diff options
| -rw-r--r-- | Next/SHA1s | 374 | ||||
| -rw-r--r-- | Next/Trees | 376 | ||||
| -rw-r--r-- | Next/merge.log | 12123 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 12874 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b39b89bd0a7a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,374 @@ +Name SHA1 +---- ---- +origin 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 9238ca68a8560dc180a5cab5f49928bcca83a471 +kbuild-current 98b1cc82c4affc16f5598d4fa14b1858671b2263 +arc-current 9a733dc4fbeec3f6d99645b845712b035e7440cf +arm-current f54e8634d1366926c807e2af6125b33cff555fa7 +arm64-fixes 3c0696076aad60a2f04c019761921954579e1b0e +arm-soc-fixes d73ad797c83b0777407a2200bbefa3cb82759247 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 03191fb3db3d2585725bcffe0356d12fcfd27c4c +powerpc-fixes d2441d3e8c0c076d0a2e705fa235c76869a85140 +s390-fixes e6b2dab41888332bf83f592131e7ea07756770a4 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 979e90173af8d2f52f671d988189aab98c6d1be6 +bpf 117211aa739a926e6555cfea883be84bee6f1695 +ipsec 76df934c6d5f5c93ba7a0112b1818620ddc10b19 +netfilter 1ae4cd3cbdd08287c56c4cc816ebf05eb6681a0f +ipvs 1ae4cd3cbdd08287c56c4cc816ebf05eb6681a0f +wireless 400f6ebbc175286576c7f7fddf3c347d09d12310 +wpan 83fcf26b00d77e4a0ec920524fe85350a27e9c05 +rdma-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +sound-current ae53e2198cb811f7ee7c5cd4580bf42e88086fa5 +sound-asoc-fixes f32c80d34249e1cfb2e647ab3c8ef38a460c787f +regmap-fixes fea88064445a59584460f7f67d102b6e5fc1ca1d +regulator-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spi-fixes fc70d643a2f6678cbe0f5c86433c1aeb4d613fcc +pci-current 5df12742b7e3aae2594a30a9d14d5d6e9e7699f4 +driver-core.current 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +tty.current a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +usb.current 7fbcd195e2b8cc952e4aeaeb50867b798040314c +usb-serial-fixes 06f22cd6635bdae7d73566fca9879b2026a08e00 +phy 2a9c713825b3127ece11984abf973672c9779518 +staging.current 98b1cc82c4affc16f5598d4fa14b1858671b2263 +iio-fixes 1e8787459bfd8be5c4de1509bd4b9a508487c2f5 +counter-current a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +char-misc.current 1e37bf84afacd5ba17b7a13a18ca2bc78aff05c0 +soundwire-fixes 393cae5f32d640b9798903702018a48c7a45e59f +thunderbolt-fixes f0b94c1c5c7994a74e487f43c91cfc922105a423 +input-current c3d1610345b79cbe29ef6ca04a4780eff0d360c7 +crypto-current 9aedd10fe38418319bd8ed55dc68a40ec04aaa05 +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 4ee632c82d2dbb9e2dcc816890ef182a151cbd99 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 7c1b1906229db88c487e21e1ecb622db64a1830d +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 32138be394e5d32c095a413949e6ab4875b2aec0 +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +at91-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +omap-fixes c72b9c33ef9695ad7ce7a6eb39a9df8a01b70796 +kvm-fixes 4cdf351d3630a640ab6a05721ef055b9df62277f +kvms390-fixes 27072b8e18a73ffeffb1c140939023915a35134b +hwmon-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes ef3d5cf9c59cccb012aa6b93d99f4c6eb5d6648e +btrfs-fixes cdec1b57f10a83b26cc2655ab9a15b49f241747b +vfs-fixes 485053bb81c81a122edd982b263277e65d7485c5 +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes 7bcd032370f88fd4022b6926d101403e96a86309 +samsung-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-samsung-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +devicetree-fixes 136c6531ba12e4a658376387e355a09c9b5223e5 +dt-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +scsi-fixes 77a67255609606164e1042f3bf7452a568a700e4 +drm-fixes ceb6a6f023fd3e8b07761ed900352ef574010bcb +drm-intel-fixes ceb6a6f023fd3e8b07761ed900352ef574010bcb +mmc-fixes 1036f69e251380573e256568cf814506e3fb9988 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +hyperv-fixes 564eac2860bdbe6ac651e6909ac07ecd93d778f3 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes eb46a0076501a63fb1cb5f4ed3c604ceed1327b0 +riscv-dt-fixes 79997eda0d31bc68203c95ecb978773ee6ce7a1f +riscv-soc-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spdx a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +gpio-brgl-fixes ceb6a6f023fd3e8b07761ed900352ef574010bcb +gpio-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +erofs-fixes 62b241efff99fc4d88a86f1c67c7516e31f432a3 +kunit-fixes 1bddcf77ce6668692fc15e968fd0870d5524d112 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 55122e0130e51eb71f5ec62d10525db0468f28e8 +nfsd-fixes 1227561c2ffb81ab09ead21cce6438f59276aa6e +irqchip-fixes b673fe1a6229a49be5394f4e539055d9ce685615 +renesas-fixes 9eab43facdadb7d00456c2657001ae2e5353c814 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current b1693747487442984050eb0f462b83a3a8307525 +efi-fixes 50d7cdf7a9b1ab6f4f74a69c84e974d5dc0c1bf1 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes f37669119423ca852ca855b24732f25c0737aa57 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 6f9c4d8c468c189d6dc470324bd52955f8aa0a10 +rust-fixes cfd96726e61136e68a168813cedc4084f626208b +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pmdomain-fixes 0cb19e50a911aaadf49eed120392e429d6e1fa0c +overlayfs-fixes 413ba91089c74207313b315e04cf381ffb5b20e4 +drm-misc-fixes aca58eac52b88138ab98c814afb389a381725cd7 +mm-stable d9d9bd979cced7d4a51b65224b1d7f396c8b4eea +mm-nonmm-stable fc0fbad122a7609d785ee754c2b6e1e3265547d0 +mm b960ce977c11b66f9eda29aca3e292fc2ddc6174 +kbuild 1809d3a7b51a6ef0f6953d9b2533a71e8e631fee +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf a61f89bf76ef6f87ec48dd90dbc73a6cf9952edc +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping b07bc2347672cc8c7293c64499f1488278c5ca3d +asm-generic d6e81532b10d8deb2bc30f7b44f09534876893e3 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm f1ff4ced177d35d52874ae0ce64b54275bdff6fd +arm64 fdd44642dc72c6c37176fec17cb28b4cd2df913f +arm-perf bb339db4d363c84e0a8d70827df591397ccd7312 +arm-soc 16bcd9a4a33275a3f35670e06fbaac04950540d1 +amlogic 7406f70924e6f2647c29fa3d991c60f74c5ef57b +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed e60f7a99d3789b5d0b24d3c0571b013309e56815 +at91 58f72e7817f1f46d1a61558bc8dae1059c0d9379 +broadcom 62a3c97f8167c88a5623d45c8984927c82c286be +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 4a23d0f9814c38308dc82b6dbc466666a400b27d +imx-mxs 4db02d61a81ea4ab3bf9ec6878ccf3f2a3f27405 +mediatek 9802b60bd6d895a8be9c44cc5f74bb11131aa8bc +mvebu 476887312c6082e2c03efc3f016e8134c076108e +omap 0ea5e8402a4709edfc011b69518d696677fc3922 +qcom 452e8fdfae6cd82daa164b510b98e441da3f071f +renesas a4ce2434e9bb0e1ded26c7bdfc45893d3dadc700 +reset c3c46acd5be9a3351c163d2869045cab4d5342dc +rockchip 242278ed93dd9ac662501cb071bb565c51bbc80e +samsung-krzk 1b97a284a293f1ce0c31fff372c4c90b1100ced6 +scmi 7c2d214ab5b92901a5adaf059cfaccf055b8cd53 +stm32 769e4b077b2eb5f9c633f4f6a566f29036fb3f47 +sunxi d4d29dd858bb1cb78d2848d6742ade3c0421ce49 +tee 84ec4fd8883176442d21454bcecd3c29c0aabad6 +tegra 8ebef8a2874952441b6573f982bfac25d4426bf4 +ti bfb1d67c6f854cf214a4bc8758a6f8adb02ea222 +xilinx 21d01d5afbc8e52081f8bf721f16f4a34ec4b84a +clk 7aaac8b1f0cd9c6bca27eac4b8e82ebe7c0a25b1 +clk-imx 144f1b70ea9ebebd21390bfcc78ba3192f12b0c1 +clk-renesas 515f05da372aedf347a1ac99d17fb832ba371d4d +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch e2f7b3d8b4b300956a77fa1ab084c931ba1c7421 +m68k 03191fb3db3d2585725bcffe0356d12fcfd27c4c +m68knommu ceb6a6f023fd3e8b07761ed900352ef574010bcb +microblaze ffb0399437ef582b035089d1617bbb0ea174cd0c +mips 01940cd4a6b9c47995a0cdaaafdd459b0d2221a2 +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 33cc938e65a98f1d29d0a18403dbbee050dcad9a +powerpc 8fc63a91e785ef06fb7f1aba59297793d85095f7 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v f352a28cc2fb4ee8d08c6a6362c9a861fcc84236 +riscv-dt 56b10953da7e9e92eb1a72860db656ac6a5699a1 +riscv-soc a3ee4347490b0e7c1b7111ea668a194807b0e20b +s390 5e191539a5eeb5ec563a19a0f35d387e966e1581 +sh b85ea95d086471afb4ad062012a4d73cd328fa86 +uml 974b808d85abbc03c3914af63d60d5816aabf2ca +xtensa 791beae7335caa8d8579d201d7f9b18b4d8898e1 +bcachefs f5470472504dfc96eabc3abadabdac7f15449953 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 0fc24a6549f9b6efc538b67a098ab577b1f9a00e +afs f1302568cc65d3fdd85e6413688779e5235f4e2b +btrfs 9bd44dbd29241b8171e935e8e9ced636295bb4b8 +ceph d30d7c57a64dac6c179d87d12f4350d11731bcb5 +cifs d5a4971d029e61c5a516f4891bc870d0c20e67b6 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 0ee3a0d59e007320167a2e9f4b8bf1304ada7771 +exfat 6dfb1f0dfdb081e5a46fea4c4f11d36539930eb4 +ext3 46ee834035ac224e4e1240532e27290981e4c7ad +ext4 6c02757c936063f0631b4e43fe156f8c8f1f351f +f2fs 394e7f4dbb32a44ad1a1569d55aa680e28ab3315 +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse 3f29f1c336c0e8a4bec52f1e5217f88835553e5b +gfs2 dd00aaeb343255a8a30de671bd27bde79a47c8e5 +jfs cca974daeb6c43ea971f8ceff5a7080d7d49ee30 +ksmbd 8b8cd4beea4f6c68092736c544a797dcd5e094c5 +nfs f003a717ae9086b1e8a4663124a96862df7282e7 +nfs-anna 379e4adfddd6a2f95a4f2029b8ddcbacf92b21f9 +nfsd 9637daa85f6968fafb84d2d74f7c3830e4ce5c43 +ntfs3 652483bfbc45137e8dce556c9ddbd4458dad4452 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs 75690493591fe283e4c92a3ba7c4420e9858abdb +v9fs ff49bf1867578f23a5ffdd38f927f6e1e16796c4 +v9fs-ericvh 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +xfs 98bdbf60cca858f4bc993895b738c6ae1bef42b8 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 85ddc21d198bba2c8c404a241261a74237380d5f +vfs 3f95c5b762572f2e7743e77ab50727c296a814c2 +printk 6c3a34e38436a2a3f7a1fa764c108ee19b05b893 +pci ab9345f3fb21e9563da4d6234c6e380cc691b4ad +pstore 24a0b5e196cf70ccff97bc0add6fa7178ad50cc4 +hid dad2d654c822925227d977cc4fdd85d7e20f1482 +i2c 382561d16854a747e6df71034da08d20d6013dfe +i3c b4da37db3e2cfc1c60875b0c10cfc556d5342a3a +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging db79be9d970740b2310b1eece69c34bcea06c340 +jc_docs 0c3ebff535956d2718594dc90aa9cc87521ec9fd +v4l-dvb a00b3f296eac3d43328615c3113e1a74143fc67a +v4l-dvb-next efa28efd9cba015f8c3d88123527c3c3cfcd13d0 +pm 3b6de08083e1f132679a930ff88ecea6d992fe75 +cpufreq-arm c4a5118a3ae1eadc687d84eef9431f9e13eb015c +cpupower 997bbf2accf618b87d7cc47192796e5461ca87c4 +devfreq aed5ed595960c6d301dcd4ed31aeaa7a8054c0c6 +pmdomain d6948c13b663a284574cb9e502dd663e70d910e8 +opp 19cc8b1819a40410c50a3efab6cf27b73298deb5 +thermal 9618efe343ead954ca5c23856ae23d0a29e7d4b9 +dlm 0c08699744d20ce0bac22b9f291a646a0302e51f +rdma 4f973e211b3b1c6d36f7c6a19239d258856749f9 +net-next 509afc7452707e62fb7c4bb257f111617332ffad +bpf-next 8e432e6197cef6250dfd6fdffd41c06613c874ca +ipsec-next aadbd27f9674d7f5457331fe0248b370d5c1f25d +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next ac40916a3f7243efbe6e129ebf495b5c33a3adfe +ipvs-next ac40916a3f7243efbe6e129ebf495b5c33a3adfe +bluetooth dea290e2e36bd9b1106e2e6e3267f5a4ceeaa19a +wireless-next c5a3f56fcdb0a48a20772e4c9b8adc6c7256a461 +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 83fcf26b00d77e4a0ec920524fe85350a27e9c05 +mtd a7d84a2e7663bbe12394cc771107e04668ea313a +nand 2b8aa4c3e6a5d41b10b53da2017852f647d0345b +spi-nor c692ba6de1c5b4dc8cad0ba70281ba4cf9d2fdac +crypto c480a421a4faf693c38e60b0fe6e554c9a3fee02 +drm a0a28956b46ec7f16ce5d762ac5a124bb532da0d +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-exynos 897da484d1c771f7c6af458381390ee0ca0ed762 +drm-misc 8a53e29fe05c56f643eaab285f224c09b9c3dd4c +amdgpu 669080888691c312cc926322a7b24600121c90fb +drm-intel 716c3cf21784479a1934b670ec67f320cbb5d308 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm d4ca26ac4be0d9aea7005c40df75e6775749671b +drm-msm-lumag d4ca26ac4be0d9aea7005c40df75e6775749671b +etnaviv 925b10728f20c24516031060f3d01e4410c4a52a +fbdev 13366c25125eeaa56b54a99bd8b7fd329e75a382 +regmap a2d43f711790bad9854b666644e884fcf786cc37 +sound c7e37b07cc7564a07125ae48c11fd1ca2bcbeae2 +ieee1394 c12d7aa7ffa4c61443241fbc1ee405acf4aa17de +sound-asoc 86237bd324c2e1883f5439a3cea7cd52f2382626 +modules 4652b8e4f3ffa48c706ec334f048c217a7d9750d +input c67f8a13be4e9ffc862c7f60ec97a799a1547486 +block 9d1282ca9724bbbdfd1c3419e684336c6d4b793d +device-mapper 5d6f447b07d5432686ba69183af6e96ac58069c9 +libata 804901fdd637c7af8b767c329fd84aa0d3d617ec +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 72cd89517fa0a33adb4764c34c7b268f4d23882b +mfd 03d790f04fb2507173913cad9c213272ac983a60 +backlight 7d84a63a39b78443d09f2b4edf7ecb1d586379b4 +battery b55d073e6501dc6077edaa945a6dad8ac5c8bbab +regulator ad663ce6780477177e301756ade6cf236f36ae4c +security ec4e9d630a64df500641892f4e259e8149594a99 +apparmor a7e405a2de69fe5e6657046e978a81683b140051 +integrity b4af096b5df5dd131ab796c79cedc7069d8f4882 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 3c1e09d533dba45af8b4681f005c9b5807f9b182 +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd ebf2d4e8e582a444e12eff7d4a59d87f22fb3481 +watchdog 70ec8691764ff9dc541e18dc293d6dec92ee369a +iommu 4e631678d251c100e92624cdfe3de606cd03b7ab +audit 24fade412acf3e349e337b9472a5a8f7eb94cfb8 +dt-krzk b85ea95d086471afb4ad062012a4d73cd328fa86 +mailbox fbce94a444fb02d8e60b51370886f35232175230 +spi 0ae0d521bb6fc6a947c1b5ed0635f14ac68bbd39 +tip 032ba4d28e4d60731054581e64885e97b41c04b8 +clockevents d25e52a7eb36609e3d863e4f22a1fcf3ebbf86b7 +edac 448709b588672435f694b18333961b562b0f97b5 +irqchip 19b5a44bee16518104e8a159ab9a60788292fbd4 +ftrace e1742fa172d553ecc8e9077a713315404be36c13 +rcu f1242ec0ad8f11c414da5bd56ba62ae8264df643 +kvm 8ed26ab8d59111c2f7b86d200d1eb97d2a458fd1 +kvm-arm 53d5486114ae23d36145a1e40d2b9de7a6247c1e +kvms390 26fb87ffa9d90fb16ca1b2b262f38d93bdcee934 +kvm-ppc 180c6b072bf360b686e53d893d8dcf7dbbaec6bb +kvm-riscv 4ad9843e1ea088bd2529290234c6c4c6374836a7 +kvm-x86 f2a3fb7234e52f72ff4a38364dbf639cf4c7d6c6 +xen-tip 7f3da4b698bcc21a6df0e7f114af71d53a3e26ac +percpu 1e653a292c260fd99d0dc7e7d8fd886c22a4593f +workqueues 4a6c5607d4502ccd1b15b57d57f17d12b6f257a7 +drivers-x86 ed289b98c2aeb35f1d4198933315a9c5c30e961a +chrome-platform 57eb6dcd32cf6b49c38eff81e60e8fd471aa05a8 +chrome-platform-firmware ecea08916418a94f99f89c543303877cb6e08a11 +hsi fa72d143471d04ce3055d8dad9743b08c19e4060 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 40cfa414e7f99ea0aa3b578e382eed93540c3641 +ipmi c5d03a0d8461c96317a61d67ee0c277c5840bdc5 +driver-core 532888a59505da2a3fbb4abac6adad381cedb374 +usb e9158c7e55339737847cebbfa397c668713f1a15 +thunderbolt 2cd3da4e37453019e21a486d9de3144f46b4fdf7 +usb-serial a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +tty 43f012df3c1e979966524f79b5371fde6545488a +char-misc 08b3485540d9e94ed8335f82e5fc491fc02f8423 +accel dfbf6719ccb41b84b5f1f7ce6418dffc086dc138 +coresight 60e5f23dc5d68ec01e6dae8f4311230c7d2ccb8a +fastrpc b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga 5496fb8eedd637e1e9d87655f86dc816afd5ad68 +icc da7667aef4cf721852178ca17f28b9f5333b322a +iio 2dfef50589aef3b9a2fa2190ae95b328fb664f89 +phy-next 7f6f9e0def00cfaeb1d034fd13dbd84470aeccbd +soundwire becfce5233a78956654f36555f1b9187f8d11d56 +extcon 7803680964c025f598f827b7ea7433467ef21a56 +gnss 0cbbbe09d49b959d0225f7f2223a8ae3b2c1964c +vfio 946cff255dfaa204cd7b7f05e3bb4b5b3466c6e7 +w1 efc19c44aa442197ddcbb157c6ca54a56eba8c4e +spmi b85ea95d086471afb4ad062012a4d73cd328fa86 +staging 5e8cdb6f6ebe28976876ab04995a5d3779b85082 +counter-next 8e21e4693d8502ee31ef7984e16c3d9cab6c926a +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 70f008fb3ea9bd2e6727eebc858405acd49a212b +cgroup b7aaea747923ec5492d17a2e26de347135e2c6b9 +scsi 6bdc5fb22b8ed9ecfc9000be19ff47c7f90fa4de +scsi-mkp ed340d13aa1db6773667ed4bf907738df203fbda +vhost b8e0792449928943c15d1af9f63816911d139267 +rpmsg ff9af5732fe761fa8e7aa66cb482f93a37e284ee +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 40aa7e290b8eff56b7235ece108f11e48210f262 +gpio-intel 92fc925f838660eec25862a7fa7e6ef79d22f3ea +pinctrl 6aac7cb9bb62b9f3d9016d2c096aab4be180897b +pinctrl-intel ebe7f3393784857c487bf82f86813a8b1384e278 +pinctrl-renesas 9e5889c68d992b65efd10aa0a4523c96fd07077f +pinctrl-samsung 6cf96df77338c6a7e753229fe6d330ab60e28cda +pwm 2cc2cb184833024f140af3175aa02e41f4e3d854 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 130a83879954a9fed35cf4474d223b4fcfd479fa +kunit b85ea95d086471afb4ad062012a4d73cd328fa86 +kunit-next 342fb9789267ee3908959bfa136b82e88e2ce918 +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc dc0684adf3b6be6b20fec9295027980021d30353 +nvdimm 9ea459e477dc09370cdd8ee13b61aefe8cd1f20a +at24 c692086d74a0184d8993e056dc9273abe690e315 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 31c65705a8cfa5f80d3824c686ab74b0409ee76d +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus b85ea95d086471afb4ad062012a4d73cd328fa86 +nvmem b85ea95d086471afb4ad062012a4d73cd328fa86 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay c52391fafcefe4c562bdac62088a2735c185b942 +kgdb 23816724fdbd47c28bc998866fd7bc5ad9f0e535 +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 01bd694ac2f682fb8017e16148b928482bc8fa4b +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl 5d09c63f11f083707b60c8ea0bb420651c47740f +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 94f7f6182c72ba642c1f20111681f9cc8621c95f +unicode 807f06d1074d5f39124dcc7ec3fa251983d3d4fd +slab f7eb801fcdb18653ce64b65f858a7f1203d7bbb9 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock a50156fe3dcbcd224b12a312128451c4cddd08eb +rust 71479eee9da8ddb53f3ddb91bc8591d90fb8b142 +sysctl a6fd07f80ab7bd94edb4d56c35e61117ffb9957e +execve 0a8a952a75f2c5c140939c1616423e240677666c +bitmap 5e95ee6fd52b06432da9636032ac6986112feec1 +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp a75b3809dce2ad006ebf7fa641f49881fa0d79d7 +kspp-gustavo 617ab3c357d2ebdfff0e1a090c46f2f3f29b45e2 +nolibc d543d9ddf593b1f4cb1d57d9ac0ad279fe18adaf +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd b2b67c997bf74453f3469d8b54e4859f190943bd +devicetree 2726b01362a5132f18b978711d84aebae286facb +header_cleanup 4490eab3c3b5b7ff681751b27885b8f78cb6bfcf diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2c438eba7472 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,376 @@ +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-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +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 +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 +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-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 +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +header_cleanup git https://evilpiepirate.org/git/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7b84d44635e5 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12123 @@ +$ date -R +Tue, 19 Dec 2023 08:42:10 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 60% (4887/8109)
Updating files: 61% (4947/8109)
Updating files: 62% (5028/8109)
Updating files: 63% (5109/8109)
Updating files: 64% (5190/8109)
Updating files: 65% (5271/8109)
Updating files: 66% (5352/8109)
Updating files: 67% (5434/8109)
Updating files: 68% (5515/8109)
Updating files: 69% (5596/8109)
Updating files: 70% (5677/8109)
Updating files: 71% (5758/8109)
Updating files: 72% (5839/8109)
Updating files: 73% (5920/8109)
Updating files: 74% (6001/8109)
Updating files: 75% (6082/8109)
Updating files: 76% (6163/8109)
Updating files: 77% (6244/8109)
Updating files: 78% (6326/8109)
Updating files: 79% (6407/8109)
Updating files: 80% (6488/8109)
Updating files: 81% (6569/8109)
Updating files: 82% (6650/8109)
Updating files: 83% (6731/8109)
Updating files: 84% (6812/8109)
Updating files: 85% (6893/8109)
Updating files: 86% (6974/8109)
Updating files: 87% (7055/8109)
Updating files: 88% (7136/8109)
Updating files: 89% (7218/8109)
Updating files: 90% (7299/8109)
Updating files: 91% (7380/8109)
Updating files: 92% (7461/8109)
Updating files: 93% (7542/8109)
Updating files: 94% (7623/8109)
Updating files: 95% (7704/8109)
Updating files: 96% (7785/8109)
Updating files: 97% (7866/8109)
Updating files: 98% (7947/8109)
Updating files: 99% (8028/8109)
Updating files: 100% (8109/8109)
Updating files: 100% (8109/8109), done. +HEAD is now at 0e389834672c Merge tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (2cf4f94d8e86 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 0e389834672c..2cf4f94d8e86 +Fast-forward (no commit created; -m option ignored) + Makefile | 2 +- + drivers/scsi/aacraid/aacraid.h | 1 - + drivers/scsi/aacraid/commsup.c | 6 +-- + drivers/scsi/aacraid/linit.c | 14 ------ + drivers/scsi/aacraid/src.c | 25 +---------- + drivers/spi/spi-atmel.c | 95 +++++++++++++++++++++++++++++++++++----- + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-imx.c | 15 +++++-- + drivers/ufs/host/ufshcd-pltfrm.c | 54 +++++++++++++++++++++++ + kernel/events/core.c | 10 +++++ + 10 files changed, 164 insertions(+), 59 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 (9238ca68a856 selftests: secretmem: floor the memory size to the multiple of page_size) +$ 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 +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 4 ++-- + arch/riscv/Kconfig | 4 +--- + arch/s390/Kconfig | 4 ++-- + arch/x86/Kconfig | 4 ++-- + include/linux/mmzone.h | 14 +++++++++++--- + kernel/Kconfig.kexec | 2 ++ + lib/maple_tree.c | 11 +++++++++++ + mm/filemap.c | 9 +++++++++ + mm/kasan/kasan_test.c | 20 ++++++++++++++++---- + mm/migrate.c | 9 ++++++++- + mm/sparse.c | 17 +++++++++-------- + tools/testing/radix-tree/maple.c | 2 +- + tools/testing/selftests/mm/memfd_secret.c | 3 +++ + 13 files changed, 77 insertions(+), 26 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 (9a733dc4fbee ARC: add hugetlb definitions) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/Kconfig | 5 -- + arch/arc/include/asm/cacheflush.h | 43 ----------- + arch/arc/include/asm/entry-arcv2.h | 32 +++++++++ + arch/arc/include/asm/entry-compact.h | 87 +++++++++++++++++++++- + arch/arc/include/asm/entry.h | 110 ++-------------------------- + arch/arc/include/asm/hugepage.h | 7 ++ + arch/arc/include/asm/ptrace.h | 14 ++-- + arch/arc/kernel/setup.c | 4 +- + arch/arc/kernel/signal.c | 6 +- + arch/arc/mm/cache.c | 136 ++--------------------------------- + arch/arc/mm/mmap.c | 21 +----- + arch/arc/mm/tlb.c | 16 ++--- + 12 files changed, 155 insertions(+), 326 deletions(-) +Merging arm-current/fixes (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/mach-davinci/Kconfig | 1 + + arch/arm/vfp/vfpmodule.c | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+) +Merging arm64-fixes/for-next/fixes (3c0696076aad arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify) +$ 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 (d73ad797c83b Merge tag 'reset-fixes-for-v6.7' of git://git.pengutronix.de/pza/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 3 --- + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 3 +++ + arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 2 ++ + drivers/reset/core.c | 8 ++++---- + drivers/reset/hisilicon/hi6220_reset.c | 2 +- + 5 files changed, 10 insertions(+), 8 deletions(-) +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 (d2441d3e8c0c MAINTAINERS: powerpc: Add Aneesh & Naveen) +$ 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 (e6b2dab41888 s390/vx: fix save/restore of fpu kernel context) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/include/asm/fpu/api.h | 2 +- + drivers/s390/block/scm_blk.c | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) +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 (979e90173af8 Merge branch 'mptcp-misc-fixes') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + .mailmap | 4 + + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 11 +-- + drivers/net/ethernet/intel/i40e/i40e_register.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 4 +- + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 17 ++++- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 12 +-- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 1 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 50 +++++++------ + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 ++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 31 +++++--- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +- + drivers/net/ethernet/mscc/ocelot_stats.c | 16 ++-- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 82 ++------------------ + drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 - + drivers/net/phy/phy_device.c | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +- + drivers/net/wireless/mediatek/mt76/dma.c | 10 ++- + include/linux/ieee80211.h | 3 +- + net/core/stream.c | 2 +- + net/ife/ife.c | 1 + + net/mac80211/cfg.c | 4 +- + net/mac80211/driver-ops.c | 6 +- + net/mac80211/mesh_plink.c | 16 ++-- + net/mac80211/mlme.c | 4 +- + net/mptcp/crypto_test.c | 1 + + net/mptcp/protocol.c | 6 +- + net/mptcp/protocol.h | 9 ++- + net/mptcp/subflow.c | 28 ++++--- + net/mptcp/token_test.c | 1 + + net/rfkill/rfkill-gpio.c | 8 ++ + net/rose/af_rose.c | 41 ++++++++-- + net/wireless/certs/wens.hex | 87 ++++++++++++++++++++++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 +- + 45 files changed, 320 insertions(+), 206 deletions(-) + create mode 100644 net/wireless/certs/wens.hex +Merging bpf/master (117211aa739a bpf: Add missing BPF_LINK_TYPE invocations) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + include/linux/bpf_types.h | 4 +++ + include/net/sock.h | 5 ++++ + net/core/sock_map.c | 2 ++ + .../selftests/bpf/prog_tests/sockmap_basic.c | 34 ++++++++++++++++++++++ + 4 files changed, 45 insertions(+) +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 (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes') +$ 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 (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes') +$ 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 (400f6ebbc175 wifi: iwlwifi: pcie: don't synchronize IRQs from IRQ) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 4 ++-- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 8 ++++---- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 17 +++++++++-------- + 3 files changed, 15 insertions(+), 14 deletions(-) +Merging wpan/master (83fcf26b00d7 ieee802154: Give the user the association list) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Merge made by the 'ort' strategy. + drivers/net/ieee802154/fakelb.c | 5 +- + drivers/net/ieee802154/mac802154_hwsim.c | 6 +- + include/net/cfg802154.h | 70 ++++++ + include/net/ieee802154_netdev.h | 60 +++++ + include/net/nl802154.h | 22 +- + net/ieee802154/Makefile | 2 +- + net/ieee802154/core.c | 24 ++ + net/ieee802154/nl802154.c | 225 +++++++++++++++++- + net/ieee802154/pan.c | 103 ++++++++ + net/ieee802154/rdev-ops.h | 30 +++ + net/ieee802154/trace.h | 38 +++ + net/mac802154/cfg.c | 170 +++++++++++++ + net/mac802154/ieee802154_i.h | 27 +++ + net/mac802154/main.c | 2 + + net/mac802154/rx.c | 25 ++ + net/mac802154/scan.c | 397 +++++++++++++++++++++++++++++++ + 16 files changed, 1184 insertions(+), 22 deletions(-) + create mode 100644 net/ieee802154/pan.c +Merging rdma-fixes/for-rc (a39b6ac3781d Linux 6.7-rc5) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (ae53e2198cb8 ALSA: hda/realtek: Add quirks for ASUS Zenbook 2023 Models) +$ 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. + sound/pci/hda/cs35l41_hda.c | 2 + + sound/pci/hda/cs35l41_hda.h | 5 +- + sound/pci/hda/cs35l41_hda_property.c | 362 ++++++++++++++++++++++++++---- + sound/pci/hda/patch_realtek.c | 38 +++- + sound/pci/hda/tas2781_hda_i2c.c | 4 + + sound/usb/quirks.c | 4 +- + tools/testing/selftests/alsa/mixer-test.c | 2 +- + 7 files changed, 360 insertions(+), 57 deletions(-) +Merging sound-asoc-fixes/for-linus (f32c80d34249 ASoC: tas2781: check the validity of prm_no/cfg_no) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/codecs/cs35l45-i2c.c | 2 +- + sound/soc/codecs/cs35l45-spi.c | 2 +- + sound/soc/codecs/cs35l45.c | 56 +++++++++++++++++++++-- + sound/soc/codecs/cs42l43-jack.c | 21 +++++---- + sound/soc/codecs/tas2781-fmwlib.c | 14 +++--- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 8 ++-- + sound/soc/sof/mediatek/mt8186/mt8186.c | 3 -- + 7 files changed, 76 insertions(+), 30 deletions(-) +Merging regmap-fixes/for-linus (fea88064445a regmap: fix bogus error on regcache_sync success) +$ 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 (fc70d643a2f6 spi: atmel: Fix clock issue when using devices with different polarities) +$ 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 (5df12742b7e3 Revert "PCI: acpiphp: Reassign resources on bridge if necessary") +$ 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 (a39b6ac3781d Linux 6.7-rc5) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7fbcd195e2b8 usb: fotg210-hcd: delete an incorrect bounds test) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/net/usb/ax88179_178a.c | 23 ++++++++++++++++++++--- + drivers/thunderbolt/debugfs.c | 2 +- + drivers/thunderbolt/usb4.c | 10 +++++----- + drivers/usb/fotg210/fotg210-hcd.c | 3 --- + drivers/usb/storage/unusual_devs.h | 11 +++++++++++ + drivers/usb/typec/ucsi/ucsi_glink.c | 2 +- + 6 files changed, 38 insertions(+), 13 deletions(-) +Merging usb-serial-fixes/usb-linus (06f22cd6635b USB: serial: option: add Quectel RM500Q R13 firmware support) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 3 +++ + 1 file changed, 3 insertions(+) +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 +Already up to date. +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 (1e8787459bfd iio: core: fix memleak in iio_device_register_sysfs) +$ 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/adc/imx93_adc.c | 4 + + drivers/iio/adc/mcp3564.c | 8 +- + drivers/iio/adc/meson_saradc.c | 16 ++- + drivers/iio/adc/ti_am335x_adc.c | 4 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 10 ++ + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- + drivers/iio/imu/adis16475.c | 133 +++++++++++++-------- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 +- + drivers/iio/industrialio-core.c | 5 +- + drivers/iio/magnetometer/tmag5273.c | 2 +- + 11 files changed, 151 insertions(+), 76 deletions(-) +Merging counter-current/counter-current (a39b6ac3781d Linux 6.7-rc5) +$ 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 (1e37bf84afac nvmem: brcm_nvram: store a copy of NVRAM content) +$ 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. + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 10 +- + drivers/interconnect/core.c | 3 + + drivers/interconnect/qcom/icc-rpm.c | 2 +- + drivers/interconnect/qcom/sm8250.c | 1 + + drivers/nvmem/brcm_nvram.c | 134 +++++++++++++++------ + include/linux/device.h | 2 + + 6 files changed, 107 insertions(+), 45 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 +Already up to date. +Merging thunderbolt-fixes/fixes (f0b94c1c5c79 thunderbolt: Fix minimum allocated USB 3.x and PCIe bandwidth) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (c3d1610345b7 Input: xpad - add Razer Wolverine V2 support) +$ 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/joystick/xpad.c | 1 + + drivers/input/keyboard/atkbd.c | 46 +++++++++++++++++++++++++++++--- + drivers/input/keyboard/ipaq-micro-keys.c | 3 +++ + drivers/input/mouse/amimouse.c | 5 ++-- + drivers/input/mouse/synaptics.c | 1 + + drivers/input/serio/i8042-acpipnpio.h | 8 ++++++ + 6 files changed, 57 insertions(+), 7 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (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 (4ee632c82d2d dmaengine: fsl-edma: fix DMA channel leak in eDMAv4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (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 (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (a39b6ac3781d Linux 6.7-rc5) +$ 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 (c72b9c33ef96 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/dra7.dtsi | 2 +- + arch/arm/mach-omap2/id.c | 5 +++++ + drivers/bus/ti-sysc.c | 18 ++++++++++++++---- + 3 files changed, 20 insertions(+), 5 deletions(-) +Merging kvm-fixes/master (4cdf351d3630 KVM: SVM: Update EFER software model on CR0 trap for SEV-ES) +$ 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 +Already up to date. +Merging hwmon-fixes/hwmon (a39b6ac3781d Linux 6.7-rc5) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (ef3d5cf9c59c cxl/pmu: Ensure put_device on pmu devices) +$ 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 (cdec1b57f10a 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 (485053bb81c8 fix ufs_get_locked_folio() breakage) +$ 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 (7bcd032370f8 platform/x86: intel_ips: fix kernel-doc formatting) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (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 (136c6531ba12 dt-bindings: display: adi,adv75xx: Document #sound-dai-cells) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (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 (77a672556096 scsi: ufs: core: Store min and max clk freq from OPP table) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (ceb6a6f023fd Linux 6.7-rc6) +$ 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 (ceb6a6f023fd Linux 6.7-rc6) +$ 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 (1036f69e2513 mmc: core: Cancel delayed work before releasing host) +$ 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 | 7 ++++--- + drivers/mmc/core/host.c | 1 + + drivers/mmc/host/meson-mx-sdhc-mmc.c | 26 +++++--------------------- + 3 files changed, 10 insertions(+), 24 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 (a39b6ac3781d Linux 6.7-rc5) +$ 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 (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/hv/hv_util.c | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) +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 (eb46a0076501 riscv: Check if the code to patch lies in the exit section) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/include/asm/sections.h | 1 + + arch/riscv/kernel/patch.c | 11 ++++++++++- + arch/riscv/kernel/vmlinux.lds.S | 2 ++ + 3 files changed, 13 insertions(+), 1 deletion(-) +Merging riscv-dt-fixes/riscv-dt-fixes (79997eda0d31 riscv: dts: microchip: move timebase-frequency to mpfs.dtsi) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (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 (a39b6ac3781d Linux 6.7-rc5) +$ 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 (ceb6a6f023fd Linux 6.7-rc6) +$ 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 +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (1227561c2ffb NFSD: Revert 738401a9bd1ac34ccd5723d69640a4adbb1a4bc0) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfssvc.c +Merge made by the 'ort' strategy. + fs/nfsd/nfs4callback.c | 97 +---------------------------------------- + fs/nfsd/nfs4state.c | 116 +++++-------------------------------------------- + fs/nfsd/nfs4xdr.c | 7 +-- + fs/nfsd/nfsctl.c | 18 ++++---- + fs/nfsd/nfsd.h | 1 + + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/state.h | 25 +---------- + fs/nfsd/xdr4cb.h | 18 -------- + 8 files changed, 28 insertions(+), 256 deletions(-) +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 (b16937474874 perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (50d7cdf7a9b1 efi/x86: Avoid physical KASLR on older Dell systems) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (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 (6f9c4d8c468c iommufd: Do not UAF during iommufd_put_object()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (cfd96726e611 rust: docs: fix logo replacement) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging w1-fixes/fixes (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 +Already up to date. +Merging overlayfs-fixes/ovl-fixes (413ba91089c7 ovl: fix dentry reference leak after changes to underlying layers) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (aca58eac52b8 drm/bridge: ti-sn65dsi86: Never store more than msg->size bytes in AUX xfer) +$ 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/accel/qaic/mhi_controller.c | 15 ++++++++++++++- + drivers/accel/qaic/qaic_data.c | 6 ++---- + drivers/gpu/drm/bridge/parade-ps8640.c | 5 +++-- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +++- + 4 files changed, 22 insertions(+), 8 deletions(-) +Merging mm-stable/mm-stable (d9d9bd979cce maple_tree: change return type of mas_split_final_node as void.) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging MAINTAINERS +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/btrfs/inode.c +Auto-merging include/linux/damon.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mmzone.h +Auto-merging lib/maple_tree.c +Auto-merging mm/damon/core.c +Auto-merging mm/filemap.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Auto-merging mm/workingset.c +Auto-merging tools/testing/radix-tree/maple.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 33 +- + Documentation/admin-guide/blockdev/zram.rst | 2 +- + Documentation/admin-guide/mm/damon/usage.rst | 48 +- + Documentation/admin-guide/mm/pagemap.rst | 1 + + Documentation/admin-guide/mm/zswap.rst | 10 + + Documentation/core-api/maple_tree.rst | 4 + + Documentation/filesystems/locking.rst | 4 +- + Documentation/filesystems/vfs.rst | 6 +- + Documentation/mm/arch_pgtable_helpers.rst | 2 - + Documentation/mm/damon/design.rst | 13 + + MAINTAINERS | 1 + + arch/loongarch/kernel/numa.c | 28 +- + arch/x86/mm/numa.c | 34 +- + block/fops.c | 2 +- + drivers/android/binder_alloc.c | 7 +- + drivers/block/zram/Kconfig | 15 +- + drivers/block/zram/zram_drv.c | 57 +- + 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 + + fs/Kconfig | 22 +- + fs/afs/write.c | 8 +- + fs/bcachefs/fs.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/ceph/addr.c | 4 +- + fs/dcache.c | 8 +- + 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/gfs2/quota.c | 6 +- + fs/hugetlbfs/inode.c | 6 +- + fs/inode.c | 4 +- + fs/iomap/buffered-io.c | 14 +- + fs/nfs/file.c | 2 +- + fs/nfs/nfs42xattr.c | 8 +- + fs/nfsd/filecache.c | 4 +- + fs/ntfs/aops.c | 6 +- + fs/ocfs2/aops.c | 2 +- + fs/proc/task_mmu.c | 17 +- + fs/smb/client/file.c | 6 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf.c | 6 +- + fs/xfs/xfs_dquot.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/zonefs/file.c | 2 +- + include/linux/damon.h | 20 + + include/linux/fs.h | 2 +- + include/linux/gfp_types.h | 5 +- + include/linux/highmem.h | 76 ++ + include/linux/ksm.h | 4 +- + include/linux/list_lru.h | 92 +- + include/linux/maple_tree.h | 411 ++++---- + include/linux/memblock.h | 1 + + include/linux/memcontrol.h | 15 + + include/linux/memremap.h | 12 - + include/linux/mm.h | 40 +- + include/linux/mm_types.h | 11 +- + include/linux/mmzone.h | 6 + + include/linux/page-flags.h | 9 +- + include/linux/rmap.h | 4 +- + include/linux/stackdepot.h | 59 +- + include/linux/vm_event_item.h | 4 +- + include/linux/zswap.h | 27 +- + include/uapi/linux/fs.h | 1 + + kernel/fork.c | 40 +- + lib/Kconfig | 10 + + lib/Kconfig.kasan | 23 +- + lib/maple_tree.c | 1077 +++++++++++++-------- + lib/stackdepot.c | 456 ++++++--- + lib/test_maple_tree.c | 341 ++++--- + mm/Kconfig | 20 + + mm/cma.c | 2 +- + mm/compaction.c | 3 + + mm/damon/core-test.h | 47 +- + mm/damon/core.c | 68 +- + mm/damon/sysfs-common.h | 3 + + mm/damon/sysfs-schemes.c | 272 +++++- + mm/damon/sysfs.c | 27 + + mm/filemap.c | 4 +- + mm/folio-compat.c | 4 +- + mm/gup.c | 2 + + mm/huge_memory.c | 16 +- + mm/hugetlb_vmemmap.c | 290 ++---- + mm/internal.h | 25 +- + mm/kasan/common.c | 16 +- + mm/kasan/generic.c | 66 +- + mm/kasan/kasan.h | 10 +- + mm/kasan/quarantine.c | 26 +- + mm/kasan/report.c | 12 + + mm/kasan/report_tags.c | 42 +- + mm/kasan/tags.c | 39 +- + mm/kmemleak.c | 186 ++-- + mm/kmsan/core.c | 7 +- + mm/ksm.c | 43 +- + mm/list_lru.c | 48 +- + mm/memblock.c | 34 + + mm/memcontrol.c | 7 + + mm/memory-failure.c | 115 ++- + mm/memory.c | 91 +- + mm/memory_hotplug.c | 210 ++-- + mm/mempool.c | 8 +- + mm/memremap.c | 14 +- + mm/mm_init.c | 3 +- + mm/mmap.c | 46 +- + mm/mmzone.c | 1 + + mm/oom_kill.c | 7 +- + mm/page-writeback.c | 54 +- + mm/page_alloc.c | 36 +- + mm/page_owner.c | 9 +- + mm/page_poison.c | 8 +- + mm/pagewalk.c | 29 +- + mm/process_vm_access.c | 15 +- + mm/readahead.c | 14 +- + mm/shmem.c | 6 +- + mm/slub.c | 41 +- + mm/swap.h | 3 +- + mm/swap_state.c | 26 +- + mm/swapfile.c | 34 +- + mm/truncate.c | 51 +- + mm/util.c | 8 +- + mm/vmscan.c | 12 +- + mm/vmstat.c | 7 +- + mm/workingset.c | 4 +- + mm/zswap.c | 474 +++++++-- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/cgroup/Makefile | 5 + + {tools => samples}/cgroup/cgroup_event_listener.c | 0 + samples/cgroup/memcg_event_listener.c | 330 +++++++ + 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/cgroup/test_zswap.c | 76 +- + tools/testing/selftests/damon/sysfs.sh | 27 + + tools/testing/selftests/mm/run_vmtests.sh | 2 - + tools/testing/selftests/mm/vm_util.c | 80 +- + 148 files changed, 4722 insertions(+), 2126 deletions(-) + create mode 100644 samples/cgroup/Makefile + rename {tools => samples}/cgroup/cgroup_event_listener.c (100%) + create mode 100644 samples/cgroup/memcg_event_listener.c + delete mode 100644 tools/cgroup/Makefile +Merging mm-nonmm-stable/mm-nonmm-stable (fc0fbad122a7 merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging Makefile +Auto-merging arch/mips/kernel/smp.c +Auto-merging kernel/fork.c +Auto-merging kernel/resource.c +Merge made by the 'ort' strategy. + Documentation/filesystems/squashfs.rst | 60 ++++++ + Makefile | 6 +- + arch/Kconfig | 13 -- + arch/alpha/lib/Makefile | 1 - + arch/alpha/mm/Makefile | 2 - + arch/hexagon/include/asm/irq.h | 3 + + arch/hexagon/kernel/process.c | 2 + + arch/hexagon/kernel/reset.c | 1 + + arch/hexagon/kernel/signal.c | 2 +- + arch/hexagon/kernel/smp.c | 4 +- + arch/hexagon/kernel/time.c | 4 +- + arch/hexagon/kernel/traps.c | 11 +- + arch/hexagon/kernel/vdso.c | 1 + + arch/hexagon/kernel/vm_events.c | 7 - + arch/hexagon/mm/init.c | 3 +- + arch/hexagon/mm/uaccess.c | 8 - + arch/hexagon/mm/vm_fault.c | 3 +- + arch/hexagon/mm/vm_tlb.c | 1 + + arch/mips/Kbuild | 6 - + arch/mips/boot/compressed/dbg.c | 2 + + arch/mips/boot/compressed/decompress.c | 16 +- + arch/mips/boot/compressed/decompress.h | 24 +++ + arch/mips/boot/compressed/string.c | 1 + + arch/mips/include/asm/cache.h | 6 + + arch/mips/include/asm/jump_label.h | 3 + + arch/mips/include/asm/mach-loongson64/mmzone.h | 1 - + arch/mips/include/asm/mmzone.h | 2 + + arch/mips/include/asm/processor.h | 2 + + arch/mips/include/asm/r4kcache.h | 4 + + arch/mips/include/asm/setup.h | 1 + + arch/mips/include/asm/signal.h | 1 + + arch/mips/include/asm/smp.h | 2 + + arch/mips/include/asm/spram.h | 2 +- + arch/mips/include/asm/syscalls.h | 33 ++++ + arch/mips/include/asm/tlbex.h | 1 + + arch/mips/include/asm/traps.h | 24 +++ + arch/mips/include/asm/uasm.h | 2 - + arch/mips/kernel/cpu-probe.c | 1 - + arch/mips/kernel/cpu-r3k-probe.c | 1 - + arch/mips/kernel/linux32.c | 1 + + arch/mips/kernel/machine_kexec.c | 1 + + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-mt-fpaff.c | 1 + + arch/mips/kernel/mips-mt.c | 1 + + arch/mips/kernel/module.c | 3 +- + arch/mips/kernel/r4k-bugs64.c | 1 + + arch/mips/kernel/signal-common.h | 3 + + arch/mips/kernel/signal.c | 1 + + arch/mips/kernel/signal32.c | 1 + + arch/mips/kernel/signal_n32.c | 4 +- + arch/mips/kernel/signal_o32.c | 1 + + arch/mips/kernel/smp.c | 3 + + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/syscall.c | 1 + + arch/mips/kernel/traps.c | 2 - + arch/mips/kernel/unaligned.c | 1 + + arch/mips/mm/c-r4k.c | 6 +- + arch/mips/mm/cache.c | 6 - + arch/mips/mm/fault.c | 1 + + arch/mips/mm/init.c | 1 + + arch/mips/mm/pgtable-64.c | 2 + + arch/mips/mm/tlb-r3k.c | 4 +- + arch/mips/mm/tlb-r4k.c | 6 +- + arch/mips/power/cpu.c | 1 + + arch/mips/power/hibernate.c | 1 + + arch/powerpc/kexec/core_64.c | 3 +- + arch/powerpc/mm/book3s64/pgtable.c | 2 + + arch/s390/kernel/traps.c | 2 + + arch/sparc/kernel/Makefile | 1 - + arch/sparc/lib/Makefile | 1 - + arch/sparc/mm/Makefile | 1 - + arch/sparc/prom/Makefile | 1 - + arch/x86/pci/sta2x11-fixup.c | 1 + + drivers/platform/mips/rs780e-acpi.c | 12 +- + drivers/s390/block/dasd.c | 6 - + drivers/usb/host/fsl-mph-dr-of.c | 2 +- + fs/exec.c | 3 +- + fs/jffs2/debug.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/squashfs/file.c | 3 +- + fs/squashfs/file_direct.c | 6 +- + include/linux/init_task.h | 7 - + include/linux/ioport.h | 3 + + include/linux/sched.h | 2 - + include/linux/sched/signal.h | 4 +- + init/init_task.c | 10 +- + kernel/fork.c | 26 --- + 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/test_ida.c | 2 +- + 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 ++ + 114 files changed, 760 insertions(+), 616 deletions(-) + create mode 100644 arch/mips/boot/compressed/decompress.h + create mode 100644 arch/mips/include/asm/syscalls.h +Merging mm/mm-everything (b960ce977c11 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 lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-initrd | 8 + + Documentation/admin-guide/cgroup-v2.rst | 12 + + Documentation/admin-guide/kernel-parameters.txt | 5 +- + Documentation/admin-guide/mm/damon/usage.rst | 117 ++-- + Documentation/admin-guide/mm/ksm.rst | 55 ++ + Documentation/admin-guide/mm/transhuge.rst | 97 +++- + Documentation/admin-guide/mm/userfaultfd.rst | 3 + + Documentation/admin-guide/mm/zswap.rst | 6 + + Documentation/filesystems/proc.rst | 6 +- + Documentation/mm/damon/design.rst | 24 +- + arch/arm64/kernel/kexec_image.c | 6 +- + arch/arm64/kernel/machine_kexec.c | 26 +- + arch/arm64/kernel/machine_kexec_file.c | 12 +- + arch/mips/mm/cache.c | 9 +- + arch/parisc/kernel/kexec_file.c | 8 +- + arch/powerpc/kexec/elf_64.c | 8 +- + arch/powerpc/kexec/file_load_64.c | 18 +- + arch/riscv/kernel/Makefile | 2 +- + arch/riscv/kernel/elf_kexec.c | 11 +- + arch/riscv/kernel/machine_kexec.c | 26 - + arch/x86/kernel/crash.c | 16 +- + arch/x86/kernel/kexec-bzimage64.c | 23 +- + arch/x86/kernel/machine_kexec_64.c | 7 +- + drivers/rapidio/devices/tsi721.c | 67 ++- + drivers/rapidio/devices/tsi721_dma.c | 4 +- + fs/buffer.c | 130 ++--- + fs/freevxfs/vxfs_bmap.c | 8 +- + fs/freevxfs/vxfs_immed.c | 2 +- + fs/freevxfs/vxfs_lookup.c | 3 +- + fs/nilfs2/sufile.c | 9 +- + fs/proc/task_mmu.c | 3 +- + fs/userfaultfd.c | 72 +++ + include/linux/cpumask.h | 11 + + include/linux/damon.h | 2 +- + include/linux/find.h | 3 + + include/linux/gfp_types.h | 12 +- + include/linux/huge_mm.h | 183 +++++- + include/linux/kexec.h | 9 +- + include/linux/ksm.h | 6 +- + include/linux/memcontrol.h | 20 +- + include/linux/rmap.h | 7 +- + include/linux/swap.h | 8 +- + include/linux/userfaultfd_k.h | 11 + + include/linux/zswap.h | 10 +- + include/trace/events/ksm.h | 33 ++ + include/uapi/linux/kexec.h | 1 + + include/uapi/linux/userfaultfd.h | 29 +- + init/Kconfig | 102 ++-- + init/initramfs.c | 18 +- + kernel/crash_core.c | 79 +-- + kernel/events/uprobes.c | 2 +- + kernel/fork.c | 2 +- + kernel/kexec_core.c | 6 +- + kernel/kexec_file.c | 14 +- + lib/Kconfig.debug | 4 - + lib/group_cpus.c | 47 +- + lib/maple_tree.c | 13 +- + mm/damon/core-test.h | 13 +- + mm/damon/core.c | 2 +- + mm/damon/dbgfs-test.h | 2 +- + mm/damon/dbgfs.c | 2 +- + mm/damon/modules-common.c | 2 +- + mm/damon/vaddr-test.h | 2 +- + mm/damon/vaddr.c | 2 +- + mm/folio-compat.c | 16 - + mm/huge_memory.c | 351 +++++++++++- + mm/khugepaged.c | 38 +- + mm/ksm.c | 323 ++++++++++- + mm/list_lru.c | 31 -- + mm/madvise.c | 22 +- + mm/memcontrol.c | 303 ++++++---- + mm/memory.c | 136 ++++- + mm/memremap.c | 18 +- + mm/migrate.c | 27 +- + mm/migrate_device.c | 23 +- + mm/mmap.c | 3 + + mm/page_alloc.c | 44 +- + mm/page_io.c | 85 +-- + mm/page_vma_mapped.c | 3 +- + mm/rmap.c | 66 ++- + mm/shmem.c | 11 +- + mm/swap.h | 29 +- + mm/swap_state.c | 100 ++-- + mm/swapfile.c | 69 ++- + mm/userfaultfd.c | 616 ++++++++++++++++++++- + mm/vmscan.c | 2 +- + mm/workingset.c | 42 +- + mm/zswap.c | 262 ++++----- + scripts/Makefile.extrawarn | 4 +- + security/integrity/ima/ima_kexec.c | 4 +- + tools/testing/radix-tree/maple.c | 6 +- + tools/testing/selftests/damon/Makefile | 3 + + tools/testing/selftests/damon/_damon_sysfs.py | 322 +++++++++++ + tools/testing/selftests/damon/access_memory.c | 41 ++ + .../sysfs_update_schemes_tried_regions_hang.py | 33 ++ + ..._update_schemes_tried_regions_wss_estimation.py | 55 ++ + tools/testing/selftests/mm/Makefile | 4 +- + tools/testing/selftests/mm/cow.c | 183 ++++-- + tools/testing/selftests/mm/khugepaged.c | 410 +++----------- + tools/testing/selftests/mm/run_vmtests.sh | 53 +- + tools/testing/selftests/mm/thp_settings.c | 349 ++++++++++++ + tools/testing/selftests/mm/thp_settings.h | 80 +++ + 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 +++++++ + usr/Kconfig | 6 +- + 107 files changed, 4327 insertions(+), 1551 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-initrd + create mode 100644 tools/testing/selftests/damon/_damon_sysfs.py + create mode 100644 tools/testing/selftests/damon/access_memory.c + create mode 100644 tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_hang.py + create mode 100644 tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_wss_estimation.py + create mode 100644 tools/testing/selftests/mm/thp_settings.c + create mode 100644 tools/testing/selftests/mm/thp_settings.h +Merging kbuild/for-next (1809d3a7b51a scripts: Introduce a default git.orderFile) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging scripts/Makefile.extrawarn +Auto-merging scripts/checkstack.pl +Auto-merging scripts/gdb/linux/tasks.py +Merge made by the 'ort' strategy. + .editorconfig | 32 ++++++ + .gitignore | 1 + + Documentation/process/4.Coding.rst | 4 + + Documentation/process/coding-style.rst | 4 + + MAINTAINERS | 1 + + Makefile | 12 ++- + arch/sparc/vdso/Makefile | 18 +--- + include/linux/export.h | 18 ---- + include/linux/init.h | 7 ++ + scripts/Makefile.extrawarn | 9 -- + scripts/Makefile.lib | 4 +- + scripts/Makefile.package | 28 +---- + scripts/checkstack.pl | 3 - + scripts/clang-tools/gen_compile_commands.py | 6 +- + scripts/gdb/linux/tasks.py | 15 +-- + scripts/genksyms/genksyms.c | 22 +--- + scripts/git.orderFile | 42 ++++++++ + scripts/head-object-list.txt | 1 - + scripts/kconfig/Makefile | 14 ++- + scripts/kconfig/confdata.c | 158 +++++++++++++--------------- + scripts/kconfig/expr.c | 1 - + scripts/kconfig/lkc.h | 3 - + scripts/kconfig/lkc_proto.h | 5 + + scripts/kconfig/mconf.c | 56 +--------- + scripts/kconfig/menu.c | 19 +--- + scripts/kconfig/mnconf-common.c | 53 ++++++++++ + scripts/kconfig/mnconf-common.h | 18 ++++ + scripts/kconfig/nconf.c | 55 +--------- + scripts/kconfig/symbol.c | 28 ++--- + scripts/kconfig/util.c | 3 +- + scripts/mod/modpost.c | 17 ++- + scripts/mod/modpost.h | 8 +- + scripts/package/builddeb | 8 +- + scripts/package/buildtar | 8 +- + scripts/package/kernel.spec | 6 -- + scripts/package/mkdebian | 2 +- + scripts/package/snapcraft.template | 2 +- + scripts/recordmcount.c | 1 - + scripts/recordmcount.pl | 7 -- + scripts/xz_wrap.sh | 1 - + 40 files changed, 319 insertions(+), 381 deletions(-) + create mode 100644 .editorconfig + create mode 100644 scripts/git.orderFile + create mode 100644 scripts/kconfig/mnconf-common.c + create mode 100644 scripts/kconfig/mnconf-common.h +Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Merge made by the 'ort' strategy. + .clang-format | 92 +++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 73 insertions(+), 19 deletions(-) +Merging perf/perf-tools-next (a61f89bf76ef perf top: Uniform the event name for the hybrid machine) +$ 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 +Auto-merging tools/perf/util/Build +Merge made by the 'ort' strategy. + 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/lib/api/fs/fs.c | 80 ++-- + tools/lib/api/io.h | 12 +- + tools/lib/perf/Documentation/examples/sampling.c | 2 +- + tools/lib/perf/Documentation/libperf-sampling.txt | 2 +- + tools/lib/perf/Documentation/libperf.txt | 4 +- + tools/lib/perf/cpumap.c | 65 +-- + tools/lib/perf/evlist.c | 6 +- + tools/lib/perf/evsel.c | 2 +- + tools/lib/perf/include/internal/mmap.h | 3 +- + tools/lib/perf/include/perf/cpumap.h | 29 +- + tools/lib/perf/libperf.map | 6 +- + tools/lib/perf/mmap.c | 20 +- + tools/lib/perf/tests/test-cpumap.c | 4 +- + tools/lib/perf/tests/test-evlist.c | 6 +- + tools/lib/perf/tests/test-evsel.c | 2 +- + tools/perf/.gitignore | 4 + + tools/perf/Documentation/itrace.txt | 1 + + tools/perf/Documentation/perf-config.txt | 4 +- + tools/perf/Documentation/perf-list.txt | 12 +- + tools/perf/Documentation/perf-lock.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 52 +-- + tools/perf/Documentation/perf.txt | 3 + + tools/perf/Makefile.config | 13 +- + tools/perf/Makefile.perf | 13 +- + tools/perf/arch/arm/util/cs-etm.c | 16 +- + tools/perf/arch/arm64/util/arm-spe.c | 4 +- + tools/perf/arch/arm64/util/header.c | 2 +- + tools/perf/arch/loongarch/annotate/instructions.c | 6 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 10 +- + tools/perf/bench/epoll-ctl.c | 2 +- + tools/perf/bench/epoll-wait.c | 2 +- + tools/perf/bench/futex-hash.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 2 +- + tools/perf/bench/futex-requeue.c | 2 +- + tools/perf/bench/futex-wake-parallel.c | 2 +- + tools/perf/bench/futex-wake.c | 2 +- + tools/perf/bench/sched-seccomp-notify.c | 2 +- + tools/perf/builtin-annotate.c | 51 +-- + tools/perf/builtin-c2c.c | 2 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-inject.c | 6 + + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-record.c | 91 ++-- + tools/perf/builtin-report.c | 44 +- + tools/perf/builtin-stat.c | 33 +- + tools/perf/builtin-top.c | 52 +-- + tools/perf/builtin-trace.c | 6 +- + tools/perf/perf.c | 30 ++ + .../arch/arm64/ampere/ampereone/core-imp-def.json | 2 +- + .../arch/arm64/ampere/ampereonex/branch.json | 125 ++++++ + .../arch/arm64/ampere/ampereonex/bus.json | 20 + + .../arch/arm64/ampere/ampereonex/cache.json | 206 +++++++++ + .../arch/arm64/ampere/ampereonex/core-imp-def.json | 464 +++++++++++++++++++++ + .../arch/arm64/ampere/ampereonex/exception.json | 47 +++ + .../arch/arm64/ampere/ampereonex/instruction.json | 128 ++++++ + .../arch/arm64/ampere/ampereonex/intrinsic.json | 14 + + .../arch/arm64/ampere/ampereonex/memory.json | 41 ++ + .../arch/arm64/ampere/ampereonex/metrics.json | 442 ++++++++++++++++++++ + .../arch/arm64/ampere/ampereonex/mmu.json | 170 ++++++++ + .../arch/arm64/ampere/ampereonex/pipeline.json | 41 ++ + .../arch/arm64/ampere/ampereonex/spe.json | 14 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../arch/powerpc/power10/datasource.json | 18 +- + 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/Build | 14 + + tools/perf/tests/attr.c | 2 +- + .../attr/test-record-user-regs-no-sve-aarch64 | 2 +- + .../tests/attr/test-record-user-regs-sve-aarch64 | 2 +- + tools/perf/tests/builtin-test.c | 15 + + tools/perf/tests/code-reading.c | 80 ++-- + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/make | 2 +- + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/parse-events.c | 260 ++++++++---- + tools/perf/tests/perf-time-to-tsc.c | 2 +- + .../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/diff.sh | 108 +++++ + tools/perf/tests/shell/lib/perf_has_symbol.sh | 21 + + tools/perf/tests/shell/lib/setup_python.sh | 16 + + tools/perf/tests/shell/list.sh | 19 + + tools/perf/tests/shell/pipe_test.sh | 9 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 5 +- + tools/perf/tests/shell/record.sh | 38 +- + tools/perf/tests/shell/record_offcpu.sh | 4 +- + tools/perf/tests/shell/stat+json_output.sh | 16 +- + tools/perf/tests/shell/stat_all_pmu.sh | 2 +- + tools/perf/tests/shell/stat_metrics_values.sh | 14 +- + 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 +- + .../tests/shell/test_perf_data_converter_json.sh | 13 +- + tools/perf/tests/sigtrap.c | 106 ++++- + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/task-exit.c | 2 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/topology.c | 2 +- + tools/perf/tests/workloads/thloop.c | 4 +- + tools/perf/trace/beauty/arch_errno_names.sh | 10 +- + tools/perf/trace/beauty/beauty.h | 2 - + tools/perf/trace/beauty/prctl_option.sh | 4 +- + tools/perf/trace/beauty/socket.sh | 4 +- + tools/perf/ui/browsers/annotate.c | 103 +++-- + tools/perf/ui/browsers/hists.c | 34 +- + tools/perf/ui/browsers/hists.h | 2 - + tools/perf/ui/gtk/annotate.c | 6 +- + tools/perf/ui/gtk/gtk.h | 2 - + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 389 ++++++++++------- + tools/perf/util/annotate.h | 94 +++-- + tools/perf/util/auxtrace.c | 7 +- + tools/perf/util/auxtrace.h | 3 + + tools/perf/util/block-info.c | 10 +- + tools/perf/util/block-info.h | 3 +- + tools/perf/util/block-range.c | 7 +- + tools/perf/util/bpf-event.c | 3 + + tools/perf/util/bpf_counter.c | 2 +- + tools/perf/util/compress.h | 7 +- + tools/perf/util/cpumap.c | 2 +- + tools/perf/util/cputopo.c | 2 +- + 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 | 32 ++ + tools/perf/util/env.h | 13 + + tools/perf/util/event.c | 4 +- + tools/perf/util/evlist.c | 29 +- + tools/perf/util/evlist.h | 1 + + tools/perf/util/evsel.c | 55 ++- + tools/perf/util/evsel.h | 4 +- + tools/perf/util/genelf.c | 6 +- + tools/perf/util/header.c | 35 +- + tools/perf/util/hisi-ptt.c | 1 + + tools/perf/util/hist.h | 25 +- + tools/perf/util/machine.c | 13 +- + tools/perf/util/map.c | 20 +- + tools/perf/util/map.h | 83 ++-- + tools/perf/util/maps.c | 238 +++++++++++ + tools/perf/util/maps.h | 12 + + tools/perf/util/mem-events.c | 25 +- + 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_api_probe.c | 4 +- + 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/record.c | 4 +- + 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/stat-display.c | 2 +- + tools/perf/util/stat.c | 4 +- + tools/perf/util/stat.h | 1 - + tools/perf/util/symbol-elf.c | 6 +- + tools/perf/util/symbol-minimal.c | 10 +- + tools/perf/util/symbol.c | 254 +---------- + tools/perf/util/symbol.h | 1 - + tools/perf/util/symbol_conf.h | 4 +- + tools/perf/util/thread.c | 2 +- + tools/perf/util/thread.h | 14 + + tools/perf/util/top.h | 1 - + tools/perf/util/unwind-libdw.c | 21 +- + tools/perf/util/unwind-libunwind-local.c | 2 +- + tools/perf/util/zstd.c | 63 +-- + 199 files changed, 5023 insertions(+), 1539 deletions(-) + create mode 100644 tools/build/feature/test-dwarf_getcfi.c + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/core-imp-def.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/intrinsic.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/mmu.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereonex/spe.json + 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 100755 tools/perf/tests/shell/diff.sh + create mode 100644 tools/perf/tests/shell/lib/perf_has_symbol.sh + create mode 100644 tools/perf/tests/shell/lib/setup_python.sh + create mode 100755 tools/perf/tests/shell/list.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 (b07bc2347672 dma-mapping: clear dev->dma_mem to NULL after freeing it) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + drivers/acpi/scan.c | 1 - + drivers/of/address.c | 1 - + include/linux/dma-direct.h | 19 ++++++---- + kernel/dma/coherent.c | 4 ++- + kernel/dma/direct.c | 1 - + kernel/dma/swiotlb.c | 90 ++++++++++++++++++++++++++++------------------ + 6 files changed, 70 insertions(+), 46 deletions(-) +Merging asm-generic/master (d6e81532b10d Hexagon: Make pfn accessors statics inlines) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/mips/include/asm/smp-ops.h +Auto-merging arch/mips/include/asm/smp.h +Auto-merging arch/mips/include/asm/traps.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/traps.h +Resolved 'arch/mips/include/asm/traps.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9545180def0a] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + 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/arc/include/asm/page.h | 21 ++--- + arch/arc/include/asm/pgtable-levels.h | 2 +- + 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/asm/page.h | 15 +++- + 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 | 128 +++++++++++++++++-------------- + 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 | 2 + + 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/boot/Makefile | 10 +-- + 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 - + 62 files changed, 202 insertions(+), 228 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 (f1ff4ced177d Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 1 + + arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++ + arch/arm/mm/kasan_init.c | 8 +++++++- + 3 files changed, 38 insertions(+), 1 deletion(-) +Merging arm64/for-next/core (fdd44642dc72 Merge branch 'for-next/fixes' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/dwc_pcie_pmu.rst | 94 +++ + Documentation/admin-guide/perf/imx-ddr.rst | 45 +- + Documentation/admin-guide/perf/index.rst | 1 + + Documentation/arch/arm64/arm-acpi.rst | 2 +- + Documentation/arch/arm64/perf.rst | 72 ++ + .../devicetree/bindings/perf/fsl-imx-ddr.yaml | 3 + + MAINTAINERS | 7 + + arch/arm/kernel/perf_event_v6.c | 28 +- + arch/arm/kernel/perf_event_v7.c | 50 +- + arch/arm/kernel/perf_event_xscale.c | 44 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/Makefile | 2 +- + arch/arm64/boot/install.sh | 3 +- + arch/arm64/include/asm/assembler.h | 2 +- + arch/arm64/include/asm/cache.h | 6 - + arch/arm64/include/asm/cpufeature.h | 6 + + arch/arm64/include/asm/fpsimdmacros.h | 8 - + arch/arm64/include/asm/kernel-pgtable.h | 27 +- + arch/arm64/include/asm/kvm_mmu.h | 7 - + arch/arm64/include/asm/kvm_pgtable.h | 2 + + arch/arm64/include/asm/memory.h | 7 +- + arch/arm64/include/asm/pgtable-prot.h | 2 + + arch/arm64/include/asm/processor.h | 3 + + arch/arm64/include/asm/simd.h | 11 +- + arch/arm64/include/asm/stacktrace/common.h | 19 +- + arch/arm64/include/asm/stacktrace/nvhe.h | 2 +- + arch/arm64/include/asm/sysreg.h | 25 + + arch/arm64/include/asm/thread_info.h | 1 + + arch/arm64/include/asm/tlb.h | 15 +- + arch/arm64/include/asm/tlbflush.h | 100 ++- + arch/arm64/kernel/cpufeature.c | 160 +++-- + arch/arm64/kernel/cpuinfo.c | 5 - + arch/arm64/kernel/fpsimd.c | 169 +++-- + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/idreg-override.c | 153 ++-- + arch/arm64/kernel/irq.c | 7 +- + arch/arm64/kernel/kaslr.c | 7 + + arch/arm64/kernel/pi/Makefile | 1 + + arch/arm64/kernel/smp.c | 12 +- + arch/arm64/kernel/stacktrace.c | 146 ++-- + arch/arm64/kernel/vdso32/Makefile | 8 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 61 -- + arch/arm64/kvm/hyp/vhe/tlb.c | 13 - + arch/arm64/kvm/pmu-emul.c | 8 +- + arch/arm64/kvm/sys_regs.c | 4 +- + arch/arm64/lib/copy_page.S | 11 - + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/tools/cpucaps | 2 +- + arch/arm64/tools/sysreg | 325 ++++++++- + drivers/base/arch_numa.c | 2 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 2 - + drivers/pci/access.c | 12 + + drivers/pci/pcie/aspm.c | 65 +- + drivers/perf/Kconfig | 7 + + drivers/perf/Makefile | 1 + + drivers/perf/apple_m1_cpu_pmu.c | 6 +- + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/arm_dsu_pmu.c | 6 +- + drivers/perf/arm_pmu.c | 12 +- + drivers/perf/arm_pmuv3.c | 240 ++++--- + drivers/perf/arm_spe_pmu.c | 22 - + drivers/perf/dwc_pcie_pmu.c | 792 +++++++++++++++++++++ + drivers/perf/fsl_imx8_ddr_perf.c | 45 ++ + drivers/perf/fsl_imx9_ddr_perf.c | 6 +- + drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 4 +- + include/asm-generic/numa.h | 2 + + include/linux/pci.h | 2 + + include/linux/pci_ids.h | 2 + + include/linux/perf/arm_pmu.h | 28 +- + include/linux/perf/arm_pmuv3.h | 34 +- + tools/include/perf/arm_pmuv3.h | 43 +- + tools/testing/selftests/arm64/abi/tpidr2.c | 18 +- + tools/testing/selftests/arm64/fp/sve-test.S | 10 + + tools/testing/selftests/arm64/fp/za-test.S | 6 + + tools/testing/selftests/arm64/fp/zt-test.S | 5 + + .../selftests/kvm/aarch64/vpmu_counter_access.c | 5 +- + 77 files changed, 2277 insertions(+), 800 deletions(-) + create mode 100644 Documentation/admin-guide/perf/dwc_pcie_pmu.rst + create mode 100644 drivers/perf/dwc_pcie_pmu.c +Merging arm-perf/for-next/perf (bb339db4d363 arm: perf: Fix ARCH=arm build with GCC) +$ 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 (16bcd9a4a332 Merge branch 'arm/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 10 + + MAINTAINERS | 2 - + arch/arm/arm-soc-for-next-contents.txt | 44 + + .../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/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 | 2 + + arch/arm/configs/shmobile_defconfig | 6 +- + 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 + + 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 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 16 +- + drivers/bus/hisi_lpc.c | 6 +- + drivers/bus/omap-ocp2scp.c | 6 +- + drivers/bus/omap_l3_smx.c | 6 +- + drivers/bus/qcom-ssc-block-bus.c | 6 +- + drivers/bus/simple-pm-bus.c | 7 +- + drivers/bus/sun50i-de2.c | 5 +- + drivers/bus/sunxi-rsb.c | 6 +- + drivers/bus/tegra-aconnect.c | 6 +- + drivers/bus/tegra-gmi.c | 6 +- + drivers/bus/ti-pwmss.c | 5 +- + drivers/bus/ti-sysc.c | 6 +- + drivers/bus/ts-nbus.c | 6 +- + drivers/mailbox/Kconfig | 12 - + drivers/mailbox/Makefile | 2 - + drivers/mailbox/apple-mailbox.c | 441 -------- + drivers/soc/apple/Kconfig | 15 +- + drivers/soc/apple/Makefile | 4 + + drivers/soc/apple/mailbox.c | 437 ++++++++ + drivers/soc/apple/mailbox.h | 48 + + drivers/soc/apple/rtkit-internal.h | 8 +- + drivers/soc/apple/rtkit.c | 133 +-- + include/linux/apple-mailbox.h | 19 - + include/linux/soc/apple/rtkit.h | 18 - + 112 files changed, 4484 insertions(+), 1155 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 + delete mode 100644 drivers/mailbox/apple-mailbox.c + create mode 100644 drivers/soc/apple/mailbox.c + create mode 100644 drivers/soc/apple/mailbox.h + delete mode 100644 include/linux/apple-mailbox.h +Merging amlogic/for-next (7406f70924e6 Merge branch 'v6.8/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 33 ++ + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 13 + + .../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-s400.dts | 5 - + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 23 ++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 - + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 1 - + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 1 - + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 1 - + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 1 - + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 60 +++- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 360 ++++++++++++++++++++- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 - + drivers/firmware/meson/meson_sm.c | 19 +- + 23 files changed, 519 insertions(+), 36 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 (e60f7a99d378 ARM: dts: aspeed: minerva: add sgpio line name) +$ 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 | 4 + + arch/arm/boot/dts/aspeed/Makefile | 6 +- + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++++++++++ + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++++++++++ + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 377 +++++++++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 585 +++++++++++++++++++++ + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ---------- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++++++++++++++ + 8 files changed, 2160 insertions(+), 266 deletions(-) + 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 + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +Merging at91/at91-next (58f72e7817f1 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/boot/dts/microchip/at91-sama5d27_som1_ek.dts | 1 - + arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts | 1 - + arch/arm/mach-at91/pm.c | 3 +++ + 5 files changed, 9 insertions(+), 2 deletions(-) +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 (4a23d0f9814c memory: tegra: Protect SID override call under CONFIG_IOMMU_API) +$ 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 | 19 +++++++++++++++++++ + include/soc/tegra/mc.h | 1 + + 2 files changed, 20 insertions(+) +Merging imx-mxs/for-next (4db02d61a81e 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. + Documentation/devicetree/bindings/arm/fsl.yaml | 22 +- + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/nxp/imx/imx1-ads.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx1.dtsi | 9 +- + .../boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx25-pdk.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx25.dtsi | 41 +- + arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts | 4 +- + .../boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi | 4 +- + .../nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx27-pdk.dts | 16 +- + .../dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts | 2 +- + .../boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts | 17 +- + .../boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 26 +- + arch/arm/boot/dts/nxp/imx/imx27.dtsi | 7 +- + arch/arm/boot/dts/nxp/imx/imx53-cx9020.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b105pv2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b105v2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b125pv2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b125v2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b155v2.dts | 2 +- + .../boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts | 2 + + .../boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 7 + + arch/arm/boot/dts/nxp/imx/imx6qdl-emcon-avari.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 6 +- + .../boot/dts/nxp/imx/imx6qdl-skov-cpu-revc.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc.dtsi | 4 + + arch/arm/boot/dts/nxp/imx/imx7d-meerkat96.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi | 8 + + arch/arm/boot/dts/nxp/imx/imx7d-smegw01.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d.dtsi | 3 - + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 74 ++- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 2 +- + arch/arm/boot/dts/nxp/lpc/lpc18xx.dtsi | 2 +- + arch/arm/boot/dts/nxp/ls/ls1021a.dtsi | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts | 12 +- + arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 10 +- + arch/arm/boot/dts/nxp/mxs/imx28-lwe.dtsi | 1 + + arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts | 1 + + arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 14 +- + arch/arm/boot/dts/nxp/vf/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/nxp/vf/vf610-bk4.dts | 4 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts | 14 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-b.dts | 6 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts | 70 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts | 18 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts | 20 +- + arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts | 18 +- + arch/arm/mach-imx/mmdc.c | 9 +- + arch/arm/mach-mxs/mach-mxs.c | 4 +- + arch/arm64/boot/dts/freescale/Makefile | 38 ++ + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 74 +-- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 81 +-- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 75 +-- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 74 +-- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 74 +-- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 67 +- + .../freescale/fsl-lx2160a-tqmlx2160a-mblx2160a.dts | 338 ++++++++++ + .../fsl-lx2160a-tqmlx2160a-mblx2160a_12_x_x.dtso | 29 + + .../fsl-lx2160a-tqmlx2160a-mblx2160a_14_x_x.dtso | 17 + + .../fsl-lx2160a-tqmlx2160a-mblx2160a_x_11_x.dtso | 49 ++ + .../fsl-lx2160a-tqmlx2160a-mblx2160a_x_7_x.dtso | 55 ++ + .../fsl-lx2160a-tqmlx2160a-mblx2160a_x_8_x.dtso | 47 ++ + .../boot/dts/freescale/fsl-lx2160a-tqmlx2160a.dtsi | 97 +++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 4 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 2 - + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 2 + + .../boot/dts/freescale/imx8mm-emcon-avari.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 12 +- + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mm-overdrive.dtsi | 29 + + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 1 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 39 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 29 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 13 +- + .../boot/dts/freescale/imx8mm-verdin-mallow.dtsi | 173 +++++ + .../dts/freescale/imx8mm-verdin-nonwifi-mallow.dts | 18 + + .../dts/freescale/imx8mm-verdin-wifi-mallow.dts | 18 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 18 +- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 2 + + .../dts/freescale/imx8mn-bsh-smm-s2-common.dtsi | 1 + + .../dts/freescale/imx8mn-bsh-smm-s2-display.dtsi | 121 ++++ + .../dts/freescale/imx8mn-dimonoff-gateway-evk.dts | 160 +++++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 12 +- + .../arm64/boot/dts/freescale/imx8mn-overdrive.dtsi | 18 + + .../boot/dts/freescale/imx8mn-rve-gateway.dts | 285 +++++++++ + .../boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 1 + + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 21 +- + 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-model-a.dts | 2 +- + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 56 ++ + .../boot/dts/freescale/imx8mp-debix-som-a.dtsi | 22 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 10 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 12 + + .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 4 +- + .../arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi | 711 +++++++++++++++++++++ + .../boot/dts/freescale/imx8mp-skov-revb-hdmi.dts | 20 + + .../boot/dts/freescale/imx8mp-skov-revb-lt6.dts | 101 +++ + .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 100 +++ + .../imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso | 77 +++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 28 +- + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 26 +- + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 36 +- + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 26 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 28 +- + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 199 ++++++ + .../dts/freescale/imx8mp-verdin-nonwifi-mallow.dts | 18 + + .../dts/freescale/imx8mp-verdin-wifi-mallow.dts | 18 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 30 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 28 +- + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 2 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 1 + + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 21 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi | 17 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 31 +- + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 709 ++++++++++++++++++++ + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 1 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 127 +++- + drivers/bus/imx-weim.c | 9 +- + 136 files changed, 4637 insertions(+), 597 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_12_x_x.dtso + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_14_x_x.dtso + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_11_x.dtso + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_7_x.dtso + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_8_x.dtso + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-overdrive.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-mallow.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-dimonoff-gateway-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-overdrive.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-rve-gateway.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revb-hdmi.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revb-lt6.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-mallow.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi + 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 (476887312c60 Merge branch 'mvebu/drivers' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/arm/marvell/armada-7k-8k.yaml | 22 +++++ + MAINTAINERS | 4 +- + arch/arm/boot/dts/marvell/armada-370-rd.dts | 26 +++-- + .../dts/marvell/armada-370-seagate-nas-2bay.dts | 8 +- + .../dts/marvell/armada-370-seagate-nas-4bay.dts | 8 +- + .../dts/marvell/armada-370-synology-ds213j.dts | 16 +-- + .../dts/marvell/armada-381-netgear-gs110emx.dts | 44 ++++----- + .../dts/marvell/armada-385-clearfog-gtr-l8.dts | 38 ++++---- + .../dts/marvell/armada-385-clearfog-gtr-s4.dts | 22 ++--- + arch/arm/boot/dts/marvell/armada-385-linksys.dtsi | 18 ++-- + .../boot/dts/marvell/armada-385-synology-ds116.dts | 16 +-- + .../boot/dts/marvell/armada-385-turris-omnia.dts | 20 ++-- + arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 20 ++-- + arch/arm/boot/dts/marvell/armada-388-gp.dts | 4 +- + .../boot/dts/marvell/armada-xp-linksys-mamba.dts | 18 ++-- + arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi | 6 +- + .../dts/marvell/kirkwood-linkstation-6282.dtsi | 9 +- + .../dts/marvell/kirkwood-linkstation-lswxl.dts | 9 +- + arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi | 9 +- + arch/arm/boot/dts/marvell/kirkwood-ns2max.dts | 18 ++-- + arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts | 18 ++-- + arch/arm/boot/dts/marvell/kirkwood-synology.dtsi | 102 ++++++++++--------- + .../boot/dts/marvell/mvebu-linkstation-fan.dtsi | 8 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/ac5x-rd-carrier-cn9131.dts | 44 +++++++++ + arch/arm64/boot/dts/marvell/ac5x-rd-carrier.dtsi | 34 +++++++ + .../dts/marvell/armada-3720-espressobin-ultra.dts | 14 +-- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 20 ++-- + .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 20 ++-- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 99 ++++++++++--------- + .../boot/dts/marvell/armada-7040-mochabin.dts | 24 +++-- + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 22 ++--- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 42 ++++---- + .../boot/dts/marvell/cn9130-db-comexpress.dtsi | 96 ++++++++++++++++++ + .../boot/dts/marvell/cn9131-db-comexpress.dtsi | 108 +++++++++++++++++++++ + drivers/bus/moxtet.c | 9 +- + 36 files changed, 654 insertions(+), 342 deletions(-) + create mode 100644 arch/arm64/boot/dts/marvell/ac5x-rd-carrier-cn9131.dts + create mode 100644 arch/arm64/boot/dts/marvell/ac5x-rd-carrier.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-comexpress.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi +Merging omap/for-next (0ea5e8402a47 Merge branches 'omap-for-v6.8/dt', 'omap-for-v6.8/defconfig' and 'omap-for-v6.8/maintainers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/omap.yaml | 2 + + MAINTAINERS | 1 + + arch/arm/boot/dts/ti/omap/Makefile | 14 +- + arch/arm/boot/dts/ti/omap/am571x-idk.dts | 4 +- + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +- + arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/dra71-evm.dts | 4 +- + arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/dra76-evm.dts | 4 +- + .../dts/ti/omap/logicpd-torpedo-37xx-devkit.dts | 2 +- + .../boot/dts/ti/omap/motorola-mapphone-common.dtsi | 298 --------------------- + .../dts/ti/omap/motorola-mapphone-handset.dtsi | 234 ++++++++++++++++ + .../dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi | 21 ++ + .../boot/dts/ti/omap/motorola-mapphone-xt8xx.dtsi | 75 ++++++ + .../boot/dts/ti/omap/omap4-droid-bionic-xt875.dts | 11 +- + arch/arm/boot/dts/ti/omap/omap4-droid4-xt894.dts | 19 +- + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 18 +- + arch/arm/boot/dts/ti/omap/omap4-xyboard-mz609.dts | 46 ++++ + arch/arm/boot/dts/ti/omap/omap4-xyboard-mz617.dts | 17 ++ + arch/arm/configs/omap2plus_defconfig | 5 + + 21 files changed, 465 insertions(+), 324 deletions(-) + create mode 100644 arch/arm/boot/dts/ti/omap/motorola-mapphone-handset.dtsi + create mode 100644 arch/arm/boot/dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi + create mode 100644 arch/arm/boot/dts/ti/omap/motorola-mapphone-xt8xx.dtsi + create mode 100644 arch/arm/boot/dts/ti/omap/omap4-xyboard-mz609.dts + create mode 100644 arch/arm/boot/dts/ti/omap/omap4-xyboard-mz617.dts +Merging qcom/for-next (452e8fdfae6c Merge branches 'arm32-for-6.8', 'arm64-defconfig-for-6.8', 'arm64-for-6.8', 'clk-for-6.8', 'drivers-fixes-for-6.7' and 'drivers-for-6.8' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging CREDITS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/clk/qcom/Kconfig +Auto-merging drivers/usb/typec/ucsi/ucsi_glink.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../devicetree/bindings/arm/qcom-soc.yaml | 16 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 37 +- + .../devicetree/bindings/cache/qcom,llcc.yaml | 3 + + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,camcc-sm8250.yaml | 18 +- + .../bindings/clock/qcom,gcc-ipq6018.yaml | 57 + + .../bindings/clock/qcom,gcc-ipq8074.yaml | 4 + + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 3 - + .../bindings/clock/qcom,qdu1000-ecpricc.yaml | 68 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sc7180-camcc.yaml | 18 +- + .../bindings/clock/qcom,sc7280-camcc.yaml | 18 +- + .../bindings/clock/qcom,sdm845-camcc.yaml | 18 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 20 +- + .../bindings/clock/qcom,sm8450-gpucc.yaml | 2 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 8 +- + .../bindings/clock/qcom,sm8650-dispcc.yaml | 106 + + .../devicetree/bindings/clock/qcom,sm8650-gcc.yaml | 65 + + .../bindings/clock/qcom,x1e80100-gcc.yaml | 72 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 18 +- + .../bindings/interconnect/qcom,sm6115.yaml | 152 + + .../bindings/interconnect/qcom,sm8650-rpmh.yaml | 136 + + .../bindings/interconnect/qcom,x1e80100-rpmh.yaml | 83 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 22 +- + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 14 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 1 - + arch/arm/boot/dts/qcom/Makefile | 2 + + arch/arm/boot/dts/qcom/pm8018.dtsi | 55 + + arch/arm/boot/dts/qcom/pm8058.dtsi | 159 + + .../dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 2 + + arch/arm/boot/dts/qcom/pm8821.dtsi | 22 + + .../dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0 + arch/arm/boot/dts/qcom/pm8921.dtsi | 137 + + .../dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 2 + + .../dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0 + .../boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0 + .../boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0 + .../boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 4 +- + .../boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 4 +- + arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 4 +- + .../dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 2 +- + .../arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts | 186 +- + .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 70 +- + arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 35 +- + arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts | 42 +- + .../qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts | 111 +- + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 203 +- + .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 35 +- + arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 8 +- + .../dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts | 4 +- + arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 143 +- + arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 183 +- + .../dts/qcom/qcom-msm8226-microsoft-common.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 44 +- + arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 61 +- + arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 217 +- + arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 372 ++ + .../dts/qcom/qcom-msm8926-motorola-peregrine.dts | 291 + + arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 27 +- + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 7 +- + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 45 +- + .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 33 +- + .../dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 35 +- + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 42 +- + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 33 +- + .../dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 35 +- + .../boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 13 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 35 +- + arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +- + .../boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 41 +- + arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-sdx65.dtsi | 51 +- + arch/arm64/boot/dts/qcom/Makefile | 8 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 64 + + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 3 + + arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp474.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 115 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 106 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 22 + + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 24 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 44 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts | 242 + + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 1 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 3 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 110 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 125 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 87 +- + arch/arm64/boot/dts/qcom/pm8550.dtsi | 3 - + arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 48 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 504 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 288 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 468 ++ + arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 455 ++ + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 23 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 113 + + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 111 +- + .../boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts | 2 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 31 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 5 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 174 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 14 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 37 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 7 +- + .../boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 19 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 412 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 4 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 12 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 51 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 2 + + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 1 + + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 19 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 296 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 127 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 8 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 +- + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 29 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 170 + + arch/arm64/boot/dts/qcom/sm4450-qrd.dts | 18 +- + arch/arm64/boot/dts/qcom/sm4450.dtsi | 107 + + arch/arm64/boot/dts/qcom/sm6115.dtsi | 342 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 20 +- + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 14 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 41 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 266 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 223 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 47 +- + arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 623 ++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 143 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 147 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 8 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 280 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 129 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 136 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 280 +- + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 727 +++ + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 811 +++ + arch/arm64/boot/dts/qcom/sm8650.dtsi | 6013 +++++++++++++++++ + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 424 ++ + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 401 ++ + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 3527 ++++++++++ + arch/arm64/configs/defconfig | 16 + + drivers/clk/qcom/Kconfig | 63 + + drivers/clk/qcom/Makefile | 7 + + drivers/clk/qcom/apss-ipq-pll.c | 21 + + drivers/clk/qcom/camcc-sc8280xp.c | 3045 +++++++++ + drivers/clk/qcom/clk-branch.c | 38 + + drivers/clk/qcom/clk-branch.h | 21 + + drivers/clk/qcom/clk-rpmh.c | 58 + + drivers/clk/qcom/dispcc-sm8650.c | 1810 ++++++ + drivers/clk/qcom/ecpricc-qdu1000.c | 2456 +++++++ + drivers/clk/qcom/gcc-msm8939.c | 110 +- + drivers/clk/qcom/gcc-sm8650.c | 3849 +++++++++++ + drivers/clk/qcom/gcc-x1e80100.c | 6807 ++++++++++++++++++++ + drivers/clk/qcom/gpucc-sm8150.c | 4 +- + drivers/clk/qcom/gpucc-sm8650.c | 661 ++ + drivers/clk/qcom/tcsrcc-sm8650.c | 182 + + drivers/clk/qcom/videocc-sm8150.c | 25 +- + drivers/soc/qcom/Kconfig | 13 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/llcc-qcom.c | 107 +- + drivers/soc/qcom/pmic_glink.c | 24 +- + drivers/soc/qcom/pmic_glink_altmode.c | 6 +- + drivers/soc/qcom/pmic_pdcharger_ulog.c | 166 + + drivers/soc/qcom/pmic_pdcharger_ulog.h | 36 + + drivers/soc/qcom/socinfo.c | 13 +- + drivers/usb/typec/ucsi/ucsi.c | 3 + + drivers/usb/typec/ucsi/ucsi.h | 3 + + drivers/usb/typec/ucsi/ucsi_glink.c | 13 + + include/dt-bindings/arm/qcom,ids.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8939.h | 6 + + include/dt-bindings/clock/qcom,qdu1000-ecpricc.h | 147 + + include/dt-bindings/clock/qcom,sc8280xp-camcc.h | 179 + + include/dt-bindings/clock/qcom,sm8650-dispcc.h | 102 + + include/dt-bindings/clock/qcom,sm8650-gcc.h | 254 + + include/dt-bindings/clock/qcom,sm8650-gpucc.h | 43 + + include/dt-bindings/clock/qcom,sm8650-tcsr.h | 18 + + include/dt-bindings/clock/qcom,videocc-sm8150.h | 4 + + include/dt-bindings/clock/qcom,x1e80100-gcc.h | 485 ++ + include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h | 69 + + include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h | 19 + + include/dt-bindings/iio/qcom,spmi-vadc.h | 3 + + include/dt-bindings/interconnect/qcom,sm6115.h | 111 + + .../dt-bindings/interconnect/qcom,sm8650-rpmh.h | 154 + + .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 207 + + include/dt-bindings/reset/qcom,sm8650-gpucc.h | 20 + + 212 files changed, 42498 insertions(+), 1861 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq6018.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qdu1000-ecpricc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8650-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8650-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,x1e80100-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm6115.yaml + 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 arch/arm/boot/dts/qcom/pm8018.dtsi + create mode 100644 arch/arm/boot/dts/qcom/pm8058.dtsi + rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (99%) + create mode 100644 arch/arm/boot/dts/qcom/pm8821.dtsi + rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%) + create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi + rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (99%) + rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%) + rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%) + rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%) + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcm6490-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-qrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100.dtsi + create mode 100644 drivers/clk/qcom/camcc-sc8280xp.c + create mode 100644 drivers/clk/qcom/dispcc-sm8650.c + create mode 100644 drivers/clk/qcom/ecpricc-qdu1000.c + create mode 100644 drivers/clk/qcom/gcc-sm8650.c + create mode 100644 drivers/clk/qcom/gcc-x1e80100.c + create mode 100644 drivers/clk/qcom/gpucc-sm8650.c + create mode 100644 drivers/clk/qcom/tcsrcc-sm8650.c + create mode 100644 drivers/soc/qcom/pmic_pdcharger_ulog.c + create mode 100644 drivers/soc/qcom/pmic_pdcharger_ulog.h + create mode 100644 include/dt-bindings/clock/qcom,qdu1000-ecpricc.h + create mode 100644 include/dt-bindings/clock/qcom,sc8280xp-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-tcsr.h + create mode 100644 include/dt-bindings/clock/qcom,x1e80100-gcc.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm6115.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8650-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h + create mode 100644 include/dt-bindings/reset/qcom,sm8650-gpucc.h +$ git am -3 ../patches/0001-fix-up-for-of-Stop-circularly-including-of_device.h-.patch +Applying: fix up for "of: Stop circularly including of_device.h and of_platform.h" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/clk/qcom/gcc-x1e80100.c +$ git add -A . +$ git commit -v -a --amend +[master d5221029d7a8] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git + Date: Tue Dec 19 09:35:19 2023 +1100 +Merging renesas/next (a4ce2434e9bb Merge branches 'renesas-drivers-for-v6.8' and '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. + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 3 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 106 +++++++++++++ + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 173 +++++++++++++++++++-- + drivers/soc/renesas/Kconfig | 1 + + drivers/soc/renesas/renesas-soc.c | 4 - + 5 files changed, 270 insertions(+), 17 deletions(-) +Merging reset/reset/next (c3c46acd5be9 dt-bindings: reset: hisilicon,hi3660-reset: Drop providers and consumers from example) +$ 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 ++---- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 25 +---- + .../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 +++++++++++++++++++++ + 17 files changed, 157 insertions(+), 80 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h +Merging rockchip/for-next (242278ed93dd 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 56 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/rockchip/Makefile | 3 + + arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 17 + + arch/arm/boot/dts/rockchip/rk3036.dtsi | 17 +- + arch/arm/boot/dts/rockchip/rk3066a.dtsi | 5 + + arch/arm/boot/dts/rockchip/rk3128-evb.dts | 5 - + arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 425 ++++++++++ + arch/arm/boot/dts/rockchip/rk3128.dtsi | 185 ++++ + arch/arm/boot/dts/rockchip/rk322x.dtsi | 4 + + arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 + + arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 4 + + arch/arm/boot/dts/rockchip/rv1109-sonoff-ihost.dts | 21 + + arch/arm/boot/dts/rockchip/rv1109.dtsi | 23 + + .../boot/dts/rockchip/rv1126-edgeble-neu2-io.dts | 2 +- + arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi | 72 +- + arch/arm/boot/dts/rockchip/rv1126-sonoff-ihost.dts | 29 + + .../arm/boot/dts/rockchip/rv1126-sonoff-ihost.dtsi | 404 +++++++++ + arch/arm/boot/dts/rockchip/rv1126.dtsi | 21 + + arch/arm64/boot/dts/rockchip/Makefile | 6 + + .../boot/dts/rockchip/px30-engicam-common.dtsi | 1 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 1 + + .../boot/dts/rockchip/px30-ringneck-haikou.dts | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 58 ++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 1 + + .../boot/dts/rockchip/rk3326-anbernic-rg351m.dts | 18 +- + .../boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi | 478 +++++++++++ + .../boot/dts/rockchip/rk3326-anbernic-rg351v.dts | 44 + + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 1 + + .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 55 ++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 1 + + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 1 + + .../dts/rockchip/rk3399-khadas-edge-captain.dts | 4 + + .../boot/dts/rockchip/rk3399-khadas-edge-v.dts | 4 + + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 1 + + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 42 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 15 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 + + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 7 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 + + .../boot/dts/rockchip/rk3566-powkiddy-rgb30.dts | 152 +--- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dts | 38 + + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi | 875 +++++++++++++++++++ + .../boot/dts/rockchip/rk3566-powkiddy-x55.dts | 926 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 5 +- + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 1 + + .../boot/dts/rockchip/rk3566-soquartz-blade.dts | 4 + + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 4 + + .../boot/dts/rockchip/rk3566-soquartz-model-a.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 1 - + .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 214 +++++ + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 650 +++++++++++++++ + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 4 - + .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 99 ++- + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 803 ++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 1 - + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 - + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 9 +- + .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 - + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 812 ++++++++++++++++++ + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 - + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 - + .../arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 115 +++ + drivers/clk/rockchip/clk-rk3568.c | 3 + + 94 files changed, 6620 insertions(+), 223 deletions(-) + create mode 100644 arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts + create mode 100644 arch/arm/boot/dts/rockchip/rv1109-sonoff-ihost.dts + create mode 100644 arch/arm/boot/dts/rockchip/rv1109.dtsi + create mode 100644 arch/arm/boot/dts/rockchip/rv1126-sonoff-ihost.dts + create mode 100644 arch/arm/boot/dts/rockchip/rv1126-sonoff-ihost.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.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 + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-x55.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +Merging samsung-krzk/for-next (1b97a284a293 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/google.yaml | 53 + + .../bindings/arm/samsung/samsung-boards.yaml | 6 + + .../bindings/clock/google,gs101-clock.yaml | 106 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 5 + + .../bindings/hwinfo/samsung,exynos-chipid.yaml | 18 +- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 11 +- + .../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 | 4 + + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 5 + + .../devicetree/bindings/serial/samsung_uart.yaml | 28 +- + .../bindings/soc/samsung/exynos-pmu.yaml | 10 + + .../bindings/soc/samsung/exynos-usi.yaml | 7 +- + .../soc/samsung/samsung,exynos-sysreg.yaml | 5 + + .../devicetree/bindings/sound/samsung-i2s.yaml | 19 +- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 29 +- + MAINTAINERS | 10 + + arch/arm/boot/dts/samsung/exynos4.dtsi | 26 +- + arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 48 +- + arch/arm/boot/dts/samsung/exynos4x12.dtsi | 22 +- + arch/arm/boot/dts/samsung/s5pv210.dtsi | 18 +- + arch/arm64/boot/dts/exynos/Makefile | 5 +- + 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 +- + .../boot/dts/exynos/exynosautov920-pinctrl.dtsi | 1266 ++++++++++ + arch/arm64/boot/dts/exynos/exynosautov920-sadk.dts | 88 + + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 312 +++ + arch/arm64/boot/dts/exynos/google/Makefile | 4 + + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 105 + + .../boot/dts/exynos/google/gs101-pinctrl.dtsi | 1249 ++++++++++ + arch/arm64/boot/dts/exynos/google/gs101-pinctrl.h | 33 + + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 473 ++++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 53 +- + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-cpu.h | 30 +- + drivers/clk/samsung/clk-gs101.c | 2518 ++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 6 + + drivers/clk/samsung/clk-pll.h | 3 + + drivers/clk/samsung/clk.h | 157 +- + drivers/soc/samsung/exynos-chipid.c | 1 + + drivers/tty/serial/samsung_tty.c | 16 + + drivers/watchdog/s3c2410_wdt.c | 85 +- + include/dt-bindings/clock/google,gs101.h | 392 +++ + 49 files changed, 7260 insertions(+), 269 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/google.yaml + create mode 100644 Documentation/devicetree/bindings/clock/google,gs101-clock.yaml + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov920-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov920-sadk.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov920.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/google/Makefile + create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-oriole.dts + create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-pinctrl.h + create mode 100644 arch/arm64/boot/dts/exynos/google/gs101.dtsi + create mode 100644 drivers/clk/samsung/clk-gs101.c + create mode 100644 include/dt-bindings/clock/google,gs101.h +Merging scmi/for-linux-next (7c2d214ab5b9 Merge tag 'scmi-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/juno-base.dtsi | 12 ++++----- + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 12 ++++----- + drivers/firmware/arm_scmi/base.c | 6 ++++- + drivers/firmware/arm_scmi/clock.c | 8 ++++-- + drivers/firmware/arm_scmi/driver.c | 24 +++++++++++++---- + drivers/firmware/arm_scmi/perf.c | 48 +++++++++++++++++++++------------- + drivers/firmware/arm_scmi/power.c | 8 ++++-- + drivers/firmware/arm_scmi/powercap.c | 8 ++++-- + drivers/firmware/arm_scmi/protocols.h | 11 ++++++-- + drivers/firmware/arm_scmi/reset.c | 9 +++++-- + drivers/firmware/arm_scmi/sensors.c | 8 ++++-- + drivers/firmware/arm_scmi/system.c | 6 ++++- + drivers/firmware/arm_scmi/voltage.c | 8 ++++-- + 13 files changed, 117 insertions(+), 51 deletions(-) +Merging stm32/stm32-next (769e4b077b2e ARM: multi_v7_defconfig: enable STM32 DCMIPP media support) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 16 ++---- + arch/arm/boot/dts/st/stm32f469-disco.dts | 15 ++---- + arch/arm/boot/dts/st/stm32f746.dtsi | 61 ++++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp135.dtsi | 11 ++++ + arch/arm/boot/dts/st/stm32mp151.dtsi | 4 ++ + arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi | 2 - + arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 4 +- + arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi | 2 - + arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 4 +- + arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 4 +- + .../arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 -- + arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 5 +- + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 1 - + arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts | 4 -- + .../dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 4 -- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 3 -- + arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi | 1 - + arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 1 - + .../arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi | 2 - + .../boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi | 2 - + .../boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi | 2 - + .../boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi | 2 - + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 1 - + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 16 ++++++ + 25 files changed, 108 insertions(+), 64 deletions(-) +Merging sunxi/sunxi/for-next (d4d29dd858bb Merge branch 'sunxi/dt-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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 10 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-h618-orangepi-zero2w.dts | 176 +++++++++++++++++++++ + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 161 +++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_nkm.c | 5 +- + 6 files changed, 352 insertions(+), 3 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-transpeed-8k618-t.dts +Merging tee/next (84ec4fd88831 Merge branch 'tee_iov_iter_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. + drivers/firmware/arm_scmi/optee.c | 4 + + drivers/tee/optee/call.c | 163 +++++++++++++++++++++++++++++++++++--- + drivers/tee/optee/core.c | 66 +++++++-------- + 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 | 112 +++++++++++--------------- + drivers/tee/tee_core.c | 8 ++ + drivers/tee/tee_shm.c | 78 +++++++++--------- + include/linux/tee_drv.h | 16 ++++ + 10 files changed, 457 insertions(+), 165 deletions(-) +Merging tegra/for-next (8ebef8a28749 Merge branch for-6.8/arm/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging mm/util.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/nvidia/tegra30-ouya.dts | 4 +- + drivers/soc/tegra/Kconfig | 5 ++ + drivers/soc/tegra/fuse/fuse-tegra.c | 112 ++++++++++++++++++++++-------- + drivers/soc/tegra/fuse/fuse-tegra30.c | 20 ++++++ + drivers/soc/tegra/fuse/fuse.h | 5 ++ + drivers/soc/tegra/fuse/tegra-apbmisc.c | 110 ++++++++++++++++++++++++----- + drivers/soc/tegra/pmc.c | 24 ------- + include/linux/string.h | 1 + + include/soc/tegra/fuse.h | 1 + + include/soc/tegra/pmc.h | 18 ----- + mm/util.c | 17 +++++ + 11 files changed, 229 insertions(+), 88 deletions(-) +Merging ti/ti-next (bfb1d67c6f85 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 2 + + .../boot/dts/ti/keystone/keystone-k2e-netcp.dtsi | 6 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g-evm.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2g-netcp.dtsi | 6 +- + .../arm/boot/dts/ti/keystone/keystone-k2hk-evm.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2hk-netcp.dtsi | 6 +- + .../boot/dts/ti/keystone/keystone-k2l-netcp.dtsi | 6 +- + arch/arm64/boot/dts/ti/Makefile | 70 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 96 ++- + arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi | 188 +++++ + arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 17 +- + .../dts/ti/k3-am625-beagleplay-csi2-ov5640.dtso | 77 ++ + .../ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtso | 77 ++ + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 4 +- + .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 98 ++- + .../boot/dts/ti/k3-am625-verdin-nonwifi-mallow.dts | 22 + + .../boot/dts/ti/k3-am625-verdin-wifi-mallow.dts | 22 + + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 121 ++- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 39 + + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 18 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 9 + + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 16 + + .../arm64/boot/dts/ti/k3-am62x-sk-csi2-imx219.dtso | 84 +++ + .../arm64/boot/dts/ti/k3-am62x-sk-csi2-ov5640.dtso | 82 ++ + .../boot/dts/ti/k3-am62x-sk-csi2-tevi-ov5640.dtso | 82 ++ + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 22 +- + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 103 ++- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 12 +- + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 1 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 10 +- + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 1 - + arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 1 + + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 10 +- + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 826 +++++++++++++++++++-- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 16 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am652.dtsi | 74 ++ + .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 16 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 + + .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 2 + + .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 12 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 96 ++- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 21 +- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 153 ++++ + arch/arm64/boot/dts/ti/k3-j721e-evm-pcie0-ep.dtso | 53 ++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 21 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 151 ++++ + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 160 ++++ + arch/arm64/boot/dts/ti/k3-j721s2-evm-pcie1-ep.dtso | 53 ++ + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 21 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 193 +++++ + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 102 +++ + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 22 +- + arch/arm64/configs/defconfig | 7 + + drivers/firmware/ti_sci.c | 10 +- + drivers/soc/ti/k3-socinfo.c | 75 +- + 66 files changed, 3267 insertions(+), 201 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay-csi2-ov5640.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-imx219.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-ov5640.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-tevi-ov5640.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am652.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-evm-pcie0-ep.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-evm-pcie1-ep.dtso +Merging xilinx/for-next (21d01d5afbc8 Merge remote-tracking branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/{arm => soc/xilinx}/xilinx.yaml | 7 +- + MAINTAINERS | 1 + + arch/arm64/boot/dts/xilinx/Makefile | 9 ++- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 76 +++++++++++----------- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 76 +++++++++++----------- + 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 | 15 ++--- + drivers/soc/xilinx/xlnx_event_manager.c | 7 +- + drivers/soc/xilinx/zynqmp_power.c | 16 ++--- + 15 files changed, 152 insertions(+), 133 deletions(-) + rename Documentation/devicetree/bindings/{arm => soc/xilinx}/xilinx.yaml (95%) +Merging clk/clk-next (7aaac8b1f0cd Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../bindings/arm/mediatek/mediatek,ethsys.txt | 29 - + .../devicetree/bindings/clock/brcm,kona-ccu.txt | 138 ----- + .../devicetree/bindings/clock/brcm,kona-ccu.yaml | 181 ++++++ + .../devicetree/bindings/clock/mediatek,ethsys.yaml | 54 ++ + .../devicetree/bindings/clock/renesas,9series.yaml | 10 + + .../bindings/clock/st,stm32mp25-rcc.yaml | 76 +++ + .../bindings/clock/xlnx,clocking-wizard.yaml | 1 + + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 31 +- + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 4 +- + drivers/clk/Kconfig | 11 +- + drivers/clk/Makefile | 1 - + drivers/clk/clk-renesas-pcie.c | 37 +- + drivers/clk/clk-si5341.c | 4 +- + drivers/clk/clk-sp7021.c | 12 +- + drivers/clk/clk-versaclock3.c | 88 ++- + drivers/clk/hisilicon/clk-hi3620.c | 4 +- + drivers/clk/microchip/clk-mpfs-ccc.c | 2 +- + drivers/clk/mmp/clk-of-pxa168.c | 3 + + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 3 + + drivers/clk/renesas/r9a08g045-cpg.c | 13 + + drivers/clk/renesas/rzg2l-cpg.c | 91 +-- + drivers/clk/stm32/Kconfig | 29 + + drivers/clk/stm32/Makefile | 1 + + drivers/clk/stm32/clk-stm32-core.c | 5 +- + drivers/clk/stm32/clk-stm32-core.h | 5 +- + drivers/clk/{ => stm32}/clk-stm32mp1.c | 127 +---- + drivers/clk/stm32/clk-stm32mp13.c | 9 +- + drivers/clk/stm32/reset-stm32.c | 14 +- + drivers/clk/stm32/reset-stm32.h | 8 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 632 ++++++++++++++++++--- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- + drivers/clk/zynqmp/divider.c | 66 +-- + include/dt-bindings/clock/st,stm32mp25-rcc.h | 492 ++++++++++++++++ + include/dt-bindings/reset/st,stm32mp25-rcc.h | 167 ++++++ + 34 files changed, 1770 insertions(+), 580 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt + delete mode 100644 Documentation/devicetree/bindings/clock/brcm,kona-ccu.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp25-rcc.yaml + create mode 100644 drivers/clk/stm32/Kconfig + rename drivers/clk/{ => stm32}/clk-stm32mp1.c (95%) + create mode 100644 include/dt-bindings/clock/st,stm32mp25-rcc.h + create mode 100644 include/dt-bindings/reset/st,stm32mp25-rcc.h +Merging clk-imx/for-next (144f1b70ea9e dt-bindings: clock: support i.MX93 ANATOP clock module) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/fsl,imx93-anatop.yaml | 42 ++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx93-anatop.yaml +Merging clk-renesas/renesas-clk (515f05da372a clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (e2f7b3d8b4b3 LoongArch: BPF: Fix unconditional bswap instructions) +$ 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 (ceb6a6f023fd Linux 6.7-rc6) +$ 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 (01940cd4a6b9 MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/mips/sgi-ip27/ip27-hubio.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +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 (33cc938e65a9 Linux 6.7-rc4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (8fc63a91e785 Merge branch 'smp-topo' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/trace/ftrace_entry.S +Merge made by the 'ort' strategy. + Documentation/userspace-api/ioctl/ioctl-number.rst | 4 + + MAINTAINERS | 6 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 1 - + arch/powerpc/Makefile | 25 +- + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 9 +- + arch/powerpc/include/asm/ftrace.h | 2 +- + arch/powerpc/include/asm/linkage.h | 3 - + arch/powerpc/include/asm/mmu.h | 4 + + arch/powerpc/include/asm/mmzone.h | 8 - + arch/powerpc/include/asm/papr-sysparm.h | 17 +- + arch/powerpc/include/asm/paravirt.h | 33 +- + arch/powerpc/include/asm/ppc-pci.h | 5 +- + arch/powerpc/include/asm/ps3.h | 6 + + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/asm/reg_a2.h | 154 ------ + arch/powerpc/include/asm/rtas.h | 91 ++-- + arch/powerpc/include/uapi/asm/papr-miscdev.h | 9 + + arch/powerpc/include/uapi/asm/papr-sysparm.h | 58 +++ + arch/powerpc/include/uapi/asm/papr-vpd.h | 22 + + arch/powerpc/kernel/cpu_specs_book3s_64.h | 15 + + arch/powerpc/kernel/cputable.c | 4 +- + arch/powerpc/kernel/exceptions-64e.S | 1 - + arch/powerpc/kernel/rtas.c | 209 ++++++-- + arch/powerpc/kernel/rtas_pci.c | 8 +- + arch/powerpc/kernel/smp.c | 126 ++--- + arch/powerpc/kernel/swsusp_64.c | 2 + + arch/powerpc/kernel/trace/ftrace_entry.S | 2 - + arch/powerpc/kernel/traps.c | 2 + + arch/powerpc/kernel/udbg_16550.c | 1 - + arch/powerpc/kernel/vdso/Makefile | 2 +- + arch/powerpc/kexec/core.c | 1 + + arch/powerpc/kvm/book3s_pr.c | 1 + + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/sstep.c | 14 +- + arch/powerpc/mm/book3s64/hash_utils.c | 7 + + arch/powerpc/mm/book3s64/pkeys.c | 3 +- + arch/powerpc/mm/init-common.c | 5 +- + arch/powerpc/mm/mmu_decl.h | 5 + + arch/powerpc/perf/hv-gpci.c | 3 + + arch/powerpc/perf/imc-pmu.c | 6 + + arch/powerpc/platforms/44x/Kconfig | 1 + + arch/powerpc/platforms/44x/idle.c | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 + + arch/powerpc/platforms/512x/pdm360ng.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powernv/opal-irqchip.c | 2 + + arch/powerpc/platforms/powernv/opal-powercap.c | 6 + + arch/powerpc/platforms/powernv/opal-xscom.c | 5 + + arch/powerpc/platforms/powernv/subcore.c | 3 +- + arch/powerpc/platforms/ps3/Kconfig | 12 - + arch/powerpc/platforms/ps3/Makefile | 2 +- + arch/powerpc/platforms/ps3/gelic_udbg.c | 1 + + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/eeh_pseries.c | 18 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 16 +- + arch/powerpc/platforms/pseries/papr-sysparm.c | 205 +++++++- + arch/powerpc/platforms/pseries/papr-vpd.c | 541 +++++++++++++++++++++ + 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/cxl/cxl.h | 3 +- + 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 - + tools/testing/selftests/powerpc/Makefile | 2 + + tools/testing/selftests/powerpc/math/fpu.h | 25 + + tools/testing/selftests/powerpc/math/fpu_asm.S | 48 +- + tools/testing/selftests/powerpc/math/fpu_preempt.c | 30 +- + tools/testing/selftests/powerpc/math/fpu_syscall.c | 8 +- + tools/testing/selftests/powerpc/math/vmx_preempt.c | 10 +- + .../selftests/powerpc/papr_sysparm/.gitignore | 1 + + .../selftests/powerpc/papr_sysparm/Makefile | 12 + + .../selftests/powerpc/papr_sysparm/papr_sysparm.c | 196 ++++++++ + .../testing/selftests/powerpc/papr_vpd/.gitignore | 1 + + tools/testing/selftests/powerpc/papr_vpd/Makefile | 12 + + .../testing/selftests/powerpc/papr_vpd/papr_vpd.c | 352 ++++++++++++++ + 84 files changed, 1992 insertions(+), 473 deletions(-) + delete mode 100644 arch/powerpc/include/asm/reg_a2.h + create mode 100644 arch/powerpc/include/uapi/asm/papr-miscdev.h + create mode 100644 arch/powerpc/include/uapi/asm/papr-sysparm.h + create mode 100644 arch/powerpc/include/uapi/asm/papr-vpd.h + create mode 100644 arch/powerpc/platforms/pseries/papr-vpd.c + create mode 100644 tools/testing/selftests/powerpc/math/fpu.h + create mode 100644 tools/testing/selftests/powerpc/papr_sysparm/.gitignore + create mode 100644 tools/testing/selftests/powerpc/papr_sysparm/Makefile + create mode 100644 tools/testing/selftests/powerpc/papr_sysparm/papr_sysparm.c + create mode 100644 tools/testing/selftests/powerpc/papr_vpd/.gitignore + create mode 100644 tools/testing/selftests/powerpc/papr_vpd/Makefile + create mode 100644 tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c +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 (f352a28cc2fb Merge patch series "riscv: report more ISA extensions through hwprobe") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/kernel/sys_riscv.c +Merge made by the 'ort' strategy. + Documentation/arch/riscv/hwprobe.rst | 81 ++++++++ + .../devicetree/bindings/riscv/extensions.yaml | 213 +++++++++++++++++++++ + arch/riscv/include/asm/cpufeature.h | 4 +- + arch/riscv/include/asm/hwcap.h | 30 ++- + arch/riscv/include/uapi/asm/hwprobe.h | 26 +++ + arch/riscv/kernel/cpufeature.c | 189 +++++++++++++++--- + arch/riscv/kernel/sys_riscv.c | 33 ++++ + 7 files changed, 551 insertions(+), 25 deletions(-) +Merging riscv-dt/riscv-dt-for-next (56b10953da7e riscv: dts: starfive: Enable SDIO wifi on JH7100 boards) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Auto-merging arch/riscv/boot/dts/sophgo/cv1800b.dtsi +CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sophgo/cv1800b.dtsi +Resolved 'arch/riscv/boot/dts/sophgo/cv1800b.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b1b7794aba96] Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/sophgo.yaml | 4 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 21 +++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 17 ++ + arch/riscv/boot/dts/sophgo/Makefile | 1 + + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 122 +------------ + arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts | 48 +++++ + arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 24 +++ + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 193 +++++++++++++++++++++ + arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 131 ++++++++++++++ + arch/riscv/boot/dts/starfive/jh7100.dtsi | 48 ++++- + arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 20 +++ + .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 20 +++ + arch/riscv/boot/dts/thead/th1520.dtsi | 34 ++++ + 15 files changed, 568 insertions(+), 117 deletions(-) + create mode 100644 arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts + create mode 100644 arch/riscv/boot/dts/sophgo/cv1812h.dtsi + create mode 100644 arch/riscv/boot/dts/sophgo/cv18xx.dtsi +$ git am -3 ../patches/0001-fixup-for-riscv-dts-sophgo-Separate-compatible-speci.patch +Applying: fixup for "riscv: dts: sophgo: Separate compatible specific for CV1800B soc" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/riscv/boot/dts/sophgo/cv18xx.dtsi +$ git add -A . +$ git commit -v -a --amend +[master 86195df0077a] Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git + Date: Tue Dec 19 09:35:45 2023 +1100 +Merging riscv-soc/riscv-soc-for-next (a3ee4347490b 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 +Auto-merging drivers/firmware/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/cache/sifive,ccache0.yaml | 6 +- + .../microchip/microchip,mpfs-sys-controller.yaml | 10 + + MAINTAINERS | 15 +- + arch/riscv/Kconfig.errata | 19 + + drivers/base/firmware_loader/sysfs_upload.c | 1 + + drivers/cache/Kconfig | 6 + + drivers/cache/Makefile | 3 +- + drivers/{soc/sifive => cache}/sifive_ccache.c | 62 ++- + drivers/firmware/Kconfig | 1 + + drivers/firmware/Makefile | 1 + + drivers/firmware/microchip/Kconfig | 12 + + drivers/firmware/microchip/Makefile | 3 + + drivers/firmware/microchip/mpfs-auto-update.c | 494 +++++++++++++++++++++ + drivers/soc/Kconfig | 1 - + drivers/soc/Makefile | 1 - + drivers/soc/microchip/Kconfig | 1 + + drivers/soc/microchip/mpfs-sys-controller.c | 33 +- + drivers/soc/sifive/Kconfig | 10 - + drivers/soc/sifive/Makefile | 3 - + include/linux/firmware.h | 2 + + include/soc/microchip/mpfs.h | 2 + + lib/test_firmware.c | 1 + + 22 files changed, 658 insertions(+), 29 deletions(-) + rename drivers/{soc/sifive => cache}/sifive_ccache.c (81%) + create mode 100644 drivers/firmware/microchip/Kconfig + create mode 100644 drivers/firmware/microchip/Makefile + create mode 100644 drivers/firmware/microchip/mpfs-auto-update.c + delete mode 100644 drivers/soc/sifive/Kconfig + delete mode 100644 drivers/soc/sifive/Makefile +Merging s390/for-next (5e191539a5ee Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/traps.c +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 1 - + arch/s390/boot/ipl_parm.c | 2 +- + arch/s390/boot/startup.c | 3 +- + arch/s390/crypto/chacha-glue.c | 2 +- + arch/s390/include/asm/ap.h | 21 ++-- + arch/s390/include/asm/ctlreg.h | 24 +++-- + arch/s390/include/asm/fpu/api.h | 35 +++--- + arch/s390/include/asm/fpu/internal.h | 10 +- + arch/s390/include/asm/processor.h | 34 ++++-- + arch/s390/include/asm/setup.h | 2 - + arch/s390/include/asm/sysinfo.h | 4 + + arch/s390/kernel/compat_signal.c | 16 ++- + arch/s390/kernel/crash_dump.c | 5 +- + arch/s390/kernel/early.c | 12 +-- + arch/s390/kernel/fpu.c | 12 +-- + arch/s390/kernel/machine_kexec.c | 2 +- + arch/s390/kernel/nmi.c | 10 +- + arch/s390/kernel/perf_regs.c | 6 +- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/processor.c | 7 +- + arch/s390/kernel/ptrace.c | 28 +++-- + arch/s390/kernel/setup.c | 25 +---- + arch/s390/kernel/signal.c | 12 +-- + arch/s390/kernel/smp.c | 6 +- + arch/s390/kernel/sysinfo.c | 10 ++ + arch/s390/kernel/traps.c | 13 ++- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 26 ++--- + arch/s390/lib/test_unwind.c | 6 +- + arch/s390/mm/pgtable.c | 27 ++--- + arch/s390/tools/gen_facilities.c | 1 + + drivers/s390/cio/chsc.c | 18 ++-- + drivers/s390/cio/chsc_sch.c | 6 +- + drivers/s390/cio/cio.c | 6 +- + drivers/s390/cio/cio.h | 2 +- + drivers/s390/cio/css.c | 36 ++----- + drivers/s390/cio/device.c | 66 ++++++------ + drivers/s390/cio/device_pgid.c | 12 +-- + drivers/s390/cio/eadm_sch.c | 36 +++---- + drivers/s390/cio/vfio_ccw_drv.c | 8 +- + drivers/s390/cio/vfio_ccw_fsm.c | 24 ++--- + drivers/s390/crypto/ap_bus.c | 72 ++++++------- + drivers/s390/crypto/ap_bus.h | 22 +--- + drivers/s390/crypto/ap_card.c | 18 ++-- + drivers/s390/crypto/ap_queue.c | 200 +++++++++++++++++++++++------------ + drivers/s390/crypto/vfio_ap_ops.c | 30 ++++-- + drivers/s390/crypto/zcrypt_api.c | 16 +-- + drivers/s390/crypto/zcrypt_cex4.c | 31 +++--- + lib/raid6/s390vx.uc | 2 +- + 50 files changed, 517 insertions(+), 455 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 (791beae7335c xtensa: Use PCI_HEADER_TYPE_MFD instead of literal) +$ 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/Kconfig | 2 +- + arch/xtensa/include/asm/asmmacro.h | 2 +- + arch/xtensa/lib/pci-auto.c | 8 +++++--- + 3 files changed, 7 insertions(+), 5 deletions(-) +Merging bcachefs/for-next (f5470472504d bcachefs: kill __bch2_btree_iter_peek_upto_and_restart()) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs.c +Merge made by the 'ort' strategy. + arch/powerpc/kernel/firmware.c | 2 + + fs/bcachefs/Kconfig | 18 +- + fs/bcachefs/Makefile | 1 + + fs/bcachefs/alloc_background.c | 283 ++++++------ + fs/bcachefs/alloc_background.h | 23 +- + fs/bcachefs/alloc_foreground.c | 42 +- + fs/bcachefs/backpointers.c | 196 ++++---- + fs/bcachefs/backpointers.h | 27 +- + fs/bcachefs/bcachefs.h | 179 +++++-- + fs/bcachefs/bcachefs_format.h | 26 +- + fs/bcachefs/bcachefs_ioctl.h | 60 ++- + fs/bcachefs/bkey_methods.h | 2 - + fs/bcachefs/btree_cache.c | 22 +- + fs/bcachefs/btree_cache.h | 4 +- + fs/bcachefs/btree_gc.c | 302 +++++------- + fs/bcachefs/btree_io.c | 52 ++- + fs/bcachefs/btree_io.h | 2 +- + fs/bcachefs/btree_iter.c | 822 ++++++++++++++++----------------- + fs/bcachefs/btree_iter.h | 406 +++++++--------- + fs/bcachefs/btree_journal_iter.c | 21 +- + fs/bcachefs/btree_key_cache.c | 61 ++- + fs/bcachefs/btree_key_cache.h | 2 - + fs/bcachefs/btree_locking.c | 102 ++-- + fs/bcachefs/btree_locking.h | 7 +- + fs/bcachefs/btree_trans_commit.c | 243 ++++------ + fs/bcachefs/btree_types.h | 133 +++--- + fs/bcachefs/btree_update.c | 247 ++++------ + fs/bcachefs/btree_update.h | 111 +++-- + fs/bcachefs/btree_update_interior.c | 334 ++++++++------ + fs/bcachefs/btree_update_interior.h | 15 +- + fs/bcachefs/btree_write_buffer.c | 688 ++++++++++++++++++--------- + fs/bcachefs/btree_write_buffer.h | 53 ++- + fs/bcachefs/btree_write_buffer_types.h | 63 ++- + fs/bcachefs/buckets.c | 365 +++------------ + fs/bcachefs/buckets.h | 8 +- + fs/bcachefs/buckets_types.h | 2 - + fs/bcachefs/chardev.c | 524 ++++++++++++++++++--- + fs/bcachefs/compress.c | 4 - + fs/bcachefs/darray.c | 23 + + fs/bcachefs/darray.h | 41 +- + fs/bcachefs/data_update.c | 27 +- + fs/bcachefs/debug.c | 104 ++--- + fs/bcachefs/dirent.c | 23 +- + fs/bcachefs/dirent.h | 3 +- + fs/bcachefs/disk_groups.c | 11 +- + fs/bcachefs/ec.c | 104 ++--- + fs/bcachefs/ec_types.h | 2 +- + fs/bcachefs/errcode.h | 3 +- + fs/bcachefs/error.c | 18 +- + fs/bcachefs/error.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 9 +- + fs/bcachefs/fs-io.c | 20 +- + fs/bcachefs/fs-ioctl.c | 12 +- + fs/bcachefs/fs.c | 51 +- + fs/bcachefs/fs.h | 9 +- + fs/bcachefs/fsck.c | 426 +++++++---------- + fs/bcachefs/inode.c | 57 ++- + fs/bcachefs/io_misc.c | 12 +- + fs/bcachefs/io_read.c | 4 +- + fs/bcachefs/io_write.c | 11 +- + fs/bcachefs/journal.c | 108 +++-- + fs/bcachefs/journal.h | 4 +- + fs/bcachefs/journal_io.c | 105 +++-- + fs/bcachefs/journal_reclaim.c | 118 +++-- + fs/bcachefs/journal_reclaim.h | 16 +- + fs/bcachefs/journal_seq_blacklist.c | 2 +- + fs/bcachefs/journal_types.h | 16 +- + fs/bcachefs/logged_ops.c | 18 +- + fs/bcachefs/lru.c | 11 +- + fs/bcachefs/migrate.c | 9 +- + fs/bcachefs/move.c | 182 ++++---- + fs/bcachefs/move.h | 13 +- + fs/bcachefs/movinggc.c | 49 +- + fs/bcachefs/opts.c | 4 +- + fs/bcachefs/opts.h | 10 +- + fs/bcachefs/quota.c | 28 +- + fs/bcachefs/rebalance.c | 37 +- + fs/bcachefs/recovery.c | 263 ++++++----- + fs/bcachefs/recovery.h | 4 + + fs/bcachefs/recovery_types.h | 73 +-- + fs/bcachefs/reflink.c | 203 +++++++- + fs/bcachefs/reflink.h | 4 + + fs/bcachefs/replicas.c | 60 +-- + fs/bcachefs/replicas.h | 22 +- + fs/bcachefs/replicas_types.h | 6 +- + fs/bcachefs/sb-clean.c | 20 +- + fs/bcachefs/sb-errors.h | 5 +- + fs/bcachefs/sb-members.c | 13 +- + fs/bcachefs/sb-members.h | 79 ++-- + fs/bcachefs/six.c | 119 ++--- + fs/bcachefs/six.h | 13 +- + fs/bcachefs/snapshot.c | 143 +++--- + fs/bcachefs/snapshot.h | 4 - + fs/bcachefs/str_hash.h | 25 +- + fs/bcachefs/subvolume.c | 31 +- + fs/bcachefs/super-io.c | 64 +-- + fs/bcachefs/super-io.h | 1 + + fs/bcachefs/super.c | 262 ++++++----- + fs/bcachefs/super.h | 6 +- + fs/bcachefs/sysfs.c | 158 +++---- + fs/bcachefs/tests.c | 193 ++++---- + fs/bcachefs/trace.h | 260 ++++++++--- + fs/bcachefs/util.c | 147 +++--- + fs/bcachefs/util.h | 40 +- + fs/bcachefs/vstructs.h | 10 +- + 105 files changed, 5101 insertions(+), 4281 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 (0fc24a6549f9 fscrypt: update comment for do_remove_key()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 3 ++- + fs/crypto/keyring.c | 6 +++--- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging afs/afs-next (f1302568cc65 afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Auto-merging fs/afs/write.c +Merge made by the 'ort' strategy. + fs/afs/Makefile | 2 + + fs/afs/addr_list.c | 224 +++++-------- + fs/afs/addr_prefs.c | 531 +++++++++++++++++++++++++++++ + fs/afs/afs.h | 3 +- + fs/afs/callback.c | 141 +++++--- + fs/afs/cell.c | 5 +- + fs/afs/cmservice.c | 5 +- + fs/afs/dir.c | 59 ++-- + fs/afs/dir_silly.c | 2 +- + fs/afs/dynroot.c | 31 +- + fs/afs/file.c | 20 +- + fs/afs/fs_operation.c | 83 +++-- + fs/afs/fs_probe.c | 319 ++++++++++-------- + fs/afs/fsclient.c | 74 +++- + fs/afs/inode.c | 204 +---------- + fs/afs/internal.h | 368 +++++++++++++------- + fs/afs/main.c | 1 + + fs/afs/misc.c | 10 +- + fs/afs/proc.c | 102 +++++- + fs/afs/rotate.c | 524 +++++++++++++++++++++-------- + fs/afs/rxrpc.c | 109 +++--- + fs/afs/server.c | 133 ++++---- + fs/afs/server_list.c | 172 ++++++++-- + fs/afs/super.c | 7 +- + fs/afs/validation.c | 467 ++++++++++++++++++++++++++ + fs/afs/vl_alias.c | 69 +--- + fs/afs/vl_list.c | 29 +- + fs/afs/vl_probe.c | 60 ++-- + fs/afs/vl_rotate.c | 215 +++++++----- + fs/afs/vlclient.c | 143 +++++--- + fs/afs/volume.c | 76 +++-- + fs/afs/write.c | 6 +- + fs/afs/yfsclient.c | 25 +- + include/linux/key-type.h | 1 + + include/net/af_rxrpc.h | 15 +- + include/trace/events/afs.h | 779 ++++++++++++++++++++++++------------------- + include/trace/events/rxrpc.h | 3 + + net/dns_resolver/dns_key.c | 10 +- + net/rxrpc/af_rxrpc.c | 62 +++- + net/rxrpc/ar-internal.h | 6 +- + net/rxrpc/call_object.c | 17 +- + net/rxrpc/conn_client.c | 10 + + net/rxrpc/conn_service.c | 3 +- + net/rxrpc/net_ns.c | 4 + + net/rxrpc/peer_object.c | 60 ++-- + net/rxrpc/proc.c | 76 +++++ + net/rxrpc/sendmsg.c | 11 +- + security/keys/gc.c | 31 +- + security/keys/internal.h | 11 +- + security/keys/key.c | 15 +- + security/keys/proc.c | 2 +- + 51 files changed, 3610 insertions(+), 1725 deletions(-) + create mode 100644 fs/afs/addr_prefs.c + create mode 100644 fs/afs/validation.c +Merging btrfs/for-next (9bd44dbd2924 Merge branch 'for-next-next-v6.7-20231215' into for-next-20231215) +$ 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/accessors.c | 98 +- + fs/btrfs/accessors.h | 4 +- + fs/btrfs/bio.c | 17 +- + fs/btrfs/bio.h | 4 +- + fs/btrfs/block-group.c | 167 ++- + fs/btrfs/block-group.h | 6 +- + fs/btrfs/btrfs_inode.h | 10 +- + fs/btrfs/compression.c | 139 ++- + fs/btrfs/compression.h | 5 + + fs/btrfs/ctree.c | 63 +- + fs/btrfs/ctree.h | 17 +- + fs/btrfs/defrag.c | 13 +- + fs/btrfs/delayed-inode.c | 109 +- + fs/btrfs/dev-replace.c | 28 +- + fs/btrfs/disk-io.c | 155 ++- + fs/btrfs/disk-io.h | 3 - + fs/btrfs/extent-io-tree.c | 123 +- + fs/btrfs/extent-io-tree.h | 18 +- + fs/btrfs/extent-tree.c | 112 +- + fs/btrfs/extent_io.c | 1051 ++++++++++------- + fs/btrfs/extent_io.h | 80 +- + fs/btrfs/extent_map.c | 189 ++- + fs/btrfs/extent_map.h | 77 +- + fs/btrfs/file-item.c | 15 +- + fs/btrfs/file.c | 27 +- + fs/btrfs/free-space-cache.c | 4 +- + fs/btrfs/fs.h | 18 +- + fs/btrfs/inode.c | 153 ++- + fs/btrfs/lru_cache.c | 2 +- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/messages.c | 2 +- + fs/btrfs/messages.h | 2 +- + fs/btrfs/ordered-data.c | 5 +- + fs/btrfs/ordered-data.h | 7 - + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/raid56.c | 7 +- + fs/btrfs/raid56.h | 2 +- + fs/btrfs/reflink.c | 6 +- + fs/btrfs/relocation.c | 7 +- + fs/btrfs/scrub.c | 63 +- + fs/btrfs/subpage.c | 371 +++--- + fs/btrfs/subpage.h | 82 +- + fs/btrfs/super.c | 2351 +++++++++++++++++++------------------ + fs/btrfs/super.h | 5 +- + fs/btrfs/sysfs.c | 4 + + fs/btrfs/tests/btrfs-tests.c | 5 +- + fs/btrfs/tests/btrfs-tests.h | 1 + + fs/btrfs/tests/extent-io-tests.c | 4 +- + fs/btrfs/tests/extent-map-tests.c | 143 +-- + fs/btrfs/tests/inode-tests.c | 60 +- + fs/btrfs/tree-checker.h | 2 +- + fs/btrfs/tree-log.c | 17 +- + fs/btrfs/volumes.c | 934 +++++++++------ + fs/btrfs/volumes.h | 47 +- + fs/btrfs/xattr.c | 55 +- + fs/btrfs/zlib.c | 6 +- + fs/btrfs/zoned.c | 66 +- + fs/btrfs/zoned.h | 12 +- + fs/btrfs/zstd.c | 7 +- + fs/namespace.c | 11 + + include/trace/events/btrfs.h | 78 +- + 61 files changed, 3885 insertions(+), 3190 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 (d5a4971d029e cifs: do not let cifs_chan_update_iface deallocate channels) +$ 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/cifs_debug.c | 12 ++++++----- + fs/smb/client/cifsglob.h | 3 ++- + fs/smb/client/connect.c | 7 ++++++- + fs/smb/client/file.c | 2 +- + fs/smb/client/misc.c | 4 ++++ + fs/smb/client/sess.c | 50 ++++++++++++++++++---------------------------- + fs/smb/client/smb2ops.c | 25 ++++++++++++++--------- + fs/smb/client/smb2pdu.c | 32 ++++++++++++++++++++--------- + 8 files changed, 78 insertions(+), 57 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 (0ee3a0d59e00 erofs: enable sub-page compressed block support) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/decompressor.c | 112 +++++++++++++---------- + fs/erofs/inode.c | 6 +- + fs/erofs/zdata.c | 231 ++++++++++++++++++++++-------------------------- + fs/erofs/zmap.c | 32 +++---- + 4 files changed, 188 insertions(+), 193 deletions(-) +Merging exfat/dev (6dfb1f0dfdb0 exfat: do not zero the extended part) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 87 ++++++++++------------- + fs/exfat/exfat_fs.h | 5 +- + fs/exfat/file.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++------ + fs/exfat/inode.c | 136 +++++++++++++++++++++++++++++++----- + fs/exfat/namei.c | 6 ++ + 5 files changed, 335 insertions(+), 92 deletions(-) +Merging ext3/for_next (46ee834035ac Pull quota cleanup from Chao Yu.) +$ 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/notify/fanotify/fanotify.c | 34 +++------- + fs/notify/fanotify/fanotify.h | 16 +++++ + fs/notify/fanotify/fanotify_user.c | 124 ++++++++++++++++++++++++++++++------- + fs/notify/mark.c | 52 +++------------- + fs/quota/dquot.c | 6 +- + include/linux/fsnotify_backend.h | 14 ++--- + include/linux/quotaops.h | 15 ++--- + 7 files changed, 148 insertions(+), 113 deletions(-) +Merging ext4/dev (6c02757c9360 jbd2: fix soft lockup in journal_finish_inode_data_buffers()) +$ 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 (394e7f4dbb32 f2fs: don't set FI_PREALLOCATED_ALL for partial write) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/inode.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 6 ++ + fs/f2fs/compress.c | 6 +- + fs/f2fs/data.c | 48 +++++------- + fs/f2fs/f2fs.h | 46 +++++++---- + fs/f2fs/file.c | 66 ++++++++-------- + fs/f2fs/gc.c | 7 +- + fs/f2fs/inode.c | 57 ++++---------- + fs/f2fs/namei.c | 23 +++--- + fs/f2fs/recovery.c | 25 ++++-- + fs/f2fs/segment.c | 131 +++++++++++--------------------- + fs/f2fs/super.c | 16 ++-- + fs/f2fs/sysfs.c | 9 +++ + fs/f2fs/xattr.c | 6 ++ + include/linux/f2fs_fs.h | 2 +- + include/trace/events/f2fs.h | 127 +++++++++++++++++++++++++++---- + 15 files changed, 321 insertions(+), 254 deletions(-) +Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (3f29f1c336c0 fuse: disable FOPEN_PARALLEL_DIRECT_WRITES with FUSE_DIRECT_IO_ALLOW_MMAP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (dd00aaeb3432 gfs2: Use GL_NOBLOCK flag for non-blocking lookups) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/quota.c +Merge made by the 'ort' strategy. + fs/gfs2/dentry.c | 23 ++++++++++++++--------- + fs/gfs2/glock.c | 39 ++++++++++++++++++++++++++++++++++++++- + fs/gfs2/glock.h | 1 + + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 8 ++++---- + fs/gfs2/quota.c | 3 ++- + fs/gfs2/rgrp.c | 12 ++++++------ + 7 files changed, 66 insertions(+), 22 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 (8b8cd4beea4f Merge tag '6.7-rc5-ksmbd-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 (9637daa85f69 svcrdma: Increase the per-transport rw_ctx count) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfssvc.c +Merge made by the 'ort' strategy. + fs/nfs/callback.h | 19 -- + fs/nfsd/Kconfig | 16 ++ + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfs4callback.c | 26 +-- + fs/nfsd/nfs4proc.c | 7 +- + fs/nfsd/nfs4recover.c | 97 +++++--- + fs/nfsd/nfs4state.c | 2 +- + 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/nfs4.h | 22 ++ + include/linux/sunrpc/svc.h | 2 - + include/linux/sunrpc/svc_rdma.h | 60 ++++- + include/linux/sunrpc/svcauth.h | 7 +- + include/trace/events/rpcrdma.h | 253 +++++++++------------ + 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 | 44 ++-- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 349 +++++++++++++---------------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 112 ++++----- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 82 ++++--- + net/sunrpc/xprtrdma/verbs.c | 2 +- + 31 files changed, 694 insertions(+), 588 deletions(-) +Merging ntfs3/master (652483bfbc45 fs/ntfs3: Fix c/mtime typo) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 41 ++++++---- + fs/ntfs3/dir.c | 44 +++++++---- + fs/ntfs3/file.c | 59 ++++++++++++--- + fs/ntfs3/frecord.c | 5 +- + fs/ntfs3/fslog.c | 214 ++++++++++++++++++++++++----------------------------- + fs/ntfs3/fsntfs.c | 5 +- + fs/ntfs3/inode.c | 30 ++++++-- + fs/ntfs3/namei.c | 12 +++ + fs/ntfs3/ntfs.h | 2 +- + fs/ntfs3/ntfs_fs.h | 11 ++- + fs/ntfs3/record.c | 16 +++- + fs/ntfs3/super.c | 47 +++++++----- + fs/ntfs3/xattr.c | 3 + + 13 files changed, 300 insertions(+), 189 deletions(-) +$ git am -3 ../patches/ntfs-align-struct-ATTR_LIST_ENTRY.patch +Applying: ntfs3: align struct ATTR_LIST_ENTRY +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs3/ntfs.h +$ git add -A . +$ git commit -v -a --amend +[master 99bbac67edd9] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git + Date: Tue Dec 19 09:53:19 2023 +1100 +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 (d17bb4620f90 overlayfs.rst: fix ReST formatting) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'ort' strategy. + Documentation/filesystems/overlayfs.rst | 104 +++++++++++++++++--------------- + 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 +- + 9 files changed, 76 insertions(+), 74 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 (ff49bf186757 net: 9p: avoid freeing uninit memory in p9pdu_vreadf) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + include/trace/events/9p.h | 11 +++++++---- + net/9p/protocol.c | 17 +++++++++++++---- + 2 files changed, 20 insertions(+), 8 deletions(-) +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 (98bdbf60cca8 Merge tag 'repair-quota-6.8_2023-12-15' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into xfs-6.8-mergeB) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging MAINTAINERS +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_dquot.c +Auto-merging include/linux/mm.h +Auto-merging mm/memory-failure.c +Merge made by the 'ort' strategy. + Documentation/filesystems/index.rst | 5 +- + Documentation/filesystems/xfs/index.rst | 14 + + .../{ => xfs}/xfs-delayed-logging-design.rst | 0 + .../{ => xfs}/xfs-maintainer-entry-profile.rst | 0 + .../{ => xfs}/xfs-online-fsck-design.rst | 2 +- + .../{ => xfs}/xfs-self-describing-metadata.rst | 0 + .../maintainer/maintainer-entry-profile.rst | 2 +- + MAINTAINERS | 4 +- + drivers/dax/super.c | 3 +- + fs/xfs/Makefile | 21 +- + fs/xfs/libxfs/xfs_ag.c | 2 +- + fs/xfs/libxfs/xfs_ag.h | 10 + + fs/xfs/libxfs/xfs_ag_resv.c | 2 + + fs/xfs/libxfs/xfs_alloc.c | 116 +- + fs/xfs/libxfs/xfs_alloc.h | 24 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 13 +- + fs/xfs/libxfs/xfs_attr.c | 92 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 25 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 +- + fs/xfs/libxfs/xfs_bmap.c | 142 +- + fs/xfs/libxfs/xfs_bmap.h | 7 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 123 +- + fs/xfs/libxfs/xfs_bmap_btree.h | 5 + + fs/xfs/libxfs/xfs_btree.c | 28 +- + fs/xfs/libxfs/xfs_btree.h | 5 + + fs/xfs/libxfs/xfs_btree_staging.c | 89 +- + fs/xfs/libxfs/xfs_btree_staging.h | 33 +- + fs/xfs/libxfs/xfs_da_btree.c | 69 +- + fs/xfs/libxfs/xfs_da_btree.h | 2 + + fs/xfs/libxfs/xfs_defer.c | 456 ++++-- + fs/xfs/libxfs/xfs_defer.h | 59 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 3 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 13 +- + fs/xfs/libxfs/xfs_format.h | 5 +- + fs/xfs/libxfs/xfs_health.h | 10 + + fs/xfs/libxfs/xfs_ialloc.c | 36 +- + fs/xfs/libxfs/xfs_ialloc.h | 3 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_iext_tree.c | 23 +- + fs/xfs/libxfs/xfs_inode_fork.c | 34 +- + fs/xfs/libxfs/xfs_inode_fork.h | 3 + + fs/xfs/libxfs/xfs_log_recover.h | 8 + + fs/xfs/{ => libxfs}/xfs_ondisk.h | 8 +- + fs/xfs/libxfs/xfs_refcount.c | 57 +- + fs/xfs/libxfs/xfs_refcount.h | 12 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 15 +- + fs/xfs/libxfs/xfs_rmap.c | 2 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 14 + + fs/xfs/libxfs/xfs_rtbitmap.h | 16 + + fs/xfs/libxfs/xfs_sb.c | 6 +- + fs/xfs/libxfs/xfs_shared.h | 2 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 8 +- + fs/xfs/libxfs/xfs_types.h | 7 + + fs/xfs/scrub/agb_bitmap.c | 103 ++ + fs/xfs/scrub/agb_bitmap.h | 68 + + fs/xfs/scrub/agheader_repair.c | 19 +- + fs/xfs/scrub/alloc.c | 52 +- + fs/xfs/scrub/alloc_repair.c | 934 ++++++++++++ + fs/xfs/scrub/bitmap.c | 509 ++++--- + fs/xfs/scrub/bitmap.h | 111 +- + fs/xfs/scrub/bmap.c | 162 ++- + fs/xfs/scrub/bmap_repair.c | 867 +++++++++++ + fs/xfs/scrub/common.c | 35 +- + fs/xfs/scrub/common.h | 56 + + fs/xfs/scrub/cow_repair.c | 614 ++++++++ + fs/xfs/scrub/dir.c | 42 +- + fs/xfs/scrub/dqiterate.c | 211 +++ + fs/xfs/scrub/fsb_bitmap.h | 37 + + fs/xfs/scrub/health.c | 32 + + fs/xfs/scrub/health.h | 2 + + fs/xfs/scrub/ialloc.c | 39 +- + fs/xfs/scrub/ialloc_repair.c | 884 ++++++++++++ + fs/xfs/scrub/inode.c | 20 +- + fs/xfs/scrub/inode_repair.c | 1525 ++++++++++++++++++++ + fs/xfs/scrub/newbt.c | 559 +++++++ + fs/xfs/scrub/newbt.h | 68 + + fs/xfs/scrub/off_bitmap.h | 37 + + fs/xfs/scrub/parent.c | 17 + + fs/xfs/scrub/quota.c | 107 +- + fs/xfs/scrub/quota.h | 36 + + fs/xfs/scrub/quota_repair.c | 575 ++++++++ + fs/xfs/scrub/reap.c | 168 ++- + fs/xfs/scrub/reap.h | 5 + + fs/xfs/scrub/refcount.c | 2 +- + fs/xfs/scrub/refcount_repair.c | 794 ++++++++++ + fs/xfs/scrub/repair.c | 391 ++++- + fs/xfs/scrub/repair.h | 99 ++ + fs/xfs/scrub/rmap.c | 1 + + fs/xfs/scrub/rtbitmap.c | 107 +- + fs/xfs/scrub/rtbitmap.h | 22 + + fs/xfs/scrub/rtbitmap_repair.c | 202 +++ + fs/xfs/scrub/rtsummary.c | 141 +- + fs/xfs/scrub/scrub.c | 62 +- + fs/xfs/scrub/scrub.h | 15 +- + fs/xfs/scrub/symlink.c | 20 +- + fs/xfs/scrub/trace.c | 3 + + fs/xfs/scrub/trace.h | 488 ++++++- + fs/xfs/scrub/xfarray.h | 22 + + fs/xfs/xfs_attr_item.c | 295 ++-- + fs/xfs/xfs_bmap_item.c | 218 ++- + fs/xfs/xfs_buf.c | 44 +- + fs/xfs/xfs_buf.h | 1 + + fs/xfs/xfs_dir2_readdir.c | 3 + + fs/xfs/xfs_dquot.c | 37 +- + fs/xfs/xfs_dquot.h | 8 +- + fs/xfs/xfs_extent_busy.c | 13 + + fs/xfs/xfs_extent_busy.h | 2 + + fs/xfs/xfs_extfree_item.c | 356 ++--- + fs/xfs/xfs_fsops.c | 54 +- + fs/xfs/xfs_fsops.h | 14 +- + fs/xfs/xfs_globals.c | 12 + + fs/xfs/xfs_health.c | 8 +- + fs/xfs/xfs_inode.c | 59 +- + fs/xfs/xfs_inode.h | 2 + + fs/xfs/xfs_inode_item.c | 3 + + fs/xfs/xfs_ioctl.c | 115 +- + fs/xfs/xfs_log.c | 1 + + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_log_recover.c | 129 +- + fs/xfs/xfs_mount.c | 8 +- + fs/xfs/xfs_notify_failure.c | 108 +- + fs/xfs/xfs_refcount_item.c | 252 +--- + fs/xfs/xfs_reflink.c | 2 +- + fs/xfs/xfs_rmap_item.c | 275 ++-- + fs/xfs/xfs_rtalloc.c | 11 +- + fs/xfs/xfs_super.c | 6 +- + fs/xfs/xfs_symlink.c | 3 + + fs/xfs/xfs_sysctl.h | 2 + + fs/xfs/xfs_sysfs.c | 63 + + fs/xfs/xfs_trace.h | 27 +- + fs/xfs/xfs_trans.c | 62 + + fs/xfs/xfs_trans.h | 16 +- + fs/xfs/xfs_xattr.c | 6 + + include/linux/mm.h | 1 + + mm/memory-failure.c | 21 +- + 135 files changed, 12099 insertions(+), 2045 deletions(-) + create mode 100644 Documentation/filesystems/xfs/index.rst + rename Documentation/filesystems/{ => xfs}/xfs-delayed-logging-design.rst (100%) + rename Documentation/filesystems/{ => xfs}/xfs-maintainer-entry-profile.rst (100%) + rename Documentation/filesystems/{ => xfs}/xfs-online-fsck-design.rst (99%) + rename Documentation/filesystems/{ => xfs}/xfs-self-describing-metadata.rst (100%) + rename fs/xfs/{ => libxfs}/xfs_ondisk.h (97%) + create mode 100644 fs/xfs/scrub/agb_bitmap.c + create mode 100644 fs/xfs/scrub/agb_bitmap.h + create mode 100644 fs/xfs/scrub/alloc_repair.c + create mode 100644 fs/xfs/scrub/bmap_repair.c + create mode 100644 fs/xfs/scrub/cow_repair.c + create mode 100644 fs/xfs/scrub/dqiterate.c + create mode 100644 fs/xfs/scrub/fsb_bitmap.h + create mode 100644 fs/xfs/scrub/ialloc_repair.c + create mode 100644 fs/xfs/scrub/inode_repair.c + create mode 100644 fs/xfs/scrub/newbt.c + create mode 100644 fs/xfs/scrub/newbt.h + create mode 100644 fs/xfs/scrub/off_bitmap.h + create mode 100644 fs/xfs/scrub/quota.h + create mode 100644 fs/xfs/scrub/quota_repair.c + create mode 100644 fs/xfs/scrub/refcount_repair.c + create mode 100644 fs/xfs/scrub/rtbitmap.h + create mode 100644 fs/xfs/scrub/rtbitmap_repair.c +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 (85ddc21d198b Merge branch 'vfs.iov_iter' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging MAINTAINERS +Auto-merging block/bdev.c +Auto-merging drivers/s390/cio/vfio_ccw_drv.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/xen/privcmd.c +Auto-merging fs/bcachefs/fs-ioctl.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/f2fs/file.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/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/open.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/smb/client/cifsfs.c +Auto-merging fs/stat.c +Auto-merging fs/xfs/xfs_fsops.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging include/linux/blk_types.h +CONFLICT (content): Merge conflict in include/linux/blk_types.h +Auto-merging include/linux/fs.h +Auto-merging io_uring/io_uring.c +Auto-merging lib/iov_iter.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memcontrol.c +Auto-merging mm/migrate.c +Auto-merging net/core/scm.c +Auto-merging net/ipv4/tcp.c +Auto-merging tools/testing/selftests/Makefile +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. +Resolved 'include/linux/blk_types.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b72483462966] 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 | 21 +- + 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/android/binder.c | 2 +- + drivers/block/loop.c | 2 - + drivers/block/ublk_drv.c | 9 +- + drivers/char/random.c | 6 +- + 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 | 8 +- + 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 | 87 ++- + fs/bcachefs/fs-ioctl.c | 4 +- + fs/bcachefs/super-io.c | 19 +- + fs/bcachefs/super_types.h | 1 + + fs/btrfs/extent_io.c | 50 +- + 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/ceph/file.c | 13 +- + fs/coda/file.c | 2 - + fs/dax.c | 2 +- + fs/direct-io.c | 2 +- + fs/eventfd.c | 46 +- + fs/ext4/inode.c | 4 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 8 +- + fs/f2fs/file.c | 4 +- + fs/file.c | 99 ++-- + fs/file_table.c | 22 +- + fs/fuse/file.c | 5 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfsplus/wrapper.c | 5 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 20 +- + fs/internal.h | 13 +- + fs/mnt_idmapping.c | 159 ++++-- + fs/mount.h | 27 +- + fs/namei.c | 9 +- + fs/namespace.c | 630 +++++++++++++++++---- + fs/nfs/nfs4file.c | 5 +- + 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 | 9 +- + fs/overlayfs/copy_up.c | 30 +- + fs/overlayfs/file.c | 10 +- + fs/pipe.c | 24 +- + fs/pnode.c | 2 +- + fs/proc/task_mmu.c | 3 +- + fs/proc_namespace.c | 13 +- + fs/read_write.c | 249 ++++---- + fs/readdir.c | 4 + + fs/remap_range.c | 45 +- + fs/smb/client/cifsfs.c | 5 +- + fs/splice.c | 259 +++++---- + fs/stat.c | 9 +- + fs/super.c | 500 ++++++++-------- + 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 | 17 +- + include/linux/file.h | 12 +- + include/linux/fs.h | 121 +++- + include/linux/fsnotify.h | 50 +- + include/linux/mnt_idmapping.h | 3 - + include/linux/mount.h | 5 +- + include/linux/splice.h | 51 +- + include/linux/syscalls.h | 8 + + include/linux/uidgid.h | 13 + + include/linux/uio.h | 2 - + include/linux/writeback.h | 1 - + include/net/scm.h | 9 + + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/mount.h | 70 +++ + include/uapi/linux/stat.h | 1 + + io_uring/io_uring.c | 4 +- + io_uring/openclose.c | 2 +- + io_uring/splice.c | 4 +- + kernel/pid.c | 2 +- + kernel/seccomp.c | 2 +- + kernel/trace/trace_events_user.c | 4 +- + kernel/user_namespace.c | 20 +- + lib/iov_iter.c | 13 - + mm/hugetlb.c | 2 +- + mm/memcontrol.c | 10 +- + mm/migrate.c | 6 +- + mm/vmpressure.c | 2 +- + net/compat.c | 2 +- + net/core/scm.c | 2 +- + net/ipv4/tcp.c | 10 +- + net/socket.c | 6 +- + samples/vfio-mdev/mtty.c | 4 +- + security/keys/keyctl.c | 5 +- + security/security.c | 10 +- + tools/testing/selftests/Makefile | 2 + + .../selftests/filesystems/overlayfs/.gitignore | 2 + + .../selftests/filesystems/overlayfs/Makefile | 7 + + .../selftests/filesystems/overlayfs/dev_in_maps.c | 182 ++++++ + .../testing/selftests/filesystems/overlayfs/log.h | 26 + + .../selftests/filesystems/statmount/.gitignore | 2 + + .../selftests/filesystems/statmount/Makefile | 6 + + .../filesystems/statmount/statmount_test.c | 612 ++++++++++++++++++++ + virt/kvm/eventfd.c | 4 +- + 151 files changed, 3328 insertions(+), 1372 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/overlayfs/.gitignore + create mode 100644 tools/testing/selftests/filesystems/overlayfs/Makefile + create mode 100644 tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c + create mode 100644 tools/testing/selftests/filesystems/overlayfs/log.h + create mode 100644 tools/testing/selftests/filesystems/statmount/.gitignore + create mode 100644 tools/testing/selftests/filesystems/statmount/Makefile + create mode 100644 tools/testing/selftests/filesystems/statmount/statmount_test.c +$ git am -3 ../patches/fixup-for-vfs-brauner-and-btrfs-conflict.patch +Applying: linux-next: manual merge of the vfs-brauner tree with the btrfs tree +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 0a8f6ea5c1ba] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Tue Dec 19 09:53:28 2023 +1100 +Merging vfs/for-next (3f95c5b76257 Merge branch 'work.minix' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +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/minix/dir.c | 83 +++++++++++++++++++++----------------------------- + fs/minix/namei.c | 12 +++----- + fs/namei.c | 16 ++++++++-- + include/linux/namei.h | 1 + + 5 files changed, 69 insertions(+), 74 deletions(-) +Merging printk/for-next (6c3a34e38436 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/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + lib/vsprintf.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging pci/next (ab9345f3fb21 Merge branch 'pci/controller/vmd') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/controller/vmd.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/rcar-pci-host.yaml | 11 ++ + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 39 +++- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 39 +++- + Documentation/driver-api/pci/p2pdma.rst | 16 +- + arch/powerpc/sysdev/fsl_pci.c | 4 +- + arch/x86/kernel/aperture_64.c | 3 +- + arch/x86/kernel/early-quirks.c | 4 +- + arch/x86/pci/acpi.c | 3 + + arch/x86/pci/mmconfig-shared.c | 178 +++++++++-------- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/pci/mmconfig_64.c | 42 ++-- + arch/x86/pci/pcbios.c | 28 ++- + drivers/pci/controller/cadence/pci-j721e.c | 45 ++++- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 16 +- + drivers/pci/controller/dwc/pci-layerscape.c | 191 +++++++++++++++--- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +- + drivers/pci/controller/pci-host-common.c | 4 +- + drivers/pci/controller/pci-host-generic.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 18 +- + drivers/pci/controller/vmd.c | 6 +- + drivers/pci/iov.c | 7 +- + drivers/pci/pci.c | 85 ++++++-- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/aer.c | 21 +- + drivers/pci/probe.c | 218 +++++++++++++-------- + drivers/pci/quirks.c | 34 +++- + drivers/pci/setup-bus.c | 30 ++- + drivers/pci/setup-res.c | 72 ++++--- + drivers/pci/switch/switchtec.c | 25 ++- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + include/linux/aer.h | 8 +- + include/linux/pci-ecam.h | 2 +- + include/linux/pci.h | 12 +- + 33 files changed, 812 insertions(+), 359 deletions(-) +Merging pstore/for-next/pstore (24a0b5e196cf pstore: inode: Use cleanup.h for struct pstore_private) +$ 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/inode.c | 107 +++++++++++++++++++++------------------------------ + fs/pstore/ram.c | 1 + + fs/pstore/ram_core.c | 2 +- + 3 files changed, 45 insertions(+), 65 deletions(-) +Merging hid/for-next (dad2d654c822 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 | 22 +- + drivers/hid/Makefile | 1 + + drivers/hid/hid-ids.h | 6 +- + drivers/hid/hid-mcp2200.c | 392 +++++++++ + drivers/hid/hid-mcp2221.c | 72 +- + drivers/hid/hid-nintendo.c | 950 +++++++++++++++------ + drivers/hid/i2c-hid/i2c-hid-core.c | 137 +-- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 67 +- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 60 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 63 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 185 +++- + drivers/hid/wacom.h | 1 + + drivers/hid/wacom_sys.c | 8 + + drivers/hid/wacom_wac.c | 12 +- + drivers/hid/wacom_wac.h | 1 + + drivers/platform/chrome/cros_ec_ishtp.c | 74 +- + include/linux/intel-ish-client-if.h | 3 + + tools/testing/selftests/hid/tests/base.py | 7 +- + tools/testing/selftests/hid/tests/test_mouse.py | 14 +- + tools/testing/selftests/hid/tests/test_tablet.py | 776 +++++++++++------ + .../selftests/hid/tests/test_wacom_generic.py | 6 +- + tools/testing/selftests/hid/vmtest.sh | 50 +- + 22 files changed, 2033 insertions(+), 874 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 (db79be9d9707 hwmon: (pmbus) Add support for MPS Multi-phase mp2856/mp2857 controller) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 110 +++- + .../devicetree/bindings/hwmon/gpio-fan.txt | 41 -- + .../devicetree/bindings/hwmon/gpio-fan.yaml | 60 ++ + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 2 +- + .../devicetree/bindings/hwmon/lltc,ltc4286.yaml | 50 ++ + .../devicetree/bindings/trivial-devices.yaml | 6 + + Documentation/hwmon/dell-smm-hwmon.rst | 38 +- + Documentation/hwmon/gigabyte_waterforce.rst | 47 ++ + Documentation/hwmon/index.rst | 4 + + Documentation/hwmon/ltc4286.rst | 95 ++++ + Documentation/hwmon/max31827.rst | 75 ++- + Documentation/hwmon/mp2856.rst | 98 ++++ + Documentation/hwmon/mp5990.rst | 84 +++ + Documentation/hwmon/sht3x.rst | 29 +- + MAINTAINERS | 25 + + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/aquacomputer_d5next.c | 10 - + drivers/hwmon/aspeed-pwm-tacho.c | 26 +- + drivers/hwmon/corsair-cpro.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 608 ++++++++++++++------- + drivers/hwmon/emc1403.c | 6 +- + drivers/hwmon/gigabyte_waterforce.c | 428 +++++++++++++++ + drivers/hwmon/hp-wmi-sensors.c | 125 ++++- + drivers/hwmon/k10temp.c | 1 + + drivers/hwmon/ltc2991.c | 20 +- + drivers/hwmon/max31827.c | 275 ++++++++-- + 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/pc87360.c | 6 +- + drivers/hwmon/peci/dimmtemp.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 28 + + drivers/hwmon/pmbus/Makefile | 3 + + drivers/hwmon/pmbus/lm25066.c | 14 +- + drivers/hwmon/pmbus/ltc4286.c | 175 ++++++ + drivers/hwmon/pmbus/mp2856.c | 466 ++++++++++++++++ + drivers/hwmon/pmbus/mp5990.c | 179 ++++++ + drivers/hwmon/sht4x.c | 3 +- + drivers/hwmon/smsc47m1.c | 67 +-- + drivers/hwmon/tmp513.c | 64 ++- + drivers/platform/x86/wmi.c | 1 + + 45 files changed, 2924 insertions(+), 482 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/lltc,ltc4286.yaml + create mode 100644 Documentation/hwmon/gigabyte_waterforce.rst + create mode 100644 Documentation/hwmon/ltc4286.rst + create mode 100644 Documentation/hwmon/mp2856.rst + create mode 100644 Documentation/hwmon/mp5990.rst + create mode 100644 drivers/hwmon/gigabyte_waterforce.c + create mode 100644 drivers/hwmon/pmbus/ltc4286.c + create mode 100644 drivers/hwmon/pmbus/mp2856.c + create mode 100644 drivers/hwmon/pmbus/mp5990.c +Merging jc_docs/docs-next (0c3ebff53595 scripts: kernel-doc: Clarify missing struct member description) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/arch/x86/boot.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/dynamic-debug-howto.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/admin-guide/media/index.rst | 10 +- + Documentation/arch/x86/boot.rst | 2 +- + Documentation/bpf/btf.rst | 6 +- + Documentation/conf.py | 7 +- + 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 | 11 +- + Documentation/driver-api/index.rst | 6 +- + Documentation/driver-api/media/index.rst | 7 +- + Documentation/driver-api/mei/index.rst | 7 +- + Documentation/driver-api/nvmem.rst | 8 +- + Documentation/driver-api/pci/index.rst | 5 +- + Documentation/driver-api/tee.rst | 66 ++ + 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/changes.rst | 2 +- + Documentation/process/development-process.rst | 19 +- + Documentation/process/submitting-patches.rst | 15 +- + Documentation/security/keys/trusted-encrypted.rst | 2 +- + Documentation/sphinx-static/custom.css | 10 + + Documentation/sphinx-static/theme_overrides.css | 5 - + Documentation/sphinx/automarkup.py | 26 +- + Documentation/sphinx/cdomain.py | 6 +- + Documentation/sphinx/kfigure.py | 8 +- + Documentation/staging/index.rst | 1 - + Documentation/staging/tee.rst | 364 ---------- + Documentation/subsystem-apis.rst | 1 + + Documentation/tee/amd-tee.rst | 90 +++ + Documentation/tee/index.rst | 19 + + Documentation/tee/op-tee.rst | 166 +++++ + Documentation/tee/tee.rst | 22 + + Documentation/trace/ftrace.rst | 2 +- + .../it_IT/process/development-process.rst | 19 +- + Documentation/translations/sp_SP/disclaimer-sp.rst | 3 + + Documentation/translations/sp_SP/index.rst | 1 - + .../sp_SP/process/handling-regressions.rst | 797 +++++++++++++++++++++ + .../translations/sp_SP/{ => process}/howto.rst | 2 +- + Documentation/translations/sp_SP/process/index.rst | 4 + + .../sp_SP/process/management-style.rst | 299 ++++++++ + .../sp_SP/process/submit-checklist.rst | 133 ++++ + .../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 | 6 +- + 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 +- + Documentation/userspace-api/tee.rst | 39 + + MAINTAINERS | 6 +- + drivers/tee/optee/Kconfig | 2 +- + fs/vboxsf/vboxsf_wrappers.c | 2 +- + scripts/kernel-doc | 9 +- + scripts/sphinx-pre-install | 10 +- + 132 files changed, 2751 insertions(+), 695 deletions(-) + create mode 100644 Documentation/driver-api/tee.rst + delete mode 100644 Documentation/staging/tee.rst + create mode 100644 Documentation/tee/amd-tee.rst + create mode 100644 Documentation/tee/index.rst + create mode 100644 Documentation/tee/op-tee.rst + create mode 100644 Documentation/tee/tee.rst + create mode 100644 Documentation/translations/sp_SP/process/handling-regressions.rst + rename Documentation/translations/sp_SP/{ => process}/howto.rst (99%) + create mode 100644 Documentation/translations/sp_SP/process/management-style.rst + create mode 100644 Documentation/translations/sp_SP/process/submit-checklist.rst + create mode 100644 Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst + create mode 100644 Documentation/userspace-api/tee.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 (efa28efd9cba media: rkisp1: resizer: Stop manual allocation of v4l2_subdev_state) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/userspace-api/media/drivers/index.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/visl.rst | 2 + + .../bindings/media/i2c/galaxycore,gc2145.yaml | 113 + + .../bindings/media/i2c/thine,thp7312.yaml | 224 ++ + .../bindings/media/mediatek,mdp3-rdma.yaml | 8 + + .../devicetree/bindings/media/rockchip-isp1.yaml | 11 +- + .../devicetree/bindings/media/st,stm32-dcmipp.yaml | 89 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/media/camera-sensor.rst | 3 +- + .../driver-api/media/drivers/ccs/mk-ccs-regs | 104 +- + Documentation/driver-api/media/v4l2-subdev.rst | 7 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/drivers/thp7312.rst | 39 + + MAINTAINERS | 24 +- + drivers/base/property.c | 28 + + drivers/media/common/videobuf2/videobuf2-core.c | 9 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 10 +- + drivers/media/i2c/Kconfig | 27 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/adv7180.c | 10 +- + drivers/media/i2c/adv7183.c | 2 - + drivers/media/i2c/ccs/Kconfig | 1 + + drivers/media/i2c/ccs/ccs-core.c | 107 +- + drivers/media/i2c/ccs/ccs-reg-access.c | 213 +- + drivers/media/i2c/ccs/ccs-regs.h | 906 ++++---- + drivers/media/i2c/ccs/ccs.h | 2 + + drivers/media/i2c/ccs/smiapp-reg-defs.h | 951 ++++----- + drivers/media/i2c/ds90ub913.c | 10 +- + drivers/media/i2c/ds90ub953.c | 10 +- + drivers/media/i2c/ds90ub960.c | 11 +- + drivers/media/i2c/gc2145.c | 1450 +++++++++++++ + drivers/media/i2c/hi846.c | 10 +- + drivers/media/i2c/imx214.c | 12 +- + drivers/media/i2c/imx219.c | 9 +- + drivers/media/i2c/imx290.c | 10 +- + drivers/media/i2c/imx296.c | 10 +- + drivers/media/i2c/imx319.c | 12 +- + drivers/media/i2c/imx334.c | 12 +- + drivers/media/i2c/imx335.c | 12 +- + drivers/media/i2c/imx355.c | 12 +- + drivers/media/i2c/imx412.c | 12 +- + drivers/media/i2c/imx415.c | 10 +- + drivers/media/i2c/mt9m001.c | 10 +- + drivers/media/i2c/mt9m111.c | 10 +- + drivers/media/i2c/mt9m114.c | 16 +- + drivers/media/i2c/mt9p031.c | 8 +- + drivers/media/i2c/mt9t112.c | 1 - + drivers/media/i2c/mt9v111.c | 10 +- + drivers/media/i2c/ov01a10.c | 32 +- + drivers/media/i2c/ov02a10.c | 10 +- + drivers/media/i2c/ov13b10.c | 14 +- + drivers/media/i2c/ov2640.c | 10 +- + drivers/media/i2c/ov2680.c | 10 +- + drivers/media/i2c/ov2740.c | 10 +- + drivers/media/i2c/ov5640.c | 10 +- + drivers/media/i2c/ov5645.c | 12 +- + drivers/media/i2c/ov5670.c | 10 +- + drivers/media/i2c/ov7251.c | 12 +- + drivers/media/i2c/ov8858.c | 10 +- + drivers/media/i2c/ov9282.c | 12 +- + drivers/media/i2c/ov9640.c | 2 - + drivers/media/i2c/ov9734.c | 19 +- + drivers/media/i2c/rj54n1cb0c.c | 4 +- + drivers/media/i2c/saa6752hs.c | 4 +- + drivers/media/i2c/st-mipid02.c | 480 ++--- + drivers/media/i2c/st-vgxy61.c | 29 +- + drivers/media/i2c/tc358746.c | 10 +- + drivers/media/i2c/tda1997x.c | 10 +- + drivers/media/i2c/thp7312.c | 2244 ++++++++++++++++++++ + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/i2c/tw9910.c | 2 - + drivers/media/pci/bt8xx/bttv-driver.c | 27 +- + drivers/media/pci/bt8xx/bttv-vbi.c | 8 +- + drivers/media/pci/intel/ivsc/mei_csi.c | 10 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 10 +- + drivers/media/platform/chips-media/wave5/Kconfig | 4 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 16 +- + .../media/platform/microchip/microchip-csi2dc.c | 10 +- + .../media/platform/microchip/microchip-isc-base.c | 41 - + .../platform/microchip/microchip-isc-scaler.c | 10 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 27 +- + drivers/media/platform/nxp/imx7-media-csi.c | 33 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 10 +- + .../media/platform/nxp/imx8-isi/imx8-isi-debug.c | 27 +- + .../media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 10 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 10 +- + .../media/platform/qcom/camss/camss-csid-gen2.c | 31 +- + drivers/media/platform/qcom/camss/camss-csid.c | 5 + + drivers/media/platform/qcom/camss/camss-csid.h | 7 + + drivers/media/platform/qcom/camss/camss-vfe-170.c | 36 - + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 8 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 36 - + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 31 - + drivers/media/platform/qcom/camss/camss-vfe-480.c | 69 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 81 + + drivers/media/platform/qcom/camss/camss-vfe.h | 26 + + drivers/media/platform/qcom/camss/camss.c | 124 +- + drivers/media/platform/qcom/camss/camss.h | 10 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 10 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 10 +- + drivers/media/platform/renesas/vsp1/vsp1_brx.c | 41 +- + drivers/media/platform/renesas/vsp1/vsp1_clu.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 130 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.h | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_hgo.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_hgt.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_histo.c | 24 +- + drivers/media/platform/renesas/vsp1/vsp1_hsit.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 3 +- + drivers/media/platform/renesas/vsp1/vsp1_lut.c | 1 - + drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 8 +- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 38 +- + drivers/media/platform/renesas/vsp1/vsp1_sru.c | 37 +- + drivers/media/platform/renesas/vsp1/vsp1_uds.c | 40 +- + drivers/media/platform/renesas/vsp1/vsp1_uif.c | 25 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 10 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 162 +- + drivers/media/platform/rockchip/rga/rga-hw.c | 158 +- + drivers/media/platform/rockchip/rga/rga.c | 189 +- + drivers/media/platform/rockchip/rga/rga.h | 35 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 12 +- + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 24 +- + .../media/platform/rockchip/rkisp1/rkisp1-debug.c | 6 + + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 41 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 33 +- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 9 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 48 +- + .../media/platform/samsung/exynos-gsc/gsc-core.h | 1 - + drivers/media/platform/st/stm32/Kconfig | 16 + + drivers/media/platform/st/stm32/Makefile | 1 + + .../media/platform/st/stm32/stm32-dcmipp/Makefile | 4 + + .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 956 +++++++++ + .../st/stm32/stm32-dcmipp/dcmipp-byteproc.c | 565 +++++ + .../platform/st/stm32/stm32-dcmipp/dcmipp-common.c | 111 + + .../platform/st/stm32/stm32-dcmipp/dcmipp-common.h | 217 ++ + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 604 ++++++ + .../st/stm32/stm32-dcmipp/dcmipp-parallel.c | 440 ++++ + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 1 + + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 9 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 10 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 10 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 10 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 10 +- + drivers/media/platform/video-mux.c | 10 +- + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 10 +- + drivers/media/test-drivers/vimc/vimc-debayer.c | 11 +- + drivers/media/test-drivers/vimc/vimc-scaler.c | 11 +- + drivers/media/test-drivers/vimc/vimc-sensor.c | 11 +- + drivers/media/test-drivers/visl/visl-core.c | 21 + + drivers/media/test-drivers/visl/visl-dec.c | 72 +- + drivers/media/test-drivers/visl/visl-dec.h | 8 + + drivers/media/test-drivers/visl/visl-trace-av1.h | 314 +++ + .../media/test-drivers/visl/visl-trace-points.c | 1 + + drivers/media/test-drivers/visl/visl-video.c | 18 + + drivers/media/test-drivers/visl/visl-video.h | 1 + + drivers/media/test-drivers/visl/visl.h | 1 + + drivers/media/usb/cx231xx/cx231xx-core.c | 2 + + drivers/media/usb/stk1160/stk1160-video.c | 5 +- + drivers/media/usb/uvc/uvc_driver.c | 18 + + drivers/media/usb/uvc/uvc_video.c | 2 +- + drivers/media/v4l2-core/v4l2-async.c | 4 - + drivers/media/v4l2-core/v4l2-cci.c | 8 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 4 +- + drivers/media/v4l2-core/v4l2-subdev.c | 20 +- + drivers/staging/media/imx/imx-ic-prp.c | 2 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/imx/imx-media-utils.c | 8 +- + drivers/staging/media/imx/imx-media-vdic.c | 2 +- + drivers/staging/media/imx/imx-media.h | 4 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- + drivers/staging/media/starfive/camss/Kconfig | 1 + + drivers/staging/media/starfive/camss/stf-isp.c | 10 +- + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 10 +- + include/linux/property.h | 1 + + include/media/v4l2-cci.h | 11 + + include/media/v4l2-subdev.h | 7 +- + include/uapi/linux/thp7312.h | 19 + + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/v4l2-subdev.h | 2 +- + 181 files changed, 10423 insertions(+), 2549 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/galaxycore,gc2145.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/thine,thp7312.yaml + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml + create mode 100644 Documentation/userspace-api/media/drivers/thp7312.rst + create mode 100644 drivers/media/i2c/gc2145.c + create mode 100644 drivers/media/i2c/thp7312.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/Makefile + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-parallel.c + create mode 100644 drivers/media/test-drivers/visl/visl-trace-av1.h + create mode 100644 include/uapi/linux/thp7312.h +Merging pm/linux-next (fbcc41b78701 Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep' 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 drivers/acpi/scan.c +Auto-merging include/linux/property.h +Merge made by the 'ort' strategy. + drivers/acpi/Kconfig | 5 + + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_extlog.c | 12 +- + drivers/acpi/acpi_lpit.c | 2 +- + drivers/acpi/acpi_lpss.c | 51 +- + drivers/acpi/acpi_video.c | 77 +-- + drivers/acpi/acpi_watchdog.c | 2 +- + drivers/acpi/apei/einj.c | 71 +- + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/arm64/thermal_cpufreq.c | 22 + + drivers/acpi/bus.c | 32 +- + drivers/acpi/internal.h | 28 +- + drivers/acpi/mipi-disco-img.c | 725 +++++++++++++++++++++ + drivers/acpi/numa/srat.c | 10 +- + drivers/acpi/osl.c | 67 +- + drivers/acpi/processor_thermal.c | 49 +- + drivers/acpi/property.c | 102 ++- + drivers/acpi/scan.c | 61 +- + drivers/acpi/thermal.c | 80 +-- + .../{thermal/thermal_acpi.c => acpi/thermal_lib.c} | 80 ++- + drivers/acpi/utils.c | 163 ++--- + drivers/cpufreq/intel_pstate.c | 14 +- + drivers/firmware/efi/dev-path-parser.c | 7 +- + drivers/idle/intel_idle.c | 34 + + drivers/perf/arm_cspmu/arm_cspmu.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 2 +- + drivers/platform/surface/surface_acpi_notify.c | 30 +- + drivers/pnp/pnpacpi/rsparser.c | 12 +- + drivers/thermal/Kconfig | 4 - + drivers/thermal/Makefile | 1 - + drivers/thermal/gov_power_allocator.c | 123 ++-- + drivers/thermal/intel/Kconfig | 2 +- + drivers/thermal/intel/int340x_thermal/Kconfig | 2 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 8 +- + drivers/thermal/thermal_core.c | 81 ++- + drivers/thermal/thermal_core.h | 4 +- + drivers/thermal/thermal_helpers.c | 17 +- + drivers/thermal/thermal_hwmon.c | 5 +- + drivers/thermal/thermal_netlink.c | 20 +- + drivers/thermal/thermal_sysfs.c | 116 ++-- + drivers/thermal/thermal_trip.c | 78 +-- + fs/debugfs/file.c | 28 +- + include/acpi/acpi_bus.h | 169 ++++- + include/acpi/video.h | 9 + + include/linux/acpi.h | 22 +- + include/linux/property.h | 7 + + include/linux/thermal.h | 17 +- + kernel/power/hibernate.c | 10 +- + kernel/power/power.h | 2 + + kernel/power/snapshot.c | 4 +- + kernel/power/swap.c | 40 +- + lib/fw_table.c | 30 +- + 52 files changed, 1792 insertions(+), 753 deletions(-) + create mode 100644 drivers/acpi/arm64/thermal_cpufreq.c + create mode 100644 drivers/acpi/mipi-disco-img.c + rename drivers/{thermal/thermal_acpi.c => acpi/thermal_lib.c} (65%) +$ git reset --hard HEAD^ +HEAD is now at cbd605a8bc98 Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git +Merging next-20231218 version of pm +$ git merge -m next-20231218/pm 3b6de08083e1f132679a930ff88ecea6d992fe75 +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/base/property.c +Auto-merging include/linux/property.h +Merge made by the 'ort' strategy. + drivers/acpi/Kconfig | 5 + + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_extlog.c | 12 +- + drivers/acpi/acpi_lpit.c | 2 +- + drivers/acpi/acpi_lpss.c | 19 +- + drivers/acpi/acpi_video.c | 77 +-- + drivers/acpi/acpi_watchdog.c | 2 +- + drivers/acpi/apei/einj.c | 71 +- + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/arm64/thermal_cpufreq.c | 22 + + drivers/acpi/bus.c | 32 +- + drivers/acpi/internal.h | 28 +- + drivers/acpi/mipi-disco-img.c | 725 +++++++++++++++++++++ + drivers/acpi/numa/srat.c | 10 +- + drivers/acpi/osl.c | 67 +- + drivers/acpi/processor_thermal.c | 49 +- + drivers/acpi/property.c | 106 ++- + drivers/acpi/scan.c | 56 +- + drivers/acpi/thermal.c | 76 +-- + .../{thermal/thermal_acpi.c => acpi/thermal_lib.c} | 80 ++- + drivers/acpi/utils.c | 48 -- + drivers/base/property.c | 1 + + drivers/base/swnode.c | 3 + + drivers/cpufreq/intel_pstate.c | 14 +- + drivers/firmware/efi/dev-path-parser.c | 7 +- + drivers/idle/intel_idle.c | 34 + + drivers/perf/arm_cspmu/arm_cspmu.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 2 +- + drivers/pnp/pnpacpi/rsparser.c | 12 +- + drivers/thermal/Kconfig | 4 - + drivers/thermal/Makefile | 1 - + drivers/thermal/gov_power_allocator.c | 123 ++-- + drivers/thermal/intel/Kconfig | 2 +- + drivers/thermal/intel/int340x_thermal/Kconfig | 2 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 8 +- + drivers/thermal/thermal_core.c | 80 ++- + drivers/thermal/thermal_core.h | 4 +- + drivers/thermal/thermal_helpers.c | 17 +- + drivers/thermal/thermal_hwmon.c | 5 +- + drivers/thermal/thermal_netlink.c | 20 +- + drivers/thermal/thermal_sysfs.c | 116 ++-- + drivers/thermal/thermal_trip.c | 78 +-- + fs/debugfs/file.c | 28 +- + include/acpi/acpi_bus.h | 158 ++++- + include/acpi/video.h | 9 + + include/linux/acpi.h | 22 +- + include/linux/property.h | 7 + + include/linux/thermal.h | 17 +- + kernel/power/hibernate.c | 10 +- + kernel/power/power.h | 2 + + kernel/power/snapshot.c | 4 +- + kernel/power/swap.c | 40 +- + lib/fw_table.c | 30 +- + 53 files changed, 1724 insertions(+), 631 deletions(-) + create mode 100644 drivers/acpi/arm64/thermal_cpufreq.c + 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 (c4a5118a3ae1 cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/scmi-cpufreq.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +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 (aed5ed595960 PM / devfreq: Synchronize devfreq_monitor_[start/stop]) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 3 + + drivers/devfreq/devfreq.c | 90 +++++++++++++++++++-------- + 2 files changed, 67 insertions(+), 26 deletions(-) +Merging pmdomain/next (d6948c13b663 PM: domains: Move genpd and its governor to the pmdomain subsystem) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/firmware/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +- + MAINTAINERS | 10 +----- + drivers/base/power/Makefile | 1 - + drivers/firmware/Kconfig | 9 ------ + drivers/firmware/Makefile | 1 - + drivers/firmware/arm_scmi/Kconfig | 25 --------------- + drivers/pmdomain/Kconfig | 1 + + drivers/pmdomain/Makefile | 1 + + drivers/pmdomain/amlogic/meson-ee-pwrc.c | 16 ++++++++++ + drivers/pmdomain/arm/Kconfig | 37 ++++++++++++++++++++++ + drivers/pmdomain/arm/Makefile | 1 + + .../{firmware => pmdomain/arm}/scpi_pm_domain.c | 0 + drivers/{base/power/domain.c => pmdomain/core.c} | 34 -------------------- + .../domain_governor.c => pmdomain/governor.c} | 8 +++-- + drivers/pmdomain/imx/gpc.c | 28 ++++++++-------- + drivers/pmdomain/imx/gpcv2.c | 6 ++-- + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 6 ++-- + drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 6 ++-- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 6 ++-- + drivers/pmdomain/imx/imx93-pd.c | 6 ++-- + drivers/pmdomain/qcom/cpr.c | 6 ++-- + drivers/pmdomain/qcom/rpmhpd.c | 12 +++---- + drivers/pmdomain/xilinx/zynqmp-pm-domains.c | 6 ++-- + include/dt-bindings/power/meson-g12a-power.h | 1 + + include/linux/pm_domain.h | 12 ------- + 25 files changed, 100 insertions(+), 141 deletions(-) + create mode 100644 drivers/pmdomain/arm/Kconfig + rename drivers/{firmware => pmdomain/arm}/scpi_pm_domain.c (100%) + rename drivers/{base/power/domain.c => pmdomain/core.c} (98%) + rename drivers/{base/power/domain_governor.c => pmdomain/governor.c} (98%) +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 (829509c37d9c thermal/thermal_of: Allow rebooting after critical temp) +$ 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 +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/thermal_core.h +Auto-merging kernel/reboot.c +Merge made by the 'ort' strategy. + .../bindings/thermal/loongson,ls2k-thermal.yaml | 10 ++- + .../bindings/thermal/mediatek,thermal.yaml | 99 ++++++++++++++++++++++ + .../bindings/thermal/mediatek-thermal.txt | 52 ------------ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 16 ++++ + drivers/thermal/loongson2_thermal.c | 2 +- + drivers/thermal/thermal_core.c | 21 ++++- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_of.c | 6 ++ + include/linux/reboot.h | 12 ++- + kernel/reboot.c | 33 +++++--- + 11 files changed, 180 insertions(+), 73 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt +$ git reset --hard HEAD^ +HEAD is now at 191069cf98f9 Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git +Merging next-20231218 version of thermal +$ git merge -m next-20231218/thermal 9618efe343ead954ca5c23856ae23d0a29e7d4b9 +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 (4f973e211b3b IB/ipoib: Fix mcast list locking) +$ 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/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 69 ++++--- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 7 + + drivers/infiniband/hw/bnxt_re/main.c | 33 ++-- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 215 ++++++++++++++-------- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 35 +++- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 21 ++- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 111 ++++++++--- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 11 +- + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 67 ++++++- + 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 | 13 +- + 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 | 71 +++++-- + drivers/infiniband/hw/hns/hns_roce_main.c | 48 ++++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 28 ++- + 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/mlx5/dm.c | 5 + + drivers/infiniband/hw/mlx5/main.c | 24 +++ + drivers/infiniband/hw/mlx5/mr.c | 1 + + drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- + drivers/infiniband/hw/mthca/mthca_main.c | 2 +- + drivers/infiniband/sw/siw/siw.h | 14 +- + 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 | 52 ++---- + 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 | 7 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 - + drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 38 +++- + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/eswitch.h | 8 + + include/linux/mlx5/mlx5_ifc.h | 9 +- + include/uapi/rdma/bnxt_re-abi.h | 10 + + include/uapi/rdma/hns-abi.h | 5 + + include/uapi/rdma/mlx5-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + + 57 files changed, 1127 insertions(+), 576 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 (509afc745270 Merge branch 'tools-net-ynl-add-sub-message-support-to-ynl') +$ 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/broadcom/bnxt/bnxt_xdp.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_register.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_type.h +Auto-merging drivers/net/ethernet/intel/ice/ice_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/usb/ax88179_178a.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/ieee80211.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mm_types.h +Auto-merging include/net/sock.h +Auto-merging mm/page_alloc.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/mptcp/protocol.h +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/kernel-doc +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/bpf/config.x86_64 +Auto-merging tools/testing/selftests/net/mptcp/mptcp_join.sh +Merge made by the 'ort' strategy. + Documentation/Makefile | 16 +- + Documentation/admin-guide/sysctl/net.rst | 5 +- + Documentation/bpf/kfuncs.rst | 24 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 6 + + .../bindings/net/dsa/marvell,mv88e6060.yaml | 88 + + .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 337 + + .../devicetree/bindings/net/dsa/marvell.txt | 109 - + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 34 +- + .../devicetree/bindings/net/ethernet-switch.yaml | 23 +- + .../devicetree/bindings/net/lantiq,pef2256.yaml | 213 + + .../devicetree/bindings/net/marvell,aquantia.yaml | 116 + + .../devicetree/bindings/net/marvell,mvusb.yaml | 7 +- + .../bindings/net/marvell,orion-mdio.yaml | 22 - + .../devicetree/bindings/net/qcom,ipa.yaml | 24 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 2 +- + .../devicetree/bindings/net/renesas,ethertsn.yaml | 133 + + .../devicetree/bindings/net/xlnx,axi-ethernet.yaml | 16 + + Documentation/netlink/netlink-raw.yaml | 68 +- + Documentation/netlink/specs/devlink.yaml | 381 +- + Documentation/netlink/specs/ethtool.yaml | 4 + + .../netlink/specs/{mptcp.yaml => mptcp_pm.yaml} | 0 + Documentation/netlink/specs/netdev.yaml | 285 +- + Documentation/netlink/specs/ovs_datapath.yaml | 3 +- + Documentation/netlink/specs/ovs_flow.yaml | 7 +- + Documentation/netlink/specs/ovs_vport.yaml | 4 - + Documentation/netlink/specs/rt_link.yaml | 449 +- + Documentation/netlink/specs/tc.yaml | 2031 +++++ + Documentation/networking/bridge.rst | 334 +- + .../device_drivers/ethernet/intel/ice.rst | 141 + + .../device_drivers/ethernet/marvell/octeon_ep.rst | 5 + + .../networking/device_drivers/wifi/index.rst | 1 - + .../networking/device_drivers/wifi/ray_cs.rst | 165 - + .../networking/devlink/devlink-reload.rst | 13 +- + Documentation/networking/devlink/ice.rst | 9 + + Documentation/networking/ethtool-netlink.rst | 12 +- + Documentation/networking/index.rst | 3 + + Documentation/networking/net_cachelines/index.rst | 16 + + .../net_cachelines/inet_connection_sock.rst | 50 + + .../networking/net_cachelines/inet_sock.rst | 44 + + .../networking/net_cachelines/net_device.rst | 178 + + .../net_cachelines/netns_ipv4_sysctl.rst | 158 + + Documentation/networking/net_cachelines/snmp.rst | 135 + + .../networking/net_cachelines/tcp_sock.rst | 157 + + Documentation/networking/netlink_spec/.gitignore | 1 + + Documentation/networking/netlink_spec/readme.txt | 4 + + Documentation/networking/page_pool.rst | 10 +- + Documentation/networking/scaling.rst | 15 + + Documentation/networking/smc-sysctl.rst | 14 + + Documentation/networking/timestamping.rst | 3 +- + Documentation/networking/xdp-rx-metadata.rst | 2 + + Documentation/networking/xsk-tx-metadata.rst | 79 + + Documentation/userspace-api/netlink/index.rst | 4 +- + Documentation/userspace-api/netlink/intro.rst | 4 + + .../userspace-api/netlink/netlink-raw.rst | 96 +- + Documentation/userspace-api/netlink/specs.rst | 2 +- + MAINTAINERS | 74 +- + drivers/dpll/dpll_core.c | 8 +- + drivers/dpll/dpll_netlink.c | 16 +- + drivers/net/Kconfig | 1 + + drivers/net/bonding/bond_alb.c | 3 +- + drivers/net/bonding/bond_main.c | 29 +- + drivers/net/dsa/lantiq_gswip.c | 2 +- + drivers/net/dsa/microchip/ksz8.h | 4 + + drivers/net/dsa/microchip/ksz8795.c | 152 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 3 + + drivers/net/dsa/microchip/ksz_common.c | 34 +- + drivers/net/dsa/microchip/ksz_common.h | 21 +- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 408 +- + drivers/net/dsa/mv88e6xxx/chip.h | 31 +- + drivers/net/dsa/mv88e6xxx/global1.c | 7 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 10 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 8 +- + drivers/net/dsa/qca/qca8k-common.c | 2 +- + drivers/net/dsa/realtek/rtl8365mb.c | 2 +- + drivers/net/dsa/realtek/rtl8366-core.c | 2 +- + drivers/net/dsa/realtek/rtl8366rb.c | 59 +- + drivers/net/dsa/sja1105/sja1105_main.c | 3 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 8 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 32 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 33 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 31 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 28 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 61 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 23 +- + drivers/net/ethernet/asix/ax88796c_main.c | 2 +- + drivers/net/ethernet/asix/ax88796c_main.h | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 25 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1925 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 410 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 361 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 521 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 38 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 37 +- + drivers/net/ethernet/broadcom/tg3.c | 22 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 15 +- + drivers/net/ethernet/cadence/macb_main.c | 42 +- + drivers/net/ethernet/cadence/macb_ptp.c | 28 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 31 +- + drivers/net/ethernet/chelsio/cxgb3/adapter.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 24 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 25 +- + drivers/net/ethernet/dlink/dl2k.c | 3 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 28 +- + drivers/net/ethernet/ezchip/nps_enet.c | 6 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 31 +- + drivers/net/ethernet/freescale/fec_main.c | 4 +- + .../net/ethernet/fungible/funeth/funeth_ethtool.c | 48 +- + drivers/net/ethernet/google/gve/gve.h | 8 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 88 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 3 +- + drivers/net/ethernet/google/gve/gve_dqo.h | 3 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +- + drivers/net/ethernet/google/gve/gve_main.c | 17 +- + drivers/net/ethernet/google/gve/gve_register.h | 9 + + drivers/net/ethernet/google/gve/gve_rx.c | 17 +- + drivers/net/ethernet/google/gve/gve_tx.c | 2 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 37 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 80 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 23 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 21 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 40 +- + drivers/net/ethernet/intel/Kconfig | 11 + + drivers/net/ethernet/intel/e1000e/defines.h | 3 - + drivers/net/ethernet/intel/e1000e/mac.c | 18 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e.h | 164 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 227 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 7 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 76 +- + 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 | 10 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 295 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 646 +- + 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 | 11 +- + 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/iavf/iavf.h | 5 +- + drivers/net/ethernet/intel/iavf/iavf_adminq.c | 86 +- + drivers/net/ethernet/intel/iavf/iavf_adminq.h | 7 - + drivers/net/ethernet/intel/iavf/iavf_adv_rss.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_adv_rss.h | 3 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 93 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 27 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 41 + + drivers/net/ethernet/intel/ice/Makefile | 5 +- + drivers/net/ethernet/intel/ice/ice.h | 25 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 197 +- + drivers/net/ethernet/intel/ice/ice_base.c | 12 +- + drivers/net/ethernet/intel/ice/ice_common.c | 273 +- + drivers/net/ethernet/intel/ice/ice_common.h | 4 +- + drivers/net/ethernet/intel/ice/ice_debugfs.c | 667 ++ + drivers/net/ethernet/intel/ice/ice_devlink.c | 49 + + drivers/net/ethernet/intel/ice/ice_devlink.h | 1 + + drivers/net/ethernet/intel/ice/ice_dpll.c | 26 - + drivers/net/ethernet/intel/ice/ice_eswitch.c | 578 +- + 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_ethtool.c | 115 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 48 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 44 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 4 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 7 + + drivers/net/ethernet/intel/ice/ice_flow.c | 486 +- + drivers/net/ethernet/intel/ice/ice_flow.h | 60 +- + drivers/net/ethernet/intel/ice/ice_fwlog.c | 470 ++ + drivers/net/ethernet/intel/ice/ice_fwlog.h | 79 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 4 + + drivers/net/ethernet/intel/ice/ice_hwmon.c | 126 + + drivers/net/ethernet/intel/ice/ice_hwmon.h | 15 + + drivers/net/ethernet/intel/ice/ice_lib.c | 266 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 4 + + drivers/net/ethernet/intel/ice/ice_main.c | 123 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 117 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 2 +- + drivers/net/ethernet/intel/ice/ice_ptp_consts.h | 12 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 444 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 48 +- + 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_type.h | 38 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 9 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 105 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.h | 1 + + .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 1 + + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 35 +- + drivers/net/ethernet/intel/idpf/idpf.h | 7 +- + drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 53 +- + drivers/net/ethernet/intel/idpf/idpf_lib.c | 65 + + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 12 +- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 2 + + drivers/net/ethernet/intel/igb/e1000_mac.c | 6 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 33 +- + 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_ethtool.c | 33 +- + 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/intel/ixgbe/ixgbe_ethtool.c | 40 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 27 +- + drivers/net/ethernet/marvell/mvmdio.c | 95 +- + drivers/net/ethernet/marvell/mvneta.c | 25 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 100 +- + drivers/net/ethernet/marvell/octeon_ep/Makefile | 3 +- + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 25 +- + .../net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 893 +++ + .../net/ethernet/marvell/octeon_ep/octep_config.h | 48 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 80 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 173 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 158 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 19 +- + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 4 + + .../marvell/octeon_ep/octep_regs_cnxk_pf.h | 403 + + drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 12 +- + drivers/net/ethernet/marvell/octeon_ep/octep_rx.h | 34 +- + drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 5 +- + drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 75 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 74 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 9 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 42 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 9 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 25 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 80 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 726 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 89 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 96 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 17 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 80 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 127 +- + 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 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 40 +- + .../net/ethernet/mellanox/mlx5/core/diag/crdump.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 9 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 35 +- + .../ethernet/mellanox/mlx5/core/en/monitor_stats.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/monitor_stats.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en/params.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 9 +- + .../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/trap.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 11 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 17 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 74 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 43 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 162 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + 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/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 34 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.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/ipoib/ipoib.c | 19 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 2 + + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 78 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 7 + + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 20 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 10 + + .../mellanox/mlx5/core/steering/dr_action.c | 8 +- + 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 | 103 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 28 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 21 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 853 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 34 +- + drivers/net/ethernet/microchip/lan743x_main.h | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 2 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 76 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 1 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 51 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 73 +- + drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfdk/dp.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 40 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 199 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 16 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 535 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 6 + + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 90 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 2 - + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 43 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 3 + + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 64 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 8 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 26 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 108 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 5 + + drivers/net/ethernet/pensando/ionic/ionic_main.c | 44 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 10 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 32 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 12 +- + drivers/net/ethernet/realtek/r8169_firmware.c | 3 - + drivers/net/ethernet/realtek/r8169_main.c | 152 +- + drivers/net/ethernet/renesas/Kconfig | 12 +- + 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 | 381 +- + drivers/net/ethernet/renesas/rswitch.h | 43 +- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 3 +- + drivers/net/ethernet/sfc/efx.c | 24 +- + drivers/net/ethernet/sfc/ethtool.c | 3 +- + drivers/net/ethernet/sfc/ethtool_common.c | 126 +- + drivers/net/ethernet/sfc/ethtool_common.h | 13 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 26 +- + drivers/net/ethernet/sfc/net_driver.h | 2 +- + drivers/net/ethernet/sfc/ptp.c | 30 +- + drivers/net/ethernet/sfc/ptp.h | 7 +- + drivers/net/ethernet/sfc/siena/efx.c | 24 +- + drivers/net/ethernet/sfc/siena/ethtool.c | 3 +- + drivers/net/ethernet/sfc/siena/ethtool_common.c | 126 +- + drivers/net/ethernet/sfc/siena/ethtool_common.h | 13 +- + drivers/net/ethernet/sfc/siena/net_driver.h | 2 +- + drivers/net/ethernet/sfc/siena/ptp.c | 30 +- + drivers/net/ethernet/sfc/siena/ptp.h | 7 +- + drivers/net/ethernet/sfc/siena/siena.c | 2 +- + drivers/net/ethernet/socionext/netsec.c | 2 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 13 + + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 137 - + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 51 - + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 16 - + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 53 - + drivers/net/ethernet/stmicro/stmmac/hwif.c | 21 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 37 +- + drivers/net/ethernet/stmicro/stmmac/mmc.h | 14 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 115 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 13 + + drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 165 + + drivers/net/ethernet/stmicro/stmmac/stmmac_est.h | 64 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 41 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 123 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 93 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 8 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 26 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 212 +- + drivers/net/ethernet/ti/cpsw.c | 15 +- + drivers/net/ethernet/ti/cpsw_new.c | 15 +- + drivers/net/ethernet/ti/davinci_mdio.c | 16 +- + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 2 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 1 + + 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/fjes/fjes_main.c | 6 +- + drivers/net/hyperv/netvsc_drv.c | 36 +- + drivers/net/hyperv/rndis_filter.c | 1 - + 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 | 42 +- + 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/ipvlan/ipvlan_main.c | 1 + + drivers/net/macvlan.c | 15 +- + drivers/net/mdio/mdio-bcm-unimac.c | 21 +- + drivers/net/mdio/mdio-gpio.c | 4 +- + drivers/net/mdio/mdio-mux.c | 14 +- + drivers/net/pcs/pcs-rzn1-miic.c | 6 +- + drivers/net/phy/Kconfig | 34 +- + drivers/net/phy/Makefile | 13 +- + drivers/net/phy/adin.c | 53 + + 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 | 374 + + drivers/net/phy/{ => aquantia}/aquantia_hwmon.c | 14 - + drivers/net/phy/{ => aquantia}/aquantia_main.c | 137 +- + drivers/net/phy/at803x.c | 871 +- + drivers/net/phy/ax88796b_rust.rs | 135 + + drivers/net/phy/bcm-phy-ptp.c | 15 +- + drivers/net/phy/bcm54140.c | 16 +- + drivers/net/phy/bcm84881.c | 12 + + drivers/net/phy/broadcom.c | 2 + + drivers/net/phy/dp83640.c | 24 +- + drivers/net/phy/dp83tg720.c | 188 + + drivers/net/phy/marvell10g.c | 209 +- + drivers/net/phy/mdio_bus.c | 2 +- + drivers/net/phy/mdio_device.c | 6 + + drivers/net/phy/micrel.c | 51 +- + drivers/net/phy/mscc/mscc.h | 5 + + drivers/net/phy/mscc/mscc_main.c | 4 +- + drivers/net/phy/mscc/mscc_ptp.c | 18 +- + drivers/net/phy/nxp-c45-tja11xx.c | 17 +- + drivers/net/phy/nxp-tja11xx.c | 2 +- + drivers/net/phy/phy-c45.c | 129 +- + drivers/net/phy/phy-core.c | 204 +- + drivers/net/phy/phy.c | 28 +- + drivers/net/phy/phy_device.c | 49 +- + drivers/net/phy/phylink.c | 256 +- + drivers/net/phy/sfp-bus.c | 2 +- + drivers/net/phy/sfp.c | 47 +- + drivers/net/phy/smsc.c | 2 +- + drivers/net/usb/ax88179_178a.c | 2 - + drivers/net/virtio_net.c | 326 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 32 +- + drivers/net/vxlan/vxlan_core.c | 23 +- + drivers/net/wan/Kconfig | 2 + + drivers/net/wan/Makefile | 2 + + drivers/net/wan/framer/Kconfig | 42 + + drivers/net/wan/framer/Makefile | 7 + + drivers/net/wan/framer/framer-core.c | 882 +++ + drivers/net/wan/framer/pef2256/Makefile | 8 + + drivers/net/wan/framer/pef2256/pef2256-regs.h | 250 + + drivers/net/wan/framer/pef2256/pef2256.c | 880 +++ + drivers/net/wan/fsl_ucc_hdlc.c | 6 +- + drivers/net/wan/ixp4xx_hss.c | 5 +- + 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/net/wwan/qcom_bam_dmux.c | 6 +- + drivers/pci/pci.c | 3 + + drivers/pci/quirks.c | 13 + + drivers/pinctrl/Kconfig | 15 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-pef2256.c | 358 + + drivers/ptp/ptp_ines.c | 16 +- + drivers/ptp/ptp_ocp.c | 8 - + drivers/vhost/vsock.c | 1 + + include/linux/avf/virtchnl.h | 35 +- + include/linux/bpf.h | 8 +- + include/linux/bpf_verifier.h | 77 + + include/linux/cache.h | 25 + + include/linux/cgroup-defs.h | 1 + + include/linux/cgroup.h | 4 +- + include/linux/compiler-gcc.h | 2 +- + include/linux/dpll.h | 3 - + include/linux/ethtool.h | 83 +- + include/linux/framer/framer-provider.h | 194 + + include/linux/framer/framer.h | 205 + + include/linux/framer/pef2256.h | 31 + + include/linux/ieee80211.h | 4 +- + include/linux/indirect_call_wrapper.h | 2 +- + include/linux/linkmode.h | 5 + + include/linux/list.h | 20 + + include/linux/mdio.h | 1 + + include/linux/mii_timestamper.h | 4 +- + include/linux/mlx5/driver.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 50 +- + include/linux/mm_types.h | 2 +- + include/linux/netdevice.h | 149 +- + include/linux/netfilter_ipv6.h | 8 +- + include/linux/netlink.h | 1 + + include/linux/phy.h | 90 +- + include/linux/platform_data/microchip-ksz.h | 23 +- + include/linux/poison.h | 2 + + include/linux/rtnetlink.h | 41 + + include/linux/skbuff.h | 20 +- + include/linux/tcp.h | 262 +- + include/linux/tnum.h | 4 + + include/linux/virtio_vsock.h | 1 + + include/net/act_api.h | 2 +- + include/net/af_vsock.h | 2 +- + include/net/cfg80211.h | 3 + + include/net/dropreason-core.h | 6 + + include/net/inet_sock.h | 5 +- + include/net/ip.h | 10 +- + include/net/ip6_fib.h | 4 +- + include/net/ip_tunnels.h | 11 + + include/net/mana/gdma.h | 7 +- + include/net/mana/mana.h | 46 +- + include/net/netdev_rx_queue.h | 4 + + include/net/netlink.h | 16 +- + include/net/netns/core.h | 1 + + include/net/netns/ipv4.h | 50 +- + include/net/netns/smc.h | 2 + + include/net/page_pool/helpers.h | 85 +- + include/net/page_pool/types.h | 49 +- + include/net/sock.h | 1 - + include/net/tcp.h | 22 +- + include/net/tcp_ao.h | 6 +- + include/net/tcp_states.h | 2 + + include/net/vxlan.h | 33 +- + include/net/xdp_sock.h | 111 + + include/net/xdp_sock_drv.h | 34 + + include/net/xsk_buff_pool.h | 8 + + include/uapi/linux/batadv_packet.h | 45 +- + include/uapi/linux/bpf.h | 40 +- + include/uapi/linux/ethtool.h | 13 +- + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 529 ++ + include/uapi/linux/if_xdp.h | 47 +- + include/uapi/linux/mptcp.h | 1 + + include/uapi/linux/mptcp_pm.h | 2 +- + include/uapi/linux/netdev.h | 77 +- + 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 | 1865 ++--- + kernel/cgroup/cgroup-internal.h | 4 +- + kernel/cgroup/cgroup-v1.c | 34 + + kernel/cgroup/cgroup.c | 45 +- + kernel/trace/bpf_trace.c | 98 +- + lib/test_bpf.c | 18 - + 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/bpf/test_run.c | 2 +- + net/bridge/br_private.h | 2 + + net/core/Makefile | 2 +- + net/core/bpf_sk_storage.c | 3 +- + net/core/dev.c | 109 +- + net/core/dev.h | 3 +- + net/core/dev_ioctl.c | 7 +- + net/core/filter.c | 27 +- + net/core/link_watch.c | 8 +- + net/core/net-sysfs.c | 17 +- + net/core/net_namespace.c | 49 + + net/core/netdev-genl-gen.c | 110 + + net/core/netdev-genl-gen.h | 16 + + net/core/netdev-genl.c | 344 +- + net/core/page_pool.c | 117 +- + net/core/page_pool_priv.h | 12 + + net/core/page_pool_user.c | 410 + + net/core/rtnetlink.c | 22 +- + net/core/skbuff.c | 59 +- + net/core/sock.c | 8 +- + net/core/sysctl_net_core.c | 15 +- + net/dccp/ipv6.c | 2 +- + net/devlink/core.c | 4 +- + net/devlink/dev.c | 24 +- + 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/dns_resolver/Kconfig | 2 +- + net/dsa/tag_rtl4_a.c | 5 +- + net/ethtool/common.c | 18 +- + net/ethtool/ioctl.c | 181 +- + net/ethtool/rings.c | 12 + + net/ethtool/rss.c | 24 +- + net/hsr/hsr_device.c | 67 +- + net/ipv4/af_inet.c | 5 +- + net/ipv4/inet_connection_sock.c | 48 +- + net/ipv4/inet_diag.c | 86 +- + net/ipv4/inet_hashtables.c | 27 +- + net/ipv4/ip_sockglue.c | 39 +- + net/ipv4/ipmr.c | 13 +- + net/ipv4/syncookies.c | 227 +- + net/ipv4/sysctl_net_ipv4.c | 18 +- + net/ipv4/tcp.c | 94 + + net/ipv4/tcp_ao.c | 16 +- + net/ipv4/tcp_input.c | 29 +- + net/ipv4/tcp_ipv4.c | 6 + + net/ipv4/tcp_timer.c | 4 +- + net/ipv6/datagram.c | 6 +- + net/ipv6/icmp.c | 8 +- + net/ipv6/ipv6_sockglue.c | 136 +- + net/ipv6/ping.c | 8 +- + net/ipv6/raw.c | 4 +- + net/ipv6/syncookies.c | 108 +- + net/ipv6/tcp_ipv6.c | 11 +- + net/ipv6/udp.c | 4 +- + net/l2tp/l2tp_ip6.c | 4 +- + net/mac80211/scan.c | 48 +- + net/mptcp/mptcp_pm_gen.c | 2 +- + net/mptcp/mptcp_pm_gen.h | 2 +- + net/mptcp/pm_userspace.c | 8 +- + net/mptcp/protocol.h | 9 + + net/mptcp/sockopt.c | 2 + + 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/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/netfilter/nf_synproxy_core.c | 4 +- + net/netlink/af_netlink.c | 3 +- + net/packet/af_packet.c | 20 +- + net/rds/tcp_listen.c | 2 +- + net/rfkill/core.c | 4 +- + net/sched/act_api.c | 242 +- + net/sched/cls_api.c | 40 +- + net/sched/cls_u32.c | 36 +- + net/sched/sch_cbs.c | 4 +- + net/sched/sch_generic.c | 5 +- + net/sctp/socket.c | 3 + + 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/vmw_vsock/af_vsock.c | 9 +- + net/vmw_vsock/hyperv_transport.c | 4 +- + net/vmw_vsock/virtio_transport.c | 1 + + net/vmw_vsock/virtio_transport_common.c | 43 +- + net/vmw_vsock/vsock_loopback.c | 1 + + net/wireless/nl80211.c | 1 + + net/xdp/xdp_umem.c | 11 +- + net/xdp/xsk.c | 56 +- + net/xdp/xsk_buff_pool.c | 2 + + net/xdp/xsk_queue.h | 19 +- + rust/bindings/bindings_helper.h | 3 + + rust/kernel/lib.rs | 3 + + rust/kernel/net.rs | 6 + + rust/kernel/net/phy.rs | 901 +++ + rust/uapi/uapi_helper.h | 2 + + scripts/checkpatch.pl | 19 + + scripts/kernel-doc | 5 + + tools/bpf/bpftool/Documentation/bpftool.rst | 2 +- + tools/bpf/bpftool/link.c | 105 +- + tools/bpf/bpftool/prog.c | 14 +- + tools/include/uapi/linux/bpf.h | 39 +- + tools/include/uapi/linux/if_xdp.h | 63 +- + tools/include/uapi/linux/netdev.h | 77 +- + tools/lib/bpf/elf.c | 5 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_common.h | 13 +- + tools/lib/bpf/libbpf_internal.h | 3 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/net/ynl/Makefile | 2 + + tools/net/ynl/generated/.gitignore | 2 + + tools/net/ynl/generated/devlink-user.c | 6864 ---------------- + tools/net/ynl/generated/devlink-user.h | 5255 ------------- + tools/net/ynl/generated/ethtool-user.c | 6370 --------------- + tools/net/ynl/generated/ethtool-user.h | 5535 ------------- + tools/net/ynl/generated/fou-user.c | 330 - + tools/net/ynl/generated/fou-user.h | 343 - + tools/net/ynl/generated/handshake-user.c | 332 - + tools/net/ynl/generated/handshake-user.h | 145 - + tools/net/ynl/generated/netdev-user.c | 225 - + tools/net/ynl/generated/netdev-user.h | 90 - + tools/net/ynl/generated/nfsd-user.c | 203 - + tools/net/ynl/generated/nfsd-user.h | 67 - + tools/net/ynl/lib/nlspec.py | 55 + + tools/net/ynl/lib/ynl-priv.h | 144 + + tools/net/ynl/lib/ynl.c | 14 +- + tools/net/ynl/lib/ynl.h | 149 +- + tools/net/ynl/lib/ynl.py | 98 +- + tools/net/ynl/samples/.gitignore | 1 + + tools/net/ynl/samples/Makefile | 4 +- + tools/net/ynl/samples/netdev.c | 10 +- + tools/net/ynl/samples/page-pool.c | 147 + + tools/net/ynl/ynl-gen-c.py | 265 +- + tools/net/ynl/ynl-gen-rst.py | 417 + + tools/net/ynl/ynl-regen.sh | 4 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/README.rst | 2 +- + 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/network_helpers.h | 43 + + 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/fill_link_info.c | 242 +- + .../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 +- + .../selftests/bpf/prog_tests/uprobe_multi_test.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/prog_tests/vmlinux.c | 16 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 33 +- + .../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 + + .../selftests/bpf/progs/test_fill_link_info.c | 6 + + .../selftests/bpf/progs/test_global_func12.c | 4 +- + .../selftests/bpf/progs/test_global_func17.c | 1 + + .../testing/selftests/bpf/progs/verifier_bounds.c | 2 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 92 + + .../bpf/progs/verifier_subprog_precision.c | 4 +- + 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_offload.py | 15 +- + 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 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 231 +- + tools/testing/selftests/bpf/xsk.c | 3 + + tools/testing/selftests/bpf/xsk.h | 1 + + .../selftests/drivers/net/mlxsw/pci_reset.sh | 58 + + tools/testing/selftests/net/Makefile | 3 +- + .../selftests/net/arp_ndisc_evict_nocarrier.sh | 46 +- + .../selftests/net/arp_ndisc_untracked_subnets.sh | 20 +- + tools/testing/selftests/net/cmsg_ipv6.sh | 10 +- + tools/testing/selftests/net/cmsg_sender.c | 50 +- + tools/testing/selftests/net/cmsg_so_mark.sh | 7 +- + tools/testing/selftests/net/cmsg_time.sh | 7 +- + tools/testing/selftests/net/drop_monitor_tests.sh | 21 +- + tools/testing/selftests/net/fcnal-test.sh | 30 +- + tools/testing/selftests/net/fdb_flush.sh | 11 +- + tools/testing/selftests/net/fib-onlink-tests.sh | 9 +- + .../selftests/net/fib_nexthop_multiprefix.sh | 96 +- + tools/testing/selftests/net/fib_nexthop_nongw.sh | 34 +- + tools/testing/selftests/net/fib_nexthops.sh | 142 +- + tools/testing/selftests/net/fib_rule_tests.sh | 36 +- + tools/testing/selftests/net/fib_tests.sh | 180 +- + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../selftests/net/forwarding/ethtool_rmon.sh | 143 + + tools/testing/selftests/net/forwarding/lib.sh | 36 +- + tools/testing/selftests/net/fq_band_pktlimit.sh | 57 + + tools/testing/selftests/net/icmp.sh | 10 +- + tools/testing/selftests/net/icmp_redirect.sh | 180 +- + .../testing/selftests/net/io_uring_zerocopy_tx.sh | 9 +- + tools/testing/selftests/net/ioam6.sh | 233 +- + tools/testing/selftests/net/l2tp.sh | 130 +- + tools/testing/selftests/net/lib.sh | 93 + + tools/testing/selftests/net/mptcp/diag.sh | 23 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 110 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 372 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 91 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 39 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 19 +- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 143 +- + tools/testing/selftests/net/msg_zerocopy.sh | 9 +- + .../selftests/net/ndisc_unsolicited_na_test.sh | 19 +- + tools/testing/selftests/net/net_helper.sh | 22 + + tools/testing/selftests/net/sctp_vrf.sh | 12 +- + tools/testing/selftests/net/settings | 2 +- + .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 51 +- + .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 48 +- + .../selftests/net/srv6_end_dt6_l3vpn_test.sh | 46 +- + tools/testing/selftests/net/tcp_ao/.gitignore | 2 + + tools/testing/selftests/net/tcp_ao/Makefile | 59 + + tools/testing/selftests/net/tcp_ao/bench-lookups.c | 358 + + tools/testing/selftests/net/tcp_ao/connect-deny.c | 264 + + tools/testing/selftests/net/tcp_ao/connect.c | 90 + + tools/testing/selftests/net/tcp_ao/icmps-accept.c | 1 + + tools/testing/selftests/net/tcp_ao/icmps-discard.c | 449 ++ + .../testing/selftests/net/tcp_ao/key-management.c | 1180 +++ + tools/testing/selftests/net/tcp_ao/lib/aolib.h | 605 ++ + tools/testing/selftests/net/tcp_ao/lib/kconfig.c | 148 + + tools/testing/selftests/net/tcp_ao/lib/netlink.c | 415 + + tools/testing/selftests/net/tcp_ao/lib/proc.c | 273 + + tools/testing/selftests/net/tcp_ao/lib/repair.c | 254 + + tools/testing/selftests/net/tcp_ao/lib/setup.c | 342 + + tools/testing/selftests/net/tcp_ao/lib/sock.c | 592 ++ + tools/testing/selftests/net/tcp_ao/lib/utils.c | 30 + + tools/testing/selftests/net/tcp_ao/restore.c | 236 + + tools/testing/selftests/net/tcp_ao/rst.c | 415 + + tools/testing/selftests/net/tcp_ao/self-connect.c | 197 + + tools/testing/selftests/net/tcp_ao/seq-ext.c | 245 + + .../selftests/net/tcp_ao/setsockopt-closed.c | 835 ++ + tools/testing/selftests/net/tcp_ao/unsigned-md5.c | 742 ++ + .../selftests/net/test_bridge_backup_port.sh | 371 +- + .../selftests/net/test_bridge_neigh_suppress.sh | 331 +- + tools/testing/selftests/net/test_vxlan_mdb.sh | 202 +- + .../selftests/net/test_vxlan_nolocalbypass.sh | 48 +- + .../testing/selftests/net/test_vxlan_under_vrf.sh | 70 +- + .../selftests/net/test_vxlan_vnifiltering.sh | 154 +- + tools/testing/selftests/net/traceroute.sh | 82 +- + 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/net/unicast_extensions.sh | 91 +- + tools/testing/selftests/net/vrf-xfrm-tests.sh | 77 +- + tools/testing/selftests/net/vrf_route_leaking.sh | 201 +- + .../testing/selftests/net/vrf_strict_mode_test.sh | 47 +- + tools/testing/selftests/tc-testing/Makefile | 29 +- + 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 +- + .../filters/{concurrency.json => flower.json} | 98 + + .../tc-testing/tc-tests/filters/matchall.json | 23 + + .../tc-testing/tc-tests/filters/tests.json | 129 - + .../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 +- + tools/testing/vsock/vsock_test.c | 175 + + 1015 files changed, 55464 insertions(+), 98137 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml + create mode 100644 Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/marvell.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,pef2256.yaml + create mode 100644 Documentation/devicetree/bindings/net/marvell,aquantia.yaml + create mode 100644 Documentation/devicetree/bindings/net/renesas,ethertsn.yaml + rename Documentation/netlink/specs/{mptcp.yaml => mptcp_pm.yaml} (100%) + create mode 100644 Documentation/netlink/specs/tc.yaml + delete mode 100644 Documentation/networking/device_drivers/wifi/ray_cs.rst + create mode 100644 Documentation/networking/net_cachelines/index.rst + create mode 100644 Documentation/networking/net_cachelines/inet_connection_sock.rst + create mode 100644 Documentation/networking/net_cachelines/inet_sock.rst + create mode 100644 Documentation/networking/net_cachelines/net_device.rst + create mode 100644 Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst + create mode 100644 Documentation/networking/net_cachelines/snmp.rst + create mode 100644 Documentation/networking/net_cachelines/tcp_sock.rst + create mode 100644 Documentation/networking/netlink_spec/.gitignore + create mode 100644 Documentation/networking/netlink_spec/readme.txt + create mode 100644 Documentation/networking/xsk-tx-metadata.rst + create mode 100644 drivers/net/ethernet/intel/ice/ice_debugfs.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_fwlog.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_fwlog.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_hwmon.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_hwmon.h + 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/ethernet/stmicro/stmmac/stmmac_est.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_est.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%) + create mode 100644 drivers/net/phy/ax88796b_rust.rs + create mode 100644 drivers/net/phy/dp83tg720.c + create mode 100644 drivers/net/wan/framer/Kconfig + create mode 100644 drivers/net/wan/framer/Makefile + create mode 100644 drivers/net/wan/framer/framer-core.c + create mode 100644 drivers/net/wan/framer/pef2256/Makefile + create mode 100644 drivers/net/wan/framer/pef2256/pef2256-regs.h + create mode 100644 drivers/net/wan/framer/pef2256/pef2256.c + 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 drivers/pinctrl/pinctrl-pef2256.c + create mode 100644 include/linux/framer/framer-provider.h + create mode 100644 include/linux/framer/framer.h + create mode 100644 include/linux/framer/pef2256.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 rust/kernel/net.rs + create mode 100644 rust/kernel/net/phy.rs + create mode 100644 tools/net/ynl/generated/.gitignore + delete mode 100644 tools/net/ynl/generated/devlink-user.c + delete mode 100644 tools/net/ynl/generated/devlink-user.h + delete mode 100644 tools/net/ynl/generated/ethtool-user.c + delete mode 100644 tools/net/ynl/generated/ethtool-user.h + delete mode 100644 tools/net/ynl/generated/fou-user.c + delete mode 100644 tools/net/ynl/generated/fou-user.h + delete mode 100644 tools/net/ynl/generated/handshake-user.c + delete mode 100644 tools/net/ynl/generated/handshake-user.h + delete mode 100644 tools/net/ynl/generated/netdev-user.c + delete mode 100644 tools/net/ynl/generated/netdev-user.h + delete mode 100644 tools/net/ynl/generated/nfsd-user.c + delete mode 100644 tools/net/ynl/generated/nfsd-user.h + create mode 100644 tools/net/ynl/lib/ynl-priv.h + 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 100644 tools/testing/selftests/bpf/progs/verifier_global_subprogs.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/pci_reset.sh + create mode 100755 tools/testing/selftests/net/forwarding/ethtool_rmon.sh + create mode 100755 tools/testing/selftests/net/fq_band_pktlimit.sh + create mode 100644 tools/testing/selftests/net/lib.sh + create mode 100755 tools/testing/selftests/net/net_helper.sh + create mode 100644 tools/testing/selftests/net/tcp_ao/.gitignore + create mode 100644 tools/testing/selftests/net/tcp_ao/Makefile + create mode 100644 tools/testing/selftests/net/tcp_ao/bench-lookups.c + create mode 100644 tools/testing/selftests/net/tcp_ao/connect-deny.c + create mode 100644 tools/testing/selftests/net/tcp_ao/connect.c + create mode 120000 tools/testing/selftests/net/tcp_ao/icmps-accept.c + create mode 100644 tools/testing/selftests/net/tcp_ao/icmps-discard.c + create mode 100644 tools/testing/selftests/net/tcp_ao/key-management.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/aolib.h + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/kconfig.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/netlink.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/proc.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/repair.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/setup.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/sock.c + create mode 100644 tools/testing/selftests/net/tcp_ao/lib/utils.c + create mode 100644 tools/testing/selftests/net/tcp_ao/restore.c + create mode 100644 tools/testing/selftests/net/tcp_ao/rst.c + create mode 100644 tools/testing/selftests/net/tcp_ao/self-connect.c + create mode 100644 tools/testing/selftests/net/tcp_ao/seq-ext.c + create mode 100644 tools/testing/selftests/net/tcp_ao/setsockopt-closed.c + create mode 100644 tools/testing/selftests/net/tcp_ao/unsigned-md5.c + create mode 100644 tools/testing/selftests/tc-testing/action-ebpf + delete mode 100644 tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py + rename tools/testing/selftests/tc-testing/tc-tests/filters/{concurrency.json => flower.json} (65%) + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/tests.json +Merging bpf-next/for-next (8e432e6197ce bpf: Ensure precise is reset to false in __mark_reg_const_zero()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging Documentation/netlink/specs/netdev.yaml +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging drivers/net/ethernet/intel/ice/ice.h +Auto-merging drivers/net/ethernet/intel/ice/ice_base.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ptp.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ptp.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +Auto-merging drivers/net/veth.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/skbuff.h +CONFLICT (content): Merge conflict in include/linux/skbuff.h +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/uapi/linux/netdev.h +Auto-merging kernel/bpf/arraymap.c +Auto-merging kernel/bpf/core.c +Auto-merging net/core/filter.c +Auto-merging net/netfilter/nf_bpf_link.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging tools/include/uapi/linux/netdev.h +CONFLICT (modify/delete): tools/net/ynl/generated/netdev-user.c deleted in HEAD and modified in bpf-next/for-next. Version bpf-next/for-next of tools/net/ynl/generated/netdev-user.c left in tree. +Resolved 'include/linux/skbuff.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/net/ynl/generated/netdev-user.c +rm 'tools/net/ynl/generated/netdev-user.c' +$ git commit --no-edit -v -a +[master 6f5a34a10318] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/cpumasks.rst | 2 +- + Documentation/bpf/fs_kfuncs.rst | 21 + + Documentation/bpf/index.rst | 1 + + Documentation/netlink/specs/netdev.yaml | 4 + + Documentation/networking/xdp-rx-metadata.rst | 8 +- + Documentation/networking/xsk-tx-metadata.rst | 2 + + arch/arm64/net/bpf_jit_comp.c | 55 +- + arch/riscv/include/asm/cfi.h | 3 +- + arch/riscv/kernel/cfi.c | 2 +- + arch/riscv/net/bpf_jit_comp64.c | 25 +- + arch/s390/net/bpf_jit_comp.c | 59 +- + arch/x86/include/asm/cfi.h | 126 ++- + arch/x86/kernel/alternative.c | 87 +- + arch/x86/kernel/cfi.c | 4 +- + arch/x86/net/bpf_jit_comp.c | 264 ++++- + drivers/media/rc/bpf-lirc.c | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 2 + + drivers/net/ethernet/intel/ice/ice_base.c | 15 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 412 ++++---- + drivers/net/ethernet/intel/ice/ice_main.c | 21 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 22 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 16 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 19 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 32 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 207 +++- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 18 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 15 + + drivers/net/veth.c | 19 + + fs/verity/fsverity_private.h | 10 + + fs/verity/init.c | 1 + + fs/verity/measure.c | 84 ++ + include/asm-generic/Kbuild | 1 + + include/asm-generic/cfi.h | 5 + + include/linux/bpf.h | 143 ++- + include/linux/bpf_verifier.h | 70 +- + include/linux/cfi.h | 12 + + include/linux/filter.h | 4 +- + include/linux/if_vlan.h | 4 +- + include/linux/lsm_hook_defs.h | 15 +- + include/linux/mlx5/device.h | 2 +- + include/linux/security.h | 43 +- + include/linux/skbuff.h | 13 +- + include/net/xdp.h | 20 +- + include/net/xdp_sock_drv.h | 17 + + include/net/xfrm.h | 9 + + include/net/xsk_buff_pool.h | 2 + + include/uapi/linux/bpf.h | 46 +- + include/uapi/linux/netdev.h | 3 + + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 37 +- + kernel/bpf/bpf_cgrp_storage.c | 6 +- + kernel/bpf/bpf_lsm.c | 27 +- + kernel/bpf/bpf_struct_ops.c | 35 +- + kernel/bpf/btf.c | 11 +- + kernel/bpf/cgroup.c | 6 +- + kernel/bpf/core.c | 53 +- + kernel/bpf/cpumask.c | 20 +- + kernel/bpf/dispatcher.c | 7 +- + kernel/bpf/hashtab.c | 12 +- + kernel/bpf/helpers.c | 38 +- + kernel/bpf/inode.c | 324 +++++- + kernel/bpf/log.c | 42 +- + kernel/bpf/map_in_map.c | 17 +- + kernel/bpf/map_in_map.h | 2 +- + kernel/bpf/syscall.c | 294 ++++-- + kernel/bpf/tnum.c | 6 - + kernel/bpf/token.c | 271 +++++ + kernel/bpf/trampoline.c | 101 +- + kernel/bpf/verifier.c | 558 ++++++----- + kernel/trace/bpf_trace.c | 84 +- + lib/test_bpf.c | 2 +- + net/bpf/bpf_dummy_struct_ops.c | 38 +- + net/bpf/test_run.c | 15 +- + net/core/filter.c | 36 +- + net/core/xdp.c | 33 + + net/ipv4/bpf_tcp_ca.c | 71 +- + net/netfilter/nf_bpf_link.c | 2 +- + net/xdp/xsk_buff_pool.c | 12 + + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_policy.c | 2 + + net/xfrm/xfrm_state_bpf.c | 134 +++ + security/security.c | 101 +- + security/selinux/hooks.c | 47 +- + tools/include/uapi/linux/bpf.h | 46 +- + tools/include/uapi/linux/netdev.h | 3 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 37 +- + tools/lib/bpf/bpf.h | 35 +- + tools/lib/bpf/bpf_core_read.h | 32 + + tools/lib/bpf/btf.c | 7 +- + tools/lib/bpf/elf.c | 2 - + tools/lib/bpf/features.c | 478 +++++++++ + tools/lib/bpf/libbpf.c | 584 +++-------- + tools/lib/bpf/libbpf.h | 37 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 36 +- + tools/lib/bpf/libbpf_probes.c | 8 +- + tools/lib/bpf/linker.c | 24 +- + tools/lib/bpf/str_error.h | 3 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 10 + + tools/testing/selftests/bpf/cgroup_helpers.c | 16 + + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/config | 3 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 5 - + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 98 +- + tools/testing/selftests/bpf/prog_tests/cpumask.c | 1 + + tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c | 142 +++ + .../bpf/prog_tests/global_func_dead_code.c | 60 ++ + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 31 +- + .../selftests/bpf/prog_tests/libbpf_probes.c | 4 + + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 8 +- + .../selftests/bpf/prog_tests/local_kptr_stash.c | 23 + + tools/testing/selftests/bpf/prog_tests/map_btf.c | 98 ++ + .../testing/selftests/bpf/prog_tests/map_in_map.c | 141 +++ + tools/testing/selftests/bpf/prog_tests/syscall.c | 30 +- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 162 ++- + tools/testing/selftests/bpf/prog_tests/time_tai.c | 2 +- + tools/testing/selftests/bpf/prog_tests/token.c | 1031 ++++++++++++++++++++ + .../selftests/bpf/prog_tests/uprobe_multi_test.c | 175 +++- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 165 +++- + .../bpf/prog_tests/xdp_context_test_run.c | 4 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 132 ++- + .../selftests/bpf/progs/access_map_in_map.c | 93 ++ + tools/testing/selftests/bpf/progs/bpf_misc.h | 1 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 + + .../selftests/bpf/progs/cgrp_ls_recursion.c | 92 +- + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 61 +- + tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c | 100 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 1 + + .../testing/selftests/bpf/progs/cpumask_success.c | 43 + + .../selftests/bpf/progs/exceptions_assert.c | 2 +- + .../testing/selftests/bpf/progs/exceptions_fail.c | 2 +- + .../bpf/progs/freplace_dead_global_func.c | 11 + + tools/testing/selftests/bpf/progs/iters.c | 2 +- + .../testing/selftests/bpf/progs/local_kptr_stash.c | 53 + + tools/testing/selftests/bpf/progs/map_in_map_btf.c | 73 ++ + tools/testing/selftests/bpf/progs/normal_map_btf.c | 56 ++ + tools/testing/selftests/bpf/progs/priv_map.c | 13 + + tools/testing/selftests/bpf/progs/priv_prog.c | 13 + + tools/testing/selftests/bpf/progs/syscall.c | 96 +- + tools/testing/selftests/bpf/progs/test_fsverity.c | 48 + + tools/testing/selftests/bpf/progs/test_get_xattr.c | 37 + + .../selftests/bpf/progs/test_global_func15.c | 34 +- + .../selftests/bpf/progs/test_global_func16.c | 2 +- + .../selftests/bpf/progs/test_sig_in_xattr.c | 83 ++ + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 138 +-- + .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 8 +- + tools/testing/selftests/bpf/progs/timer_failure.c | 37 +- + .../selftests/bpf/progs/user_ringbuf_fail.c | 2 +- + .../selftests/bpf/progs/verifier_basic_stack.c | 8 +- + .../selftests/bpf/progs/verifier_bitfield_write.c | 100 ++ + .../bpf/progs/verifier_cgroup_inv_retcode.c | 8 +- + .../bpf/progs/verifier_direct_packet_access.c | 2 +- + .../selftests/bpf/progs/verifier_global_subprogs.c | 15 +- + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 7 +- + .../bpf/progs/verifier_netfilter_retcode.c | 2 +- + .../selftests/bpf/progs/verifier_raw_stack.c | 5 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 287 ++++++ + .../selftests/bpf/progs/verifier_stack_ptr.c | 4 +- + .../bpf/progs/verifier_subprog_precision.c | 137 ++- + .../testing/selftests/bpf/progs/verifier_var_off.c | 91 +- + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 42 +- + tools/testing/selftests/bpf/progs/xdp_metadata.c | 36 +- + .../selftests/bpf/progs/xdp_synproxy_kern.c | 4 +- + tools/testing/selftests/bpf/test_loader.c | 7 + + tools/testing/selftests/bpf/test_tunnel.sh | 92 -- + tools/testing/selftests/bpf/testing_helpers.h | 3 + + .../selftests/bpf/verifier/atomic_cmpxchg.c | 11 - + tools/testing/selftests/bpf/verifier/calls.c | 4 +- + tools/testing/selftests/bpf/verifier/precise.c | 38 +- + tools/testing/selftests/bpf/verify_sig_setup.sh | 25 + + tools/testing/selftests/bpf/veristat.c | 2 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 36 +- + tools/testing/selftests/bpf/xdp_metadata.h | 34 +- + tools/testing/selftests/bpf/xskxceiver.c | 25 +- + 177 files changed, 8423 insertions(+), 1814 deletions(-) + create mode 100644 Documentation/bpf/fs_kfuncs.rst + create mode 100644 include/asm-generic/cfi.h + create mode 100644 kernel/bpf/token.c + create mode 100644 net/xfrm/xfrm_state_bpf.c + create mode 100644 tools/lib/bpf/features.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/global_func_dead_code.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_btf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_in_map.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/token.c + create mode 100644 tools/testing/selftests/bpf/progs/access_map_in_map.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_dead_global_func.c + create mode 100644 tools/testing/selftests/bpf/progs/map_in_map_btf.c + create mode 100644 tools/testing/selftests/bpf/progs/normal_map_btf.c + create mode 100644 tools/testing/selftests/bpf/progs/priv_map.c + create mode 100644 tools/testing/selftests/bpf/progs/priv_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/test_fsverity.c + create mode 100644 tools/testing/selftests/bpf/progs/test_get_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sig_in_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bitfield_write.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 (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) +$ 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 (dea290e2e36b Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg) +$ 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/btmtkuart.c | 11 +-- + drivers/bluetooth/btnxpuart.c | 8 +- + drivers/bluetooth/btusb.c | 4 + + drivers/bluetooth/hci_qca.c | 23 +++++ + drivers/bluetooth/hci_vhci.c | 10 +- + include/net/bluetooth/hci_core.h | 35 ++++++- + net/bluetooth/af_bluetooth.c | 7 +- + net/bluetooth/hci_conn.c | 51 ++++++++-- + net/bluetooth/hci_event.c | 41 ++++---- + net/bluetooth/hci_sync.c | 96 ++----------------- + net/bluetooth/iso.c | 197 +++++++++++++++++++++++++++++++++++++-- + net/bluetooth/l2cap_core.c | 21 +++-- + net/bluetooth/lib.c | 69 +++++++++++++- + net/bluetooth/mgmt.c | 42 ++++----- + net/bluetooth/smp.c | 7 ++ + 17 files changed, 448 insertions(+), 183 deletions(-) +Merging wireless-next/for-next (c5a3f56fcdb0 Merge tag 'ath-next-20231215' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging Documentation/driver-api/index.rst +CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/mediatek/mt76/dma.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7925/main.c +Auto-merging include/net/cfg80211.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/driver-ops.h +Auto-merging net/mac80211/mlme.c +Auto-merging net/wireless/core.h +Auto-merging net/wireless/nl80211.c +Resolved 'Documentation/driver-api/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d584bafaccfc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/wbrf.rst | 78 + + drivers/bcma/driver_pci_host.c | 2 +- + drivers/net/wireless/ath/ath10k/bmi.c | 1 + + drivers/net/wireless/ath/ath10k/ce.c | 1 + + drivers/net/wireless/ath/ath10k/core.c | 17 + + drivers/net/wireless/ath/ath10k/core.h | 3 +- + drivers/net/wireless/ath/ath10k/coredump.c | 1 + + drivers/net/wireless/ath/ath10k/coredump.h | 1 + + drivers/net/wireless/ath/ath10k/debug.c | 1 + + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 1 + + drivers/net/wireless/ath/ath10k/htc.c | 1 + + drivers/net/wireless/ath/ath10k/htc.h | 20 +- + drivers/net/wireless/ath/ath10k/htt.h | 1 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 1 + + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +- + drivers/net/wireless/ath/ath10k/hw.c | 1 + + drivers/net/wireless/ath/ath10k/hw.h | 4 + + drivers/net/wireless/ath/ath10k/mac.c | 17 +- + drivers/net/wireless/ath/ath10k/pci.c | 1 + + drivers/net/wireless/ath/ath10k/pci.h | 1 + + drivers/net/wireless/ath/ath10k/qmi.c | 1 + + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 1 + + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 + + drivers/net/wireless/ath/ath10k/rx_desc.h | 1 + + drivers/net/wireless/ath/ath10k/sdio.c | 1 + + drivers/net/wireless/ath/ath10k/thermal.c | 1 + + drivers/net/wireless/ath/ath10k/usb.h | 1 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 1 + + drivers/net/wireless/ath/ath10k/wmi.c | 1 + + drivers/net/wireless/ath/ath10k/wmi.h | 1 + + drivers/net/wireless/ath/ath10k/wow.c | 1 + + drivers/net/wireless/ath/ath11k/Kconfig | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 10 +- + drivers/net/wireless/ath/ath11k/ce.c | 2 +- + drivers/net/wireless/ath/ath11k/ce.h | 1 + + drivers/net/wireless/ath/ath11k/core.h | 1 - + drivers/net/wireless/ath/ath11k/dbring.c | 1 + + drivers/net/wireless/ath/ath11k/dbring.h | 1 + + drivers/net/wireless/ath/ath11k/debug.c | 1 + + drivers/net/wireless/ath/ath11k/debug.h | 2 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 1 + + drivers/net/wireless/ath/ath11k/debugfs.h | 1 + + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 1 + + drivers/net/wireless/ath/ath11k/debugfs_sta.h | 1 + + drivers/net/wireless/ath/ath11k/dp.c | 2 +- + drivers/net/wireless/ath/ath11k/dp.h | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 1 + + drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_tx.h | 1 + + drivers/net/wireless/ath/ath11k/fw.c | 2 +- + drivers/net/wireless/ath/ath11k/hal.c | 2 +- + drivers/net/wireless/ath/ath11k/hal.h | 2 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 1 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 1 + + drivers/net/wireless/ath/ath11k/hal_rx.h | 1 + + drivers/net/wireless/ath/ath11k/hif.h | 1 + + drivers/net/wireless/ath/ath11k/htc.c | 1 + + drivers/net/wireless/ath/ath11k/htc.h | 6 +- + drivers/net/wireless/ath/ath11k/hw.c | 2 +- + drivers/net/wireless/ath/ath11k/hw.h | 2 +- + drivers/net/wireless/ath/ath11k/mac.c | 16 +- + drivers/net/wireless/ath/ath11k/mac.h | 1 + + drivers/net/wireless/ath/ath11k/mhi.c | 2 +- + drivers/net/wireless/ath/ath11k/mhi.h | 1 + + drivers/net/wireless/ath/ath11k/pcic.c | 6 +- + drivers/net/wireless/ath/ath11k/peer.c | 2 +- + drivers/net/wireless/ath/ath11k/peer.h | 2 +- + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/qmi.h | 2 +- + drivers/net/wireless/ath/ath11k/reg.c | 1 + + drivers/net/wireless/ath/ath11k/reg.h | 1 + + drivers/net/wireless/ath/ath11k/rx_desc.h | 1 + + drivers/net/wireless/ath/ath11k/spectral.c | 1 + + drivers/net/wireless/ath/ath11k/spectral.h | 1 + + drivers/net/wireless/ath/ath11k/thermal.c | 1 + + drivers/net/wireless/ath/ath11k/thermal.h | 1 + + drivers/net/wireless/ath/ath11k/trace.h | 1 + + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.h | 63 +- + drivers/net/wireless/ath/ath11k/wow.h | 1 + + drivers/net/wireless/ath/ath12k/Kconfig | 2 +- + drivers/net/wireless/ath/ath12k/core.c | 6 +- + drivers/net/wireless/ath/ath12k/core.h | 5 +- + drivers/net/wireless/ath/ath12k/dbring.c | 2 +- + drivers/net/wireless/ath/ath12k/debug.c | 2 +- + drivers/net/wireless/ath/ath12k/dp.c | 6 +- + drivers/net/wireless/ath/ath12k/dp.h | 13 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 15 +- + drivers/net/wireless/ath/ath12k/dp_mon.h | 4 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 153 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 8 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.c | 6 +- + drivers/net/wireless/ath/ath12k/hal.h | 2 +- + drivers/net/wireless/ath/ath12k/hal_rx.c | 2 +- + drivers/net/wireless/ath/ath12k/hal_rx.h | 3 +- + drivers/net/wireless/ath/ath12k/hif.h | 2 +- + drivers/net/wireless/ath/ath12k/hw.c | 5 +- + drivers/net/wireless/ath/ath12k/hw.h | 2 +- + drivers/net/wireless/ath/ath12k/mac.c | 190 +- + drivers/net/wireless/ath/ath12k/mac.h | 3 +- + drivers/net/wireless/ath/ath12k/mhi.c | 18 +- + drivers/net/wireless/ath/ath12k/pci.c | 174 +- + drivers/net/wireless/ath/ath12k/pci.h | 4 +- + drivers/net/wireless/ath/ath12k/peer.h | 2 +- + drivers/net/wireless/ath/ath12k/qmi.c | 2 +- + drivers/net/wireless/ath/ath12k/qmi.h | 2 +- + drivers/net/wireless/ath/ath12k/reg.c | 21 +- + drivers/net/wireless/ath/ath12k/reg.h | 4 +- + drivers/net/wireless/ath/ath12k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.h | 64 +- + drivers/net/wireless/ath/ath5k/ahb.c | 8 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 3 - + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 2 +- + drivers/net/wireless/ath/ath9k/common-init.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 10 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 36 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 5 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 12 +- + drivers/net/wireless/ath/ath9k/link.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 15 + + drivers/net/wireless/ath/ath9k/pci.c | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 6 +- + drivers/net/wireless/intel/iwlegacy/common.c | 3 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 1 + + .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h | 15 +- + .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 17 +- + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 17 +- + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h | 21 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 11 - + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 4 - + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 16 + + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 13 - + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 47 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 34 +- + drivers/net/wireless/marvell/libertas/Kconfig | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 + + drivers/net/wireless/marvell/mwifiex/fw.h | 1 + + drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + + drivers/net/wireless/marvell/mwifiex/sdio.c | 19 + + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 + + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 + + drivers/net/wireless/mediatek/mt76/dma.c | 266 ++- + drivers/net/wireless/mediatek/mt76/dma.h | 54 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 22 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 60 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 108 + + drivers/net/wireless/mediatek/mt76/mt76.h | 105 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 8 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 7 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 5 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 5 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 29 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 46 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 21 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 118 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 38 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 4 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 6 + + .../net/wireless/mediatek/mt76/mt792x_acpi_sar.c | 53 + + .../net/wireless/mediatek/mt76/mt792x_acpi_sar.h | 2 + + drivers/net/wireless/mediatek/mt76/mt792x_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 400 +++- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 38 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h | 3 + + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 520 ++++- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 219 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 89 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 640 +++++- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 253 ++- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 293 ++- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 160 +- + drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 81 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 182 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 18 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 15 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 3 - + drivers/net/wireless/realtek/rtlwifi/pci.c | 100 +- + drivers/net/wireless/realtek/rtlwifi/pci.h | 24 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 76 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 16 +- + drivers/net/wireless/realtek/rtw88/debug.c | 6 +- + drivers/net/wireless/realtek/rtw88/debug.h | 6 +- + drivers/net/wireless/realtek/rtw88/main.c | 5 + + drivers/net/wireless/realtek/rtw88/sdio.c | 35 +- + drivers/net/wireless/realtek/rtw89/coex.c | 8 + + drivers/net/wireless/realtek/rtw89/core.c | 12 +- + drivers/net/wireless/realtek/rtw89/core.h | 86 +- + drivers/net/wireless/realtek/rtw89/debug.c | 70 +- + drivers/net/wireless/realtek/rtw89/debug.h | 18 +- + drivers/net/wireless/realtek/rtw89/fw.c | 175 +- + drivers/net/wireless/realtek/rtw89/fw.h | 154 +- + drivers/net/wireless/realtek/rtw89/mac.c | 834 +++++--- + drivers/net/wireless/realtek/rtw89/mac.h | 146 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 21 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 765 ++++++- + drivers/net/wireless/realtek/rtw89/pci.c | 22 +- + drivers/net/wireless/realtek/rtw89/pci.h | 4 + + drivers/net/wireless/realtek/rtw89/phy.c | 511 ++++- + drivers/net/wireless/realtek/rtw89/phy.h | 33 +- + drivers/net/wireless/realtek/rtw89/ps.h | 4 + + drivers/net/wireless/realtek/rtw89/reg.h | 2234 +++++++++++++++++++- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 347 +++ + drivers/net/wireless/realtek/rtw89/ser.c | 10 +- + drivers/net/wireless/realtek/rtw89/wow.c | 7 +- + drivers/net/wireless/silabs/wfx/sta.c | 42 +- + drivers/platform/x86/amd/Kconfig | 14 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/wbrf.c | 317 +++ + include/linux/acpi_amd_wbrf.h | 91 + + include/net/cfg80211.h | 99 +- + include/net/mac80211.h | 23 +- + include/uapi/linux/nl80211.h | 136 +- + net/mac80211/Makefile | 2 + + net/mac80211/cfg.c | 4 +- + net/mac80211/chan.c | 13 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.h | 2 +- + net/mac80211/ibss.c | 2 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/main.c | 2 + + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_pathtbl.c | 8 +- + net/mac80211/mlme.c | 25 +- + net/mac80211/rx.c | 4 +- + net/mac80211/scan.c | 4 +- + net/mac80211/sta_info.c | 8 +- + net/mac80211/sta_info.h | 2 +- + net/mac80211/tdls.c | 18 +- + net/mac80211/tx.c | 7 +- + net/mac80211/wbrf.c | 95 + + net/wireless/Makefile | 4 +- + net/wireless/chan.c | 3 +- + net/wireless/core.h | 3 + + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 289 ++- + net/wireless/nl80211.h | 2 +- + net/wireless/rdev-ops.h | 26 +- + net/wireless/scan.c | 108 +- + net/wireless/trace.h | 22 +- + 292 files changed, 10710 insertions(+), 2093 deletions(-) + create mode 100644 Documentation/driver-api/wbrf.rst + create mode 100644 drivers/platform/x86/amd/wbrf.c + create mode 100644 include/linux/acpi_amd_wbrf.h + create mode 100644 net/mac80211/wbrf.c +Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (83fcf26b00d7 ieee802154: Give the user the association list) +$ 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 (a7d84a2e7663 mtd: maps: vmu-flash: Fix the (mtd core) switch to ref counters) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/maps/vmu-flash.c | 2 +- + drivers/mtd/ssfdc.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nand/nand/next (2b8aa4c3e6a5 mtd: rawnand: diskonchip: fix a potential double free in doc_probe) +$ 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 | 408 ++++++++++-------------- + 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/diskonchip.c | 10 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- + drivers/mtd/nand/raw/meson_nand.c | 8 +- + drivers/mtd/nand/raw/nand_base.c | 10 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 2 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 7 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 13 +- + include/linux/mtd/rawnand.h | 13 + + 15 files changed, 225 insertions(+), 260 deletions(-) +Merging spi-nor/spi-nor/next (c692ba6de1c5 mtd: spi-nor: micron-st: Add support for mt25qu01g) +$ 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 | 148 ++++++++++++------- + drivers/mtd/spi-nor/core.h | 22 +-- + drivers/mtd/spi-nor/debugfs.c | 2 +- + drivers/mtd/spi-nor/micron-st.c | 59 +++++++- + drivers/mtd/spi-nor/spansion.c | 4 +- + drivers/mtd/spi-nor/sst.c | 6 +- + drivers/mtd/spi-nor/swp.c | 25 ++-- + 10 files changed, 375 insertions(+), 147 deletions(-) +Merging crypto/master (c480a421a4fa crypto: octeontx2 - Fix cptvf driver cleanup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging Documentation/driver-api/index.rst +CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/dma/idxd/submit.c +Resolved 'Documentation/driver-api/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ef67bea51f59] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-hisi-hpre | 2 +- + Documentation/ABI/testing/debugfs-hisi-sec | 2 +- + Documentation/ABI/testing/debugfs-hisi-zip | 2 +- + .../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 + + Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 824 ++++++++ + Documentation/driver-api/crypto/iaa/index.rst | 20 + + Documentation/driver-api/crypto/index.rst | 20 + + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 9 +- + arch/arm64/crypto/Kconfig | 6 +- + arch/arm64/crypto/sm4-ce-core.S | 158 -- + arch/arm64/crypto/sm4-ce-glue.c | 108 +- + arch/arm64/crypto/sm4-ce.h | 3 - + arch/arm64/crypto/sm4-neon-core.S | 113 - + arch/arm64/crypto/sm4-neon-glue.c | 105 +- + arch/powerpc/crypto/aes-gcm-p10-glue.c | 2 +- + arch/s390/crypto/aes_s390.c | 4 +- + arch/s390/crypto/paes_s390.c | 4 +- + arch/x86/crypto/Kconfig | 8 +- + arch/x86/crypto/sha1_ssse3_glue.c | 7 +- + arch/x86/crypto/sha256_ssse3_glue.c | 7 +- + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 52 - + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 55 - + arch/x86/crypto/sm4-avx.h | 4 - + arch/x86/crypto/sm4_aesni_avx2_glue.c | 26 - + arch/x86/crypto/sm4_aesni_avx_glue.c | 130 -- + crypto/Kconfig | 23 - + crypto/Makefile | 2 - + crypto/af_alg.c | 14 +- + crypto/algapi.c | 1 + + crypto/algif_skcipher.c | 72 +- + crypto/arc4.c | 11 +- + crypto/cbc.c | 6 +- + crypto/cfb.c | 254 --- + crypto/drbg.c | 40 +- + crypto/ecb.c | 10 +- + crypto/lskcipher.c | 42 +- + crypto/ofb.c | 106 - + crypto/rsa.c | 2 + + crypto/shash.c | 6 +- + crypto/skcipher.c | 80 +- + crypto/tcrypt.c | 76 - + crypto/testmgr.c | 74 +- + crypto/testmgr.h | 1148 ---------- + drivers/char/hw_random/atmel-rng.c | 6 +- + drivers/char/hw_random/cctrng.c | 6 +- + drivers/char/hw_random/core.c | 36 +- + drivers/char/hw_random/exynos-trng.c | 6 +- + drivers/char/hw_random/ingenic-rng.c | 8 +- + drivers/char/hw_random/jh7110-trng.c | 2 +- + drivers/char/hw_random/ks-sa-rng.c | 6 +- + drivers/char/hw_random/mxc-rnga.c | 6 +- + drivers/char/hw_random/n2-drv.c | 6 +- + drivers/char/hw_random/npcm-rng.c | 6 +- + drivers/char/hw_random/omap-rng.c | 6 +- + drivers/char/hw_random/stm32-rng.c | 7 +- + drivers/char/hw_random/timeriomem-rng.c | 6 +- + drivers/char/hw_random/virtio-rng.c | 14 +- + drivers/char/hw_random/xgene-rng.c | 6 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 25 +- + drivers/crypto/amcc/crypto4xx_alg.c | 14 - + drivers/crypto/amcc/crypto4xx_core.c | 40 - + drivers/crypto/amcc/crypto4xx_core.h | 4 - + drivers/crypto/aspeed/Kconfig | 4 +- + drivers/crypto/aspeed/aspeed-hace-crypto.c | 230 --- + drivers/crypto/atmel-aes.c | 214 +- + drivers/crypto/atmel-tdes.c | 205 +- + drivers/crypto/bcm/cipher.c | 57 - + drivers/crypto/cavium/cpt/cptvf_algs.c | 24 - + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 19 - + drivers/crypto/ccp/ccp-crypto-aes.c | 18 - + drivers/crypto/ccp/ccp-ops.c | 5 +- + drivers/crypto/ccree/cc_aead.c | 10 +- + drivers/crypto/ccree/cc_cipher.c | 45 +- + drivers/crypto/hifn_795x.c | 126 +- + drivers/crypto/hisilicon/debugfs.c | 54 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 122 +- + drivers/crypto/hisilicon/qm.c | 264 ++- + drivers/crypto/hisilicon/qm_common.h | 4 - + drivers/crypto/hisilicon/sec2/sec.h | 7 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 43 +- + drivers/crypto/hisilicon/sec2/sec_crypto.h | 2 - + drivers/crypto/hisilicon/sec2/sec_main.c | 72 +- + drivers/crypto/hisilicon/sgl.c | 12 +- + drivers/crypto/hisilicon/zip/zip_main.c | 227 +- + drivers/crypto/inside-secure/safexcel.c | 4 - + drivers/crypto/inside-secure/safexcel.h | 4 - + drivers/crypto/inside-secure/safexcel_cipher.c | 171 +- + drivers/crypto/intel/Kconfig | 1 + + drivers/crypto/intel/Makefile | 1 + + drivers/crypto/intel/iaa/Kconfig | 19 + + drivers/crypto/intel/iaa/Makefile | 12 + + drivers/crypto/intel/iaa/iaa_crypto.h | 173 ++ + drivers/crypto/intel/iaa/iaa_crypto_comp_fixed.c | 92 + + drivers/crypto/intel/iaa/iaa_crypto_main.c | 2182 ++++++++++++++++++++ + drivers/crypto/intel/iaa/iaa_crypto_stats.c | 313 +++ + drivers/crypto/intel/iaa/iaa_crypto_stats.h | 53 + + .../intel/qat/qat_common/adf_accel_devices.h | 1 + + drivers/crypto/intel/qat/qat_common/adf_rl.c | 7 +- + drivers/crypto/intel/qat/qat_common/adf_rl.h | 1 + + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 6 +- + .../intel/qat/qat_common/adf_sysfs_ras_counters.c | 7 +- + drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.c | 8 + + drivers/crypto/marvell/cesa/cesa.c | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 23 - + drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 6 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 1 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 6 +- + drivers/crypto/n2_core.c | 36 +- + drivers/crypto/sa2ul.c | 3 +- + drivers/crypto/sahara.c | 184 +- + drivers/crypto/starfive/Kconfig | 2 +- + drivers/crypto/starfive/jh7110-aes.c | 77 +- + drivers/crypto/starfive/jh7110-cryp.c | 20 +- + drivers/crypto/starfive/jh7110-cryp.h | 12 +- + drivers/crypto/starfive/jh7110-rsa.c | 58 +- + drivers/crypto/virtio/virtio_crypto_common.h | 2 + + drivers/crypto/virtio/virtio_crypto_core.c | 23 +- + drivers/dma/idxd/Makefile | 2 +- + drivers/dma/idxd/bus.c | 6 + + drivers/dma/idxd/cdev.c | 6 +- + drivers/dma/idxd/defaults.c | 53 + + drivers/dma/idxd/device.c | 13 +- + drivers/dma/idxd/dma.c | 9 +- + drivers/dma/idxd/idxd.h | 83 +- + drivers/dma/idxd/init.c | 7 + + drivers/dma/idxd/irq.c | 12 +- + drivers/dma/idxd/submit.c | 9 +- + include/crypto/if_alg.h | 5 + + include/crypto/skcipher.h | 117 +- + include/linux/hisi_acc_qm.h | 28 +- + lib/crypto/aesgcm.c | 13 + + 136 files changed, 5118 insertions(+), 4501 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure,safexcel.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt + create mode 100644 Documentation/driver-api/crypto/iaa/iaa-crypto.rst + create mode 100644 Documentation/driver-api/crypto/iaa/index.rst + create mode 100644 Documentation/driver-api/crypto/index.rst + delete mode 100644 crypto/cfb.c + delete mode 100644 crypto/ofb.c + create mode 100644 drivers/crypto/intel/iaa/Kconfig + create mode 100644 drivers/crypto/intel/iaa/Makefile + create mode 100644 drivers/crypto/intel/iaa/iaa_crypto.h + create mode 100644 drivers/crypto/intel/iaa/iaa_crypto_comp_fixed.c + create mode 100644 drivers/crypto/intel/iaa/iaa_crypto_main.c + create mode 100644 drivers/crypto/intel/iaa/iaa_crypto_stats.c + create mode 100644 drivers/crypto/intel/iaa/iaa_crypto_stats.h + create mode 100644 drivers/dma/idxd/defaults.c +Merging drm/drm-next (a0a28956b46e Merge tag 'amd-drm-next-6.8-2023-12-08' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/display/panel/panel-simple.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/ivpu/ivpu_hw_37xx.c +Auto-merging drivers/accel/qaic/mhi_controller.c +Auto-merging drivers/accel/qaic/qaic_data.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/gpu/drm/drm_auth.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging drivers/gpu/drm/i915/display/intel_fb.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.h +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/soc/qcom/pmic_glink_altmode.c +Merge made by the 'ort' strategy. + Documentation/accel/qaic/aic100.rst | 11 +- + Documentation/accel/qaic/qaic.rst | 37 +- + Documentation/core-api/pin_user_pages.rst | 2 + + .../bindings/display/bridge/lontium,lt8912b.yaml | 21 + + .../bindings/display/panel/himax,hx8394.yaml | 3 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/newvision,nv3051d.yaml | 2 +- + .../bindings/display/panel/panel-simple.yaml | 4 + + .../bindings/display/ti/ti,am65x-dss.yaml | 14 + + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../devicetree/bindings/gpu/img,powervr.yaml | 73 + + Documentation/gpu/amdgpu/display/dc-debug.rst | 41 + + .../gpu/amdgpu/display/trace-groups-table.csv | 29 + + Documentation/gpu/drivers.rst | 2 + + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-kms.rst | 8 + + Documentation/gpu/drm-mm.rst | 10 + + Documentation/gpu/drm-vm-bind-locking.rst | 582 ++ + Documentation/gpu/imagination/index.rst | 13 + + Documentation/gpu/imagination/uapi.rst | 171 + + Documentation/gpu/implementation_guidelines.rst | 1 + + Documentation/gpu/rfc/xe.rst | 5 + + Documentation/gpu/todo.rst | 47 +- + MAINTAINERS | 24 +- + drivers/accel/drm_accel.c | 1 + + 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 | 44 +- + drivers/accel/qaic/mhi_controller.h | 2 +- + drivers/accel/qaic/qaic.h | 21 +- + drivers/accel/qaic/qaic_control.c | 7 +- + drivers/accel/qaic/qaic_data.c | 147 +- + drivers/accel/qaic/qaic_drv.c | 98 +- + drivers/accel/qaic/qaic_timesync.c | 395 ++ + drivers/accel/qaic/qaic_timesync.h | 11 + + drivers/auxdisplay/Kconfig | 10 +- + drivers/auxdisplay/cfag12864bfb.c | 10 +- + drivers/auxdisplay/ht16k33.c | 10 +- + drivers/char/agp/Makefile | 6 - + drivers/char/agp/agp.h | 9 - + drivers/char/agp/backend.c | 11 - + drivers/char/agp/compat_ioctl.c | 291 - + drivers/char/agp/compat_ioctl.h | 106 - + drivers/char/agp/frontend.c | 1068 ---- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/dma-fence.c | 3 +- + drivers/dma-buf/sw_sync.c | 82 + + drivers/dma-buf/sync_debug.h | 2 + + drivers/dma-buf/sync_file.c | 19 + + drivers/gpu/drm/Kconfig | 38 +- + drivers/gpu/drm/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 + + 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 | 4 +- + .../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 | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 128 +- + 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_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 61 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 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/amdgpu/aqua_vanjaram.c | 414 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 156 - + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.h | 4 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 48 +- + 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_events.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 146 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 118 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 180 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 9 +- + drivers/gpu/drm/amd/display/Makefile | 3 + + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 14 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 391 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 107 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 56 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 22 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 60 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 215 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 36 + + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 62 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 12 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 26 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 25 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 46 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 80 +- + drivers/gpu/drm/amd/display/dc/dc.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 29 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 74 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 2 + + 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 | 4 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 38 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 23 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 5 +- + 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 | 4 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 4 +- + 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 | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 3 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 60 +- + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 92 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h | 58 +- + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 10 +- + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 1 - + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 12 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 29 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 58 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 19 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 26 +- + .../amd/display/dc/dml2/dml2_translation_helper.c | 4 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 13 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 29 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 4 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 26 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 10 +- + .../drm/amd/display/dc/{ => dsc}/dcn20/dcn20_dsc.c | 0 + .../drm/amd/display/dc/{ => dsc}/dcn20/dcn20_dsc.h | 0 + .../drm/amd/display/dc/{ => dsc}/dcn35/dcn35_dsc.c | 0 + .../drm/amd/display/dc/{ => dsc}/dcn35/dcn35_dsc.h | 0 + .../gpu/drm/amd/display/dc/{inc/hw => dsc}/dsc.h | 0 + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 15 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 19 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 36 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 4 + + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 25 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 64 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/link.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 12 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 145 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 60 +- + .../dc/link/protocols/link_dp_irq_handler.c | 18 +- + .../dc/link/protocols/link_dp_training_dpia.c | 4 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 10 + + .../dc/link/protocols/link_edp_panel_control.c | 30 + + .../dc/link/protocols/link_edp_panel_control.h | 3 + + drivers/gpu/drm/amd/display/dc/optc/Makefile | 108 + + .../amd/display/dc/{ => optc}/dcn10/dcn10_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn10/dcn10_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn20/dcn20_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn20/dcn20_optc.h | 2 +- + .../amd/display/dc/{ => optc}/dcn201/dcn201_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn201/dcn201_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn30/dcn30_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn30/dcn30_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn301/dcn301_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn301/dcn301_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn31/dcn31_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn31/dcn31_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn314/dcn314_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn314/dcn314_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn32/dcn32_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn32/dcn32_optc.h | 0 + .../amd/display/dc/{ => optc}/dcn35/dcn35_optc.c | 0 + .../amd/display/dc/{ => optc}/dcn35/dcn35_optc.h | 0 + 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 | 30 +- + .../dc/{ => resource}/dcn10/dcn10_resource.h | 0 + .../dc/{ => resource}/dcn20/dcn20_resource.c | 40 +- + .../dc/{ => resource}/dcn20/dcn20_resource.h | 1 + + .../dc/{ => resource}/dcn201/dcn201_resource.c | 14 +- + .../dc/{ => resource}/dcn201/dcn201_resource.h | 0 + .../dc/{ => resource}/dcn21/dcn21_resource.c | 9 +- + .../dc/{ => resource}/dcn21/dcn21_resource.h | 0 + .../dc/{ => resource}/dcn30/dcn30_resource.c | 4 +- + .../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 | 6 +- + .../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 | 5 +- + .../dc/{ => resource}/dcn32/dcn32_resource.h | 12 + + .../dc/{ => resource}/dcn321/dcn321_resource.c | 3 +- + .../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 | 169 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 2 +- + .../gpu/drm/amd/display/include/hdcp_msg_types.h | 5 + + .../drm/amd/display/modules/freesync/freesync.c | 6 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/amdgpu_reg_state.h | 153 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 8 + + .../include/asic_reg/smuio/smuio_10_0_2_offset.h | 102 + + .../include/asic_reg/smuio/smuio_10_0_2_sh_mask.h | 184 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 18 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 25 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 40 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 12 + + 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 | 27 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 10 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + 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 | 77 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 36 +- + drivers/gpu/drm/armada/armada_crtc.c | 29 +- + drivers/gpu/drm/armada/armada_drv.c | 5 +- + 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/Kconfig | 17 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 54 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 4 + + drivers/gpu/drm/bridge/aux-bridge.c | 140 + + drivers/gpu/drm/bridge/aux-hpd-bridge.c | 163 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 22 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 3 +- + drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 58 + + drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +- + 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_agpsupport.c | 451 -- + drivers/gpu/drm/drm_atomic.c | 9 + + drivers/gpu/drm/drm_atomic_helper.c | 4 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 14 + + drivers/gpu/drm/drm_atomic_uapi.c | 97 +- + drivers/gpu/drm/drm_auth.c | 8 +- + drivers/gpu/drm/drm_bridge.c | 44 - + drivers/gpu/drm/drm_bridge_connector.c | 6 - + drivers/gpu/drm/drm_bufs.c | 1627 ----- + drivers/gpu/drm/drm_client.c | 12 +- + drivers/gpu/drm/drm_connector.c | 6 + + drivers/gpu/drm/drm_context.c | 513 -- + drivers/gpu/drm/drm_crtc_helper.c | 7 +- + drivers/gpu/drm/drm_crtc_internal.h | 4 +- + drivers/gpu/drm/drm_damage_helper.c | 3 +- + drivers/gpu/drm/drm_debugfs.c | 65 +- + drivers/gpu/drm/drm_dma.c | 178 - + drivers/gpu/drm/drm_drv.c | 27 +- + 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_encoder.c | 4 + + drivers/gpu/drm/drm_file.c | 68 +- + drivers/gpu/drm/drm_flip_work.c | 27 +- + drivers/gpu/drm/drm_format_helper.c | 215 +- + drivers/gpu/drm/drm_framebuffer.c | 77 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 9 + + drivers/gpu/drm/drm_gpuvm.c | 1168 +++- + drivers/gpu/drm/drm_hashtab.c | 203 - + drivers/gpu/drm/drm_internal.h | 23 +- + drivers/gpu/drm/drm_ioc32.c | 613 +- + drivers/gpu/drm/drm_ioctl.c | 94 +- + drivers/gpu/drm/drm_irq.c | 204 - + drivers/gpu/drm/drm_kms_helper_common.c | 32 - + drivers/gpu/drm/drm_legacy.h | 290 - + drivers/gpu/drm/drm_legacy_misc.c | 105 - + drivers/gpu/drm/drm_lock.c | 373 -- + drivers/gpu/drm/drm_memory.c | 138 - + drivers/gpu/drm/drm_mipi_dbi.c | 19 +- + drivers/gpu/drm/drm_mipi_dsi.c | 17 +- + drivers/gpu/drm/drm_mode_object.c | 2 +- + drivers/gpu/drm/drm_pci.c | 204 +- + drivers/gpu/drm/drm_plane.c | 150 +- + drivers/gpu/drm/drm_plane_helper.c | 32 - + drivers/gpu/drm/drm_scatter.c | 220 - + drivers/gpu/drm/drm_syncobj.c | 64 +- + drivers/gpu/drm/drm_vblank.c | 101 - + drivers/gpu/drm/drm_vm.c | 665 --- + 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/exynos/exynos5433_drm_decon.c | 6 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 6 +- + drivers/gpu/drm/exynos/exynos_dp.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 6 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 6 +- + drivers/gpu/drm/gud/gud_pipe.c | 30 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 18 + + drivers/gpu/drm/i915/Makefile | 184 +- + 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 | 10 +- + 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 | 37 +- + drivers/gpu/drm/i915/display/intel_bw.c | 7 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + 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 | 10 + + drivers/gpu/drm/i915/display/intel_cursor.c | 42 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 167 +- + 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 | 569 +- + 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 | 237 +- + .../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 | 3 +- + .../gpu/drm/i915/display/intel_display_driver.c | 7 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 4 +- + .../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 | 22 +- + .../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 | 483 +- + 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 | 662 ++- + 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 | 189 +- + 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 | 372 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.h | 1 - + drivers/gpu/drm/i915/display/intel_fb.c | 166 +- + drivers/gpu/drm/i915/display/intel_fb.h | 2 + + drivers/gpu/drm/i915/display/intel_fb_bo.c | 97 + + drivers/gpu/drm/i915/display/intel_fb_bo.h | 26 + + drivers/gpu/drm/i915/display/intel_fbc.c | 59 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 112 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 115 + + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 21 + + 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 | 6 +- + 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 | 467 +- + drivers/gpu/drm/i915/display/intel_psr.h | 17 +- + 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_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 51 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 29 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 106 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 5 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 31 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 13 +- + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 12 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 21 + + .../drm/i915/gem/selftests/i915_gem_coherency.c | 10 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 14 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 4 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 43 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 13 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_context.c | 14 + + drivers/gpu/drm/i915/gt/intel_context.h | 4 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 7 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 8 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 23 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 23 + + drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 14 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 38 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 26 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 5 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 100 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 7 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 38 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 20 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 67 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 17 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 11 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 5 - + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 115 + + .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.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 | 112 +- + drivers/gpu/drm/i915/i915_driver.c | 14 +- + drivers/gpu/drm/i915/i915_drm_client.c | 108 + + drivers/gpu/drm/i915/i915_drm_client.h | 42 + + drivers/gpu/drm/i915/i915_drv.h | 20 +- + drivers/gpu/drm/i915/i915_gem.c | 2 - + drivers/gpu/drm/i915/i915_gpu_error.c | 199 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 32 +- + drivers/gpu/drm/i915/i915_params.c | 89 - + drivers/gpu/drm/i915/i915_params.h | 22 - + drivers/gpu/drm/i915/i915_pmu.c | 77 +- + drivers/gpu/drm/i915/i915_reg.h | 2 - + drivers/gpu/drm/i915/i915_sysfs.c | 79 +- + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/intel_memory_region.c | 19 + + drivers/gpu/drm/i915/intel_memory_region.h | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 243 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 13 +- + drivers/gpu/drm/i915/intel_wakeref.c | 35 +- + drivers/gpu/drm/i915/intel_wakeref.h | 73 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 18 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 5 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 1 + + drivers/gpu/drm/i915/selftests/i915_syncmap.c | 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 | 110 + + 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 | 721 +++ + drivers/gpu/drm/imagination/pvr_device_info.c | 255 + + 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 | 509 ++ + drivers/gpu/drm/imagination/pvr_fw_info.h | 135 + + drivers/gpu/drm/imagination/pvr_fw_meta.c | 555 ++ + 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 | 471 ++ + 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 | 166 + + drivers/gpu/drm/imagination/pvr_job.c | 786 +++ + drivers/gpu/drm/imagination/pvr_job.h | 161 + + drivers/gpu/drm/imagination/pvr_mmu.c | 2638 +++++++++ + 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 | 1092 ++++ + drivers/gpu/drm/imagination/pvr_vm.h | 66 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 237 + + drivers/gpu/drm/imagination/pvr_vm_mips.h | 22 + + drivers/gpu/drm/imx/dcss/dcss-drv.c | 6 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 9 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 15 +- + 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/loongson/Kconfig | 1 + + drivers/gpu/drm/loongson/lsdc_plane.c | 1 - + 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_gpu.h | 2 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/disp.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 | 15 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 5 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 19 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 68 +- + drivers/gpu/drm/nouveau/nouveau_exec.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_platform.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 207 +- + drivers/gpu/drm/nouveau/nouveau_sched.h | 43 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 384 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 12 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 1 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 4 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 5 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 9 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 14 +- + drivers/gpu/drm/panel/panel-edp.c | 137 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 37 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 180 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 225 + + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 57 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 62 + + drivers/gpu/drm/panfrost/panfrost_device.c | 81 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 23 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_dump.c | 12 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 119 +- + drivers/gpu/drm/panfrost/panfrost_gpu.h | 1 + + drivers/gpu/drm/panfrost/panfrost_job.c | 30 +- + drivers/gpu/drm/panfrost/panfrost_job.h | 1 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 32 +- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 1 + + drivers/gpu/drm/panfrost/panfrost_regs.h | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 14 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 7 - + drivers/gpu/drm/radeon/clearstate_evergreen.h | 8 +- + drivers/gpu/drm/radeon/r100.c | 4 +- + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon_audio.c | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.h | 1 - + drivers/gpu/drm/radeon/si.c | 4 + + drivers/gpu/drm/radeon/sumo_dpm.c | 4 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 4 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.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 | 18 +- + drivers/gpu/drm/scheduler/sched_main.c | 500 +- + drivers/gpu/drm/solomon/ssd130x.c | 38 +- + drivers/gpu/drm/solomon/ssd130x.h | 1 - + 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 | 5 +- + 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_gem_shmem_test.c | 383 ++ + drivers/gpu/drm/tests/drm_mm_test.c | 1904 ------ + drivers/gpu/drm/tidss/tidss_crtc.c | 12 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 138 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 3 + + drivers/gpu/drm/tidss/tidss_drv.c | 16 +- + drivers/gpu/drm/tidss/tidss_irq.c | 54 +- + drivers/gpu/drm/tidss/tidss_kms.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +- + 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 | 17 +- + drivers/gpu/drm/tiny/repaper.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 44 +- + drivers/gpu/drm/tiny/st7586.c | 19 +- + drivers/gpu/drm/ttm/ttm_bo.c | 8 +- + drivers/gpu/drm/ttm/ttm_device.c | 6 +- + drivers/gpu/drm/udl/udl_modeset.c | 19 +- + drivers/gpu/drm/v3d/Makefile | 4 +- + drivers/gpu/drm/v3d/v3d_bo.c | 51 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 170 +- + drivers/gpu/drm/v3d/v3d_drv.c | 50 +- + drivers/gpu/drm/v3d/v3d_drv.h | 165 +- + drivers/gpu/drm/v3d/v3d_gem.c | 779 +-- + drivers/gpu/drm/v3d/v3d_irq.c | 93 +- + drivers/gpu/drm/v3d/v3d_regs.h | 90 +- + drivers/gpu/drm/v3d/v3d_sched.c | 397 +- + drivers/gpu/drm/v3d/v3d_submit.c | 1320 +++++ + drivers/gpu/drm/v3d/v3d_sysfs.c | 69 + + drivers/gpu/drm/v3d/v3d_trace.h | 57 + + 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_drv.h | 5 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 41 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 20 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 1 - + drivers/hid/hid-picolcd_fb.c | 1 + + drivers/media/pci/ivtv/Kconfig | 4 +- + drivers/media/pci/ivtv/ivtvfb.c | 6 +- + drivers/phy/qualcomm/Kconfig | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 44 +- + drivers/soc/qcom/Kconfig | 1 + + drivers/soc/qcom/pmic_glink_altmode.c | 33 +- + drivers/staging/sm750fb/sm750.c | 65 +- + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/mux/nb7vpq904m.c | 44 +- + drivers/usb/typec/tcpm/Kconfig | 1 + + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 41 +- + drivers/video/fbdev/Kconfig | 50 +- + drivers/video/fbdev/acornfb.c | 2 +- + drivers/video/fbdev/amba-clcd.c | 2 + + drivers/video/fbdev/arcfb.c | 114 +- + drivers/video/fbdev/au1100fb.c | 2 + + drivers/video/fbdev/au1200fb.c | 11 +- + drivers/video/fbdev/clps711x-fb.c | 4 +- + drivers/video/fbdev/core/Kconfig | 7 +- + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/cfbcopyarea.c | 3 + + drivers/video/fbdev/core/cfbfillrect.c | 3 + + drivers/video/fbdev/core/cfbimgblt.c | 3 + + drivers/video/fbdev/core/fb_chrdev.c | 68 +- + drivers/video/fbdev/core/fb_defio.c | 2 + + drivers/video/fbdev/core/fb_io_fops.c | 36 + + drivers/video/fbdev/core/fb_sys_fops.c | 6 + + drivers/video/fbdev/core/syscopyarea.c | 3 + + drivers/video/fbdev/core/sysfillrect.c | 3 + + drivers/video/fbdev/core/sysimgblt.c | 3 + + drivers/video/fbdev/cyber2000fb.c | 9 +- + drivers/video/fbdev/ep93xx-fb.c | 2 + + drivers/video/fbdev/gbefb.c | 2 + + drivers/video/fbdev/omap/omapfb_main.c | 2 + + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 + + drivers/video/fbdev/ps3fb.c | 11 +- + drivers/video/fbdev/sa1100fb.c | 2 + + drivers/video/fbdev/sbuslib.c | 5 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 16 +- + drivers/video/fbdev/simplefb.c | 132 +- + drivers/video/fbdev/sm712fb.c | 6 +- + drivers/video/fbdev/smscufx.c | 2 + + drivers/video/fbdev/udlfb.c | 2 + + drivers/video/fbdev/vermilion/vermilion.c | 2 + + drivers/video/fbdev/vfb.c | 10 +- + drivers/video/fbdev/vt8500lcdfb.c | 4 +- + drivers/video/fbdev/wm8505fb.c | 2 + + include/drm/bridge/aux-bridge.h | 37 + + include/drm/display/drm_dp.h | 28 + + include/drm/display/drm_dp_helper.h | 32 + + include/drm/display/drm_dp_mst_helper.h | 16 +- + include/drm/drm_auth.h | 22 - + include/drm/drm_bridge.h | 4 +- + include/drm/drm_color_mgmt.h | 19 +- + include/drm/drm_device.h | 71 +- + include/drm/drm_drv.h | 28 +- + include/drm/drm_edid.h | 153 - + include/drm/drm_eld.h | 164 + + include/drm/drm_encoder.h | 16 +- + include/drm/drm_file.h | 17 +- + include/drm/drm_flip_work.h | 20 +- + include/drm/drm_format_helper.h | 81 +- + include/drm/drm_framebuffer.h | 12 - + include/drm/drm_gem.h | 32 +- + include/drm/drm_gem_atomic_helper.h | 10 + + include/drm/drm_gpuvm.h | 532 +- + include/drm/drm_ioctl.h | 11 - + include/drm/drm_legacy.h | 331 -- + include/drm/drm_mipi_dbi.h | 4 +- + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 10 + + include/drm/drm_plane.h | 24 + + include/drm/drm_plane_helper.h | 2 - + include/drm/drm_print.h | 2 +- + include/drm/gpu_scheduler.h | 56 +- + include/drm/i915_pciids.h | 3 +- + include/linux/dma-buf.h | 11 +- + include/linux/fb.h | 16 +- + include/linux/iosys-map.h | 44 +- + include/linux/sizes.h | 9 + + include/uapi/drm/drm.h | 72 +- + include/uapi/drm/drm_mode.h | 19 + + include/uapi/drm/ivpu_accel.h | 2 +- + include/uapi/drm/pvr_drm.h | 1295 ++++ + include/uapi/drm/qaic_accel.h | 5 +- + include/uapi/drm/v3d_drm.h | 245 +- + include/uapi/drm/virtgpu_drm.h | 2 + + include/uapi/linux/sync_file.h | 22 + + 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 + + 883 files changed, 57998 insertions(+), 19689 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpu/img,powervr.yaml + create mode 100644 Documentation/gpu/amdgpu/display/trace-groups-table.csv + create mode 100644 Documentation/gpu/drm-vm-bind-locking.rst + 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 + delete mode 100644 drivers/char/agp/compat_ioctl.c + delete mode 100644 drivers/char/agp/compat_ioctl.h + delete mode 100644 drivers/char/agp/frontend.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h + 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 + rename drivers/gpu/drm/amd/display/dc/{ => dsc}/dcn20/dcn20_dsc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dsc}/dcn20/dcn20_dsc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dsc}/dcn35/dcn35_dsc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dsc}/dcn35/dcn35_dsc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{inc/hw => dsc}/dsc.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn10/dcn10_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn10/dcn10_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn20/dcn20_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn20/dcn20_optc.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn201/dcn201_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn201/dcn201_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn30/dcn30_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn30/dcn30_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn301/dcn301_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn301/dcn301_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn31/dcn31_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn31/dcn31_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn314/dcn314_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn314/dcn314_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn32/dcn32_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn32/dcn32_optc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn35/dcn35_optc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => optc}/dcn35/dcn35_optc.h (100%) + 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 (98%) + 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 (98%) + 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 (99%) + 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 (99%) + 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%) + create mode 100644 drivers/gpu/drm/amd/include/amdgpu_reg_state.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_10_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_10_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/bridge/aux-bridge.c + create mode 100644 drivers/gpu/drm/bridge/aux-hpd-bridge.c + delete mode 100644 drivers/gpu/drm/drm_agpsupport.c + delete mode 100644 drivers/gpu/drm/drm_bufs.c + delete mode 100644 drivers/gpu/drm/drm_context.c + delete mode 100644 drivers/gpu/drm/drm_dma.c + create mode 100644 drivers/gpu/drm/drm_eld.c + delete mode 100644 drivers/gpu/drm/drm_hashtab.c + delete mode 100644 drivers/gpu/drm/drm_irq.c + delete mode 100644 drivers/gpu/drm/drm_legacy.h + delete mode 100644 drivers/gpu/drm/drm_legacy_misc.c + delete mode 100644 drivers/gpu/drm/drm_lock.c + delete mode 100644 drivers/gpu/drm/drm_memory.c + delete mode 100644 drivers/gpu/drm/drm_scatter.c + delete mode 100644 drivers/gpu/drm/drm_vm.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/i915/display/intel_fb_bo.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fb_bo.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.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/tests/drm_gem_shmem_test.c + create mode 100644 drivers/gpu/drm/v3d/v3d_submit.c + create mode 100644 drivers/gpu/drm/v3d/v3d_sysfs.c + create mode 100644 include/drm/bridge/aux-bridge.h + create mode 100644 include/drm/drm_eld.h + delete mode 100644 include/drm/drm_legacy.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-exynos/for-linux-next (897da484d1c7 drm/exynos: fix accidental on-stack copy of exynos_drm_plane) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml | 6 +++--- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 ++-- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +++--- + 3 files changed, 8 insertions(+), 8 deletions(-) +Merging drm-misc/for-linux-next (8a53e29fe05c drm/imagination: Fix error path in pvr_vm_create_context) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging include/drm/drm_atomic_helper.h +Merge made by the 'ort' strategy. + .../display/panel/fascontek,fs035vg158.yaml | 56 +++ + .../bindings/display/panel/ilitek,ili9805.yaml | 62 +++ + .../display/panel/leadtek,ltk035c5444t.yaml | 8 +- + .../panel/panel-simple-lvds-dual-ports.yaml | 2 + + .../bindings/display/panel/sitronix,st7701.yaml | 1 + + .../bindings/display/rockchip/rockchip-vop2.yaml | 100 +++- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/automated_testing.rst | 7 +- + Documentation/gpu/rfc/xe.rst | 127 +++-- + MAINTAINERS | 13 + + drivers/gpu/drm/bridge/aux-hpd-bridge.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 16 +- + drivers/gpu/drm/ci/arm64.config | 1 + + drivers/gpu/drm/ci/build.sh | 16 +- + drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- + drivers/gpu/drm/ci/igt_runner.sh | 10 +- + drivers/gpu/drm/ci/test.yml | 13 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 13 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 5 + + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 46 ++ + drivers/gpu/drm/drm_atomic_helper.c | 16 +- + drivers/gpu/drm/drm_debugfs.c | 2 +- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 2 +- + drivers/gpu/drm/imagination/pvr_hwrt.c | 27 +- + drivers/gpu/drm/imagination/pvr_mmu.c | 4 +- + drivers/gpu/drm/imagination/pvr_vm.c | 32 +- + drivers/gpu/drm/imagination/pvr_vm_mips.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-edp.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 405 ++++++++++++++++ + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 515 +++++++++++++++------ + drivers/gpu/drm/panel/panel-simple.c | 34 ++ + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 138 +++++- + drivers/gpu/drm/panel/panel-synaptics-r63353.c | 362 +++++++++++++++ + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 1 - + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 - + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 - + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 18 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 - + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 502 ++++++++++++++++++-- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 100 +++- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - + drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 - + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 223 ++++++++- + drivers/gpu/drm/vc4/vc4_hdmi.c | 12 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 25 +- + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/tcpm/Kconfig | 2 +- + include/drm/bridge/aux-bridge.h | 2 +- + include/drm/drm_atomic_helper.h | 5 +- + include/drm/drm_modeset_helper_vtables.h | 6 +- + include/dt-bindings/soc/rockchip,vop2.h | 4 + + include/uapi/drm/drm_fourcc.h | 10 +- + include/uapi/drm/drm_mode.h | 18 +- + 58 files changed, 2599 insertions(+), 418 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/fascontek,fs035vg158.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9805.yaml + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9805.c + create mode 100644 drivers/gpu/drm/panel/panel-synaptics-r63353.c +Merging amdgpu/drm-next (669080888691 drm/amd/display: Revert " drm/amd/display: Use channel_width = 2 for vram table 3.0") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging include/uapi/drm/drm_mode.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 93 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 31 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 93 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 249 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 58 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 15 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 18 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 46 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 108 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 818 +++++++++++++++++++-- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 ++ + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 232 +++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 1 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 10 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 14 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c | 3 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 2 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3 + + .../dc/dml/dcn32/display_mode_vba_util_32.c | 33 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 1 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 7 - + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 20 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 138 ++-- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 6 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +- + .../display/dc/link/protocols/link_dp_capability.c | 14 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 2 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 21 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 15 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 12 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 10 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +- + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 52 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 208 ++++++ + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 42 ++ + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 3 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 3 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 5 - + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h | 5 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_7_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 8 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 - + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 89 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 47 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 15 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 20 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 + + drivers/gpu/drm/arm/malidp_crtc.c | 2 +- + drivers/gpu/drm/drm_atomic.c | 1 + + drivers/gpu/drm/drm_atomic_state_helper.c | 1 + + drivers/gpu/drm/drm_atomic_uapi.c | 52 +- + drivers/gpu/drm/drm_property.c | 59 ++ + drivers/gpu/drm/radeon/atombios_encoders.c | 1 + + drivers/gpu/drm/radeon/dce3_1_afmt.c | 1 + + drivers/gpu/drm/radeon/dce6_afmt.c | 1 + + drivers/gpu/drm/radeon/evergreen.c | 1 + + drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 + + drivers/gpu/drm/radeon/radeon_atombios.c | 1 + + drivers/gpu/drm/radeon/radeon_audio.c | 1 + + drivers/gpu/drm/radeon/radeon_audio.h | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 1 + + drivers/gpu/drm/radeon/radeon_encoders.c | 1 + + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 8 +- + include/drm/drm_mode_object.h | 2 +- + include/drm/drm_plane.h | 7 + + include/drm/drm_property.h | 6 + + include/uapi/drm/drm_mode.h | 8 + + 112 files changed, 2623 insertions(+), 411 deletions(-) +Merging drm-intel/for-linux-next (716c3cf21784 drm/i915/display: Remove dead code around intel_atomic_helper->free_list) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_core.h +Auto-merging drivers/gpu/drm/i915/display/intel_fb.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 111 ++++++++++------ + drivers/gpu/drm/i915/display/intel_crtc.c | 9 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 82 +++++------- + drivers/gpu/drm/i915/display/intel_ddi.c | 48 +++++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 33 ++--- + drivers/gpu/drm/i915/display/intel_display_core.h | 6 - + .../gpu/drm/i915/display/intel_display_device.h | 2 +- + .../gpu/drm/i915/display/intel_display_driver.c | 7 - + drivers/gpu/drm/i915/display/intel_display_irq.c | 15 +-- + drivers/gpu/drm/i915/display/intel_display_types.h | 6 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 147 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/display/intel_fb.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 6 +- + drivers/gpu/drm/i915/display/intel_tc.c | 25 ++-- + drivers/gpu/drm/i915/display/intel_tv.c | 6 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 21 +-- + 21 files changed, 269 insertions(+), 268 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 (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/ci/build.sh +Auto-merging drivers/gpu/drm/drm_gpuvm.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 2 + + .../bindings/display/msm/dsi-controller-main.yaml | 3 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 1 + + .../bindings/display/msm/mdss-common.yaml | 18 +- + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 21 +- + .../bindings/display/msm/qcom,sc7180-mdss.yaml | 14 +- + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 14 +- + .../bindings/display/msm/qcom,sdm670-mdss.yaml | 292 +++++++++++++ + .../bindings/display/msm/qcom,sdm845-dpu.yaml | 4 +- + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 10 + + .../bindings/display/msm/qcom,sm6125-mdss.yaml | 8 +- + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 8 +- + .../bindings/display/msm/qcom,sm6375-mdss.yaml | 8 +- + .../bindings/display/msm/qcom,sm8150-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 10 + + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 13 +- + .../bindings/display/msm/qcom,sm8650-dpu.yaml | 127 ++++++ + .../bindings/display/msm/qcom,sm8650-mdss.yaml | 328 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- + drivers/gpu/drm/ci/build.sh | 3 + + drivers/gpu/drm/drm_exec.c | 13 +- + drivers/gpu/drm/drm_gpuvm.c | 4 +- + drivers/gpu/drm/imagination/pvr_job.c | 2 +- + drivers/gpu/drm/msm/Kconfig | 2 + + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 122 +++--- + drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 + + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 + + .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 457 +++++++++++++++++++++ + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 17 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 17 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 104 +++++ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 17 +- + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 18 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 8 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 32 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 17 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 7 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 11 +- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 7 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 51 ++- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 16 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 25 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 51 ++- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 33 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 29 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 186 ++++----- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 21 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 75 ++-- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 55 +-- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 130 +++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 207 ++++++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 72 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 247 +++++++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 142 +++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 52 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 28 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 16 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 10 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 37 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 37 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 70 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 79 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 105 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 141 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 13 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 42 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 32 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 37 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 87 +--- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 24 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 30 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 21 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 29 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 25 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 19 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h | 1 - + drivers/gpu/drm/msm/dp/dp_aux.c | 39 +- + drivers/gpu/drm/msm/dp/dp_debug.c | 69 +--- + drivers/gpu/drm/msm/dp/dp_debug.h | 23 +- + drivers/gpu/drm/msm/dp/dp_display.c | 369 +++++++---------- + drivers/gpu/drm/msm/dp/dp_display.h | 4 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 30 +- + drivers/gpu/drm/msm/dp/dp_power.c | 32 +- + drivers/gpu/drm/msm/dp/dp_power.h | 11 - + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 17 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 10 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 27 ++ + drivers/gpu/drm/msm/msm_debugfs.c | 41 +- + drivers/gpu/drm/msm/msm_drv.c | 94 ++++- + drivers/gpu/drm/msm/msm_drv.h | 15 +- + drivers/gpu/drm/msm/msm_gem.c | 7 +- + drivers/gpu/drm/msm/msm_gem.h | 17 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 233 ++++------- + drivers/gpu/drm/msm/msm_gpu.c | 44 +- + drivers/gpu/drm/msm/msm_mdss.c | 106 +++-- + drivers/gpu/drm/msm/msm_mdss.h | 1 + + drivers/gpu/drm/msm/msm_rd.c | 3 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- + drivers/gpu/drm/tests/drm_exec_test.c | 16 +- + include/drm/drm_exec.h | 2 +- + include/uapi/drm/msm_drm.h | 3 + + 143 files changed, 3621 insertions(+), 2013 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sdm670-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8650-mdss.yaml + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h +$ git am -3 ../patches/0001-fix-up-for-drm-exec-Pass-in-initial-of-objects.patch +Applying: fix up for "drm/exec: Pass in initial # of objects" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c +$ git add -A . +$ git commit -v -a --amend +[master 897f59037052] Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git + Date: Tue Dec 19 11:19:20 2023 +1100 +Merging drm-msm-lumag/msm-next-lumag (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) +$ 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 (13366c25125e fbdev: amba-clcd: Delete the old CLCD driver) +$ 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 MAINTAINERS +Auto-merging drivers/video/fbdev/Kconfig +CONFLICT (modify/delete): drivers/video/fbdev/amba-clcd.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/amba-clcd.c left in tree. +CONFLICT (modify/delete): drivers/video/fbdev/vermilion/vermilion.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/vermilion/vermilion.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/amba-clcd.c drivers/video/fbdev/vermilion/vermilion.c +rm 'drivers/video/fbdev/amba-clcd.c' +rm 'drivers/video/fbdev/vermilion/vermilion.c' +$ git commit --no-edit -v -a +[master eda1ed53517a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 5 - + drivers/video/backlight/Kconfig | 7 - + drivers/video/backlight/Makefile | 1 - + drivers/video/backlight/cr_bllcd.c | 264 ------- + drivers/video/fbdev/Kconfig | 33 - + drivers/video/fbdev/Makefile | 2 - + drivers/video/fbdev/amba-clcd.c | 986 ------------------------ + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/hgafb.c | 13 +- + drivers/video/fbdev/imxfb.c | 179 +++-- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 2 +- + drivers/video/fbdev/vermilion/Makefile | 6 - + drivers/video/fbdev/vermilion/cr_pll.c | 195 ----- + drivers/video/fbdev/vermilion/vermilion.c | 1175 ----------------------------- + drivers/video/fbdev/vermilion/vermilion.h | 245 ------ + include/linux/amba/clcd-regs.h | 87 --- + include/linux/amba/clcd.h | 290 ------- + 17 files changed, 115 insertions(+), 3377 deletions(-) + delete mode 100644 drivers/video/backlight/cr_bllcd.c + delete mode 100644 drivers/video/fbdev/amba-clcd.c + delete mode 100644 drivers/video/fbdev/vermilion/Makefile + delete mode 100644 drivers/video/fbdev/vermilion/cr_pll.c + delete mode 100644 drivers/video/fbdev/vermilion/vermilion.c + delete mode 100644 drivers/video/fbdev/vermilion/vermilion.h + delete mode 100644 include/linux/amba/clcd-regs.h + delete mode 100644 include/linux/amba/clcd.h +Merging regmap/for-next (a2d43f711790 Merge remote-tracking branch 'regmap/for-6.8' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/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 (c7e37b07cc75 ALSA: au88x0: fixed a typo) +$ 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 include/linux/pci_ids.h +Auto-merging sound/core/pcm.c +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/patch_hdmi.c +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/linux/pci_ids.h | 1 + + 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/hda/intel-dsp-config.c | 10 +++ + sound/isa/wavefront/wavefront_fx.c | 6 +- + sound/pci/au88x0/au88x0.c | 2 +- + sound/pci/au88x0/au88x0_core.c | 10 +-- + sound/pci/hda/hda_codec.c | 2 + + sound/pci/hda/hda_controller.c | 10 +-- + sound/pci/hda/hda_intel.c | 2 + + 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 ++--- + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/mtl.c | 28 +++++++ + sound/soc/sof/intel/pci-mtl.c | 33 +++++++- + tools/include/uapi/sound/asound.h | 7 +- + 37 files changed, 444 insertions(+), 132 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 (86237bd324c2 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 +Auto-merging sound/soc/sof/intel/mtl.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,max98363.yaml | 2 +- + .../bindings/sound/audio-graph-port.yaml | 6 + + 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/fsl,xcvr.yaml | 22 +- + .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 9 + + .../bindings/sound/qcom,lpass-rx-macro.yaml | 23 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 25 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 23 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 23 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 5 + + .../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 - + arch/arm/mach-ep93xx/edb93xx.c | 32 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 12 +- + arch/arm/mach-s3c/mach-crag6410-module.c | 60 ++- + arch/arm/mach-s3c/mach-crag6410.c | 24 +- + drivers/soundwire/qcom.c | 33 +- + include/sound/cs4271.h | 1 - + include/sound/rt5682s.h | 8 + + include/sound/simple_card_utils.h | 3 + + include/sound/soc.h | 56 ++- + include/sound/sof.h | 15 + + include/sound/sof/dai-imx.h | 7 + + include/sound/sof/dai.h | 2 + + include/sound/sof/ipc4/header.h | 35 ++ + include/sound/sof/topology.h | 61 +-- + include/sound/wm0010.h | 6 - + include/sound/wm1250-ev1.h | 24 -- + include/sound/wm2200.h | 2 - + include/sound/wm5100.h | 4 - + include/sound/wm8996.h | 3 - + include/uapi/sound/sof/tokens.h | 5 + + sound/soc/amd/acp-config.c | 38 +- + sound/soc/amd/acp/Kconfig | 13 + + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp-mach-common.c | 58 ++- + sound/soc/amd/acp/acp-mach.h | 3 + + sound/soc/amd/acp/acp-renoir.c | 37 ++ + sound/soc/amd/acp/acp-sof-mach.c | 4 +- + sound/soc/amd/acp/acp63.c | 22 +- + sound/soc/amd/acp/acp70.c | 28 +- + sound/soc/amd/vangogh/pci-acp5x.c | 5 +- + sound/soc/cirrus/edb93xx.c | 1 - + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + 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/cs35l32.c | 1 - + sound/soc/codecs/cs35l33.c | 4 +- + sound/soc/codecs/cs35l34.c | 4 +- + sound/soc/codecs/cs35l35.c | 2 - + sound/soc/codecs/cs35l36.c | 3 +- + sound/soc/codecs/cs4271.c | 39 +- + sound/soc/codecs/cs42l42.c | 1 - + sound/soc/codecs/cs42l42.h | 2 +- + sound/soc/codecs/cs42l43-jack.c | 4 +- + sound/soc/codecs/cs42l43.c | 92 ++++- + sound/soc/codecs/cs42l43.h | 9 + + sound/soc/codecs/cs43130.c | 320 +++++++++------ + sound/soc/codecs/cs43130.h | 3 + + sound/soc/codecs/cs4349.c | 1 - + sound/soc/codecs/es8326.c | 229 ++++++----- + sound/soc/codecs/es83xx-dsm-common.c | 89 ++++ + sound/soc/codecs/es83xx-dsm-common.h | 393 ++++++++++++++++++ + 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/codecs/rt722-sdca-sdw.c | 3 + + sound/soc/codecs/tas2781-fmwlib.c | 1 + + sound/soc/codecs/wm0010.c | 44 +- + sound/soc/codecs/wm1250-ev1.c | 115 ++---- + sound/soc/codecs/wm2200.c | 67 ++- + sound/soc/codecs/wm5100.c | 107 ++--- + sound/soc/codecs/wm8996.c | 58 ++- + sound/soc/codecs/wsa884x.c | 7 +- + sound/soc/fsl/Kconfig | 14 +- + sound/soc/fsl/Makefile | 4 - + sound/soc/fsl/fsl_mqs.c | 2 - + 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 | 295 +++++++++++--- + sound/soc/generic/simple-card-utils.c | 19 + + 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 | 2 + + sound/soc/intel/boards/Makefile | 3 +- + sound/soc/intel/boards/bytcht_es8316.c | 71 +++- + sound/soc/intel/boards/bytcr_rt5640.c | 31 +- + 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 | 272 +++---------- + 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_cs_amp.c | 30 +- + sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 97 +++++ + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 15 +- + 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-adl-match.c | 8 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 14 +- + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 71 ++++ + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 86 ++++ + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 78 ++++ + sound/soc/mediatek/mt7986/mt7986-wm8960.c | 2 +- + sound/soc/qcom/Kconfig | 12 + + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/apq8096.c | 2 +- + sound/soc/qcom/common.c | 2 +- + sound/soc/qcom/lpass-apq8016.c | 2 +- + sound/soc/qcom/lpass-cpu.c | 2 +- + sound/soc/qcom/lpass-hdmi.c | 2 +- + sound/soc/qcom/lpass-ipq806x.c | 2 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/lpass-sc7180.c | 2 +- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/qcom/qdsp6/audioreach.c | 55 +-- + sound/soc/qcom/qdsp6/audioreach.h | 2 - + sound/soc/qcom/qdsp6/q6afe.c | 8 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 4 +- + sound/soc/qcom/qdsp6/q6asm.h | 20 +- + sound/soc/qcom/qdsp6/topology.c | 3 +- + sound/soc/qcom/sc7180.c | 2 +- + sound/soc/qcom/sc8280xp.c | 23 +- + sound/soc/qcom/sdm845.c | 2 +- + sound/soc/qcom/sdw.c | 47 ++- + sound/soc/qcom/sdw.h | 1 + + sound/soc/qcom/sm8250.c | 17 +- + sound/soc/qcom/storm.c | 2 +- + sound/soc/qcom/x1e80100.c | 168 ++++++++ + sound/soc/sh/fsi.c | 4 +- + sound/soc/soc-core.c | 103 ++++- + sound/soc/soc-dapm.c | 75 ++-- + sound/soc/soc-pcm.c | 52 +-- + sound/soc/sof/Kconfig | 11 + + sound/soc/sof/Makefile | 3 +- + sound/soc/sof/amd/acp-common.c | 1 - + sound/soc/sof/core.c | 311 ++++++++++++-- + sound/soc/sof/fw-file-profile.c | 322 +++++++++++++++ + sound/soc/sof/imx/imx8m.c | 7 + + sound/soc/sof/intel/apl.c | 2 +- + sound/soc/sof/intel/cnl.c | 2 +- + sound/soc/sof/intel/hda-codec.c | 18 +- + sound/soc/sof/intel/hda-dai.c | 3 + + sound/soc/sof/intel/hda-loader.c | 10 +- + sound/soc/sof/intel/hda.c | 6 +- + sound/soc/sof/intel/icl.c | 2 +- + sound/soc/sof/intel/lnl.c | 8 +- + sound/soc/sof/intel/mtl.c | 23 +- + sound/soc/sof/intel/mtl.h | 3 + + sound/soc/sof/intel/skl.c | 2 +- + sound/soc/sof/intel/tgl.c | 4 +- + sound/soc/sof/ipc3-dtrace.c | 3 +- + sound/soc/sof/ipc3-pcm.c | 11 + + sound/soc/sof/ipc3-topology.c | 48 +++ + sound/soc/sof/ipc4-control.c | 179 ++++++++ + sound/soc/sof/ipc4-loader.c | 3 + + sound/soc/sof/ipc4-priv.h | 4 + + sound/soc/sof/ipc4-topology.c | 32 +- + sound/soc/sof/ipc4.c | 121 ++++-- + 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-acpi-dev.c | 14 +- + sound/soc/sof/sof-audio.c | 120 ------ + sound/soc/sof/sof-audio.h | 1 + + sound/soc/sof/sof-of-dev.c | 13 +- + sound/soc/sof/sof-pci-dev.c | 102 +---- + sound/soc/sof/sof-priv.h | 9 +- + sound/soc/sof/topology.c | 7 +- + sound/soc/sti/sti_uniperif.c | 7 +- + sound/soc/tegra/tegra_pcm.c | 4 +- + 211 files changed, 5518 insertions(+), 2877 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 + delete mode 100644 include/sound/wm1250-ev1.h + mode change 100644 => 100755 sound/soc/codecs/es8326.c + create mode 100644 sound/soc/codecs/es83xx-dsm-common.c + create mode 100644 sound/soc/codecs/es83xx-dsm-common.h + delete mode 100644 sound/soc/fsl/mpc8610_hpcd.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt722_sdca.c + create mode 100644 sound/soc/qcom/x1e80100.c + create mode 100644 sound/soc/sof/fw-file-profile.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 (c67f8a13be4e Input: da9063 - use dev_err_probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/joystick/xpad.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/gpio-keys.yaml | 41 +++- + .../devicetree/bindings/input/gpio-mouse.txt | 32 --- + .../devicetree/bindings/input/gpio-mouse.yaml | 68 ++++++ + .../bindings/input/mediatek,pmic-keys.yaml | 24 +- + .../bindings/input/microchip,cap11xx.yaml | 80 ++++++- + .../bindings/input/sprd,sc27xx-vibrator.yaml | 19 +- + .../bindings/input/touchscreen/samsung,s6sy761.txt | 32 --- + .../input/touchscreen/samsung,s6sy761.yaml | 54 +++++ + drivers/input/input.c | 8 +- + drivers/input/joystick/as5011.c | 24 +- + drivers/input/joystick/pxrc.c | 42 ++-- + drivers/input/joystick/xpad.c | 6 +- + drivers/input/keyboard/cap11xx.c | 255 ++++++++++++++++----- + drivers/input/keyboard/gpio_keys.c | 69 +++++- + drivers/input/keyboard/omap-keypad.c | 19 +- + drivers/input/keyboard/omap4-keypad.c | 15 +- + drivers/input/keyboard/qt1050.c | 2 +- + drivers/input/keyboard/tca6416-keypad.c | 1 - + drivers/input/misc/da9063_onkey.c | 61 ++--- + drivers/input/misc/ims-pcu.c | 10 +- + drivers/input/misc/iqs269a.c | 23 +- + drivers/input/misc/max77693-haptic.c | 14 +- + drivers/input/mouse/cyapa.c | 22 +- + drivers/input/mouse/cyapa_gen3.c | 2 +- + drivers/input/mouse/cyapa_gen5.c | 4 +- + drivers/input/mouse/cyapa_gen6.c | 20 +- + drivers/input/mouse/elan_i2c_core.c | 18 +- + drivers/input/mouse/navpoint.c | 41 ++-- + drivers/input/rmi4/rmi_f01.c | 13 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 21 +- + drivers/input/touchscreen/edt-ft5x06.c | 2 +- + drivers/input/touchscreen/hideep.c | 6 +- + drivers/input/touchscreen/hycon-hy46xx.c | 2 +- + drivers/input/touchscreen/ilitek_ts_i2c.c | 16 +- + drivers/input/touchscreen/iqs5xx.c | 12 +- + drivers/input/touchscreen/iqs7211.c | 12 +- + drivers/input/touchscreen/melfas_mip4.c | 16 +- + drivers/input/touchscreen/usbtouchscreen.c | 4 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 6 +- + drivers/input/vivaldi-fmap.c | 6 +- + include/linux/gpio_keys.h | 2 + + include/linux/input/as5011.h | 1 - + include/linux/input/navpoint.h | 1 - + include/linux/platform_data/keypad-omap.h | 3 - + 44 files changed, 709 insertions(+), 420 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/gpio-mouse.txt + create mode 100644 Documentation/devicetree/bindings/input/gpio-mouse.yaml + 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 (9d1282ca9724 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 MAINTAINERS +Auto-merging drivers/block/ublk_drv.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/io_uring_types.h +Auto-merging io_uring/io_uring.c +Auto-merging io_uring/uring_cmd.c +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + block/bio-integrity.c | 218 ++++++++++++++++++++++++++++++++++++++- + block/bio.c | 53 +++++----- + block/blk-cgroup.c | 3 + + block/blk-mq.c | 3 +- + block/blk-rq-qos.h | 2 +- + block/blk-settings.c | 12 +-- + block/genhd.c | 1 + + block/ioctl.c | 11 +- + drivers/block/rnbd/rnbd-clt.c | 13 ++- + drivers/block/rnbd/rnbd-proto.h | 14 ++- + drivers/block/rnbd/rnbd-srv.c | 44 ++++---- + drivers/block/ublk_drv.c | 2 +- + drivers/md/md-multipath.c | 32 +++--- + drivers/md/md.c | 66 +++++------- + drivers/md/md.h | 5 - + drivers/md/raid1.c | 71 +++++-------- + drivers/md/raid10.c | 222 +++++++++++----------------------------- + drivers/md/raid5-cache.c | 11 +- + drivers/md/raid5-ppl.c | 16 +-- + drivers/md/raid5.c | 203 +++++++++++------------------------- + drivers/md/raid5.h | 4 +- + drivers/nvme/host/ioctl.c | 201 ++++++------------------------------ + include/linux/bio.h | 9 ++ + include/linux/blkdev.h | 119 ++++++++++----------- + include/linux/io_uring.h | 89 +--------------- + include/linux/io_uring/cmd.h | 77 ++++++++++++++ + include/linux/io_uring_types.h | 31 ++++++ + include/uapi/linux/io_uring.h | 9 ++ + io_uring/io_uring.c | 22 ++-- + io_uring/io_uring.h | 10 -- + io_uring/opdef.c | 9 ++ + io_uring/openclose.c | 44 ++++++++ + io_uring/openclose.h | 3 + + io_uring/rw.c | 2 +- + io_uring/uring_cmd.c | 16 +-- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + 38 files changed, 786 insertions(+), 867 deletions(-) + create mode 100644 include/linux/io_uring/cmd.h +Merging device-mapper/for-next (5d6f447b07d5 MAINTAINERS: remove stale info for DEVICE-MAPPER) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/md/md.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 -- + drivers/md/Kconfig | 1 + + drivers/md/dm-integrity.c | 11 ++++++----- + drivers/md/dm-raid.c | 3 +++ + drivers/md/md.c | 11 ++++++++--- + 5 files changed, 18 insertions(+), 10 deletions(-) +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 (72cd89517fa0 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 +- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 9 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 2 +- + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 1 + + drivers/mmc/core/block.c | 46 ++- + drivers/mmc/core/mmc.c | 5 - + drivers/mmc/host/mmci.c | 69 +++- + drivers/mmc/host/mmci.h | 2 + + drivers/mmc/host/mtk-sd.c | 166 +++++++--- + drivers/mmc/host/sdhci-of-dwcmshc.c | 349 +++++++++++++++++++++ + drivers/mmc/host/sdhci-omap.c | 2 +- + 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 - + 17 files changed, 601 insertions(+), 113 deletions(-) +Merging mfd/for-mfd-next (03d790f04fb2 mfd: intel-lpss: Fix the fractional clock divider flags) +$ 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 ------- + .../bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml | 126 ++++++------ + .../devicetree/bindings/mfd/qcom,pm8008.yaml | 6 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + .../devicetree/bindings/mfd/ti,am3359-tscadc.yaml | 2 - + drivers/mfd/ab8500-sysctrl.c | 6 +- + drivers/mfd/cros_ec_dev.c | 5 +- + drivers/mfd/cs42l43-sdw.c | 76 +++---- + drivers/mfd/da9062-core.c | 22 +- + 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 | 33 ++- + drivers/mfd/intel-lpss-pci.c | 27 ++- + drivers/mfd/intel-lpss.c | 52 +++-- + drivers/mfd/intel-lpss.h | 28 +-- + 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/syscon.c | 4 + + drivers/mfd/ti_am335x_tscadc.c | 6 +- + drivers/mfd/tps65086.c | 1 + + drivers/mfd/tps65911-comparator.c | 6 +- + drivers/mfd/tps6594-core.c | 3 + + drivers/mfd/tps6594-spi.c | 2 +- + drivers/mfd/twl4030-audio.c | 6 +- + drivers/mfd/twl6030-irq.c | 10 +- + include/linux/mfd/max77693-private.h | 2 +- + include/linux/mfd/max77843-private.h | 2 +- + include/linux/mfd/si476x-platform.h | 2 +- + include/linux/mfd/tps65910.h | 2 +- + include/soc/qcom/qcom-spmi-pmic.h | 1 + + 42 files changed, 469 insertions(+), 370 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 (7d84a63a39b7 backlight: hx8357: Convert to agnostic GPIO API) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Auto-merging MAINTAINERS +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/video/backlight/Makefile +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/mps,mp3309c.yaml | 10 +- + MAINTAINERS | 7 + + drivers/gpio/gpiolib-of.c | 4 +- + drivers/video/backlight/Kconfig | 11 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/hx8357.c | 74 +--- + drivers/video/backlight/ili922x.c | 8 +- + drivers/video/backlight/mp3309c.c | 444 +++++++++++++++++++++ + drivers/video/backlight/pwm_bl.c | 34 +- + 9 files changed, 515 insertions(+), 78 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 (ad663ce67804 regulator: qcom_smd: Add LDO5 MP5496 regulator) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 + + .../bindings/regulator/fixed-regulator.yaml | 2 + + .../bindings/regulator/qcom,rpmh-regulator.yaml | 14 ++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 + + .../bindings/regulator/qcom,spmi-regulator.yaml | 19 +++ + .../devicetree/bindings/regulator/regulator.yaml | 13 ++ + drivers/regulator/Kconfig | 10 ++ + drivers/regulator/Makefile | 1 + + drivers/regulator/arizona-ldo1.c | 8 +- + drivers/regulator/bd9571mwv-regulator.c | 5 +- + drivers/regulator/core.c | 126 ++++++++++++--- + drivers/regulator/db8500-prcmu.c | 6 +- + drivers/regulator/event.c | 91 +++++++++++ + drivers/regulator/of_regulator.c | 9 ++ + drivers/regulator/palmas-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 177 ++++++++++++++++++--- + drivers/regulator/qcom_smd-regulator.c | 35 ++++ + drivers/regulator/qcom_spmi-regulator.c | 34 ++++ + drivers/regulator/regnl.h | 13 ++ + drivers/regulator/stm32-vrefbuf.c | 6 +- + drivers/regulator/stpmic1_regulator.c | 2 +- + drivers/regulator/uniphier-regulator.c | 6 +- + drivers/regulator/userspace-consumer.c | 6 +- + drivers/regulator/virtual.c | 6 +- + drivers/regulator/wm8350-regulator.c | 6 +- + include/linux/regulator/consumer.h | 47 +----- + include/linux/regulator/machine.h | 18 +++ + include/uapi/regulator/regulator.h | 90 +++++++++++ + 28 files changed, 632 insertions(+), 131 deletions(-) + create mode 100644 drivers/regulator/event.c + create mode 100644 drivers/regulator/regnl.h + create mode 100644 include/uapi/regulator/regulator.h +Merging security/next (ec4e9d630a64 calipso: fix memory leak in netlbl_calipso_add_pass()) +$ 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 +CONFLICT (content): Merge conflict in 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/lsm_hook_defs.h +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +CONFLICT (content): Merge conflict in security/smack/smack_lsm.c +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 +Auto-merging tools/testing/selftests/Makefile +Resolved 'Documentation/userspace-api/index.rst' using previous resolution. +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/linux/security.h' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Resolved 'security/smack/smack_lsm.c' 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 a5e035bf003d] 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 + + net/netlabel/netlabel_calipso.c | 49 ++-- + 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 ++++++ + 65 files changed, 1715 insertions(+), 120 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 3c32853ed8c2] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git + Date: Tue Dec 19 11:56:41 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 (b4af096b5df5 KEYS: encrypted: Add check for strsep) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/Kconfig | 10 +++++----- + security/keys/encrypted-keys/encrypted.c | 4 ++++ + 2 files changed, 9 insertions(+), 5 deletions(-) +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (3c1e09d533db selinux: remove the wrong comment about multithreaded process handling) +$ 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 | 29 ++++- + 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(+), 154 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 (ebf2d4e8e582 tpm: nuvoton: Use i2c_get_match_data()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm_i2c_nuvoton.c | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) +Merging watchdog/master (70ec8691764f dt-bindings: watchdog: qcom,pm8916-wdt: add parent spmi node to example) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 6 +-- + .../bindings/watchdog/alphascale,asm9260-wdt.yaml | 6 +-- + .../devicetree/bindings/watchdog/apple,wdt.yaml | 6 +-- + .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 6 +-- + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 10 ++--- + .../bindings/watchdog/cnxt,cx92755-wdt.yaml | 6 +-- + .../bindings/watchdog/dlg,da9062-watchdog.yaml | 12 ++++-- + .../bindings/watchdog/intel,keembay-wdt.yaml | 5 ++- + .../bindings/watchdog/maxim,max63xx.yaml | 8 ++-- + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 1 + + .../bindings/watchdog/nxp,pnx4008-wdt.yaml | 34 ++++++++++++++++ + .../devicetree/bindings/watchdog/pnx4008-wdt.txt | 17 -------- + .../bindings/watchdog/qca,ar7130-wdt.yaml | 33 ++++++++++++++++ + .../bindings/watchdog/qca-ar7130-wdt.txt | 13 ------- + .../bindings/watchdog/qcom,pm8916-wdt.yaml | 31 ++++++++------- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 +- + .../bindings/watchdog/realtek,rtd119x.txt | 17 -------- + .../watchdog/realtek,rtd1295-watchdog.yaml | 38 ++++++++++++++++++ + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 10 ++--- + .../bindings/watchdog/technologic,ts7200-wdt.yaml | 45 ++++++++++++++++++++++ + MAINTAINERS | 2 +- + drivers/watchdog/at91sam9_wdt.c | 12 +++--- + drivers/watchdog/bcm2835_wdt.c | 3 +- + drivers/watchdog/hpwdt.c | 9 +---- + drivers/watchdog/it87_wdt.c | 29 ++++++++++---- + drivers/watchdog/mlx_wdt.c | 2 +- + drivers/watchdog/mtk_wdt.c | 42 ++++++++++++++++++++ + drivers/watchdog/rti_wdt.c | 13 ++++++- + drivers/watchdog/starfive-wdt.c | 8 ++-- + drivers/watchdog/txx9wdt.c | 11 +++--- + drivers/watchdog/watchdog_dev.c | 3 +- + 31 files changed, 306 insertions(+), 134 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/nxp,pnx4008-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/qca,ar7130-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd1295-watchdog.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/technologic,ts7200-wdt.yaml +Merging iommu/next (4e631678d251 Merge branches 'apple/dart', 'arm/rockchip', 'arm/smmu', '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 arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/traps.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/memory/tegra/tegra186.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging include/linux/device.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging mm/Kconfig +Resolved 'arch/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a5681781ac94] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/apple,dart.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 77 ++++++++- + .../devicetree/bindings/iommu/rockchip,iommu.yaml | 11 +- + arch/Kconfig | 5 + + arch/arc/mm/dma.c | 2 +- + arch/arm/mm/dma-mapping-nommu.c | 2 +- + arch/arm/mm/dma-mapping.c | 10 +- + arch/arm64/mm/dma-mapping.c | 4 +- + arch/mips/mm/dma-noncoherent.c | 2 +- + arch/riscv/mm/dma-noncoherent.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/traps.c | 4 +- + drivers/acpi/scan.c | 32 ++-- + drivers/dma/tegra186-gpc-dma.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c | 9 +- + drivers/hv/hv_common.c | 2 +- + drivers/iommu/Kconfig | 1 + + drivers/iommu/amd/amd_iommu.h | 8 +- + drivers/iommu/amd/amd_iommu_types.h | 6 - + drivers/iommu/amd/init.c | 8 +- + drivers/iommu/amd/io_pgtable.c | 5 +- + drivers/iommu/amd/io_pgtable_v2.c | 10 +- + drivers/iommu/amd/iommu.c | 189 ++++++++++----------- + drivers/iommu/apple-dart.c | 40 ++++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 23 ++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 79 ++++----- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 8 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 166 +++++++++++------- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 - + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 26 ++- + drivers/iommu/dma-iommu.c | 3 + + drivers/iommu/intel/iommu.c | 2 - + drivers/iommu/intel/svm.c | 14 +- + drivers/iommu/io-pgtable-arm.c | 55 ++++-- + drivers/iommu/io-pgtable.c | 23 +++ + drivers/iommu/iommu-sva.c | 101 ++++++----- + drivers/iommu/iommu.c | 154 ++++++++++++----- + 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 | 67 ++++---- + drivers/iommu/omap-iommu.c | 1 - + drivers/iommu/sprd-iommu.c | 8 +- + drivers/iommu/virtio-iommu.c | 36 +++- + drivers/memory/tegra/tegra186.c | 14 +- + drivers/of/device.c | 24 ++- + include/acpi/acpi_bus.h | 2 + + include/linux/device.h | 1 - + include/linux/device/bus.h | 5 - + include/linux/dma-map-ops.h | 5 +- + include/linux/io-pgtable.h | 34 ++++ + include/linux/iommu.h | 47 ++++- + include/linux/mm_types.h | 5 +- + include/linux/of_iommu.h | 13 +- + include/linux/sched.h | 2 +- + kernel/fork.c | 2 +- + mm/Kconfig | 3 + + mm/init-mm.c | 3 - + 59 files changed, 860 insertions(+), 520 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 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 (fbce94a444fb mailbox: qcom-apcs-ipc: re-organize compatibles with fallbacks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Merge made by the 'ort' strategy. + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 62 +++++++++++++++------- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 10 ++-- + 2 files changed, 48 insertions(+), 24 deletions(-) +Merging spi/for-next (0ae0d521bb6f Merge remote-tracking branch 'spi/for-6.8' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/spi-nor/core.c +Auto-merging sound/pci/hda/cs35l56_hda_spi.c +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/snps,dw-apb-ssi.yaml | 2 - + .../devicetree/bindings/spi/st,stm32-spi.yaml | 1 + + Documentation/spi/pxa2xx.rst | 59 ++- + MAINTAINERS | 10 + + drivers/input/rmi4/rmi_spi.c | 2 +- + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/mtd/nand/spi/core.c | 2 +- + drivers/mtd/spi-nor/core.c | 5 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/spi/Kconfig | 3 +- + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-ath79.c | 2 +- + drivers/spi/spi-axi-spi-engine.c | 519 +++++++++++++-------- + drivers/spi/spi-bcm-qspi.c | 2 +- + drivers/spi/spi-cadence-quadspi.c | 4 +- + drivers/spi/spi-cadence-xspi.c | 1 - + drivers/spi/spi-cs42l43.c | 2 +- + drivers/spi/spi-dw-mmio.c | 1 - + drivers/spi/spi-geni-qcom.c | 96 ++-- + drivers/spi/spi-ingenic.c | 15 +- + drivers/spi/spi-intel.c | 10 +- + drivers/spi/spi-ljca.c | 2 +- + drivers/spi/spi-mem.c | 6 +- + drivers/spi/spi-mpc52xx.c | 1 + + drivers/spi/spi-npcm-fiu.c | 2 +- + drivers/spi/spi-pl022.c | 378 +++------------ + drivers/spi/spi-sh-msiof.c | 17 + + drivers/spi/spi-sprd-adi.c | 32 +- + drivers/spi/spi-sprd.c | 4 +- + drivers/spi/spi-st-ssc4.c | 70 +-- + drivers/spi/spi-stm32-qspi.c | 18 +- + drivers/spi/spi-stm32.c | 485 ++++++++++++------- + drivers/spi/spi-sun4i.c | 72 +-- + drivers/spi/spi-sun6i.c | 148 +++--- + drivers/spi/spi-sunplus-sp7021.c | 88 ++-- + drivers/spi/spi-synquacer.c | 82 ++-- + drivers/spi/spi-tegra114.c | 118 ++--- + drivers/spi/spi-tegra20-sflash.c | 74 +-- + drivers/spi/spi-tegra20-slink.c | 96 ++-- + drivers/spi/spi-tegra210-quad.c | 80 ++-- + drivers/spi/spi-ti-qspi.c | 103 ++-- + drivers/spi/spi-topcliff-pch.c | 226 ++++----- + drivers/spi/spi-uniphier.c | 194 ++++---- + drivers/spi/spi-wpcm-fiu.c | 4 +- + drivers/spi/spi-xcomm.c | 32 +- + drivers/spi/spi-xilinx.c | 58 +-- + drivers/spi/spi-xlp.c | 40 +- + drivers/spi/spi-xtensa-xtfpga.c | 30 +- + drivers/spi/spi-zynq-qspi.c | 28 +- + drivers/spi/spi-zynqmp-gqspi.c | 50 +- + drivers/spi/spi.c | 260 +++++++++-- + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + include/linux/spi/spi-mem.h | 2 + + include/linux/spi/spi.h | 65 ++- + sound/pci/hda/cs35l56_hda_spi.c | 2 +- + 58 files changed, 2014 insertions(+), 1698 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 (032ba4d28e4d Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/alternative.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/sched.h +Auto-merging kernel/ptrace.c +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/RAS/ras.rst | 26 + + Documentation/arch/x86/cpuinfo.rst | 85 +- + Documentation/arch/x86/pti.rst | 10 +- + Documentation/arch/x86/tdx.rst | 207 ++- + .../bindings/interrupt-controller/qcom,mpm.yaml | 54 +- + .../interrupt-controller/renesas,rzg2l-irqc.yaml | 5 +- + Documentation/index.rst | 1 + + Documentation/locking/mutex-design.rst | 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 | 21 +- + arch/x86/boot/compressed/ident_map_64.c | 5 + + arch/x86/boot/compressed/idt_64.c | 1 + + arch/x86/boot/compressed/idt_handlers_64.S | 1 + + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/coco/tdx/tdx-shared.c | 6 +- + 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/amd/ibs.c | 3 + + 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/intel/uncore.c | 12 + + arch/x86/events/intel/uncore.h | 10 +- + arch/x86/events/intel/uncore_discovery.c | 5 +- + arch/x86/events/intel/uncore_discovery.h | 2 +- + arch/x86/events/intel/uncore_nhmex.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 208 ++- + arch/x86/events/perf_event.h | 12 + + arch/x86/events/perf_event_flags.h | 2 + + arch/x86/include/asm/alternative.h | 30 +- + 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 | 10 +- + arch/x86/include/asm/current.h | 7 + + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/fpu/sched.h | 10 +- + arch/x86/include/asm/ia32.h | 11 +- + arch/x86/include/asm/io.h | 8 +- + arch/x86/include/asm/mce.h | 4 +- + arch/x86/include/asm/msr-index.h | 8 + + arch/x86/include/asm/mwait.h | 20 +- + arch/x86/include/asm/nospec-branch.h | 23 +- + arch/x86/include/asm/page.h | 6 +- + arch/x86/include/asm/paravirt.h | 79 +- + arch/x86/include/asm/paravirt_types.h | 87 +- + arch/x86/include/asm/percpu.h | 191 ++- + 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/qspinlock_paravirt.h | 4 +- + arch/x86/include/asm/setup.h | 2 - + arch/x86/include/asm/shared/tdx.h | 6 + + arch/x86/include/asm/tdx.h | 38 + + arch/x86/include/asm/text-patching.h | 12 +- + arch/x86/include/asm/uaccess_64.h | 11 +- + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/acpi/wakeup_64.S | 24 +- + arch/x86/kernel/alternative.c | 151 +- + 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 | 49 +- + arch/x86/kernel/cpu/amd.c | 280 ++-- + arch/x86/kernel/cpu/common.c | 10 + + arch/x86/kernel/cpu/hygon.c | 3 + + arch/x86/kernel/cpu/intel_epb.c | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 80 +- + arch/x86/kernel/cpu/mce/core.c | 87 +- + arch/x86/kernel/cpu/mce/inject.c | 1 + + arch/x86/kernel/cpu/mce/intel.c | 326 ++--- + arch/x86/kernel/cpu/mce/internal.h | 66 +- + arch/x86/kernel/cpu/mce/threshold.c | 115 ++ + arch/x86/kernel/cpu/microcode/intel.c | 20 +- + arch/x86/kernel/cpu/mtrr/generic.c | 14 +- + arch/x86/kernel/head_64.S | 51 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/module.c | 20 +- + arch/x86/kernel/paravirt.c | 54 +- + arch/x86/kernel/process_32.c | 7 +- + arch/x86/kernel/process_64.c | 7 +- + arch/x86/kernel/setup.c | 6 +- + arch/x86/kernel/smp.c | 10 +- + arch/x86/kernel/smpboot.c | 1 + + arch/x86/kernel/traps.c | 4 +- + arch/x86/kernel/vmlinux.lds.S | 14 +- + 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/tools/Makefile | 2 +- + arch/x86/tools/chkobjdump.awk | 34 - + arch/x86/tools/objdump_reformat.awk | 4 +- + arch/x86/tools/relocs.c | 2 +- + arch/x86/virt/vmx/tdx/Makefile | 2 +- + arch/x86/virt/vmx/tdx/tdx.c | 1492 ++++++++++++++++++++ + arch/x86/virt/vmx/tdx/tdx.h | 121 ++ + arch/x86/xen/irq.c | 2 +- + arch/x86/xen/xen-asm.S | 10 +- + drivers/edac/mce_amd.c | 526 +------ + drivers/idle/intel_idle.c | 19 +- + drivers/iommu/amd/iommu.c | 4 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/irqchip/irq-qcom-mpm.c | 26 +- + drivers/irqchip/irq-renesas-rzg2l.c | 110 +- + drivers/irqchip/irq-xtensa-pic.c | 31 +- + drivers/pci/controller/pci-hyperv.c | 7 - + include/linux/cleanup.h | 52 +- + include/linux/compiler.h | 2 +- + include/linux/cpuhotplug.h | 14 - + 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/sched/task.h | 2 + + include/linux/spinlock.h | 41 + + include/trace/events/sched.h | 15 +- + include/uapi/linux/perf_event.h | 13 + + kernel/events/core.c | 46 +- + kernel/freezer.c | 1 + + kernel/locking/mutex.c | 5 + + kernel/ptrace.c | 154 +- + 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 | 309 ++-- + 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/arch/x86/include/asm/cpufeatures.h | 2 +- + tools/objtool/check.c | 2 +- + tools/testing/selftests/sgx/Makefile | 14 +- + tools/testing/selftests/sgx/defines.h | 2 + + tools/testing/selftests/sgx/load.c | 9 +- + tools/testing/selftests/sgx/sigstruct.c | 5 +- + tools/testing/selftests/sgx/test_encl.c | 63 +- + tools/testing/selftests/sgx/test_encl.lds | 10 +- + tools/testing/selftests/sgx/test_encl_bootstrap.S | 28 +- + 159 files changed, 5073 insertions(+), 2789 deletions(-) + create mode 100644 Documentation/RAS/ras.rst + delete mode 100644 arch/x86/tools/chkobjdump.awk + create mode 100644 arch/x86/virt/vmx/tdx/tdx.c + create mode 100644 arch/x86/virt/vmx/tdx/tdx.h +Merging clockevents/timers/drivers/next (d25e52a7eb36 clocksource/drivers/cadence-ttc: Fix some kernel-doc warnings) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + .../bindings/timer/thead,c900-aclint-mtimer.yaml | 9 ++++++++- + drivers/clocksource/timer-cadence-ttc.c | 22 ++++++++++++++++------ + drivers/clocksource/timer-riscv.c | 7 +++++++ + drivers/clocksource/timer-ti-dm.c | 4 ++-- + 5 files changed, 34 insertions(+), 9 deletions(-) +Merging edac/edac-for-next (448709b58867 Merge edac-urgent into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.c | 21 ++--- + drivers/edac/amd64_edac.c | 66 ++++++++++---- + drivers/edac/amd64_edac.h | 1 + + 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_mc.c | 1 + + 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/igen6_edac.c | 194 ++++++++++++++++++++++++++++++++++++---- + 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/pnd2_edac.c | 57 ++++++------ + 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 +- + include/linux/edac.h | 3 + + 34 files changed, 328 insertions(+), 183 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 (f1242ec0ad8f doc: Update checklist.rst discussion of callback execution) +$ 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 +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c6daf6e08af] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/checklist.rst | 57 ++- + Documentation/RCU/rcu_dereference.rst | 30 +- + Documentation/RCU/torture.rst | 2 +- + Documentation/RCU/whatisRCU.rst | 19 +- + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 500 +++++++++++---------- + Documentation/memory-barriers.txt | 17 +- + include/linux/rcu_notifier.h | 6 +- + include/linux/rculist.h | 2 +- + include/linux/rcupdate.h | 13 +- + include/linux/srcu.h | 2 +- + kernel/context_tracking.c | 4 + + kernel/locking/locktorture.c | 18 +- + kernel/rcu/Kconfig | 13 + + kernel/rcu/Kconfig.debug | 25 ++ + kernel/rcu/rcu.h | 16 +- + kernel/rcu/rcuscale.c | 6 +- + kernel/rcu/rcutorture.c | 16 +- + kernel/rcu/srcutree.c | 24 +- + kernel/rcu/tasks.h | 4 +- + kernel/rcu/tree.c | 15 +- + kernel/rcu/tree_nocb.h | 26 +- + kernel/rcu/tree_stall.h | 11 +- + kernel/rcu/update.c | 6 + + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 5 +- + .../selftests/rcutorture/configs/rcu/TREE07.boot | 3 + + 26 files changed, 497 insertions(+), 344 deletions(-) +Merging kvm/next (8ed26ab8d591 KVM: clean up directives to compile out irqfds) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/debugfs.c +Auto-merging arch/x86/kvm/x86.c +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/compaction.c +Auto-merging mm/migrate.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging virt/kvm/eventfd.c +Auto-merging virt/kvm/kvm_main.c +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 97e9866eaa6e] 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 | 213 ++++++++- + arch/arm64/include/asm/kvm_host.h | 2 - + arch/arm64/kvm/Kconfig | 4 +- + arch/loongarch/include/asm/kvm_host.h | 1 - + arch/loongarch/kvm/Kconfig | 3 +- + arch/mips/include/asm/kvm_host.h | 2 - + arch/mips/kvm/Kconfig | 3 +- + arch/powerpc/include/asm/kvm_host.h | 2 - + arch/powerpc/kvm/Kconfig | 11 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/kvm/powerpc.c | 9 +- + arch/riscv/include/asm/kvm_host.h | 2 - + arch/riscv/kvm/Kconfig | 4 +- + arch/s390/kvm/Kconfig | 2 - + arch/x86/include/asm/kvm_host.h | 17 +- + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kvm/Kconfig | 16 +- + 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 | 181 ++++--- + include/linux/kvm_types.h | 1 + + include/linux/pagemap.h | 17 + + include/trace/events/kvm.h | 8 +- + include/uapi/linux/kvm.h | 139 ++---- + io_uring/io_uring.c | 3 +- + mm/compaction.c | 43 +- + mm/migrate.c | 2 + + tools/testing/selftests/kvm/Makefile | 4 +- + .../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 | 215 +++++++-- + tools/testing/selftests/kvm/include/test_util.h | 7 +- + tools/testing/selftests/kvm/include/ucall_common.h | 18 +- + .../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 | 226 +++++---- + 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 | 161 ++++++- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 10 +- + .../selftests/kvm/x86_64/mmio_warning_test.c | 121 ----- + .../selftests/kvm/x86_64/monitor_mwait_test.c | 6 +- + .../kvm/x86_64/private_mem_conversions_test.c | 482 +++++++++++++++++++ + .../kvm/x86_64/private_mem_kvm_exits_test.c | 120 +++++ + .../kvm/x86_64/svm_nested_soft_inject_test.c | 4 +- + .../selftests/kvm/x86_64/ucna_injection_test.c | 2 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 8 +- + virt/kvm/Kconfig | 25 +- + virt/kvm/Makefile.kvm | 1 + + virt/kvm/dirty_ring.c | 2 +- + virt/kvm/eventfd.c | 28 +- + virt/kvm/guest_memfd.c | 532 +++++++++++++++++++++ + virt/kvm/kvm_main.c | 516 ++++++++++++++++---- + virt/kvm/kvm_mm.h | 26 + + 62 files changed, 3159 insertions(+), 652 deletions(-) + create mode 100644 tools/testing/selftests/kvm/guest_memfd_test.c + delete mode 100644 tools/testing/selftests/kvm/x86_64/mmio_warning_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 2b767bd8a1f1] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Tue Dec 19 12:49:34 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 ccc5c2734793] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Tue Dec 19 12:49:34 2023 +1100 +Merging kvm-arm/next (53d5486114ae Merge branch kvm-arm64/fgt-rework 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 arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c +Auto-merging arch/arm64/kvm/sys_regs.c +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/esr.h | 15 ++++ + arch/arm64/include/asm/kvm_arm.h | 57 ++++++++----- + arch/arm64/include/asm/kvm_emulate.h | 26 +++--- + arch/arm64/include/asm/kvm_host.h | 1 + + arch/arm64/include/asm/kvm_pgtable.h | 76 ++++++++++++------ + arch/arm64/include/asm/kvm_pkvm.h | 5 +- + arch/arm64/kvm/arm.c | 5 ++ + arch/arm64/kvm/emulate-nested.c | 63 +++++++++++++++ + arch/arm64/kvm/hyp/include/hyp/fault.h | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 93 ++++++++++++++-------- + arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 22 ++++- + 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/pkvm.c | 4 + + arch/arm64/kvm/hyp/nvhe/setup.c | 2 +- + arch/arm64/kvm/hyp/pgtable.c | 90 +++++++++++++-------- + arch/arm64/kvm/mmu.c | 49 ++++++------ + arch/arm64/kvm/reset.c | 9 +-- + arch/arm64/kvm/sys_regs.c | 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 + + 26 files changed, 453 insertions(+), 212 deletions(-) +Merging kvms390/next (26fb87ffa9d9 s390/uvdevice: Report additional-data length for attestation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Merge made by the 'ort' strategy. + drivers/s390/char/uvdevice.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging kvm-ppc/topic/ppc-kvm (180c6b072bf3 KVM: PPC: Book3S HV nestedv2: Do not cancel pending decrementer exception) +$ 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 +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/kvm_book3s.h | 10 +++-- + arch/powerpc/include/asm/kvm_book3s_64.h | 1 + + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 7 +++- + arch/powerpc/kvm/book3s_hv.c | 72 ++++++++++++++++++++++---------- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/kvm/book3s_hv_nestedv2.c | 29 +++++++++++++ + arch/powerpc/kvm/emulate_loadstore.c | 21 +++++----- + 8 files changed, 107 insertions(+), 39 deletions(-) +Merging kvm-riscv/riscv_kvm_next (4ad9843e1ea0 RISCV: KVM: update external interrupt atomically for IMSIC swfile) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Merge made by the 'ort' strategy. + arch/riscv/kvm/aia_imsic.c | 13 +++++++++++++ + tools/testing/selftests/kvm/riscv/get-reg-list.c | 10 ++++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) +Merging kvm-x86/next (f2a3fb7234e5 Merge branches 'fixes', 'generic', 'hyperv', 'lam', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'xen') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/xen.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 6 + + Documentation/virt/kvm/locking.rst | 7 +- + arch/arm64/kvm/arm.c | 1 - + arch/powerpc/kvm/powerpc.c | 1 - + arch/riscv/kvm/vm.c | 1 - + arch/s390/kvm/guestdbg.c | 4 +- + arch/s390/kvm/kvm-s390.c | 1 - + arch/x86/include/asm/kvm-x86-ops.h | 3 + + arch/x86/include/asm/kvm-x86-pmu-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 58 ++- + arch/x86/kvm/Kconfig | 28 +- + arch/x86/kvm/Makefile | 16 +- + arch/x86/kvm/cpuid.c | 33 +- + arch/x86/kvm/cpuid.h | 13 +- + arch/x86/kvm/emulate.c | 27 +- + arch/x86/kvm/governed_features.h | 1 + + arch/x86/kvm/hyperv.h | 87 +++- + arch/x86/kvm/irq.c | 2 + + arch/x86/kvm/irq_comm.c | 9 +- + arch/x86/kvm/kvm_emulate.h | 9 + + arch/x86/kvm/kvm_onhyperv.h | 20 + + arch/x86/kvm/lapic.c | 5 +- + arch/x86/kvm/mmu.h | 8 + + arch/x86/kvm/mmu/mmu.c | 22 +- + arch/x86/kvm/mmu/mmu_internal.h | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 95 ++--- + arch/x86/kvm/mmu/tdp_mmu.h | 3 +- + arch/x86/kvm/pmu.c | 140 +++++-- + arch/x86/kvm/pmu.h | 47 +-- + arch/x86/kvm/reverse_cpuid.h | 33 +- + arch/x86/kvm/svm/hyperv.h | 9 + + arch/x86/kvm/svm/nested.c | 49 +-- + arch/x86/kvm/svm/pmu.c | 17 - + arch/x86/kvm/svm/sev.c | 7 +- + arch/x86/kvm/svm/svm.c | 18 +- + arch/x86/kvm/svm/svm.h | 2 + + arch/x86/kvm/svm/svm_onhyperv.c | 10 +- + arch/x86/kvm/svm/vmenter.S | 10 +- + arch/x86/kvm/vmx/hyperv.c | 447 --------------------- + arch/x86/kvm/vmx/hyperv.h | 238 +++-------- + arch/x86/kvm/vmx/hyperv_evmcs.c | 315 +++++++++++++++ + arch/x86/kvm/vmx/hyperv_evmcs.h | 166 ++++++++ + arch/x86/kvm/vmx/nested.c | 160 +++++--- + arch/x86/kvm/vmx/nested.h | 3 +- + arch/x86/kvm/vmx/pmu_intel.c | 22 - + arch/x86/kvm/vmx/sgx.c | 1 + + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 75 +++- + arch/x86/kvm/vmx/vmx.h | 14 +- + arch/x86/kvm/vmx/vmx_onhyperv.c | 36 ++ + arch/x86/kvm/vmx/vmx_onhyperv.h | 125 ++++++ + arch/x86/kvm/vmx/vmx_ops.h | 2 +- + arch/x86/kvm/x86.c | 142 +++++-- + arch/x86/kvm/x86.h | 2 + + arch/x86/kvm/xen.c | 9 +- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 + + tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 5 +- + .../kvm/x86_64/hyperv_extended_hypercalls.c | 2 + + .../testing/selftests/kvm/x86_64/hyperv_features.c | 2 + + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 2 + + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 1 + + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 + + .../kvm/x86_64/vmx_set_nested_state_test.c | 16 +- + virt/kvm/kvm_main.c | 6 +- + 66 files changed, 1555 insertions(+), 1050 deletions(-) + create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.c + create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.h + create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.c + create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.h +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 +Already up to date. +Merging percpu/for-next (1e653a292c26 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/dennis/percpu.git percpu/for-next +Auto-merging arch/arc/include/asm/cacheflush.h +Auto-merging arch/riscv/Kconfig +Merge made by the 'ort' strategy. + arch/arc/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/cacheflush.h | 2 ++ + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + + arch/csky/abiv2/inc/abi/cacheflush.h | 1 + + arch/m68k/include/asm/cacheflush_mm.h | 1 + + arch/mips/include/asm/cacheflush.h | 2 ++ + arch/nios2/include/asm/cacheflush.h | 1 + + arch/parisc/include/asm/cacheflush.h | 1 + + arch/riscv/Kconfig | 2 ++ + arch/riscv/include/asm/cacheflush.h | 3 ++- + arch/riscv/include/asm/tlbflush.h | 1 + + arch/riscv/mm/kasan_init.c | 8 ++++++++ + arch/riscv/mm/tlbflush.c | 5 +++++ + arch/sh/include/asm/cacheflush.h | 1 + + arch/sparc/include/asm/cacheflush_32.h | 1 + + arch/sparc/include/asm/cacheflush_64.h | 1 + + arch/xtensa/include/asm/cacheflush.h | 6 ++++-- + include/asm-generic/cacheflush.h | 6 ++++++ + mm/percpu.c | 8 +------- + 19 files changed, 42 insertions(+), 10 deletions(-) +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 +Already up to date. +Merging drivers-x86/for-next (ed289b98c2ae Merge tag 'platform-drivers-x86-amd-wbrf-v6.8-1' into review-hans) +$ 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 +Auto-merging drivers/platform/x86/intel_ips.c +Auto-merging drivers/platform/x86/wmi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/wmi.c +Resolved 'drivers/platform/x86/wmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d0a5e6b6f3f4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-platform-silicom | 29 + + drivers/acpi/scan.c | 1 + + drivers/platform/mellanox/mlxbf-tmfifo.c | 2 +- + drivers/platform/x86/Kconfig | 19 +- + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/acer-wmi.c | 377 +++++++- + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-wmi.c | 5 +- + drivers/platform/x86/dell/alienware-wmi.c | 4 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 171 +++- + drivers/platform/x86/hp/hp-wmi.c | 6 +- + drivers/platform/x86/intel/pmc/Kconfig | 1 + + drivers/platform/x86/intel/pmc/adl.c | 2 + + drivers/platform/x86/intel/pmc/cnp.c | 2 + + drivers/platform/x86/intel/pmc/core.c | 175 ++-- + drivers/platform/x86/intel/pmc/core.h | 10 +- + drivers/platform/x86/intel/pmc/core_ssram.c | 265 +++++- + drivers/platform/x86/intel/pmc/icl.c | 10 +- + drivers/platform/x86/intel/pmc/mtl.c | 87 +- + drivers/platform/x86/intel/pmc/spt.c | 10 +- + drivers/platform/x86/intel/pmc/tgl.c | 1 + + drivers/platform/x86/intel/pmt/class.c | 43 +- + drivers/platform/x86/intel/pmt/class.h | 30 +- + drivers/platform/x86/intel/pmt/crashlog.c | 2 +- + drivers/platform/x86/intel/pmt/telemetry.c | 193 +++- + drivers/platform/x86/intel/pmt/telemetry.h | 126 +++ + .../x86/intel/speed_select_if/isst_tpmi_core.c | 25 + + drivers/platform/x86/intel/tpmi.c | 35 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 15 + + drivers/platform/x86/intel/vsec.c | 122 ++- + drivers/platform/x86/intel/vsec.h | 45 +- + drivers/platform/x86/intel/wmi/sbl-fw-update.c | 13 +- + drivers/platform/x86/intel/wmi/thunderbolt.c | 3 +- + drivers/platform/x86/intel_ips.c | 33 - + drivers/platform/x86/silicom-platform.c | 1004 ++++++++++++++++++++ + drivers/platform/x86/wmi.c | 351 +------ + 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/intel_tpmi.h | 18 +- + include/linux/platform_data/x86/clk-lpss.h | 2 +- + include/linux/wmi.h | 18 +- + 42 files changed, 2810 insertions(+), 646 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-silicom + create mode 100644 drivers/platform/x86/intel/pmt/telemetry.h + create mode 100644 drivers/platform/x86/silicom-platform.c +Merging chrome-platform/for-next (57eb6dcd32cf platform/chrome/wilco_ec: 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/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 74 ++++++++++++++++-------- + drivers/platform/chrome/cros_ec_vbc.c | 12 ++-- + drivers/platform/chrome/wilco_ec/event.c | 4 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 6 +- + 4 files changed, 64 insertions(+), 32 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 (40cfa414e7f9 leds: sun50i-a100: Avoid division-by-zero warning) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging drivers/leds/trigger/ledtrig-netdev.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-led-trigger-netdev | 39 ++ + .../ABI/testing/sysfs-class-led-trigger-tty | 56 ++ + .../bindings/leds/allwinner,sun50i-a100-ledc.yaml | 137 +++++ + .../devicetree/bindings/leds/awinic,aw200xx.yaml | 95 +++- + Documentation/devicetree/bindings/leds/common.yaml | 2 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 4 +- + drivers/leds/Kconfig | 35 +- + drivers/leds/Makefile | 2 + + drivers/leds/led-triggers.c | 13 - + drivers/leds/leds-aw200xx.c | 98 +++- + drivers/leds/leds-gpio.c | 2 + + drivers/leds/leds-max5970.c | 109 ++++ + drivers/leds/leds-sun50i-a100.c | 584 +++++++++++++++++++++ + drivers/leds/leds-syscon.c | 3 +- + drivers/leds/leds-tca6507.c | 30 +- + drivers/leds/rgb/leds-qcom-lpg.c | 63 +-- + drivers/leds/trigger/ledtrig-gpio.c | 26 +- + drivers/leds/trigger/ledtrig-netdev.c | 32 +- + drivers/leds/trigger/ledtrig-tty.c | 247 +++++++-- + drivers/tty/tty_io.c | 28 +- + include/linux/leds.h | 20 +- + include/linux/tty.h | 1 + + 22 files changed, 1427 insertions(+), 199 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 (532888a59505 driver core: Better advertise dev_err_probe()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/acpi/property.c +Auto-merging drivers/base/cpu.c +Auto-merging drivers/base/property.c +Auto-merging drivers/base/swnode.c +Auto-merging include/linux/device.h +Auto-merging include/linux/property.h +Auto-merging kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/cpu.h | 1 - + arch/arm64/kernel/setup.c | 13 ++------- + arch/loongarch/Kconfig | 2 ++ + arch/loongarch/kernel/topology.c | 42 ++------------------------- + arch/riscv/Kconfig | 1 + + arch/riscv/kernel/setup.c | 18 ++---------- + arch/x86/Kconfig | 2 ++ + arch/x86/include/asm/cpu.h | 4 --- + arch/x86/kernel/topology.c | 33 ++------------------- + drivers/acpi/Kconfig | 1 - + drivers/acpi/acpi_processor.c | 18 ------------ + drivers/base/arch_topology.c | 38 ++++++++++++++++-------- + drivers/base/core.c | 13 +++++---- + drivers/base/cpu.c | 39 +++++++++++++++++++------ + drivers/base/dd.c | 2 +- + drivers/base/init.c | 2 +- + drivers/base/node.c | 9 ++++-- + drivers/base/soc.c | 4 +-- + drivers/base/swnode.c | 8 +++--- + fs/kernfs/dir.c | 62 ++++++++++++++++++++++++---------------- + fs/sysfs/dir.c | 2 +- + include/linux/cpu.h | 5 ++++ + include/linux/device.h | 1 - + include/linux/property.h | 26 +++++++++++++++++ + kernel/cgroup/cgroup-v1.c | 2 +- + kernel/cgroup/cgroup.c | 35 ++++------------------- + kernel/cgroup/cpuset.c | 2 +- + 28 files changed, 169 insertions(+), 217 deletions(-) +Merging usb/usb-next (e9158c7e5533 usb: typec: tcpm: Parse Accessory Mode information) +$ 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 +Auto-merging arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/usb/fotg210/fotg210-hcd.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/typec/mux/Kconfig +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + .../bindings/connector/usb-connector.yaml | 45 ++ + .../devicetree/bindings/usb/generic-xhci.yaml | 25 +- + .../devicetree/bindings/usb/genesys,gl850g.yaml | 5 + + .../devicetree/bindings/usb/nxp,ptn5110.yaml | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 8 +- + .../bindings/usb/qcom,wcd939x-usbss.yaml | 102 +++ + .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 6 + + Documentation/usb/raw-gadget.rst | 3 - + arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 5 + + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 14 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- + drivers/net/usb/r8152.c | 16 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 2 +- + drivers/tty/tty_io.c | 3 + + drivers/usb/atm/ueagle-atm.c | 16 +- + drivers/usb/cdns3/cdns3-gadget.c | 7 +- + drivers/usb/cdns3/cdns3-plat.c | 16 +- + drivers/usb/cdns3/cdns3-starfive.c | 2 +- + drivers/usb/cdns3/cdnsp-debug.h | 354 +++++----- + drivers/usb/chipidea/core.c | 6 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/class/cdc-acm.c | 3 + + drivers/usb/core/driver.c | 5 +- + drivers/usb/core/generic.c | 16 + + drivers/usb/core/hub.c | 48 +- + drivers/usb/core/quirks.c | 7 + + drivers/usb/dwc3/dwc3-imx8mp.c | 4 +- + drivers/usb/dwc3/dwc3-xilinx.c | 13 +- + drivers/usb/fotg210/fotg210-hcd.c | 12 +- + drivers/usb/fotg210/fotg210-udc.c | 6 +- + drivers/usb/gadget/configfs.c | 13 +- + drivers/usb/gadget/function/f_fs.c | 5 +- + drivers/usb/gadget/function/f_midi.c | 4 +- + drivers/usb/gadget/function/f_tcm.c | 4 +- + drivers/usb/gadget/function/f_uac1.c | 83 ++- + drivers/usb/gadget/function/f_uac2.c | 6 +- + drivers/usb/gadget/function/f_uvc.c | 50 +- + drivers/usb/gadget/function/f_uvc.h | 2 +- + drivers/usb/gadget/function/u_uvc.h | 6 + + drivers/usb/gadget/function/uvc.h | 14 +- + drivers/usb/gadget/function/uvc_configfs.c | 2 +- + 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/legacy/webcam.c | 333 ++++++--- + drivers/usb/gadget/udc/at91_udc.c | 13 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 3 +- + drivers/usb/gadget/udc/cdns2/cdns2-debug.h | 138 ++-- + 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/max3421-hcd.c | 18 +- + drivers/usb/host/xhci-dbgcap.c | 132 ++-- + drivers/usb/host/xhci-dbgcap.h | 1 + + drivers/usb/host/xhci-mem.c | 2 + + drivers/usb/host/xhci-pci.c | 140 ++-- + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 11 +- + drivers/usb/host/xhci.c | 162 +++-- + drivers/usb/host/xhci.h | 13 +- + 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/misc/yurex.c | 12 +- + drivers/usb/mon/mon_stat.c | 6 +- + drivers/usb/mon/mon_text.c | 28 +- + drivers/usb/phy/phy-generic.c | 14 +- + drivers/usb/phy/phy-twl6030-usb.c | 8 +- + drivers/usb/storage/sierra_ms.c | 16 +- + drivers/usb/typec/class.c | 13 +- + drivers/usb/typec/mux/Kconfig | 10 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/wcd939x-usbss.c | 779 +++++++++++++++++++++ + drivers/usb/typec/pd.c | 6 +- + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 20 +- + drivers/usb/typec/tcpm/tcpm.c | 32 +- + drivers/usb/typec/tipd/core.c | 20 + + drivers/usb/usbip/vudc.h | 2 +- + drivers/usb/usbip/vudc_dev.c | 3 +- + drivers/usb/usbip/vudc_main.c | 2 +- + include/linux/usb.h | 6 + + include/linux/usb/hcd.h | 5 +- + include/linux/usb/quirks.h | 3 + + include/linux/usb/tcpci.h | 5 +- + include/linux/usb/tcpm.h | 1 + + include/uapi/linux/usb/functionfs.h | 6 +- + 90 files changed, 2551 insertions(+), 911 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/qcom,wcd939x-usbss.yaml + create mode 100644 drivers/usb/typec/mux/wcd939x-usbss.c +Merging thunderbolt/next (2cd3da4e3745 thunderbolt: Add support for Intel Lunar Lake) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/switch.c +Auto-merging drivers/thunderbolt/tb.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 4 ++++ + drivers/thunderbolt/nhi.h | 2 ++ + drivers/thunderbolt/switch.c | 20 ++-------------- + drivers/thunderbolt/tb.c | 46 ++++++++++++++++++++++-------------- + drivers/thunderbolt/tb.h | 16 +++++++++++++ + drivers/thunderbolt/tmu.c | 2 +- + drivers/thunderbolt/tunnel.c | 46 +++++++++++++++++++++++++----------- + drivers/thunderbolt/xdomain.c | 54 ++++++++++++++++++++++++++++++++++++++++++- + 8 files changed, 139 insertions(+), 51 deletions(-) +Merging usb-serial/usb-next (a39b6ac3781d Linux 6.7-rc5) +$ 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 (43f012df3c1e tty: serial: 8250: Set RS422 interface by default to fix Moxa RS422/RS485 PCIe boards) +$ 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 MAINTAINERS +Auto-merging drivers/bluetooth/btmtkuart.c +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/tty/serial/samsung_tty.c +Auto-merging drivers/tty/tty_io.c +Auto-merging include/linux/tty.h +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/fsl-imx-uart.yaml | 29 ++- + .../bindings/serial/qcom,msm-uartdm.yaml | 13 + + .../devicetree/bindings/serial/renesas,sci.yaml | 2 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + .../devicetree/bindings/serial/sprd-uart.yaml | 1 + + MAINTAINERS | 1 - + arch/alpha/kernel/srmcons.c | 34 ++- + arch/m68k/emu/nfcon.c | 4 +- + arch/powerpc/include/asm/hvconsole.h | 4 +- + arch/powerpc/include/asm/hvsi.h | 18 +- + arch/powerpc/include/asm/opal.h | 8 +- + arch/powerpc/platforms/powernv/opal.c | 14 +- + arch/powerpc/platforms/pseries/hvconsole.c | 4 +- + arch/um/drivers/chan.h | 2 +- + arch/um/drivers/chan_kern.c | 9 +- + arch/um/drivers/chan_user.c | 4 +- + arch/um/drivers/chan_user.h | 9 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/line.h | 6 +- + arch/um/drivers/null.c | 2 +- + arch/xtensa/platforms/iss/console.c | 2 +- + drivers/bluetooth/btmtkuart.c | 4 +- + drivers/bluetooth/btnxpuart.c | 4 +- + drivers/bluetooth/hci_serdev.c | 4 +- + drivers/char/ttyprintk.c | 6 +- + drivers/char/virtio_console.c | 58 +---- + drivers/gnss/serial.c | 4 +- + drivers/gnss/sirf.c | 4 +- + drivers/greybus/gb-beagleplay.c | 5 +- + drivers/iio/chemical/pms7003.c | 6 +- + drivers/iio/chemical/scd30_serial.c | 6 +- + drivers/iio/chemical/sps30_serial.c | 18 +- + drivers/iio/imu/bno055/bno055_ser_core.c | 6 +- + drivers/ipack/devices/ipoctal.c | 14 +- + drivers/isdn/capi/capi.c | 4 +- + drivers/mfd/rave-sp.c | 10 +- + drivers/misc/bcm-vk/bcm_vk_tty.c | 4 +- + drivers/mmc/core/sdio_uart.c | 22 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 5 +- + drivers/net/usb/hso.c | 11 - + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/s3fwrn5/uart.c | 5 +- + drivers/platform/chrome/cros_ec_uart.c | 5 +- + drivers/platform/surface/aggregator/controller.h | 4 +- + drivers/platform/surface/aggregator/core.c | 4 +- + .../platform/surface/aggregator/ssh_packet_layer.c | 4 +- + .../platform/surface/aggregator/ssh_packet_layer.h | 2 +- + drivers/s390/char/con3215.c | 25 +- + drivers/s390/char/con3270.c | 12 +- + drivers/tty/amiserial.c | 16 +- + drivers/tty/ehv_bytechan.c | 18 +- + drivers/tty/goldfish.c | 23 +- + drivers/tty/hvc/hvc_console.c | 7 +- + drivers/tty/hvc/hvc_console.h | 8 +- + drivers/tty/hvc/hvc_dcc.c | 32 ++- + drivers/tty/hvc/hvc_iucv.c | 18 +- + drivers/tty/hvc/hvc_opal.c | 22 +- + drivers/tty/hvc/hvc_riscv_sbi.c | 9 +- + drivers/tty/hvc/hvc_rtas.c | 11 +- + drivers/tty/hvc/hvc_udbg.c | 9 +- + drivers/tty/hvc/hvc_vio.c | 18 +- + drivers/tty/hvc/hvc_xen.c | 23 +- + drivers/tty/hvc/hvsi_lib.c | 20 +- + drivers/tty/ipwireless/main.h | 3 - + drivers/tty/mips_ejtag_fdc.c | 10 +- + drivers/tty/moxa.c | 15 +- + drivers/tty/mxser.c | 8 +- + drivers/tty/n_gsm.c | 17 +- + drivers/tty/n_hdlc.c | 10 +- + drivers/tty/nozomi.c | 27 +- + drivers/tty/serdev/core.c | 31 +-- + drivers/tty/serdev/serdev-ttyport.c | 5 +- + 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_dwlib.c | 22 +- + drivers/tty/serial/8250/8250_em.c | 5 +- + drivers/tty/serial/8250/8250_fsl.c | 8 +- + 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_pci.c | 58 ++++- + 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 | 276 +++++++++++---------- + 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 | 7 +- + drivers/tty/serial/esp32_uart.c | 16 +- + drivers/tty/serial/fsl_linflexuart.c | 6 +- + drivers/tty/serial/fsl_lpuart.c | 5 +- + drivers/tty/serial/imx.c | 27 +- + 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 | 7 +- + 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 | 25 +- + 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 | 221 +++++++++-------- + drivers/tty/serial/sccnxp.c | 13 +- + drivers/tty/serial/serial-tegra.c | 5 +- + drivers/tty/serial/serial_core.c | 11 +- + 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 | 34 ++- + drivers/tty/serial/xilinx_uartps.c | 7 +- + drivers/tty/sysrq.c | 19 +- + drivers/tty/tty_io.c | 18 +- + drivers/tty/tty_ioctl.c | 4 +- + drivers/tty/tty_port.c | 18 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/keyboard.c | 10 +- + include/linux/amba/serial.h | 239 +++++++++--------- + include/linux/serdev.h | 29 ++- + include/linux/tty.h | 19 +- + include/linux/tty_driver.h | 9 +- + include/linux/tty_port.h | 8 +- + include/linux/virtio_console.h | 38 --- + net/bluetooth/rfcomm/tty.c | 2 +- + sound/drivers/serial-generic.c | 4 +- + 165 files changed, 1165 insertions(+), 1280 deletions(-) + delete mode 100644 include/linux/virtio_console.h +Merging char-misc/char-misc-next (08b3485540d9 greybus: gb-beagleplay: Remove use of pad bytes) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging MAINTAINERS +Auto-merging drivers/android/binder.c +Auto-merging drivers/android/binder_alloc.c +CONFLICT (content): Merge conflict in drivers/android/binder_alloc.c +Auto-merging drivers/greybus/gb-beagleplay.c +Auto-merging drivers/of/device.c +Auto-merging drivers/soc/xilinx/xlnx_event_manager.c +Auto-merging drivers/soc/xilinx/zynqmp_power.c +Resolved 'drivers/android/binder_alloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bf9602022c67] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 16 + + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 159 ++ + Documentation/ABI/testing/sysfs-nvmem-cells | 21 + + Documentation/arch/arm64/silicon-errata.rst | 10 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 20 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 1 + + Documentation/trace/coresight/coresight.rst | 4 + + MAINTAINERS | 10 +- + drivers/android/binder.c | 27 +- + drivers/android/binder_alloc.c | 1596 ++++++++++---------- + drivers/android/binder_alloc.h | 61 +- + drivers/android/binder_alloc_selftest.c | 18 +- + drivers/android/binder_trace.h | 2 +- + drivers/cdx/cdx.c | 3 + + drivers/comedi/comedi_fops.c | 4 +- + drivers/firmware/xilinx/zynqmp.c | 389 ++--- + drivers/greybus/gb-beagleplay.c | 58 +- + drivers/hwtracing/coresight/coresight-core.c | 3 + + drivers/hwtracing/coresight/coresight-dummy.c | 5 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 52 +- + 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 | 76 +- + drivers/hwtracing/ptt/hisi_ptt.c | 19 +- + drivers/hwtracing/ptt/hisi_ptt.h | 1 + + drivers/ipack/ipack.c | 4 +- + drivers/mcb/mcb-core.c | 5 +- + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/Makefile | 2 +- + drivers/misc/cardreader/rts5264.c | 886 +++++++++++ + drivers/misc/cardreader/rts5264.h | 278 ++++ + drivers/misc/cardreader/rtsx_pcr.c | 30 +- + drivers/misc/cardreader/rtsx_pcr.h | 1 + + drivers/misc/eeprom/ee1004.c | 94 +- + drivers/misc/mei/Kconfig | 35 +- + drivers/misc/mei/Makefile | 7 + + drivers/misc/mei/gsc_proxy/Kconfig | 2 +- + drivers/misc/mei/hdcp/Kconfig | 2 +- + drivers/misc/mei/platform-vsc.c | 450 ++++++ + drivers/misc/mei/pxp/Kconfig | 3 +- + drivers/misc/mei/vsc-fw-loader.c | 770 ++++++++++ + drivers/misc/mei/vsc-tp.c | 555 +++++++ + drivers/misc/mei/vsc-tp.h | 50 + + drivers/misc/nsm.c | 506 +++++++ + drivers/misc/vmw_vmci/vmci_handle_array.c | 12 +- + drivers/misc/vmw_vmci/vmci_handle_array.h | 6 - + drivers/mmc/host/rtsx_pci_sdmmc.c | 17 +- + drivers/nvmem/Kconfig | 1 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 335 ++-- + drivers/nvmem/imx-ocotp.c | 11 +- + drivers/nvmem/internals.h | 59 + + drivers/nvmem/layouts.c | 201 +++ + drivers/nvmem/layouts/Kconfig | 8 + + drivers/nvmem/layouts/onie-tlv.c | 27 +- + drivers/nvmem/layouts/sl28vpd.c | 27 +- + drivers/nvmem/mtk-efuse.c | 11 +- + drivers/nvmem/stm32-romem.c | 16 + + drivers/of/device.c | 41 + + drivers/of/platform.c | 40 - + drivers/parport/parport_serial.c | 64 + + drivers/parport/share.c | 8 +- + drivers/pcmcia/bcm63xx_pcmcia.c | 5 +- + drivers/pcmcia/db1xxx_ss.c | 6 +- + drivers/pcmcia/electra_cf.c | 6 +- + drivers/pcmcia/omap_cf.c | 5 +- + drivers/pcmcia/pxa2xx_base.c | 6 +- + drivers/pcmcia/sa1100_generic.c | 8 +- + drivers/pcmcia/xxs1500_ss.c | 6 +- + drivers/platform/goldfish/goldfish_pipe.c | 5 +- + drivers/soc/xilinx/xlnx_event_manager.c | 8 +- + drivers/soc/xilinx/zynqmp_power.c | 2 +- + drivers/spmi/Makefile | 2 +- + drivers/spmi/hisi-spmi-controller.c | 32 +- + drivers/spmi/spmi-devres.c | 64 + + drivers/spmi/spmi-mtk-pmif.c | 61 +- + drivers/spmi/spmi-pmic-arb.c | 87 +- + drivers/spmi/spmi.c | 6 +- + drivers/video/console/Kconfig | 2 +- + drivers/virt/vmgenid.c | 2 + + include/linux/coresight.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 37 +- + include/linux/nvmem-consumer.h | 7 - + include/linux/nvmem-provider.h | 64 +- + include/linux/of_device.h | 6 + + include/linux/rtsx_pci.h | 8 + + include/linux/spmi.h | 3 + + include/uapi/linux/android/binder.h | 30 +- + include/uapi/linux/mei.h | 4 +- + include/uapi/linux/nsm.h | 31 + + init/do_mounts.c | 9 +- + tools/testing/nvdimm/test/Kbuild | 1 + + 104 files changed, 7126 insertions(+), 1702 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-nvmem-cells + create mode 100644 drivers/misc/cardreader/rts5264.c + create mode 100644 drivers/misc/cardreader/rts5264.h + create mode 100644 drivers/misc/mei/platform-vsc.c + create mode 100644 drivers/misc/mei/vsc-fw-loader.c + create mode 100644 drivers/misc/mei/vsc-tp.c + create mode 100644 drivers/misc/mei/vsc-tp.h + create mode 100644 drivers/misc/nsm.c + create mode 100644 drivers/nvmem/internals.h + create mode 100644 drivers/nvmem/layouts.c + create mode 100644 drivers/spmi/spmi-devres.c + create mode 100644 include/uapi/linux/nsm.h +Merging accel/habanalabs-next (dfbf6719ccb4 accel/habanalabs/gaudi2: avoid overriding existing undefined opcode data) +$ 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. + .../ABI/testing/debugfs-driver-habanalabs | 72 ++++++------ + Documentation/ABI/testing/sysfs-driver-habanalabs | 12 ++ + drivers/accel/habanalabs/common/device.c | 25 +++-- + drivers/accel/habanalabs/common/firmware_if.c | 123 +++++++-------------- + drivers/accel/habanalabs/common/habanalabs.h | 15 +++ + drivers/accel/habanalabs/common/habanalabs_drv.c | 37 +++++++ + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 54 +++++++++ + 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 | 42 ++++++- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 74 ++++++------- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 13 ++- + .../habanalabs/include/hw_ip/pci/pci_general.h | 1 + + include/linux/habanalabs/cpucp_if.h | 8 +- + include/uapi/drm/habanalabs_accel.h | 28 +++++ + 16 files changed, 333 insertions(+), 183 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 +Already up to date. +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 (da7667aef4cf 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 | 4 + + 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 | 27 + + drivers/interconnect/qcom/Makefile | 6 + + 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/sc8180x.c | 1 + + drivers/interconnect/qcom/sdm660.c | 2 +- + drivers/interconnect/qcom/sm6115.c | 1423 ++++++++++++ + 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 +- + 25 files changed, 5818 insertions(+), 58 deletions(-) + create mode 100644 drivers/interconnect/qcom/sm6115.c + 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 +Merging iio/togreg (2dfef50589ae iio: adc: ad7091r: Align arguments to function call parenthesis) +$ 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 Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/base/property.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/magnetometer/tmag5273.c +Auto-merging include/linux/property.h +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + .mailmap | 7 +- + Documentation/ABI/testing/sysfs-bus-iio | 42 +- + .../bindings/iio/adc/maxim,max34408.yaml | 139 ++ + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 10 +- + .../bindings/iio/adc/qcom,spmi-rradc.yaml | 4 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 9 +- + .../bindings/iio/adc/ti,palmas-gpadc.yaml | 15 - + .../bindings/iio/amplifiers/adi,hmc425a.yaml | 4 + + .../bindings/iio/chemical/aosong,ags02ma.yaml | 47 + + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 5 + + .../bindings/iio/humidity/ti,hdc3020.yaml | 55 + + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 4 + + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 4 + + .../devicetree/bindings/iio/imu/bosch,bmi323.yaml | 77 + + .../bindings/iio/light/liteon,ltr390.yaml | 56 + + .../bindings/iio/light/vishay,veml6075.yaml | 39 + + .../bindings/iio/pressure/honeywell,hsc030pa.yaml | 142 ++ + .../iio/pressure/honeywell,mprls0025pa.yaml | 2 - + .../bindings/iio/temperature/melexis,mlx90632.yaml | 19 +- + .../iio/temperature/microchip,mcp9600.yaml | 70 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 56 +- + drivers/base/property.c | 37 +- + drivers/iio/accel/Kconfig | 7 +- + drivers/iio/accel/bmi088-accel-core.c | 2 + + drivers/iio/accel/bmi088-accel-spi.c | 2 + + drivers/iio/adc/Kconfig | 13 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7091r-base.c | 15 +- + drivers/iio/adc/ad9467.c | 207 +- + drivers/iio/adc/adi-axi-adc.c | 159 +- + drivers/iio/adc/max34408.c | 276 +++ + drivers/iio/adc/mcp3911.c | 64 +- + drivers/iio/amplifiers/hmc425a.c | 23 + + drivers/iio/chemical/Kconfig | 11 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/ags02ma.c | 165 ++ + drivers/iio/dac/ad5791.c | 9 +- + drivers/iio/frequency/adf4377.c | 16 +- + drivers/iio/frequency/admv1014.c | 31 +- + drivers/iio/humidity/hdc3020.c | 473 +++++ + 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/imu/inv_mpu6050/inv_mpu_core.c | 9 +- + drivers/iio/industrialio-buffer.c | 16 + + drivers/iio/industrialio-core.c | 66 + + drivers/iio/light/Kconfig | 37 + + drivers/iio/light/Makefile | 3 + + drivers/iio/light/isl76682.c | 345 ++++ + drivers/iio/light/ltr390.c | 196 ++ + drivers/iio/light/ltrf216a.c | 10 +- + drivers/iio/light/pa12203001.c | 2 +- + drivers/iio/light/rohm-bu27008.c | 201 +- + drivers/iio/light/veml6075.c | 474 +++++ + drivers/iio/magnetometer/tmag5273.c | 10 +- + drivers/iio/pressure/Kconfig | 22 + + drivers/iio/pressure/Makefile | 3 + + 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/pressure/hsc030pa.c | 494 +++++ + drivers/iio/pressure/hsc030pa.h | 74 + + drivers/iio/pressure/hsc030pa_i2c.c | 69 + + drivers/iio/pressure/hsc030pa_spi.c | 61 + + drivers/iio/proximity/irsd200.c | 1 - + drivers/iio/proximity/sx9324.c | 24 +- + drivers/iio/resolver/ad2s1210.c | 160 +- + drivers/iio/temperature/Kconfig | 22 + + drivers/iio/temperature/Makefile | 2 + + drivers/iio/temperature/mcp9600.c | 139 ++ + drivers/iio/temperature/mlx90635.c | 1097 ++++++++++ + include/linux/iio/adc/adi-axi-adc.h | 4 + + include/linux/iio/types.h | 1 + + include/linux/property.h | 12 + + include/uapi/linux/iio/types.h | 2 + + scripts/checkpatch.pl | 1 + + tools/iio/iio_event_monitor.c | 2 + + 89 files changed, 8175 insertions(+), 408 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max34408.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/aosong,ags02ma.yaml + create mode 100644 Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bmi323.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltr390.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/vishay,veml6075.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/honeywell,hsc030pa.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/chemical/ags02ma.c + create mode 100644 drivers/iio/humidity/hdc3020.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/light/isl76682.c + create mode 100644 drivers/iio/light/ltr390.c + create mode 100644 drivers/iio/light/veml6075.c + create mode 100644 drivers/iio/pressure/hsc030pa.c + create mode 100644 drivers/iio/pressure/hsc030pa.h + create mode 100644 drivers/iio/pressure/hsc030pa_i2c.c + create mode 100644 drivers/iio/pressure/hsc030pa_spi.c + create mode 100644 drivers/iio/temperature/mcp9600.c + create mode 100644 drivers/iio/temperature/mlx90635.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 +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-combo.c +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 (becfce5233a7 soundwire: amd: drop bus freq calculation and set 'max_clk_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/qcom.c +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 | 12 ++++++-- + 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, 62 insertions(+), 44 deletions(-) +Merging extcon/extcon-next (7803680964c0 extcon: qcom-spmi-misc: don't use kernel-doc marker for comment) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/extcon-qcom-spmi-misc.c | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 9 ++++++++- + drivers/extcon/extcon.c | 3 +-- + 3 files changed, 10 insertions(+), 4 deletions(-) +Merging gnss/gnss-next (0cbbbe09d49b gnss: ubx: add support for the reset gpio) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 6 +++++ + drivers/gnss/ubx.c | 31 ++++++++-------------- + 2 files changed, 17 insertions(+), 20 deletions(-) +Merging vfio/next (946cff255dfa Merge branches 'v6.8/vfio/debugfs', 'v6.8/vfio/pds' and 'v6.8/vfio/type1-account' into v6.8/vfio/next) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-vfio | 25 +++ + MAINTAINERS | 1 + + drivers/vfio/Kconfig | 10 ++ + drivers/vfio/Makefile | 1 + + drivers/vfio/debugfs.c | 92 ++++++++++ + drivers/vfio/pci/pds/dirty.c | 309 +++++++++++++++++++++------------ + drivers/vfio/pci/pds/dirty.h | 18 +- + drivers/vfio/vfio.h | 14 ++ + drivers/vfio/vfio_iommu_type1.c | 8 +- + drivers/vfio/vfio_main.c | 4 + + include/linux/vfio.h | 7 + + include/uapi/linux/vfio.h | 1 + + 12 files changed, 364 insertions(+), 126 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-vfio + create mode 100644 drivers/vfio/debugfs.c +Merging w1/for-next (efc19c44aa44 w1: amd_axi_w1: Explicitly include correct DT includes) +$ 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 | 396 +++++++++++++++++++++ + drivers/w1/masters/w1-gpio.c | 118 +++--- + include/linux/w1-gpio.h | 22 -- + 7 files changed, 502 insertions(+), 98 deletions(-) + create mode 100644 Documentation/devicetree/bindings/w1/amd,axi-1wire-host.yaml + create mode 100644 drivers/w1/masters/amd_axi_w1.c + delete mode 100644 include/linux/w1-gpio.h +Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (5e8cdb6f6ebe staging: rtl8192e: rename variable HTInitializeHTInfo) +$ 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 CREDITS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 8 + + MAINTAINERS | 5 +- + drivers/staging/rtl8192e/Makefile | 1 - + drivers/staging/rtl8192e/dot11d.c | 165 ----- + drivers/staging/rtl8192e/dot11d.h | 84 --- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 29 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 71 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 11 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 22 - + drivers/staging/rtl8192e/rtl819x_BAProc.c | 206 +++---- + drivers/staging/rtl8192e/rtl819x_HT.h | 33 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 285 +++------ + drivers/staging/rtl8192e/rtl819x_TS.h | 20 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 70 +-- + drivers/staging/rtl8192e/rtllib.h | 41 +- + drivers/staging/rtl8192e/rtllib_module.c | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 32 - + drivers/staging/rtl8192e/rtllib_softmac.c | 275 +-------- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 7 +- + drivers/staging/rtl8192e/rtllib_tx.c | 66 +- + drivers/staging/vc04_services/interface/TODO | 5 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 271 +++------ + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 7 - + .../interface/vchiq_arm/vchiq_connected.c | 8 +- + .../interface/vchiq_arm/vchiq_connected.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 664 +++++++++------------ + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 54 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 10 + + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 113 ++-- + 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 +- + 38 files changed, 867 insertions(+), 1892 deletions(-) + delete mode 100644 drivers/staging/rtl8192e/dot11d.c + delete mode 100644 drivers/staging/rtl8192e/dot11d.h +Merging counter-next/counter-next (8e21e4693d85 MAINTAINERS: add myself as counter watch events tool maintainer) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 + + tools/counter/Build | 1 + + tools/counter/Makefile | 12 +- + tools/counter/counter_watch_events.c | 406 +++++++++++++++++++++++++++++++++++ + 4 files changed, 423 insertions(+), 2 deletions(-) + create mode 100644 tools/counter/counter_watch_events.c +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 (70f008fb3ea9 dmaengine: dmatest: prevent using swiotlb buffer with nobounce parameter) +$ 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/dma-controller.yaml | 15 -------- + .../devicetree/bindings/dma/dma-router.yaml | 11 ------ + .../bindings/dma/nvidia,tegra210-adma.yaml | 3 ++ + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 2 +- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 1 + + .../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/dmatest.c | 17 ++++++++- + drivers/dma/milbeaut-hdmac.c | 17 ++++++--- + drivers/dma/milbeaut-xdmac.c | 17 ++++++--- + drivers/dma/sf-pdma/sf-pdma.c | 44 ++++++++++++++++++++-- + drivers/dma/sf-pdma/sf-pdma.h | 8 +++- + drivers/dma/tegra210-adma.c | 35 ++++++++++++++++- + drivers/dma/uniphier-mdmac.c | 17 ++++++--- + drivers/dma/uniphier-xdmac.c | 17 ++++++--- + 18 files changed, 225 insertions(+), 71 deletions(-) +Merging cgroup/for-next (b7aaea747923 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 +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 33 ++- + include/linux/cgroup-defs.h | 22 +- + include/linux/cpuset.h | 6 + + include/linux/sched/isolation.h | 4 +- + include/linux/workqueue.h | 2 +- + kernel/cgroup/cpuset.c | 297 ++++++++++++++++------ + kernel/cgroup/rstat.c | 150 +++++++---- + kernel/workqueue.c | 167 ++++++++---- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 222 ++++++++++------ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + 10 files changed, 639 insertions(+), 266 deletions(-) +Merging scsi/for-next (6bdc5fb22b8e Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 49 ++ + .../devicetree/bindings/ufs/ufs-common.yaml | 2 + + MAINTAINERS | 3 +- + drivers/s390/scsi/zfcp_fc.c | 15 +- + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/a3000.c | 5 +- + drivers/scsi/a4000t.c | 5 +- + drivers/scsi/aic7xxx/aic7770_osm.c | 6 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 3 +- + drivers/scsi/arcmsr/arcmsr.h | 29 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 96 +++- + drivers/scsi/atari_scsi.c | 5 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 14 +- + drivers/scsi/bvme6000_scsi.c | 6 +- + drivers/scsi/ch.c | 12 +- + drivers/scsi/csiostor/csio_init.c | 3 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/elx/libefc/efc_node.h | 12 +- + drivers/scsi/fnic/fnic_debugfs.c | 3 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 12 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ipr.c | 55 --- + drivers/scsi/isci/request.c | 5 +- + drivers/scsi/isci/request.h | 2 +- + drivers/scsi/isci/task.c | 4 +- + drivers/scsi/jazz_esp.c | 6 +- + drivers/scsi/libfc/fc_fcp.c | 22 +- + 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/mac_esp.c | 6 +- + drivers/scsi/mac_scsi.c | 5 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1 + + drivers/scsi/mpi3mr/mpi3mr.h | 33 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 536 ++++++++++++++++----- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 118 ++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 33 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 16 +- + 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/scsi/mvme16x_scsi.c | 6 +- + drivers/scsi/qlogicpti.c | 6 +- + drivers/scsi/scsi_error.c | 1 + + drivers/scsi/sgiwd93.c | 5 +- + drivers/scsi/sni_53c710.c | 6 +- + drivers/scsi/sun3_scsi.c | 5 +- + drivers/scsi/sun3x_esp.c | 6 +- + drivers/scsi/sun_esp.c | 6 +- + drivers/target/target_core_pr.c | 1 + + drivers/ufs/core/ufs-fault-injection.c | 19 +- + drivers/ufs/core/ufs-fault-injection.h | 13 +- + drivers/ufs/core/ufs-sysfs.c | 120 +++++ + drivers/ufs/core/ufshcd.c | 7 +- + include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 + + include/ufs/ufshcd.h | 5 + + include/ufs/unipro.h | 4 +- + 74 files changed, 1314 insertions(+), 668 deletions(-) +Merging scsi-mkp/for-next (ed340d13aa1d Merge patch series "scsi: hisi_sas: Minor fixes and cleanups") +$ 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 Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufshcd-pltfrm.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 7 + + .../devicetree/bindings/ufs/qcom,ufs.yaml | 2 + + drivers/scsi/fcoe/fcoe_sysfs.c | 26 +- + drivers/scsi/fnic/fnic.h | 68 +- + drivers/scsi/fnic/fnic_fcs.c | 63 +- + drivers/scsi/fnic/fnic_isr.c | 174 +++-- + drivers/scsi/fnic/fnic_main.c | 144 ++-- + drivers/scsi/fnic/fnic_res.c | 48 +- + drivers/scsi/fnic/fnic_scsi.c | 870 ++++++++++++--------- + drivers/scsi/fnic/fnic_stats.h | 3 + + drivers/scsi/fnic/fnic_trace.c | 11 + + drivers/scsi/fnic/vnic_dev.c | 4 + + drivers/scsi/fnic/vnic_scsi.h | 13 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 19 +- + drivers/scsi/lpfc/lpfc_attr.c | 8 +- + drivers/scsi/lpfc/lpfc_els.c | 14 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vmid.c | 1 + + drivers/scsi/mpi3mr/mpi3mr_app.c | 6 +- + drivers/ufs/core/ufs-sysfs.c | 31 + + drivers/ufs/core/ufshcd.c | 107 ++- + drivers/ufs/host/ufs-exynos.c | 7 +- + drivers/ufs/host/ufs-hisi.c | 11 +- + drivers/ufs/host/ufs-mediatek.c | 12 +- + drivers/ufs/host/ufs-qcom.c | 472 +++-------- + drivers/ufs/host/ufs-qcom.h | 56 +- + drivers/ufs/host/ufshcd-pltfrm.c | 69 +- + drivers/ufs/host/ufshcd-pltfrm.h | 10 +- + include/ufs/ufs.h | 14 + + include/ufs/ufshcd.h | 6 + + 31 files changed, 1244 insertions(+), 1045 deletions(-) +Merging vhost/linux-next (b8e079244992 virtio_blk: fix snprintf truncation compiler warning) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/block/virtio_blk.c | 8 ++++---- + drivers/virtio/virtio_ring.c | 6 ++---- + 2 files changed, 6 insertions(+), 8 deletions(-) +Merging rpmsg/for-next (ff9af5732fe7 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 21 ++++++ + Documentation/staging/rpmsg.rst | 50 +++++++------ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 22 ++++++ + drivers/remoteproc/imx_dsp_rproc.c | 1 + + drivers/remoteproc/qcom_q6v5_pas.c | 19 +++++ + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 87 ++++++++++------------ + drivers/rpmsg/virtio_rpmsg_bus.c | 1 + + 7 files changed, 129 insertions(+), 72 deletions(-) +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 (40aa7e290b8e Merge tag 'intel-gpio-v6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib-sysfs.c +Merge made by the 'ort' strategy. + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 2 +- + .../bindings/gpio/rockchip,gpio-bank.yaml | 7 + + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 2 + + .../bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 3 + + drivers/gpio/gpio-elkhartlake.c | 14 +- + drivers/gpio/gpio-ixp4xx.c | 51 +++++- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-mmio.c | 53 +++--- + drivers/gpio/gpio-mockup.c | 3 +- + drivers/gpio/gpio-sifive.c | 1 - + drivers/gpio/gpio-sim.c | 24 ++- + drivers/gpio/gpio-stmpe.c | 6 +- + drivers/gpio/gpio-tangier.c | 63 ++----- + drivers/gpio/gpio-tangier.h | 4 +- + drivers/gpio/gpio-wm831x.c | 14 +- + drivers/gpio/gpio-wm8994.c | 13 +- + drivers/gpio/gpio-xilinx.c | 1 - + drivers/gpio/gpiolib-sysfs.c | 45 +++-- + drivers/gpio/gpiolib-sysfs.h | 10 +- + drivers/gpio/gpiolib.c | 200 +++++++++++---------- + drivers/gpio/gpiolib.h | 2 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 11 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 9 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/sunplus/sppctl.c | 10 +- + include/linux/gpio/driver.h | 43 +++-- + 26 files changed, 344 insertions(+), 255 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 +Already up to date. +Merging pinctrl/for-next (6aac7cb9bb62 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/pinctrl-single.yaml | 1 + + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 6 +- + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 148 ++ + .../bindings/pinctrl/qcom,sm8650-tlmm.yaml | 147 ++ + .../bindings/pinctrl/qcom,x1e80100-tlmm.yaml | 143 ++ + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 45 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 5 +- + MAINTAINERS | 1 - + drivers/pinctrl/Kconfig | 16 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-ns.c | 4 +- + drivers/pinctrl/core.c | 59 +- + drivers/pinctrl/core.h | 33 +- + drivers/pinctrl/devicetree.c | 8 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 44 +- + drivers/pinctrl/intel/Kconfig | 21 +- + drivers/pinctrl/intel/Makefile | 2 + + drivers/pinctrl/intel/pinctrl-alderlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 229 +-- + 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-meteorpoint.c | 465 +++++ + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 5 +- + drivers/pinctrl/intel/pinctrl-tangier.c | 32 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 13 +- + drivers/pinctrl/mediatek/pinctrl-moore.h | 10 +- + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt6795.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8186.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-paris.h | 10 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 9 +- + drivers/pinctrl/pinconf-generic.c | 16 +- + drivers/pinctrl/pinconf.c | 14 +- + drivers/pinctrl/pinconf.h | 10 +- + drivers/pinctrl/pinctrl-amd.c | 9 + + drivers/pinctrl/pinctrl-amd.h | 5 + + drivers/pinctrl/pinctrl-as3722.c | 17 +- + drivers/pinctrl/pinctrl-equilibrium.c | 42 +- + drivers/pinctrl/pinctrl-ingenic.c | 35 +- + drivers/pinctrl/pinctrl-keembay.c | 6 +- + drivers/pinctrl/pinctrl-single.c | 5 + + drivers/pinctrl/pinctrl-tps6594.c | 373 ++++ + drivers/pinctrl/pinctrl-utils.c | 26 +- + drivers/pinctrl/pinctrl-utils.h | 18 +- + drivers/pinctrl/pinmux.c | 36 +- + drivers/pinctrl/pinmux.h | 20 +- + 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 | 13 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 46 + + drivers/pinctrl/qcom/pinctrl-msm.h | 5 + + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 16 - + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 20 - + drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c | 20 - + drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 15 - + drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c | 16 - + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 24 - + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 24 - + drivers/pinctrl/qcom/pinctrl-sm8650-lpass-lpi.c | 231 +++ + drivers/pinctrl/qcom/pinctrl-sm8650.c | 1762 ++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 1876 ++++++++++++++++++++ + drivers/pinctrl/renesas/pinctrl-rza1.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 10 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 171 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 280 +++ + drivers/pinctrl/samsung/pinctrl-exynos.c | 109 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 25 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 7 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 14 + + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 12 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 12 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 + + include/linux/pinctrl/machine.h | 6 +- + include/linux/pinctrl/pinconf-generic.h | 10 +- + include/linux/pinctrl/pinconf.h | 16 +- + include/linux/pinctrl/pinctrl.h | 24 +- + include/linux/pinctrl/pinmux.h | 22 +- + 109 files changed, 6646 insertions(+), 799 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/intel/pinctrl-intel-platform.c + create mode 100644 drivers/pinctrl/intel/pinctrl-meteorpoint.c + 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 (ebe7f3393784 pinctrl: intel: Add Intel Meteor Point pin controller and GPIO support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (9e5889c68d99 pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (6cf96df77338 pinctrl: samsung: add exynosautov920 pinctrl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (2cc2cb184833 pwm: Stop referencing pwm->chip) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +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-bcm-kona.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 | 10 +- + drivers/pwm/pwm-imx-tpm.c | 10 +- + drivers/pwm/pwm-jz4740.c | 6 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-lpc32xx.c | 2 +- + drivers/pwm/pwm-mediatek.c | 2 +- + drivers/pwm/pwm-renesas-tpu.c | 2 +- + drivers/pwm/pwm-rockchip.c | 9 +- + drivers/pwm/pwm-samsung.c | 6 +- + drivers/pwm/pwm-sti.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 10 +- + drivers/pwm/pwm-stm32.c | 106 +++++++++++++-------- + drivers/pwm/pwm-stmpe.c | 2 +- + drivers/pwm/pwm-tegra.c | 2 +- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 8 +- + drivers/pwm/pwm-twl-led.c | 4 +- + drivers/pwm/pwm-twl.c | 4 +- + drivers/pwm/pwm-vt8500.c | 2 +- + drivers/pwm/sysfs.c | 2 +- + include/linux/pwm.h | 7 +- + 30 files changed, 149 insertions(+), 173 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 (130a83879954 selftests: sched: Remove initialization to 0 for a static variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + .../selftests/breakpoints/breakpoint_test.c | 4 +- + .../breakpoints/step_after_suspend_test.c | 2 +- + tools/testing/selftests/capabilities/test_execve.c | 6 +- + tools/testing/selftests/prctl/set-process-name.c | 32 ++++++++++ + tools/testing/selftests/sched/cs_prctl_test.c | 2 +- + tools/testing/selftests/vDSO/vdso_test_abi.c | 72 ++++++++++++---------- + tools/testing/selftests/x86/lam.c | 4 +- + 7 files changed, 78 insertions(+), 44 deletions(-) +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 (342fb9789267 kunit: Reset test->priv after each param iteration) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/api/resource.rst | 9 + + Documentation/dev-tools/kunit/run_manual.rst | 51 +++++- + Documentation/dev-tools/kunit/running_tips.rst | 7 + + Documentation/dev-tools/kunit/usage.rst | 60 ++++++- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 78 +-------- + drivers/gpu/drm/vc4/tests/vc4_mock.c | 9 +- + include/asm-generic/vmlinux.lds.h | 11 +- + include/kunit/device.h | 80 +++++++++ + include/kunit/resource.h | 21 +++ + include/kunit/test.h | 31 ++-- + include/linux/module.h | 2 + + kernel/module/main.c | 3 + + lib/fortify_kunit.c | 5 +- + lib/kunit/Makefile | 3 +- + lib/kunit/attributes.c | 60 +++++++ + lib/kunit/debugfs.c | 102 +++++++++++- + lib/kunit/device-impl.h | 17 ++ + lib/kunit/device.c | 181 +++++++++++++++++++++ + lib/kunit/executor.c | 68 +++++++- + lib/kunit/kunit-example-test.c | 52 ++++++ + lib/kunit/kunit-test.c | 139 +++++++++++++++- + lib/kunit/string-stream-test.c | 2 +- + lib/kunit/string-stream.c | 2 +- + lib/kunit/test.c | 46 +++++- + lib/overflow_kunit.c | 5 +- + sound/soc/soc-topology-test.c | 10 +- + tools/testing/kunit/kunit_parser.py | 4 +- + tools/testing/kunit/kunit_tool_test.py | 16 ++ + .../kunit/test_data/test_parse_attributes.log | 9 + + 29 files changed, 939 insertions(+), 144 deletions(-) + create mode 100644 include/kunit/device.h + create mode 100644 lib/kunit/device-impl.h + create mode 100644 lib/kunit/device.c + create mode 100644 tools/testing/kunit/test_data/test_parse_attributes.log +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 (dc0684adf3b6 rtc: Add driver for Nuvoton ma35d1 rtc controller) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../bindings/rtc/nuvoton,ma35d1-rtc.yaml | 48 +++ + arch/alpha/kernel/rtc.c | 2 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/rtc.c | 2 +- + drivers/base/power/trace.c | 2 +- + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-cmos.c | 28 +- + drivers/rtc/rtc-ma35d1.c | 324 +++++++++++++++++++++ + drivers/rtc/rtc-mc146818-lib.c | 39 ++- + include/linux/mc146818rtc.h | 3 +- + 11 files changed, 437 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/nuvoton,ma35d1-rtc.yaml + create mode 100644 drivers/rtc/rtc-ma35d1.c +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 (c692086d74a0 dt-bindings: at24: add ROHM BR24G04) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 1 + + drivers/misc/eeprom/at24.c | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (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 (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +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 (c52391fafcef auxdisplay: img-ascii-lcd: Use device_get_match_data()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/img-ascii-lcd.c | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) +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 (01bd694ac2f6 bus: mhi: host: Drop chan lock before queuing buffers) +$ 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/internal.h | 4 + + drivers/bus/mhi/ep/main.c | 387 ++++++++++++++++++--------- + drivers/bus/mhi/ep/ring.c | 60 +++-- + drivers/bus/mhi/host/init.c | 1 + + drivers/bus/mhi/host/internal.h | 2 +- + drivers/bus/mhi/host/main.c | 34 ++- + drivers/bus/mhi/host/pci_generic.c | 22 ++ + drivers/bus/mhi/host/pm.c | 24 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 314 +++++++++++++++++++--- + include/linux/mhi.h | 4 + + include/linux/mhi_ep.h | 36 ++- + 11 files changed, 680 insertions(+), 208 deletions(-) +Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cxl/next (5d09c63f11f0 cxl/hdm: Remove broken error path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (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 (94f7f6182c72 efivarfs: automatically update super block flag) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + drivers/firmware/efi/Kconfig | 15 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 18 + + drivers/firmware/efi/stmm/mm_communication.h | 236 ++++++++++ + drivers/firmware/efi/stmm/tee_stmm_efi.c | 616 +++++++++++++++++++++++++++ + drivers/firmware/efi/vars.c | 8 + + fs/efivarfs/inode.c | 3 +- + fs/efivarfs/internal.h | 8 +- + fs/efivarfs/super.c | 68 ++- + fs/efivarfs/vars.c | 5 +- + include/linux/efi.h | 12 + + 11 files changed, 970 insertions(+), 20 deletions(-) + create mode 100644 drivers/firmware/efi/stmm/mm_communication.h + create mode 100644 drivers/firmware/efi/stmm/tee_stmm_efi.c +Merging unicode/for-next (807f06d1074d ecryptfs: Reject casefold directory inodes) +$ 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 fs/ecryptfs/inode.c +Merge made by the 'ort' strategy. + fs/ecryptfs/inode.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging slab/slab/for-next (f7eb801fcdb1 Merge branch 'slab/for-6.8/slub-hook-cleanups' 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/arm64/Kconfig +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.debug +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/kasan/report.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 cb78d78d7283] 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 | 1141 ++++++++--- + 29 files changed, 1096 insertions(+), 5377 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 (a50156fe3dcb 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 | 119 +++++- + include/uapi/linux/landlock.h | 58 ++- + samples/landlock/sandboxer.c | 13 +- + security/landlock/fs.c | 202 ++++++++- + security/landlock/fs.h | 2 + + security/landlock/limits.h | 11 +- + security/landlock/ruleset.c | 7 +- + security/landlock/ruleset.h | 2 +- + security/landlock/syscalls.c | 19 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 588 ++++++++++++++++++++++++++- + tools/testing/selftests/landlock/net_test.c | 59 ++- + 12 files changed, 1005 insertions(+), 77 deletions(-) +Merging rust/rust-next (71479eee9da8 rust: Suppress searching builtin sysroot) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging rust/bindings/bindings_helper.h +Merge made by the 'ort' strategy. + rust/Makefile | 5 ++++ + rust/bindgen_parameters | 4 +++ + rust/bindings/bindings_helper.h | 6 ++--- + rust/bindings/lib.rs | 3 --- + rust/exports.c | 2 +- + rust/kernel/allocator.rs | 2 +- + rust/kernel/error.rs | 4 +++ + rust/kernel/str.rs | 6 +++++ + rust/macros/lib.rs | 60 ++++++++++++++++++++++++++++++++++------- + rust/macros/paste.rs | 10 ++++++- + scripts/Makefile.build | 1 + + 11 files changed, 85 insertions(+), 18 deletions(-) +Merging sysctl/sysctl-next (a6fd07f80ab7 coda: Remove the now superfluous sentinel elements from ctl_table array) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging MAINTAINERS +Auto-merging fs/aio.c +Auto-merging fs/dcache.c +Auto-merging fs/devpts/inode.c +Auto-merging fs/eventpoll.c +Auto-merging fs/exec.c +Auto-merging fs/file_table.c +Auto-merging fs/inode.c +Auto-merging fs/lockd/svc.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/notify/dnotify/dnotify.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/pipe.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/verity/init.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/aio.c | 1 - + fs/cachefiles/error_inject.c | 1 - + fs/coda/sysctl.c | 1 - + fs/coredump.c | 1 - + fs/dcache.c | 1 - + fs/devpts/inode.c | 1 - + fs/eventpoll.c | 1 - + fs/exec.c | 1 - + fs/file_table.c | 1 - + fs/inode.c | 1 - + fs/lockd/svc.c | 1 - + fs/locks.c | 1 - + fs/namei.c | 1 - + fs/namespace.c | 1 - + fs/nfs/nfs4sysctl.c | 1 - + fs/nfs/sysctl.c | 1 - + fs/notify/dnotify/dnotify.c | 1 - + fs/notify/fanotify/fanotify_user.c | 1 - + fs/notify/inotify/inotify_user.c | 1 - + fs/ntfs/sysctl.c | 1 - + fs/ocfs2/stackglue.c | 1 - + fs/pipe.c | 1 - + fs/proc/proc_sysctl.c | 10 ++- + fs/quota/dquot.c | 1 - + fs/sysctls.c | 1 - + fs/userfaultfd.c | 1 - + fs/verity/init.c | 1 - + fs/xfs/xfs_sysctl.c | 2 - + lib/test_sysctl.c | 31 ++++++- + tools/testing/selftests/sysctl/sysctl.sh | 146 ++++++++++++++++++------------- + 31 files changed, 122 insertions(+), 95 deletions(-) +Merging execve/for-next/execve (0a8a952a75f2 ELF, MAINTAINERS: specifically mention ELF) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging fs/exec.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6210320607fb] Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 ++- + fs/exec.c | 13 +++++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) +Merging bitmap/bitmap-for-next (5e95ee6fd52b sh: mach-x3proto: optimize ilsel_enable()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu.h +Auto-merging drivers/net/wireless/realtek/rtw89/pci.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/perf/arm_pmuv3.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Auto-merging drivers/tty/nozomi.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/find.h +Auto-merging kernel/sched/sched.h +Auto-merging sound/pci/hda/hda_codec.c +Merge made by the 'ort' strategy. + arch/m68k/include/asm/mmu_context.h | 11 +- + arch/microblaze/include/asm/mmu_context_mm.h | 11 +- + arch/mips/sgi-ip30/ip30-irq.c | 12 +- + arch/powerpc/mm/book3s32/mmu_context.c | 10 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 41 +--- + arch/powerpc/platforms/powernv/pci-sriov.c | 12 +- + arch/sh/boards/mach-x3proto/ilsel.c | 4 +- + arch/sparc/kernel/pci_msi.c | 9 +- + arch/x86/kvm/hyperv.c | 36 ++-- + drivers/block/null_blk/main.c | 39 ++-- + drivers/dma/idxd/perfmon.c | 8 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 15 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 10 +- + drivers/iommu/msm_iommu.c | 18 +- + drivers/isdn/mISDN/core.c | 9 +- + drivers/media/radio/radio-shark.c | 5 +- + drivers/media/radio/radio-shark2.c | 5 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 16 +- + drivers/media/usb/em28xx/em28xx-cards.c | 37 ++-- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 11 +- + drivers/net/ethernet/sfc/rx_common.c | 4 +- + drivers/net/ethernet/sfc/siena/rx_common.c | 4 +- + drivers/net/ethernet/sfc/siena/siena_sriov.c | 14 +- + drivers/net/wireless/ath/ath10k/snoc.c | 9 +- + drivers/net/wireless/realtek/rtw88/pci.c | 5 +- + drivers/net/wireless/realtek/rtw89/pci.c | 5 +- + drivers/pci/controller/pci-hyperv.c | 7 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 10 +- + drivers/perf/arm-cci.c | 24 +-- + drivers/perf/arm-ccn.c | 10 +- + drivers/perf/arm_dmc620_pmu.c | 9 +- + drivers/perf/arm_pmuv3.c | 8 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 21 +- + drivers/scsi/qedi/qedi_main.c | 9 +- + drivers/scsi/scsi_lib.c | 7 +- + drivers/tty/nozomi.c | 5 +- + drivers/tty/serial/sc16is7xx.c | 8 +- + drivers/usb/class/cdc-acm.c | 5 +- + include/linux/cpumask.h | 12 ++ + include/linux/find.h | 301 ++++++++++++++++++++++++++- + kernel/sched/sched.h | 14 +- + kernel/watch_queue.c | 6 +- + lib/find_bit.c | 85 ++++++++ + lib/sbitmap.c | 46 +--- + lib/test_bitmap.c | 61 ++++++ + net/bluetooth/cmtp/core.c | 10 +- + net/smc/smc_wr.c | 10 +- + sound/pci/hda/hda_codec.c | 7 +- + sound/usb/caiaq/audio.c | 13 +- + 49 files changed, 630 insertions(+), 418 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 (a75b3809dce2 qnx4: Use get_directory_fname() in qnx4_match()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging drivers/misc/vmw_vmci/vmci_handle_array.h +Auto-merging drivers/nvme/host/fabrics.c +Auto-merging drivers/nvme/host/fc.c +Auto-merging fs/afs/internal.h +Auto-merging samples/v4l/v4l2-pci-skeleton.c +Merge made by the 'ort' strategy. + arch/arm/kernel/atags_proc.c | 4 +- + drivers/gpu/drm/drm_modes.c | 6 +-- + drivers/hid/uhid.c | 15 ++++---- + drivers/misc/lkdtm/heap.c | 60 ++++++++++++++++++++++++++++++ + drivers/misc/vmw_vmci/vmci_handle_array.h | 2 +- + drivers/nvdimm/btt.c | 2 +- + drivers/nvme/host/fabrics.c | 4 +- + drivers/nvme/host/fc.c | 8 ++-- + fs/afs/internal.h | 2 +- + fs/afs/xattr.c | 2 +- + fs/qnx4/dir.c | 52 ++++---------------------- + fs/qnx4/namei.c | 29 ++++++--------- + fs/qnx4/qnx4.h | 60 ++++++++++++++++++++++++++++++ + include/linux/kfence.h | 2 + + include/linux/moduleparam.h | 6 +-- + include/linux/net/intel/i40e_client.h | 2 +- + kernel/params.c | 56 +++++++++++++++------------- + kernel/trace/trace_uprobe.c | 2 +- + net/sunrpc/clnt.c | 10 ++++- + samples/trace_events/trace-events-sample.h | 2 +- + samples/v4l/v4l2-pci-skeleton.c | 10 ++--- + 21 files changed, 210 insertions(+), 126 deletions(-) +Merging kspp-gustavo/for-next/kspp (617ab3c357d2 init: Kconfig: Disable -Wstringop-overflow for GCC-11) +$ 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 init/Kconfig +Auto-merging scripts/Makefile.extrawarn +Merge made by the 'ort' strategy. + Makefile | 4 ++++ + init/Kconfig | 12 ++++++++++++ + scripts/Makefile.extrawarn | 2 -- + 3 files changed, 16 insertions(+), 2 deletions(-) +Merging nolibc/nolibc (d543d9ddf593 selftests/nolibc: disable coredump via setrlimit) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Merge made by the 'ort' strategy. + tools/include/nolibc/arch-mips.h | 11 +- + tools/include/nolibc/arch.h | 4 +- + tools/include/nolibc/stdio.h | 4 +- + tools/include/nolibc/sys.h | 38 ++++++ + tools/include/nolibc/types.h | 25 +--- + tools/testing/selftests/nolibc/.gitignore | 1 + + tools/testing/selftests/nolibc/Makefile | 65 ++++++++--- + tools/testing/selftests/nolibc/nolibc-test.c | 51 ++++++-- + tools/testing/selftests/nolibc/run-tests.sh | 169 +++++++++++++++++++++++++++ + 9 files changed, 318 insertions(+), 50 deletions(-) + create mode 100755 tools/testing/selftests/nolibc/run-tests.sh +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. +Merging devicetree/for-next (2726b01362a5 Merge branch 'dt/header-fixes-for-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/cache/qcom,llcc.yaml +Auto-merging Documentation/devicetree/bindings/connector/usb-connector.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/connector/usb-connector.yaml +Auto-merging Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml +Auto-merging Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml +Auto-merging drivers/of/platform.c +Auto-merging include/linux/of_device.h +Resolved 'Documentation/devicetree/bindings/connector/usb-connector.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 14a3e64715ea] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/calxeda/l2ecc.yaml | 2 +- + .../bindings/arm/msm/qcom,idle-state.txt | 84 --------- + .../bindings/auxdisplay/hit,hd44780.yaml | 2 +- + .../devicetree/bindings/cache/qcom,llcc.yaml | 2 +- + .../bindings/clock/baikal,bt1-ccu-pll.yaml | 2 +- + .../bindings/connector/usb-connector.yaml | 81 +++++---- + .../devicetree/bindings/cpu/idle-states.yaml | 81 ++++++++- + .../bindings/display/panel/synaptics,r63353.yaml | 61 +++++++ + .../display/rockchip/inno_hdmi-rockchip.txt | 49 ------ + .../display/rockchip/rockchip,inno-hdmi.yaml | 103 +++++++++++ + .../devicetree/bindings/dts-coding-style.rst | 196 +++++++++++++++++++++ + .../devicetree/bindings/gpu/samsung-g2d.yaml | 65 ++++--- + .../devicetree/bindings/gpu/samsung-rotator.yaml | 9 +- + .../devicetree/bindings/gpu/samsung-scaler.yaml | 75 ++++---- + .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 6 +- + Documentation/devicetree/bindings/index.rst | 1 + + .../bindings/interrupt-controller/qcom,pdc.yaml | 4 + + .../st,stih407-irq-syscfg.yaml | 4 +- + .../bindings/misc/fsl,dpaa2-console.yaml | 2 +- + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + Documentation/devicetree/bindings/net/sff,sfp.yaml | 2 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 2 +- + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 6 +- + .../devicetree/bindings/power/fsl,scu-pd.yaml | 1 + + .../bindings/power/supply/richtek,rt9455.yaml | 8 +- + .../devicetree/bindings/regulator/mps,mp5416.yaml | 4 +- + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 4 +- + .../bindings/remoteproc/fsl,imx-rproc.yaml | 8 +- + arch/sparc/kernel/pci_sabre.c | 9 +- + arch/sparc/kernel/pci_schizo.c | 13 +- + drivers/net/can/c_can/c_can_platform.c | 13 +- + drivers/net/can/flexcan/flexcan-core.c | 12 +- + drivers/net/can/mscan/mpc5xxx_can.c | 8 +- + drivers/net/can/xilinx_can.c | 9 +- + drivers/of/overlay.c | 2 +- + drivers/of/platform.c | 22 ++- + drivers/thermal/loongson2_thermal.c | 3 +- + include/linux/of_device.h | 5 +- + include/linux/of_platform.h | 4 +- + 39 files changed, 655 insertions(+), 311 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/synaptics,r63353.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/dts-coding-style.rst +Merging header_cleanup/header_cleanup (4490eab3c3b5 fixup! Kill sched.h dependency on rcupdate.h) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Auto-merging arch/x86/include/asm/current.h +Auto-merging arch/x86/include/asm/paravirt.h +Auto-merging arch/x86/include/asm/paravirt_types.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/paravirt_types.h +Auto-merging arch/x86/include/asm/percpu.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h +Auto-merging arch/x86/include/asm/preempt.h +Auto-merging fs/exec.c +Auto-merging include/linux/lockdep_types.h +Auto-merging include/linux/mutex.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/uidgid.h +Auto-merging include/linux/workqueue.h +Auto-merging init/init_task.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging mm/filemap.c +Auto-merging mm/khugepaged.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Resolved 'arch/x86/include/asm/paravirt_types.h' using previous resolution. +Resolved 'arch/x86/include/asm/percpu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7814f2aa9a43] Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/spectre.h | 4 +- + arch/arm64/kernel/ptrace.c | 1 + + arch/powerpc/kernel/interrupt.c | 1 + + arch/powerpc/kvm/book3s_64_vio.c | 1 + + arch/x86/include/asm/current.h | 1 + + arch/x86/include/asm/debugreg.h | 1 + + arch/x86/include/asm/fpu/types.h | 2 + + arch/x86/include/asm/paravirt.h | 4 + + arch/x86/include/asm/paravirt_types.h | 1 + + arch/x86/include/asm/percpu.h | 2 +- + arch/x86/include/asm/preempt.h | 1 - + arch/x86/include/uapi/asm/signal.h | 1 - + arch/x86/kernel/fpu/bugs.c | 1 + + arch/x86/kernel/signal.c | 1 + + arch/x86/lib/cache-smp.c | 1 + + drivers/base/power/runtime.c | 1 + + drivers/gpu/drm/i915/i915_memcpy.c | 2 + + drivers/gpu/drm/lima/lima_ctx.c | 1 + + drivers/irqchip/irq-gic-v4.c | 1 + + drivers/media/test-drivers/vidtv/vidtv_pes.c | 1 + + drivers/target/target_core_xcopy.c | 1 + + fs/exec.c | 1 + + include/linux/audit.h | 1 + + include/linux/dma-fence.h | 1 + + include/linux/hrtimer.h | 46 +--- + include/linux/hrtimer_types.h | 50 +++++ + include/linux/ipc.h | 2 +- + include/linux/irqflags.h | 14 +- + include/linux/irqflags_types.h | 22 ++ + include/linux/kmsan_types.h | 2 + + include/linux/ktime.h | 8 +- + include/linux/lockdep.h | 57 ----- + include/linux/lockdep_types.h | 57 +++++ + include/linux/mm_types_task.h | 5 +- + include/linux/mutex.h | 52 +---- + include/linux/mutex_types.h | 71 ++++++ + include/linux/nodemask.h | 2 +- + include/linux/nodemask_types.h | 10 + + include/linux/nsproxy.h | 1 + + include/linux/numa.h | 19 +- + include/linux/pid.h | 140 ++++++++++-- + include/linux/pid_types.h | 16 ++ + include/linux/plist.h | 12 +- + include/linux/plist_types.h | 17 ++ + include/linux/posix-timers.h | 69 +----- + include/linux/posix-timers_types.h | 80 +++++++ + include/linux/prandom.h | 1 - + include/linux/preempt.h | 6 +- + include/linux/rcupdate_wait.h | 10 + + include/linux/refcount.h | 13 +- + include/linux/refcount_types.h | 19 ++ + include/linux/restart_block.h | 2 +- + include/linux/resume_user_mode.h | 1 + + include/linux/rhashtable-types.h | 2 +- + include/linux/rseq.h | 131 +++++++++++ + include/linux/rslib.h | 1 - + include/linux/sched.h | 323 ++------------------------- + include/linux/sched/signal.h | 1 + + include/linux/sched/task.h | 2 + + include/linux/sched/task_stack.h | 1 + + include/linux/seccomp.h | 24 +- + include/linux/seccomp_types.h | 35 +++ + include/linux/sem.h | 10 +- + include/linux/sem_types.h | 13 ++ + include/linux/seqlock.h | 79 +------ + include/linux/seqlock_types.h | 93 ++++++++ + include/linux/shm.h | 4 +- + include/linux/signal.h | 1 + + include/linux/signal_types.h | 2 +- + include/linux/spinlock.h | 31 +++ + include/linux/syscall_user_dispatch.h | 9 +- + include/linux/syscall_user_dispatch_types.h | 22 ++ + include/linux/time_namespace.h | 3 + + include/linux/timekeeping.h | 1 + + include/linux/timer.h | 16 +- + include/linux/timer_types.h | 23 ++ + include/linux/timerqueue.h | 13 +- + include/linux/timerqueue_types.h | 17 ++ + include/linux/torture.h | 1 + + include/linux/types.h | 3 + + include/linux/uidgid.h | 11 +- + include/linux/uidgid_types.h | 15 ++ + include/linux/wait.h | 1 - + include/linux/workqueue.h | 16 +- + include/linux/workqueue_types.h | 25 +++ + include/uapi/linux/resource.h | 2 +- + init/init_task.c | 1 + + ipc/shm.c | 1 + + ipc/util.h | 1 + + kernel/Makefile | 1 + + kernel/async.c | 5 +- + kernel/bpf/hashtab.c | 1 + + kernel/exit.c | 4 +- + kernel/fork.c | 2 + + kernel/futex/core.c | 1 + + kernel/futex/requeue.c | 1 + + kernel/futex/waitwake.c | 1 + + kernel/locking/spinlock_debug.c | 1 + + kernel/numa.c | 24 ++ + kernel/pid_namespace.c | 1 + + kernel/sched/core.c | 1 + + lib/test_rhashtable.c | 1 + + mm/filemap.c | 1 + + mm/khugepaged.c | 1 + + mm/shmem.c | 1 + + mm/swapfile.c | 1 + + net/ipv4/fib_trie.c | 1 + + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 + + net/netfilter/ipset/ip_set_hash_gen.h | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 1 + + net/netfilter/ipvs/ip_vs_est.c | 1 + + security/selinux/hooks.c | 1 + + security/smack/smack_lsm.c | 1 + + 113 files changed, 1053 insertions(+), 774 deletions(-) + create mode 100644 include/linux/hrtimer_types.h + create mode 100644 include/linux/irqflags_types.h + create mode 100644 include/linux/mutex_types.h + create mode 100644 include/linux/nodemask_types.h + create mode 100644 include/linux/pid_types.h + create mode 100644 include/linux/plist_types.h + create mode 100644 include/linux/posix-timers_types.h + create mode 100644 include/linux/refcount_types.h + create mode 100644 include/linux/rseq.h + create mode 100644 include/linux/seccomp_types.h + create mode 100644 include/linux/sem_types.h + create mode 100644 include/linux/seqlock_types.h + create mode 100644 include/linux/syscall_user_dispatch_types.h + create mode 100644 include/linux/timer_types.h + create mode 100644 include/linux/timerqueue_types.h + create mode 100644 include/linux/uidgid_types.h + create mode 100644 include/linux/workqueue_types.h + create mode 100644 kernel/numa.c +$ git am -3 ../patches/0001-drm-using-mul_u32_u32-requires-linux-math64.h.patch +Applying: drm: using mul_u32_u32() requires linux/math64.h +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/drm_color_mgmt.h +$ git add -A . +$ git commit -v -a --amend +[master c2d493c1a653] Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git + Date: Tue Dec 19 14:30:25 2023 +1100 +$ git am -3 ../patches/0001-fixup-for-s390-and-rseq-Split-out-rseq.h-from-sched..patch +Applying: fixup for s390 and "rseq: Split out rseq.h from sched.h" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9ae735a9d027 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20231219 |