diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-11-29 13:01:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-11-29 13:01:02 +1100 |
| commit | 1f5c003694fab4b1ba6cbdcc417488b975c088d0 (patch) | |
| tree | d7780f9d3afb200f5b2320721f1e11cf86b1f672 | |
| parent | a227b58cdd26c8f27927c2a0e1973c8b74a0db0c (diff) | |
Add linux-next specific files for 20231129next-20231129
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 371 | ||||
| -rw-r--r-- | Next/Trees | 373 | ||||
| -rw-r--r-- | Next/merge.log | 6125 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6870 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1b4027c6bb2c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,371 @@ +Name SHA1 +---- ---- +origin 18d46e76d7c2eedd8577fae67e3f1d4db25018b0 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 207f27102c1805e7e1b8a8ec5c7ca85742b9b9f7 +kbuild-current 98b1cc82c4affc16f5598d4fa14b1858671b2263 +arc-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm-current 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +arm64-fixes c0a8574204054effad6ac83cc75c02576e2985fe +arm-soc-fixes 736a4aad8a9fdcf577ffa33b33df240c67557af8 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 03191fb3db3d2585725bcffe0356d12fcfd27c4c +powerpc-fixes 98b1cc82c4affc16f5598d4fa14b1858671b2263 +s390-fixes aab1f809d7540def24498e81347740a7239a74d5 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 91d3d149978ba7b238198dd80e4b823756aa7cfa +bpf 0bad281d0ecdf8391b0f42678b663336e7c3ceb0 +ipsec 76df934c6d5f5c93ba7a0112b1818620ddc10b19 +netfilter 54d4434da824460a190d547404530eff12a7907d +ipvs 54d4434da824460a190d547404530eff12a7907d +wireless 4ded3bfe1db655367642aadba91aee770cbab317 +wpan 2d1c882d4434a27a026b98b602f232c7919849c5 +rdma-fixes 2b78832f50c4d711e161b166d7d8790968051546 +sound-current baaacbff64d9f34b64f294431966d035aeadb81c +sound-asoc-fixes 3acc58f55edf786971898fdb6bc180bc77acb2a6 +regmap-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +regulator-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spi-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pci-current b85ea95d086471afb4ad062012a4d73cd328fa86 +driver-core.current 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +tty.current 58ac1b3799799069d53f5bf95c093f2fe8dd3cc5 +usb.current 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +usb-serial-fixes 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +phy 2a9c713825b3127ece11984abf973672c9779518 +staging.current 98b1cc82c4affc16f5598d4fa14b1858671b2263 +iio-fixes 1cd2fe4fd63e54b799a68c0856bda18f2e40caa8 +counter-current 58720809f52779dc0f08e53e54b014209d13eebb +char-misc.current af54d778a03853801d681c98c0c2a6c316ef9ca7 +soundwire-fixes 393cae5f32d640b9798903702018a48c7a45e59f +thunderbolt-fixes ac43c9122e4287bbdbe91e980fc2528acb72cc1e +input-current 936e4d49ecbc8c404790504386e1422b599dec39 +crypto-current 9aedd10fe38418319bd8ed55dc68a40ec04aaa05 +vfio-fixes ae2667cd8a479bb5abd6e24c12fcc9ef5bc06d75 +kselftest-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 54bed6bafa0f38daf9697af50e3aff5ff1354fe1 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 7c1b1906229db88c487e21e1ecb622db64a1830d +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 32138be394e5d32c095a413949e6ab4875b2aec0 +reset-fixes b5ec294472794ed9ecba0cb4b8208372842e7e0d +mips-fixes 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +at91-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +omap-fixes 0b9a4a67c60d3e15b39a69d480a50ce7eeff9bc1 +kvm-fixes ffc253263a1375a65fa6c9f62a893e9767fbebfa +kvms390-fixes 27072b8e18a73ffeffb1c140939023915a35134b +hwmon-fixes 58ebe7fb6eb2deed0fd05cf57911fea3f36124eb +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes 8f61d48c83f6e3525a770e44692604595693f787 +btrfs-fixes 1472b846cf93e8cdff41b75ec5beb248a8e63c2a +vfs-fixes dc32464a5fe4946fe1a4d8f8e29961dc411933c5 +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes fb103b90e944ecd664577c0fd37a069282dcd294 +samsung-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-samsung-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +devicetree-fixes d79972789d17499b6091ded2fc0c6763c501a5ba +dt-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +scsi-fixes b09d7f8fd50f6e93cbadd8d27fde178f745b42a1 +drm-fixes 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +drm-intel-fixes 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +mmc-fixes 477865af60b2117ceaa1d558e03559108c15c78c +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 98b1cc82c4affc16f5598d4fa14b1858671b2263 +hyperv-fixes 18286883e779fb79b413a7462968ee3f6768f19c +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 3ca112b71f35dd5d99fc4571a56b5fc6f0c15814 +riscv-dt-fixes e80ed63affc9a9b4aacb44180ecd7ed601839599 +riscv-soc-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spdx 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +gpio-brgl-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +gpio-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +erofs-fixes 62b241efff99fc4d88a86f1c67c7516e31f432a3 +kunit-fixes 1bddcf77ce6668692fc15e968fd0870d5524d112 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 55122e0130e51eb71f5ec62d10525db0468f28e8 +nfsd-fixes bf51c52a1f3c238d72c64e14d5e7702d3a245b82 +irqchip-fixes b673fe1a6229a49be5394f4e539055d9ce685615 +renesas-fixes 9eab43facdadb7d00456c2657001ae2e5353c814 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 57686a72da08ae555d93148aa8756b16417a6aff +efi-fixes 01b1e3ca0e5ce47bbae8217d47376ad01b331b07 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes f37669119423ca852ca855b24732f25c0737aa57 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 98594181944daa201481ad63242806beb7c89ff4 +rust-fixes cfd96726e61136e68a168813cedc4084f626208b +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pmdomain-fixes 0cb19e50a911aaadf49eed120392e429d6e1fa0c +overlayfs-fixes 37f32f52643869131ec01bb69bdf9f404f6109fb +drm-misc-fixes b9c02e1052650af56d4487efa5fade3fb70e3653 +mm-stable 5b7ad877e4d81f8904ce83982b1ba5c6e83deccb +mm-nonmm-stable 5b7ad877e4d81f8904ce83982b1ba5c6e83deccb +mm c1bcffa795b1dbf18349b4933cc2a21e7d3b5f38 +kbuild ef6609adf1ecc4c0797a894d4dd365dbbc4903f9 +clang-format 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +perf 5940a20a186bd74efd6d0dc0b2b7c77d891895d9 +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping 53c87e846e335e3c18044c397cc35178163d7827 +asm-generic 0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm c7368ddba2ffcc5d200122c5bb122c3825ecb976 +arm64 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +arm-perf b805cafc604bfdb671fae7347a57f51154afa735 +arm-soc 1b52f65d88adb1fac2193ed5d38b51ad13c7be76 +amlogic 3a5038e9c0556e51db96c2f7149d853efb886c95 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed e9be9b34b841d2b1691c285ef0e85232734e28b2 +at91 b766b70117ac57d13dbbd6a6f4f0a75d57f9290e +broadcom 62a3c97f8167c88a5623d45c8984927c82c286be +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 0d6c918011ce4764ed277de4726a468b7ffe5fed +imx-mxs 258bebe27695b921ac416afc2931f1f7565e958f +mediatek 9802b60bd6d895a8be9c44cc5f74bb11131aa8bc +mvebu 93e6b023e552e7af30ba89439a1486160779010f +omap cb1114df7bb08a0be22ae1652b0c5ff9602ed391 +qcom 2b05c2dc230b58fa09358009e83eb5556ab72dc1 +renesas a89ef75a010408c660879f7e4a9522c5b76f4408 +reset e4916e791fb637a87c0ad5a0cd7ee824b817b27f +rockchip 5d1f1f3b9d049bd6d687b85924cabe0cc84fbd46 +samsung-krzk 64041620130cdf762a340d7a4bb2029e7577fc12 +scmi b419bd935f13421f87738dd83a18dbdabb4651fb +stm32 9a7308232a118b3837800337381bb1cbae30ae1d +sunxi 715a9e70bdd4d5f8a6875a0b27ebd36d7eb58d1b +tee 352b5f33b950a2130413b8278c859677d81e7fee +tegra 650220c2b474332f78dbb20651f0e98d77af6fde +ti 2b27ce85624e95fbc73f1c4682b40c4fb1d35600 +xilinx 1d4723dec415d594a21190183ed62a9e3aadff91 +clk b85ea95d086471afb4ad062012a4d73cd328fa86 +clk-imx b85ea95d086471afb4ad062012a4d73cd328fa86 +clk-renesas 5f9e29b9159a41fcf6733c3b59fa46a90ce3ae20 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch c517fd2738f472eb0d1db60a70d91629349a9bf8 +m68k 03191fb3db3d2585725bcffe0356d12fcfd27c4c +m68knommu 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +microblaze ffb0399437ef582b035089d1617bbb0ea174cd0c +mips 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 487635756198cad563feb47539c6a37ea57f1dae +powerpc 0d555b57ee660d8a871781c0eebf006e855e918d +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 3ca112b71f35dd5d99fc4571a56b5fc6f0c15814 +riscv-dt b85ea95d086471afb4ad062012a4d73cd328fa86 +riscv-soc 94f4018bc9f3e124bdaa630cf1d8f5d5e095adbe +s390 e9304ad4e23b1a5a8944b01a0dfb210461c3657e +sh b85ea95d086471afb4ad062012a4d73cd328fa86 +uml 974b808d85abbc03c3914af63d60d5816aabf2ca +xtensa a83a72730c330a57c1a07cd98603140f5fbe0bf9 +bcachefs 8e0964b74d3211e5267d8bcf90b7f333ebe7d76e +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 15baf55481de700f8c4494cddb80ec4f4575548b +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs f931faf024ddc452abbf21e3cba3a7d08fe376b1 +ceph d30d7c57a64dac6c179d87d12f4350d11731bcb5 +cifs d002738760599563bb4831dbf070f5a77bfeb925 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 1a0ac8bd7a4fa5b2f4ef14c3b1e9d6e5a5faae06 +exfat 1373ca10ec04afba9199de1fab01fde91338a78b +ext3 8abc712ea4867a81c860853048f24e511bbc20f2 +ext4 91562895f8030cb9a0470b1db49de79346a69f91 +f2fs 6bc40e44f1ddef16a787f3501b97f1fff909177c +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse 18437366a3a10577852f1626bc0dc28ae91573a7 +gfs2 8d859dc44163102336550ca74d82d7362bcacf53 +jfs cca974daeb6c43ea971f8ceff5a7080d7d49ee30 +ksmbd df60cee26a2e3d937a319229e335cb3f9c1f16d2 +nfs f003a717ae9086b1e8a4663124a96862df7282e7 +nfs-anna 379e4adfddd6a2f95a4f2029b8ddcbacf92b21f9 +nfsd 1ec134cfd5e23fde88289ed06c653d5fdc5c7a4f +ntfs3 ffc253263a1375a65fa6c9f62a893e9767fbebfa +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 2c3ef4f89ced1a9d3a6fd4f6457be5c440c89362 +ubifs 75690493591fe283e4c92a3ba7c4420e9858abdb +v9fs ce07087964208eee2ca2f9ee4a98f8b5d9027fe6 +v9fs-ericvh 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +xfs 9c235dfc3d3f901fe22acb20f2ab37ff39f2ce02 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 1633874f3b87772f38d9b356a1d1113678ea4f0e +vfs bbe6a7c899e7f265c5a6d01a178336a405e98ed6 +printk b4908d68609b57ad1ba4b80bd72c4d2260387e31 +pci b85ea95d086471afb4ad062012a4d73cd328fa86 +pstore 1d49dee6b691d47acd5c299c89d9e32acea1d20d +hid 8674f6b6cdbad3200c6e9751edd0d63a45c92476 +i2c 382561d16854a747e6df71034da08d20d6013dfe +i3c b4da37db3e2cfc1c60875b0c10cfc556d5342a3a +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging f903139441884c1da34fbfa9a33c14e1bb85f292 +jc_docs d254d263f6c89107a5accf5b24bc3d120ead113f +v4l-dvb a00b3f296eac3d43328615c3113e1a74143fc67a +v4l-dvb-next 3b8551e73271fc375b15c887db54ad31686eb2ea +pm 3f96bebf018e0e06c7a3ec604f487fe95a878ed3 +cpufreq-arm 8f96e29aae31354191227ad476dc7f6147ef1d75 +cpupower 997bbf2accf618b87d7cc47192796e5461ca87c4 +devfreq b85ea95d086471afb4ad062012a4d73cd328fa86 +pmdomain 034c9ec5d5b6c608578776fa99f47060388e81c9 +opp 19cc8b1819a40410c50a3efab6cf27b73298deb5 +thermal 9618efe343ead954ca5c23856ae23d0a29e7d4b9 +dlm 0c08699744d20ce0bac22b9f291a646a0302e51f +rdma 50af5d12f7e24b85fc10270d7700f4aa1b20b8e4 +net-next a379972973a80924b1d03443e20f113ff76a94c7 +bpf-next cf9791631027a476f7cdb0e1b3ac6add16eff264 +ipsec-next aadbd27f9674d7f5457331fe0248b370d5c1f25d +mlx5-next 82f9378c443c206d3f9e45844306e5270e7e4109 +netfilter-next ac40916a3f7243efbe6e129ebf495b5c33a3adfe +ipvs-next ac40916a3f7243efbe6e129ebf495b5c33a3adfe +bluetooth ab3d463ded5dfd81227fc998910c40913ce17616 +wireless-next a214724554aee8f6a5953dccab51ceff448c08cd +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd b85ea95d086471afb4ad062012a4d73cd328fa86 +nand acb1fd579efbcac26ce8f9c4fc8bd82f7eaa56e9 +spi-nor 9b3eae3486c86304e047829cfe0073b66dc02b36 +crypto cc03a934c5da764b369979752cd3ade3bd4f5823 +drm a13fee31f56449fc600d9e064c7b32302f92dcef +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-misc fb3f43d50d9b22946702085d1fa2139c8741283d +amdgpu 699d392903c3cebb7d2a2a3505ec9047c419dcd7 +drm-intel a4f477e6ac171ccdea38556437493c3c5222bbe5 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 07e6de738aa6f0e873463e9ca88bdb7081c4bfd4 +drm-msm-lumag d3b4075b173f033387b614297bb4d998cf22c8bd +etnaviv 925b10728f20c24516031060f3d01e4410c4a52a +fbdev 64a1aed0aa07698d12deca9b7821ea77762ff328 +regmap 1957b92aaff0fa71621e61bbd0257b9c3bb9baf2 +sound f8ccb133c9866b17a44f8e1a2478beb1631a366d +ieee1394 c12d7aa7ffa4c61443241fbc1ee405acf4aa17de +sound-asoc 1be95177eb04f56be8a5d7abfd4ef8d2c7e05873 +modules 4652b8e4f3ffa48c706ec334f048c217a7d9750d +input fedfa36d045ab78ea9a0aa2c5a3d5d74c27207d3 +block 20d713ea3192ca6735d669ce583a7d2183bd2f81 +device-mapper 13648e04a9b831b3dfa5cf3887dfa6cf8fe5fe69 +libata 804901fdd637c7af8b767c329fd84aa0d3d617ec +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 078ebb647090d89e3ccf8e4d1fb712b3f0445486 +mfd 95f44ef666a6504a7c75def89fffacb0ae4bf52c +backlight 58793f263abc8e5233fabf7466219202db09d048 +battery b55d073e6501dc6077edaa945a6dad8ac5c8bbab +regulator 753e4d5c433da57da75dd4c3e1aececc8e874a62 +security 80b4ff1d2c9bc7e20b82d18535a27fa32dffa1dd +apparmor a7e405a2de69fe5e6657046e978a81683b140051 +integrity b836c4d29f2744200b2af41e14bf50758dddc818 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux ae254858ce0745aba25d107159b580ab5fdada5b +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd c2d5304e6c648ebcf653bace7e51e0e6742e46c8 +watchdog b85ea95d086471afb4ad062012a4d73cd328fa86 +iommu 173ff345925a394284250bfa6e47d231e62031c7 +audit 24fade412acf3e349e337b9472a5a8f7eb94cfb8 +devicetree 67f7a63ecc712dbc307c04a1a7fbf32d1aa864df +dt-krzk b85ea95d086471afb4ad062012a4d73cd328fa86 +mailbox 96cb7a4e296da9aaae0ad61394fdb2828e0a21b5 +spi 8e6a43961f24cf841d3c0d199521d0b284d948b9 +tip c17381b94c1508ff9606b856bb1a464a496e41bc +clockevents c28ca80ba3b531a79402d61046aef83272f86b08 +edac a2f99fbae4513ce4871e71ba88cd9d75fe5019e6 +irqchip 19b5a44bee16518104e8a159ab9a60788292fbd4 +ftrace e1742fa172d553ecc8e9077a713315404be36c13 +rcu 68f721e904b253ae9f782db0362f608048225403 +kvm e9e60c82fe391d04db55a91c733df4a017c28b2f +kvm-arm 9daf33ca4801813b0ccd566e32f650a9bbff466f +kvms390 70fea30195168fd84e7076720c984f0ac1af5b09 +kvm-ppc 98b1cc82c4affc16f5598d4fa14b1858671b2263 +kvm-riscv d9c00f44e5de542340cce1d09e2c990e16c0ed3a +kvm-x86 45b890f7689eb0aba454fc5831d2d79763781677 +xen-tip 7f3da4b698bcc21a6df0e7f114af71d53a3e26ac +percpu 3fcf62f24c80e2472f472778f317e062841c2d37 +workqueues 4a6c5607d4502ccd1b15b57d57f17d12b6f257a7 +drivers-x86 3ecb4d85461a34323a849769030841533fcd0395 +chrome-platform d131f1f3b459980d38a59adc3598c96cc3a6ad5e +chrome-platform-firmware ecea08916418a94f99f89c543303877cb6e08a11 +hsi fa72d143471d04ce3055d8dad9743b08c19e4060 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 8171710be2d04fdc263da49212d7b875d3688f58 +ipmi c5d03a0d8461c96317a61d67ee0c277c5840bdc5 +driver-core 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +usb 24af68a0ed53629bdde7b53ef8c2be72580d293b +thunderbolt 655b8af57d31e07340b023a807e43dadf81a0818 +usb-serial 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +tty ab58841ab9fca536e5579312d7b46cbc4822e29c +char-misc bc1183a63057839b18e955b6d68abbb20d37b0f1 +accel ce06bc9d7209f3a585c5154841eeb0b788ff75c7 +coresight 60e5f23dc5d68ec01e6dae8f4311230c7d2ccb8a +fastrpc b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga 5496fb8eedd637e1e9d87655f86dc816afd5ad68 +icc feaf241ae2da2a73cb421473f52a4732128a996f +iio 6543f376ec8aa90a6c1ed44b765f4f0d6c3eb1db +phy-next 7f6f9e0def00cfaeb1d034fd13dbd84470aeccbd +soundwire 55d50ace6b88eb273a10963160cadbadccfcdd64 +extcon b85ea95d086471afb4ad062012a4d73cd328fa86 +gnss 98b1cc82c4affc16f5598d4fa14b1858671b2263 +vfio 2b88119e35b00d8cb418d86abbace3b90a993bd7 +w1 271c81935801d6449bb7bab5ccfc6cd38238c62b +staging d488759416ed3adf542abe15a530243bb74dd882 +counter-next 7904cdf1397c9391178ce53a7ebfa099c6bc4a59 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 306f5df81fcc89b462fbeb9dbe26d9a8ad7c7582 +cgroup 357564d50da386e66ab41b6abe2b0811437b55ee +scsi d85d85eab615b51563dfdd8a4e6202937326b44e +scsi-mkp 6bae38ddd3a8dffbc35d6c637f58c3710f65d54e +vhost e07754e0a1ea2d63fb29574253d1fd7405607343 +rpmsg cae0e61beb7acb1c54a17e5418978f096d66def6 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 58bfaaac03284d82a55a724bfe2d97e19f3a11d0 +gpio-intel 92fc925f838660eec25862a7fa7e6ef79d22f3ea +pinctrl 75eb87dfebda92508158d6356286366762c741f0 +pinctrl-intel 6191e49de389f57a2d34fdfe2c5df7fca2a1f246 +pinctrl-renesas dc99d4c8ac46bf533b9519a53795c4cd6ff0fa39 +pinctrl-samsung 904140fa45533f6d05071e24492013da16c46b7f +pwm 5d67b8f81b9d598599366214e3b2eb5f84003c9f +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest b85ea95d086471afb4ad062012a4d73cd328fa86 +kunit b85ea95d086471afb4ad062012a4d73cd328fa86 +kunit-next b85ea95d086471afb4ad062012a4d73cd328fa86 +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc 3d762e21d56370a43478b55e604b4a83dd85aafc +nvdimm 9ea459e477dc09370cdd8ee13b61aefe8cd1f20a +at24 b85ea95d086471afb4ad062012a4d73cd328fa86 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 31c65705a8cfa5f80d3824c686ab74b0409ee76d +fsi f04d61a379d65794d5d85168b84dcdf01d426f7c +slimbus b85ea95d086471afb4ad062012a4d73cd328fa86 +nvmem b85ea95d086471afb4ad062012a4d73cd328fa86 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay 35b464e32c8bccef435e415db955787ead4ab44c +kgdb 23816724fdbd47c28bc998866fd7bc5ad9f0e535 +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 83c5dcf78ab992181c7d8bd5e94a0fdbde4c0efe +memblock e96c6b8f212a510c9b22362de519f6e1d7920de5 +cxl 5d09c63f11f083707b60c8ea0bb420651c47740f +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 5329aa5101f73c451bcd48deaf3f296685849d9c +unicode c1869dbd29578abdbf383ffa70c36f3f555ababb +slab 7eec549256f21ad40c7d9c7f687f165ce70bab70 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 323f65ded48d9f4619b9b3d80f952471cf469b11 +rust 3857af38e57a80b15b994e19d1f4301cac796481 +sysctl 8b793bcda61f6c3ed4f5b2ded7530ef6749580cb +execve 21ca59b365c091d583f36ac753eaa8baf947be6f +bitmap 0762cf0860c80e6974f6a77b1c4ee0941cf836c2 +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp d71f22365a9caca82d424f3a33445de46567e198 +kspp-gustavo 89741e7e42f6ab203fe50d80887f6feded326160 +nolibc b85ea95d086471afb4ad062012a4d73cd328fa86 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd b2b67c997bf74453f3469d8b54e4859f190943bd diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2773cf8f6503 --- /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.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#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..933e93cb4b3d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6125 @@ +$ date -R +Wed, 29 Nov 2023 07:56:58 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 96% (3626/3748)
Updating files: 97% (3636/3748)
Updating files: 98% (3674/3748)
Updating files: 99% (3711/3748)
Updating files: 100% (3748/3748)
Updating files: 100% (3748/3748), done. +HEAD is now at 2cc14f52aeb7 Linux 6.7-rc3 +Merging origin/master (18d46e76d7c2 Merge tag 'for-6.7-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 2cc14f52aeb7..18d46e76d7c2 +Fast-forward (no commit created; -m option ignored) + drivers/media/pci/mgb4/Kconfig | 1 + + drivers/media/pci/mgb4/mgb4_core.c | 20 +- + drivers/media/platform/renesas/vsp1/vsp1_pipe.c | 2 +- + drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 10 +- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 8 +- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.h | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 29 +-- + fs/btrfs/disk-io.c | 1 + + fs/btrfs/extent_io.c | 11 +- + fs/btrfs/ioctl.c | 1 + + fs/btrfs/ref-verify.c | 2 + + fs/btrfs/send.c | 2 +- + fs/btrfs/super.c | 5 +- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-checker.c | 39 ++++ + fs/btrfs/volumes.c | 9 +- + fs/smb/server/ksmbd_work.c | 10 +- + fs/smb/server/oplock.c | 3 +- + fs/smb/server/smb2pdu.c | 272 ++++++++++++------------ + fs/smb/server/smbacl.c | 7 +- + fs/smb/server/smbacl.h | 2 +- + fs/smb/server/vfs.c | 70 +++--- + fs/smb/server/vfs.h | 10 +- + fs/smb/server/vfs_cache.c | 33 ++- + fs/smb/server/vfs_cache.h | 6 +- + include/uapi/linux/v4l2-subdev.h | 2 +- + 26 files changed, 310 insertions(+), 251 deletions(-) +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 (207f27102c18 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 MAINTAINERS +Auto-merging scripts/checkstack.pl +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 7 +++++ + arch/powerpc/Kconfig | 4 +-- + arch/riscv/Kconfig | 4 +-- + arch/s390/Kconfig | 4 +-- + arch/x86/Kconfig | 4 +-- + drivers/base/memory.c | 18 +++++++++-- + fs/proc/task_mmu.c | 26 +++++++++++++--- + fs/squashfs/block.c | 2 +- + include/linux/hugetlb.h | 5 +-- + include/linux/mmzone.h | 14 +++++++-- + kernel/Kconfig.kexec | 2 ++ + lib/group_cpus.c | 22 ++++++++++---- + mm/Kconfig | 16 +++++----- + mm/damon/core.c | 1 + + mm/damon/sysfs-schemes.c | 49 ++++++++++++++++++++++++++---- + mm/filemap.c | 2 +- + mm/hugetlb.c | 7 +++++ + mm/kmemleak.c | 40 +++++++++++++----------- + mm/madvise.c | 11 +++++++ + mm/memcontrol.c | 2 +- + mm/memory.c | 1 + + mm/memory_hotplug.c | 15 +++++---- + mm/shmem.c | 19 +++++++++++- + mm/sparse.c | 17 ++++++----- + scripts/checkstack.pl | 8 ++--- + scripts/gdb/linux/tasks.py | 12 +++----- + tools/testing/selftests/mm/Makefile | 4 +-- + tools/testing/selftests/mm/pagemap_ioctl.c | 9 ++++-- + 29 files changed, 226 insertions(+), 100 deletions(-) +Merging kbuild-current/fixes (98b1cc82c4af Linux 6.7-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (c0a857420405 arm64: add dependency between vmlinuz.efi and Image) +$ 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 (b85ea95d0864 Linux 6.7-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 (98b1cc82c4af Linux 6.7-rc2) +$ 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 (aab1f809d754 scripts/checkstack.pl: match all stack sizes for s390) +$ 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 (91d3d149978b r8169: prevent potential deadlock in rtl8169_close) +$ 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. + drivers/net/dsa/mv88e6xxx/chip.c | 26 ++++- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 16 ++- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 2 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 9 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 126 ++++++++++++++++----- + drivers/net/ethernet/realtek/r8169_main.c | 9 +- + drivers/net/ethernet/renesas/rswitch.c | 22 ++-- + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 + + include/net/neighbour.h | 2 +- + net/ipv4/igmp.c | 6 +- + net/mptcp/options.c | 1 + + tools/testing/selftests/net/af_unix/diag_uid.c | 1 - + tools/testing/selftests/net/cmsg_sender.c | 2 +- + tools/testing/selftests/net/ipsec.c | 4 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 11 +- + tools/testing/selftests/net/mptcp/mptcp_inq.c | 11 +- + 19 files changed, 184 insertions(+), 77 deletions(-) +Merging bpf/master (0bad281d0ecd netkit: Reject IFLA_NETKIT_PEER_INFO in netkit_change_link) +$ 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. + drivers/net/netdevsim/bpf.c | 4 ++-- + drivers/net/netkit.c | 6 ++++++ + kernel/bpf/memalloc.c | 2 ++ + 3 files changed, 10 insertions(+), 2 deletions(-) +Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link) +$ 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 (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit') +$ 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 (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit') +$ 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 (4ded3bfe1db6 wifi: mac80211: use wiphy locked debugfs for sdata/link) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging fs/debugfs/file.c +Auto-merging fs/debugfs/inode.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath9k/Kconfig | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 4 +- + fs/debugfs/file.c | 100 ++++++++++++++ + fs/debugfs/inode.c | 71 ++++++++-- + fs/debugfs/internal.h | 21 ++- + include/linux/debugfs.h | 19 +++ + include/linux/ieee80211.h | 4 +- + include/net/cfg80211.h | 46 +++++++ + net/mac80211/Kconfig | 2 +- + net/mac80211/debugfs_netdev.c | 150 ++++++++++++++------- + net/mac80211/debugfs_sta.c | 74 ++++++----- + net/mac80211/driver-ops.h | 9 +- + net/mac80211/ht.c | 1 + + net/wireless/core.c | 6 +- + net/wireless/core.h | 1 + + net/wireless/debugfs.c | 160 +++++++++++++++++++++++ + net/wireless/nl80211.c | 55 +++++--- + 19 files changed, 614 insertions(+), 118 deletions(-) +Merging wpan/master (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (2b78832f50c4 RDMA/irdma: Fix UAF in irdma_sc_ccq_get_cqe_info()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/infiniband/core/verbs.c | 2 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 13 +++++++---- + drivers/infiniband/hw/irdma/hw.c | 12 ++++++---- + drivers/infiniband/hw/irdma/main.c | 2 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 28 ++++++++++++++++------ + drivers/infiniband/hw/irdma/verbs.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 7 +++--- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 37 ++++++++++++++++++++++-------- + 11 files changed, 74 insertions(+), 33 deletions(-) +Merging sound-current/for-linus (baaacbff64d9 ALSA: hda/realtek: Headset Mic VREF to 100%) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + include/sound/cs35l41.h | 2 +- + sound/hda/intel-nhlt.c | 33 +++++++++++++++++++++++++++++---- + sound/pci/hda/cs35l41_hda.c | 28 ++++++++++++---------------- + sound/pci/hda/cs35l56_hda_spi.c | 4 ++++ + sound/pci/hda/patch_realtek.c | 19 +++++++++++++++++++ + sound/soc/codecs/cs35l41-lib.c | 6 ++++-- + sound/soc/codecs/cs35l41.c | 4 ++-- + 7 files changed, 71 insertions(+), 25 deletions(-) +Merging sound-asoc-fixes/for-linus (3acc58f55edf ASoC: hdac_hda: Conditionally register dais for HDMI and Analog) +$ 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. + drivers/spi/spi-atmel.c | 7 +-- + sound/soc/amd/yc/acp6x-mach.c | 21 +++++++++ + sound/soc/codecs/cs43130.c | 6 +-- + sound/soc/codecs/hdac_hda.c | 23 ++++++++-- + sound/soc/codecs/lpass-tx-macro.c | 5 +++ + sound/soc/codecs/nau8822.c | 9 ++-- + sound/soc/codecs/rt5645.c | 10 ++++- + sound/soc/codecs/wm8974.c | 6 +-- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl_sai.c | 21 +++++++++ + sound/soc/fsl/fsl_xcvr.c | 14 +++++- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 + + sound/soc/intel/boards/sof_sdw.c | 17 ++++---- + sound/soc/intel/skylake/skl-pcm.c | 9 +++- + sound/soc/intel/skylake/skl-sst-ipc.c | 4 +- + sound/soc/soc-pcm.c | 11 ++--- + sound/soc/sof/ipc3-topology.c | 2 + + sound/soc/sof/ipc4-topology.c | 9 ++++ + sound/soc/sof/mediatek/mt8186/mt8186.c | 3 ++ + sound/soc/sof/sof-audio.c | 65 ++++++++++++++++++---------- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/sof/topology.c | 4 +- + 22 files changed, 188 insertions(+), 63 deletions(-) +Merging regmap-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1) +$ 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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (2cc14f52aeb7 Linux 6.7-rc3) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (58ac1b379979 ARM: PL011: Fix DMA support) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_early.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 14 +++-- + drivers/tty/serial/amba-pl011.c | 112 +++++++++++++++++------------------ + drivers/tty/serial/sc16is7xx.c | 12 ++++ + 4 files changed, 75 insertions(+), 64 deletions(-) +Merging usb.current/usb-linus (2cc14f52aeb7 Linux 6.7-rc3) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c | 2 +- + drivers/phy/sunplus/phy-sunplus-usb2.c | 2 +- + drivers/phy/ti/phy-gmii-sel.c | 5 ++++- + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (98b1cc82c4af Linux 6.7-rc2) +$ 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 (1cd2fe4fd63e iio: imu: adis16475: use bit numbers in assign_bit()) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 37 +++++-- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- + drivers/iio/imu/adis16475.c | 133 +++++++++++++++---------- + drivers/iio/magnetometer/tmag5273.c | 2 +- + 4 files changed, 109 insertions(+), 67 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 (af54d778a038 devcoredump: Send uevent once devcd is ready) +$ 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 +Merge made by the 'ort' strategy. + drivers/base/devcoredump.c | 3 +++ + drivers/misc/mei/client.c | 4 ++-- + drivers/misc/mei/pxp/mei_pxp.c | 3 ++- + tools/testing/nvdimm/test/ndtest.c | 2 +- + 4 files changed, 8 insertions(+), 4 deletions(-) +Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/intel_ace2x.c | 3 ++- + drivers/soundwire/stream.c | 7 ++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging thunderbolt-fixes/fixes (ac43c9122e42 thunderbolt: Fix memory leak in margining_port_remove()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (936e4d49ecbc Input: atkbd - skip ATKBD_CMD_GETID in translated mode) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/keyboard/atkbd.c | 46 +++++++++++++++++++++++++++++++++++++---- + drivers/input/mouse/synaptics.c | 1 + + 2 files changed, 43 insertions(+), 4 deletions(-) +Merging crypto-current/master (9aedd10fe384 crypto: ahash - Set using_shash for cloned ahash wrapper over shash) +$ 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 (ae2667cd8a47 vfio/pds: Fix possible sleep while in atomic context) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/vfio/pci/pds/pci_drv.c | 4 ++-- + drivers/vfio/pci/pds/vfio_dev.c | 30 +++++++++++++++++++++--------- + drivers/vfio/pci/pds/vfio_dev.h | 2 +- + 3 files changed, 24 insertions(+), 12 deletions(-) +Merging kselftest-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) +$ 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 (54bed6bafa0f dmaengine: stm32-dma: avoid bitfield overflow assertion) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/fsl-edma-main.c | 7 ++++++- + drivers/dma/stm32-dma.c | 8 ++++++-- + drivers/dma/ti/k3-psil-am62.c | 12 ++++++------ + drivers/dma/ti/k3-psil-am62a.c | 12 ++++++------ + 4 files changed, 24 insertions(+), 15 deletions(-) +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (7c1b1906229d mtd: spinand: gigadevice: Fix the get ecc status issue) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/gigadevice.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (32138be394e5 Merge tag 'media-renesas-fixes-20231113' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) +$ 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 (b5ec29447279 reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/hisilicon/hi6220_reset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (b85ea95d0864 Linux 6.7-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 (27072b8e18a7 KVM: s390/mm: Properly reset no-dat) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Merge made by the 'ort' strategy. + arch/s390/kvm/vsie.c | 4 ---- + arch/s390/mm/pgtable.c | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging hwmon-fixes/hwmon (58ebe7fb6eb2 hwmon: max31827: include regulator header) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/ltc2991.c | 2 +- + drivers/hwmon/max31827.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +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 (1472b846cf93 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 +Merge made by the 'ort' strategy. +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 (fb103b90e944 platform/x86: asus-wmi: Filter Volume key presses if also reported via atkbd) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + drivers/platform/x86/Kconfig | 2 +- + drivers/platform/x86/asus-nb-wmi.c | 61 ++++++++++++++++++++++++-------------- + drivers/platform/x86/asus-wmi.c | 8 +++++ + drivers/platform/x86/asus-wmi.h | 7 +++-- + 4 files changed, 51 insertions(+), 27 deletions(-) +Merging samsung-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-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 (b85ea95d0864 Linux 6.7-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 (d79972789d17 of: dynamic: Fix of_reconfig_get_state_change() return value documentation) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml +Auto-merging drivers/of/dynamic.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/display/mediatek/mediatek,dsi.yaml | 1 - + drivers/of/dynamic.c | 5 +++-- + scripts/dtc/dt-extract-compatibles | 14 ++++++++++++-- + 3 files changed, 15 insertions(+), 5 deletions(-) +Merging dt-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-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 (b09d7f8fd50f scsi: sd: Fix system start for ATA devices) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/ata/libata-scsi.c | 9 +++++++-- + drivers/firewire/sbp2.c | 6 +++--- + drivers/scsi/sd.c | 9 ++++++++- + drivers/ufs/core/ufshcd.c | 13 +++++++++++++ + include/scsi/scsi_device.h | 12 +++++++++--- + 5 files changed, 40 insertions(+), 9 deletions(-) +Merging drm-fixes/drm-fixes (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (477865af60b2 mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled) +$ 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 | 2 ++ + drivers/mmc/core/core.c | 9 +++++-- + drivers/mmc/host/cqhci-core.c | 44 ++++++++++++++++---------------- + drivers/mmc/host/sdhci-pci-gli.c | 54 +++++++++++++++++++++------------------- + drivers/mmc/host/sdhci-sprd.c | 25 +++++++++++++++++++ + 5 files changed, 85 insertions(+), 49 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 (98b1cc82c4af Linux 6.7-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (18286883e779 x86/hyperv: Use atomic_try_cmpxchg() to micro-optimize hv_nmi_unknown()) +$ 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 (3ca112b71f35 Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ 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 (e80ed63affc9 riscv: dts: sophgo: remove address-cells from intc node) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 1 - + 1 file changed, 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (b85ea95d0864 Linux 6.7-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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (b85ea95d0864 Linux 6.7-rc1) +$ 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 (b85ea95d0864 Linux 6.7-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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (62b241efff99 MAINTAINERS: erofs: add EROFS webpage) +$ 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 (1bddcf77ce66 kunit: test: Avoid cast warning when adding kfree() as an action) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Merge made by the 'ort' strategy. + lib/kunit/kunit-test.c | 2 +- + lib/kunit/test.c | 42 ++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 41 insertions(+), 3 deletions(-) +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 (bf51c52a1f3c NFSD: Fix checksum mismatches in the duplicate reply cache) +$ 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 (57686a72da08 tools: Disable __packed attribute compiler warning due to -Werror=attributes) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Merge made by the 'ort' strategy. + tools/arch/arm64/include/asm/cputype.h | 5 +++- + tools/arch/arm64/include/uapi/asm/kvm.h | 32 ++++++++++++++++++++++ + tools/arch/arm64/include/uapi/asm/perf_regs.h | 10 ++++--- + tools/arch/arm64/tools/Makefile | 2 +- + tools/arch/s390/include/uapi/asm/kvm.h | 16 +++++++++++ + tools/arch/x86/include/asm/cpufeatures.h | 16 ++++++++++- + tools/arch/x86/include/asm/disabled-features.h | 16 +++++++++-- + tools/arch/x86/include/asm/msr-index.h | 23 +++++++++++++--- + tools/arch/x86/include/uapi/asm/prctl.h | 12 ++++++++ + tools/include/asm-generic/unaligned.h | 1 + + tools/include/uapi/asm-generic/unistd.h | 12 ++++++-- + tools/include/uapi/drm/drm.h | 20 ++++++++++++++ + tools/include/uapi/drm/i915_drm.h | 8 +++--- + tools/include/uapi/linux/fscrypt.h | 3 +- + tools/include/uapi/linux/kvm.h | 24 ++++++++++++++-- + tools/include/uapi/linux/mount.h | 3 +- + tools/include/uapi/linux/vhost.h | 8 ++++++ + tools/perf/MANIFEST | 2 ++ + tools/perf/Makefile.perf | 24 ++++++++++------ + .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 4 +++ + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 4 +++ + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 4 +++ + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 3 ++ + tools/perf/builtin-kwork.c | 2 +- + tools/perf/trace/beauty/include/linux/socket.h | 1 + + tools/perf/util/Build | 2 +- + tools/perf/util/bpf_lock_contention.c | 3 +- + tools/testing/selftests/kvm/Makefile | 5 ++-- + 28 files changed, 226 insertions(+), 39 deletions(-) +Merging efi-fixes/urgent (01b1e3ca0e5c efi/unaccepted: Fix off-by-one when checking for overlapping ranges) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/unaccepted_memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging zstd-fixes/zstd-linus (77618db34645 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 +Already up to date. +Merging battery-fixes/fixes (f37669119423 power: supply: cw2015: correct time_to_empty units in sysfs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/cw2015_battery.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (98594181944d iommufd/selftest: Fix _test_mock_dirty_bitmaps()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Merge made by the 'ort' strategy. + tools/testing/selftests/iommu/iommufd_utils.h | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) +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 (b85ea95d0864 Linux 6.7-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 (0cb19e50a911 pmdomain: arm: Avoid polling for scmi_perf_domain) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/arm/scmi_perf_domain.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging overlayfs-fixes/ovl-fixes (37f32f526438 ovl: fix memory leak in ovl_parse_param()) +$ 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 (b9c02e105265 drm/gpuvm: Fix deprecated license identifier) +$ 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/dma-buf/dma-resv.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 17 ----------------- + drivers/gpu/drm/drm_gpuvm.c | 2 +- + include/drm/drm_gpuvm.h | 2 +- + include/linux/dma-fence.h | 15 +++++++++++++++ + 5 files changed, 18 insertions(+), 20 deletions(-) +Merging mm-stable/mm-stable (5b7ad877e4d8 Merge tag 'afs-fixes-20231124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ 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 (5b7ad877e4d8 Merge tag 'afs-fixes-20231124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ 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 (c1bcffa795b1 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging scripts/checkstack.pl +Merge made by the 'ort' strategy. + Documentation/admin-guide/blockdev/zram.rst | 2 +- + Documentation/admin-guide/mm/pagemap.rst | 1 + + Documentation/admin-guide/mm/userfaultfd.rst | 3 + + Documentation/core-api/maple_tree.rst | 4 + + Documentation/filesystems/locking.rst | 4 +- + Documentation/filesystems/squashfs.rst | 60 ++ + Documentation/filesystems/vfs.rst | 6 +- + Documentation/mm/arch_pgtable_helpers.rst | 2 - + MAINTAINERS | 1 + + Makefile | 6 +- + arch/Kconfig | 13 - + arch/loongarch/kernel/numa.c | 28 +- + arch/powerpc/kexec/core_64.c | 3 +- + arch/x86/mm/numa.c | 34 +- + arch/x86/pci/sta2x11-fixup.c | 1 + + block/fops.c | 2 +- + drivers/block/zram/Kconfig | 15 +- + drivers/block/zram/zram_drv.c | 27 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/dax/bus.c | 3 + + drivers/dax/bus.h | 1 + + drivers/dax/cxl.c | 1 + + drivers/dax/dax-private.h | 1 + + drivers/dax/hmem/hmem.c | 1 + + drivers/dax/kmem.c | 8 +- + drivers/dax/pmem.c | 1 + + drivers/usb/host/fsl-mph-dr-of.c | 2 +- + fs/Kconfig | 22 +- + fs/afs/write.c | 8 +- + fs/bcachefs/fs.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/buffer.c | 130 ++-- + fs/ceph/addr.c | 4 +- + fs/exec.c | 3 +- + fs/ext2/inode.c | 2 +- + fs/ext4/inline.c | 3 +- + fs/ext4/inode.c | 6 +- + fs/f2fs/compress.c | 2 +- + fs/f2fs/inode.c | 2 +- + fs/gfs2/aops.c | 41 +- + fs/hugetlbfs/inode.c | 6 +- + fs/iomap/buffered-io.c | 14 +- + fs/jffs2/debug.c | 2 +- + fs/nfs/file.c | 2 +- + fs/nilfs2/btnode.c | 62 +- + fs/nilfs2/dir.c | 244 +++--- + fs/nilfs2/file.c | 28 +- + fs/nilfs2/gcinode.c | 4 +- + fs/nilfs2/inode.c | 11 +- + fs/nilfs2/ioctl.c | 10 +- + fs/nilfs2/mdt.c | 23 +- + fs/nilfs2/namei.c | 38 +- + fs/nilfs2/nilfs.h | 20 +- + fs/nilfs2/page.c | 93 +-- + fs/nilfs2/page.h | 12 +- + fs/nilfs2/segment.c | 157 ++-- + fs/ntfs/aops.c | 6 +- + fs/ocfs2/aops.c | 2 +- + fs/proc/task_mmu.c | 17 +- + fs/smb/client/file.c | 6 +- + fs/squashfs/file.c | 3 +- + fs/squashfs/file_direct.c | 6 +- + fs/userfaultfd.c | 72 ++ + fs/xfs/xfs_aops.c | 2 +- + fs/zonefs/file.c | 2 +- + include/linux/fs.h | 2 +- + include/linux/gfp_types.h | 5 +- + include/linux/highmem.h | 76 ++ + include/linux/init_task.h | 7 - + include/linux/ioport.h | 3 + + include/linux/list_lru.h | 36 +- + include/linux/maple_tree.h | 411 +++++----- + include/linux/memblock.h | 1 + + include/linux/memremap.h | 12 - + include/linux/mm.h | 40 +- + include/linux/mm_types.h | 11 +- + include/linux/mmzone.h | 4 + + include/linux/page-flags.h | 9 +- + include/linux/rmap.h | 5 + + include/linux/sched.h | 2 - + include/linux/sched/signal.h | 4 +- + include/linux/stackdepot.h | 59 +- + include/linux/swap.h | 6 + + include/linux/userfaultfd_k.h | 11 + + include/linux/vm_event_item.h | 3 - + include/trace/events/vmscan.h | 95 ++- + include/uapi/linux/fs.h | 1 + + include/uapi/linux/userfaultfd.h | 29 +- + init/init_task.c | 10 +- + kernel/fork.c | 66 +- + kernel/kexec_core.c | 5 +- + kernel/kexec_file.c | 2 + + kernel/ptrace.c | 13 +- + kernel/reboot.c | 17 +- + kernel/resource.c | 57 ++ + kernel/sched/fair.c | 13 - + kernel/sched/sched.h | 11 + + kernel/signal.c | 28 +- + kernel/watchdog.c | 3 + + lib/Kconfig | 10 + + lib/Kconfig.kasan | 2 +- + lib/maple_tree.c | 1066 ++++++++++++++++---------- + lib/stackdepot.c | 456 +++++++---- + lib/test_ida.c | 2 +- + lib/test_maple_tree.c | 332 ++++---- + mm/damon/core-test.h | 15 +- + mm/filemap.c | 2 +- + mm/folio-compat.c | 4 +- + mm/gup.c | 2 + + mm/huge_memory.c | 126 ++- + mm/hugetlb_vmemmap.c | 273 +++---- + mm/internal.h | 23 +- + mm/kasan/common.c | 8 +- + mm/kasan/generic.c | 66 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/quarantine.c | 26 +- + mm/kasan/report_tags.c | 27 +- + mm/kasan/tags.c | 24 +- + mm/khugepaged.c | 3 + + mm/kmemleak.c | 67 +- + mm/kmsan/core.c | 7 +- + mm/ksm.c | 4 +- + mm/memblock.c | 34 + + mm/memcontrol.c | 12 + + mm/memory-failure.c | 115 ++- + mm/memory.c | 33 +- + mm/memory_hotplug.c | 210 +++-- + mm/mempool.c | 8 +- + mm/memremap.c | 14 +- + mm/mm_init.c | 3 +- + mm/mmap.c | 46 +- + mm/oom_kill.c | 7 +- + mm/page-writeback.c | 54 +- + mm/page_alloc.c | 80 +- + mm/page_owner.c | 9 +- + mm/page_poison.c | 8 +- + mm/pagewalk.c | 29 +- + mm/process_vm_access.c | 15 +- + mm/rmap.c | 30 + + mm/shmem.c | 6 +- + mm/slub.c | 41 +- + mm/swapfile.c | 34 +- + mm/truncate.c | 51 +- + mm/userfaultfd.c | 599 +++++++++++++++ + mm/util.c | 8 +- + mm/vmscan.c | 53 +- + mm/vmstat.c | 6 +- + mm/zswap.c | 15 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/cgroup/Makefile | 5 + + samples/cgroup/memcg_event_listener.c | 330 ++++++++ + scripts/Makefile.extrawarn | 4 +- + scripts/checkpatch.pl | 2 +- + scripts/checkstack.pl | 19 +- + scripts/gdb/linux/page_owner.py | 58 +- + scripts/gdb/linux/slab.py | 3 +- + scripts/gdb/linux/stackdepot.py | 6 +- + scripts/spelling.txt | 14 + + tools/cgroup/Makefile | 11 - + tools/include/linux/rwsem.h | 4 + + tools/include/linux/spinlock.h | 1 + + tools/include/uapi/linux/fs.h | 1 + + tools/testing/radix-tree/linux.c | 45 +- + tools/testing/radix-tree/linux/maple_tree.h | 2 +- + tools/testing/radix-tree/maple.c | 390 +++++++++- + tools/testing/selftests/mm/uffd-common.c | 39 +- + tools/testing/selftests/mm/uffd-common.h | 9 + + tools/testing/selftests/mm/uffd-stress.c | 5 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 192 +++++ + tools/testing/selftests/mm/vm_util.c | 80 +- + 171 files changed, 5234 insertions(+), 2418 deletions(-) + create mode 100644 samples/cgroup/Makefile + create mode 100644 samples/cgroup/memcg_event_listener.c + delete mode 100644 tools/cgroup/Makefile +$ git am -3 ../patches/0001-powerpc-pmd_move_must_withdraw-is-only-needed-for-CO.patch +Applying: powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/mm/book3s64/pgtable.c +$ git add -A . +$ git commit -v -a --amend +[master bc5c3cc45af4] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed Nov 29 08:14:18 2023 +1100 +$ git am -3 ../patches/0001-sparc-turn-off-Werror-for-now.patch +Applying: sparc: turn off Werror for now +$ git reset HEAD^ +Unstaged changes after reset: +M arch/sparc/kernel/Makefile +M arch/sparc/lib/Makefile +M arch/sparc/mm/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 759d91f65bd2] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed Nov 29 08:14:18 2023 +1100 +$ git am -3 ../patches/0001-Revert-samples-cgroup-introduce-memcg-memory.events-.patch +Applying: Revert "samples/cgroup: introduce memcg memory.events listener" +$ git reset HEAD^ +Unstaged changes after reset: +M samples/cgroup/Makefile +D samples/cgroup/memcg_event_listener.c +$ git add -A . +$ git commit -v -a --amend +[master eaf955cf5f4b] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed Nov 29 08:14:18 2023 +1100 +$ git am -3 ../patches/0002-Revert-samples-introduce-new-samples-subdir-for-cgro.patch +Applying: Revert "samples: introduce new samples subdir for cgroup" +$ git reset HEAD^ +Unstaged changes after reset: +M MAINTAINERS +M samples/Kconfig +M samples/Makefile +D samples/cgroup/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 520f30b8bba1] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed Nov 29 08:14:18 2023 +1100 +Merging kbuild/for-next (ef6609adf1ec kbuild: remove the last use of old cmd_src_tar rule in packaging) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 2 - + scripts/Makefile.package | 26 +------ + scripts/genksyms/genksyms.c | 22 +----- + scripts/kconfig/confdata.c | 155 ++++++++++++++++++------------------- + scripts/package/buildtar | 8 +- + scripts/package/snapcraft.template | 2 +- + 6 files changed, 80 insertions(+), 135 deletions(-) +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 (5940a20a186b perf mmap: Lazily initialize zstd streams to save memory when not using it) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging tools/perf/Makefile.perf +CONFLICT (content): Merge conflict in tools/perf/Makefile.perf +Auto-merging tools/perf/util/Build +Recorded preimage for 'tools/perf/Makefile.perf' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/perf/Makefile.perf'. +[master 4b9ab83c57d5] Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git +$ git diff -M --stat --summary HEAD^.. + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 + + tools/build/feature/test-dwarf_getcfi.c | 9 + + tools/build/feature/test-libopencsd.c | 4 +- + tools/include/uapi/linux/perf_event.h | 13 ++ + tools/perf/.gitignore | 1 + + tools/perf/Documentation/itrace.txt | 1 + + tools/perf/Documentation/perf-config.txt | 4 +- + tools/perf/Documentation/perf-list.txt | 12 +- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Documentation/perf.txt | 3 + + tools/perf/Makefile.config | 13 +- + tools/perf/Makefile.perf | 21 +- + tools/perf/arch/loongarch/annotate/instructions.c | 6 +- + tools/perf/builtin-annotate.c | 7 +- + tools/perf/builtin-inject.c | 6 + + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-record.c | 28 ++- + tools/perf/builtin-report.c | 7 + + tools/perf/perf.c | 30 +++ + tools/perf/pmu-events/arch/riscv/mapfile.csv | 2 + + .../arch/riscv/starfive/dubhe-80/common.json | 172 ++++++++++++++ + .../arch/riscv/starfive/dubhe-80/firmware.json | 68 ++++++ + .../arch/riscv/thead/c900-legacy/cache.json | 67 ++++++ + .../arch/riscv/thead/c900-legacy/firmware.json | 68 ++++++ + .../arch/riscv/thead/c900-legacy/instruction.json | 72 ++++++ + .../arch/riscv/thead/c900-legacy/microarch.json | 80 +++++++ + .../arch/x86/cascadelakex/clx-metrics.json | 6 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 6 + + .../arch/x86/sapphirerapids/spr-metrics.json | 6 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 6 + + tools/perf/pmu-events/jevents.py | 2 +- + tools/perf/scripts/python/arm-cs-trace-disasm.py | 4 +- + tools/perf/scripts/python/compaction-times.py | 2 +- + tools/perf/scripts/python/exported-sql-viewer.py | 4 +- + tools/perf/tests/Makefile.tests | 22 ++ + tools/perf/tests/attr.c | 2 +- + tools/perf/tests/builtin-test.c | 15 ++ + tools/perf/tests/code-reading.c | 78 ++----- + tools/perf/tests/make | 2 +- + tools/perf/tests/parse-events.c | 260 +++++++++++++++------ + .../shell/coresight/memcpy_thread/memcpy_thread.c | 1 - + .../shell/coresight/thread_loop/thread_loop.c | 1 - + .../unroll_loop_thread/unroll_loop_thread.c | 1 - + tools/perf/tests/shell/lib/perf_has_symbol.sh | 21 ++ + tools/perf/tests/shell/pipe_test.sh | 9 +- + tools/perf/tests/shell/record.sh | 38 ++- + tools/perf/tests/shell/record_offcpu.sh | 4 +- + tools/perf/tests/shell/stat_all_pmu.sh | 2 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 6 + + tools/perf/tests/shell/test_brstack.sh | 6 + + tools/perf/tests/shell/test_data_symbol.sh | 16 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/workloads/thloop.c | 4 +- + tools/perf/trace/beauty/prctl_option.sh | 4 +- + tools/perf/trace/beauty/socket.sh | 4 +- + tools/perf/ui/browsers/annotate.c | 18 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 247 +++++++++++++------- + tools/perf/util/annotate.h | 58 +++-- + tools/perf/util/auxtrace.c | 3 + + tools/perf/util/auxtrace.h | 3 + + tools/perf/util/block-info.c | 4 +- + tools/perf/util/block-range.c | 7 +- + tools/perf/util/bpf-event.c | 3 + + tools/perf/util/compress.h | 7 +- + tools/perf/util/cs-etm.c | 21 +- + tools/perf/util/debuginfo.c | 205 ++++++++++++++++ + tools/perf/util/debuginfo.h | 64 +++++ + tools/perf/util/dwarf-aux.c | 211 ++++++++++++++++- + tools/perf/util/dwarf-aux.h | 48 +++- + tools/perf/util/env.c | 18 ++ + tools/perf/util/env.h | 7 + + tools/perf/util/event.c | 4 +- + tools/perf/util/evsel.c | 35 ++- + tools/perf/util/evsel.h | 1 + + tools/perf/util/header.c | 30 ++- + tools/perf/util/machine.c | 10 +- + tools/perf/util/mmap.c | 5 +- + tools/perf/util/mmap.h | 1 - + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/parse-events.c | 52 +++-- + tools/perf/util/perf_event_attr_fprintf.c | 1 + + tools/perf/util/pmu.c | 8 +- + tools/perf/util/pmu.h | 3 +- + tools/perf/util/probe-finder.c | 201 +--------------- + tools/perf/util/probe-finder.h | 19 +- + tools/perf/util/s390-cpumcf-kernel.h | 2 + + tools/perf/util/s390-sample-raw.c | 118 +++++++++- + tools/perf/util/sample.h | 1 + + .../perf/util/scripting-engines/trace-event-perl.c | 3 + + .../util/scripting-engines/trace-event-python.c | 17 +- + tools/perf/util/session.c | 20 +- + tools/perf/util/sort.c | 14 +- + tools/perf/util/symbol_conf.h | 4 +- + tools/perf/util/thread.h | 14 ++ + tools/perf/util/zstd.c | 63 ++--- + 97 files changed, 2184 insertions(+), 608 deletions(-) + create mode 100644 tools/build/feature/test-dwarf_getcfi.c + create mode 100644 tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/common.json + create mode 100644 tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/thead/c900-legacy/cache.json + create mode 100644 tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/thead/c900-legacy/instruction.json + create mode 100644 tools/perf/pmu-events/arch/riscv/thead/c900-legacy/microarch.json + create mode 100644 tools/perf/tests/Makefile.tests + create mode 100644 tools/perf/tests/shell/lib/perf_has_symbol.sh + create mode 100644 tools/perf/util/debuginfo.c + create mode 100644 tools/perf/util/debuginfo.h +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 (53c87e846e33 swiotlb: fix out-of-bounds TLB allocations with CONFIG_SWIOTLB_DYNAMIC) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (0734f5c7eb15 Merge branch 'asm-generic-prototypes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + Documentation/driver-api/device-io.rst | 9 ++- + arch/alpha/include/asm/io.h | 7 -- + arch/alpha/include/asm/mmu_context.h | 2 + + arch/alpha/kernel/asm-offsets.c | 2 +- + arch/alpha/kernel/traps.c | 1 + + arch/arm/include/asm/io.h | 6 -- + arch/arm/include/asm/irq_work.h | 2 - + arch/arm/include/asm/vdso.h | 5 -- + arch/arm/vdso/vgettimeofday.c | 1 + + arch/arm64/include/asm/irq_work.h | 2 - + arch/arm64/kernel/vdso32/vgettimeofday.c | 2 + + arch/csky/include/asm/ftrace.h | 4 + + arch/csky/include/asm/irq_work.h | 2 +- + arch/csky/include/asm/jump_label.h | 5 ++ + arch/csky/include/asm/traps.h | 2 +- + arch/csky/kernel/traps.c | 1 + + arch/csky/kernel/vdso/vgettimeofday.c | 11 +-- + arch/hexagon/include/asm/io.h | 9 --- + arch/hexagon/include/uapi/asm/user.h | 7 +- + arch/hexagon/kernel/ptrace.c | 7 +- + arch/loongarch/kernel/asm-offsets.c | 26 +++---- + arch/loongarch/vdso/vgettimeofday.c | 7 +- + arch/m68k/coldfire/vectors.c | 3 +- + arch/m68k/coldfire/vectors.h | 3 - + arch/m68k/include/asm/io_mm.h | 6 -- + arch/m68k/include/asm/kmap.h | 1 - + arch/microblaze/include/asm/ftrace.h | 1 + + arch/microblaze/kernel/traps.c | 1 + + arch/mips/include/asm/ftrace.h | 4 + + arch/mips/include/asm/io.h | 126 +++++++++++++++++-------------- + arch/mips/include/asm/mmiowb.h | 4 +- + arch/mips/include/asm/smp-ops.h | 2 - + arch/mips/include/asm/smp.h | 4 +- + arch/mips/include/asm/traps.h | 3 + + arch/mips/kernel/setup.c | 1 + + arch/mips/pci/pci-ip27.c | 3 + + arch/mips/vdso/vgettimeofday.c | 1 + + arch/nios2/include/asm/traps.h | 2 + + arch/parisc/include/asm/io.h | 8 -- + arch/powerpc/include/asm/io.h | 7 -- + arch/powerpc/include/asm/irq_work.h | 1 - + arch/riscv/include/asm/irq_work.h | 2 +- + arch/riscv/kernel/vdso/vgettimeofday.c | 7 +- + arch/s390/include/asm/irq_work.h | 2 - + arch/sh/include/asm/io.h | 9 --- + arch/sh/include/asm/traps_32.h | 3 + + arch/sparc/include/asm/io_64.h | 7 -- + arch/sparc/kernel/asm-offsets.c | 6 +- + arch/sparc/kernel/traps_32.c | 1 + + arch/sparc/kernel/traps_64.c | 1 + + arch/x86/entry/vdso/vclock_gettime.c | 10 +-- + arch/x86/include/asm/irq_work.h | 1 - + arch/x86/include/asm/traps.h | 1 - + arch/x86/include/asm/vdso/gettimeofday.h | 2 - + arch/x86/kernel/traps.c | 1 + + include/linux/irq_work.h | 3 + + include/vdso/gettime.h | 23 ++++++ + scripts/headers_install.sh | 1 - + 58 files changed, 172 insertions(+), 209 deletions(-) + delete mode 100644 arch/m68k/coldfire/vectors.h + create mode 100644 include/vdso/gettime.h +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (c7368ddba2ff ARM: 9326/1: make <linux/uaccess.h> self-contained for ARM) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Already up to date. +Merging arm64/for-next/core (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (3a5038e9c055 Merge branch 'v6.8/drivers' 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. + .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 33 ++++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 6 ++++ + .../meson-axg-jethome-jethub-j110-rev-2.dts | 14 ++++++++- + .../meson-axg-jethome-jethub-j110-rev-3.dts | 12 ++++++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 23 +++++++++++++++ + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++ + drivers/firmware/meson/meson_sm.c | 19 ++++++------- + 9 files changed, 103 insertions(+), 14 deletions(-) +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 (e9be9b34b841 ARM: dts: aspeed: Add ASRock E3C256D4I BMC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 316 ++++++++++++++++++++ + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 318 +++++++++++++++++++++ + 4 files changed, 638 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts +Merging at91/at91-next (b766b70117ac Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/microchip/at91-sam9x60_curiosity.dts | 3 +++ + arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 3 +++ + arch/arm/mach-at91/pm.c | 3 +++ + 3 files changed, 9 insertions(+) +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 (0d6c918011ce memory: tegra: Skip SID programming if SID registers aren't set) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/tegra/tegra186.c | 17 +++++++++++++++++ + include/soc/tegra/mc.h | 1 + + 2 files changed, 18 insertions(+) +Merging imx-mxs/for-next (258bebe27695 Merge branch 'imx/dt64' 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. + .../dts/nxp/imx/imx6q-skov-reve-mi1010ait-1cp1.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx7d.dtsi | 3 - + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 19 +- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 40 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 30 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 9 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 + + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 92 +++ + .../boot/dts/freescale/imx8mp-debix-som-a.dtsi | 22 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 12 + + .../imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso | 77 +++ + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 10 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 2 - + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 24 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 31 +- + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 709 +++++++++++++++++++++ + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 3 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 100 ++- + drivers/bus/imx-weim.c | 9 +- + 24 files changed, 1158 insertions(+), 67 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts +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 (a89ef75a0104 Merge branch 'renesas-dts-for-v6.8' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/renesas/iwg20d-q7-dbcm-ca.dtsi | 15 +++++ + .../boot/dts/renesas/r8a7740-armadillo800eva.dts | 28 +++++++++- + arch/arm/boot/dts/renesas/r8a7740.dtsi | 65 ++++++++++++++++++++++ + .../dts/renesas/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 15 +++++ + .../arm/boot/dts/renesas/r8a7745-iwg22d-sodimm.dts | 4 +- + arch/arm/boot/dts/renesas/r8a7779-marzen.dts | 48 +++++++++++++--- + arch/arm/boot/dts/renesas/r8a7790-lager.dts | 23 ++++++-- + arch/arm/boot/dts/renesas/r8a7790-stout.dts | 15 +++++ + arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 30 +++++++++- + arch/arm/boot/dts/renesas/r8a7791-porter.dts | 26 ++++++++- + arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 49 ++++++++++++++++ + arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 21 +++++++ + arch/arm/boot/dts/renesas/r8a7793-gose.dts | 28 +++++++++- + arch/arm/boot/dts/renesas/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/renesas/r8a7794-silk.dts | 17 +++++- + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 6 +- + arch/arm64/boot/dts/renesas/draak.dtsi | 32 ++++++----- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 6 ++ + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 15 +++++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 2 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 1 + + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 1 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 49 ++++++++++++++++ + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 65 ++++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 ++ + 28 files changed, 531 insertions(+), 42 deletions(-) +Merging reset/reset/next (e4916e791fb6 dt-bindings: reset: imx-src: Simplify compatible schema and drop unneeded quotes) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../devicetree/bindings/reset/fsl,imx-src.yaml | 31 ++---- + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 10 +- + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 8 +- + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 2 +- + drivers/reset/reset-brcmstb.c | 3 +- + drivers/reset/reset-meson-audio-arb.c | 4 +- + drivers/reset/reset-meson.c | 1 + + drivers/reset/reset-npcm.c | 5 +- + drivers/reset/reset-qcom-aoss.c | 4 +- + drivers/reset/reset-qcom-pdc.c | 4 +- + drivers/reset/reset-simple.c | 3 +- + drivers/reset/reset-sunplus.c | 3 +- + drivers/reset/reset-uniphier-glue.c | 3 +- + drivers/reset/sti/reset-syscfg.c | 11 +- + include/dt-bindings/reset/amlogic,c3-reset.h | 119 +++++++++++++++++++++ + 16 files changed, 156 insertions(+), 56 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h +Merging rockchip/for-next (5d1f1f3b9d04 Merge branch 'v6.8-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 25 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm/boot/dts/rockchip/Makefile | 1 + + arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 397 ++++++++++ + arch/arm/boot/dts/rockchip/rk3128.dtsi | 13 +- + arch/arm/boot/dts/rockchip/rk322x.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/px30-ringneck-haikou.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 58 ++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + .../boot/dts/rockchip/rk3566-powkiddy-rgb30.dts | 152 +--- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dts | 38 + + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi | 875 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 97 +++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 8 + + .../arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 8 + + drivers/clk/rockchip/clk-rk3128.c | 24 +- + drivers/clk/rockchip/clk-rk3568.c | 2 + + 22 files changed, 1556 insertions(+), 174 deletions(-) + create mode 100644 arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi +Merging samsung-krzk/for-next (64041620130c Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 6 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 5 + + .../bindings/hwinfo/samsung,exynos-chipid.yaml | 18 ++- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 10 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 22 +-- + .../bindings/iio/adc/samsung,exynos-adc.yaml | 29 ++-- + .../bindings/mfd/samsung,exynos5433-lpass.yaml | 2 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 25 ++-- + .../devicetree/bindings/pwm/pwm-samsung.yaml | 3 + + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 5 + + .../devicetree/bindings/serial/samsung_uart.yaml | 16 ++- + .../bindings/soc/samsung/exynos-pmu.yaml | 7 + + .../bindings/soc/samsung/exynos-usi.yaml | 6 +- + .../soc/samsung/samsung,exynos-sysreg.yaml | 5 + + .../devicetree/bindings/sound/samsung-i2s.yaml | 19 ++- + arch/arm/boot/dts/samsung/exynos4.dtsi | 26 ++-- + arch/arm/boot/dts/samsung/exynos4x12.dtsi | 22 ++- + arch/arm/boot/dts/samsung/s5pv210.dtsi | 18 +-- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 60 +++++--- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 18 +-- + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 45 ++++-- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 40 +++--- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 51 +++++++ + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 10 +- + drivers/clk/samsung/clk-cpu.h | 30 ++-- + drivers/clk/samsung/clk.h | 157 +++++++++++---------- + drivers/soc/samsung/exynos-chipid.c | 1 + + 27 files changed, 427 insertions(+), 229 deletions(-) +Merging scmi/for-linux-next (b419bd935f13 Merge branch 'for-next/scmi/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 70 +++++++++++++++++++++++------------ + drivers/firmware/arm_scmi/clock.c | 2 +- + drivers/firmware/arm_scmi/driver.c | 12 ++++-- + drivers/firmware/arm_scmi/perf.c | 35 ++++++++++++------ + drivers/firmware/arm_scmi/power.c | 2 +- + drivers/firmware/arm_scmi/powercap.c | 2 +- + drivers/firmware/arm_scmi/protocols.h | 3 +- + drivers/firmware/arm_scmi/reset.c | 3 +- + drivers/firmware/arm_scmi/sensors.c | 2 +- + drivers/firmware/arm_scmi/voltage.c | 2 +- + include/linux/arm_ffa.h | 2 + + 11 files changed, 89 insertions(+), 46 deletions(-) +Merging stm32/stm32-next (9a7308232a11 ARM: dts: stm32: add SPI support on STM32F746) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32f469-disco.dts | 15 +++----- + arch/arm/boot/dts/st/stm32f746.dtsi | 61 ++++++++++++++++++++++++++++++++ + 2 files changed, 65 insertions(+), 11 deletions(-) +Merging sunxi/sunxi/for-next (715a9e70bdd4 Merge branch 'sunxi/clk-for-6.8' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 3 - + .../dts/allwinner/sun50i-h616-orangepi-zero2.dts | 3 + + .../dts/allwinner/sun50i-h618-orangepi-zero2w.dts | 176 +++++++++++++++++++++ + .../dts/allwinner/sun50i-h618-orangepi-zero3.dts | 2 + + drivers/clk/sunxi-ng/ccu_nkm.c | 5 +- + 6 files changed, 188 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts +Merging tee/next (352b5f33b950 Merge branch 'ffa_notif_for_v6.8' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-optee-devices | 9 ++ + drivers/firmware/arm_scmi/optee.c | 4 + + drivers/tee/optee/call.c | 163 ++++++++++++++++++++-- + drivers/tee/optee/core.c | 18 +-- + drivers/tee/optee/device.c | 17 ++- + drivers/tee/optee/ffa_abi.c | 107 ++++++++++++-- + drivers/tee/optee/optee_ffa.h | 28 +++- + drivers/tee/optee/optee_private.h | 40 +++++- + drivers/tee/optee/smc_abi.c | 67 ++++----- + drivers/tee/tee_core.c | 8 ++ + include/linux/tee_drv.h | 16 +++ + 11 files changed, 393 insertions(+), 84 deletions(-) +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 (2b27ce85624e Merge branch 'ti-keystone-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. + arch/arm/boot/dts/ti/keystone/keystone-k2e-netcp.dtsi | 6 +++--- + arch/arm/boot/dts/ti/keystone/keystone-k2g-evm.dts | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g-netcp.dtsi | 6 +++--- + arch/arm/boot/dts/ti/keystone/keystone-k2hk-evm.dts | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2hk-netcp.dtsi | 6 +++--- + arch/arm/boot/dts/ti/keystone/keystone-k2l-netcp.dtsi | 6 +++--- + drivers/firmware/ti_sci.c | 10 +++++----- + 7 files changed, 19 insertions(+), 19 deletions(-) +Merging xilinx/for-next (1d4723dec415 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/Makefile | 9 ++++---- + 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/xlnx_event_manager.c | 7 ++++-- + drivers/soc/xilinx/zynqmp_power.c | 14 +++++------- + 11 files changed, 66 insertions(+), 56 deletions(-) +Merging clk/clk-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (5f9e29b9159a clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset()) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 3 +++ + drivers/clk/renesas/rzg2l-cpg.c | 38 +++++++++++++-------------------- + 2 files changed, 18 insertions(+), 23 deletions(-) +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 (c517fd2738f4 Docs/zh_CN/LoongArch: Update links in LoongArch introduction.rst) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (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 (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (ffb0399437ef microblaze: defconfig: Enable the Marvell phy driver) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/configs/mmu_defconfig | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) +Merging mips/mips-next (2cc14f52aeb7 Linux 6.7-rc3) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (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 (487635756198 parisc: Fix asm operand number out of range build error in bug table) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/bug.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging powerpc/next (0d555b57ee66 powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig.debug | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/include/asm/ps3.h | 6 ++ + arch/powerpc/include/asm/reg_a2.h | 154 --------------------------- + arch/powerpc/include/asm/rtas.h | 63 +++++------ + arch/powerpc/kernel/cputable.c | 4 +- + arch/powerpc/kernel/exceptions-64e.S | 1 - + arch/powerpc/kernel/rtas.c | 23 ++-- + arch/powerpc/kernel/udbg_16550.c | 1 - + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/sstep.c | 14 ++- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/ps3/Kconfig | 12 --- + arch/powerpc/platforms/ps3/Makefile | 2 +- + arch/powerpc/platforms/ps3/gelic_udbg.c | 1 + + arch/powerpc/platforms/pseries/pseries.h | 1 + + arch/powerpc/platforms/pseries/suspend.c | 1 + + arch/powerpc/sysdev/grackle.c | 19 ---- + arch/powerpc/sysdev/xics/icp-native.c | 2 + + drivers/misc/ocxl/afu_irq.c | 2 +- + drivers/misc/ocxl/context.c | 2 +- + drivers/misc/ocxl/link.c | 14 +-- + drivers/misc/ocxl/main.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 6 -- + 25 files changed, 79 insertions(+), 261 deletions(-) + delete mode 100644 arch/powerpc/include/asm/reg_a2.h +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 (3ca112b71f35 Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (94f4018bc9f3 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/cache/sifive,ccache0.yaml | 6 ++- + MAINTAINERS | 14 ++--- + drivers/cache/Kconfig | 6 +++ + drivers/cache/Makefile | 3 +- + drivers/{soc/sifive => cache}/sifive_ccache.c | 62 +++++++++++++++++++++- + drivers/soc/Kconfig | 1 - + drivers/soc/Makefile | 1 - + drivers/soc/sifive/Kconfig | 10 ---- + drivers/soc/sifive/Makefile | 3 -- + 9 files changed, 80 insertions(+), 26 deletions(-) + rename drivers/{soc/sifive => cache}/sifive_ccache.c (81%) + delete mode 100644 drivers/soc/sifive/Kconfig + delete mode 100644 drivers/soc/sifive/Makefile +Merging s390/for-next (e9304ad4e23b Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. + arch/s390/boot/ipl_parm.c | 2 +- + arch/s390/boot/startup.c | 3 ++- + arch/s390/include/asm/sysinfo.h | 4 ++++ + arch/s390/kernel/sysinfo.c | 10 ++++++++++ + 4 files changed, 17 insertions(+), 2 deletions(-) +Merging sh/for-next (b85ea95d0864 Linux 6.7-rc1) +$ 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 (8e0964b74d32 bcachefs: Improve trace_trans_restart_would_deadlock) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging drivers/md/bcache/btree.c +Auto-merging drivers/md/bcache/super.c +Auto-merging drivers/md/bcache/writeback.c +Auto-merging fs/bcachefs/fs.c +Merge made by the 'ort' strategy. + arch/powerpc/kernel/firmware.c | 2 + + drivers/md/bcache/btree.c | 14 +- + drivers/md/bcache/journal.c | 20 +-- + drivers/md/bcache/movinggc.c | 16 +-- + drivers/md/bcache/request.c | 74 +++++------ + drivers/md/bcache/request.h | 2 +- + drivers/md/bcache/super.c | 40 +++--- + drivers/md/bcache/writeback.c | 16 +-- + fs/bcachefs/Kconfig | 22 ++++ + fs/bcachefs/Makefile | 1 + + fs/bcachefs/alloc_background.c | 183 ++++++++++++++------------ + fs/bcachefs/alloc_background.h | 23 +++- + fs/bcachefs/alloc_foreground.c | 30 +++++ + fs/bcachefs/backpointers.c | 133 ++++++++++--------- + fs/bcachefs/backpointers.h | 27 ++-- + fs/bcachefs/bcachefs.h | 73 ++++++----- + fs/bcachefs/bcachefs_format.h | 29 ++-- + fs/bcachefs/bcachefs_ioctl.h | 35 ++++- + fs/bcachefs/bkey_methods.h | 2 - + fs/bcachefs/btree_gc.c | 29 ++-- + fs/bcachefs/btree_io.c | 13 +- + fs/bcachefs/btree_iter.c | 174 ++++++------------------ + fs/bcachefs/btree_iter.h | 36 +++-- + fs/bcachefs/btree_journal_iter.c | 39 +++++- + fs/bcachefs/btree_journal_iter.h | 10 +- + fs/bcachefs/btree_key_cache.c | 29 ++-- + fs/bcachefs/btree_locking.c | 29 +++- + fs/bcachefs/btree_trans_commit.c | 87 ++++++------ + fs/bcachefs/btree_types.h | 36 +++-- + fs/bcachefs/btree_update.c | 57 +------- + fs/bcachefs/btree_update.h | 54 ++++---- + fs/bcachefs/btree_update_interior.c | 63 +++++---- + fs/bcachefs/btree_write_buffer.c | 123 ++++++++++------- + fs/bcachefs/btree_write_buffer.h | 5 +- + fs/bcachefs/buckets.c | 148 ++++++++++----------- + fs/bcachefs/buckets.h | 4 + + fs/bcachefs/buckets_types.h | 2 - + fs/bcachefs/chardev.c | 92 ++++++++++--- + fs/bcachefs/clock.c | 3 +- + fs/bcachefs/compress.c | 16 ++- + fs/bcachefs/darray.c | 23 ++++ + fs/bcachefs/darray.h | 34 +++-- + fs/bcachefs/data_update.c | 112 ++++++++++++++-- + fs/bcachefs/data_update.h | 9 +- + fs/bcachefs/dirent.c | 5 +- + fs/bcachefs/dirent.h | 3 +- + fs/bcachefs/ec.c | 14 +- + fs/bcachefs/ec_types.h | 2 +- + fs/bcachefs/errcode.h | 4 +- + fs/bcachefs/error.c | 18 +-- + fs/bcachefs/extents.c | 30 ++--- + fs/bcachefs/fs-io-buffered.c | 2 +- + fs/bcachefs/fs-io-direct.c | 8 +- + fs/bcachefs/fs-io.c | 6 +- + fs/bcachefs/fs.c | 9 +- + fs/bcachefs/fs.h | 9 +- + fs/bcachefs/fsck.c | 115 +++++++++------- + fs/bcachefs/inode.c | 22 ++-- + fs/bcachefs/io_misc.c | 12 +- + fs/bcachefs/io_read.c | 4 +- + fs/bcachefs/io_write.c | 20 +-- + fs/bcachefs/io_write.h | 3 +- + fs/bcachefs/journal.c | 42 +++--- + fs/bcachefs/journal.h | 5 +- + fs/bcachefs/journal_io.c | 38 ++++-- + fs/bcachefs/journal_io.h | 2 +- + fs/bcachefs/journal_reclaim.c | 89 +++++++++---- + fs/bcachefs/journal_reclaim.h | 15 +-- + fs/bcachefs/journal_seq_blacklist.c | 2 +- + fs/bcachefs/journal_types.h | 8 +- + fs/bcachefs/logged_ops.c | 4 +- + fs/bcachefs/lru.c | 2 +- + fs/bcachefs/migrate.c | 2 +- + fs/bcachefs/move.c | 255 +++++++++++++++++------------------- + fs/bcachefs/move.h | 23 +++- + fs/bcachefs/movinggc.c | 9 +- + fs/bcachefs/rebalance.c | 20 ++- + fs/bcachefs/recovery.c | 167 ++++++++++++++--------- + fs/bcachefs/reflink.c | 2 +- + fs/bcachefs/replicas.c | 127 +++++++++--------- + fs/bcachefs/replicas.h | 22 ++-- + fs/bcachefs/replicas_types.h | 4 +- + fs/bcachefs/sb-clean.c | 3 +- + fs/bcachefs/sb-errors.h | 3 +- + fs/bcachefs/sb-members.c | 5 + + fs/bcachefs/six.c | 119 +++++------------ + fs/bcachefs/six.h | 7 - + fs/bcachefs/snapshot.c | 20 +-- + fs/bcachefs/str_hash.h | 25 +++- + fs/bcachefs/subvolume.c | 6 +- + fs/bcachefs/super-io.c | 36 ++++- + fs/bcachefs/super-io.h | 1 + + fs/bcachefs/super.c | 104 +++++++++------ + fs/bcachefs/super.h | 6 +- + fs/bcachefs/super_types.h | 1 + + fs/bcachefs/sysfs.c | 152 +++++++++++---------- + fs/bcachefs/trace.h | 150 ++++++++++++++++----- + fs/bcachefs/util.c | 145 +++++++++++--------- + fs/bcachefs/util.h | 33 ++++- + include/linux/closure.h | 9 +- + kernel/kthread.c | 3 +- + lib/closure.c | 5 +- + 102 files changed, 2223 insertions(+), 1703 deletions(-) + create mode 100644 fs/bcachefs/darray.c +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 (f931faf024dd Merge branch 'for-next-next-v6.7-20231124' into for-next-20231124) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 165 ++- + fs/btrfs/block-group.h | 6 +- + fs/btrfs/compression.c | 118 +- + fs/btrfs/compression.h | 5 + + fs/btrfs/ctree.c | 48 +- + fs/btrfs/ctree.h | 11 +- + fs/btrfs/defrag.c | 3 +- + fs/btrfs/delayed-inode.c | 45 +- + fs/btrfs/dev-replace.c | 28 +- + fs/btrfs/disk-io.c | 122 +- + fs/btrfs/disk-io.h | 3 - + fs/btrfs/extent-io-tree.c | 121 +- + fs/btrfs/extent-io-tree.h | 18 +- + fs/btrfs/extent-tree.c | 112 +- + fs/btrfs/extent_io.c | 174 ++- + fs/btrfs/extent_io.h | 16 +- + fs/btrfs/extent_map.c | 56 +- + fs/btrfs/extent_map.h | 13 - + fs/btrfs/file.c | 4 +- + fs/btrfs/fs.h | 18 +- + fs/btrfs/inode.c | 50 +- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/messages.c | 2 +- + fs/btrfs/messages.h | 2 +- + fs/btrfs/ordered-data.h | 7 - + fs/btrfs/raid56.c | 1 - + fs/btrfs/raid56.h | 2 +- + fs/btrfs/scrub.c | 53 +- + fs/btrfs/subpage.c | 94 +- + fs/btrfs/super.c | 2353 +++++++++++++++++++------------------ + fs/btrfs/super.h | 5 +- + fs/btrfs/tests/btrfs-tests.c | 5 +- + fs/btrfs/tests/btrfs-tests.h | 1 + + fs/btrfs/tests/extent-map-tests.c | 40 +- + fs/btrfs/tree-log.c | 1 - + fs/btrfs/volumes.c | 540 +++++---- + fs/btrfs/volumes.h | 45 +- + fs/btrfs/zlib.c | 6 +- + fs/btrfs/zoned.c | 67 +- + fs/btrfs/zoned.h | 11 +- + fs/btrfs/zstd.c | 7 +- + fs/namespace.c | 11 + + include/trace/events/btrfs.h | 59 +- + 43 files changed, 2362 insertions(+), 2090 deletions(-) +Merging ceph/master (d30d7c57a64d ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/Kconfig | 1 + + fs/ceph/caps.c | 9 +++------ + include/linux/ceph/osd_client.h | 3 ++- + net/ceph/osd_client.c | 32 ++++++++++++++++++-------------- + 4 files changed, 24 insertions(+), 21 deletions(-) +Merging cifs/for-next (d00273876059 smb: client: cleanup smb2_query_reparse_point()) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/smb/client/file.c +Merge made by the 'ort' strategy. + fs/smb/client/cifsfs.c | 7 +- + fs/smb/client/cifsglob.h | 47 ++- + fs/smb/client/cifsproto.h | 30 +- + fs/smb/client/cifssmb.c | 17 +- + fs/smb/client/dir.c | 7 +- + fs/smb/client/file.c | 10 +- + fs/smb/client/inode.c | 87 ++-- + fs/smb/client/link.c | 29 +- + fs/smb/client/smb2glob.h | 26 +- + fs/smb/client/smb2inode.c | 1027 +++++++++++++++++++++++++++------------------ + fs/smb/client/smb2ops.c | 297 ++++++------- + fs/smb/client/smb2proto.h | 29 +- + fs/smb/client/trace.h | 7 +- + 13 files changed, 977 insertions(+), 643 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 +Already up to date. +Merging ext3/for_next (8abc712ea486 ext2: Fix ki_pos update for DIO buffered-io fallback case) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/file.c | 1 - + 1 file changed, 1 deletion(-) +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 (6bc40e44f1dd Merge tag 'ovl-fixes-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs) +$ 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 (18437366a3a1 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 | 81 ++++++++++++++++++++++++++++++++--- + include/uapi/linux/fuse.h | 10 +++-- + 5 files changed, 103 insertions(+), 16 deletions(-) +Merging gfs2/for-next (8d859dc44163 gfs2: Fix inode_go_instantiate description) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/dentry.c | 6 ++---- + fs/gfs2/glock.c | 39 ++++++++++++++++++++++++++++++++++++++- + fs/gfs2/glock.h | 1 + + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 8 ++++---- + 5 files changed, 46 insertions(+), 10 deletions(-) +Merging jfs/jfs-next (cca974daeb6c 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 +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 (df60cee26a2e Merge tag '6.7-rc3-smb3-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (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 +Already up to date. +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 (1ec134cfd5e2 svcrdma: Clean up locking) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + fs/nfsd/Kconfig | 16 +++++ + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfs4proc.c | 7 ++- + fs/nfsd/nfs4recover.c | 97 +++++++++++++++++++----------- + fs/nfsd/nfs4xdr.c | 13 ++-- + fs/nfsd/nfscache.c | 6 +- + fs/nfsd/nfsctl.c | 6 ++ + fs/nfsd/nfssvc.c | 7 +-- + fs/nfsd/trace.h | 22 ------- + fs/nfsd/vfs.c | 46 ++++++++++++-- + fs/nfsd/vfs.h | 1 + + fs/nfsd/xdr4.h | 1 + + include/linux/sunrpc/svc.h | 2 - + include/linux/sunrpc/svc_rdma.h | 6 +- + include/linux/sunrpc/svcauth.h | 7 ++- + include/trace/events/sunrpc.h | 1 - + net/sunrpc/auth_gss/svcauth_gss.c | 16 ++--- + net/sunrpc/svc.c | 2 - + net/sunrpc/svcauth.c | 16 +++++ + net/sunrpc/xprtrdma/svc_rdma.c | 32 +++++++--- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 11 ++-- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 32 ++++++---- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 12 +++- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 69 +++++++++++++-------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + + 25 files changed, 285 insertions(+), 146 deletions(-) +Merging ntfs3/master (ffc253263a13 Linux 6.6) +$ 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 (2c3ef4f89ced ovl: initialize ovl_copy_up_ctx.destname inside ovl_do_copy_up()) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 8 +++++++- + fs/overlayfs/export.c | 4 ++-- + fs/overlayfs/namei.c | 4 ++-- + fs/overlayfs/ovl_entry.h | 5 +---- + fs/overlayfs/params.c | 2 -- + fs/overlayfs/readdir.c | 2 +- + fs/overlayfs/super.c | 19 ++++++++----------- + fs/overlayfs/util.c | 2 +- + 8 files changed, 22 insertions(+), 24 deletions(-) +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 (9c235dfc3d3f xfs: dquot recovery does not validate the recovered dquot) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (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 (1633874f3b87 Merge branch 'vfs.fscache' 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 drivers/vhost/vdpa.c +Auto-merging drivers/xen/privcmd.c +Auto-merging fs/bcachefs/super-io.c +Auto-merging fs/bcachefs/super_types.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/subpage.c +CONFLICT (content): Merge conflict in fs/btrfs/subpage.c +Auto-merging fs/btrfs/super.c +CONFLICT (content): Merge conflict in fs/btrfs/super.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging include/linux/fs.h +Auto-merging mm/hugetlb.c +Auto-merging mm/memcontrol.c +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/btrfs/subpage.c' using previous resolution. +Resolved 'fs/btrfs/super.c' using previous resolution. +Resolved 'fs/buffer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 85674938e00f] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 12 + + MAINTAINERS | 20 +- + arch/alpha/kernel/syscalls/syscall.tbl | 2 + + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/include/asm/unistd32.h | 4 + + arch/m68k/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 + + arch/parisc/kernel/syscalls/syscall.tbl | 2 + + arch/powerpc/kernel/syscalls/syscall.tbl | 2 + + arch/s390/kernel/syscalls/syscall.tbl | 2 + + arch/sh/kernel/syscalls/syscall.tbl | 2 + + arch/sparc/kernel/syscalls/syscall.tbl | 2 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/xen.c | 2 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + block/Kconfig | 20 + + block/bdev.c | 256 +++++++----- + drivers/accel/habanalabs/common/device.c | 2 +- + drivers/block/loop.c | 2 - + drivers/fpga/dfl.c | 2 +- + drivers/gpu/drm/drm_syncobj.c | 6 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 13 +- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/md/dm.c | 4 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/s390/cio/vfio_ccw_chp.c | 2 +- + drivers/s390/cio/vfio_ccw_drv.c | 4 +- + drivers/s390/cio/vfio_ccw_ops.c | 6 +- + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 6 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 6 +- + drivers/vfio/pci/vfio_pci_intrs.c | 12 +- + drivers/vfio/platform/vfio_platform_irq.c | 4 +- + drivers/vhost/vdpa.c | 4 +- + drivers/vhost/vhost.c | 10 +- + drivers/vhost/vhost.h | 2 +- + drivers/virt/acrn/ioeventfd.c | 2 +- + drivers/xen/privcmd.c | 2 +- + fs/aio.c | 85 +++- + fs/bcachefs/fs-ioctl.c | 4 +- + fs/bcachefs/super-io.c | 19 +- + fs/bcachefs/super_types.h | 1 + + fs/btrfs/extent_io.c | 52 +-- + fs/btrfs/ioctl.c | 12 +- + fs/btrfs/subpage.c | 4 +- + fs/buffer.c | 108 ++--- + fs/cachefiles/daemon.c | 15 +- + fs/cachefiles/interface.c | 7 +- + fs/cachefiles/internal.h | 59 ++- + fs/cachefiles/io.c | 5 +- + fs/cachefiles/ondemand.c | 166 ++++++-- + fs/coda/file.c | 2 - + fs/dax.c | 2 +- + fs/direct-io.c | 2 +- + fs/eventfd.c | 42 +- + fs/ext4/inode.c | 4 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 8 +- + fs/f2fs/file.c | 4 +- + fs/file.c | 53 ++- + fs/file_table.c | 16 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 8 +- + fs/internal.h | 3 +- + fs/mnt_idmapping.c | 159 ++++--- + fs/mount.h | 27 +- + fs/namei.c | 9 +- + fs/namespace.c | 618 +++++++++++++++++++++++----- + fs/nfs/write.c | 12 +- + fs/nfsd/vfs.c | 7 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/super.c | 8 - + fs/ntfs/aops.c | 10 +- + fs/open.c | 3 +- + fs/overlayfs/copy_up.c | 26 +- + fs/overlayfs/file.c | 10 +- + fs/pipe.c | 17 +- + fs/pnode.c | 2 +- + fs/proc_namespace.c | 13 +- + fs/read_write.c | 170 +++++--- + fs/remap_range.c | 37 +- + fs/splice.c | 82 ++-- + fs/stat.c | 9 +- + fs/super.c | 498 ++++++++++++---------- + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_super.c | 24 +- + include/linux/blk_types.h | 8 +- + include/linux/blkdev.h | 29 +- + include/linux/eventfd.h | 17 +- + include/linux/fdtable.h | 15 +- + include/linux/fs.h | 94 ++++- + include/linux/mnt_idmapping.h | 3 - + include/linux/mount.h | 5 +- + include/linux/syscalls.h | 8 + + include/linux/uidgid.h | 13 + + include/linux/writeback.h | 1 - + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/mount.h | 62 +++ + include/uapi/linux/stat.h | 1 + + io_uring/io_uring.c | 4 +- + kernel/user_namespace.c | 20 +- + mm/hugetlb.c | 2 +- + mm/memcontrol.c | 10 +- + mm/migrate.c | 6 +- + mm/vmpressure.c | 2 +- + samples/vfio-mdev/mtty.c | 4 +- + virt/kvm/eventfd.c | 4 +- + 116 files changed, 2130 insertions(+), 1075 deletions(-) +Merging vfs/for-next (bbe6a7c899e7 bch2_ioctl_subvolume_destroy(): fix locking) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/bcachefs/fs-ioctl.c +Auto-merging fs/namei.c +Merge made by the 'ort' strategy. + fs/bcachefs/fs-ioctl.c | 31 +++++++++++++++++-------------- + fs/namei.c | 16 +++++++++++++--- + include/linux/namei.h | 1 + + 3 files changed, 31 insertions(+), 17 deletions(-) +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 (b85ea95d0864 Linux 6.7-rc1) +$ 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 (1d49dee6b691 pstore/ram: Fix crash when setting number of cpus to an odd number) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/ram.c | 1 + + 1 file changed, 1 insertion(+) +Merging hid/for-next (8674f6b6cdba Merge branch 'for-6.7/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. + drivers/hid/Kconfig | 9 ++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-mcp2200.c | 392 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-mcp2221.c | 72 ++++++--- + 5 files changed, 453 insertions(+), 22 deletions(-) + create mode 100644 drivers/hid/hid-mcp2200.c +Merging i2c/i2c/for-next (382561d16854 i2c: ocores: Move system PM hooks to the NOIRQ phase) +$ 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 +Already up to date. +Merging i3c/i3c/next (b4da37db3e2c i3c: master: Fix build error) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 12 ++++++-- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 7 +++-- + drivers/i3c/master/mipi-i3c-hci/core.c | 49 +++++++++++++++++++++++++++++++- + drivers/i3c/master/mipi-i3c-hci/dma.c | 4 ++- + drivers/i3c/master/mipi-i3c-hci/hci.h | 1 + + 5 files changed, 66 insertions(+), 7 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (f90313944188 hwmon: (nct6775) Fix fan speed set failure in automatic mode) +$ 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 110 +++++++++++-- + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/mp5990.rst | 84 ++++++++++ + drivers/hwmon/aspeed-pwm-tacho.c | 26 ++- + drivers/hwmon/emc1403.c | 6 +- + drivers/hwmon/ltc2991.c | 20 ++- + drivers/hwmon/max6650.c | 8 +- + drivers/hwmon/nct6775-core.c | 41 +++-- + drivers/hwmon/nct6775-i2c.c | 14 +- + drivers/hwmon/nct6775-platform.c | 26 +-- + drivers/hwmon/nct6775.h | 2 +- + drivers/hwmon/npcm750-pwm-fan.c | 30 +++- + drivers/hwmon/pmbus/Kconfig | 9 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/lm25066.c | 14 +- + drivers/hwmon/pmbus/mp5990.c | 179 +++++++++++++++++++++ + drivers/hwmon/sht4x.c | 3 +- + 18 files changed, 483 insertions(+), 93 deletions(-) + create mode 100644 Documentation/hwmon/mp5990.rst + create mode 100644 drivers/hwmon/pmbus/mp5990.c +Merging jc_docs/docs-next (d254d263f6c8 docs: submitting-patches: improve the base commit explanation) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/arch/x86/boot.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/index.rst | 10 +- + Documentation/arch/x86/boot.rst | 2 +- + Documentation/bpf/btf.rst | 6 +- + Documentation/conf.py | 4 + + Documentation/core-api/dma-api-howto.rst | 2 +- + Documentation/core-api/dma-api.rst | 2 +- + Documentation/crypto/api.rst | 5 +- + Documentation/crypto/index.rst | 5 +- + Documentation/dev-tools/index.rst | 5 +- + Documentation/doc-guide/sphinx.rst | 9 + + Documentation/driver-api/index.rst | 5 +- + Documentation/driver-api/media/index.rst | 7 +- + Documentation/driver-api/mei/index.rst | 7 +- + Documentation/driver-api/pci/index.rst | 5 +- + Documentation/filesystems/vfs.rst | 2 +- + Documentation/input/input_kapi.rst | 5 +- + Documentation/input/input_uapi.rst | 5 +- + Documentation/input/joydev/index.rst | 5 +- + Documentation/livepatch/callbacks.rst | 4 +- + Documentation/misc-devices/index.rst | 5 +- + Documentation/networking/snmp_counter.rst | 16 +- + Documentation/process/development-process.rst | 19 +- + Documentation/process/submitting-patches.rst | 15 +- + Documentation/sphinx-static/custom.css | 9 + + Documentation/sphinx-static/theme_overrides.css | 5 - + Documentation/sphinx/automarkup.py | 20 +- + Documentation/trace/ftrace.rst | 2 +- + .../it_IT/process/development-process.rst | 19 +- + .../sp_SP/process/handling-regressions.rst | 797 +++++++++++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 1 + + .../translations/zh_CN/dev-tools/index.rst | 5 +- + .../zh_CN/dev-tools/testing-overview.rst | 2 +- + .../translations/zh_CN/driver-api/gpio/index.rst | 3 +- + .../translations/zh_CN/driver-api/index.rst | 5 +- + .../zh_CN/process/development-process.rst | 5 +- + Documentation/translations/zh_CN/process/index.rst | 53 +- + .../translations/zh_CN/process/magic-number.rst | 69 +- + .../zh_CN/process/maintainer-pgp-guide.rst | 789 ++++++++++++++++++++ + .../translations/zh_CN/userspace-api/index.rst | 5 +- + Documentation/translations/zh_TW/IRQ.txt | 8 +- + .../translations/zh_TW/admin-guide/README.rst | 2 +- + .../translations/zh_TW/admin-guide/bug-bisect.rst | 2 +- + .../translations/zh_TW/admin-guide/bug-hunting.rst | 2 +- + .../zh_TW/admin-guide/clearing-warn-once.rst | 2 +- + .../translations/zh_TW/admin-guide/cpu-load.rst | 2 +- + .../translations/zh_TW/admin-guide/index.rst | 2 +- + .../translations/zh_TW/admin-guide/init.rst | 2 +- + .../zh_TW/admin-guide/reporting-issues.rst | 2 +- + .../zh_TW/admin-guide/security-bugs.rst | 2 +- + .../zh_TW/admin-guide/tainted-kernels.rst | 2 +- + .../translations/zh_TW/admin-guide/unicode.rst | 2 +- + .../translations/zh_TW/arch/arm64/amu.rst | 2 +- + .../translations/zh_TW/arch/arm64/booting.txt | 4 +- + .../translations/zh_TW/arch/arm64/elf_hwcaps.rst | 2 +- + .../translations/zh_TW/arch/arm64/hugetlbpage.rst | 2 +- + .../translations/zh_TW/arch/arm64/index.rst | 2 +- + .../zh_TW/arch/arm64/legacy_instructions.txt | 4 +- + .../translations/zh_TW/arch/arm64/memory.txt | 4 +- + .../translations/zh_TW/arch/arm64/perf.rst | 2 +- + .../zh_TW/arch/arm64/silicon-errata.txt | 4 +- + .../zh_TW/arch/arm64/tagged-pointers.txt | 4 +- + .../translations/zh_TW/dev-tools/sparse.rst | 10 +- + .../zh_TW/dev-tools/testing-overview.rst | 2 +- + .../translations/zh_TW/disclaimer-zh_TW.rst | 2 +- + .../translations/zh_TW/filesystems/debugfs.rst | 2 +- + .../translations/zh_TW/filesystems/index.rst | 2 +- + .../translations/zh_TW/filesystems/sysfs.txt | 2 +- + .../translations/zh_TW/filesystems/virtiofs.rst | 2 +- + Documentation/translations/zh_TW/gpio.txt | 8 +- + Documentation/translations/zh_TW/index.rst | 2 +- + Documentation/translations/zh_TW/io_ordering.txt | 8 +- + .../translations/zh_TW/process/1.Intro.rst | 2 +- + .../translations/zh_TW/process/2.Process.rst | 2 +- + .../translations/zh_TW/process/3.Early-stage.rst | 2 +- + .../translations/zh_TW/process/4.Coding.rst | 2 +- + .../translations/zh_TW/process/5.Posting.rst | 2 +- + .../translations/zh_TW/process/6.Followthrough.rst | 2 +- + .../zh_TW/process/7.AdvancedTopics.rst | 2 +- + .../translations/zh_TW/process/8.Conclusion.rst | 2 +- + .../process/code-of-conduct-interpretation.rst | 2 +- + .../translations/zh_TW/process/code-of-conduct.rst | 2 +- + .../translations/zh_TW/process/coding-style.rst | 2 +- + .../zh_TW/process/development-process.rst | 6 +- + .../translations/zh_TW/process/email-clients.rst | 2 +- + .../zh_TW/process/embargoed-hardware-issues.rst | 2 +- + Documentation/translations/zh_TW/process/howto.rst | 2 +- + Documentation/translations/zh_TW/process/index.rst | 2 +- + .../zh_TW/process/kernel-driver-statement.rst | 2 +- + .../zh_TW/process/kernel-enforcement-statement.rst | 2 +- + .../translations/zh_TW/process/license-rules.rst | 2 +- + .../translations/zh_TW/process/magic-number.rst | 2 +- + .../zh_TW/process/management-style.rst | 2 +- + .../zh_TW/process/programming-language.rst | 2 +- + .../zh_TW/process/stable-api-nonsense.rst | 2 +- + .../zh_TW/process/stable-kernel-rules.rst | 2 +- + .../zh_TW/process/submit-checklist.rst | 2 +- + .../zh_TW/process/submitting-patches.rst | 2 +- + .../zh_TW/process/volatile-considered-harmful.rst | 2 +- + Documentation/userspace-api/index.rst | 5 +- + Documentation/userspace-api/media/cec/cec-api.rst | 7 +- + .../userspace-api/media/drivers/index.rst | 7 +- + Documentation/userspace-api/media/dvb/dvbapi.rst | 7 +- + Documentation/userspace-api/media/index.rst | 7 +- + .../media/mediactl/media-controller.rst | 7 +- + .../userspace-api/media/rc/remote_controllers.rst | 7 +- + Documentation/userspace-api/media/v4l/v4l2.rst | 7 +- + MAINTAINERS | 2 +- + 107 files changed, 1863 insertions(+), 290 deletions(-) + create mode 100644 Documentation/translations/sp_SP/process/handling-regressions.rst + create mode 100644 Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst +Merging v4l-dvb/master (a00b3f296eac media: mediatek: vcodec: Set the supported vp9 profile for each platform) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/platform/renesas/vsp1/vsp1_rwpf.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/starfive_camss.rst | 72 + + .../admin-guide/media/starfive_camss_graph.dot | 12 + + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + .../devicetree/bindings/media/cnm,wave521c.yaml | 61 + + .../bindings/media/starfive,jh7110-camss.yaml | 180 ++ + Documentation/driver-api/media/v4l2-subdev.rst | 4 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 8 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 8 + + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 1 + + MAINTAINERS | 19 +- + drivers/input/touchscreen/sur40.c | 5 +- + drivers/media/cec/core/cec-adap.c | 54 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 + + drivers/media/common/videobuf2/videobuf2-core.c | 489 ++-- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 87 +- + drivers/media/dvb-core/dvb_vb2.c | 19 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- + drivers/media/i2c/adv7180.c | 4 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 6 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 2 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 6 +- + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/ar0521.c | 5 +- + drivers/media/i2c/ccs/ccs-core.c | 27 +- + drivers/media/i2c/ccs/ccs.h | 1 + + drivers/media/i2c/ds90ub913.c | 3 +- + drivers/media/i2c/ds90ub953.c | 3 +- + drivers/media/i2c/ds90ub960.c | 12 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 3 +- + drivers/media/i2c/hi556.c | 13 +- + drivers/media/i2c/hi846.c | 11 +- + drivers/media/i2c/hi847.c | 9 +- + drivers/media/i2c/imx208.c | 9 +- + drivers/media/i2c/imx214.c | 4 +- + drivers/media/i2c/imx219.c | 12 +- + drivers/media/i2c/imx258.c | 9 +- + drivers/media/i2c/imx274.c | 12 +- + drivers/media/i2c/imx290.c | 8 +- + drivers/media/i2c/imx296.c | 18 +- + drivers/media/i2c/imx319.c | 7 +- + drivers/media/i2c/imx334.c | 12 +- + drivers/media/i2c/imx335.c | 12 +- + drivers/media/i2c/imx355.c | 7 +- + drivers/media/i2c/imx412.c | 12 +- + drivers/media/i2c/imx415.c | 6 +- + drivers/media/i2c/isl7998x.c | 6 +- + drivers/media/i2c/max9286.c | 4 +- + drivers/media/i2c/mt9m001.c | 6 +- + drivers/media/i2c/mt9m111.c | 6 +- + drivers/media/i2c/mt9m114.c | 58 +- + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9t112.c | 2 +- + drivers/media/i2c/mt9v011.c | 2 +- + drivers/media/i2c/mt9v032.c | 10 +- + drivers/media/i2c/mt9v111.c | 4 +- + drivers/media/i2c/og01a1b.c | 10 +- + drivers/media/i2c/ov01a10.c | 2 +- + drivers/media/i2c/ov02a10.c | 6 +- + drivers/media/i2c/ov08d10.c | 9 +- + drivers/media/i2c/ov08x40.c | 7 +- + drivers/media/i2c/ov13858.c | 10 +- + drivers/media/i2c/ov13b10.c | 10 +- + drivers/media/i2c/ov2640.c | 6 +- + drivers/media/i2c/ov2659.c | 6 +- + drivers/media/i2c/ov2680.c | 10 +- + drivers/media/i2c/ov2685.c | 4 +- + drivers/media/i2c/ov2740.c | 4 +- + drivers/media/i2c/ov4689.c | 2 +- + drivers/media/i2c/ov5640.c | 9 +- + drivers/media/i2c/ov5645.c | 4 +- + drivers/media/i2c/ov5647.c | 12 +- + drivers/media/i2c/ov5648.c | 6 +- + drivers/media/i2c/ov5670.c | 13 +- + drivers/media/i2c/ov5675.c | 9 +- + drivers/media/i2c/ov5693.c | 4 +- + drivers/media/i2c/ov5695.c | 8 +- + drivers/media/i2c/ov6650.c | 34 +- + drivers/media/i2c/ov7251.c | 4 +- + drivers/media/i2c/ov7670.c | 7 +- + drivers/media/i2c/ov772x.c | 2 +- + drivers/media/i2c/ov7740.c | 7 +- + drivers/media/i2c/ov8856.c | 9 +- + drivers/media/i2c/ov8858.c | 6 +- + drivers/media/i2c/ov8865.c | 8 +- + drivers/media/i2c/ov9282.c | 14 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/ov9650.c | 7 +- + drivers/media/i2c/ov9734.c | 9 +- + drivers/media/i2c/rj54n1cb0c.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 37 +- + drivers/media/i2c/s5k5baf.c | 35 +- + drivers/media/i2c/s5k6a3.c | 8 +- + drivers/media/i2c/saa6752hs.c | 2 +- + drivers/media/i2c/st-mipid02.c | 11 +- + drivers/media/i2c/st-vgxy61.c | 5 +- + drivers/media/i2c/tc358746.c | 12 +- + drivers/media/i2c/tda1997x.c | 6 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 6 +- + drivers/media/i2c/tw9910.c | 2 +- + drivers/media/i2c/video-i2c.c | 5 +- + drivers/media/mc/Kconfig | 7 - + drivers/media/mc/mc-device.c | 4 - + drivers/media/pci/cx18/cx18-streams.c | 5 +- + drivers/media/pci/dt3155/dt3155.c | 2 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 24 +- + drivers/media/pci/intel/ivsc/mei_csi.c | 75 +- + drivers/media/pci/ivtv/ivtv-driver.h | 1 + + drivers/media/pci/ivtv/ivtv-streams.c | 4 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 +- + drivers/media/pci/tw68/tw68-video.c | 5 +- + drivers/media/pci/tw686x/tw686x-video.c | 5 +- + drivers/media/platform/amphion/vpu_core.c | 2 +- + drivers/media/platform/amphion/vpu_dbg.c | 30 +- + drivers/media/platform/amphion/vpu_v4l2.c | 4 +- + drivers/media/platform/atmel/atmel-isi.c | 12 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 4 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 3 +- + drivers/media/platform/chips-media/Kconfig | 18 +- + drivers/media/platform/chips-media/Makefile | 6 +- + drivers/media/platform/chips-media/coda/Kconfig | 18 + + drivers/media/platform/chips-media/coda/Makefile | 6 + + .../platform/chips-media/{ => coda}/coda-bit.c | 0 + .../platform/chips-media/{ => coda}/coda-common.c | 2 +- + .../platform/chips-media/{ => coda}/coda-gdi.c | 0 + .../platform/chips-media/{ => coda}/coda-h264.c | 0 + .../platform/chips-media/{ => coda}/coda-jpeg.c | 0 + .../platform/chips-media/{ => coda}/coda-mpeg2.c | 0 + .../platform/chips-media/{ => coda}/coda-mpeg4.c | 0 + .../media/platform/chips-media/{ => coda}/coda.h | 0 + .../platform/chips-media/{ => coda}/coda_regs.h | 0 + .../platform/chips-media/{ => coda}/imx-vdoa.c | 0 + .../platform/chips-media/{ => coda}/imx-vdoa.h | 0 + .../media/platform/chips-media/{ => coda}/trace.h | 2 +- + drivers/media/platform/chips-media/wave5/Kconfig | 12 + + drivers/media/platform/chips-media/wave5/Makefile | 10 + + .../platform/chips-media/wave5/wave5-helper.c | 213 ++ + .../platform/chips-media/wave5/wave5-helper.h | 31 + + .../media/platform/chips-media/wave5/wave5-hw.c | 2554 ++++++++++++++++++++ + .../platform/chips-media/wave5/wave5-regdefine.h | 732 ++++++ + .../media/platform/chips-media/wave5/wave5-vdi.c | 205 ++ + .../media/platform/chips-media/wave5/wave5-vdi.h | 35 + + .../platform/chips-media/wave5/wave5-vpu-dec.c | 1932 +++++++++++++++ + .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++ + .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ + .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + + .../platform/chips-media/wave5/wave5-vpuapi.c | 960 ++++++++ + .../platform/chips-media/wave5/wave5-vpuapi.h | 870 +++++++ + .../platform/chips-media/wave5/wave5-vpuconfig.h | 77 + + .../platform/chips-media/wave5/wave5-vpuerror.h | 292 +++ + drivers/media/platform/chips-media/wave5/wave5.h | 114 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 20 +- + drivers/media/platform/mediatek/vcodec/Kconfig | 1 - + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 24 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c | 26 + + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 14 + + .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 168 +- + .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 9 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- + .../media/platform/microchip/microchip-csi2dc.c | 15 +- + .../media/platform/microchip/microchip-isc-base.c | 10 +- + .../platform/microchip/microchip-isc-scaler.c | 16 +- + drivers/media/platform/nuvoton/npcm-video.c | 32 +- + drivers/media/platform/nvidia/tegra-vde/Kconfig | 1 - + drivers/media/platform/nvidia/tegra-vde/v4l2.c | 2 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 10 +- + drivers/media/platform/nxp/imx7-media-csi.c | 23 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 10 +- + .../media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 18 +- + .../media/platform/nxp/imx8-isi/imx8-isi-video.c | 2 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 13 +- + drivers/media/platform/qcom/camss/camss-csid.c | 15 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 15 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 34 +- + drivers/media/platform/renesas/rcar-isp.c | 4 +- + .../media/platform/renesas/rcar-vin/rcar-csi2.c | 4 +- + drivers/media/platform/renesas/rcar_drif.c | 5 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 6 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 6 +- + drivers/media/platform/renesas/vsp1/vsp1_brx.c | 2 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 8 +- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 3 +- + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 16 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 103 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 53 +- + .../platform/samsung/exynos4-is/fimc-capture.c | 12 +- + .../platform/samsung/exynos4-is/fimc-is-i2c.c | 1 - + .../media/platform/samsung/exynos4-is/fimc-isp.c | 24 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 16 +- + .../media/platform/samsung/exynos4-is/mipi-csis.c | 3 +- + .../platform/samsung/s3c-camif/camif-capture.c | 8 +- + drivers/media/platform/st/sti/hva/hva-v4l2.c | 9 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 8 - + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 8 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 8 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 8 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 8 +- + drivers/media/platform/ti/am437x/am437x-vpfe.c | 5 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 18 +- + drivers/media/platform/ti/cal/cal-video.c | 7 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 5 +- + drivers/media/platform/ti/davinci/vpif_display.c | 5 +- + drivers/media/platform/ti/omap/omap_vout.c | 5 +- + drivers/media/platform/ti/omap3isp/ispccdc.c | 19 +- + drivers/media/platform/ti/omap3isp/ispccp2.c | 13 +- + drivers/media/platform/ti/omap3isp/ispcsi2.c | 9 +- + drivers/media/platform/ti/omap3isp/isppreview.c | 18 +- + drivers/media/platform/ti/omap3isp/ispresizer.c | 21 +- + drivers/media/platform/verisilicon/Kconfig | 1 - + drivers/media/platform/verisilicon/hantro.h | 9 +- + drivers/media/platform/verisilicon/hantro_drv.c | 6 +- + drivers/media/platform/verisilicon/hantro_g2.c | 14 + + .../platform/verisilicon/hantro_g2_hevc_dec.c | 18 +- + .../media/platform/verisilicon/hantro_g2_vp9_dec.c | 28 +- + drivers/media/platform/verisilicon/hantro_hw.h | 7 +- + .../media/platform/verisilicon/hantro_postproc.c | 95 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 29 +- + drivers/media/platform/video-mux.c | 18 +- + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 64 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 9 +- + drivers/media/platform/xilinx/xilinx-vip.c | 4 +- + drivers/media/rc/ir-hix5hd2.c | 10 +- + drivers/media/rc/meson-ir-tx.c | 34 +- + drivers/media/test-drivers/Kconfig | 1 - + drivers/media/test-drivers/vicodec/Kconfig | 1 - + drivers/media/test-drivers/vicodec/vicodec-core.c | 20 +- + drivers/media/test-drivers/vimc/vimc-debayer.c | 10 +- + drivers/media/test-drivers/vimc/vimc-scaler.c | 9 +- + drivers/media/test-drivers/vimc/vimc-sensor.c | 6 +- + drivers/media/test-drivers/visl/Kconfig | 1 - + drivers/media/test-drivers/visl/visl-dec.c | 32 +- + drivers/media/test-drivers/visl/visl-video.c | 3 + + drivers/media/test-drivers/vivid/Kconfig | 1 - + drivers/media/test-drivers/vivid/vivid-core.c | 14 + + drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 - + drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +- + drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 - + drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 - + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 - + drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +- + drivers/media/usb/airspy/airspy.c | 5 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 5 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 5 +- + drivers/media/usb/hackrf/hackrf.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +- + drivers/media/usb/usbtv/usbtv-video.c | 5 +- + drivers/media/v4l2-core/v4l2-common.c | 3 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +- + drivers/media/v4l2-core/v4l2-dev.c | 6 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 6 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 9 +- + drivers/media/v4l2-core/v4l2-subdev.c | 181 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 3 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 6 +- + drivers/staging/media/atomisp/pci/atomisp_tpg.c | 2 +- + .../media/deprecated/atmel/atmel-isc-base.c | 10 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 4 +- + drivers/staging/media/imx/imx-media-capture.c | 7 +- + drivers/staging/media/imx/imx-media-csi.c | 8 +- + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/staging/media/imx/imx-media-vdic.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 14 +- + drivers/staging/media/meson/vdec/vdec.c | 13 +- + drivers/staging/media/omap4iss/iss_csi2.c | 9 +- + drivers/staging/media/omap4iss/iss_ipipe.c | 11 +- + drivers/staging/media/omap4iss/iss_ipipeif.c | 11 +- + drivers/staging/media/omap4iss/iss_resizer.c | 11 +- + drivers/staging/media/rkvdec/Kconfig | 1 - + drivers/staging/media/rkvdec/rkvdec.c | 3 + + drivers/staging/media/starfive/Kconfig | 5 + + drivers/staging/media/starfive/Makefile | 2 + + drivers/staging/media/starfive/camss/Kconfig | 17 + + drivers/staging/media/starfive/camss/Makefile | 13 + + drivers/staging/media/starfive/camss/TODO.txt | 4 + + drivers/staging/media/starfive/camss/stf-camss.c | 436 ++++ + drivers/staging/media/starfive/camss/stf-camss.h | 134 + + drivers/staging/media/starfive/camss/stf-capture.c | 603 +++++ + drivers/staging/media/starfive/camss/stf-capture.h | 86 + + .../staging/media/starfive/camss/stf-isp-hw-ops.c | 445 ++++ + drivers/staging/media/starfive/camss/stf-isp.c | 381 +++ + drivers/staging/media/starfive/camss/stf-isp.h | 428 ++++ + drivers/staging/media/starfive/camss/stf-video.c | 572 +++++ + drivers/staging/media/starfive/camss/stf-video.h | 100 + + drivers/staging/media/sunxi/cedrus/Kconfig | 1 - + drivers/staging/media/sunxi/cedrus/TODO | 23 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 9 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 9 +- + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 8 +- + drivers/staging/media/tegra-video/csi.c | 6 +- + drivers/staging/media/tegra-video/vi.c | 20 +- + drivers/staging/media/tegra-video/vip.c | 6 +- + include/media/cec.h | 22 +- + include/media/v4l2-mem2mem.h | 9 +- + include/media/v4l2-subdev.h | 225 +- + include/media/videobuf2-core.h | 39 +- + include/uapi/linux/videodev2.h | 11 +- + samples/v4l/v4l2-pci-skeleton.c | 5 +- + 311 files changed, 15885 insertions(+), 1751 deletions(-) + create mode 100644 Documentation/admin-guide/media/starfive_camss.rst + create mode 100644 Documentation/admin-guide/media/starfive_camss_graph.dot + create mode 100644 Documentation/devicetree/bindings/media/cnm,wave521c.yaml + create mode 100644 Documentation/devicetree/bindings/media/starfive,jh7110-camss.yaml + create mode 100644 drivers/media/platform/chips-media/coda/Kconfig + create mode 100644 drivers/media/platform/chips-media/coda/Makefile + rename drivers/media/platform/chips-media/{ => coda}/coda-bit.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda-common.c (99%) + rename drivers/media/platform/chips-media/{ => coda}/coda-gdi.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda-h264.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda-jpeg.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda-mpeg2.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda-mpeg4.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda.h (100%) + rename drivers/media/platform/chips-media/{ => coda}/coda_regs.h (100%) + rename drivers/media/platform/chips-media/{ => coda}/imx-vdoa.c (100%) + rename drivers/media/platform/chips-media/{ => coda}/imx-vdoa.h (100%) + rename drivers/media/platform/chips-media/{ => coda}/trace.h (99%) + create mode 100644 drivers/media/platform/chips-media/wave5/Kconfig + create mode 100644 drivers/media/platform/chips-media/wave5/Makefile + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-helper.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-helper.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-hw.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-regdefine.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vdi.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vdi.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpu.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpu.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpuapi.c + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpuapi.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5-vpuerror.h + create mode 100644 drivers/media/platform/chips-media/wave5/wave5.h + create mode 100644 drivers/staging/media/starfive/Kconfig + create mode 100644 drivers/staging/media/starfive/Makefile + create mode 100644 drivers/staging/media/starfive/camss/Kconfig + create mode 100644 drivers/staging/media/starfive/camss/Makefile + create mode 100644 drivers/staging/media/starfive/camss/TODO.txt + create mode 100644 drivers/staging/media/starfive/camss/stf-camss.c + create mode 100644 drivers/staging/media/starfive/camss/stf-camss.h + create mode 100644 drivers/staging/media/starfive/camss/stf-capture.c + create mode 100644 drivers/staging/media/starfive/camss/stf-capture.h + create mode 100644 drivers/staging/media/starfive/camss/stf-isp-hw-ops.c + create mode 100644 drivers/staging/media/starfive/camss/stf-isp.c + create mode 100644 drivers/staging/media/starfive/camss/stf-isp.h + create mode 100644 drivers/staging/media/starfive/camss/stf-video.c + create mode 100644 drivers/staging/media/starfive/camss/stf-video.h +Merging v4l-dvb-next/master (3b8551e73271 media: wave5: add OF and V4L_MEM2MEM_DRIVERS dependencies) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + drivers/media/platform/chips-media/wave5/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging pm/linux-next (3f96bebf018e 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 +Auto-merging fs/debugfs/file.c +Merge made by the 'ort' strategy. + drivers/acpi/Kconfig | 5 + + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_lpit.c | 2 +- + drivers/acpi/acpi_video.c | 82 +-- + drivers/acpi/apei/einj.c | 71 +- + drivers/acpi/bus.c | 32 +- + drivers/acpi/internal.h | 19 +- + drivers/acpi/mipi-disco-img.c | 725 +++++++++++++++++++++ + drivers/acpi/property.c | 106 ++- + drivers/acpi/scan.c | 56 +- + drivers/acpi/thermal.c | 69 +- + .../{thermal/thermal_acpi.c => acpi/thermal_lib.c} | 80 ++- + drivers/base/property.c | 1 + + drivers/base/swnode.c | 3 + + drivers/cpufreq/amd-pstate.c | 4 +- + drivers/cpufreq/imx6q-cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 73 ++- + drivers/platform/chrome/cros_ec_debugfs.c | 2 +- + drivers/pmdomain/qcom/rpmpd.c | 1 + + drivers/thermal/Kconfig | 4 - + drivers/thermal/Makefile | 1 - + drivers/thermal/intel/Kconfig | 2 +- + drivers/thermal/intel/int340x_thermal/Kconfig | 2 +- + drivers/thermal/thermal_core.c | 43 +- + fs/debugfs/file.c | 28 +- + include/acpi/acpi_bus.h | 93 +++ + include/acpi/video.h | 9 + + include/linux/acpi.h | 35 +- + include/linux/fw_table.h | 3 - + include/linux/property.h | 7 + + include/linux/thermal.h | 9 +- + lib/fw_table.c | 2 +- + 32 files changed, 1346 insertions(+), 228 deletions(-) + create mode 100644 drivers/acpi/mipi-disco-img.c + rename drivers/{thermal/thermal_acpi.c => acpi/thermal_lib.c} (65%) +Merging cpufreq-arm/cpufreq/arm/linux-next (8f96e29aae31 pmdomain: qcom: rpmpd: Set GENPD_FLAG_ACTIVE_WAKEUP) +$ 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 (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/bench/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (b85ea95d0864 Linux 6.7-rc1) +$ 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 (034c9ec5d5b6 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +- + drivers/firmware/Kconfig | 9 ------ + drivers/firmware/Makefile | 1 - + drivers/firmware/arm_scmi/Kconfig | 25 --------------- + drivers/pmdomain/Kconfig | 1 + + drivers/pmdomain/arm/Kconfig | 37 ++++++++++++++++++++++ + drivers/pmdomain/arm/Makefile | 1 + + .../{firmware => pmdomain/arm}/scpi_pm_domain.c | 0 + drivers/pmdomain/qcom/rpmhpd.c | 12 +++---- + 9 files changed, 46 insertions(+), 42 deletions(-) + create mode 100644 drivers/pmdomain/arm/Kconfig + rename drivers/{firmware => pmdomain/arm}/scpi_pm_domain.c (100%) +Merging opp/opp/linux-next (19cc8b1819a4 OPP: Check for invalid OPP in dev_pm_opp_find_level_ceil()) +$ 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/core.c | 196 +++++++++++++++++++++++++------------------- + drivers/opp/of.c | 57 ++++++++++--- + drivers/opp/opp.h | 8 +- + drivers/opp/ti-opp-supply.c | 13 +-- + include/linux/pm_opp.h | 12 ++- + 5 files changed, 175 insertions(+), 111 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 (0c08699744d2 dlm: implement EXPORT_OP_ASYNC_LOCK) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/lowcomms.c | 14 +++++++------- + fs/dlm/plock.c | 20 +++++--------------- + fs/gfs2/export.c | 1 + + fs/ocfs2/export.c | 1 + + 4 files changed, 14 insertions(+), 22 deletions(-) +Merging rdma/for-next (50af5d12f7e2 RDMA/IPoIB: Add tx timeout work to recover queue stop situation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Merge made by the 'ort' strategy. + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 59 ++++++---- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 7 ++ + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 138 +++++++++++------------ + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 20 +++- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 17 ++- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 37 +++++-- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 4 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 4 +- + drivers/infiniband/hw/hns/Makefile | 3 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 19 +++- + drivers/infiniband/hw/hns/hns_roce_cq.c | 17 ++- + drivers/infiniband/hw/hns/hns_roce_debugfs.c | 110 +++++++++++++++++++ + drivers/infiniband/hw/hns/hns_roce_debugfs.h | 33 ++++++ + drivers/infiniband/hw/hns/hns_roce_device.h | 26 +++++ + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 49 ++++++--- + drivers/infiniband/hw/hns/hns_roce_main.c | 48 ++++++-- + drivers/infiniband/hw/hns/hns_roce_mr.c | 26 +++-- + drivers/infiniband/hw/hns/hns_roce_pd.c | 14 ++- + drivers/infiniband/hw/hns/hns_roce_qp.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 6 +- + drivers/infiniband/hw/irdma/utils.c | 11 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- + drivers/infiniband/hw/mthca/mthca_main.c | 2 +- + drivers/infiniband/sw/siw/siw.h | 4 +- + drivers/infiniband/sw/siw/siw_cm.c | 145 ++++++++++--------------- + drivers/infiniband/sw/siw/siw_main.c | 30 +++-- + drivers/infiniband/sw/siw/siw_mem.c | 121 ++++++++------------- + drivers/infiniband/sw/siw/siw_mem.h | 5 +- + drivers/infiniband/sw/siw/siw_qp.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 84 ++++++-------- + drivers/infiniband/sw/siw/siw_qp_tx.c | 51 ++++----- + drivers/infiniband/sw/siw/siw_verbs.c | 42 ++----- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 26 ++++- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 33 +++++- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 4 +- + include/uapi/rdma/bnxt_re-abi.h | 9 ++ + 42 files changed, 762 insertions(+), 485 deletions(-) + create mode 100644 drivers/infiniband/hw/hns/hns_roce_debugfs.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_debugfs.h +Merging net-next/main (a379972973a8 Merge branch 'net-page_pool-add-netlink-based-introspection') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/renesas/rswitch.c +Auto-merging include/linux/ieee80211.h +Auto-merging include/net/cfg80211.h +Auto-merging mm/page_alloc.c +Auto-merging net/wireless/nl80211.c +Auto-merging tools/testing/selftests/net/cmsg_sender.c +Merge made by the 'ort' strategy. + Documentation/Makefile | 16 +- + Documentation/bpf/kfuncs.rst | 24 + + .../devicetree/bindings/net/marvell,aquantia.yaml | 116 + + .../devicetree/bindings/net/qcom,ipa.yaml | 1 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 2 +- + .../devicetree/bindings/net/renesas,ethertsn.yaml | 133 + + .../devicetree/bindings/net/xlnx,axi-ethernet.yaml | 16 + + Documentation/netlink/specs/devlink.yaml | 4 +- + Documentation/netlink/specs/netdev.yaml | 172 + + .../device_drivers/ethernet/marvell/octeon_ep.rst | 4 + + .../networking/device_drivers/wifi/index.rst | 1 - + .../networking/device_drivers/wifi/ray_cs.rst | 165 - + Documentation/networking/index.rst | 1 + + Documentation/networking/netlink_spec/.gitignore | 1 + + Documentation/networking/netlink_spec/readme.txt | 4 + + Documentation/networking/page_pool.rst | 10 +- + Documentation/networking/smc-sysctl.rst | 14 + + MAINTAINERS | 42 +- + drivers/base/firmware_loader/sysfs_upload.c | 1 + + drivers/net/bonding/bond_alb.c | 3 +- + drivers/net/bonding/bond_main.c | 29 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1417 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 220 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 35 +- + drivers/net/ethernet/cadence/macb.h | 15 +- + drivers/net/ethernet/cadence/macb_main.c | 42 +- + drivers/net/ethernet/cadence/macb_ptp.c | 28 +- + drivers/net/ethernet/google/gve/gve_dqo.h | 3 + + drivers/net/ethernet/google/gve/gve_main.c | 13 + + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 37 +- + drivers/net/ethernet/intel/i40e/i40e.h | 148 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 161 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 68 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 29 +- + drivers/net/ethernet/intel/i40e/i40e_debug.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 246 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 620 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 70 + + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 51 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 20 +- + drivers/net/ethernet/intel/ice/ice.h | 13 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 29 + + drivers/net/ethernet/intel/ice/ice_devlink.h | 1 + + drivers/net/ethernet/intel/ice/ice_eswitch.c | 576 +- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 22 +- + drivers/net/ethernet/intel/ice/ice_eswitch_br.c | 22 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 81 +- + drivers/net/ethernet/intel/ice/ice_main.c | 6 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 195 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 9 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 20 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 4 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 9 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 21 +- + drivers/net/ethernet/intel/igc/igc_base.h | 4 + + drivers/net/ethernet/intel/igc/igc_defines.h | 2 + + drivers/net/ethernet/intel/igc/igc_main.c | 65 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 50 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 5 + + drivers/net/ethernet/marvell/octeon_ep/Makefile | 3 +- + .../net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 886 +++ + .../net/ethernet/marvell/octeon_ep/octep_config.h | 5 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 42 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 125 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 85 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 15 + + .../marvell/octeon_ep/octep_regs_cnxk_pf.h | 400 + + drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 5 +- + drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 3 - + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 2 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 8 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 23 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 14 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 10 +- + drivers/net/ethernet/mediatek/mtk_wed_wo.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/diag/crdump.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 14 + + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 32 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 78 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 20 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 11 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 7 + + drivers/net/ethernet/mellanox/mlxsw/core.h | 9 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 119 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 94 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 44 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 +- + drivers/net/ethernet/microchip/lan743x_main.h | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 50 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 40 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 36 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 183 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 15 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 369 + + drivers/net/ethernet/realtek/r8169_firmware.c | 3 - + drivers/net/ethernet/realtek/r8169_main.c | 139 +- + drivers/net/ethernet/renesas/Kconfig | 9 + + drivers/net/ethernet/renesas/Makefile | 5 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 40 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.h | 9 +- + drivers/net/ethernet/renesas/rswitch.c | 4 +- + drivers/net/ethernet/socionext/netsec.c | 2 + + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 35 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 13 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 15 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 57 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 26 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 197 +- + drivers/net/ethernet/xilinx/Kconfig | 1 + + drivers/net/ethernet/xilinx/xilinx_axienet.h | 35 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 683 +- + drivers/net/ipa/Makefile | 4 +- + drivers/net/ipa/data/ipa_data-v5.5.c | 487 ++ + drivers/net/ipa/gsi_reg.c | 1 + + drivers/net/ipa/ipa_data.h | 1 + + drivers/net/ipa/ipa_main.c | 13 +- + drivers/net/ipa/ipa_mem.c | 2 +- + drivers/net/ipa/ipa_reg.c | 6 +- + drivers/net/ipa/ipa_reg.h | 111 +- + drivers/net/ipa/ipa_version.h | 1 + + drivers/net/ipa/reg/ipa_reg-v5.5.c | 565 ++ + drivers/net/macvlan.c | 14 +- + drivers/net/phy/Kconfig | 5 +- + drivers/net/phy/Makefile | 6 +- + drivers/net/phy/aquantia.h | 16 - + drivers/net/phy/aquantia/Kconfig | 6 + + drivers/net/phy/aquantia/Makefile | 6 + + drivers/net/phy/aquantia/aquantia.h | 122 + + drivers/net/phy/aquantia/aquantia_firmware.c | 370 + + drivers/net/phy/{ => aquantia}/aquantia_hwmon.c | 14 - + drivers/net/phy/{ => aquantia}/aquantia_main.c | 137 +- + drivers/net/phy/bcm-phy-ptp.c | 15 +- + drivers/net/phy/bcm84881.c | 12 + + drivers/net/phy/broadcom.c | 2 + + drivers/net/phy/dp83640.c | 24 +- + drivers/net/phy/marvell10g.c | 209 +- + drivers/net/phy/micrel.c | 44 +- + drivers/net/phy/mscc/mscc_ptp.c | 18 +- + drivers/net/phy/nxp-c45-tja11xx.c | 17 +- + drivers/net/phy/phy.c | 28 +- + drivers/net/phy/phy_device.c | 13 +- + drivers/net/phy/phylink.c | 185 +- + drivers/net/phy/sfp-bus.c | 2 +- + drivers/net/phy/sfp.c | 41 +- + drivers/net/usb/ax88179_178a.c | 2 - + drivers/net/vxlan/vxlan_core.c | 23 +- + drivers/net/wireless/Kconfig | 3 - + drivers/net/wireless/Makefile | 2 - + drivers/net/wireless/atmel/Kconfig | 35 - + drivers/net/wireless/atmel/Makefile | 4 - + drivers/net/wireless/atmel/atmel.c | 4452 ----------- + drivers/net/wireless/atmel/atmel.h | 31 - + drivers/net/wireless/atmel/atmel_cs.c | 292 - + drivers/net/wireless/atmel/atmel_pci.c | 65 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 6 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 3 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 4 +- + drivers/net/wireless/cisco/Kconfig | 59 - + drivers/net/wireless/cisco/Makefile | 3 - + drivers/net/wireless/cisco/airo.c | 8288 -------------------- + drivers/net/wireless/cisco/airo.h | 10 - + drivers/net/wireless/cisco/airo_cs.c | 218 - + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 6 - + drivers/net/wireless/intersil/Kconfig | 2 - + drivers/net/wireless/intersil/Makefile | 2 - + drivers/net/wireless/intersil/hostap/Kconfig | 95 - + drivers/net/wireless/intersil/hostap/Makefile | 8 - + drivers/net/wireless/intersil/hostap/hostap.h | 98 - + .../net/wireless/intersil/hostap/hostap_80211.h | 97 - + .../net/wireless/intersil/hostap/hostap_80211_rx.c | 1116 --- + .../net/wireless/intersil/hostap/hostap_80211_tx.c | 554 -- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 3277 -------- + drivers/net/wireless/intersil/hostap/hostap_ap.h | 264 - + .../net/wireless/intersil/hostap/hostap_common.h | 420 - + .../net/wireless/intersil/hostap/hostap_config.h | 49 - + drivers/net/wireless/intersil/hostap/hostap_cs.c | 710 -- + .../net/wireless/intersil/hostap/hostap_download.c | 810 -- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 3387 -------- + drivers/net/wireless/intersil/hostap/hostap_info.c | 509 -- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 3847 --------- + drivers/net/wireless/intersil/hostap/hostap_main.c | 1123 --- + drivers/net/wireless/intersil/hostap/hostap_pci.c | 445 -- + drivers/net/wireless/intersil/hostap/hostap_plx.c | 617 -- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 411 - + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 1051 --- + drivers/net/wireless/intersil/orinoco/Kconfig | 143 - + drivers/net/wireless/intersil/orinoco/Makefile | 15 - + drivers/net/wireless/intersil/orinoco/airport.c | 268 - + drivers/net/wireless/intersil/orinoco/cfg.c | 291 - + drivers/net/wireless/intersil/orinoco/cfg.h | 15 - + drivers/net/wireless/intersil/orinoco/fw.c | 387 - + drivers/net/wireless/intersil/orinoco/fw.h | 21 - + drivers/net/wireless/intersil/orinoco/hermes.c | 778 -- + drivers/net/wireless/intersil/orinoco/hermes.h | 534 -- + drivers/net/wireless/intersil/orinoco/hermes_dld.c | 477 -- + drivers/net/wireless/intersil/orinoco/hermes_dld.h | 52 - + drivers/net/wireless/intersil/orinoco/hermes_rid.h | 165 - + drivers/net/wireless/intersil/orinoco/hw.c | 1362 ---- + drivers/net/wireless/intersil/orinoco/hw.h | 60 - + drivers/net/wireless/intersil/orinoco/main.c | 2414 ------ + drivers/net/wireless/intersil/orinoco/main.h | 50 - + drivers/net/wireless/intersil/orinoco/mic.c | 89 - + drivers/net/wireless/intersil/orinoco/mic.h | 23 - + drivers/net/wireless/intersil/orinoco/orinoco.h | 251 - + drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 350 - + .../net/wireless/intersil/orinoco/orinoco_nortel.c | 314 - + .../net/wireless/intersil/orinoco/orinoco_pci.c | 257 - + .../net/wireless/intersil/orinoco/orinoco_pci.h | 54 - + .../net/wireless/intersil/orinoco/orinoco_plx.c | 362 - + .../net/wireless/intersil/orinoco/orinoco_tmd.c | 237 - + .../net/wireless/intersil/orinoco/orinoco_usb.c | 1787 ----- + drivers/net/wireless/intersil/orinoco/scan.c | 259 - + drivers/net/wireless/intersil/orinoco/scan.h | 21 - + .../net/wireless/intersil/orinoco/spectrum_cs.c | 328 - + drivers/net/wireless/intersil/orinoco/wext.c | 1428 ---- + drivers/net/wireless/intersil/orinoco/wext.h | 13 - + drivers/net/wireless/legacy/Kconfig | 55 - + drivers/net/wireless/legacy/Makefile | 6 - + drivers/net/wireless/legacy/ray_cs.c | 2824 ------- + drivers/net/wireless/legacy/ray_cs.h | 74 - + drivers/net/wireless/legacy/rayctl.h | 734 -- + drivers/net/wireless/legacy/rndis_wlan.c | 3760 --------- + drivers/net/wireless/legacy/wl3501.h | 615 -- + drivers/net/wireless/legacy/wl3501_cs.c | 2036 ----- + drivers/net/wireless/marvell/libertas/Kconfig | 9 +- + drivers/net/wireless/marvell/libertas/Makefile | 1 - + drivers/net/wireless/marvell/libertas/if_cs.c | 957 --- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 8 - + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 24 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 46 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 42 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 9 +- + drivers/net/wireless/purelifi/plfxlc/usb.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 4 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 83 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 3 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 3 + + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 11 + + drivers/net/wireless/realtek/rtlwifi/base.c | 8 - + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + drivers/net/wireless/realtek/rtlwifi/pci.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 3 - + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 3 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 17 - + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw88/tx.c | 3 +- + drivers/net/wireless/realtek/rtw89/acpi.c | 81 +- + drivers/net/wireless/realtek/rtw89/acpi.h | 32 +- + drivers/net/wireless/realtek/rtw89/cam.c | 16 +- + drivers/net/wireless/realtek/rtw89/coex.c | 4 +- + drivers/net/wireless/realtek/rtw89/core.c | 95 +- + drivers/net/wireless/realtek/rtw89/core.h | 40 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/efuse.c | 11 +- + drivers/net/wireless/realtek/rtw89/efuse.h | 17 +- + drivers/net/wireless/realtek/rtw89/efuse_be.c | 420 + + drivers/net/wireless/realtek/rtw89/mac.c | 16 +- + drivers/net/wireless/realtek/rtw89/mac.h | 4 + + drivers/net/wireless/realtek/rtw89/mac_be.c | 4 + + drivers/net/wireless/realtek/rtw89/pci.c | 323 +- + drivers/net/wireless/realtek/rtw89/pci.h | 515 ++ + drivers/net/wireless/realtek/rtw89/pci_be.c | 509 ++ + drivers/net/wireless/realtek/rtw89/phy.h | 16 + + drivers/net/wireless/realtek/rtw89/reg.h | 437 ++ + drivers/net/wireless/realtek/rtw89/regd.c | 175 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 3 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 4 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 4 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 29 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.h | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 4 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 363 + + drivers/net/wireless/realtek/rtw89/rtw8922a.h | 73 + + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 88 + + drivers/net/wireless/realtek/rtw89/sar.c | 4 +- + drivers/net/wireless/realtek/rtw89/ser.c | 6 + + drivers/net/wireless/realtek/rtw89/txrx.h | 4 + + drivers/net/wireless/zydas/Kconfig | 19 - + drivers/net/wireless/zydas/Makefile | 2 - + drivers/net/wireless/zydas/zd1201.c | 1909 ----- + drivers/net/wireless/zydas/zd1201.h | 144 - + drivers/pci/pci.c | 3 + + drivers/pci/quirks.c | 13 + + drivers/ptp/ptp_ines.c | 16 +- + include/linux/bpf.h | 6 +- + include/linux/bpf_verifier.h | 77 + + include/linux/cgroup-defs.h | 1 + + include/linux/cgroup.h | 4 +- + include/linux/compiler-gcc.h | 2 +- + include/linux/ethtool.h | 8 + + include/linux/firmware.h | 2 + + include/linux/ieee80211.h | 4 +- + include/linux/indirect_call_wrapper.h | 2 +- + include/linux/linkmode.h | 5 + + include/linux/list.h | 20 + + include/linux/mii_timestamper.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 5 +- + include/linux/netdevice.h | 7 + + include/linux/netlink.h | 1 + + include/linux/phy.h | 9 +- + include/linux/poison.h | 2 + + include/linux/tnum.h | 4 + + include/net/cfg80211.h | 3 + + include/net/ip_tunnels.h | 11 + + include/net/mana/mana.h | 46 +- + include/net/netlink.h | 14 + + include/net/netns/smc.h | 2 + + include/net/page_pool/helpers.h | 8 +- + include/net/page_pool/types.h | 43 +- + include/net/vxlan.h | 33 +- + include/uapi/linux/batadv_packet.h | 45 +- + include/uapi/linux/bpf.h | 29 +- + include/uapi/linux/if_link.h | 8 + + include/uapi/linux/netdev.h | 36 + + include/uapi/linux/nl80211.h | 22 +- + kernel/bpf/btf.c | 11 +- + kernel/bpf/helpers.c | 46 +- + kernel/bpf/log.c | 480 ++ + kernel/bpf/lpm_trie.c | 3 + + kernel/bpf/stackmap.c | 11 +- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/task_iter.c | 29 +- + kernel/bpf/tnum.c | 7 +- + kernel/bpf/verifier.c | 1782 ++--- + kernel/cgroup/cgroup-internal.h | 4 +- + kernel/cgroup/cgroup-v1.c | 34 + + kernel/cgroup/cgroup.c | 45 +- + kernel/trace/bpf_trace.c | 12 +- + lib/test_bpf.c | 16 - + lib/test_firmware.c | 1 + + mm/page_alloc.c | 7 + + net/8021q/vlan_dev.c | 15 +- + net/batman-adv/Makefile | 1 + + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/batman-adv/fragmentation.c | 8 +- + net/batman-adv/gateway_client.c | 2 +- + net/batman-adv/main.c | 5 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 129 +- + net/batman-adv/multicast.h | 30 +- + net/batman-adv/multicast_forw.c | 1178 +++ + net/batman-adv/netlink.c | 2 +- + net/batman-adv/originator.c | 28 + + net/batman-adv/originator.h | 3 + + net/batman-adv/routing.c | 70 + + net/batman-adv/routing.h | 11 + + net/batman-adv/soft-interface.c | 18 +- + net/batman-adv/types.h | 70 + + net/core/Makefile | 2 +- + net/core/dev.c | 10 +- + net/core/dev_ioctl.c | 7 +- + net/core/netdev-genl-gen.c | 60 + + net/core/netdev-genl-gen.h | 11 + + net/core/page_pool.c | 78 +- + net/core/page_pool_priv.h | 12 + + net/core/page_pool_user.c | 408 + + net/core/rtnetlink.c | 2 +- + net/devlink/core.c | 4 +- + net/devlink/dev.c | 8 + + net/devlink/devl_internal.h | 21 +- + net/devlink/health.c | 3 +- + net/devlink/netlink.c | 45 +- + net/devlink/netlink_gen.c | 4 +- + net/devlink/netlink_gen.h | 5 + + net/devlink/region.c | 3 +- + net/dsa/tag_rtl4_a.c | 5 +- + net/ethtool/common.c | 6 + + net/hsr/hsr_device.c | 67 +- + net/ipv4/tcp_ipv4.c | 6 + + net/ipv4/tcp_timer.c | 4 +- + net/ipv6/tcp_ipv6.c | 9 +- + net/mac80211/scan.c | 48 +- + net/ncsi/internal.h | 7 +- + net/ncsi/ncsi-cmd.c | 3 +- + net/ncsi/ncsi-manage.c | 29 +- + net/ncsi/ncsi-netlink.c | 4 +- + net/ncsi/ncsi-pkt.h | 17 +- + net/ncsi/ncsi-rsp.c | 67 +- + net/netlink/af_netlink.c | 3 +- + net/rfkill/core.c | 4 +- + net/sched/cls_u32.c | 36 +- + net/sched/sch_generic.c | 5 +- + net/smc/af_smc.c | 2 +- + net/smc/smc.h | 1 - + net/smc/smc_clc.c | 15 +- + net/smc/smc_clc.h | 3 +- + net/smc/smc_sysctl.c | 24 + + net/smc/smc_sysctl.h | 2 + + net/smc/smc_tx.c | 30 +- + net/tipc/netlink_compat.c | 2 +- + net/wireless/nl80211.c | 1 + + tools/bpf/bpftool/Documentation/bpftool.rst | 2 +- + tools/include/uapi/linux/bpf.h | 29 +- + tools/include/uapi/linux/netdev.h | 36 + + tools/lib/bpf/libbpf_common.h | 13 +- + tools/net/ynl/generated/netdev-user.c | 419 + + tools/net/ynl/generated/netdev-user.h | 171 + + tools/net/ynl/lib/ynl.h | 2 +- + tools/net/ynl/samples/.gitignore | 1 + + tools/net/ynl/samples/Makefile | 2 +- + tools/net/ynl/samples/page-pool.c | 147 + + tools/net/ynl/ynl-gen-c.py | 65 +- + tools/net/ynl/ynl-gen-rst.py | 388 + + tools/testing/selftests/bpf/cgroup_helpers.c | 116 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 4 +- + tools/testing/selftests/bpf/config.aarch64 | 17 +- + tools/testing/selftests/bpf/config.s390x | 9 - + tools/testing/selftests/bpf/config.vm | 12 + + tools/testing/selftests/bpf/config.x86_64 | 12 - + .../selftests/bpf/map_tests/map_percpu_stats.c | 39 +- + tools/testing/selftests/bpf/prog_tests/align.c | 42 +- + tools/testing/selftests/bpf/prog_tests/bind_perm.c | 6 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 87 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 210 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 48 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 1 + + .../selftests/bpf/prog_tests/cgroup1_hierarchy.c | 158 + + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 2 +- + .../selftests/bpf/prog_tests/local_kptr_stash.c | 33 + + tools/testing/selftests/bpf/prog_tests/log_buf.c | 4 +- + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 2124 +++++ + tools/testing/selftests/bpf/prog_tests/spin_lock.c | 14 +- + tools/testing/selftests/bpf/prog_tests/tc_opts.c | 6 +- + tools/testing/selftests/bpf/prog_tests/vmlinux.c | 16 +- + .../selftests/bpf/progs/bpf_iter_task_stack.c | 5 + + .../selftests/bpf/progs/exceptions_assert.c | 40 +- + tools/testing/selftests/bpf/progs/iters.c | 22 + + .../testing/selftests/bpf/progs/local_kptr_stash.c | 71 + + tools/testing/selftests/bpf/progs/pyperf180.c | 22 + + .../selftests/bpf/progs/refcounted_kptr_fail.c | 19 + + .../selftests/bpf/progs/test_cgroup1_hierarchy.c | 71 + + .../testing/selftests/bpf/progs/verifier_bounds.c | 2 + + tools/testing/selftests/bpf/test_loader.c | 35 +- + tools/testing/selftests/bpf/test_maps.c | 17 +- + tools/testing/selftests/bpf/test_maps.h | 5 + + tools/testing/selftests/bpf/test_sock_addr.c | 2 +- + tools/testing/selftests/bpf/test_verifier.c | 2 +- + tools/testing/selftests/bpf/testing_helpers.c | 4 +- + tools/testing/selftests/bpf/veristat.c | 89 +- + tools/testing/selftests/bpf/vmtest.sh | 4 +- + .../selftests/drivers/net/mlxsw/pci_reset.sh | 58 + + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/cmsg_sender.c | 50 +- + tools/testing/selftests/net/fq_band_pktlimit.sh | 57 + + tools/testing/selftests/net/net_helper.sh | 22 + + tools/testing/selftests/net/udpgro.sh | 13 +- + tools/testing/selftests/net/udpgro_bench.sh | 5 +- + tools/testing/selftests/net/udpgro_frglist.sh | 5 +- + tools/testing/selftests/tc-testing/Makefile | 31 +- + tools/testing/selftests/tc-testing/README | 2 - + tools/testing/selftests/tc-testing/action-ebpf | Bin 0 -> 856 bytes + .../tc-testing/plugin-lib/buildebpfPlugin.py | 67 - + .../selftests/tc-testing/plugin-lib/nsPlugin.py | 216 +- + .../selftests/tc-testing/tc-tests/actions/bpf.json | 14 +- + .../selftests/tc-testing/tc-tests/filters/bpf.json | 10 +- + .../selftests/tc-testing/tc-tests/filters/u32.json | 57 + + tools/testing/selftests/tc-testing/tdc.py | 14 +- + tools/testing/selftests/tc-testing/tdc.sh | 69 +- + 499 files changed, 20974 insertions(+), 63873 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/marvell,aquantia.yaml + create mode 100644 Documentation/devicetree/bindings/net/renesas,ethertsn.yaml + delete mode 100644 Documentation/networking/device_drivers/wifi/ray_cs.rst + create mode 100644 Documentation/networking/netlink_spec/.gitignore + create mode 100644 Documentation/networking/netlink_spec/readme.txt + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h + create mode 100644 drivers/net/ipa/data/ipa_data-v5.5.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v5.5.c + delete mode 100644 drivers/net/phy/aquantia.h + create mode 100644 drivers/net/phy/aquantia/Kconfig + create mode 100644 drivers/net/phy/aquantia/Makefile + create mode 100644 drivers/net/phy/aquantia/aquantia.h + create mode 100644 drivers/net/phy/aquantia/aquantia_firmware.c + rename drivers/net/phy/{ => aquantia}/aquantia_hwmon.c (90%) + rename drivers/net/phy/{ => aquantia}/aquantia_main.c (91%) + delete mode 100644 drivers/net/wireless/atmel/atmel.c + delete mode 100644 drivers/net/wireless/atmel/atmel.h + delete mode 100644 drivers/net/wireless/atmel/atmel_cs.c + delete mode 100644 drivers/net/wireless/atmel/atmel_pci.c + delete mode 100644 drivers/net/wireless/cisco/Kconfig + delete mode 100644 drivers/net/wireless/cisco/Makefile + delete mode 100644 drivers/net/wireless/cisco/airo.c + delete mode 100644 drivers/net/wireless/cisco/airo.h + delete mode 100644 drivers/net/wireless/cisco/airo_cs.c + delete mode 100644 drivers/net/wireless/intersil/hostap/Kconfig + delete mode 100644 drivers/net/wireless/intersil/hostap/Makefile + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap.h + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_80211.h + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_80211_rx.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_80211_tx.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_ap.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_ap.h + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_common.h + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_config.h + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_cs.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_download.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_hw.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_info.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_ioctl.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_main.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_pci.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_plx.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_proc.c + delete mode 100644 drivers/net/wireless/intersil/hostap/hostap_wlan.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/Kconfig + delete mode 100644 drivers/net/wireless/intersil/orinoco/Makefile + delete mode 100644 drivers/net/wireless/intersil/orinoco/airport.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/cfg.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/cfg.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/fw.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/fw.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/hermes.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/hermes.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/hermes_dld.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/hermes_dld.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/hermes_rid.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/hw.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/hw.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/main.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/main.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/mic.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/mic.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_cs.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_nortel.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_pci.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_pci.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_plx.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_tmd.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/orinoco_usb.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/scan.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/scan.h + delete mode 100644 drivers/net/wireless/intersil/orinoco/spectrum_cs.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/wext.c + delete mode 100644 drivers/net/wireless/intersil/orinoco/wext.h + delete mode 100644 drivers/net/wireless/legacy/Kconfig + delete mode 100644 drivers/net/wireless/legacy/Makefile + delete mode 100644 drivers/net/wireless/legacy/ray_cs.c + delete mode 100644 drivers/net/wireless/legacy/ray_cs.h + delete mode 100644 drivers/net/wireless/legacy/rayctl.h + delete mode 100644 drivers/net/wireless/legacy/rndis_wlan.c + delete mode 100644 drivers/net/wireless/legacy/wl3501.h + delete mode 100644 drivers/net/wireless/legacy/wl3501_cs.c + delete mode 100644 drivers/net/wireless/marvell/libertas/if_cs.c + create mode 100644 drivers/net/wireless/realtek/rtw89/efuse_be.c + create mode 100644 drivers/net/wireless/realtek/rtw89/pci_be.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922ae.c + delete mode 100644 drivers/net/wireless/zydas/zd1201.c + delete mode 100644 drivers/net/wireless/zydas/zd1201.h + create mode 100644 net/batman-adv/multicast_forw.c + create mode 100644 net/core/page_pool_priv.h + create mode 100644 net/core/page_pool_user.c + create mode 100644 tools/net/ynl/samples/page-pool.c + create mode 100755 tools/net/ynl/ynl-gen-rst.py + create mode 100644 tools/testing/selftests/bpf/config.vm + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup1_hierarchy.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/reg_bounds.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/pci_reset.sh + create mode 100755 tools/testing/selftests/net/fq_band_pktlimit.sh + create mode 100755 tools/testing/selftests/net/net_helper.sh + create mode 100644 tools/testing/selftests/tc-testing/action-ebpf + delete mode 100644 tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py +Merging bpf-next/for-next (cf9791631027 selftests/bpf: update test_offload to use new orphaned property) +$ 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 +Merge made by the 'ort' strategy. + include/linux/bpf.h | 2 + + kernel/bpf/verifier.c | 83 +++++++++++++++---- + net/bpf/test_run.c | 2 +- + tools/bpf/bpftool/prog.c | 14 ++-- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_version.h | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/progs/test_global_func12.c | 4 +- + .../selftests/bpf/progs/test_global_func17.c | 1 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 92 ++++++++++++++++++++++ + .../bpf/progs/verifier_subprog_precision.c | 4 +- + tools/testing/selftests/bpf/test_offload.py | 15 ++-- + 12 files changed, 187 insertions(+), 37 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/verifier_global_subprogs.c +Merging ipsec-next/master (aadbd27f9674 net: phy: correctly check soft_reset ret ONLY if defined for PHY) +$ 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 (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) +$ 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 (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) +$ 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 (ab3d463ded5d Bluetooth: hci_event: shut up a false-positive warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 5 ++ + drivers/bluetooth/btintel.h | 4 +- + drivers/bluetooth/btusb.c | 4 ++ + drivers/bluetooth/hci_qca.c | 1 + + drivers/bluetooth/hci_vhci.c | 10 +-- + include/net/bluetooth/hci_core.h | 25 ++++++- + net/bluetooth/hci_conn.c | 32 ++++++++- + net/bluetooth/hci_event.c | 14 ++-- + net/bluetooth/hci_sync.c | 96 ++----------------------- + net/bluetooth/iso.c | 146 +++++++++++++++++++++++++++++++++++++-- + net/bluetooth/lib.c | 69 +++++++++++++++++- + net/bluetooth/mgmt.c | 17 ----- + 12 files changed, 291 insertions(+), 132 deletions(-) +Merging wireless-next/for-next (a214724554ae Merge tag 'wireless-next-2023-11-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ 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 (b85ea95d0864 Linux 6.7-rc1) +$ 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 (acb1fd579efb mtd: rawnand: meson: initialize clock register) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 2 +- + drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 2 +- + drivers/mtd/nand/raw/brcmnand/bcma_nand.c | 2 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 +--- + drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +- + drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c | 2 +- + drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 2 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- + drivers/mtd/nand/raw/meson_nand.c | 4 +++- + drivers/mtd/nand/raw/txx9ndfmc.c | 13 +++++-------- + 10 files changed, 16 insertions(+), 19 deletions(-) +Merging spi-nor/spi-nor/next (9b3eae3486c8 docs: mtd: spi-nor: drop obsolete info) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/mtd/spi-nor.rst | 238 ++++++++++++++++++++++++------- + MAINTAINERS | 2 +- + drivers/mtd/spi-nor/atmel.c | 16 +-- + drivers/mtd/spi-nor/core.c | 5 +- + drivers/mtd/spi-nor/core.h | 6 +- + drivers/mtd/spi-nor/sst.c | 6 +- + drivers/mtd/spi-nor/swp.c | 25 ++-- + 7 files changed, 217 insertions(+), 81 deletions(-) +Merging crypto/master (cc03a934c5da dt-bindings: crypto: convert Inside Secure SafeXcel to the json-schema) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + .../bindings/crypto/inside-secure,safexcel.yaml | 86 ++++++++++++++++++++++ + .../bindings/crypto/inside-secure-safexcel.txt | 40 ---------- + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + arch/x86/crypto/sha1_ssse3_glue.c | 7 +- + arch/x86/crypto/sha256_ssse3_glue.c | 7 +- + crypto/drbg.c | 40 ++++------ + crypto/rsa.c | 2 + + crypto/shash.c | 6 +- + crypto/testmgr.c | 25 +------ + drivers/char/hw_random/ingenic-rng.c | 2 +- + drivers/char/hw_random/virtio-rng.c | 8 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 25 +------ + drivers/crypto/ccree/cc_aead.c | 10 ++- + drivers/crypto/ccree/cc_cipher.c | 10 ++- + drivers/crypto/hisilicon/debugfs.c | 50 ++++++------- + drivers/crypto/hisilicon/qm.c | 22 ++++-- + drivers/crypto/hisilicon/zip/zip_main.c | 54 +++++++------- + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 3 +- + drivers/crypto/marvell/cesa/cesa.c | 6 +- + drivers/crypto/n2_core.c | 9 ++- + drivers/crypto/starfive/Kconfig | 2 +- + drivers/crypto/starfive/jh7110-cryp.c | 18 +---- + drivers/crypto/starfive/jh7110-cryp.h | 10 ++- + drivers/crypto/starfive/jh7110-rsa.c | 49 ++++-------- + lib/crypto/aesgcm.c | 13 ++++ + 27 files changed, 259 insertions(+), 248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure,safexcel.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt +Merging drm/drm-next (a13fee31f564 Merge v6.7-rc3 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/drm_gpuvm.c +Auto-merging include/drm/drm_gpuvm.h +Merge made by the 'ort' strategy. + Documentation/accel/qaic/aic100.rst | 11 +- + Documentation/accel/qaic/qaic.rst | 28 + + .../bindings/display/panel/newvision,nv3051d.yaml | 2 +- + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../devicetree/bindings/gpu/img,powervr.yaml | 73 + + Documentation/gpu/drivers.rst | 2 + + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-mm.rst | 6 + + Documentation/gpu/imagination/index.rst | 13 + + Documentation/gpu/imagination/uapi.rst | 174 + + Documentation/gpu/todo.rst | 17 + + MAINTAINERS | 23 +- + drivers/accel/ivpu/Kconfig | 11 +- + drivers/accel/ivpu/ivpu_debugfs.c | 57 + + drivers/accel/ivpu/ivpu_drv.c | 49 +- + drivers/accel/ivpu/ivpu_drv.h | 18 +- + drivers/accel/ivpu/ivpu_fw.c | 79 +- + drivers/accel/ivpu/ivpu_fw.h | 1 + + drivers/accel/ivpu/ivpu_gem.c | 692 +-- + drivers/accel/ivpu/ivpu_gem.h | 75 +- + drivers/accel/ivpu/ivpu_hw.h | 20 + + drivers/accel/ivpu/ivpu_hw_37xx.c | 59 +- + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 2 + + drivers/accel/ivpu/ivpu_hw_40xx.c | 69 +- + drivers/accel/ivpu/ivpu_ipc.c | 251 +- + drivers/accel/ivpu/ivpu_ipc.h | 33 +- + drivers/accel/ivpu/ivpu_job.c | 103 +- + drivers/accel/ivpu/ivpu_job.h | 4 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 38 + + drivers/accel/ivpu/ivpu_jsm_msg.h | 1 + + drivers/accel/ivpu/ivpu_mmu.c | 44 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 153 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 11 +- + drivers/accel/ivpu/ivpu_pm.c | 72 +- + drivers/accel/ivpu/ivpu_pm.h | 3 + + drivers/accel/ivpu/vpu_boot_api.h | 90 +- + drivers/accel/ivpu/vpu_jsm_api.h | 309 +- + drivers/accel/qaic/Makefile | 3 +- + drivers/accel/qaic/mhi_controller.c | 42 +- + drivers/accel/qaic/mhi_controller.h | 2 +- + drivers/accel/qaic/qaic.h | 6 + + drivers/accel/qaic/qaic_control.c | 2 +- + drivers/accel/qaic/qaic_data.c | 131 +- + drivers/accel/qaic/qaic_drv.c | 48 +- + drivers/accel/qaic/qaic_timesync.c | 395 ++ + drivers/accel/qaic/qaic_timesync.h | 11 + + drivers/dma-buf/dma-buf.c | 4 +- + drivers/gpu/drm/Kconfig | 14 +- + drivers/gpu/drm/Makefile | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 3 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +- + drivers/gpu/drm/armada/armada_crtc.c | 5 +- + drivers/gpu/drm/armada/armada_drv.c | 5 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 22 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 6 +- + drivers/gpu/drm/display/drm_dp_helper.c | 161 + + drivers/gpu/drm/display/drm_dp_mst_topology.c | 234 +- + drivers/gpu/drm/drm_atomic_helper.c | 4 +- + drivers/gpu/drm/drm_client.c | 12 +- + drivers/gpu/drm/drm_connector.c | 6 + + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_edid.c | 43 +- + drivers/gpu/drm/drm_edid_load.c | 16 - + drivers/gpu/drm/drm_eld.c | 55 + + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_flip_work.c | 27 +- + drivers/gpu/drm/drm_format_helper.c | 215 +- + drivers/gpu/drm/drm_framebuffer.c | 75 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 9 + + drivers/gpu/drm/drm_gpuvm.c | 1131 +++- + drivers/gpu/drm/drm_internal.h | 6 + + drivers/gpu/drm/drm_ioctl.c | 1 + + drivers/gpu/drm/drm_kms_helper_common.c | 32 - + drivers/gpu/drm/drm_mipi_dbi.c | 19 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/gud/gud_pipe.c | 30 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Makefile | 180 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 46 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 66 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 4 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 10 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 3 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 83 +- + drivers/gpu/drm/i915/display/intel_audio.c | 17 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 9 +- + drivers/gpu/drm/i915/display/intel_bios.c | 32 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 5 +- + drivers/gpu/drm/i915/display/intel_color.c | 70 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 1 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 160 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 16 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 177 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 5 + + drivers/gpu/drm/i915/display/intel_display.c | 560 +- + drivers/gpu/drm/i915/display/intel_display.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 20 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 98 + + .../i915/display/intel_display_debugfs_params.c | 176 + + .../i915/display/intel_display_debugfs_params.h | 13 + + .../gpu/drm/i915/display/intel_display_device.c | 13 +- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + .../gpu/drm/i915/display/intel_display_driver.c | 7 + + .../gpu/drm/i915/display/intel_display_params.c | 217 + + .../gpu/drm/i915/display/intel_display_params.h | 61 + + drivers/gpu/drm/i915/display/intel_display_power.c | 14 +- + .../drm/i915/display/intel_display_power_well.c | 23 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 31 +- + drivers/gpu/drm/i915/display/intel_dp.c | 502 +- + drivers/gpu/drm/i915/display/intel_dp.h | 26 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 99 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 14 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 660 ++- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 171 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 5 + + drivers/gpu/drm/i915/display/intel_dpll.c | 270 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 9 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 187 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 6 + + drivers/gpu/drm/i915/display/intel_dpt.c | 24 - + drivers/gpu/drm/i915/display/intel_dpt.h | 2 - + drivers/gpu/drm/i915/display/intel_dpt_common.c | 34 + + drivers/gpu/drm/i915/display/intel_dpt_common.h | 13 + + drivers/gpu/drm/i915/display/intel_dsb.c | 98 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.c | 82 + + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 29 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 355 +- + drivers/gpu/drm/i915/display/intel_fb.c | 8 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 57 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 - + drivers/gpu/drm/i915/display/intel_hdcp.c | 37 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 8 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 10 - + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 16 + + drivers/gpu/drm/i915/display/intel_link_bw.c | 30 +- + drivers/gpu/drm/i915/display/intel_link_bw.h | 1 + + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 6 + + .../gpu/drm/i915/display/intel_modeset_verify.c | 2 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 371 +- + drivers/gpu/drm/i915/display/intel_psr.h | 7 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_qp_tables.c | 3 - + drivers/gpu/drm/i915/display/intel_sdvo.c | 24 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 29 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 28 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 5 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 21 +- + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt.h | 14 + + drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +- + drivers/gpu/drm/i915/gvt/handlers.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 4 +- + drivers/gpu/drm/i915/i915_driver.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 20 +- + drivers/gpu/drm/i915/i915_gem.c | 2 - + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 2 + + drivers/gpu/drm/i915/i915_params.c | 89 - + drivers/gpu/drm/i915/i915_params.h | 22 - + drivers/gpu/drm/i915/i915_reg.h | 2 - + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 - + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + + drivers/gpu/drm/i915/soc/intel_gmch.c | 27 +- + drivers/gpu/drm/i915/vlv_sideband.c | 29 +- + drivers/gpu/drm/i915/vlv_sideband.h | 9 +- + drivers/gpu/drm/imagination/Kconfig | 18 + + drivers/gpu/drm/imagination/Makefile | 35 + + drivers/gpu/drm/imagination/pvr_ccb.c | 645 ++ + drivers/gpu/drm/imagination/pvr_ccb.h | 71 + + drivers/gpu/drm/imagination/pvr_cccb.c | 267 + + drivers/gpu/drm/imagination/pvr_cccb.h | 109 + + drivers/gpu/drm/imagination/pvr_context.c | 464 ++ + drivers/gpu/drm/imagination/pvr_context.h | 205 + + drivers/gpu/drm/imagination/pvr_debugfs.c | 53 + + drivers/gpu/drm/imagination/pvr_debugfs.h | 29 + + drivers/gpu/drm/imagination/pvr_device.c | 658 +++ + drivers/gpu/drm/imagination/pvr_device.h | 710 +++ + drivers/gpu/drm/imagination/pvr_device_info.c | 254 + + drivers/gpu/drm/imagination/pvr_device_info.h | 186 + + drivers/gpu/drm/imagination/pvr_drv.c | 1501 +++++ + drivers/gpu/drm/imagination/pvr_drv.h | 129 + + drivers/gpu/drm/imagination/pvr_free_list.c | 625 ++ + drivers/gpu/drm/imagination/pvr_free_list.h | 195 + + drivers/gpu/drm/imagination/pvr_fw.c | 1489 +++++ + drivers/gpu/drm/imagination/pvr_fw.h | 508 ++ + drivers/gpu/drm/imagination/pvr_fw_info.h | 135 + + drivers/gpu/drm/imagination/pvr_fw_meta.c | 554 ++ + drivers/gpu/drm/imagination/pvr_fw_meta.h | 14 + + drivers/gpu/drm/imagination/pvr_fw_mips.c | 252 + + drivers/gpu/drm/imagination/pvr_fw_mips.h | 48 + + drivers/gpu/drm/imagination/pvr_fw_startstop.c | 306 + + drivers/gpu/drm/imagination/pvr_fw_startstop.h | 13 + + drivers/gpu/drm/imagination/pvr_fw_trace.c | 515 ++ + drivers/gpu/drm/imagination/pvr_fw_trace.h | 78 + + drivers/gpu/drm/imagination/pvr_gem.c | 414 ++ + drivers/gpu/drm/imagination/pvr_gem.h | 170 + + drivers/gpu/drm/imagination/pvr_hwrt.c | 549 ++ + drivers/gpu/drm/imagination/pvr_hwrt.h | 165 + + drivers/gpu/drm/imagination/pvr_job.c | 788 +++ + drivers/gpu/drm/imagination/pvr_job.h | 161 + + drivers/gpu/drm/imagination/pvr_mmu.c | 2637 +++++++++ + drivers/gpu/drm/imagination/pvr_mmu.h | 108 + + drivers/gpu/drm/imagination/pvr_params.c | 147 + + drivers/gpu/drm/imagination/pvr_params.h | 72 + + drivers/gpu/drm/imagination/pvr_power.c | 433 ++ + drivers/gpu/drm/imagination/pvr_power.h | 41 + + drivers/gpu/drm/imagination/pvr_queue.c | 1432 +++++ + drivers/gpu/drm/imagination/pvr_queue.h | 169 + + drivers/gpu/drm/imagination/pvr_rogue_cr_defs.h | 6193 ++++++++++++++++++++ + .../gpu/drm/imagination/pvr_rogue_cr_defs_client.h | 159 + + drivers/gpu/drm/imagination/pvr_rogue_defs.h | 179 + + drivers/gpu/drm/imagination/pvr_rogue_fwif.h | 2188 +++++++ + drivers/gpu/drm/imagination/pvr_rogue_fwif_check.h | 493 ++ + .../gpu/drm/imagination/pvr_rogue_fwif_client.h | 373 ++ + .../drm/imagination/pvr_rogue_fwif_client_check.h | 133 + + .../gpu/drm/imagination/pvr_rogue_fwif_common.h | 60 + + .../gpu/drm/imagination/pvr_rogue_fwif_dev_info.h | 113 + + .../imagination/pvr_rogue_fwif_resetframework.h | 28 + + drivers/gpu/drm/imagination/pvr_rogue_fwif_sf.h | 1648 ++++++ + .../gpu/drm/imagination/pvr_rogue_fwif_shared.h | 258 + + .../drm/imagination/pvr_rogue_fwif_shared_check.h | 108 + + .../gpu/drm/imagination/pvr_rogue_fwif_stream.h | 78 + + .../gpu/drm/imagination/pvr_rogue_heap_config.h | 113 + + drivers/gpu/drm/imagination/pvr_rogue_meta.h | 356 ++ + drivers/gpu/drm/imagination/pvr_rogue_mips.h | 335 ++ + drivers/gpu/drm/imagination/pvr_rogue_mips_check.h | 58 + + drivers/gpu/drm/imagination/pvr_rogue_mmu_defs.h | 136 + + drivers/gpu/drm/imagination/pvr_stream.c | 285 + + drivers/gpu/drm/imagination/pvr_stream.h | 75 + + drivers/gpu/drm/imagination/pvr_stream_defs.c | 351 ++ + drivers/gpu/drm/imagination/pvr_stream_defs.h | 16 + + drivers/gpu/drm/imagination/pvr_sync.c | 289 + + drivers/gpu/drm/imagination/pvr_sync.h | 84 + + drivers/gpu/drm/imagination/pvr_vm.c | 1107 ++++ + drivers/gpu/drm/imagination/pvr_vm.h | 65 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 238 + + drivers/gpu/drm/imagination/pvr_vm_mips.h | 22 + + drivers/gpu/drm/imx/dcss/dcss-drv.c | 6 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 6 +- + drivers/gpu/drm/kmb/kmb_drv.c | 5 +- + drivers/gpu/drm/lima/lima_device.c | 2 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 5 +- + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 5 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_platform.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 174 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 8 - + drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 1 - + drivers/gpu/drm/omapdrm/omap_drv.c | 9 +- + drivers/gpu/drm/panel/panel-edp.c | 58 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 37 +- + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 57 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 78 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 13 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_dump.c | 12 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 85 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 1 + + drivers/gpu/drm/radeon/radeon_audio.c | 1 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 47 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 + + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 + + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 486 +- + drivers/gpu/drm/solomon/ssd130x.c | 38 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 6 +- + drivers/gpu/drm/sprd/sprd_drm.c | 5 +- + drivers/gpu/drm/sprd/sprd_dsi.c | 6 +- + drivers/gpu/drm/tegra/hdmi.c | 1 + + drivers/gpu/drm/tegra/sor.c | 1 + + drivers/gpu/drm/tests/Makefile | 4 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 465 -- + drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 166 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 72 +- + drivers/gpu/drm/tests/drm_mm_test.c | 1904 ------ + drivers/gpu/drm/tidss/tidss_kms.c | 4 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tiny/arcpgu.c | 6 +- + drivers/gpu/drm/tiny/cirrus.c | 3 +- + drivers/gpu/drm/tiny/ili9225.c | 10 +- + drivers/gpu/drm/tiny/ofdrm.c | 16 +- + drivers/gpu/drm/tiny/repaper.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 43 +- + drivers/gpu/drm/tiny/st7586.c | 19 +- + drivers/gpu/drm/v3d/Makefile | 3 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 170 +- + drivers/gpu/drm/v3d/v3d_drv.c | 46 +- + drivers/gpu/drm/v3d/v3d_drv.h | 31 + + drivers/gpu/drm/v3d/v3d_gem.c | 15 +- + drivers/gpu/drm/v3d/v3d_irq.c | 93 +- + drivers/gpu/drm/v3d/v3d_regs.h | 90 +- + drivers/gpu/drm/v3d/v3d_sched.c | 81 +- + drivers/gpu/drm/v3d/v3d_sysfs.c | 69 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 5 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 41 +- + drivers/video/fbdev/simplefb.c | 132 +- + include/drm/display/drm_dp.h | 25 + + include/drm/display/drm_dp_helper.h | 32 + + include/drm/display/drm_dp_mst_helper.h | 16 +- + include/drm/drm_color_mgmt.h | 19 +- + include/drm/drm_edid.h | 153 - + include/drm/drm_eld.h | 164 + + include/drm/drm_flip_work.h | 20 +- + include/drm/drm_format_helper.h | 81 +- + include/drm/drm_gem.h | 32 +- + include/drm/drm_gem_atomic_helper.h | 10 + + include/drm/drm_gpuvm.h | 549 +- + include/drm/drm_mipi_dbi.h | 4 +- + include/drm/drm_print.h | 2 +- + include/drm/gpu_scheduler.h | 50 +- + include/linux/iosys-map.h | 44 +- + include/linux/sizes.h | 9 + + include/uapi/drm/drm.h | 20 + + include/uapi/drm/drm_mode.h | 10 + + include/uapi/drm/ivpu_accel.h | 2 +- + include/uapi/drm/pvr_drm.h | 1297 ++++ + include/uapi/drm/qaic_accel.h | 5 +- + include/uapi/drm/v3d_drm.h | 5 + + include/uapi/drm/virtgpu_drm.h | 2 + + sound/core/pcm_drm_eld.c | 1 + + sound/soc/codecs/hdac_hdmi.c | 1 + + sound/soc/codecs/hdmi-codec.c | 1 + + sound/x86/intel_hdmi_audio.c | 1 + + 362 files changed, 44798 insertions(+), 6536 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpu/img,powervr.yaml + create mode 100644 Documentation/gpu/imagination/index.rst + create mode 100644 Documentation/gpu/imagination/uapi.rst + create mode 100644 drivers/accel/qaic/qaic_timesync.c + create mode 100644 drivers/accel/qaic/qaic_timesync.h + create mode 100644 drivers/gpu/drm/drm_eld.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs_params.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs_params.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_params.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_params.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.h + create mode 100644 drivers/gpu/drm/imagination/Kconfig + create mode 100644 drivers/gpu/drm/imagination/Makefile + create mode 100644 drivers/gpu/drm/imagination/pvr_ccb.c + create mode 100644 drivers/gpu/drm/imagination/pvr_ccb.h + create mode 100644 drivers/gpu/drm/imagination/pvr_cccb.c + create mode 100644 drivers/gpu/drm/imagination/pvr_cccb.h + create mode 100644 drivers/gpu/drm/imagination/pvr_context.c + create mode 100644 drivers/gpu/drm/imagination/pvr_context.h + create mode 100644 drivers/gpu/drm/imagination/pvr_debugfs.c + create mode 100644 drivers/gpu/drm/imagination/pvr_debugfs.h + create mode 100644 drivers/gpu/drm/imagination/pvr_device.c + create mode 100644 drivers/gpu/drm/imagination/pvr_device.h + create mode 100644 drivers/gpu/drm/imagination/pvr_device_info.c + create mode 100644 drivers/gpu/drm/imagination/pvr_device_info.h + create mode 100644 drivers/gpu/drm/imagination/pvr_drv.c + create mode 100644 drivers/gpu/drm/imagination/pvr_drv.h + create mode 100644 drivers/gpu/drm/imagination/pvr_free_list.c + create mode 100644 drivers/gpu/drm/imagination/pvr_free_list.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw.c + create mode 100644 drivers/gpu/drm/imagination/pvr_fw.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_info.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_meta.c + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_meta.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_mips.c + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_mips.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_startstop.c + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_startstop.h + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_trace.c + create mode 100644 drivers/gpu/drm/imagination/pvr_fw_trace.h + create mode 100644 drivers/gpu/drm/imagination/pvr_gem.c + create mode 100644 drivers/gpu/drm/imagination/pvr_gem.h + create mode 100644 drivers/gpu/drm/imagination/pvr_hwrt.c + create mode 100644 drivers/gpu/drm/imagination/pvr_hwrt.h + create mode 100644 drivers/gpu/drm/imagination/pvr_job.c + create mode 100644 drivers/gpu/drm/imagination/pvr_job.h + create mode 100644 drivers/gpu/drm/imagination/pvr_mmu.c + create mode 100644 drivers/gpu/drm/imagination/pvr_mmu.h + create mode 100644 drivers/gpu/drm/imagination/pvr_params.c + create mode 100644 drivers/gpu/drm/imagination/pvr_params.h + create mode 100644 drivers/gpu/drm/imagination/pvr_power.c + create mode 100644 drivers/gpu/drm/imagination/pvr_power.h + create mode 100644 drivers/gpu/drm/imagination/pvr_queue.c + create mode 100644 drivers/gpu/drm/imagination/pvr_queue.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_cr_defs.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_cr_defs_client.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_defs.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_check.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_client.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_client_check.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_common.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_dev_info.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_resetframework.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_sf.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_shared.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_shared_check.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_stream.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_heap_config.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_meta.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mips.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mips_check.h + create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mmu_defs.h + create mode 100644 drivers/gpu/drm/imagination/pvr_stream.c + create mode 100644 drivers/gpu/drm/imagination/pvr_stream.h + create mode 100644 drivers/gpu/drm/imagination/pvr_stream_defs.c + create mode 100644 drivers/gpu/drm/imagination/pvr_stream_defs.h + create mode 100644 drivers/gpu/drm/imagination/pvr_sync.c + create mode 100644 drivers/gpu/drm/imagination/pvr_sync.h + create mode 100644 drivers/gpu/drm/imagination/pvr_vm.c + create mode 100644 drivers/gpu/drm/imagination/pvr_vm.h + create mode 100644 drivers/gpu/drm/imagination/pvr_vm_mips.c + create mode 100644 drivers/gpu/drm/imagination/pvr_vm_mips.h + create mode 100644 drivers/gpu/drm/v3d/v3d_sysfs.c + create mode 100644 include/drm/drm_eld.h + create mode 100644 include/uapi/drm/pvr_drm.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 (fb3f43d50d9b drm/panel-edp: Avoid adding multiple preferred modes) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Merge made by the 'ort' strategy. + Documentation/gpu/drm-kms.rst | 8 + + Documentation/gpu/imagination/index.rst | 2 +- + Documentation/gpu/imagination/uapi.rst | 5 +- + Documentation/gpu/todo.rst | 23 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 24 +-- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 10 +- + drivers/gpu/drm/ast/ast_drv.c | 263 +++++++++++++++++++++++- + drivers/gpu/drm/ast/ast_drv.h | 101 ++++++--- + drivers/gpu/drm/ast/ast_main.c | 244 ++-------------------- + drivers/gpu/drm/ast/ast_mode.c | 26 ++- + drivers/gpu/drm/ast/ast_post.c | 75 ++++--- + drivers/gpu/drm/ast/ast_reg.h | 12 +- + drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c | 4 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 14 ++ + drivers/gpu/drm/drm_atomic_uapi.c | 97 ++++++++- + drivers/gpu/drm/drm_crtc_internal.h | 2 +- + drivers/gpu/drm/drm_damage_helper.c | 3 +- + drivers/gpu/drm/drm_ioctl.c | 13 ++ + drivers/gpu/drm/drm_mode_object.c | 2 +- + drivers/gpu/drm/drm_plane.c | 150 +++++++++++++- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 9 +- + drivers/gpu/drm/imagination/pvr_cccb.h | 1 + + drivers/gpu/drm/imagination/pvr_device.h | 25 ++- + drivers/gpu/drm/imagination/pvr_free_list.c | 2 +- + drivers/gpu/drm/imagination/pvr_fw.h | 3 +- + drivers/gpu/drm/imagination/pvr_fw_info.h | 8 +- + drivers/gpu/drm/imagination/pvr_hwrt.h | 1 + + drivers/gpu/drm/imagination/pvr_job.c | 4 +- + drivers/gpu/drm/imagination/pvr_mmu.c | 3 +- + drivers/gpu/drm/imagination/pvr_queue.c | 2 +- + drivers/gpu/drm/imagination/pvr_queue.h | 4 +- + drivers/gpu/drm/imagination/pvr_rogue_fwif_sf.h | 4 +- + drivers/gpu/drm/imagination/pvr_vm.c | 32 ++- + drivers/gpu/drm/imagination/pvr_vm.h | 3 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 9 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 31 ++- + drivers/gpu/drm/nouveau/nouveau_drv.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 68 ++---- + drivers/gpu/drm/nouveau/nouveau_exec.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 207 +++++++++++-------- + drivers/gpu/drm/nouveau/nouveau_sched.h | 43 ++-- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 205 +++++++++--------- + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 4 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 4 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 5 +- + drivers/gpu/drm/panel/panel-edp.c | 79 ++++++- + drivers/gpu/drm/qxl/qxl_display.c | 14 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 14 +- + drivers/gpu/drm/scheduler/sched_main.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- + drivers/gpu/drm/ttm/ttm_bo.c | 8 +- + drivers/gpu/drm/ttm/ttm_device.c | 6 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 20 +- + include/drm/drm_bridge.h | 2 +- + include/drm/drm_drv.h | 9 + + include/drm/drm_file.h | 12 ++ + include/drm/drm_framebuffer.h | 12 -- + include/drm/drm_plane.h | 24 +++ + include/drm/gpu_scheduler.h | 6 +- + include/uapi/drm/drm.h | 35 +++- + include/uapi/drm/drm_mode.h | 9 + + include/uapi/drm/pvr_drm.h | 10 +- + 75 files changed, 1331 insertions(+), 801 deletions(-) +Merging amdgpu/drm-next (699d392903c3 drm/amdgpu: Add function parameter 'xcc_mask' not described in 'amdgpu_vm_flush_compute_tlb') +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bc12f10af124] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/display/dc-debug.rst | 41 ++ + .../gpu/amdgpu/display/trace-groups-table.csv | 29 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 29 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 247 ++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h | 49 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 45 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 44 ++ + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 692 ++++++++++----------- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 31 - + drivers/gpu/drm/amd/display/Makefile | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 107 +++- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 46 +- + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 47 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 29 +- + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 46 -- + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce80/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 30 - + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 30 - + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 13 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 30 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h | 7 +- + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 10 +- + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 1 - + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 15 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 40 +- + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/resource.h | 12 + + drivers/gpu/drm/amd/display/dc/resource/Makefile | 199 ++++++ + .../dc/{ => resource}/dce100/dce100_resource.c | 0 + .../dc/{ => resource}/dce100/dce100_resource.h | 0 + .../dc/{ => resource}/dce110/dce110_resource.c | 0 + .../dc/{ => resource}/dce110/dce110_resource.h | 0 + .../dc/{ => resource}/dce112/dce112_resource.c | 0 + .../dc/{ => resource}/dce112/dce112_resource.h | 0 + .../dc/{ => resource}/dce120/dce120_resource.c | 2 +- + .../dc/{ => resource}/dce120/dce120_resource.h | 0 + .../amd/display/dc/resource/dce80/CMakeLists.txt | 4 + + .../dc/{ => resource}/dce80/dce80_resource.c | 0 + .../dc/{ => resource}/dce80/dce80_resource.h | 0 + .../dc/{ => resource}/dcn10/dcn10_resource.c | 25 +- + .../dc/{ => resource}/dcn10/dcn10_resource.h | 0 + .../dc/{ => resource}/dcn20/dcn20_resource.c | 24 +- + .../dc/{ => resource}/dcn20/dcn20_resource.h | 0 + .../dc/{ => resource}/dcn201/dcn201_resource.c | 14 +- + .../dc/{ => resource}/dcn201/dcn201_resource.h | 0 + .../dc/{ => resource}/dcn21/dcn21_resource.c | 6 +- + .../dc/{ => resource}/dcn21/dcn21_resource.h | 0 + .../dc/{ => resource}/dcn30/dcn30_resource.c | 2 +- + .../dc/{ => resource}/dcn30/dcn30_resource.h | 0 + .../dc/{ => resource}/dcn301/dcn301_resource.c | 4 +- + .../dc/{ => resource}/dcn301/dcn301_resource.h | 0 + .../dc/{ => resource}/dcn302/dcn302_resource.c | 4 +- + .../dc/{ => resource}/dcn302/dcn302_resource.h | 0 + .../dc/{ => resource}/dcn303/dcn303_resource.c | 4 +- + .../dc/{ => resource}/dcn303/dcn303_resource.h | 0 + .../dc/{ => resource}/dcn31/dcn31_resource.c | 2 +- + .../dc/{ => resource}/dcn31/dcn31_resource.h | 0 + .../dc/{ => resource}/dcn314/dcn314_resource.c | 0 + .../dc/{ => resource}/dcn314/dcn314_resource.h | 0 + .../dc/{ => resource}/dcn315/dcn315_resource.c | 0 + .../dc/{ => resource}/dcn315/dcn315_resource.h | 0 + .../dc/{ => resource}/dcn316/dcn316_resource.c | 0 + .../dc/{ => resource}/dcn316/dcn316_resource.h | 0 + .../dc/{ => resource}/dcn32/dcn32_resource.c | 4 +- + .../dc/{ => resource}/dcn32/dcn32_resource.h | 0 + .../dc/{ => resource}/dcn321/dcn321_resource.c | 2 +- + .../dc/{ => resource}/dcn321/dcn321_resource.h | 0 + .../dc/{ => resource}/dcn35/dcn35_resource.c | 20 +- + .../dc/{ => resource}/dcn35/dcn35_resource.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 81 ++- + .../gpu/drm/amd/display/include/hdcp_msg_types.h | 5 + + .../drm/amd/display/modules/freesync/freesync.c | 6 +- + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 8 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 17 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 11 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.c | 7 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.c | 9 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 9 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 3 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 40 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 36 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 18 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 36 +- + drivers/gpu/drm/radeon/clearstate_evergreen.h | 8 +- + 130 files changed, 1755 insertions(+), 836 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/display/trace-groups-table.csv + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce100/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn315/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce100/dce100_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce100/dce100_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce110/dce110_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce110/dce110_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce112/dce112_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce112/dce112_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce120/dce120_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce120/dce120_resource.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce80/dce80_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce80/dce80_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn10/dcn10_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn10/dcn10_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn20/dcn20_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn20/dcn20_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn201/dcn201_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn201/dcn201_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn21/dcn21_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn21/dcn21_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn30/dcn30_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn30/dcn30_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn301/dcn301_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn301/dcn301_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn302/dcn302_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn302/dcn302_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn303/dcn303_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn303/dcn303_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn31/dcn31_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn31/dcn31_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn314/dcn314_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn314/dcn314_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn315/dcn315_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn315/dcn315_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn316/dcn316_resource.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn316/dcn316_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn32/dcn32_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn32/dcn32_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn321/dcn321_resource.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn321/dcn321_resource.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn35/dcn35_resource.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn35/dcn35_resource.h (99%) +Merging drm-intel/for-linux-next (a4f477e6ac17 drm/i915/psr: Add proper handling for disabling sel fetch for planes) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_crtc_state_dump.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Merge made by the 'ort' strategy. + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 + + drivers/gpu/drm/i915/display/intel_cursor.c | 36 ++++++++- + drivers/gpu/drm/i915/display/intel_dp.c | 7 -- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 88 +++------------------- + drivers/gpu/drm/i915/display/intel_psr.h | 10 --- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 78 ++++++++++++++++++- + 7 files changed, 124 insertions(+), 100 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 (07e6de738aa6 drm/msm/a690: Fix reg values for a690) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 25 +++++---- + drivers/gpu/drm/msm/msm_debugfs.c | 41 +++++++++------ + drivers/gpu/drm/msm/msm_drv.c | 94 +++++++++++++++++++++++++++++++++- + drivers/gpu/drm/msm/msm_gem.c | 7 +-- + drivers/gpu/drm/msm/msm_gem.h | 4 ++ + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 40 +++++++++------ + drivers/gpu/drm/msm/msm_gpu.c | 44 ++++++++-------- + drivers/gpu/drm/msm/msm_rd.c | 3 ++ + include/uapi/drm/msm_drm.h | 2 + + 10 files changed, 191 insertions(+), 71 deletions(-) +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 +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +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 (64a1aed0aa07 fbdev: mmp: Fix typo and wording in code comment) +$ 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/fsl-diu-fb.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/imxfb.c | 179 ++++++++++++++++++++--------------- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 2 +- + 3 files changed, 104 insertions(+), 79 deletions(-) +Merging regmap/for-next (1957b92aaff0 regmap: fix regmap_noinc_write() description) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regmap-kunit.c | 60 ++++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-raw-ram.c | 23 ++++++++++---- + drivers/base/regmap/regmap.c | 2 +- + 4 files changed, 79 insertions(+), 7 deletions(-) +Merging sound/for-next (f8ccb133c986 ASoC: Intel: avs: Unhardcode HDAudio BE DAI drivers description) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/soc/codecs/hdac_hda.c +Auto-merging sound/soc/codecs/hdac_hdmi.c +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Auto-merging sound/soc/soc-pcm.c +Merge made by the 'ort' strategy. + include/sound/hda_codec.h | 5 +- + include/sound/hdaudio.h | 13 +-- + include/sound/pcm.h | 7 ++ + include/sound/pcm_params.h | 2 + + include/sound/soc.h | 1 + + include/uapi/sound/asound.h | 7 +- + sound/core/pcm.c | 3 + + sound/core/pcm_lib.c | 34 ++++++++ + sound/core/pcm_native.c | 55 +++++++++++- + sound/hda/hdac_device.c | 168 ++++++++++++++++++++++++++----------- + sound/hda/hdac_stream.c | 9 +- + sound/isa/wavefront/wavefront_fx.c | 6 +- + sound/pci/hda/hda_codec.c | 2 + + sound/pci/hda/hda_controller.c | 10 +-- + sound/pci/hda/patch_ca0132.c | 3 +- + sound/pci/hda/patch_hdmi.c | 6 +- + sound/soc/codecs/hda-dai.c | 7 +- + sound/soc/codecs/hda.c | 2 + + sound/soc/codecs/hdac_hda.c | 8 +- + sound/soc/codecs/hdac_hdmi.c | 10 ++- + sound/soc/intel/avs/loader.c | 4 +- + sound/soc/intel/avs/path.c | 2 +- + sound/soc/intel/avs/pcm.c | 58 ++++++++++--- + sound/soc/intel/avs/probes.c | 3 +- + sound/soc/intel/avs/topology.c | 13 ++- + sound/soc/intel/skylake/skl-pcm.c | 13 ++- + sound/soc/soc-pcm.c | 10 +++ + sound/soc/sof/intel/hda-dai-ops.c | 21 ++--- + tools/include/uapi/sound/asound.h | 7 +- + 29 files changed, 364 insertions(+), 125 deletions(-) +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 (1be95177eb04 Merge remote-tracking branch 'asoc/for-6.8' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging include/sound/soc.h +Auto-merging sound/soc/soc-pcm.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,max98363.yaml | 2 +- + Documentation/devicetree/bindings/sound/es8328.txt | 38 -- + .../devicetree/bindings/sound/everest,es8328.yaml | 77 ++++ + .../devicetree/bindings/sound/fsl,mqs.txt | 36 -- + .../devicetree/bindings/sound/fsl,mqs.yaml | 105 +++++ + .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 9 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 4 + + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 4 +- + .../bindings/sound/qcom,wcd938x-sdw.yaml | 4 +- + .../devicetree/bindings/sound/qcom,wcd938x.yaml | 4 +- + .../devicetree/bindings/sound/qcom,wsa883x.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wsa8840.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 36 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 2 +- + .../bindings/sound/sound-card-common.yaml | 7 + + .../bindings/sound/ti,tlv320aic32x4.yaml | 2 +- + Documentation/sound/soc/dapm.rst | 2 +- + MAINTAINERS | 1 - + include/sound/rt5682s.h | 8 + + include/sound/soc.h | 56 ++- + include/sound/sof/dai-imx.h | 7 + + include/sound/sof/dai.h | 2 + + include/sound/sof/ipc4/header.h | 29 ++ + include/uapi/sound/sof/tokens.h | 4 + + sound/soc/amd/acp/Kconfig | 13 + + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp63.c | 22 +- + sound/soc/amd/acp/acp70.c | 28 +- + sound/soc/codecs/aw88395/aw88395_device.h | 1 + + sound/soc/codecs/aw88395/aw88395_lib.c | 124 ++---- + sound/soc/codecs/aw88395/aw88395_reg.h | 3 - + sound/soc/codecs/aw88399.c | 1 - + sound/soc/codecs/aw88399.h | 1 + + sound/soc/codecs/cs42l43.c | 4 +- + sound/soc/codecs/cs43130.c | 318 +++++++++------ + sound/soc/codecs/cs43130.h | 3 + + sound/soc/codecs/es8326.c | 229 ++++++----- + sound/soc/codecs/nau8810.c | 9 +- + sound/soc/codecs/nau8821.c | 7 + + sound/soc/codecs/nau8821.h | 3 + + sound/soc/codecs/rt5682s.c | 23 ++ + sound/soc/codecs/rt5682s.h | 7 + + sound/soc/fsl/Kconfig | 13 - + sound/soc/fsl/Makefile | 4 - + sound/soc/fsl/fsl_mqs.c | 1 - + sound/soc/fsl/imx-rpmsg.c | 61 ++- + sound/soc/fsl/mpc8610_hpcd.c | 451 --------------------- + .../generic/audio-graph-card2-custom-sample.dtsi | 380 +++++++++++++++-- + sound/soc/generic/audio-graph-card2.c | 289 ++++++++++--- + sound/soc/intel/avs/boards/da7219.c | 10 +- + sound/soc/intel/avs/boards/dmic.c | 10 +- + sound/soc/intel/avs/boards/es8336.c | 10 +- + sound/soc/intel/avs/boards/hdaudio.c | 10 +- + sound/soc/intel/avs/boards/i2s_test.c | 10 +- + sound/soc/intel/avs/boards/max98357a.c | 10 +- + sound/soc/intel/avs/boards/max98373.c | 10 +- + sound/soc/intel/avs/boards/max98927.c | 10 +- + sound/soc/intel/avs/boards/nau8825.c | 10 +- + sound/soc/intel/avs/boards/probe.c | 10 +- + sound/soc/intel/avs/boards/rt274.c | 10 +- + sound/soc/intel/avs/boards/rt286.c | 10 +- + sound/soc/intel/avs/boards/rt298.c | 10 +- + sound/soc/intel/avs/boards/rt5514.c | 10 +- + sound/soc/intel/avs/boards/rt5663.c | 10 +- + sound/soc/intel/avs/boards/rt5682.c | 10 +- + sound/soc/intel/avs/boards/ssm4567.c | 10 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/Makefile | 3 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 8 +- + sound/soc/intel/boards/sof_board_helpers.c | 330 +++++++++++++++ + sound/soc/intel/boards/sof_board_helpers.h | 31 ++ + sound/soc/intel/boards/sof_cs42l42.c | 229 +++-------- + sound/soc/intel/boards/sof_maxim_common.c | 13 +- + sound/soc/intel/boards/sof_nau8825.c | 226 +++-------- + sound/soc/intel/boards/sof_rt5682.c | 355 +++++----------- + sound/soc/intel/boards/sof_sdw.c | 60 ++- + sound/soc/intel/boards/sof_sdw_common.h | 18 +- + sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 97 +++++ + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 8 + + sound/soc/intel/boards/sof_ssp_amp.c | 160 +++----- + sound/soc/intel/boards/sof_ssp_common.c | 21 + + sound/soc/intel/boards/sof_ssp_common.h | 1 + + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 71 ++++ + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 86 ++++ + sound/soc/sh/fsi.c | 4 +- + sound/soc/soc-core.c | 95 ++++- + sound/soc/soc-dapm.c | 75 ++-- + sound/soc/soc-pcm.c | 44 +- + sound/soc/sof/imx/imx8m.c | 7 + + sound/soc/sof/intel/hda-loader.c | 5 +- + sound/soc/sof/intel/hda.c | 6 +- + sound/soc/sof/intel/mtl.c | 15 +- + sound/soc/sof/ipc3-dtrace.c | 3 +- + sound/soc/sof/ipc3-pcm.c | 11 + + sound/soc/sof/ipc3-topology.c | 46 +++ + sound/soc/sof/ipc4-control.c | 179 ++++++++ + sound/soc/sof/ipc4-priv.h | 3 + + sound/soc/sof/ipc4-topology.c | 20 + + sound/soc/sof/ipc4.c | 57 +++ + sound/soc/sof/mediatek/adsp_helper.h | 4 - + sound/soc/sof/mediatek/mt8186/mt8186.c | 49 --- + sound/soc/sof/mediatek/mt8195/mt8195.c | 49 --- + sound/soc/sof/sof-audio.h | 1 + + sound/soc/sof/topology.c | 5 + + sound/soc/sti/sti_uniperif.c | 7 +- + sound/soc/tegra/tegra_pcm.c | 4 +- + 106 files changed, 3072 insertions(+), 1945 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es8328.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.yaml + mode change 100644 => 100755 sound/soc/codecs/es8326.c + delete mode 100644 sound/soc/fsl/mpc8610_hpcd.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt722_sdca.c +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 (fedfa36d045a Input: cap11xx - remove unnecessary IRQ parsing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/samsung,s6sy761.txt | 32 ------------- + .../input/touchscreen/samsung,s6sy761.yaml | 54 ++++++++++++++++++++++ + drivers/input/keyboard/cap11xx.c | 13 ++---- + 3 files changed, 58 insertions(+), 41 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.yaml +Merging block/for-next (20d713ea3192 Merge branch 'for-6.8/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging include/linux/blkdev.h +Merge made by the 'ort' strategy. + drivers/block/rnbd/rnbd-clt.c | 13 ++++++++----- + drivers/block/rnbd/rnbd-proto.h | 14 ++++++++++---- + drivers/block/rnbd/rnbd-srv.c | 25 +++++++++++++------------ + include/linux/blkdev.h | 24 +++++++++++------------- + 4 files changed, 42 insertions(+), 34 deletions(-) +Merging device-mapper/for-next (13648e04a9b8 dm-crypt: start allocating with MAX_ORDER) +$ 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 (804901fdd637 ata: pata_pxa: convert not to use dma_request_slave_channel()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/pata_pxa.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (078ebb647090 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 8 +- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 2 +- + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 1 + + drivers/mmc/core/mmc.c | 5 - + drivers/mmc/host/meson-mx-sdhc-mmc.c | 26 +- + drivers/mmc/host/mmci.c | 69 +++- + drivers/mmc/host/mmci.h | 2 + + drivers/mmc/host/sdhci-of-dwcmshc.c | 349 +++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 3 +- + drivers/mmc/host/sdhci.h | 1 + + drivers/mmc/host/sdhci_am654.c | 37 +-- + include/linux/mmc/card.h | 3 - + include/linux/mmc/core.h | 1 - + include/linux/mmc/mmc.h | 10 - + 14 files changed, 438 insertions(+), 79 deletions(-) +Merging mfd/for-mfd-next (95f44ef666a6 dt-bindings: mfd: qcom,spmi-pmic: Add pm8916 vm-bms and lbc) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/ams,as3711.yaml | 223 +++++++++++++++++++++ + Documentation/devicetree/bindings/mfd/as3711.txt | 73 ------- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + drivers/mfd/ab8500-sysctrl.c | 6 +- + drivers/mfd/cros_ec_dev.c | 5 +- + drivers/mfd/exynos-lpass.c | 6 +- + drivers/mfd/fsl-imx25-tsadc.c | 6 +- + drivers/mfd/hi655x-pmic.c | 5 +- + drivers/mfd/intel-lpss-acpi.c | 6 +- + drivers/mfd/intel-lpss-pci.c | 8 +- + drivers/mfd/intel-lpss.c | 11 +- + drivers/mfd/kempld-core.c | 6 +- + drivers/mfd/mcp-sa11x0.c | 6 +- + drivers/mfd/mxs-lradc.c | 6 +- + drivers/mfd/omap-usb-host.c | 5 +- + drivers/mfd/omap-usb-tll.c | 5 +- + drivers/mfd/pcf50633-adc.c | 6 +- + drivers/mfd/qcom-pm8xxx.c | 6 +- + drivers/mfd/qcom-spmi-pmic.c | 1 + + drivers/mfd/rk8xx-core.c | 34 ++-- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/stm32-timers.c | 6 +- + drivers/mfd/ti_am335x_tscadc.c | 6 +- + drivers/mfd/tps65086.c | 1 + + drivers/mfd/tps65911-comparator.c | 6 +- + drivers/mfd/twl4030-audio.c | 6 +- + include/soc/qcom/qcom-spmi-pmic.h | 1 + + 28 files changed, 297 insertions(+), 168 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/ams,as3711.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/as3711.txt +Merging backlight/for-backlight-next (58793f263abc backlight: pwm_bl: Use dev_err_probe) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/mps,mp3309c.yaml | 10 +- + MAINTAINERS | 7 + + drivers/video/backlight/Kconfig | 11 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/mp3309c.c | 443 +++++++++++++++++++++ + drivers/video/backlight/pwm_bl.c | 34 +- + 6 files changed, 484 insertions(+), 22 deletions(-) + create mode 100644 drivers/video/backlight/mp3309c.c +Merging battery/for-next (b55d073e6501 power: supply: bq256xx: fix some problem in bq256xx_hw_init) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + .../bindings/power/reset/nvmem-reboot-mode.yaml | 8 +++----- + .../bindings/power/reset/syscon-reboot-mode.yaml | 8 +++----- + drivers/power/reset/as3722-poweroff.c | 6 ++---- + drivers/power/reset/at91-poweroff.c | 11 +++++------ + drivers/power/reset/at91-reset.c | 11 +++++------ + drivers/power/reset/at91-sama5d2_shdwc.c | 11 +++++------ + drivers/power/reset/atc260x-poweroff.c | 6 ++---- + drivers/power/reset/ltc2952-poweroff.c | 5 ++--- + drivers/power/reset/mt6323-poweroff.c | 6 ++---- + drivers/power/reset/pwr-mlxbf.c | 20 +++++++++++++++----- + drivers/power/reset/qnap-poweroff.c | 5 ++--- + drivers/power/reset/regulator-poweroff.c | 6 ++---- + drivers/power/reset/restart-poweroff.c | 6 ++---- + drivers/power/reset/rmobile-reset.c | 5 ++--- + drivers/power/reset/syscon-poweroff.c | 6 ++---- + drivers/power/reset/tps65086-restart.c | 12 +++++++----- + drivers/power/supply/bq256xx_charger.c | 5 ++++- + drivers/power/supply/bq27xxx_battery.c | 22 ++++++++++++++++++++++ + drivers/power/supply/bq27xxx_battery_i2c.c | 1 + + include/linux/power/bq27xxx_battery.h | 1 + + 20 files changed, 89 insertions(+), 72 deletions(-) +Merging regulator/for-next (753e4d5c433d regulator: add under-voltage support (part 2)) +$ 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. + Documentation/admin-guide/kernel-parameters.txt | 7 ++ + .../bindings/regulator/fixed-regulator.yaml | 2 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 + + .../bindings/regulator/qcom,spmi-regulator.yaml | 19 ++++ + .../devicetree/bindings/regulator/regulator.yaml | 13 +++ + drivers/regulator/core.c | 107 ++++++++++++++++----- + drivers/regulator/of_regulator.c | 9 ++ + drivers/regulator/palmas-regulator.c | 2 +- + drivers/regulator/qcom_smd-regulator.c | 34 +++++++ + drivers/regulator/qcom_spmi-regulator.c | 34 +++++++ + drivers/regulator/stpmic1_regulator.c | 2 +- + include/linux/regulator/machine.h | 18 ++++ + 12 files changed, 225 insertions(+), 26 deletions(-) +Merging security/next (80b4ff1d2c9b selftests: remove the LSM_ID_IMA check in lsm/lsm_list_modules_test) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging .mailmap +Auto-merging Documentation/userspace-api/index.rst +Auto-merging MAINTAINERS +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +Auto-merging tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +Auto-merging tools/perf/arch/s390/entry/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in tools/perf/arch/s390/entry/syscalls/syscall.tbl +Auto-merging tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' using previous resolution. +Resolved 'tools/perf/arch/s390/entry/syscalls/syscall.tbl' using previous resolution. +Resolved 'tools/perf/arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 06e530fa3c65] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 4 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/lsm.rst | 73 ++++++ + MAINTAINERS | 17 +- + arch/alpha/kernel/syscalls/syscall.tbl | 3 + + arch/arm/tools/syscall.tbl | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 + + arch/m68k/kernel/syscalls/syscall.tbl | 3 + + arch/microblaze/kernel/syscalls/syscall.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 + + arch/parisc/kernel/syscalls/syscall.tbl | 3 + + arch/powerpc/kernel/syscalls/syscall.tbl | 3 + + arch/s390/kernel/syscalls/syscall.tbl | 3 + + arch/sh/kernel/syscalls/syscall.tbl | 3 + + arch/sparc/kernel/syscalls/syscall.tbl | 3 + + arch/x86/entry/syscalls/syscall_32.tbl | 3 + + arch/x86/entry/syscalls/syscall_64.tbl | 3 + + arch/xtensa/kernel/syscalls/syscall.tbl | 3 + + fs/proc/base.c | 29 +-- + fs/proc/internal.h | 2 +- + include/linux/lsm_hook_defs.h | 4 + + include/linux/lsm_hooks.h | 17 +- + include/linux/security.h | 47 +++- + include/linux/syscalls.h | 6 + + include/uapi/asm-generic/unistd.h | 9 +- + include/uapi/linux/lsm.h | 89 +++++++ + kernel/sys_ni.c | 3 + + security/Makefile | 1 + + security/apparmor/include/procattr.h | 2 +- + security/apparmor/lsm.c | 90 ++++++- + security/apparmor/procattr.c | 10 +- + security/bpf/hooks.c | 9 +- + security/commoncap.c | 8 +- + security/landlock/cred.c | 2 +- + security/landlock/fs.c | 2 +- + security/landlock/net.c | 2 +- + security/landlock/ptrace.c | 2 +- + security/landlock/setup.c | 6 + + security/landlock/setup.h | 1 + + security/loadpin/loadpin.c | 9 +- + security/lockdown/lockdown.c | 8 +- + security/lsm_syscalls.c | 120 +++++++++ + security/safesetid/lsm.c | 9 +- + security/security.c | 255 ++++++++++++++++++- + security/selinux/hooks.c | 145 ++++++++--- + security/smack/smack_lsm.c | 92 ++++++- + security/tomoyo/tomoyo.c | 9 +- + security/yama/yama_lsm.c | 8 +- + .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 3 + + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 3 + + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 3 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 3 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/lsm/.gitignore | 1 + + tools/testing/selftests/lsm/Makefile | 17 ++ + tools/testing/selftests/lsm/common.c | 89 +++++++ + tools/testing/selftests/lsm/common.h | 33 +++ + tools/testing/selftests/lsm/config | 3 + + .../testing/selftests/lsm/lsm_get_self_attr_test.c | 275 +++++++++++++++++++++ + .../testing/selftests/lsm/lsm_list_modules_test.c | 137 ++++++++++ + .../testing/selftests/lsm/lsm_set_self_attr_test.c | 74 ++++++ + 64 files changed, 1689 insertions(+), 97 deletions(-) + create mode 100644 Documentation/userspace-api/lsm.rst + create mode 100644 include/uapi/linux/lsm.h + create mode 100644 security/lsm_syscalls.c + create mode 100644 tools/testing/selftests/lsm/.gitignore + create mode 100644 tools/testing/selftests/lsm/Makefile + create mode 100644 tools/testing/selftests/lsm/common.c + create mode 100644 tools/testing/selftests/lsm/common.h + create mode 100644 tools/testing/selftests/lsm/config + create mode 100644 tools/testing/selftests/lsm/lsm_get_self_attr_test.c + create mode 100644 tools/testing/selftests/lsm/lsm_list_modules_test.c + create mode 100644 tools/testing/selftests/lsm/lsm_set_self_attr_test.c +$ git am -3 ../patches/0001-fix-up-for-LSM-wireup-Linux-Security-Module-syscalls.patch +Applying: fix up for "LSM: wireup Linux Security Module syscalls" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master a95b7c0a18e4] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git + Date: Wed Nov 29 10:16:40 2023 +1100 +Merging apparmor/apparmor-next (a7e405a2de69 apparmor: add missing params to aa_may_ptrace 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 +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + security/apparmor/Kconfig | 12 ++++++------ + security/apparmor/apparmorfs.c | 16 ++++++++-------- + security/apparmor/crypto.c | 6 +++--- + security/apparmor/domain.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/apparmor/task.c | 2 ++ + 6 files changed, 21 insertions(+), 19 deletions(-) +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 (ae254858ce07 selinux: introduce an initial SID for early boot processes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging MAINTAINERS +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +- + security/selinux/hooks.c | 28 +++++ + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/include/policycap.h | 1 + + security/selinux/include/policycap_names.h | 1 + + security/selinux/include/security.h | 6 + + security/selinux/selinuxfs.c | 148 +++++++++++------------ + security/selinux/ss/avtab.c | 101 +++++++--------- + security/selinux/ss/policydb.c | 38 ++++-- + security/selinux/ss/services.c | 13 +- + 10 files changed, 191 insertions(+), 153 deletions(-) +Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (c2d5304e6c64 Merge tag 'platform-drivers-x86-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ 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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (173ff345925a Merge branches 'apple/dart', 'virtio', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/scan.c +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/iommu/apple,dart.yaml | 1 + + MAINTAINERS | 2 + + drivers/acpi/scan.c | 7 +- + drivers/iommu/amd/iommu.c | 4 +- + drivers/iommu/apple-dart.c | 37 +++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 - + drivers/iommu/arm/arm-smmu/arm-smmu.c | 12 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 16 +- + drivers/iommu/intel/dmar.c | 18 ++ + drivers/iommu/intel/iommu.c | 18 +- + drivers/iommu/intel/iommu.h | 3 + + drivers/iommu/intel/svm.c | 26 +++ + drivers/iommu/io-pgtable-arm.c | 55 ++++-- + drivers/iommu/io-pgtable.c | 23 +++ + drivers/iommu/iommu.c | 219 ++++++++++++++------- + drivers/iommu/iommufd/hw_pagetable.c | 2 + + drivers/iommu/mtk_iommu.c | 7 +- + drivers/iommu/mtk_iommu_v1.c | 3 - + drivers/iommu/of_iommu.c | 15 +- + drivers/iommu/sprd-iommu.c | 8 +- + drivers/iommu/virtio-iommu.c | 36 +++- + include/acpi/acpi_bus.h | 2 + + include/linux/device.h | 1 - + include/linux/device/bus.h | 5 - + include/linux/dma-map-ops.h | 1 + + include/linux/io-pgtable.h | 34 ++++ + include/linux/iommu.h | 3 +- + 27 files changed, 401 insertions(+), 160 deletions(-) +Merging audit/next (24fade412acf Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +++++- + kernel/audit.c | 31 ++++++++++++++++++++++++------- + 2 files changed, 29 insertions(+), 8 deletions(-) +Merging devicetree/for-next (67f7a63ecc71 dt-bindings: arm/calxeda: drop unneeded quotes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/calxeda/l2ecc.yaml | 2 +- + Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml | 4 ++++ + Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml | 2 +- + Documentation/devicetree/bindings/power/fsl,scu-pd.yaml | 1 + + drivers/of/overlay.c | 2 +- + drivers/of/platform.c | 4 ++-- + 6 files changed, 10 insertions(+), 5 deletions(-) +Merging dt-krzk/for-next (b85ea95d0864 Linux 6.7-rc1) +$ 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 +Already up to date. +Merging mailbox/for-next (96cb7a4e296d dt-bindings: mailbox: qcom-ipcc: document the SM8650 Inter-Processor Communication Controller) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (8e6a43961f24 spi: sprd: adi: Use devm_register_restart_handler()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/adi,axi-spi-engine.txt | 31 -- + .../bindings/spi/adi,axi-spi-engine.yaml | 66 +++ + .../devicetree/bindings/spi/renesas,rspi.yaml | 2 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 1 + + MAINTAINERS | 10 + + drivers/input/rmi4/rmi_spi.c | 2 +- + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/spi/Kconfig | 3 +- + drivers/spi/spi-axi-spi-engine.c | 403 ++++++++++++------- + drivers/spi/spi-cadence-xspi.c | 1 - + drivers/spi/spi-ingenic.c | 15 +- + drivers/spi/spi-intel.c | 10 +- + drivers/spi/spi-sprd-adi.c | 30 +- + drivers/spi/spi-stm32.c | 447 ++++++++++++++------- + drivers/spi/spi-ti-qspi.c | 13 +- + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + include/linux/spi/spi.h | 2 - + 18 files changed, 671 insertions(+), 373 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt + create mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.yaml +Merging tip/master (c17381b94c15 Merge branch into tip/master: 'x86/percpu') +$ 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 +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-event_source-devices-caps | 6 + + Documentation/scheduler/sched-design-CFS.rst | 8 +- + .../zh_CN/scheduler/sched-design-CFS.rst | 8 +- + MAINTAINERS | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/x86/Kconfig | 12 + + arch/x86/entry/calling.h | 14 +- + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 35 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/core.c | 145 ++++++- + arch/x86/events/intel/cstate.c | 162 +++++-- + 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/apic.h | 2 - + arch/x86/include/asm/apicdef.h | 276 +----------- + arch/x86/include/asm/barrier.h | 18 - + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/current.h | 7 + + arch/x86/include/asm/fpu/sched.h | 10 +- + arch/x86/include/asm/io.h | 8 +- + arch/x86/include/asm/mce.h | 1 - + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/page.h | 6 +- + arch/x86/include/asm/paravirt.h | 8 +- + arch/x86/include/asm/paravirt_types.h | 8 +- + 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 | 21 + + arch/x86/include/asm/setup.h | 2 - + arch/x86/kernel/alternative.c | 8 +- + arch/x86/kernel/apic/apic_flat_64.c | 2 - + arch/x86/kernel/apic/apic_noop.c | 1 - + arch/x86/kernel/apic/apic_numachip.c | 2 - + arch/x86/kernel/apic/bigsmp_32.c | 1 - + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 1 - + arch/x86/kernel/apic/x2apic_cluster.c | 1 - + arch/x86/kernel/apic/x2apic_phys.c | 1 - + arch/x86/kernel/apic/x2apic_uv_x.c | 1 - + arch/x86/kernel/callthunks.c | 2 +- + arch/x86/kernel/cpu/amd.c | 3 + + arch/x86/kernel/cpu/common.c | 8 + + arch/x86/kernel/cpu/hygon.c | 3 + + arch/x86/kernel/cpu/intel_epb.c | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 74 ++-- + arch/x86/kernel/cpu/mce/core.c | 19 +- + arch/x86/kernel/cpu/mce/inject.c | 1 + + arch/x86/kernel/cpu/mtrr/generic.c | 14 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/process_32.c | 7 +- + arch/x86/kernel/process_64.c | 7 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smpboot.c | 1 + + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/lib/cmpxchg16b_emu.S | 12 +- + arch/x86/lib/cmpxchg8b_emu.S | 30 +- + arch/x86/lib/misc.c | 2 +- + arch/x86/platform/uv/uv_irq.c | 2 +- + arch/x86/xen/xen-asm.S | 10 +- + drivers/edac/mce_amd.c | 46 +- + drivers/iommu/amd/iommu.c | 4 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 7 - + include/linux/cleanup.h | 52 ++- + include/linux/compiler.h | 2 +- + include/linux/energy_model.h | 1 - + include/linux/lockdep_types.h | 2 +- + include/linux/mm_types.h | 3 + + include/linux/mutex.h | 3 +- + include/linux/perf_event.h | 22 +- + include/linux/rwsem.h | 8 +- + include/linux/sched.h | 26 +- + include/linux/spinlock.h | 15 + + include/trace/events/sched.h | 15 +- + include/uapi/linux/perf_event.h | 13 + + kernel/events/core.c | 46 +- + kernel/sched/core.c | 140 +++--- + kernel/sched/cpufreq_schedutil.c | 64 +-- + kernel/sched/deadline.c | 477 +++++++++++++-------- + kernel/sched/debug.c | 11 +- + kernel/sched/fair.c | 289 +++++++------ + kernel/sched/idle.c | 30 ++ + kernel/sched/rt.c | 15 +- + kernel/sched/sched.h | 135 ++---- + kernel/sched/stop_task.c | 13 +- + kernel/time/tick-internal.h | 3 +- + lib/debugobjects.c | 204 ++++----- + tools/objtool/check.c | 2 +- + 93 files changed, 1708 insertions(+), 1225 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 (a2f99fbae451 EDAC/{sb,i7core}_edac: Do not use a plain integer for a NULL pointer) +$ 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 +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.c | 21 ++++++--------------- + drivers/edac/armada_xp_edac.c | 16 +++++++--------- + drivers/edac/aspeed_edac.c | 6 ++---- + drivers/edac/bluefield_edac.c | 6 ++---- + drivers/edac/cell_edac.c | 5 ++--- + drivers/edac/cpc925_edac.c | 6 ++---- + drivers/edac/dmc520_edac.c | 6 ++---- + drivers/edac/edac_pci_sysfs.c | 4 ++-- + drivers/edac/fsl_ddr_edac.c | 3 +-- + drivers/edac/fsl_ddr_edac.h | 2 +- + drivers/edac/highbank_l2_edac.c | 5 ++--- + drivers/edac/highbank_mc_edac.c | 5 ++--- + drivers/edac/i7core_edac.c | 4 ++-- + drivers/edac/layerscape_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 13 +++++-------- + drivers/edac/npcm_edac.c | 6 ++---- + drivers/edac/octeon_edac-l2c.c | 6 ++---- + drivers/edac/octeon_edac-lmc.c | 5 ++--- + drivers/edac/octeon_edac-pc.c | 5 ++--- + drivers/edac/octeon_edac-pci.c | 6 ++---- + drivers/edac/ppc4xx_edac.c | 7 ++----- + drivers/edac/qcom_edac.c | 6 ++---- + drivers/edac/sb_edac.c | 10 +++++----- + drivers/edac/synopsys_edac.c | 6 ++---- + drivers/edac/thunderx_edac.c | 10 +++++----- + drivers/edac/ti_edac.c | 6 ++---- + drivers/edac/xgene_edac.c | 6 ++---- + drivers/edac/zynqmp_edac.c | 6 ++---- + 28 files changed, 71 insertions(+), 118 deletions(-) +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 (68f721e904b2 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 +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 | 8 +++++--- + kernel/rcu/rcutorture.c | 12 +++++++----- + kernel/rcu/tree_stall.h | 11 ++++++++++- + kernel/rcu/update.c | 6 ++++++ + 7 files changed, 62 insertions(+), 12 deletions(-) +Merging kvm/next (e9e60c82fe39 selftests/kvm: fix compilation on non-x86_64 platforms) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/pagemap.h +CONFLICT (content): Merge conflict in include/linux/pagemap.h +Auto-merging io_uring/io_uring.c +Auto-merging mm/migrate.c +Auto-merging tools/testing/selftests/kvm/Makefile +Resolved 'include/linux/pagemap.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4eef60944cfc] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 201 ++++++++ + arch/arm64/include/asm/kvm_host.h | 2 - + arch/arm64/kvm/Kconfig | 2 +- + arch/loongarch/include/asm/kvm_host.h | 1 - + arch/loongarch/kvm/Kconfig | 2 +- + arch/mips/include/asm/kvm_host.h | 2 - + arch/mips/kvm/Kconfig | 2 +- + arch/powerpc/include/asm/kvm_host.h | 2 - + arch/powerpc/kvm/Kconfig | 8 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/kvm/powerpc.c | 7 +- + arch/riscv/include/asm/kvm_host.h | 2 - + arch/riscv/kvm/Kconfig | 2 +- + arch/x86/include/asm/kvm_host.h | 17 +- + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kvm/Kconfig | 14 +- + arch/x86/kvm/debugfs.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 271 ++++++++++- + arch/x86/kvm/mmu/mmu_internal.h | 2 + + arch/x86/kvm/vmx/vmx.c | 11 +- + arch/x86/kvm/x86.c | 26 +- + fs/anon_inodes.c | 51 +- + fs/userfaultfd.c | 5 +- + include/linux/anon_inodes.h | 4 +- + include/linux/kvm_host.h | 142 +++++- + include/linux/kvm_types.h | 1 + + include/linux/pagemap.h | 17 + + include/uapi/linux/kvm.h | 49 ++ + io_uring/io_uring.c | 3 +- + mm/compaction.c | 43 +- + mm/migrate.c | 2 + + tools/testing/selftests/kvm/Makefile | 3 + + .../selftests/kvm/aarch64/page_fault_test.c | 2 +- + tools/testing/selftests/kvm/dirty_log_test.c | 2 +- + tools/testing/selftests/kvm/guest_memfd_test.c | 198 ++++++++ + .../testing/selftests/kvm/include/kvm_util_base.h | 150 +++++- + tools/testing/selftests/kvm/include/test_util.h | 5 + + tools/testing/selftests/kvm/include/ucall_common.h | 11 + + .../selftests/kvm/include/x86_64/processor.h | 15 + + tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 224 +++++---- + tools/testing/selftests/kvm/lib/memstress.c | 3 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 11 +- + .../testing/selftests/kvm/set_memory_region_test.c | 153 +++++- + .../kvm/x86_64/private_mem_conversions_test.c | 482 +++++++++++++++++++ + .../kvm/x86_64/private_mem_kvm_exits_test.c | 120 +++++ + .../selftests/kvm/x86_64/ucna_injection_test.c | 2 +- + virt/kvm/Kconfig | 17 + + virt/kvm/Makefile.kvm | 1 + + virt/kvm/dirty_ring.c | 2 +- + virt/kvm/guest_memfd.c | 534 +++++++++++++++++++++ + virt/kvm/kvm_main.c | 507 ++++++++++++++++--- + virt/kvm/kvm_mm.h | 26 + + 53 files changed, 3062 insertions(+), 306 deletions(-) + create mode 100644 tools/testing/selftests/kvm/guest_memfd_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/private_mem_kvm_exits_test.c + create mode 100644 virt/kvm/guest_memfd.c +$ git am -3 ../patches/0001-fs-Convert-error_remove_page-to-error_remove_folio.patch +Applying: fs: Convert error_remove_page to error_remove_folio +$ git reset HEAD^ +Unstaged changes after reset: +M virt/kvm/guest_memfd.c +$ git add -A . +$ git commit -v -a --amend +[master ef55a7f2d07a] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Wed Nov 29 11:09:30 2023 +1100 +$ git am -3 ../patches/0001-fix-up-for-KVM-Add-KVM_CREATE_GUEST_MEMFD-ioctl-for-.patch +Applying: fix up for "KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory" +$ git reset HEAD^ +Unstaged changes after reset: +M virt/kvm/guest_memfd.c +$ git add -A . +$ git commit -v -a --amend +[master b8e70ecaf74d] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Wed Nov 29 11:09:30 2023 +1100 +Merging kvm-arm/next (9daf33ca4801 Merge branch kvm-arm64/lpa2 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging tools/testing/selftests/kvm/include/kvm_util_base.h +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/cpufeature.h | 5 ++ + arch/arm64/include/asm/kvm_arm.h | 2 + + arch/arm64/include/asm/kvm_emulate.h | 12 ++- + arch/arm64/include/asm/kvm_pgtable.h | 76 +++++++++++----- + arch/arm64/include/asm/kvm_pkvm.h | 5 +- + arch/arm64/include/asm/pgtable-prot.h | 2 + + arch/arm64/include/asm/sysreg.h | 5 ++ + arch/arm64/include/asm/tlb.h | 15 ++-- + arch/arm64/include/asm/tlbflush.h | 100 +++++++++++++-------- + arch/arm64/kernel/cpufeature.c | 39 ++++++++ + arch/arm64/kvm/arm.c | 5 ++ + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 4 - + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +- + arch/arm64/kvm/hyp/nvhe/mm.c | 4 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 2 +- + arch/arm64/kvm/hyp/pgtable.c | 90 ++++++++++++------- + arch/arm64/kvm/mmu.c | 16 ++-- + arch/arm64/kvm/reset.c | 9 +- + arch/arm64/tools/cpucaps | 1 + + .../selftests/kvm/include/aarch64/processor.h | 4 +- + tools/testing/selftests/kvm/include/guest_modes.h | 4 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 1 + + .../testing/selftests/kvm/lib/aarch64/processor.c | 69 +++++++++++--- + tools/testing/selftests/kvm/lib/guest_modes.c | 50 +++++------ + tools/testing/selftests/kvm/lib/kvm_util.c | 3 + + 25 files changed, 360 insertions(+), 169 deletions(-) +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 (98b1cc82c4af Linux 6.7-rc2) +$ 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 (7f3da4b698bc xen/events: fix error code in xen_bind_pirq_msi_to_irq()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + arch/x86/xen/enlighten.c | 6 +++++- + arch/x86/xen/xen-ops.h | 2 +- + drivers/xen/events/events_base.c | 4 +++- + 3 files changed, 9 insertions(+), 3 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 (4a6c5607d450 workqueue: Make sure that wq_unbound_cpumask is never empty) +$ 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. + kernel/workqueue.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (3ecb4d85461a platform/x86/dell: alienware-wmi: Use kasprintf()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging drivers/acpi/scan.c +Merge made by the 'ort' strategy. + drivers/acpi/scan.c | 1 + + drivers/platform/mellanox/mlxbf-tmfifo.c | 2 +- + drivers/platform/x86/dell/alienware-wmi.c | 4 +- + drivers/platform/x86/intel/wmi/sbl-fw-update.c | 13 +-- + drivers/platform/x86/intel/wmi/thunderbolt.c | 3 +- + drivers/platform/x86/wmi.c | 66 ++++++----- + drivers/platform/x86/x86-android-tablets/core.c | 62 +++++++++++ + drivers/platform/x86/x86-android-tablets/lenovo.c | 124 ++++++++++++++++++++- + .../x86/x86-android-tablets/x86-android-tablets.h | 9 ++ + include/linux/wmi.h | 10 ++ + 10 files changed, 245 insertions(+), 49 deletions(-) +Merging chrome-platform/for-next (d131f1f3b459 platform/chrome: sensorhub: Implement quickselect for median calculation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 74 ++++++++++++++++-------- + 1 file changed, 51 insertions(+), 23 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (ecea08916418 firmware: coreboot: framebuffer: Avoid invalid zero physical address) +$ 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 +Merge made by the 'ort' strategy. + drivers/firmware/google/framebuffer-coreboot.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging hsi/for-next (fa72d143471d HSI: omap_ssi: Remove usage of the deprecated ida_simple_xx() API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (8171710be2d0 leds: max5970: Add support for max5970) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + .../bindings/leds/allwinner,sun50i-a100-ledc.yaml | 137 +++++ + Documentation/devicetree/bindings/leds/common.yaml | 2 +- + drivers/leds/Kconfig | 21 + + drivers/leds/Makefile | 2 + + drivers/leds/leds-max5970.c | 109 ++++ + drivers/leds/leds-sun50i-a100.c | 580 +++++++++++++++++++++ + drivers/leds/leds-syscon.c | 3 +- + drivers/leds/leds-tca6507.c | 30 +- + drivers/leds/trigger/ledtrig-gpio.c | 26 +- + 9 files changed, 867 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/allwinner,sun50i-a100-ledc.yaml + create mode 100644 drivers/leds/leds-max5970.c + create mode 100644 drivers/leds/leds-sun50i-a100.c +Merging ipmi/for-next (c5d03a0d8461 ipmi: Use regspacings passed as a module parameter) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_si_hardcode.c | 2 +- + drivers/char/ipmi/ipmi_si_platform.c | 12 ++++-------- + 2 files changed, 5 insertions(+), 9 deletions(-) +Merging driver-core/driver-core-next (2cc14f52aeb7 Linux 6.7-rc3) +$ 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 (24af68a0ed53 usb: misc: onboard_usb_hub: Add support for Cypress CY7C6563x) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 5 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 +- + Documentation/usb/raw-gadget.rst | 3 - + drivers/usb/cdns3/cdns3-gadget.c | 7 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/core/hub.c | 15 +- + drivers/usb/core/quirks.c | 7 + + drivers/usb/gadget/function/f_midi.c | 4 +- + drivers/usb/gadget/function/f_uvc.c | 11 +- + drivers/usb/gadget/function/f_uvc.h | 2 +- + drivers/usb/gadget/function/uvc.h | 14 +- + drivers/usb/gadget/function/uvc_v4l2.c | 16 +- + drivers/usb/gadget/function/uvc_video.c | 441 ++++++++++++++++----- + drivers/usb/gadget/function/uvc_video.h | 3 +- + drivers/usb/gadget/udc/at91_udc.c | 13 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 13 +- + drivers/usb/gadget/udc/gr_udc.c | 13 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 13 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 12 +- + drivers/usb/host/xhci-mem.c | 2 + + drivers/usb/host/xhci-ring.c | 11 +- + drivers/usb/host/xhci.c | 23 +- + drivers/usb/host/xhci.h | 9 +- + drivers/usb/misc/iowarrior.c | 1 - + drivers/usb/misc/onboard_usb_hub.c | 24 +- + drivers/usb/misc/onboard_usb_hub.h | 6 + + drivers/usb/misc/qcom_eud.c | 3 + + drivers/usb/phy/phy-generic.c | 14 +- + drivers/usb/typec/tcpm/tcpm.c | 6 +- + drivers/usb/usbip/vudc.h | 2 +- + drivers/usb/usbip/vudc_dev.c | 3 +- + drivers/usb/usbip/vudc_main.c | 2 +- + include/linux/usb/hcd.h | 5 +- + include/linux/usb/quirks.h | 3 + + 35 files changed, 517 insertions(+), 197 deletions(-) +Merging thunderbolt/next (655b8af57d31 thunderbolt: Remove duplicated re-assignment of pointer 'out') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/tunnel.c | 2 -- + 1 file changed, 2 deletions(-) +Merging usb-serial/usb-next (2cc14f52aeb7 Linux 6.7-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (ab58841ab9fc tty: srmcons: use 'buf' directly in srmcons_do_write()) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/8250/8250_omap.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/devices.txt | 3 + + Documentation/admin-guide/sysrq.rst | 11 +- + .../bindings/serial/fsl,s32-linflexuart.yaml | 2 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 2 +- + arch/alpha/kernel/srmcons.c | 9 +- + drivers/net/usb/hso.c | 11 -- + drivers/s390/char/con3215.c | 1 - + drivers/tty/amiserial.c | 10 +- + drivers/tty/ehv_bytechan.c | 7 +- + drivers/tty/goldfish.c | 7 +- + drivers/tty/hvc/hvc_console.c | 7 +- + drivers/tty/hvc/hvc_console.h | 4 +- + drivers/tty/hvc/hvc_opal.c | 17 +-- + drivers/tty/ipwireless/main.h | 3 - + drivers/tty/nozomi.c | 18 --- + drivers/tty/serdev/core.c | 15 ++- + drivers/tty/serdev/serdev-ttyport.c | 3 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 6 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 6 +- + drivers/tty/serial/8250/8250_bcm7271.c | 5 +- + drivers/tty/serial/8250/8250_core.c | 5 +- + drivers/tty/serial/8250/8250_dw.c | 6 +- + drivers/tty/serial/8250/8250_em.c | 5 +- + drivers/tty/serial/8250/8250_fsl.c | 5 +- + drivers/tty/serial/8250/8250_ingenic.c | 5 +- + drivers/tty/serial/8250/8250_ioc3.c | 5 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 6 +- + drivers/tty/serial/8250/8250_mtk.c | 6 +- + drivers/tty/serial/8250/8250_of.c | 5 +- + drivers/tty/serial/8250/8250_omap.c | 7 +- + drivers/tty/serial/8250/8250_pxa.c | 6 +- + drivers/tty/serial/8250/8250_tegra.c | 6 +- + drivers/tty/serial/8250/8250_uniphier.c | 6 +- + drivers/tty/serial/8250/serial_cs.c | 6 - + drivers/tty/serial/Kconfig | 3 + + drivers/tty/serial/altera_jtaguart.c | 6 +- + drivers/tty/serial/altera_uart.c | 6 +- + drivers/tty/serial/amba-pl011.c | 11 +- + drivers/tty/serial/ar933x_uart.c | 6 +- + drivers/tty/serial/atmel_serial.c | 22 ++-- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 6 +- + drivers/tty/serial/cpm_uart.c | 6 +- + drivers/tty/serial/digicolor-usart.c | 6 +- + drivers/tty/serial/esp32_acm.c | 5 +- + drivers/tty/serial/esp32_uart.c | 6 +- + drivers/tty/serial/fsl_linflexuart.c | 6 +- + drivers/tty/serial/fsl_lpuart.c | 5 +- + drivers/tty/serial/imx.c | 23 ++-- + drivers/tty/serial/jsm/jsm.h | 5 - + drivers/tty/serial/jsm/jsm_cls.c | 36 ----- + drivers/tty/serial/jsm/jsm_neo.c | 40 ------ + drivers/tty/serial/lantiq.c | 6 +- + drivers/tty/serial/liteuart.c | 6 +- + drivers/tty/serial/lpc32xx_hs.c | 6 +- + drivers/tty/serial/ma35d1_serial.c | 5 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/mcf.c | 6 +- + drivers/tty/serial/meson_uart.c | 8 +- + drivers/tty/serial/milbeaut_usio.c | 6 +- + drivers/tty/serial/mpc52xx_uart.c | 7 +- + drivers/tty/serial/msm_serial.c | 6 +- + drivers/tty/serial/mxs-auart.c | 20 +-- + drivers/tty/serial/omap-serial.c | 6 +- + drivers/tty/serial/owl-uart.c | 6 +- + drivers/tty/serial/pic32_uart.c | 7 +- + drivers/tty/serial/qcom_geni_serial.c | 6 +- + drivers/tty/serial/rda-uart.c | 6 +- + drivers/tty/serial/rp2.c | 1 - + drivers/tty/serial/sa1100.c | 6 +- + drivers/tty/serial/samsung_tty.c | 6 +- + drivers/tty/serial/sc16is7xx.c | 145 ++++++++++++--------- + drivers/tty/serial/sccnxp.c | 13 +- + drivers/tty/serial/serial-tegra.c | 5 +- + drivers/tty/serial/serial_core.c | 9 +- + drivers/tty/serial/serial_txx9.c | 5 +- + drivers/tty/serial/sh-sci.c | 13 +- + drivers/tty/serial/sifive.c | 10 +- + drivers/tty/serial/sprd_serial.c | 6 +- + drivers/tty/serial/st-asc.c | 6 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/sunhv.c | 6 +- + drivers/tty/serial/sunplus-uart.c | 6 +- + drivers/tty/serial/sunsab.c | 22 ++-- + drivers/tty/serial/sunsu.c | 6 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/tegra-tcu.c | 6 +- + drivers/tty/serial/timbuart.c | 6 +- + drivers/tty/serial/uartlite.c | 20 +-- + drivers/tty/serial/ucc_uart.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 7 +- + drivers/tty/sysrq.c | 19 ++- + drivers/tty/tty_io.c | 8 +- + drivers/tty/tty_port.c | 16 ++- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/keyboard.c | 10 +- + include/linux/serdev.h | 8 +- + include/linux/tty.h | 12 +- + include/linux/tty_driver.h | 5 +- + include/linux/tty_port.h | 4 +- + 100 files changed, 393 insertions(+), 551 deletions(-) +Merging char-misc/char-misc-next (bc1183a63057 misc: ocxl: main: Remove unnecessary ‘0’ values from rc) + 0e425d703c30 ("misc: ocxl: afu_irq: Remove unnecessary (void*) conversions") + 29eb0dc7bd1e ("misc: ocxl: link: Remove unnecessary (void*) conversions") + 62df29a542f9 ("misc: ocxl: context: Remove unnecessary (void*) conversions") + bc1183a63057 ("misc: ocxl: main: Remove unnecessary ‘0’ values from rc") +$ 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 +Merge made by the 'ort' strategy. +Merging accel/habanalabs-next (ce06bc9d7209 accel/habanalabs: expose module id through sysfs) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging drivers/accel/habanalabs/common/device.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-habanalabs | 6 ++ + drivers/accel/habanalabs/common/device.c | 25 +++-- + drivers/accel/habanalabs/common/firmware_if.c | 115 ++++++--------------- + drivers/accel/habanalabs/common/habanalabs.h | 10 ++ + drivers/accel/habanalabs/common/habanalabs_drv.c | 37 +++++++ + drivers/accel/habanalabs/common/hwmon.c | 4 - + drivers/accel/habanalabs/common/memory.c | 7 +- + drivers/accel/habanalabs/common/mmu/mmu.c | 1 + + drivers/accel/habanalabs/common/sysfs.c | 13 +++ + drivers/accel/habanalabs/gaudi2/gaudi2.c | 56 +++++----- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 1 + + .../habanalabs/include/hw_ip/pci/pci_general.h | 1 + + 12 files changed, 148 insertions(+), 128 deletions(-) +Merging coresight/next (60e5f23dc5d6 coresight: ultrasoc-smb: Use guards to cleanup) +$ 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-dummy.c | 5 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 6 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 56 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 2 +- + drivers/hwtracing/coresight/coresight-funnel.c | 5 +- + drivers/hwtracing/coresight/coresight-replicator.c | 5 +- + 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 | 28 +- + drivers/hwtracing/coresight/coresight-trbe.h | 2 + + drivers/hwtracing/coresight/ultrasoc-smb.c | 112 ++-- + drivers/hwtracing/coresight/ultrasoc-smb.h | 6 +- + drivers/hwtracing/ptt/hisi_ptt.c | 33 +- + drivers/hwtracing/ptt/hisi_ptt.h | 1 + + include/linux/coresight.h | 1 + + 27 files changed, 1460 insertions(+), 153 deletions(-) +Merging fastrpc/for-next (b85ea95d0864 Linux 6.7-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 (5496fb8eedd6 drivers/fpga: use standard array-copy function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging drivers/fpga/dfl.c +Merge made by the 'ort' strategy. + drivers/fpga/dfl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging icc/icc-next (feaf241ae2da Merge branch 'icc-fixes' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + + .../bindings/interconnect/qcom,sm8650-rpmh.yaml | 136 ++ + .../bindings/interconnect/qcom,x1e80100-rpmh.yaml | 83 + + drivers/interconnect/core.c | 3 + + drivers/interconnect/imx/imx8mm.c | 9 +- + drivers/interconnect/imx/imx8mn.c | 9 +- + drivers/interconnect/imx/imx8mp.c | 9 +- + drivers/interconnect/imx/imx8mq.c | 9 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/icc-rpm.h | 2 +- + drivers/interconnect/qcom/msm8916.c | 2 +- + drivers/interconnect/qcom/msm8939.c | 2 +- + drivers/interconnect/qcom/msm8974.c | 6 +- + drivers/interconnect/qcom/msm8996.c | 2 +- + drivers/interconnect/qcom/osm-l3.c | 6 +- + drivers/interconnect/qcom/qcm2290.c | 2 +- + drivers/interconnect/qcom/qcs404.c | 2 +- + drivers/interconnect/qcom/sdm660.c | 2 +- + drivers/interconnect/qcom/sm8650.c | 1674 ++++++++++++++ + drivers/interconnect/qcom/sm8650.h | 143 ++ + drivers/interconnect/qcom/smd-rpm.c | 6 +- + drivers/interconnect/qcom/x1e80100.c | 2328 ++++++++++++++++++++ + drivers/interconnect/qcom/x1e80100.h | 192 ++ + drivers/interconnect/samsung/exynos.c | 6 +- + .../dt-bindings/interconnect/qcom,sm8650-rpmh.h | 154 ++ + .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 207 ++ + 28 files changed, 4964 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8650-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,x1e80100-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/sm8650.c + create mode 100644 drivers/interconnect/qcom/sm8650.h + create mode 100644 drivers/interconnect/qcom/x1e80100.c + create mode 100644 drivers/interconnect/qcom/x1e80100.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8650-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h +Merging iio/togreg (6543f376ec8a iio: buffer: document known issue) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/base/property.c +Auto-merging drivers/iio/magnetometer/tmag5273.c +Auto-merging include/linux/property.h +Merge made by the 'ort' strategy. + .mailmap | 7 +- + Documentation/ABI/testing/sysfs-bus-iio | 18 + + .../bindings/iio/adc/maxim,max34408.yaml | 139 ++ + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 4 + + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 4 + + .../devicetree/bindings/iio/imu/bosch,bmi323.yaml | 77 + + .../iio/temperature/microchip,mcp9600.yaml | 70 + + MAINTAINERS | 11 +- + 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/adis.c | 18 +- + 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/imu/inv_icm42600/inv_icm42600_accel.c | 5 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 5 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 5 +- + drivers/iio/industrialio-buffer.c | 16 + + drivers/iio/industrialio-core.c | 63 + + drivers/iio/light/rohm-bu27008.c | 201 +- + drivers/iio/magnetometer/tmag5273.c | 10 +- + drivers/iio/pressure/bmp280-core.c | 42 +- + drivers/iio/pressure/bmp280-i2c.c | 8 +- + drivers/iio/pressure/bmp280-spi.c | 10 +- + drivers/iio/pressure/bmp280.h | 6 +- + drivers/iio/proximity/sx9324.c | 24 +- + drivers/iio/resolver/ad2s1210.c | 160 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/mcp9600.c | 139 ++ + include/linux/property.h | 12 + + 40 files changed, 3899 insertions(+), 141 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 Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.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 + create mode 100644 drivers/iio/temperature/mcp9600.c +Merging phy-next/next (7f6f9e0def00 phy: qcom-qmp-usb: Add Qualcomm SDX75 USB3 PHY support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../phy/amlogic,g12a-mipi-dphy-analog.yaml | 12 -- + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 17 -- + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 5 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 1 + + drivers/phy/phy-core.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 65 ++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 1 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 7 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 86 ++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 173 +++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 156 +++++++++++++++---- + 15 files changed, 476 insertions(+), 60 deletions(-) +Merging soundwire/next (55d50ace6b88 soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/stream.c +Auto-merging sound/soc/intel/boards/sof_sdw.c +Merge made by the 'ort' strategy. + drivers/soundwire/amd_manager.c | 8 +++++ + drivers/soundwire/bus.c | 4 +++ + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/generic_bandwidth_allocation.c | 8 ++--- + drivers/soundwire/intel_auxdevice.c | 3 ++ + drivers/soundwire/master.c | 2 +- + drivers/soundwire/qcom.c | 39 +++++++++++++----------- + drivers/soundwire/slave.c | 12 ++++---- + drivers/soundwire/stream.c | 10 +++--- + include/linux/soundwire/sdw.h | 10 +++--- + sound/soc/intel/boards/sof_sdw.c | 4 +-- + 11 files changed, 60 insertions(+), 42 deletions(-) +Merging extcon/extcon-next (b85ea95d0864 Linux 6.7-rc1) +$ 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 (98b1cc82c4af Linux 6.7-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (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 (271c81935801 w1: Add AXI 1-wire host driver for AMD programmable logic IP core) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/w1/amd,axi-1wire-host.yaml | 44 +++ + MAINTAINERS | 8 + + drivers/w1/masters/Kconfig | 11 + + drivers/w1/masters/Makefile | 1 + + drivers/w1/masters/amd_axi_w1.c | 395 +++++++++++++++++++++ + 5 files changed, 459 insertions(+) + create mode 100644 Documentation/devicetree/bindings/w1/amd,axi-1wire-host.yaml + create mode 100644 drivers/w1/masters/amd_axi_w1.c +Merging staging/staging-next (d488759416ed Staging: rtl8192e: Rename variable TsCommonInfo) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 8 + + MAINTAINERS | 5 +- + drivers/staging/rtl8192e/dot11d.c | 154 +----------- + drivers/staging/rtl8192e/dot11d.h | 58 +---- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 69 +----- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 9 - + drivers/staging/rtl8192e/rtl819x_BAProc.c | 206 ++++++++-------- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 40 +--- + drivers/staging/rtl8192e/rtl819x_TS.h | 20 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 70 +++--- + drivers/staging/rtl8192e/rtllib.h | 18 +- + drivers/staging/rtl8192e/rtllib_rx.c | 31 --- + drivers/staging/rtl8192e/rtllib_softmac.c | 241 +------------------ + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- + drivers/staging/rtl8192e/rtllib_tx.c | 24 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 94 ++------ + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 7 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 261 ++++++++------------- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 16 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 10 + + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 21 -- + drivers/staging/vme_user/Kconfig | 22 +- + drivers/staging/vt6655/card.c | 90 +++---- + drivers/staging/vt6655/card.h | 18 +- + drivers/staging/vt6655/device.h | 4 +- + drivers/staging/vt6655/device_main.c | 18 +- + drivers/staging/vt6655/rxtx.c | 2 +- + 31 files changed, 424 insertions(+), 1126 deletions(-) +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 (306f5df81fcc dmaengine: apple-admac: Keep upper bits of REG_BUS_WIDTH) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 ++ + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 2 +- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 39 ++++++++++++++++++---- + .../devicetree/bindings/dma/ti/k3-pktdma.yaml | 26 +++++++++++++-- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 20 +++++++++-- + drivers/dma/apple-admac.c | 5 ++- + drivers/dma/milbeaut-hdmac.c | 17 ++++++---- + drivers/dma/milbeaut-xdmac.c | 17 ++++++---- + drivers/dma/uniphier-mdmac.c | 17 ++++++---- + drivers/dma/uniphier-xdmac.c | 17 ++++++---- + 10 files changed, 124 insertions(+), 38 deletions(-) +Merging cgroup/for-next (357564d50da3 Merge branch 'for-6.8' 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. + Documentation/admin-guide/cgroup-v2.rst | 17 +- + include/linux/cgroup-defs.h | 7 + + include/linux/workqueue.h | 2 +- + kernel/cgroup/cpuset.c | 286 ++++++++++++++++------ + kernel/cgroup/legacy_freezer.c | 8 +- + kernel/cgroup/rstat.c | 43 ++-- + kernel/workqueue.c | 167 +++++++++---- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 222 +++++++++++------ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + 9 files changed, 532 insertions(+), 222 deletions(-) +Merging scsi/for-next (d85d85eab615 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 49 ++++++ + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 14 +- + drivers/scsi/ch.c | 12 +- + drivers/scsi/csiostor/csio_init.c | 3 +- + drivers/scsi/elx/libefc/efc_node.h | 12 +- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 53 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 4 +- + drivers/scsi/lpfc/lpfc_mbox.c | 6 +- + drivers/scsi/lpfc/lpfc_mem.c | 47 +++--- + drivers/scsi/lpfc/lpfc_sli.c | 20 ++- + drivers/scsi/lpfc/lpfc_sli.h | 10 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 231 +++++++++------------------ + drivers/scsi/mpt3sas/mpi/mpi2_image.h | 32 ++-- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 27 ++-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 35 ++-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 3 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 42 ++--- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 56 +++---- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 9 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h | 44 ++--- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 +- + drivers/ufs/core/ufs-sysfs.c | 120 ++++++++++++++ + include/ufs/unipro.h | 4 +- + 29 files changed, 466 insertions(+), 388 deletions(-) +Merging scsi-mkp/for-next (6bae38ddd3a8 Merge patch series "scsi: arcmsr: support Areca ARC-1688 Raid controller") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + drivers/scsi/arcmsr/arcmsr.h | 29 +++++++++- + drivers/scsi/arcmsr/arcmsr_hba.c | 96 +++++++++++++++++++++++++++++++++- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1 + + drivers/scsi/mpi3mr/mpi3mr.h | 6 +-- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 ++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 13 ++++- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 16 +++--- + drivers/scsi/scsi_error.c | 1 + + drivers/ufs/core/ufs-fault-injection.c | 19 +++++-- + drivers/ufs/core/ufs-fault-injection.h | 13 +++-- + drivers/ufs/core/ufshcd.c | 7 ++- + include/ufs/ufshcd.h | 5 ++ + 15 files changed, 191 insertions(+), 28 deletions(-) +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 +Already up to date. +Merging rpmsg/for-next (cae0e61beb7a arm64: dts: imx8mp: Add reserve-memory nodes for DSP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 22 ++++++++++++++++++++++ + drivers/remoteproc/imx_dsp_rproc.c | 1 + + 2 files changed, 23 insertions(+) +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 (58bfaaac0328 gpio: sysfs: fix forward declaration of struct gpio_device) +$ 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. + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml | 2 +- + drivers/gpio/gpio-mockup.c | 3 +-- + drivers/gpio/gpio-sifive.c | 1 - + drivers/gpio/gpiolib-sysfs.h | 4 ++-- + drivers/gpio/gpiolib.c | 14 ++++++++++++++ + include/linux/gpio/driver.h | 1 + + 6 files changed, 19 insertions(+), 6 deletions(-) +Merging gpio-intel/for-next (92fc925f8386 gpio: tangier: simplify locking using cleanup helpers) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-elkhartlake.c | 14 +-------- + drivers/gpio/gpio-tangier.c | 63 +++++++++++++---------------------------- + drivers/gpio/gpio-tangier.h | 4 +-- + 3 files changed, 22 insertions(+), 59 deletions(-) +Merging pinctrl/for-next (75eb87dfebda Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 148 ++ + .../bindings/pinctrl/qcom,sm8650-tlmm.yaml | 147 ++ + .../bindings/pinctrl/qcom,x1e80100-tlmm.yaml | 143 ++ + drivers/pinctrl/Kconfig | 16 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/cirrus/Kconfig | 3 +- + drivers/pinctrl/core.c | 24 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 4 +- + drivers/pinctrl/pinctrl-as3722.c | 17 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 1 + + drivers/pinctrl/pinctrl-tps6594.c | 373 ++++ + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Kconfig.msm | 18 + + drivers/pinctrl/qcom/Makefile | 3 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 69 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 7 + + drivers/pinctrl/qcom/pinctrl-msm.c | 42 + + drivers/pinctrl/qcom/pinctrl-msm.h | 5 + + drivers/pinctrl/qcom/pinctrl-sm8650-lpass-lpi.c | 255 +++ + drivers/pinctrl/qcom/pinctrl-sm8650.c | 1762 ++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 1876 ++++++++++++++++++++ + drivers/pinctrl/realtek/pinctrl-rtd.c | 4 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 16 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 + + 26 files changed, 4892 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8650-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,x1e80100-tlmm.yaml + create mode 100644 drivers/pinctrl/pinctrl-tps6594.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8650-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8650.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-x1e80100.c +Merging pinctrl-intel/for-next (6191e49de389 pinctrl: baytrail: Simplify code with cleanup helpers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/Kconfig | 12 +- + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-alderlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 230 ++++++++++--------------- + drivers/pinctrl/intel/pinctrl-broxton.c | 5 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 5 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 5 +- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 5 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 5 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 5 +- + drivers/pinctrl/intel/pinctrl-intel-platform.c | 225 ++++++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-intel.c | 32 ++-- + drivers/pinctrl/intel/pinctrl-intel.h | 14 +- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-lakefield.c | 5 +- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 5 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 72 +++----- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 5 +- + drivers/pinctrl/intel/pinctrl-tangier.c | 32 ++-- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 5 +- + 23 files changed, 414 insertions(+), 279 deletions(-) + create mode 100644 drivers/pinctrl/intel/pinctrl-intel-platform.c +Merging pinctrl-renesas/renesas-pinctrl (dc99d4c8ac46 dt-bindings: pinctrl: renesas: Drop unneeded quotes) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging pinctrl-samsung/for-next (904140fa4553 dt-bindings: pinctrl: samsung: use Exynos7 fallbacks for newer wake-up controllers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 43 ++++++++++++++-------- + .../bindings/pinctrl/samsung,pinctrl.yaml | 4 +- + MAINTAINERS | 1 - + 3 files changed, 31 insertions(+), 17 deletions(-) +Merging pwm/for-next (5d67b8f81b9d dt-bindings: pwm: samsung: add specific compatibles for existing SoC) + 5d67b8f81b9d ("dt-bindings: pwm: samsung: add specific compatibles for existing SoC") +$ 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 Documentation/devicetree/bindings/pwm/pwm-samsung.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 - + drivers/pwm/core.c | 76 ++++++--------- + drivers/pwm/pwm-atmel-hlcdc.c | 8 +- + drivers/pwm/pwm-atmel-tcb.c | 8 +- + drivers/pwm/pwm-bcm2835.c | 2 + + drivers/pwm/pwm-berlin.c | 8 +- + drivers/pwm/pwm-brcmstb.c | 8 +- + drivers/pwm/pwm-cros-ec.c | 1 - + drivers/pwm/pwm-dwc.c | 6 +- + drivers/pwm/pwm-img.c | 8 +- + drivers/pwm/pwm-imx-tpm.c | 10 +- + drivers/pwm/pwm-jz4740.c | 4 +- + drivers/pwm/pwm-rockchip.c | 9 +- + drivers/pwm/pwm-samsung.c | 6 +- + drivers/pwm/pwm-stm32-lp.c | 10 +- + drivers/pwm/pwm-stm32.c | 106 +++++++++++++-------- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 8 +- + drivers/pwm/sysfs.c | 2 +- + include/linux/pwm.h | 4 +- + 20 files changed, 135 insertions(+), 156 deletions(-) +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (b85ea95d0864 Linux 6.7-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 (b85ea95d0864 Linux 6.7-rc1) +$ 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 (3d762e21d563 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-cmos.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (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 (b85ea95d0864 Linux 6.7-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 (b85ea95d0864 Linux 6.7-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 +Already up to date. +Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (83c5dcf78ab9 bus: mhi: host: Add alignment check for event ring read pointer) +$ 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 ++++++++++++++++++++++++++++---------- + drivers/bus/mhi/host/init.c | 1 + + drivers/bus/mhi/host/internal.h | 2 +- + drivers/bus/mhi/host/main.c | 8 +++-- + drivers/bus/mhi/host/pci_generic.c | 22 ++++++++++++ + drivers/bus/mhi/host/pm.c | 24 ++++++++++---- + include/linux/mhi.h | 4 +++ + 7 files changed, 100 insertions(+), 29 deletions(-) +Merging memblock/for-next (e96c6b8f212a 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 +Already up to date. +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 (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +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 (c1869dbd2957 Merge branch 'unicode/negative-dentries' into unicode/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging fs/afs/dynroot.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/gfs2/dentry.c +Auto-merging fs/libfs.c +Auto-merging fs/namei.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/proc/base.c +Auto-merging fs/smb/client/dir.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 3 +- + Documentation/filesystems/vfs.rst | 11 +++- + fs/9p/vfs_dentry.c | 11 +++- + fs/afs/dir.c | 6 +- + fs/afs/dynroot.c | 4 +- + fs/ceph/dir.c | 5 +- + fs/coda/dir.c | 3 +- + fs/crypto/fname.c | 3 +- + fs/dcache.c | 8 +++ + fs/ecryptfs/dentry.c | 6 +- + fs/ecryptfs/inode.c | 8 +++ + fs/exfat/namei.c | 3 +- + fs/ext4/namei.c | 35 ++--------- + fs/f2fs/namei.c | 25 ++------ + fs/fat/namei_vfat.c | 6 +- + fs/fuse/dir.c | 3 +- + fs/gfs2/dentry.c | 4 +- + fs/hfs/sysdep.c | 3 +- + fs/jfs/namei.c | 3 +- + fs/kernfs/dir.c | 3 +- + fs/libfs.c | 107 ++++++++++++++++++++++++---------- + fs/namei.c | 18 +++--- + fs/nfs/dir.c | 9 ++- + fs/ocfs2/dcache.c | 4 +- + fs/orangefs/dcache.c | 3 +- + fs/overlayfs/super.c | 20 ++++--- + fs/proc/base.c | 6 +- + fs/proc/fd.c | 3 +- + fs/proc/generic.c | 6 +- + fs/proc/proc_sysctl.c | 3 +- + fs/reiserfs/xattr.c | 3 +- + fs/smb/client/dir.c | 3 +- + fs/vboxsf/dir.c | 4 +- + include/linux/dcache.h | 10 +++- + include/linux/fscrypt.h | 4 +- + 35 files changed, 219 insertions(+), 137 deletions(-) +Merging slab/slab/for-next (7eec549256f2 Merge branch 'slab/for-6.8/slab-removal' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging CREDITS +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging include/linux/cpuhotplug.h +Auto-merging kernel/cpu.c +Auto-merging lib/Kconfig.kasan +Auto-merging mm/Kconfig +Auto-merging mm/kasan/common.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/kasan/quarantine.c +CONFLICT (content): Merge conflict in mm/kasan/quarantine.c +Auto-merging mm/memcontrol.c +Auto-merging mm/mempool.c +Auto-merging mm/slub.c +Resolved 'mm/kasan/quarantine.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7044bcbba6e3] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 12 +- + Documentation/core-api/mm-api.rst | 2 +- + arch/arm64/Kconfig | 2 +- + arch/s390/Kconfig | 2 +- + arch/x86/Kconfig | 2 +- + include/linux/cpuhotplug.h | 1 - + include/linux/slab.h | 22 +- + include/linux/slab_def.h | 124 -- + include/linux/slub_def.h | 204 -- + kernel/cpu.c | 5 - + lib/Kconfig.debug | 1 - + lib/Kconfig.kasan | 11 +- + lib/Kconfig.kfence | 2 +- + lib/Kconfig.kmsan | 2 +- + mm/Kconfig | 68 +- + mm/Kconfig.debug | 16 +- + mm/Makefile | 6 +- + mm/dmapool.c | 2 +- + mm/kasan/common.c | 13 +- + mm/kasan/kasan.h | 3 +- + mm/kasan/quarantine.c | 7 - + mm/kasan/report.c | 1 + + mm/kfence/core.c | 4 - + mm/memcontrol.c | 6 +- + mm/mempool.c | 6 +- + mm/slab.c | 4026 ------------------------------------- + mm/slab.h | 551 ++--- + mm/slab_common.c | 231 +-- + mm/slub.c | 1007 +++++++--- + 29 files changed, 998 insertions(+), 5341 deletions(-) + delete mode 100644 include/linux/slab_def.h + delete mode 100644 include/linux/slub_def.h + delete mode 100644 mm/slab.c +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 (323f65ded48d landlock: Document IOCTL support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging security/landlock/fs.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 74 +++- + include/uapi/linux/landlock.h | 58 +++- + samples/landlock/sandboxer.c | 13 +- + security/landlock/fs.c | 150 +++++++- + security/landlock/fs.h | 11 + + security/landlock/limits.h | 15 +- + security/landlock/ruleset.c | 5 +- + security/landlock/ruleset.h | 2 +- + security/landlock/syscalls.c | 10 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 498 ++++++++++++++++++++++++++- + 11 files changed, 789 insertions(+), 49 deletions(-) +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 (0762cf0860c8 lib/find_bit: Fix the code comments about find_next_bit_wrap) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + include/linux/find.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (d71f22365a9c gcc-plugins: randstruct: Update code comment in relayout_struct()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +++----- + include/uapi/linux/stddef.h | 2 +- + scripts/gcc-plugins/randomize_layout_plugin.c | 3 +-- + 3 files changed, 5 insertions(+), 8 deletions(-) +Merging kspp-gustavo/for-next/kspp (89741e7e42f6 Makefile: Enable -Wstringop-overflow globally) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging Makefile +Auto-merging scripts/Makefile.extrawarn +Merge made by the 'ort' strategy. + Makefile | 2 ++ + arch/powerpc/crypto/aes-gcm-p10-glue.c | 2 +- + scripts/Makefile.extrawarn | 2 -- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging nolibc/nolibc (b85ea95d0864 Linux 6.7-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..10ee0ab9d9f7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20231129 |