diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-18 14:30:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-18 14:30:46 +1100 |
commit | 2863b714f3ad0a9686f2de1b779228ad8c7a8052 (patch) | |
tree | 56a8502bb353844ce277c1a56eccb4d94ab9b102 | |
parent | 83bd51470d0181add769deec697e99bd65b000eb (diff) |
Add linux-next specific files for 20240118next-20240118
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 373 | ||||
-rw-r--r-- | Next/Trees | 375 | ||||
-rw-r--r-- | Next/merge.log | 5264 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 6013 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7081308f5864 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,373 @@ +Name SHA1 +---- ---- +origin 82fd5ee9d8a516d47a17e8c99c2712a3fd937014 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes da864b7c9eb39fe4468f5cdb001df350e2a03cb6 +kbuild-current 753547de0daecbdbd1af3618987ddade325d9aaa +arc-current 861deac3b092f37b2c5e6871732f3e11486f7082 +arm-current f54e8634d1366926c807e2af6125b33cff555fa7 +arm64-fixes 3c0696076aad60a2f04c019761921954579e1b0e +arm-soc-fixes 643fe70e7bcdcc9e2d96952f7fc2bab56385cce5 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8 +powerpc-fixes d2441d3e8c0c076d0a2e705fa235c76869a85140 +s390-fixes 3d940bb1818325142e6764bff788cbf95b9afb54 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net ea937f77208323d35ffe2f8d8fc81b00118bfcda +bpf 33772ff3b887eb2f426ed66bcb1808837a40669c +ipsec 1982a2a02c9197436d4a8ea12f66bafab53f16a0 +netfilter 080898f8e782734987f127c73a69ebeab7b5f5e8 +ipvs b29be0ca8e816119ccdf95cc7d7c7be9bde005f1 +wireless 989cd9fd1ffe1a964429325f9092ea8f0db3f953 +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +sound-current fb3c007fde80d9d3b4207943e74c150c9116cead +sound-asoc-fixes 6db342158dbd819be53f6955109fa67f399526b8 +regmap-fixes fea88064445a59584460f7f67d102b6e5fc1ca1d +regulator-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spi-fixes fc70d643a2f6678cbe0f5c86433c1aeb4d613fcc +pci-current 0ee2030af4e3e0a9cd26dfaa8c2f935beffa91d1 +driver-core.current 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab +tty.current a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +usb.current 610a9b8f49fbcf1100716370d3b5f6f884a2835a +usb-serial-fixes 610a9b8f49fbcf1100716370d3b5f6f884a2835a +phy 2a9c713825b3127ece11984abf973672c9779518 +staging.current 98b1cc82c4affc16f5598d4fa14b1858671b2263 +iio-fixes 45ad6eb5f557edda196d79f536b4cc4e5705f0f5 +counter-current a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +char-misc.current 610a9b8f49fbcf1100716370d3b5f6f884a2835a +soundwire-fixes 393cae5f32d640b9798903702018a48c7a45e59f +thunderbolt-fixes 0dd3ee31125508cd67f7e7172247f05b7fd1753a +input-current 58f65f9db7e0de366a5a115c2e2c0703858bba69 +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 60a031b64984ad4a219a13b0fe912746b586bb9b +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +at91-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes 0dd3ee31125508cd67f7e7172247f05b7fd1753a +kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77 +hwmon-fixes 2539b15d504c3f9fd8ca82032bf9c80c9864412c +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes ceb6a6f023fd3e8b07761ed900352ef574010bcb +btrfs-fixes 4f9d4cf13b08a0a558f873430bac313769b5bb82 +vfs-fixes 485053bb81c81a122edd982b263277e65d7485c5 +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes b20712e853305cbd04673f02b7e52ba5b12c11a9 +samsung-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-samsung-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +devicetree-fixes 136c6531ba12e4a658376387e355a09c9b5223e5 +dt-krzk-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +scsi-fixes 04c116e2bdfc3969f9819d2cebfdf678353c354c +drm-fixes 0dd3ee31125508cd67f7e7172247f05b7fd1753a +drm-intel-fixes 0dd3ee31125508cd67f7e7172247f05b7fd1753a +mmc-fixes 8abf77c88929b6d20fa4f9928b18d6448d64e293 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +hyperv-fixes 564eac2860bdbe6ac651e6909ac07ecd93d778f3 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes b8b2711336f03ece539de61479d6ffc44fb603d3 +riscv-dt-fixes e1b91b84ea273919369ba9c73f4d38ec90f9066b +riscv-soc-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +spdx 052d534373b7ed33712a63d5e17b2b6cdbce84fd +gpio-brgl-fixes efb8235bfdbe661c460f803150b50840a73b5f03 +gpio-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pinctrl-intel-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +erofs-fixes 2b872b0f466d2acb4491da845c66b49246d5cdf9 +kunit-fixes 1bddcf77ce6668692fc15e968fd0870d5524d112 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 55122e0130e51eb71f5ec62d10525db0468f28e8 +nfsd-fixes 1d9cabe2817edd215779dc9c2fe5e7ab9aac0704 +renesas-fixes 9eab43facdadb7d00456c2657001ae2e5353c814 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current d988c9f511af71a3445b6a4f3a2c67208ff8e480 +efi-fixes 0e9ce09fde3a54d8911ceaa2063dc37d04c027ee +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes f37669119423ca852ca855b24732f25c0737aa57 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 861deac3b092f37b2c5e6871732f3e11486f7082 +rust-fixes cfd96726e61136e68a168813cedc4084f626208b +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes b85ea95d086471afb4ad062012a4d73cd328fa86 +pmdomain-fixes 0cb19e50a911aaadf49eed120392e429d6e1fa0c +overlayfs-fixes 413ba91089c74207313b315e04cf381ffb5b20e4 +drm-misc-fixes a20f1b02bafcbf5a32d96a1d4185d6981cf7d016 +mm-stable 1b1934dbbdcf9aa2d507932ff488cec47999cf3f +mm-nonmm-stable 1b1934dbbdcf9aa2d507932ff488cec47999cf3f +mm 0a368f746bf8fbdc7156a88d27b1eb5df1d3b75d +kbuild 6185d32170b683abadddf1e68be998e24f3cc5de +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf d988c9f511af71a3445b6a4f3a2c67208ff8e480 +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping 7c65aa3cc072cee76f577262fbe381a111a98774 +asm-generic d93cca2f3109f88c94a32d3322ec8b2854a9c339 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 8790fade1a19caf714ba1d91ce1fdceb9f2067f2 +arm64 f827bcdafa2a2ac21c91e47f587e8d0c76195409 +arm-perf bb339db4d363c84e0a8d70827df591397ccd7312 +arm-soc 6905b2bcfacd8d173aafe081a96445a5503d3d80 +amlogic 0dd3ee31125508cd67f7e7172247f05b7fd1753a +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed e60f7a99d3789b5d0b24d3c0571b013309e56815 +at91 58f72e7817f1f46d1a61558bc8dae1059c0d9379 +broadcom 62a3c97f8167c88a5623d45c8984927c82c286be +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 365fcc03b6321f36eb7cbda8baa737238c387907 +imx-mxs 4db02d61a81ea4ab3bf9ec6878ccf3f2a3f27405 +mediatek 9802b60bd6d895a8be9c44cc5f74bb11131aa8bc +mvebu 476887312c6082e2c03efc3f016e8134c076108e +omap 3571685e5445b85219df88eb13dcc81c2aaa2c2f +qcom 4f6a031a1c8dcfb2252e724cf36a48981c92c099 +renesas a4ce2434e9bb0e1ded26c7bdfc45893d3dadc700 +reset c3c46acd5be9a3351c163d2869045cab4d5342dc +rockchip 3a40bdf5fbe2ad9b98b317eb991c476e3a78cac4 +samsung-krzk 1b97a284a293f1ce0c31fff372c4c90b1100ced6 +scmi 27345a7b7bba72bd4b6d183088e4025fbc416b7f +stm32 769e4b077b2eb5f9c633f4f6a566f29036fb3f47 +sunxi d4d29dd858bb1cb78d2848d6742ade3c0421ce49 +tee 84ec4fd8883176442d21454bcecd3c29c0aabad6 +tegra 5e6333ef8ea5ab004f8a24a8ebb0a3bc15b05586 +ti bfb1d67c6f854cf214a4bc8758a6f8adb02ea222 +xilinx a346958e11808e25fcdea7e9cf57680402aac2f1 +clk 4f964cfef39d48a8e6748847df9a1ed310b96c4e +clk-imx f52f00069888e410cec718792b3e314624f209ea +clk-renesas 515f05da372aedf347a1ac99d17fb832ba371d4d +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch efe1f329f78a8d1b8d235c3b8a690aa2e6e2724b +m68k 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8 +m68knommu ceb6a6f023fd3e8b07761ed900352ef574010bcb +microblaze ffb0399437ef582b035089d1617bbb0ea174cd0c +mips 3c1e5abcda64bed0c7bffa65af2316995f269a61 +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 47bd91340b0f51cb59c2c51a591227ea14039bbf +powerpc 44a1aad2fe6c10bfe0589d8047057b10a4c18a19 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v d4abde52b4b116111537593e2744b3234d18808d +riscv-dt 56b10953da7e9e92eb1a72860db656ac6a5699a1 +riscv-soc a3ee4347490b0e7c1b7111ea668a194807b0e20b +s390 8eb3db95a8c8ecd6f8bb082a99ded3bbc79b023f +sh b85ea95d086471afb4ad062012a4d73cd328fa86 +uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88 +xtensa a03cd7602a090eae277d2b79d43925661e7fbe9a +bcachefs 1d1edd147cbd59f87c664ab134dec39f1d0412e9 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt c919330dd57835970b37676d377de3eaaea2c1e9 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 932ab07c383e655d4a353bb3b67c7164cad64eb3 +ceph c44f04bff405160082ea0c0f1d841cdb08e13993 +cifs a1ac095871e6404270974a1648f85494760ea7fe +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs aa12a790d31be14b289d5a2c6f41ca535fcc7841 +exfat f55c096f62f100aa9f5f48d86e1b6846ecbd67e7 +exportfs 4213483e1c20c127de34f007cef3c5be50d418f3 +ext3 46ee834035ac224e4e1240532e27290981e4c7ad +ext4 68da4c44b994aea797eb9821acb3a4a36015293e +f2fs 70d201a40823acba23899342d62bc2644051ad2e +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse 3f29f1c336c0e8a4bec52f1e5217f88835553e5b +gfs2 dc33003bffec99504639416fd1338c0ddf62e226 +jfs a280c9ceeca73fad22af79b08b470fc7126cf1d5 +ksmbd 77bebd186442a7d703b796784db7495129cc3e70 +nfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd 17419aefcbfd9891863e8b8132f0bca9a6b2984e +ntfs3 ddb17dc880eeaac37b5a6e984de07b882de7d78d +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs adbf4c4954e33e623897058a617c583d65a177f6 +v9fs ff49bf1867578f23a5ffdd38f927f6e1e16796c4 +v9fs-ericvh 5254c0cbc92d2a08e75443bdb914f1c4839cdf5a +xfs d61b40bf15ce453f3aa71f6b423938e239e7f8f8 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner cd51dcb4290ae52e16c094d83686503f6b1e037c +vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +printk 6c3a34e38436a2a3f7a1fa764c108ee19b05b893 +pci 7119ca35ee4a0129ae86ae9d36f357edc55aab2f +pstore 24a0b5e196cf70ccff97bc0add6fa7178ad50cc4 +hid 80d5a73edcfbd1d8d6a4c2b755873c5d63a1ebd7 +i2c c5eb372fe3e6eef7d080371e1b4b5f3669820ee9 +i3c 4fa0888f6f3e6a67cac5afafb23e33f8222cfdd0 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 2539b15d504c3f9fd8ca82032bf9c80c9864412c +jc_docs ead8467f96d6dc35bbf8c63ee9d244a357ede84a +v4l-dvb 60a031b64984ad4a219a13b0fe912746b586bb9b +v4l-dvb-next 60a031b64984ad4a219a13b0fe912746b586bb9b +pm 15f5ad190ec05493ea77da93644d86d26834b485 +cpufreq-arm 0990319a0400db1d6069b5549327cd9105a266d5 +cpupower 997bbf2accf618b87d7cc47192796e5461ca87c4 +devfreq aed5ed595960c6d301dcd4ed31aeaa7a8054c0c6 +pmdomain d6948c13b663a284574cb9e502dd663e70d910e8 +opp dcfec12b67980cba139a6c3afba57ebd4936ebe8 +thermal 5314b1543787e6cd5d248186fcfd5c5fc4ca2146 +dlm 5beebc1dda47719dac85830c53bca1a0ab497d96 +rdma d24b923f1d696ddacb09f0f2d1b1f4f045cfe65e +net-next 3e7aeb78ab01c2c2f0e1f784e5ddec88fcd3d106 +bpf-next 3fbf61207c66ff7ac9b60ab76d4bfd239f97e973 +ipsec-next 3e7aeb78ab01c2c2f0e1f784e5ddec88fcd3d106 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next a7fe0881d9b78d402bbd9067dd4503a57c57a1d9 +ipvs-next 42a7889a1931a07a04a64c8cd72f41a4ba78a1d9 +bluetooth 6061d66bd0e5ac1eca2858356cd8d7c12f415176 +wireless-next 3fbf61207c66ff7ac9b60ab76d4bfd239f97e973 +wpan-next 2373699560a754079579b7722b50d1d38de1960e +wpan-staging 2373699560a754079579b7722b50d1d38de1960e +mtd 98d4fda8f2d4bc3fb97958d2ef4c90e161a628f2 +nand 023e6aad7e5e7f2e086c399abd0675589c123728 +spi-nor 3c0e1dfa703cd2a16fbfb1290b0970b61add3cde +crypto b8910630c967ffee582289451ddb5f9f19c26872 +drm 205e18c13545ab43cc4fe4930732b4feef551198 +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-exynos 10faae933f2b0316cbbf2fb14144d3f62c3358a0 +drm-misc 1f1626ac0428820f998245478610f452650bcab5 +amdgpu 762343f79e431b0555469e97e3afcd443027fa37 +drm-intel d505a16e00c35919fd9fe5735894645e0f70a415 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm d4ca26ac4be0d9aea7005c40df75e6775749671b +drm-msm-lumag d4ca26ac4be0d9aea7005c40df75e6775749671b +etnaviv f1a925152c8518fe21cc2cad4d48e4c61d11bc33 +fbdev 9a9895fd7f795631ebbc592aef5505318d314045 +regmap 632cdb1dab49248236e4a32a7b792a99192b9f7b +sound fb3c007fde80d9d3b4207943e74c150c9116cead +ieee1394 986c20bb3e67d0171c0c2e4acd25429b1876b963 +sound-asoc 6db342158dbd819be53f6955109fa67f399526b8 +modules 4515d08a742c76612b65d2f47a87d12860519842 +input 52c4e5985a730796a3fa555b83b404708b960f9d +block baec4e4d14be21fc6013a11ca31f74d224fffdd4 +device-mapper 5d6f447b07d5432686ba69183af6e96ac58069c9 +libata fa7280e5dd815363af147dc5358b25f5a06c9c68 +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 5d40213347480e3ab903d5438dbd0d6b0110e6b8 +mfd 284d16c456e5d4b143f375b8ccc4038ab3f4ee0f +backlight 7d84a63a39b78443d09f2b4edf7ecb1d586379b4 +battery 05599b5f56b750b5a92ff7f2c081945210816f83 +regulator 94cc3087aac4103c33c6da84c092301afd783200 +security f1bb47a31dff6d4b34fb14e99850860ee74bb003 +apparmor 8ead196be219adade3bd0d4115cc9b8506643121 +integrity c00f94b3a5be428837868c0f2cdaa3fa5b4b1995 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux bbf5a1d0e5d0fb3bdf90205aa872636122692a50 +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 2b6fad7a900d2a378b475e5c196c146fb71856be +watchdog 9546b21ea672aa961d5a89ea754214afed013f02 +iommu 75f74f85a42eb294b657f847c33e1bb7921dbec9 +audit 24fade412acf3e349e337b9472a5a8f7eb94cfb8 +dt-krzk b85ea95d086471afb4ad062012a4d73cd328fa86 +mailbox cd795fb0c352c1f70e5fa437b01572c8693e1b77 +spi 5d81c811f371bd12e2346cf9e410d7ec8c61af84 +tip 1ac6b49423e83af2abed9be7fbdf2e491686c66b +clockevents c0c4579d79d0df841e825c68df450909a0032faf +edac e6e10e8939e07d01da621db3de0cbfcf0f965863 +ftrace 4af12c95cbe888b71e905058c48e8d1e779264b5 +rcu 7dfb03dd24d43b9e7a725e70d2e8a83bb29df294 +kvm 1c6d984f523f67ecfad1083bb04c55d91977bb15 +kvm-arm 040113fa32f27096f531c377001936e0d7964597 +kvms390 10f7b1dcdfe05efcd26e90e337daf1bfd8f4a6da +kvm-ppc 180c6b072bf360b686e53d893d8dcf7dbbaec6bb +kvm-riscv aad86da229bc9d0390dc2c02eb0db9ab1f50d059 +kvm-x86 1c6d984f523f67ecfad1083bb04c55d91977bb15 +xen-tip 2d2db7d40254d5fb53b11ebd703cd1ed0c5de7a1 +percpu 1e653a292c260fd99d0dc7e7d8fd886c22a4593f +workqueues 1a65a6d17cbc58e1aeffb2be962acce49efbef9c +drivers-x86 236f7d8034ff401d02fa6d74bae494a2b54e1834 +chrome-platform 57eb6dcd32cf6b49c38eff81e60e8fd471aa05a8 +chrome-platform-firmware 09aeaabebdafbcf4afd1c481beaff37ecbc6b023 +hsi fa72d143471d04ce3055d8dad9743b08c19e4060 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 4289e434c46c8cbd32cf8b67fa7689b3d2ca4361 +ipmi 9bd9fbd9032a3b7e9ea916d6e58ba0116e0621be +driver-core e3977e0609a07d86406029fceea0fd40d7849368 +usb 933bb7b878ddd0f8c094db45551a7daddf806e00 +thunderbolt 04b99eac389adc6485f7913d83ec9ed68bbc8326 +usb-serial a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 +tty 0c84bea0cabc4e2b98a3de88eeb4ff798931f056 +char-misc 5850edccec30325707f953bc088497b3b9041231 +accel a9f07790a4b2250f0140e9a61c7f842fd9b618c7 +coresight 60e5f23dc5d68ec01e6dae8f4311230c7d2ccb8a +fastrpc b85ea95d086471afb4ad062012a4d73cd328fa86 +fpga c849ecb2ae8413f86c84627cb0af06dffce4e215 +icc 869b601db3b75d7b780260096d6eafb9935388f1 +iio b1a1eaf6183697b77f7243780a25f35c7c0c8bdf +phy-next 2029e71482fcd94dcc7df2c66c7fa635479748bf +soundwire becfce5233a78956654f36555f1b9187f8d11d56 +extcon 7803680964c025f598f827b7ea7433467ef21a56 +gnss 0cbbbe09d49b959d0225f7f2223a8ae3b2c1964c +vfio 78f70c02bdbccb5e9b0b0c728185d4aeb7044ace +w1 93c4bb3666a3d463c73a66ab3cc78a4c4b83631a +spmi b85ea95d086471afb4ad062012a4d73cd328fa86 +staging 0a46c21c21c1f1c9a65e29eaae243d0f240bbd6b +counter-next 49ca40f8d6ceb76bff83713f79215d8e6252f045 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 3d0b2176e04261ab4ac095ff2a17db077fc1e46d +cgroup b7aaea747923ec5492d17a2e26de347135e2c6b9 +scsi 2d1fce73f826b1211cf285596eeb419e21e5e146 +scsi-mkp 7d1ae55ffed0ff78ed33b1465c1233e05024e135 +vhost f16d65124380ac6de8055c4a8e5373a1043bb09b +rpmsg ff9af5732fe761fa8e7aa66cb482f93a37e284ee +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 1979a28075470ef82472a5656ecc969f901e0d3b +gpio-intel 92fc925f838660eec25862a7fa7e6ef79d22f3ea +pinctrl 0ef4b05e2dfbed0f9ca8e8973f467998f96abdc1 +pinctrl-intel ebe7f3393784857c487bf82f86813a8b1384e278 +pinctrl-renesas 9e5889c68d992b65efd10aa0a4523c96fd07077f +pinctrl-samsung 6cf96df77338c6a7e753229fe6d330ab60e28cda +pwm 9320fc509b87b4d795fb37112931e2f4f8b5c55f +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest ee9793be08b1a1c29308a099c01790a3befb390a +kunit b85ea95d086471afb4ad062012a4d73cd328fa86 +kunit-next 539e582a375dedee95a4fa9ca3f37cdb25c441ec +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc 14688f1a91e1f37bc6bf50ff5241e857f24338e0 +nvdimm a085a5eb6594a3ebe5c275e9c2c2d341f686c23c +at24 c692086d74a0184d8993e056dc9273abe690e315 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 98b1cc82c4affc16f5598d4fa14b1858671b2263 +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus b85ea95d086471afb4ad062012a4d73cd328fa86 +nvmem b85ea95d086471afb4ad062012a4d73cd328fa86 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay c52391fafcefe4c562bdac62088a2735c185b942 +kgdb 23816724fdbd47c28bc998866fd7bc5ad9f0e535 +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 01bd694ac2f682fb8017e16148b928482bc8fa4b +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl 73bf93edeeea866b0b6efbc8d2595bdaaba7f1a5 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 4afa688d7141ae7a166d32224abbfd536acccfca +unicode 7f29d67809293992a721edeab3903ad498e0e9cd +slab 61d7e367f8bcc8083f02dcc5ce89b98b1480929d +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 40ab4e0407f6be5b7ecd24127e52d8aef5d5b24d +rust 711cbfc717650532624ca9f56fbaf191bed56e67 +sysctl 561429807d50aad76f1205b0b1d7b4aacf365d4e +execve 38132920f430d96de08c192ef4048f3ee54c2d69 +bitmap 071ad962baf5e857fd965595421cf6fb588610ed +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp a75b3809dce2ad006ebf7fa641f49881fa0d79d7 +kspp-gustavo 5ea9350aab7eda203739267355037bb7f2b46029 +nolibc d543d9ddf593b1f4cb1d57d9ac0ad279fe18adaf +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 47f2bd2ff382e5fe766b1322e354558a8da4a470 +devicetree 8ee03a40e9f9f6123190e288d4ddb32eec645e1e +header_cleanup 1e2f2d31997a9496f99e2b43255d6a48b06fbcc2 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f7d67c51b0ef --- /dev/null +++ b/Next/Trees @@ -0,0 +1,375 @@ +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 +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 +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +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/libata/linux#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 +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/ukleinek/linux.git#pwm/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..887a0d80288e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5264 @@ +$ date -R +Thu, 18 Jan 2024 09:52:50 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat +Merging origin/master (82fd5ee9d8a5 Merge tag 'for-linus-6.8-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 052d534373b7..82fd5ee9d8a5 +Fast-forward (no commit created; -m option ignored) + .mailmap | 5 +- + Documentation/admin-guide/features.rst | 2 +- + Documentation/admin-guide/hw_random.rst | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/arch/arc/features.rst | 2 +- + Documentation/arch/arm/features.rst | 2 +- + Documentation/arch/arm64/features.rst | 2 +- + Documentation/arch/loongarch/features.rst | 2 +- + Documentation/arch/m68k/features.rst | 2 +- + Documentation/arch/mips/features.rst | 2 +- + Documentation/arch/nios2/features.rst | 2 +- + Documentation/arch/openrisc/features.rst | 2 +- + Documentation/arch/parisc/features.rst | 2 +- + Documentation/arch/powerpc/features.rst | 2 +- + Documentation/arch/riscv/features.rst | 2 +- + Documentation/arch/riscv/hwprobe.rst | 122 ++++- + Documentation/arch/s390/features.rst | 2 +- + Documentation/arch/sh/features.rst | 2 +- + Documentation/arch/sparc/features.rst | 2 +- + Documentation/arch/x86/features.rst | 2 +- + Documentation/arch/xtensa/features.rst | 2 +- + Documentation/core-api/workqueue.rst | 2 +- + Documentation/dev-tools/kunit/running_tips.rst | 11 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/riscv/extensions.yaml | 219 ++++++++ + Documentation/sphinx/kernel_feat.py | 57 +- + Documentation/sphinx/requirements.txt | 2 + + Documentation/trace/kprobes.rst | 3 +- + .../translations/zh_CN/arch/loongarch/features.rst | 2 +- + .../translations/zh_CN/arch/mips/features.rst | 2 +- + .../translations/zh_TW/arch/loongarch/features.rst | 2 +- + .../translations/zh_TW/arch/mips/features.rst | 2 +- + Documentation/virt/kvm/api.rst | 219 +++++++- + Documentation/virt/kvm/locking.rst | 7 +- + MAINTAINERS | 29 +- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/pgtable.h | 2 + + arch/arm/mach-davinci/Kconfig | 1 + + arch/arm/mm/dma-mapping.c | 5 +- + arch/arm/mm/fault.c | 30 ++ + arch/arm/mm/kasan_init.c | 8 +- + arch/arm/vfp/vfpmodule.c | 18 + + arch/arm64/include/asm/esr.h | 15 + + arch/arm64/include/asm/kvm_arm.h | 57 +- + arch/arm64/include/asm/kvm_emulate.h | 34 +- + arch/arm64/include/asm/kvm_host.h | 140 +++-- + arch/arm64/include/asm/kvm_nested.h | 56 +- + arch/arm64/include/asm/kvm_pgtable.h | 76 ++- + arch/arm64/include/asm/kvm_pkvm.h | 5 +- + arch/arm64/include/asm/vncr_mapping.h | 103 ++++ + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kvm/Kconfig | 7 +- + arch/arm64/kvm/arch_timer.c | 3 +- + arch/arm64/kvm/arm.c | 12 +- + 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 | 6 +- + 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/nested.c | 22 +- + arch/arm64/kvm/reset.c | 9 +- + arch/arm64/kvm/sys_regs.c | 235 +++++++-- + arch/arm64/kvm/vgic/vgic-its.c | 5 + + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 28 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 101 ++-- + arch/loongarch/include/asm/kvm_host.h | 25 +- + arch/loongarch/include/asm/kvm_vcpu.h | 21 +- + arch/loongarch/include/uapi/asm/kvm.h | 1 + + arch/loongarch/kernel/fpu.S | 2 + + arch/loongarch/kvm/Kconfig | 5 +- + arch/loongarch/kvm/exit.c | 50 +- + arch/loongarch/kvm/main.c | 1 - + arch/loongarch/kvm/mmu.c | 124 +++-- + arch/loongarch/kvm/switch.S | 31 ++ + arch/loongarch/kvm/timer.c | 127 +++-- + arch/loongarch/kvm/trace.h | 6 +- + arch/loongarch/kvm/vcpu.c | 307 +++++++++-- + arch/microblaze/configs/mmu_defconfig | 13 +- + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/alchemy/devboards/db1550.c | 2 +- + arch/mips/bcm47xx/buttons.c | 6 +- + arch/mips/bcm63xx/clk.c | 4 +- + arch/mips/boot/compressed/dbg.c | 2 +- + arch/mips/boot/compressed/head.S | 4 +- + arch/mips/boot/elf2ecoff.c | 2 +- + arch/mips/cavium-octeon/csrc-octeon.c | 2 +- + .../cavium-octeon/executive/cvmx-boot-vector.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-jtag.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 +- + arch/mips/fw/arc/promlib.c | 6 +- + arch/mips/include/asm/debug.h | 2 +- + arch/mips/include/asm/dmi.h | 2 +- + arch/mips/include/asm/io.h | 4 +- + arch/mips/include/asm/kvm_host.h | 2 - + arch/mips/include/asm/mach-au1x00/au1000_dma.h | 2 +- + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 2 +- + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +- + .../include/asm/mach-loongson64/loongson_hwmon.h | 2 +- + .../include/asm/mach-loongson64/loongson_regs.h | 2 +- + arch/mips/include/asm/mach-malta/spaces.h | 4 +- + arch/mips/include/asm/mips-boards/bonito64.h | 2 +- + arch/mips/include/asm/mips-cpc.h | 2 +- + arch/mips/include/asm/mipsregs.h | 4 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 +- + arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 6 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 2 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 4 +- + arch/mips/include/asm/octeon/octeon-model.h | 4 +- + arch/mips/include/asm/page.h | 2 +- + arch/mips/include/asm/pci.h | 2 +- + arch/mips/include/asm/pgtable-bits.h | 2 +- + arch/mips/include/asm/sgi/mc.h | 2 +- + arch/mips/include/asm/sn/klconfig.h | 2 +- + arch/mips/include/asm/sync.h | 2 +- + arch/mips/include/asm/thread_info.h | 2 +- + arch/mips/include/asm/timex.h | 2 +- + arch/mips/include/asm/vdso/vdso.h | 2 +- + arch/mips/include/uapi/asm/mman.h | 2 +- + arch/mips/include/uapi/asm/msgbuf.h | 2 +- + arch/mips/kernel/cpu-probe.c | 2 +- + arch/mips/kernel/genex.S | 8 +- + arch/mips/kernel/kprobes.c | 2 +- + arch/mips/kernel/prom.c | 2 + + arch/mips/kernel/relocate.c | 2 +- + arch/mips/kernel/relocate_kernel.S | 2 +- + arch/mips/kernel/setup.c | 6 +- + arch/mips/kernel/signal.c | 2 +- + arch/mips/kernel/traps.c | 99 ++-- + arch/mips/kernel/vpe.c | 4 +- + arch/mips/kvm/Kconfig | 6 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/loongson2ef/common/platform.c | 2 +- + arch/mips/loongson64/smp.c | 2 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/cex-gen.S | 2 +- + arch/mips/mm/init.c | 16 +- + arch/mips/mm/ioremap.c | 4 + + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlbex.c | 4 +- + arch/mips/net/bpf_jit_comp32.c | 2 +- + arch/mips/pci/ops-loongson2.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-octeon.c | 2 +- + arch/mips/pci/pci-xtalk-bridge.c | 2 +- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/ralink/mt7621.c | 2 +- + arch/mips/sgi-ip27/ip27-hubio.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/parisc/kernel/firmware.c | 4 +- + arch/powerpc/include/asm/kvm_host.h | 2 - + arch/powerpc/kvm/Kconfig | 14 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/kvm/powerpc.c | 10 +- + arch/riscv/Kconfig | 26 +- + arch/riscv/configs/rv32_defconfig | 139 ----- + arch/riscv/include/asm/cpu_ops.h | 14 +- + arch/riscv/include/asm/cpufeature.h | 4 +- + arch/riscv/include/asm/hwcap.h | 38 +- + arch/riscv/include/asm/hwprobe.h | 24 + + arch/riscv/include/asm/kfence.h | 4 +- + arch/riscv/include/asm/kvm_host.h | 12 +- + arch/riscv/include/asm/kvm_vcpu_sbi.h | 20 +- + arch/riscv/include/asm/paravirt.h | 28 + + arch/riscv/include/asm/paravirt_api_clock.h | 1 + + arch/riscv/include/asm/pgtable-64.h | 22 +- + arch/riscv/include/asm/pgtable.h | 33 +- + arch/riscv/include/asm/sbi.h | 17 + + arch/riscv/include/asm/sections.h | 1 + + arch/riscv/include/asm/thread_info.h | 1 - + arch/riscv/include/asm/xip_fixup.h | 2 +- + arch/riscv/include/uapi/asm/hwprobe.h | 32 ++ + arch/riscv/include/uapi/asm/kvm.h | 13 + + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/cpu-hotplug.c | 19 +- + arch/riscv/kernel/cpu_ops.c | 14 +- + arch/riscv/kernel/cpu_ops_sbi.c | 19 - + arch/riscv/kernel/cpu_ops_spinwait.c | 11 - + arch/riscv/kernel/cpufeature.c | 195 ++++++- + arch/riscv/kernel/efi.c | 2 +- + arch/riscv/kernel/head.S | 6 +- + arch/riscv/kernel/mcount-dyn.S | 2 +- + arch/riscv/kernel/mcount.S | 2 +- + arch/riscv/kernel/module.c | 3 +- + arch/riscv/kernel/paravirt.c | 135 +++++ + arch/riscv/kernel/patch.c | 11 +- + arch/riscv/kernel/setup.c | 1 - + arch/riscv/kernel/signal.c | 2 +- + arch/riscv/kernel/smp.c | 2 +- + arch/riscv/kernel/smpboot.c | 38 +- + arch/riscv/kernel/sys_hwprobe.c | 411 +++++++++++++++ + arch/riscv/kernel/sys_riscv.c | 285 ---------- + arch/riscv/kernel/time.c | 3 + + arch/riscv/kernel/traps_misaligned.c | 6 +- + arch/riscv/kernel/vdso/hwprobe.c | 86 ++- + arch/riscv/kernel/vmlinux-xip.lds.S | 2 + + arch/riscv/kernel/vmlinux.lds.S | 2 + + arch/riscv/kvm/Kconfig | 7 +- + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/mmu.c | 22 +- + arch/riscv/kvm/vcpu.c | 10 +- + arch/riscv/kvm/vcpu_onereg.c | 143 +++-- + arch/riscv/kvm/vcpu_sbi.c | 142 +++-- + arch/riscv/kvm/vcpu_sbi_replace.c | 2 +- + arch/riscv/kvm/vcpu_sbi_sta.c | 208 ++++++++ + arch/riscv/kvm/vcpu_switch.S | 32 +- + arch/riscv/kvm/vcpu_vector.c | 16 + + arch/riscv/kvm/vm.c | 1 - + arch/riscv/lib/clear_page.S | 2 +- + arch/riscv/lib/tishift.S | 2 +- + arch/riscv/lib/uaccess.S | 2 +- + arch/riscv/mm/Makefile | 3 +- + arch/riscv/mm/fault.c | 16 +- + arch/riscv/mm/hugetlbpage.c | 12 +- + arch/riscv/mm/init.c | 8 +- + arch/riscv/mm/kasan_init.c | 45 +- + arch/riscv/mm/pageattr.c | 55 +- + arch/riscv/mm/pgtable.c | 51 +- + arch/s390/include/asm/facility.h | 6 + + arch/s390/include/asm/kvm_host.h | 2 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/facility.c | 21 + + arch/s390/kvm/Kconfig | 5 +- + arch/s390/kvm/guestdbg.c | 4 +- + arch/s390/kvm/kvm-s390.c | 1 - + arch/s390/kvm/vsie.c | 19 +- + arch/um/Makefile-skas | 5 + + arch/um/drivers/chan_user.c | 42 +- + arch/um/drivers/line.c | 13 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/virt-pci.c | 2 +- + arch/um/include/asm/mmu.h | 1 - + arch/um/include/asm/processor-generic.h | 1 - + arch/um/include/shared/kern_util.h | 5 +- + arch/um/include/shared/os.h | 3 - + arch/um/include/shared/ptrace_user.h | 41 -- + arch/um/include/shared/registers.h | 2 - + arch/um/kernel/process.c | 14 +- + arch/um/kernel/ptrace.c | 2 - + arch/um/kernel/signal.c | 12 - + arch/um/kernel/skas/uaccess.c | 4 +- + arch/um/kernel/time.c | 32 +- + arch/um/os-Linux/helper.c | 6 +- + arch/um/os-Linux/registers.c | 20 - + arch/um/os-Linux/skas/process.c | 115 ++-- + arch/um/os-Linux/start_up.c | 111 +--- + arch/um/os-Linux/util.c | 19 +- + 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 | 75 ++- + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kernel/kvmclock.c | 12 +- + arch/x86/kvm/Kconfig | 47 +- + arch/x86/kvm/Makefile | 16 +- + arch/x86/kvm/cpuid.c | 33 +- + arch/x86/kvm/cpuid.h | 13 +- + arch/x86/kvm/debugfs.c | 2 +- + 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 | 293 ++++++++++- + arch/x86/kvm/mmu/mmu_internal.h | 3 + + 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 | 86 ++- + 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 | 168 ++++-- + arch/x86/kvm/x86.h | 2 + + arch/x86/kvm/xen.c | 9 +- + arch/x86/um/asm/elf.h | 4 +- + arch/x86/um/asm/processor_64.h | 3 - + arch/x86/um/os-Linux/Makefile | 1 - + arch/x86/um/os-Linux/prctl.c | 12 - + arch/x86/um/ptrace_32.c | 24 - + arch/x86/um/ptrace_64.c | 26 - + arch/x86/um/shared/sysdep/ptrace_32.h | 4 - + arch/x86/um/shared/sysdep/ptrace_user.h | 12 +- + arch/x86/um/shared/sysdep/stub_32.h | 39 +- + arch/x86/um/shared/sysdep/stub_64.h | 17 +- + arch/x86/um/syscalls_64.c | 62 +-- + arch/x86/um/tls_64.c | 2 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/Makefile | 6 +- + arch/xtensa/include/asm/asmmacro.h | 2 +- + arch/xtensa/lib/pci-auto.c | 8 +- + drivers/mtd/mtdcore.c | 5 + + drivers/mtd/ubi/Kconfig | 9 + + drivers/mtd/ubi/block.c | 2 +- + drivers/mtd/ubi/debug.c | 108 +++- + drivers/mtd/ubi/debug.h | 342 ++++++++++-- + drivers/mtd/ubi/io.c | 86 ++- + drivers/mtd/ubi/ubi.h | 45 +- + drivers/parisc/power.c | 2 +- + drivers/s390/char/uvdevice.c | 3 + + drivers/xen/gntdev-dmabuf.c | 54 +- + drivers/xen/xenbus/xenbus_client.c | 59 ++- + fs/anon_inodes.c | 51 +- + fs/f2fs/super.c | 1 + + fs/namespace.c | 50 +- + fs/proc/task_mmu.c | 24 +- + fs/ubifs/auth.c | 21 +- + fs/ubifs/commit.c | 13 +- + fs/ubifs/dir.c | 2 + + fs/ubifs/file.c | 30 +- + fs/ubifs/replay.c | 2 + + fs/userfaultfd.c | 5 +- + include/linux/anon_inodes.h | 4 +- + include/linux/fsnotify.h | 19 + + include/linux/kvm_host.h | 181 +++++-- + include/linux/kvm_types.h | 1 + + include/linux/pagemap.h | 17 + + include/linux/pgtable.h | 21 + + include/linux/syscalls.h | 2 +- + include/trace/events/kvm.h | 8 +- + include/uapi/linux/kvm.h | 140 ++--- + include/xen/interface/io/displif.h | 2 +- + include/xen/interface/io/ring.h | 2 +- + include/xen/interface/io/sndif.h | 2 +- + io_uring/io_uring.c | 3 +- + kernel/crash_core.c | 16 +- + kernel/kexec_core.c | 1 + + lib/Kconfig.debug | 2 + + mm/compaction.c | 43 +- + mm/kasan/generic.c | 10 +- + mm/memory_hotplug.c | 8 +- + mm/migrate.c | 2 + + mm/mm_init.c | 6 + + mm/userfaultfd.c | 6 + + scripts/decode_stacktrace.sh | 19 +- + tools/testing/selftests/kvm/Makefile | 9 +- + .../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 +++++++ + .../selftests/kvm/include/aarch64/processor.h | 4 +- + tools/testing/selftests/kvm/include/guest_modes.h | 4 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 217 ++++++-- + .../selftests/kvm/include/riscv/processor.h | 62 ++- + 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 +- + .../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 | 229 ++++---- + tools/testing/selftests/kvm/lib/memstress.c | 3 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 49 +- + tools/testing/selftests/kvm/lib/riscv/ucall.c | 26 - + tools/testing/selftests/kvm/riscv/get-reg-list.c | 576 ++++++++++----------- + tools/testing/selftests/kvm/s390x/cmma_test.c | 11 +- + .../testing/selftests/kvm/set_memory_region_test.c | 161 +++++- + tools/testing/selftests/kvm/steal_time.c | 99 ++++ + 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 | 12 +- + 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 + + .../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 +- + .../kvm/x86_64/vmx_set_nested_state_test.c | 16 +- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 8 +- + tools/testing/selftests/mm/hugepage-vmemmap.c | 29 +- + tools/testing/selftests/riscv/hwprobe/Makefile | 5 +- + tools/testing/selftests/riscv/hwprobe/hwprobe.c | 2 +- + tools/testing/selftests/riscv/hwprobe/hwprobe.h | 2 +- + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 154 ++++++ + .../testing/selftests/riscv/vector/vstate_prctl.c | 10 +- + virt/kvm/Kconfig | 30 +- + 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 | 522 ++++++++++++++++--- + virt/kvm/kvm_mm.h | 26 + + 421 files changed, 10203 insertions(+), 4385 deletions(-) + create mode 100644 arch/arm64/include/asm/vncr_mapping.h + delete mode 100644 arch/riscv/configs/rv32_defconfig + create mode 100644 arch/riscv/include/asm/paravirt.h + create mode 100644 arch/riscv/include/asm/paravirt_api_clock.h + create mode 100644 arch/riscv/kernel/paravirt.c + create mode 100644 arch/riscv/kernel/sys_hwprobe.c + create mode 100644 arch/riscv/kvm/vcpu_sbi_sta.c + create mode 100644 arch/s390/kernel/facility.c + 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 + delete mode 100644 arch/x86/um/os-Linux/prctl.c + 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 tools/testing/selftests/riscv/hwprobe/which-cpus.c + create mode 100644 virt/kvm/guest_memfd.c +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (da864b7c9eb3 selftests/mm: switch to bash from sh) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging include/linux/pagemap.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + fs/hugetlbfs/inode.c | 2 +- + fs/xfs/scrub/xfile.c | 5 ++++ + include/linux/mman.h | 1 + + include/linux/pagemap.h | 14 +++++++++++ + kernel/events/uprobes.c | 2 +- + mm/memcontrol.c | 29 +++++++++++++++++++--- + mm/memory-failure.c | 2 +- + mm/readahead.c | 2 +- + .../selftests/mm/charge_reserved_hugetlb.sh | 2 +- + tools/testing/selftests/mm/mremap_test.c | 27 ++++++++++---------- + tools/testing/selftests/mm/run_vmtests.sh | 3 +++ + tools/testing/selftests/mm/write_hugetlb_memory.sh | 2 +- + 13 files changed, 70 insertions(+), 23 deletions(-) +Merging kbuild-current/fixes (753547de0dae linux/export: Ensure natural alignment of kcrctab array) +$ 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 (861deac3b092 Linux 6.7-rc7) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (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 +Already up to date. +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 (643fe70e7bcd ARM: sun9i: smp: fix return code check of of_property_match_string) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (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 (3d940bb18183 s390: update defconfigs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (ea937f772083 net: netdevsim: don't try to destroy PHC on VFs) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 17 +++++++++++ + MAINTAINERS | 16 +++-------- + drivers/net/amt.c | 6 ++-- + drivers/net/dsa/vitesse-vsc73xx-core.c | 2 ++ + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +- + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 2 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 5 +++- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 7 ++++- + drivers/net/ethernet/neterion/s2io.c | 1 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 20 +++++++++---- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 33 ++++++++++++++++++++-- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 ++-- + drivers/net/ethernet/wangxun/Kconfig | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + + drivers/net/netdevsim/netdev.c | 9 ++++-- + drivers/net/phy/micrel.c | 9 ++++++ + drivers/net/phy/sfp-bus.c | 8 +++--- + drivers/net/slip/slhc.c | 1 + + drivers/net/slip/slip.c | 1 + + drivers/net/virtio_net.c | 9 +++--- + drivers/net/wan/slic_ds26522.c | 1 + + include/linux/virtio_net.h | 9 ++++-- + include/net/netdev_queues.h | 2 +- + net/core/rtnetlink.c | 14 ++++----- + net/dsa/user.c | 7 +++-- + net/hsr/hsr_main.c | 1 + + net/ipv4/udp.c | 12 ++++---- + net/ipv6/udp.c | 16 +++++------ + net/mptcp/options.c | 6 ++-- + net/mptcp/subflow.c | 17 +++++------ + net/nfc/digital_core.c | 1 + + net/nfc/nci/core.c | 1 + + net/nfc/nci/spi.c | 1 + + net/rxrpc/ar-internal.h | 1 + + net/rxrpc/local_object.c | 13 ++++++++- + net/rxrpc/output.c | 6 ++-- + net/rxrpc/rxkad.c | 2 ++ + net/sched/cls_api.c | 12 ++++++-- + net/sunrpc/auth_gss/auth_gss.c | 1 + + net/sunrpc/auth_gss/gss_krb5_mech.c | 1 + + net/sunrpc/sunrpc_syms.c | 1 + + net/tls/tls_sw.c | 6 +++- + tools/testing/selftests/drivers/net/bonding/config | 3 ++ + .../drivers/net/bonding/mode-1-recovery-updelay.sh | 2 +- + .../drivers/net/bonding/mode-2-recovery-updelay.sh | 2 +- + .../drivers/net/netdevsim/ethtool-common.sh | 1 + + .../selftests/drivers/net/netdevsim/ethtool-fec.sh | 18 +++++++----- + .../drivers/net/netdevsim/udp_tunnel_nic.sh | 1 + + tools/testing/selftests/net/forwarding/lib.sh | 0 + tools/testing/selftests/net/rtnetlink.sh | 26 +++++++++++++++++ + tools/testing/selftests/net/tcp_ao/Makefile | 4 +-- + tools/testing/selftests/net/tls.c | 14 +++++++++ + 55 files changed, 264 insertions(+), 99 deletions(-) + mode change 100755 => 100644 tools/testing/selftests/net/forwarding/lib.sh +Merging bpf/master (33772ff3b887 selftests/bpf: Add test for alu on PTR_TO_FLOW_KEYS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/bpf/verifier.c | 4 + + net/ipv4/udp.c | 22 ++-- + .../selftests/bpf/prog_tests/sock_iter_batch.c | 135 +++++++++++++++++++++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 3 + + .../testing/selftests/bpf/progs/sock_iter_batch.c | 91 ++++++++++++++ + tools/testing/selftests/bpf/progs/test_jhash.h | 31 +++++ + .../bpf/progs/verifier_value_illegal_alu.c | 19 +++ + 7 files changed, 293 insertions(+), 12 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_iter_batch.c +Merging ipsec/master (1982a2a02c91 xfrm: Clear low order bits of ->flowi4_tos in decode_session4().) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_policy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging netfilter/main (080898f8e782 netfilter: ipset: fix performance regression in swap operation) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Merge made by the 'ort' strategy. + include/linux/netfilter/ipset/ip_set.h | 2 ++ + include/linux/netfilter_bridge.h | 6 ++-- + include/linux/skbuff.h | 2 +- + net/bridge/br_netfilter_hooks.c | 42 ++++++++++++++++++++++------ + net/bridge/br_netfilter_ipv6.c | 14 +++++++--- + net/ipv4/netfilter/nf_reject_ipv4.c | 9 ++++-- + net/ipv6/netfilter/nf_reject_ipv6.c | 11 ++++++-- + net/netfilter/ipset/ip_set_core.c | 31 +++++++++++++++------ + net/netfilter/ipset/ip_set_hash_netiface.c | 8 +++--- + net/netfilter/ipvs/ip_vs_xmit.c | 4 +-- + net/netfilter/nf_log_syslog.c | 13 +++++---- + net/netfilter/nf_queue.c | 6 ++-- + net/netfilter/nf_tables_api.c | 44 +++++++++++++++++++++--------- + net/netfilter/nfnetlink_log.c | 8 +++--- + net/netfilter/nft_limit.c | 19 ++++++++----- + net/netfilter/xt_physdev.c | 2 +- + 16 files changed, 150 insertions(+), 71 deletions(-) +Merging ipvs/main (b29be0ca8e81 netfilter: nft_immediate: drop chain reference counter on error) +$ 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 (989cd9fd1ffe wifi: p54: fix GCC format truncation warning with wiphy->fw_version) +$ 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/intersil/p54/fwio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (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 (fb3c007fde80 ALSA: hda/realtek: Enable headset mic on Lenovo M70 Gen5) +$ 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. + .../devicetree/bindings/sound/tas2562.yaml | 2 - + .../devicetree/bindings/sound/ti,tas2781.yaml | 78 +++++++++++++++++----- + include/sound/tas2781.h | 9 +-- + sound/drivers/aloop.c | 23 +++++-- + sound/pci/hda/hda_generic.c | 1 - + sound/pci/hda/patch_hdmi.c | 6 ++ + sound/pci/hda/patch_realtek.c | 3 + + sound/pci/oxygen/oxygen_mixer.c | 2 +- + sound/soc/codecs/rtq9128.c | 73 +++++++++++--------- + sound/soc/codecs/tas2562.c | 3 - + sound/soc/codecs/tas2781-i2c.c | 8 ++- + sound/soc/generic/audio-graph-card2.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 6 ++ + sound/soc/intel/boards/bxt_rt298.c | 3 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 2 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 3 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 33 +-------- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 41 ++++++++---- + sound/soc/sof/ipc3-dtrace.c | 3 +- + sound/soc/sof/ipc4-loader.c | 11 ++- + sound/soc/sof/ipc4-pcm.c | 4 +- + sound/usb/mixer_scarlett2.c | 42 ++++++------ + 22 files changed, 209 insertions(+), 149 deletions(-) +Merging sound-asoc-fixes/for-linus (6db342158dbd Merge remote-tracking branch 'asoc/for-6.7' into asoc-linus) +$ 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. +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 (0ee2030af4e3 MAINTAINERS: Orphan Cadence PCIe IP) +$ 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 (610a9b8f49fb Linux 6.7-rc8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (610a9b8f49fb Linux 6.7-rc8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +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 (45ad6eb5f557 iio: imu: bno055: serdev requires REGMAP) +$ 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/imu/bno055/Kconfig | 1 + + drivers/iio/industrialio-core.c | 5 ++++- + drivers/iio/magnetometer/rm3100-core.c | 10 ++++++++-- + drivers/iio/pressure/bmp280-spi.c | 1 + + 4 files changed, 14 insertions(+), 3 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 (610a9b8f49fb Linux 6.7-rc8) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (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 (0dd3ee311255 Linux 6.7) +$ 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 (58f65f9db7e0 Input: atkbd - use ab83 as id when skipping the getid command) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/input/touchscreen/atmel_mxt_ts.c +Merge made by the 'ort' strategy. + .../bindings/input/adafruit,seesaw-gamepad.yaml | 63 ++++ + .../devicetree/bindings/input/gpio-keys.yaml | 41 ++- + .../devicetree/bindings/input/gpio-mouse.txt | 32 -- + .../devicetree/bindings/input/gpio-mouse.yaml | 68 +++++ + .../devicetree/bindings/input/iqs269a.yaml | 98 +++++- + .../bindings/input/mediatek,pmic-keys.yaml | 24 +- + .../bindings/input/microchip,cap11xx.yaml | 80 ++++- + .../bindings/input/sprd,sc27xx-vibrator.yaml | 19 +- + .../devicetree/bindings/input/ti,drv2665.txt | 17 -- + .../devicetree/bindings/input/ti,drv2667.txt | 17 -- + .../devicetree/bindings/input/ti,drv266x.yaml | 50 +++ + .../bindings/input/touchscreen/neonode,zforce.yaml | 72 +++++ + .../bindings/input/touchscreen/samsung,s6sy761.txt | 32 -- + .../input/touchscreen/samsung,s6sy761.yaml | 54 ++++ + .../bindings/input/touchscreen/zforce_ts.txt | 34 --- + MAINTAINERS | 7 + + drivers/input/input.c | 8 +- + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/adafruit-seesaw.c | 315 +++++++++++++++++++ + drivers/input/joystick/as5011.c | 24 +- + drivers/input/joystick/pxrc.c | 42 ++- + drivers/input/joystick/xpad.c | 6 +- + drivers/input/keyboard/atkbd.c | 12 +- + drivers/input/keyboard/cap11xx.c | 255 ++++++++++++---- + drivers/input/keyboard/gpio_keys.c | 75 ++++- + 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 | 69 ++--- + drivers/input/misc/ims-pcu.c | 10 +- + drivers/input/misc/iqs269a.c | 335 ++++++++++++++++++--- + 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/touchscreen/zforce_ts.c | 34 +-- + 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 - + 57 files changed, 1634 insertions(+), 551 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adafruit,seesaw-gamepad.yaml + 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/ti,drv2665.txt + delete mode 100644 Documentation/devicetree/bindings/input/ti,drv2667.txt + create mode 100644 Documentation/devicetree/bindings/input/ti,drv266x.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt + create mode 100644 drivers/input/joystick/adafruit-seesaw.c +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 (60a031b64984 media: i2c: thp7312: select CONFIG_FW_LOADER) +$ 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 (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (0dd3ee311255 Linux 6.7) +$ 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 (83303a4c776c KVM: s390: fix cc for successful PQAP) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/s390/kvm/vsie.c +Merge made by the 'ort' strategy. + arch/s390/kvm/priv.c | 8 ++++++-- + arch/s390/kvm/vsie.c | 1 - + arch/s390/mm/gmap.c | 1 + + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging hwmon-fixes/hwmon (2539b15d504c hwmon: (npcm750-pwm-fan) Fix crash observed when instantiating nuvoton,npcm750-pwm-fan) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/npcm750-pwm-fan.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +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 (ceb6a6f023fd Linux 6.7-rc6) +$ 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 (4f9d4cf13b08 Merge branch 'misc-6.8' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/zoned.c +Merge made by the 'ort' strategy. + fs/btrfs/extent-tree.c | 50 ++++++++++++++++++++++++++++++++++------------ + fs/btrfs/inode.c | 22 +++++++++++--------- + fs/btrfs/ioctl.c | 7 +++++++ + fs/btrfs/ref-verify.c | 6 ++++-- + fs/btrfs/send.c | 4 ++-- + fs/btrfs/volumes.c | 2 -- + fs/btrfs/zoned.c | 8 ++------ + include/uapi/linux/btrfs.h | 3 +++ + 8 files changed, 68 insertions(+), 34 deletions(-) +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 (b20712e85330 Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe") +$ 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 (04c116e2bdfc scsi: ufs: core: Let the sq_lock protect sq_tail_slot access) +$ 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 (0dd3ee311255 Linux 6.7) +$ 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 (0dd3ee311255 Linux 6.7) +$ 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 (8abf77c88929 mmc: sdhci-sprd: Fix eMMC init failure after hw reset) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +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 (b8b2711336f0 riscv: Fix set_direct_map_default_noflush() to reset _PAGE_EXEC) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (e1b91b84ea27 riscv: dts: sophgo: separate sg2042 mtime and mtimecmp to fit aclint format) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 80 ++++++++++++++++++++-------------- + 1 file changed, 48 insertions(+), 32 deletions(-) +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 (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) +$ 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 (efb8235bfdbe gpiolib: revert the attempt to protect the GPIO device list with an rwsem) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 2 +- + drivers/gpio/gpio-en7523.c | 6 +- + drivers/gpio/gpio-mlxbf3.c | 2 + + drivers/gpio/gpio-rtd.c | 15 ++- + drivers/gpio/gpiolib-sysfs.c | 45 +++---- + drivers/gpio/gpiolib-sysfs.h | 6 - + drivers/gpio/gpiolib.c | 135 +++++++++++---------- + drivers/gpio/gpiolib.h | 2 - + include/linux/gpio/driver.h | 2 +- + 9 files changed, 114 insertions(+), 101 deletions(-) +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 (2b872b0f466d erofs: Don't use certain unnecessary folio_*() functions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Auto-merging fs/erofs/decompressor.c +Auto-merging fs/erofs/zmap.c +Merge made by the 'ort' strategy. + fs/erofs/decompressor.c | 2 +- + fs/erofs/fscache.c | 6 +++--- + fs/erofs/zmap.c | 23 +++++++++++++---------- + 3 files changed, 17 insertions(+), 14 deletions(-) +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 (1d9cabe2817e SUNRPC: use request size to initialize bio_vec in svc_udp_sendto()) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + net/sunrpc/svcsock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (d988c9f511af MAINTAINERS: Add Namhyung as tools/perf/ co-maintainer) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 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 | 40 +- + 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/lib/subcmd/help.c | 18 +- + tools/perf/.gitignore | 4 + + tools/perf/Documentation/itrace.txt | 1 + + tools/perf/Documentation/perf-annotate.txt | 11 + + 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-report.txt | 3 + + 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/tests/hybrid.c | 37 +- + tools/perf/arch/x86/util/dwarf-regs.c | 38 ++ + tools/perf/arch/x86/util/event.c | 109 ++-- + 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 | 300 ++++++++- + 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 | 93 ++- + tools/perf/builtin-report.c | 113 ++-- + tools/perf/builtin-stat.c | 33 +- + tools/perf/builtin-top.c | 52 +- + tools/perf/builtin-trace.c | 6 +- + tools/perf/perf-archive.sh | 86 ++- + 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 + + .../pmu-events/arch/arm64/arm/cmn/sys/cmn.json | 2 +- + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 3 +- + .../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 +++ + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 15 +- + .../arch/x86/amdzen4/memory-controller.json | 101 +++ + .../pmu-events/arch/x86/amdzen4/recommended.json | 84 +++ + .../arch/x86/cascadelakex/clx-metrics.json | 6 + + .../arch/x86/emeraldrapids/floating-point.json | 27 +- + .../arch/x86/emeraldrapids/pipeline.json | 18 +- + .../x86/emeraldrapids/uncore-interconnect.json | 8 +- + .../arch/x86/emeraldrapids/uncore-io.json | 30 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 6 + + tools/perf/pmu-events/arch/x86/icelakex/other.json | 2 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 2 +- + .../arch/x86/icelakex/uncore-interconnect.json | 6 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 6 +- + .../arch/x86/rocketlake/rkl-metrics.json | 2 +- + .../arch/x86/sapphirerapids/floating-point.json | 27 +- + .../arch/x86/sapphirerapids/pipeline.json | 2 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 6 + + .../x86/sapphirerapids/uncore-interconnect.json | 8 +- + .../arch/x86/sapphirerapids/uncore-io.json | 30 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 6 + + tools/perf/pmu-events/jevents.py | 4 +- + tools/perf/scripts/python/arm-cs-trace-disasm.py | 30 +- + 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 +- + tools/perf/tests/attr/base-record | 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 | 17 +- + tools/perf/tests/code-reading.c | 80 +-- + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/dso-data.c | 15 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/make | 2 +- + tools/perf/tests/maps.c | 61 +- + 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/script.sh | 66 ++ + 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/vmlinux-kallsyms.c | 181 +++--- + 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 | 104 ++-- + tools/perf/ui/browsers/hists.c | 36 +- + tools/perf/ui/browsers/hists.h | 2 - + tools/perf/ui/browsers/scripts.c | 1 + + tools/perf/ui/gtk/annotate.c | 6 +- + tools/perf/ui/gtk/gtk.h | 2 - + tools/perf/ui/tui/setup.c | 22 + + tools/perf/util/Build | 2 + + tools/perf/util/annotate-data.c | 405 ++++++++++++ + tools/perf/util/annotate-data.h | 143 +++++ + tools/perf/util/annotate.c | 689 ++++++++++++++++----- + tools/perf/util/annotate.h | 144 +++-- + 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 | 11 +- + tools/perf/util/bpf-event.h | 12 +- + tools/perf/util/bpf_counter.c | 2 +- + tools/perf/util/bpf_lock_contention.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/db-export.c | 4 +- + tools/perf/util/debug.c | 22 +- + tools/perf/util/debug.h | 1 + + tools/perf/util/debuginfo.c | 205 ++++++ + tools/perf/util/debuginfo.h | 64 ++ + tools/perf/util/dso.c | 4 + + tools/perf/util/dso.h | 2 + + tools/perf/util/dwarf-aux.c | 249 +++++++- + tools/perf/util/dwarf-aux.h | 51 +- + tools/perf/util/dwarf-regs.c | 34 + + tools/perf/util/env.c | 82 ++- + tools/perf/util/env.h | 17 + + tools/perf/util/event.c | 4 +- + tools/perf/util/evlist.c | 34 +- + 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 | 43 +- + tools/perf/util/hisi-ptt.c | 1 + + tools/perf/util/hist.h | 28 +- + tools/perf/util/include/dwarf-regs.h | 19 + + tools/perf/util/machine.c | 75 ++- + tools/perf/util/map.c | 20 +- + tools/perf/util/map.h | 83 +-- + tools/perf/util/maps.c | 532 +++++++++++++--- + tools/perf/util/maps.h | 48 +- + 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-event.c | 40 +- + 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 | 216 ++++++- + tools/perf/util/sort.h | 7 + + tools/perf/util/stat-display.c | 2 +- + tools/perf/util/stat-shadow.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 | 306 +-------- + tools/perf/util/symbol.h | 1 - + tools/perf/util/symbol_conf.h | 6 +- + tools/perf/util/synthetic-events.c | 118 ++-- + tools/perf/util/thread.c | 42 +- + tools/perf/util/thread.h | 14 + + tools/perf/util/top.c | 9 +- + tools/perf/util/top.h | 1 - + tools/perf/util/unwind-libdw.c | 21 +- + tools/perf/util/unwind-libunwind-local.c | 34 +- + tools/perf/util/vdso.c | 35 +- + tools/perf/util/zstd.c | 63 +- + 249 files changed, 7851 insertions(+), 2149 deletions(-) + create mode 100644 tools/build/feature/test-dwarf_getcfi.c + mode change 100644 => 100755 tools/perf/perf-archive.sh + 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 100644 tools/perf/pmu-events/arch/x86/amdzen4/memory-controller.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 100755 tools/perf/tests/shell/script.sh + create mode 100644 tools/perf/util/annotate-data.c + create mode 100644 tools/perf/util/annotate-data.h + create mode 100644 tools/perf/util/debuginfo.c + create mode 100644 tools/perf/util/debuginfo.h +Merging efi-fixes/urgent (0e9ce09fde3a riscv/efistub: Tighten ELF relocation check) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/libstub/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (861deac3b092 Linux 6.7-rc7) +$ 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 +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (a20f1b02bafc drm/bridge: parade-ps8640: Make sure we drop the AUX mutex in the error case) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/tests/drm_mm_test.c +Auto-merging drivers/gpu/drm/ttm/ttm_device.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/parade-ps8640.c | 23 +++++++++++++++ + drivers/gpu/drm/bridge/sii902x.c | 42 ++++++++++++++++++--------- + drivers/gpu/drm/panel/Kconfig | 2 ++ + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 2 ++ + drivers/gpu/drm/tests/drm_mm_test.c | 5 +++- + drivers/gpu/drm/ttm/ttm_device.c | 12 ++++++-- + 7 files changed, 70 insertions(+), 18 deletions(-) +Merging mm-stable/mm-stable (1b1934dbbdcf Merge tag 'docs-6.8-2' of git://git.lwn.net/linux) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (1b1934dbbdcf Merge tag 'docs-6.8-2' of git://git.lwn.net/linux) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (0a368f746bf8 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 arch/arm64/include/asm/esr.h +Auto-merging arch/riscv/Kconfig +Auto-merging drivers/firmware/efi/libstub/Makefile +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-kernel-mm-mempolicy | 4 + + .../sysfs-kernel-mm-mempolicy-weighted-interleave | 26 + + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 8 +- + .../admin-guide/mm/numa_memory_policy.rst | 9 + + Documentation/admin-guide/sysctl/kernel.rst | 14 +- + arch/Kconfig | 2 +- + arch/arm64/Kconfig | 5 +- + arch/arm64/include/asm/esr.h | 4 + + arch/arm64/include/asm/pgtable.h | 8 + + arch/arm64/include/asm/tlbflush.h | 16 + + arch/arm64/kernel/crash_core.c | 1 - + arch/arm64/mm/fault.c | 78 +- + arch/arm64/mm/mmu.c | 28 + + arch/powerpc/Makefile | 4 +- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/ftrace.h | 2 +- + arch/riscv/kernel/crash_core.c | 1 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/ftrace.h | 2 +- + arch/s390/mm/init.c | 3 - + arch/s390/mm/pgtable.c | 4 +- + arch/s390/mm/vmem.c | 62 +- + arch/x86/power/Makefile | 2 +- + crypto/blake2b_generic.c | 2 +- + drivers/android/binder.c | 4 +- + drivers/base/memory.c | 23 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 2 +- + drivers/md/bcache/sysfs.c | 8 +- + drivers/media/test-drivers/vicodec/codec-fwht.c | 2 +- + drivers/regulator/Kconfig | 2 +- + drivers/s390/char/sclp_cmd.c | 44 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/proc/task_mmu.c | 17 +- + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/compiler-clang.h | 2 +- + include/linux/list.h | 15 + + include/linux/list_lru.h | 2 - + include/linux/memory.h | 9 + + include/linux/memory_hotplug.h | 18 +- + include/linux/mempolicy.h | 5 + + include/linux/memremap.h | 1 + + include/linux/min_heap.h | 42 +- + include/linux/mm.h | 21 +- + include/linux/swap.h | 5 +- + include/linux/swapops.h | 13 + + include/linux/vmalloc.h | 1 - + include/linux/win_minmax.h | 4 +- + include/trace/events/oom.h | 19 +- + include/uapi/linux/mempolicy.h | 1 + + ipc/ipc_sysctl.c | 37 +- + ipc/mq_sysctl.c | 36 + + kernel/bounds.c | 2 +- + kernel/crash_core.c | 4 +- + kernel/events/uprobes.c | 2 +- + kernel/kallsyms_selftest.c | 1 - + kernel/kprobes.c | 4 +- + kernel/panic.c | 5 + + kernel/user_namespace.c | 2 +- + lib/Kconfig.kasan | 2 +- + lib/maple_tree.c | 4 +- + lib/raid6/Makefile | 2 +- + lib/sort.c | 20 +- + lib/stackinit_kunit.c | 2 +- + mm/cma.c | 8 +- + mm/filemap.c | 4 +- + mm/huge_memory.c | 23 +- + mm/hugetlb_vmemmap.c | 55 +- + mm/khugepaged.c | 4 +- + mm/list_lru.c | 3 + + mm/memcontrol.c | 146 ++- + mm/memory.c | 76 +- + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 491 ++++++++- + mm/mmap.c | 75 +- + mm/mprotect.c | 4 +- + mm/nommu.c | 2 - + mm/oom_kill.c | 6 +- + mm/page_alloc.c | 44 +- + mm/readahead.c | 6 +- + mm/rmap.c | 10 +- + mm/slab_common.c | 2 +- + mm/sparse.c | 3 +- + mm/userfaultfd.c | 2 +- + mm/vmalloc.c | 1069 +++++++++++++++----- + mm/vmscan.c | 181 +++- + mm/zswap.c | 3 +- + net/bridge/br_multicast.c | 2 +- + security/Kconfig | 2 +- + tools/mm/Makefile | 9 +- + tools/mm/thpmaps | 675 ++++++++++++ + tools/testing/selftests/bpf/README.rst | 32 +- + tools/testing/selftests/bpf/prog_tests/xdpwall.c | 2 +- + .../selftests/bpf/progs/test_core_reloc_type_id.c | 2 +- + .../selftests/filesystems/eventfd/.gitignore | 2 + + .../testing/selftests/filesystems/eventfd/Makefile | 7 + + .../selftests/filesystems/eventfd/eventfd_test.c | 186 ++++ + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 124 +++ + tools/testing/selftests/mm/ksm_functional_tests.c | 4 +- + 103 files changed, 3286 insertions(+), 694 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-mempolicy + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-mempolicy-weighted-interleave + create mode 100644 tools/mm/thpmaps + create mode 100644 tools/testing/selftests/filesystems/eventfd/.gitignore + create mode 100644 tools/testing/selftests/filesystems/eventfd/Makefile + create mode 100644 tools/testing/selftests/filesystems/eventfd/eventfd_test.c + create mode 100644 tools/testing/selftests/mm/hugetlb_madv_vs_map.c +Merging kbuild/for-next (6185d32170b6 kbuild: deb-pkg: use debian/<package> for tmpdir) +$ 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 Documentation/dev-tools/index.rst +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/dev-tools/checkuapi.rst | 477 +++++++++++++++++++++++++++ + Documentation/dev-tools/index.rst | 1 + + Documentation/process/4.Coding.rst | 4 + + Documentation/process/coding-style.rst | 4 + + Makefile | 23 +- + 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/check-uapi.sh | 573 +++++++++++++++++++++++++++++++++ + 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/conf.c | 6 + + scripts/kconfig/confdata.c | 169 +++++----- + scripts/kconfig/expr.c | 1 - + scripts/kconfig/lkc.h | 2 - + scripts/kconfig/lkc_proto.h | 7 + + scripts/kconfig/mconf.c | 56 +--- + scripts/kconfig/menu.c | 17 +- + scripts/kconfig/mnconf-common.c | 53 +++ + scripts/kconfig/mnconf-common.h | 18 ++ + scripts/kconfig/nconf.c | 55 +--- + scripts/kconfig/symbol.c | 37 ++- + scripts/kconfig/util.c | 3 +- + scripts/mod/modpost.c | 17 +- + scripts/mod/modpost.h | 8 +- + scripts/package/builddeb | 104 ++---- + scripts/package/buildtar | 8 +- + scripts/package/deb-build-option | 14 - + scripts/package/debian/copyright | 16 + + scripts/package/debian/rules | 35 +- + scripts/package/install-extmod-build | 2 +- + scripts/package/kernel.spec | 6 - + scripts/package/mkdebian | 28 +- + scripts/package/snapcraft.template | 2 +- + scripts/recordmcount.c | 1 - + scripts/recordmcount.pl | 7 - + scripts/xz_wrap.sh | 1 - + usr/gen_init_cpio.c | 33 +- + 46 files changed, 1490 insertions(+), 509 deletions(-) + create mode 100644 .editorconfig + create mode 100644 Documentation/dev-tools/checkuapi.rst + create mode 100755 scripts/check-uapi.sh + create mode 100644 scripts/git.orderFile + create mode 100644 scripts/kconfig/mnconf-common.c + create mode 100644 scripts/kconfig/mnconf-common.h + delete mode 100755 scripts/package/deb-build-option + create mode 100644 scripts/package/debian/copyright +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 +Already up to date. +Merging perf/perf-tools-next (d988c9f511af MAINTAINERS: Add Namhyung as tools/perf/ co-maintainer) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Already up to date. +Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (7c65aa3cc072 dma-debug: fix kernel-doc warnings) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'ort' strategy. + kernel/dma/debug.c | 3 ++- + kernel/dma/swiotlb.c | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging asm-generic/master (d93cca2f3109 asm-generic: Fix 32 bit __generic_cmpxchg_local) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (8790fade1a19 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 +Already up to date. +Merging arm64/for-next/core (f827bcdafa2a arm64: errata: Add Cortex-A510 speculative unprivileged load workaround) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 2 ++ + arch/arm64/Kconfig | 18 ++++++++++++++++++ + arch/arm64/include/asm/assembler.h | 25 +++++++++---------------- + arch/arm64/include/asm/irq.h | 2 ++ + arch/arm64/kernel/Makefile | 8 +++++++- + arch/arm64/kernel/asm-offsets.c | 2 -- + arch/arm64/kernel/cpu_errata.c | 21 +++++++++++++++++---- + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/tools/cpucaps | 2 +- + 9 files changed, 57 insertions(+), 25 deletions(-) +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 (6905b2bcfacd Merge branch 'soc/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8183.dtsi +Resolved 'arch/arm64/boot/dts/mediatek/mt8183.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0b00ec14953a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 184 +++++++++++++++++++++++++++++++++ + 1 file changed, 184 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (0dd3ee311255 Linux 6.7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date. +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. +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 (365fcc03b632 memory: ti-emif-pm: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (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. +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 +Merge made by the 'ort' strategy. +Merging omap/for-next (3571685e5445 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (4f6a031a1c8d Merge branches 'arm32-for-6.8', 'arm64-defconfig-for-6.8', 'arm64-for-6.8', 'clk-for-6.8' 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 +Merge made by the 'ort' strategy. +$ 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 3cb3c4390777] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git + Date: Thu Jan 18 10:46:12 2024 +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. +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 +Already up to date. +Merging rockchip/for-next (3a40bdf5fbe2 Merge branch 'v6.8-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. +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 +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (27345a7b7bba Merge branches 'for-next/ffa/fixes' and 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 85 ++++++++++++++++++++++++------------ + drivers/firmware/arm_scmi/clock.c | 5 +-- + drivers/firmware/arm_scmi/common.h | 1 + + drivers/firmware/arm_scmi/mailbox.c | 14 ++++++ + drivers/firmware/arm_scmi/perf.c | 23 +++++++--- + drivers/firmware/arm_scmi/raw_mode.c | 12 +++-- + drivers/firmware/arm_scmi/shmem.c | 8 +++- + 7 files changed, 107 insertions(+), 41 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. +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 +Merge made by the 'ort' strategy. +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. +Merging tegra/for-next (5e6333ef8ea5 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 | 115 ++++++++++++++++++++++-------- + drivers/soc/tegra/fuse/fuse-tegra30.c | 20 ++++++ + drivers/soc/tegra/fuse/fuse.h | 8 ++- + 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, 233 insertions(+), 90 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 +Merge made by the 'ort' strategy. +Merging xilinx/for-next (a346958e1180 ARM: zynq: slcr: fix function prototype kernel-doc warnings) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-zynq/slcr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging clk/clk-next (4f964cfef39d Merge branch 'clk-rs9' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (f52f00069888 clk: imx: pll14xx: change naming of fvco to fout) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (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 (efe1f329f78a Merge branch 'loongarch-kvm' into loongarch-next) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/loongarch/configs/loongson3_defconfig +Auto-merging arch/loongarch/kernel/head.S +Auto-merging scripts/min-tool-version.sh +Auto-merging scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 24 +- + .../interrupt-controller/loongson,liointc.yaml | 18 +- + .../devicetree/bindings/loongarch/cpus.yaml | 61 +++ + .../devicetree/bindings/loongarch/loongson.yaml | 34 ++ + Documentation/rust/arch-support.rst | 13 +- + MAINTAINERS | 7 + + arch/loongarch/Kbuild | 1 + + arch/loongarch/Kconfig | 22 + + arch/loongarch/Makefile | 6 +- + arch/loongarch/boot/dts/Makefile | 5 +- + arch/loongarch/boot/dts/loongson-2k0500-ref.dts | 88 ++++ + arch/loongarch/boot/dts/loongson-2k0500.dtsi | 266 +++++++++++ + arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 183 ++++++++ + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 492 +++++++++++++++++++++ + arch/loongarch/boot/dts/loongson-2k2000-ref.dts | 72 +++ + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 300 +++++++++++++ + arch/loongarch/configs/loongson3_defconfig | 55 ++- + arch/loongarch/include/asm/bootinfo.h | 6 +- + arch/loongarch/include/asm/crash_core.h | 12 + + arch/loongarch/include/asm/elf.h | 5 - + arch/loongarch/include/asm/ftrace.h | 2 +- + arch/loongarch/include/asm/shmparam.h | 12 - + arch/loongarch/kernel/acpi.c | 2 +- + arch/loongarch/kernel/efi.c | 2 + + arch/loongarch/kernel/elf.c | 5 - + arch/loongarch/kernel/env.c | 34 +- + arch/loongarch/kernel/head.S | 10 + + arch/loongarch/kernel/process.c | 1 + + arch/loongarch/kernel/setup.c | 56 +-- + arch/loongarch/kernel/smp.c | 5 +- + arch/loongarch/net/bpf_jit.c | 10 +- + scripts/generate_rust_target.rs | 7 + + scripts/min-tool-version.sh | 2 + + scripts/mod/modpost.c | 19 +- + 34 files changed, 1735 insertions(+), 102 deletions(-) + create mode 100644 Documentation/devicetree/bindings/loongarch/cpus.yaml + create mode 100644 Documentation/devicetree/bindings/loongarch/loongson.yaml + create mode 100644 arch/loongarch/boot/dts/loongson-2k0500-ref.dts + create mode 100644 arch/loongarch/boot/dts/loongson-2k0500.dtsi + create mode 100644 arch/loongarch/boot/dts/loongson-2k1000-ref.dts + create mode 100644 arch/loongarch/boot/dts/loongson-2k1000.dtsi + create mode 100644 arch/loongarch/boot/dts/loongson-2k2000-ref.dts + create mode 100644 arch/loongarch/boot/dts/loongson-2k2000.dtsi + create mode 100644 arch/loongarch/include/asm/crash_core.h + delete mode 100644 arch/loongarch/include/asm/shmparam.h +$ git am -3 ../patches/LoongArch-KVM-Fix-build-due-to-API-changes.patch +Applying: LoongArch: KVM: Fix build due to API changes +$ git reset HEAD^ +Unstaged changes after reset: +M arch/loongarch/kvm/mmu.c +$ git add -A . +$ git commit -v -a --amend +[master 932b597cea3d] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git + Date: Thu Jan 18 10:46:34 2024 +1100 +Merging m68k/for-next (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (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 +Already up to date. +Merging mips/mips-next (3c1e5abcda64 MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup()) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (47bd91340b0f parisc/unalignement: Add check to test EFAULT ret value) +$ 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 +Auto-merging arch/parisc/kernel/firmware.c +Merge made by the 'ort' strategy. + arch/parisc/kernel/cache.c | 4 + + arch/parisc/kernel/firmware.c | 286 +++++++++++++++++++-------------------- + arch/parisc/kernel/irq.c | 4 +- + arch/parisc/kernel/smp.c | 17 ++- + arch/parisc/kernel/unaligned.c | 14 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + 6 files changed, 177 insertions(+), 150 deletions(-) +Merging powerpc/next (44a1aad2fe6c Merge branch 'topic/ppc-kvm' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (d4abde52b4b1 Merge patch series "riscv: mm: Fixup & Optimize COMPAT code") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Kconfig.errata +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/sbi.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 9 ++- + .../devicetree/bindings/riscv/extensions.yaml | 2 +- + Documentation/features/vm/TLB/arch-support.txt | 2 +- + arch/riscv/Kconfig | 17 +++++- + arch/riscv/Kconfig.errata | 1 + + arch/riscv/Makefile | 2 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/errata/thead/errata.c | 69 +++++++++++++++++++++- + arch/riscv/include/asm/asm-extable.h | 15 +++++ + arch/riscv/include/asm/errata_list.h | 50 ++-------------- + arch/riscv/include/asm/pgtable.h | 2 +- + arch/riscv/include/asm/processor.h | 2 +- + arch/riscv/include/asm/sbi.h | 19 ++++++ + arch/riscv/include/asm/tlbbatch.h | 15 +++++ + arch/riscv/include/asm/tlbflush.h | 8 +++ + arch/riscv/include/asm/word-at-a-time.h | 27 +++++++++ + arch/riscv/kernel/module.c | 14 +++-- + arch/riscv/kernel/pi/cmdline_early.c | 3 +- + arch/riscv/kernel/sbi.c | 66 +++++++++++++++++++++ + arch/riscv/kernel/suspend.c | 44 ++++++++++++++ + arch/riscv/mm/extable.c | 31 ++++++++++ + arch/riscv/mm/init.c | 21 ++++++- + arch/riscv/mm/tlbflush.c | 69 +++++++++++++++------- + drivers/tty/hvc/Kconfig | 2 +- + drivers/tty/hvc/hvc_riscv_sbi.c | 39 +++++++++--- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/earlycon-riscv-sbi.c | 27 ++++++++- + tools/testing/selftests/riscv/hwprobe/cbo.c | 6 +- + tools/testing/selftests/riscv/hwprobe/hwprobe.c | 4 +- + tools/testing/selftests/riscv/mm/mmap_test.h | 3 + + .../selftests/riscv/vector/v_initval_nolibc.c | 2 +- + .../selftests/riscv/vector/vstate_exec_nolibc.c | 3 + + .../testing/selftests/riscv/vector/vstate_prctl.c | 4 +- + 33 files changed, 479 insertions(+), 102 deletions(-) + create mode 100644 arch/riscv/include/asm/tlbbatch.h +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 +Already up to date. +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 +Merge made by the 'ort' strategy. +Merging s390/for-next (8eb3db95a8c8 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 MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/s390/Kconfig | 7 +- + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/configs/zfcpdump_defconfig | 1 - + arch/s390/include/asm/pci_io.h | 32 ++-- + arch/s390/kernel/fpu.c | 1 - + arch/s390/kernel/perf_pai_crypto.c | 80 +++++----- + arch/s390/kernel/perf_pai_ext.c | 79 +++++----- + arch/s390/kernel/ptrace.c | 1 - + arch/s390/mm/fault.c | 4 +- + arch/s390/pci/pci_mmio.c | 12 +- + drivers/s390/crypto/vfio_ap_ops.c | 266 ++++++++++++++++++++++------------ + drivers/s390/crypto/vfio_ap_private.h | 3 + + 14 files changed, 298 insertions(+), 194 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 (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) +$ 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 (a03cd7602a09 xtensa: don't produce FDPIC output with fdpic toolchain) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging bcachefs/for-next (1d1edd147cbd bcachefs: opts->compression can now also be applied in the background) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs-ioctl.c +Auto-merging fs/bcachefs/super-io.c +Merge made by the 'ort' strategy. + fs/bcachefs/alloc_background.c | 89 +++++++++++----------- + fs/bcachefs/alloc_foreground.c | 7 +- + fs/bcachefs/backpointers.c | 100 ++++++++++++------------ + fs/bcachefs/backpointers.h | 1 + + fs/bcachefs/bcachefs.h | 5 -- + fs/bcachefs/bkey.c | 2 +- + fs/bcachefs/bkey_methods.c | 9 +++ + fs/bcachefs/bkey_methods.h | 10 ++- + fs/bcachefs/bset.c | 7 +- + fs/bcachefs/bset.h | 3 +- + fs/bcachefs/btree_cache.c | 12 +-- + fs/bcachefs/btree_cache.h | 19 +++-- + fs/bcachefs/btree_gc.c | 36 ++++----- + fs/bcachefs/btree_io.c | 38 ++++----- + fs/bcachefs/btree_iter.c | 2 +- + fs/bcachefs/btree_iter.h | 5 ++ + fs/bcachefs/btree_locking.c | 40 ++++++++-- + fs/bcachefs/btree_locking.h | 9 +-- + fs/bcachefs/btree_trans_commit.c | 33 ++++---- + fs/bcachefs/btree_types.h | 12 ++- + fs/bcachefs/btree_update_interior.c | 8 +- + fs/bcachefs/btree_update_interior.h | 42 +++++----- + fs/bcachefs/btree_write_buffer.c | 7 +- + fs/bcachefs/buckets.c | 148 +++++++++++++++++++----------------- + fs/bcachefs/buckets.h | 17 +++++ + fs/bcachefs/buckets_types.h | 15 ++-- + fs/bcachefs/clock.c | 4 +- + fs/bcachefs/compress.h | 8 ++ + fs/bcachefs/data_update.c | 6 +- + fs/bcachefs/debug.c | 16 ++-- + fs/bcachefs/ec.c | 6 +- + fs/bcachefs/extents.c | 11 ++- + fs/bcachefs/extents.h | 2 +- + fs/bcachefs/eytzinger.h | 4 +- + fs/bcachefs/fs-io-direct.c | 4 + + fs/bcachefs/fs-io-pagecache.c | 37 +++++---- + fs/bcachefs/fs-io-pagecache.h | 2 +- + fs/bcachefs/fs-io.c | 9 ++- + fs/bcachefs/fs-ioctl.c | 11 ++- + fs/bcachefs/inode.c | 4 +- + fs/bcachefs/io_misc.c | 4 +- + fs/bcachefs/io_write.c | 13 ++-- + fs/bcachefs/journal.c | 111 +++++++++++++++++---------- + fs/bcachefs/journal_io.c | 8 +- + fs/bcachefs/move.c | 65 +++++++++++++--- + fs/bcachefs/opts.c | 4 +- + fs/bcachefs/opts.h | 9 ++- + fs/bcachefs/rebalance.c | 13 ++-- + fs/bcachefs/recovery.c | 2 +- + fs/bcachefs/reflink.c | 21 +++-- + fs/bcachefs/reflink.h | 8 +- + fs/bcachefs/replicas.c | 26 +++---- + fs/bcachefs/sb-clean.c | 2 +- + fs/bcachefs/sb-members.c | 4 +- + fs/bcachefs/snapshot.c | 2 +- + fs/bcachefs/super-io.c | 4 +- + fs/bcachefs/super.c | 8 +- + fs/bcachefs/sysfs.c | 15 ++-- + fs/bcachefs/trace.h | 76 ++++++------------ + fs/bcachefs/util.c | 15 +++- + fs/bcachefs/util.h | 3 +- + fs/bcachefs/xattr.c | 5 +- + 62 files changed, 680 insertions(+), 538 deletions(-) +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 (c919330dd578 f2fs: fix double free of f2fs_sb_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe 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 +Already up to date. +Merging btrfs/for-next (932ab07c383e Merge branch 'for-next-next-v6.8-20240108' into for-next-20240108) +$ 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/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/zoned.c +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 537f80c827d5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/accessors.c | 12 +++++----- + fs/btrfs/btrfs_inode.h | 3 +-- + fs/btrfs/ctree.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 57 +++++++++++++++++++------------------------- + fs/btrfs/extent_io.h | 16 ++++++++++--- + fs/btrfs/file.c | 11 ++++----- + fs/btrfs/inode.c | 16 +++++-------- + fs/btrfs/tests/inode-tests.c | 40 +++++++++++++++---------------- + 9 files changed, 78 insertions(+), 81 deletions(-) +Merging ceph/master (c44f04bff405 rbd: don't move requests to the running list on errors) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/mds_client.c +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 32 +++++++++++++++++++------------- + fs/ceph/Kconfig | 1 + + fs/ceph/addr.c | 8 +++++--- + fs/ceph/caps.c | 9 +++------ + fs/ceph/dir.c | 21 +++++++++++++-------- + fs/ceph/export.c | 2 -- + fs/ceph/file.c | 8 ++++++-- + fs/ceph/mds_client.c | 35 +++++++++++++++++++++++++---------- + fs/ceph/quota.c | 39 ++++++++++++++++++++++----------------- + fs/ceph/super.h | 14 ++++++++++++++ + include/linux/ceph/osd_client.h | 7 +++++-- + net/ceph/osd_client.c | 17 ++++------------- + 12 files changed, 117 insertions(+), 76 deletions(-) +Merging cifs/for-next (a1ac095871e6 Update MAINTAINERS email address) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/smb/client/cifs_debug.c | 6 ++++-- + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/misc.c | 1 + + fs/smb/client/readdir.c | 6 +++--- + fs/smb/client/smb2pdu.c | 6 +++--- + 6 files changed, 13 insertions(+), 9 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 (aa12a790d31b erofs: make erofs_{err,info}() support NULL sb parameter) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (f55c096f62f1 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 +Already up to date. +Merging exportfs/exportfs-next (4213483e1c20 fs: Create a generic is_dot_dotdot() utility) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/crypto/fname.c | 8 +------- + fs/ecryptfs/crypto.c | 10 ---------- + fs/exportfs/expfs.c | 2 +- + fs/f2fs/f2fs.h | 11 ----------- + fs/namei.c | 6 ++---- + include/linux/fs.h | 11 +++++++++++ + 6 files changed, 15 insertions(+), 33 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. +Merging ext4/dev (68da4c44b994 ext4: fix inconsistent between segment fstrim and full fstrim) +$ 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 (70d201a40823 Merge tag 'f2fs-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (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 (dc33003bffec gfs2: Fix gfs2_drevalidate NULL pointer dereference) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/dentry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging jfs/jfs-next (a280c9ceeca7 jfs: Add missing set_freezable() for freezable kthread) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (77bebd186442 ksmbd: only v2 leases handle the directory) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/smb/ksmbd.rst | 9 ++++++--- + fs/smb/server/asn1.c | 5 +++++ + fs/smb/server/connection.c | 6 ------ + fs/smb/server/connection.h | 2 +- + fs/smb/server/oplock.c | 6 ++++++ + fs/smb/server/smb2pdu.c | 22 +++++++++++++++++----- + fs/smb/server/transport_rdma.c | 11 ++++++----- + fs/smb/server/transport_tcp.c | 13 +++++++------ + 8 files changed, 48 insertions(+), 26 deletions(-) +Merging nfs/linux-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) +$ 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 (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) +$ 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 (17419aefcbfd nfsd: rename nfsd_last_thread() to nfsd_destroy_serv()) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (ddb17dc880ee fs/ntfs3: Use kvfree to free memory allocated by kvmalloc) +$ 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/attrlist.c | 12 +-- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/dir.c | 44 +++++++---- + fs/ntfs3/file.c | 59 ++++++++++++--- + fs/ntfs3/frecord.c | 9 ++- + fs/ntfs3/fslog.c | 214 +++++++++++++++++++++++----------------------------- + fs/ntfs3/fsntfs.c | 5 +- + fs/ntfs3/inode.c | 30 ++++++-- + fs/ntfs3/namei.c | 12 +++ + fs/ntfs3/ntfs.h | 4 +- + fs/ntfs3/ntfs_fs.h | 11 ++- + fs/ntfs3/record.c | 16 +++- + fs/ntfs3/super.c | 49 +++++++----- + fs/ntfs3/xattr.c | 3 + + 15 files changed, 311 insertions(+), 202 deletions(-) +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (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 +Already up to date. +Merging ubifs/next (adbf4c4954e3 ubi: block: fix memleak in ubiblock_create()) +$ 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 +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (5254c0cbc92d Merge tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux) +$ 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 (d61b40bf15ce xfs: fix backwards logic in xfs_bmap_alloc_account) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_bmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (cd51dcb4290a Merge branch 'vfs.netfs' 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 CREDITS +Auto-merging MAINTAINERS +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging fs/ceph/addr.c +Auto-merging include/linux/fs.h +Auto-merging mm/filemap.c +Merge made by the 'ort' strategy. + CREDITS | 5 + + Documentation/filesystems/netfs_library.rst | 23 +- + Documentation/filesystems/ntfs.rst | 466 ---- + MAINTAINERS | 31 +- + arch/arm/configs/mxs_defconfig | 3 +- + arch/csky/configs/defconfig | 3 +- + arch/mips/configs/ip27_defconfig | 3 +- + arch/mips/configs/lemote2f_defconfig | 3 +- + arch/mips/configs/loongson3_defconfig | 3 +- + arch/mips/configs/pic32mzda_defconfig | 3 +- + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 3 +- + arch/sh/configs/sdk7786_defconfig | 3 +- + fs/9p/v9fs_vfs.h | 1 + + fs/9p/vfs_addr.c | 351 +-- + fs/9p/vfs_file.c | 89 +- + fs/9p/vfs_inode.c | 16 +- + fs/9p/vfs_inode_dotl.c | 8 +- + fs/9p/vfs_super.c | 14 +- + fs/Kconfig | 2 - + fs/Makefile | 2 - + fs/afs/dynroot.c | 2 +- + fs/afs/file.c | 217 +- + fs/afs/inode.c | 28 +- + fs/afs/internal.h | 72 +- + fs/afs/super.c | 2 +- + fs/afs/write.c | 836 +----- + fs/attr.c | 2 +- + fs/buffer.c | 10 +- + fs/cachefiles/Kconfig | 2 +- + fs/cachefiles/internal.h | 2 +- + fs/cachefiles/io.c | 34 +- + fs/cachefiles/ondemand.c | 2 +- + fs/ceph/addr.c | 25 +- + fs/ceph/cache.h | 45 +- + fs/ceph/inode.c | 4 +- + fs/erofs/Kconfig | 7 +- + fs/eventfd.c | 1 + + fs/fs-writeback.c | 10 +- + fs/fscache/Kconfig | 40 - + fs/fscache/Makefile | 16 - + fs/fscache/internal.h | 277 -- + fs/inode.c | 3 +- + fs/netfs/Kconfig | 39 + + fs/netfs/Makefile | 22 +- + fs/netfs/buffered_read.c | 229 +- + fs/netfs/buffered_write.c | 1253 +++++++++ + fs/netfs/direct_read.c | 125 + + fs/netfs/direct_write.c | 171 ++ + fs/{fscache/cache.c => netfs/fscache_cache.c} | 0 + fs/{fscache/cookie.c => netfs/fscache_cookie.c} | 0 + fs/netfs/fscache_internal.h | 14 + + fs/{fscache/io.c => netfs/fscache_io.c} | 42 +- + fs/{fscache/main.c => netfs/fscache_main.c} | 25 +- + fs/{fscache/proc.c => netfs/fscache_proc.c} | 23 +- + fs/{fscache/stats.c => netfs/fscache_stats.c} | 13 +- + fs/{fscache/volume.c => netfs/fscache_volume.c} | 0 + fs/netfs/internal.h | 284 ++ + fs/netfs/io.c | 215 +- + fs/netfs/iterator.c | 97 + + fs/netfs/locking.c | 216 ++ + fs/netfs/main.c | 109 + + fs/netfs/misc.c | 260 ++ + fs/netfs/objects.c | 59 +- + fs/netfs/output.c | 478 ++++ + fs/netfs/stats.c | 42 +- + fs/nfs/Kconfig | 4 +- + fs/nfs/fscache.c | 7 - + fs/nfs/fscache.h | 2 +- + fs/ntfs/Kconfig | 81 - + fs/ntfs/Makefile | 15 - + fs/ntfs/aops.c | 1744 ------------ + fs/ntfs/aops.h | 88 - + fs/ntfs/attrib.c | 2624 ------------------- + fs/ntfs/attrib.h | 102 - + fs/ntfs/bitmap.c | 179 -- + fs/ntfs/bitmap.h | 104 - + fs/ntfs/collate.c | 110 - + fs/ntfs/collate.h | 36 - + fs/ntfs/compress.c | 950 ------- + fs/ntfs/debug.c | 159 -- + fs/ntfs/debug.h | 57 - + fs/ntfs/dir.c | 1540 ----------- + fs/ntfs/dir.h | 34 - + fs/ntfs/endian.h | 79 - + fs/ntfs/file.c | 1997 -------------- + fs/ntfs/index.c | 440 ---- + fs/ntfs/index.h | 134 - + fs/ntfs/inode.c | 3102 ---------------------- + fs/ntfs/inode.h | 310 --- + fs/ntfs/layout.h | 2421 ----------------- + fs/ntfs/lcnalloc.c | 1000 ------- + fs/ntfs/lcnalloc.h | 131 - + fs/ntfs/logfile.c | 849 ------ + fs/ntfs/logfile.h | 295 --- + fs/ntfs/malloc.h | 77 - + fs/ntfs/mft.c | 2907 -------------------- + fs/ntfs/mft.h | 110 - + fs/ntfs/mst.c | 189 -- + fs/ntfs/namei.c | 392 --- + fs/ntfs/ntfs.h | 150 -- + fs/ntfs/quota.c | 103 - + fs/ntfs/quota.h | 21 - + fs/ntfs/runlist.c | 1893 -------------- + fs/ntfs/runlist.h | 88 - + fs/ntfs/super.c | 3202 ----------------------- + fs/ntfs/sysctl.c | 58 - + fs/ntfs/sysctl.h | 27 - + fs/ntfs/time.h | 89 - + fs/ntfs/types.h | 55 - + fs/ntfs/unistr.c | 384 --- + fs/ntfs/upcase.c | 73 - + fs/ntfs/usnjrnl.c | 70 - + fs/ntfs/usnjrnl.h | 191 -- + fs/ntfs/volume.h | 164 -- + fs/smb/client/cifsfs.c | 9 +- + fs/smb/client/file.c | 18 +- + fs/smb/client/fscache.c | 2 +- + include/linux/fs.h | 2 +- + include/linux/fscache-cache.h | 3 + + include/linux/fscache.h | 45 - + include/linux/netfs.h | 179 +- + include/linux/writeback.h | 2 +- + include/trace/events/afs.h | 31 - + include/trace/events/netfs.h | 155 +- + init/initramfs.c | 2 - + mm/filemap.c | 2 + + 127 files changed, 4176 insertions(+), 31499 deletions(-) + delete mode 100644 Documentation/filesystems/ntfs.rst + delete mode 100644 fs/fscache/Kconfig + delete mode 100644 fs/fscache/Makefile + delete mode 100644 fs/fscache/internal.h + create mode 100644 fs/netfs/buffered_write.c + create mode 100644 fs/netfs/direct_read.c + create mode 100644 fs/netfs/direct_write.c + rename fs/{fscache/cache.c => netfs/fscache_cache.c} (100%) + rename fs/{fscache/cookie.c => netfs/fscache_cookie.c} (100%) + create mode 100644 fs/netfs/fscache_internal.h + rename fs/{fscache/io.c => netfs/fscache_io.c} (86%) + rename fs/{fscache/main.c => netfs/fscache_main.c} (84%) + rename fs/{fscache/proc.c => netfs/fscache_proc.c} (58%) + rename fs/{fscache/stats.c => netfs/fscache_stats.c} (90%) + rename fs/{fscache/volume.c => netfs/fscache_volume.c} (100%) + create mode 100644 fs/netfs/locking.c + create mode 100644 fs/netfs/misc.c + create mode 100644 fs/netfs/output.c + delete mode 100644 fs/ntfs/Kconfig + delete mode 100644 fs/ntfs/Makefile + delete mode 100644 fs/ntfs/aops.c + delete mode 100644 fs/ntfs/aops.h + delete mode 100644 fs/ntfs/attrib.c + delete mode 100644 fs/ntfs/attrib.h + delete mode 100644 fs/ntfs/bitmap.c + delete mode 100644 fs/ntfs/bitmap.h + delete mode 100644 fs/ntfs/collate.c + delete mode 100644 fs/ntfs/collate.h + delete mode 100644 fs/ntfs/compress.c + delete mode 100644 fs/ntfs/debug.c + delete mode 100644 fs/ntfs/debug.h + delete mode 100644 fs/ntfs/dir.c + delete mode 100644 fs/ntfs/dir.h + delete mode 100644 fs/ntfs/endian.h + delete mode 100644 fs/ntfs/file.c + delete mode 100644 fs/ntfs/index.c + delete mode 100644 fs/ntfs/index.h + delete mode 100644 fs/ntfs/inode.c + delete mode 100644 fs/ntfs/inode.h + delete mode 100644 fs/ntfs/layout.h + delete mode 100644 fs/ntfs/lcnalloc.c + delete mode 100644 fs/ntfs/lcnalloc.h + delete mode 100644 fs/ntfs/logfile.c + delete mode 100644 fs/ntfs/logfile.h + delete mode 100644 fs/ntfs/malloc.h + delete mode 100644 fs/ntfs/mft.c + delete mode 100644 fs/ntfs/mft.h + delete mode 100644 fs/ntfs/mst.c + delete mode 100644 fs/ntfs/namei.c + delete mode 100644 fs/ntfs/ntfs.h + delete mode 100644 fs/ntfs/quota.c + delete mode 100644 fs/ntfs/quota.h + delete mode 100644 fs/ntfs/runlist.c + delete mode 100644 fs/ntfs/runlist.h + delete mode 100644 fs/ntfs/super.c + delete mode 100644 fs/ntfs/sysctl.c + delete mode 100644 fs/ntfs/sysctl.h + delete mode 100644 fs/ntfs/time.h + delete mode 100644 fs/ntfs/types.h + delete mode 100644 fs/ntfs/unistr.c + delete mode 100644 fs/ntfs/upcase.c + delete mode 100644 fs/ntfs/usnjrnl.c + delete mode 100644 fs/ntfs/usnjrnl.h + delete mode 100644 fs/ntfs/volume.h +Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging printk/for-next (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. +Merging pci/next (7119ca35ee4a Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +Auto-merging drivers/pci/controller/vmd.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/PCI/boot-interrupts.rst | 2 +- + Documentation/PCI/msi-howto.rst | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 18 ++ + .../devicetree/bindings/pci/qcom,pcie.yaml | 63 +++++- + .../devicetree/bindings/pci/rcar-pci-host.yaml | 11 ++ + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 2 + + .../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/misc/dw-xdata-pcie.c | 6 +- + drivers/misc/pci_endpoint_test.c | 50 +++-- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 - + drivers/pci/controller/cadence/Kconfig | 2 + + drivers/pci/controller/cadence/pci-j721e.c | 45 ++++- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 19 +- + drivers/pci/controller/cadence/pcie-cadence.h | 12 +- + drivers/pci/controller/dwc/Kconfig | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 14 +- + drivers/pci/controller/dwc/pci-exynos.c | 8 +- + drivers/pci/controller/dwc/pci-imx6.c | 17 +- + drivers/pci/controller/dwc/pci-keystone.c | 109 ++++++----- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 33 ++-- + drivers/pci/controller/dwc/pci-layerscape.c | 193 +++++++++++++++--- + drivers/pci/controller/dwc/pci-meson.c | 2 +- + drivers/pci/controller/dwc/pcie-al.c | 2 +- + drivers/pci/controller/dwc/pcie-armada8k.c | 2 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 12 +- + drivers/pci/controller/dwc/pcie-bt1.c | 4 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 197 +++++++------------ + drivers/pci/controller/dwc/pcie-designware-host.c | 30 +-- + drivers/pci/controller/dwc/pcie-designware-plat.c | 13 +- + drivers/pci/controller/dwc/pcie-designware.h | 111 ++++++++++- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6 +- + drivers/pci/controller/dwc/pcie-fu740.c | 2 +- + drivers/pci/controller/dwc/pcie-histb.c | 2 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 2 +- + drivers/pci/controller/dwc/pcie-keembay.c | 15 +- + drivers/pci/controller/dwc/pcie-kirin.c | 21 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 10 +- + drivers/pci/controller/dwc/pcie-qcom.c | 6 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 23 ++- + drivers/pci/controller/dwc/pcie-spear13xx.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 21 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 13 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 14 +- + drivers/pci/controller/dwc/pcie-visconti.c | 2 +- + drivers/pci/controller/pci-host-common.c | 4 +- + drivers/pci/controller/pci-host-generic.c | 2 +- + drivers/pci/controller/pcie-brcmstb.c | 96 ++++++++- + drivers/pci/controller/pcie-iproc-platform.c | 2 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 89 +++++---- + drivers/pci/controller/pcie-mediatek.c | 10 +- + drivers/pci/controller/pcie-rcar-ep.c | 7 +- + drivers/pci/controller/pcie-rcar-host.c | 18 +- + drivers/pci/controller/pcie-rockchip-ep.c | 23 ++- + drivers/pci/controller/pcie-rockchip-host.c | 4 +- + drivers/pci/controller/pcie-xilinx-dma-pl.c | 14 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 52 ++--- + drivers/pci/controller/vmd.c | 6 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 6 +- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 6 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 16 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +- + drivers/pci/endpoint/pci-epc-core.c | 6 +- + drivers/pci/iov.c | 7 +- + drivers/pci/pci.c | 85 ++++++-- + drivers/pci/pci.h | 4 +- + 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-epc.h | 13 +- + include/linux/pci-epf.h | 4 +- + include/linux/pci.h | 19 +- + include/uapi/linux/pcitest.h | 3 +- + 88 files changed, 1519 insertions(+), 877 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 +Already up to date. +Merging hid/for-next (80d5a73edcfb Merge branch 'for-6.8/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/hid-steam.c | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) +Merging i2c/i2c/for-next (c5eb372fe3e6 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Auto-merging drivers/gpu/drm/display/drm_dp_helper.c +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Auto-merging drivers/gpu/drm/rockchip/inno_hdmi.c +Auto-merging drivers/gpu/drm/rockchip/rk3066_hdmi.c +Auto-merging drivers/video/fbdev/cyber2000fb.c +CONFLICT (modify/delete): drivers/video/fbdev/intelfb/intelfb_i2c.c deleted in HEAD and modified in i2c/i2c/for-next. Version i2c/i2c/for-next of drivers/video/fbdev/intelfb/intelfb_i2c.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/intelfb/intelfb_i2c.c +rm 'drivers/video/fbdev/intelfb/intelfb_i2c.c' +$ git commit --no-edit -v -a +[master 56bfde9a039c] Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/eeprom/at24.yaml | 1 + + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 28 ++ + MAINTAINERS | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 - + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 - + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 1 - + drivers/gpu/drm/ast/ast_i2c.c | 1 - + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 - + drivers/gpu/drm/display/drm_dp_helper.c | 1 - + drivers/gpu/drm/display/drm_dp_mst_topology.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 - + drivers/gpu/drm/gma500/intel_gmbus.c | 1 - + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 1 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 1 - + drivers/gpu/drm/i915/display/intel_gmbus.c | 1 - + drivers/gpu/drm/i915/display/intel_sdvo.c | 1 - + drivers/gpu/drm/loongson/lsdc_i2c.c | 1 - + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 1 - + drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 - + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 1 - + drivers/gpu/drm/radeon/radeon_i2c.c | 1 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 - + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 - + drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 1 - + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali1563.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-amd756.c | 2 +- + drivers/i2c/busses/i2c-amd8111.c | 2 +- + drivers/i2c/busses/i2c-cpm.c | 2 +- + drivers/i2c/busses/i2c-elektor.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 36 +-- + drivers/i2c/busses/i2c-i801.c | 2 + + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 2 +- + drivers/i2c/busses/i2c-isch.c | 2 +- + drivers/i2c/busses/i2c-kempld.c | 3 +- + drivers/i2c/busses/i2c-mlxcpld.c | 2 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-npcm7xx.c | 49 +-- + drivers/i2c/busses/i2c-pasemi-pci.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 51 ++- + drivers/i2c/busses/i2c-rk3x.c | 8 +- + drivers/i2c/busses/i2c-s3c2410.c | 61 ++-- + drivers/i2c/busses/i2c-scmi.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sibyte.c | 4 +- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-sis96x.c | 2 +- + drivers/i2c/busses/i2c-stm32f7.c | 360 +++++++++++---------- + drivers/i2c/busses/i2c-via.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 2 +- + drivers/i2c/busses/i2c-wmt.c | 117 ++----- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core-base.c | 13 +- + drivers/i2c/i2c-smbus.c | 8 +- + drivers/i2c/i2c-stub.c | 2 +- + drivers/i2c/muxes/i2c-mux-reg.c | 4 +- + drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 2 +- + drivers/misc/eeprom/at24.c | 5 +- + drivers/staging/greybus/i2c.c | 2 +- + drivers/video/fbdev/core/fb_ddc.c | 1 - + drivers/video/fbdev/cyber2000fb.c | 1 - + drivers/video/fbdev/i740fb.c | 1 - + drivers/video/fbdev/matrox/i2c-matroxfb.c | 15 +- + drivers/video/fbdev/s3fb.c | 1 - + drivers/video/fbdev/tdfxfb.c | 1 - + drivers/video/fbdev/tridentfb.c | 1 - + drivers/video/fbdev/via/via_i2c.c | 1 - + include/linux/i2c.h | 5 +- + include/linux/platform_data/i2c-mux-reg.h | 2 - + sound/soc/rockchip/rk3399_gru_sound.c | 2 +- + 78 files changed, 405 insertions(+), 454 deletions(-) +Merging i3c/i3c/next (4fa0888f6f3e i3c: document hotjoin sysfs entry) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-i3c | 15 +++++ + drivers/i3c/master.c | 95 +++++++++++++++++++++++++++++++- + drivers/i3c/master/i3c-master-cdns.c | 7 ++- + 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 + + drivers/i3c/master/svc-i3c-master.c | 95 ++++++++++++++++++++++++++------ + include/linux/i3c/device.h | 2 + + include/linux/i3c/master.h | 9 ++- + 10 files changed, 256 insertions(+), 28 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 (2539b15d504c hwmon: (npcm750-pwm-fan) Fix crash observed when instantiating nuvoton,npcm750-pwm-fan) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (ead8467f96d6 docs, kprobes: Add loongarch as supported architecture) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (60a031b64984 media: i2c: thp7312: select CONFIG_FW_LOADER) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (60a031b64984 media: i2c: thp7312: select CONFIG_FW_LOADER) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (15f5ad190ec0 Merge branch 'thermal-core' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/acpi/cppc_sysfs.rst | 2 +- + Documentation/admin-guide/pm/amd-pstate.rst | 2 +- + drivers/acpi/resource.c | 21 + + drivers/base/power/main.c | 117 ++-- + drivers/base/power/qos.c | 2 +- + drivers/cpufreq/intel_pstate.c | 21 +- + drivers/pnp/driver.c | 2 +- + drivers/thermal/Kconfig | 7 + + drivers/thermal/Makefile | 2 + + drivers/thermal/gov_power_allocator.c | 2 +- + drivers/thermal/intel/intel_hfi.c | 28 + + drivers/thermal/thermal_core.c | 38 +- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_debugfs.c | 839 ++++++++++++++++++++++++++ + drivers/thermal/thermal_debugfs.h | 28 + + drivers/thermal/thermal_helpers.c | 21 +- + drivers/thermal/thermal_netlink.c | 95 ++- + drivers/thermal/thermal_netlink.h | 75 ++- + drivers/thermal/thermal_trip.c | 8 +- + include/acpi/actbl2.h | 12 +- + include/linux/pm.h | 1 + + include/linux/pnp.h | 2 +- + include/linux/thermal.h | 9 +- + 23 files changed, 1145 insertions(+), 190 deletions(-) + create mode 100644 drivers/thermal/thermal_debugfs.c + create mode 100644 drivers/thermal/thermal_debugfs.h +Merging cpufreq-arm/cpufreq/arm/linux-next (0990319a0400 cpufreq: armada-8k: Fix parameter type warning) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/bench/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (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 +Already up to date. +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 +Already up to date. +Merging opp/opp/linux-next (dcfec12b6798 OPP: Rename 'rate_clk_single') +$ 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 +Already up to date. +Merging thermal/thermal/linux-next (5314b1543787 thermal/drivers/exynos: Use set_trips ops) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging dlm/next (5beebc1dda47 dlm: update format header reflect current format) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (d24b923f1d69 RDMA/bnxt_re: Fix error code in bnxt_re_create_cq()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (3e7aeb78ab01 Merge tag 'net-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (3fbf61207c66 Revert "mlx5 updates 2023-12-20") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (3e7aeb78ab01 Merge tag 'net-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (a7fe0881d9b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (42a7889a1931 Merge branch 'selftests-tcp-ao') +$ 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 (6061d66bd0e5 Bluetooth: Remove usage of the deprecated ida_simple_xx() API) +$ 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/btnxpuart.c | 24 ++++++- + drivers/bluetooth/btrtl.c | 14 ++++ + drivers/bluetooth/btusb.c | 8 +++ + drivers/bluetooth/hci_bcm4377.c | 3 +- + include/net/bluetooth/hci.h | 4 +- + include/net/bluetooth/hci_sync.h | 2 +- + net/bluetooth/hci_core.c | 135 ++++++++++++++++++++++++++++----------- + net/bluetooth/hci_event.c | 14 ++-- + net/bluetooth/hci_request.c | 2 +- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/hci_sync.c | 57 ++++++++++------- + net/bluetooth/mgmt.c | 32 +++++----- + net/bluetooth/rfcomm/core.c | 2 +- + 13 files changed, 206 insertions(+), 95 deletions(-) +Merging wireless-next/for-next (3fbf61207c66 Revert "mlx5 updates 2023-12-20") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging wpan-next/master (2373699560a7 mac802154: Avoid new associations while disassociating) +$ 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 (2373699560a7 mac802154: Avoid new associations while disassociating) +$ 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 (98d4fda8f2d4 Merge tag 'nand/for-6.8' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (023e6aad7e5e mtd: rawnand: s3c2410: fix Excess struct member description kernel-doc warnings) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (3c0e1dfa703c MAINTAINERS: change my mail to the kernel.org one) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b8910630c967 crypto: iaa - Account for cpu-less numa nodes) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (205e18c13545 nouveau/gsp: handle engines in runl without nonstall interrupts.) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 25 +++++--- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 10 +-- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gsc.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 75 ++++++++++++---------- + drivers/gpu/drm/i915/i915_perf_types.h | 9 ++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 4 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 8 +-- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 20 +++--- + 13 files changed, 96 insertions(+), 78 deletions(-) +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 (10faae933f2b drm/exynos: gsc: minor fix for loop iteration in gsc_runtime_resume) +$ 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 +++--- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) +Merging drm-misc/for-linux-next (1f1626ac0428 drm/ttm: fix ttm pool initialization for no-dma-device drivers) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_device.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/ttm/ttm_device.c | 9 +++++++-- + drivers/gpu/drm/v3d/v3d_submit.c | 35 ++++++++++++++++++++++++++++------- + 2 files changed, 35 insertions(+), 9 deletions(-) +Merging amdgpu/drm-next (762343f79e43 drm/amdgpu: Clean up errors in amdgpu.h) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 860 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 201 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 163 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 567 ++++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 53 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +- + drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 8 + + drivers/gpu/drm/amd/amdgpu/atom.c | 41 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 28 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 16 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 4 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 27 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 88 +++ + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 87 +++ + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 99 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 72 ++ + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 118 ++- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 3 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 52 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 46 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 59 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 119 +-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 4 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 92 ++- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 11 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 40 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 25 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 29 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 9 +- + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 296 ++++++- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 3 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 9 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 14 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 16 +- + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 11 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 11 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 10 +- + .../drm/amd/display/dc/dml2/display_mode_core.c | 32 +- + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 36 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 58 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 45 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 11 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 - + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 50 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 60 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 34 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 60 +- + .../display/dc/link/protocols/link_dp_dpia_bw.h | 9 + + .../dc/link/protocols/link_edp_panel_control.c | 11 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 22 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 15 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 11 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 2 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 3 + + .../display/dc/resource/dcn321/dcn321_resource.c | 2 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 3 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1 + + drivers/gpu/drm/amd/display/include/audio_types.h | 17 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 8 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 28 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 42 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 17 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 160 +++- + drivers/gpu/drm/radeon/atom.c | 47 +- + drivers/gpu/drm/radeon/atom.h | 4 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 28 +- + drivers/gpu/drm/radeon/atombios_dp.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 38 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 44 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_ioctl.h | 3 +- + 137 files changed, 3870 insertions(+), 1086 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h +Merging drm-intel/for-linux-next (d505a16e00c3 drm/i915/perf: reconcile Excess struct member kernel-doc warnings) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +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 +Already up to date. +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 (f1a925152c85 drm/etnaviv: add sensitive state for PE_RT_ADDR_4_PIPE(3, 0|1) address) +$ 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_cmd_parser.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 95 ++++++++++++++++++---------- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 33 +++++++++- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 12 ++++ + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 34 ++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 4 +- + include/uapi/drm/etnaviv_drm.h | 5 ++ + 9 files changed, 156 insertions(+), 44 deletions(-) +Merging fbdev/for-next (9a9895fd7f79 fbdev: vt8500lcdfb: Remove unnecessary print function dev_err()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/vt8500lcdfb.c | 1 - + 1 file changed, 1 deletion(-) +Merging regmap/for-next (632cdb1dab49 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. +Merging sound/for-next (fb3c007fde80 ALSA: hda/realtek: Enable headset mic on Lenovo M70 Gen5) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (986c20bb3e67 firewire: core: fill model field in modalias of unit device for legacy layout of configuration ROM) +$ 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 (6db342158dbd Merge remote-tracking branch 'asoc/for-6.7' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (4515d08a742c kernel/module: improve documentation for try_module_get()) +$ 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 (52c4e5985a73 Input: driver for Adafruit Seesaw Gamepad) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (baec4e4d14be 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 io_uring/io_uring.c +Merge made by the 'ort' strategy. + block/bio-integrity.c | 2 +- + block/blk-cgroup.c | 2 +- + block/blk-iocost.c | 2 +- + block/blk-mq-debugfs.c | 18 ------------- + block/blk-mq-sched.c | 2 -- + block/blk-mq.c | 50 ++++++++++++++++++++++++++-------- + block/ioprio.c | 26 ------------------ + block/partitions/core.c | 4 +-- + drivers/block/nbd.c | 6 +---- + drivers/block/null_blk/main.c | 4 +-- + drivers/block/virtio_blk.c | 2 -- + drivers/md/md.c | 40 ++++++++++++++++++--------- + drivers/md/raid1.c | 12 ++++----- + drivers/nvme/common/keyring.c | 2 +- + drivers/nvme/host/core.c | 41 ++++++++++++++-------------- + drivers/nvme/host/nvme.h | 16 ++++++++--- + drivers/nvme/host/pci.c | 27 +++++++++++-------- + drivers/nvme/host/pr.c | 2 +- + drivers/nvme/host/rdma.c | 9 +++++-- + drivers/nvme/host/sysfs.c | 8 +++--- + drivers/nvme/host/tcp.c | 11 ++++---- + drivers/nvme/target/fc.c | 2 +- + drivers/nvme/target/fcloop.c | 7 ++--- + drivers/nvme/target/rdma.c | 19 ++++++++++--- + drivers/nvme/target/tcp.c | 48 +++++++++++++++++++++++++-------- + drivers/nvme/target/trace.c | 6 ++--- + drivers/nvme/target/trace.h | 33 +++++++++++++---------- + include/linux/bio.h | 9 ++++--- + include/linux/blk-mq.h | 3 --- + include/linux/ioprio.h | 25 ++++++++++++++++- + include/linux/nvme.h | 1 - + io_uring/io_uring.c | 63 ++++++++++++++++++++++++++++++------------- + io_uring/register.c | 8 +++--- + io_uring/rsrc.h | 14 ++++++---- + io_uring/rw.c | 48 ++++++++++++++++++--------------- + lib/sbitmap.c | 5 ---- + 36 files changed, 341 insertions(+), 236 deletions(-) +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 +Already up to date. +Merging libata/for-next (fa7280e5dd81 MAINTAINERS: Add Niklas Cassel as libata maintainer) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (5d4021334748 mmc: xenon: Add ac5 support via bounce buffer) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (284d16c456e5 mfd: ti_am335x_tscadc: Fix TI SoC dependencies) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging drivers/mfd/Kconfig +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 + + .../bindings/mfd/sprd,ums512-glbreg.yaml | 4 +- + .../devicetree/bindings/mfd/ti,am3359-tscadc.yaml | 2 - + drivers/mfd/Kconfig | 1 + + drivers/mfd/ab8500-sysctrl.c | 8 +- + 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/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 + + 43 files changed, 473 insertions(+), 371 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 +Auto-merging drivers/video/backlight/pwm_bl.c +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 (05599b5f56b7 Merge power-supply fixes for 6.7 cycle) +$ 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 +- + .../devicetree/bindings/power/reset/qcom,pon.yaml | 13 +- + .../bindings/power/reset/syscon-reboot-mode.yaml | 8 +- + .../bindings/power/reset/xlnx,zynqmp-power.yaml | 4 +- + .../devicetree/bindings/power/supply/bq24190.yaml | 1 + + drivers/power/reset/as3722-poweroff.c | 6 +- + drivers/power/reset/at91-poweroff.c | 13 +- + drivers/power/reset/at91-reset.c | 11 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 13 +- + drivers/power/reset/atc260x-poweroff.c | 6 +- + drivers/power/reset/gpio-restart.c | 34 +- + 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/bq24190_charger.c | 459 ++++++++++++++++----- + drivers/power/supply/bq256xx_charger.c | 5 +- + drivers/power/supply/bq27xxx_battery.c | 22 + + drivers/power/supply/bq27xxx_battery_i2c.c | 1 + + drivers/power/supply/power_supply_core.c | 167 ++++---- + drivers/power/supply/qcom_battmgr.c | 109 ++--- + drivers/power/supply/qcom_pmi8998_charger.c | 4 + + include/linux/power/bq27xxx_battery.h | 1 + + 28 files changed, 614 insertions(+), 342 deletions(-) +Merging regulator/for-next (94cc3087aac4 dt-bindings: regulator: Convert ti,tps65132 to YAML) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/ti,tps65132.yaml | 84 ++++++++++++++++++++++ + .../bindings/regulator/tps65132-regulator.txt | 46 ------------ + 2 files changed, 84 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65132.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/tps65132-regulator.txt +Merging security/next (f1bb47a31dff lsm: new security_file_ioctl_compat() hook) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/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/lib.c | 1 + + security/apparmor/lsm.c | 63 +++++++++++---------------------------- + security/apparmor/policy.c | 13 ++++---- + security/apparmor/policy_unpack.c | 13 +++++--- + security/apparmor/task.c | 2 ++ + 9 files changed, 54 insertions(+), 74 deletions(-) +Merging integrity/next-integrity (c00f94b3a5be overlay: disable EVM) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (bbf5a1d0e5d0 selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (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 (2b6fad7a900d tpm: cr50: fix kernel-doc warning and spelling) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (9546b21ea672 watchdog: mlx_wdt: fix all kernel-doc warnings) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (75f74f85a42e Merge branches 'apple/dart', 'arm/rockchip', 'arm/smmu', 'virtio', 'x86/vt-d', '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/arm/mm/dma-mapping.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/traps.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/memory/tegra/tegra186.c +Auto-merging include/acpi/acpi_bus.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 833e883e1a28] 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/debugfs.c | 3 - + drivers/iommu/intel/iommu.c | 241 ++---------------- + drivers/iommu/intel/iommu.h | 179 +++++++++++++- + drivers/iommu/intel/pasid.c | 274 +-------------------- + drivers/iommu/intel/pasid.h | 223 ++++++++++++++++- + drivers/iommu/intel/svm.c | 34 +-- + 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 | 71 +++--- + 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 - + 63 files changed, 1279 insertions(+), 1043 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 +Merge made by the 'ort' strategy. +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 (cd795fb0c352 mailbox: mtk-cmdq: Add CMDQ driver support for mt8188) +$ 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 +++++++--- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 130 +++++++++++++++++++-- + drivers/mailbox/arm_mhuv2.c | 3 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 6 +- + drivers/mailbox/bcm-pdc-mailbox.c | 5 +- + drivers/mailbox/imx-mailbox.c | 6 +- + drivers/mailbox/mailbox-test.c | 6 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 73 ++++++------ + drivers/mailbox/omap-mailbox.c | 6 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 16 ++- + drivers/mailbox/qcom-ipcc.c | 6 +- + drivers/mailbox/stm32-ipcc.c | 6 +- + drivers/mailbox/sun6i-msgbox.c | 6 +- + drivers/mailbox/tegra-hsp.c | 6 +- + drivers/mailbox/zynqmp-ipi-mailbox.c | 7 +- + 16 files changed, 231 insertions(+), 114 deletions(-) +Merging spi/for-next (5d81c811f371 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 +Merge made by the 'ort' strategy. + drivers/spi/spi-coldfire-qspi.c | 1 - + 1 file changed, 1 deletion(-) +Merging tip/master (1ac6b49423e8 Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/mmu_internal.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/vmenter.S +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/generate_rust_target.rs +Auto-merging scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/hw-vuln/spectre.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/arch/x86/pti.rst | 6 +- + Documentation/arch/x86/tdx.rst | 207 ++- + arch/x86/Kconfig | 49 +- + arch/x86/Makefile | 8 +- + arch/x86/boot/compressed/ident_map_64.c | 4 +- + arch/x86/coco/tdx/tdx-shared.c | 6 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/entry/calling.h | 14 +- + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 8 +- + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/current.h | 9 +- + arch/x86/include/asm/disabled-features.h | 10 +- + arch/x86/include/asm/fpu/sched.h | 10 +- + arch/x86/include/asm/linkage.h | 16 +- + arch/x86/include/asm/msr-index.h | 3 + + arch/x86/include/asm/nospec-branch.h | 53 +- + arch/x86/include/asm/page.h | 6 +- + arch/x86/include/asm/percpu.h | 191 ++- + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/pgtable-3level.h | 2 +- + arch/x86/include/asm/pgtable.h | 18 +- + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/preempt.h | 2 +- + arch/x86/include/asm/processor-flags.h | 2 +- + arch/x86/include/asm/processor.h | 3 + + arch/x86/include/asm/pti.h | 2 +- + arch/x86/include/asm/shared/tdx.h | 6 + + arch/x86/include/asm/static_call.h | 2 +- + arch/x86/include/asm/tdx.h | 38 + + arch/x86/include/asm/text-patching.h | 2 + + arch/x86/include/asm/uaccess_64.h | 11 +- + arch/x86/kernel/acpi/wakeup_64.S | 24 +- + arch/x86/kernel/alternative.c | 23 +- + arch/x86/kernel/asm-offsets.c | 2 +- + arch/x86/kernel/callthunks.c | 32 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 43 +- + arch/x86/kernel/cpu/common.c | 3 + + arch/x86/kernel/cpu/mce/core.c | 15 + + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/ftrace.c | 3 +- + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/kprobes/opt.c | 2 +- + arch/x86/kernel/ldt.c | 8 +- + arch/x86/kernel/process_32.c | 7 +- + arch/x86/kernel/process_64.c | 7 +- + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/smp.c | 10 +- + arch/x86/kernel/static_call.c | 2 +- + arch/x86/kernel/traps.c | 4 +- + arch/x86/kernel/vmlinux.lds.S | 11 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/svm/vmenter.S | 4 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/cmpxchg16b_emu.S | 12 +- + arch/x86/lib/cmpxchg8b_emu.S | 30 +- + arch/x86/lib/retpoline.S | 26 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/debug_pagetables.c | 4 +- + arch/x86/mm/dump_pagetables.c | 4 +- + arch/x86/mm/pgtable.c | 4 +- + arch/x86/mm/tlb.c | 10 +- + arch/x86/net/bpf_jit_comp.c | 4 +- + arch/x86/net/bpf_jit_comp32.c | 2 +- + arch/x86/purgatory/Makefile | 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/xen-asm.S | 10 +- + include/linux/compiler-gcc.h | 2 +- + include/linux/compiler.h | 2 +- + include/linux/indirect_call_wrapper.h | 2 +- + include/linux/module.h | 2 +- + include/linux/objtool.h | 2 +- + include/linux/pti.h | 2 +- + include/net/netfilter/nf_tables_core.h | 2 +- + include/net/tc_wrapper.h | 2 +- + kernel/sched/cpufreq_schedutil.c | 6 +- + kernel/trace/ring_buffer.c | 2 +- + net/netfilter/Makefile | 2 +- + net/netfilter/nf_tables_core.c | 6 +- + net/netfilter/nft_ct.c | 4 +- + net/netfilter/nft_lookup.c | 2 +- + net/sched/sch_api.c | 2 +- + scripts/Makefile.lib | 8 +- + scripts/Makefile.vmlinux_o | 2 +- + scripts/generate_rust_target.rs | 2 +- + scripts/mod/modpost.c | 2 +- + tools/arch/x86/include/asm/disabled-features.h | 10 +- + tools/objtool/arch/x86/special.c | 2 +- + tools/objtool/check.c | 4 +- + 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 +- + 106 files changed, 2461 insertions(+), 404 deletions(-) + 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 (c0c4579d79d0 clocksource/drivers/ep93xx: Fix error handling during probe) +$ 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-ep93xx.c | 5 ++--- + drivers/clocksource/timer-riscv.c | 7 +++++++ + drivers/clocksource/timer-ti-dm.c | 4 ++-- + 6 files changed, 36 insertions(+), 12 deletions(-) +Merging edac/edac-for-next (e6e10e8939e0 Merge branch 'edac-misc' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (4af12c95cbe8 Merge probes/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/trace/ftrace.rst +Auto-merging fs/tracefs/inode.c +CONFLICT (content): Merge conflict in fs/tracefs/inode.c +Auto-merging kernel/trace/ring_buffer.c +Resolved 'fs/tracefs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0745af88edca] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/ftrace.rst | 21 + + drivers/scsi/qla2xxx/qla_os.c | 2 +- + fs/tracefs/event_inode.c | 343 +++++----- + fs/tracefs/inode.c | 193 +++--- + fs/tracefs/internal.h | 3 + + include/linux/ring_buffer.h | 18 +- + include/linux/trace.h | 4 +- + include/linux/trace_seq.h | 9 +- + kernel/trace/ring_buffer.c | 743 +++++++++++++-------- + kernel/trace/ring_buffer_benchmark.c | 10 +- + kernel/trace/trace.c | 234 +++++-- + kernel/trace/trace.h | 2 + + kernel/trace/trace_boot.c | 2 +- + kernel/trace/trace_events.c | 107 ++- + kernel/trace/trace_events_hist.c | 49 +- + kernel/trace/trace_kprobe.c | 4 +- + kernel/trace/trace_seq.c | 3 - + samples/ftrace/sample-trace-array.c | 2 +- + .../test.d/00basic/ringbuffer_subbuf_size.tc | 95 +++ + .../ftrace/test.d/00basic/trace_marker.tc | 82 +++ + 20 files changed, 1290 insertions(+), 636 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/ringbuffer_subbuf_size.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc +Merging rcu/rcu/next (7dfb03dd24d4 Merge branches 'doc.2023.12.13a', 'torture.2023.11.23a', 'fixes.2023.12.13a', 'rcu-tasks.2023.12.12b' and 'srcu.2023.12.13a' into rcu-merge.2023.12.13a) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Already up to date. +Merging kvm/next (1c6d984f523f x86/kvm: Do not try to disable kvmclock if it was not enabled) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (040113fa32f2 KVM: arm64: Add missing memory barriers when switching to pKVM's hyp pgd) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (10f7b1dcdfe0 KVM: s390: cpu model: Use proper define for facility mask size) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (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 +Already up to date. +Merging kvm-riscv/riscv_kvm_next (aad86da229bc RISC-V: KVM: selftests: Add get-reg-list test for STA registers) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (1c6d984f523f x86/kvm: Do not try to disable kvmclock if it was not enabled) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (2d2db7d40254 xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import) +$ 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 +Auto-merging arch/riscv/include/asm/tlbflush.h +Auto-merging arch/riscv/mm/kasan_init.c +Auto-merging arch/riscv/mm/tlbflush.c +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 (1a65a6d17cbc workqueue: Add rcu lock check at the end of work item execution) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + kernel/workqueue.c | 22 +++++++++++++++------- + tools/workqueue/wq_dump.py | 29 +++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (236f7d8034ff platform/x86/amd/pmc: Modify SMU message port for latest AMD platform) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (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 +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (09aeaabebdaf firmware: coreboot: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (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 (4289e434c46c leds: trigger: netdev: Add core support for hw not supporting fallback to LED sw control) +$ 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 | 111 ++++ + drivers/leds/leds-sun50i-a100.c | 584 +++++++++++++++++++++ + drivers/leds/leds-syscon.c | 3 +- + drivers/leds/leds-tca6507.c | 30 +- + drivers/leds/rgb/Kconfig | 2 +- + drivers/leds/rgb/leds-qcom-lpg.c | 63 +-- + drivers/leds/trigger/ledtrig-gpio.c | 26 +- + drivers/leds/trigger/ledtrig-netdev.c | 47 +- + drivers/leds/trigger/ledtrig-panic.c | 5 +- + drivers/leds/trigger/ledtrig-tty.c | 247 +++++++-- + drivers/tty/tty_io.c | 28 +- + include/linux/leds.h | 20 +- + include/linux/tty.h | 1 + + 24 files changed, 1449 insertions(+), 201 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 (9bd9fbd9032a ipmi: Remove usage of the deprecated ida_simple_xx() API) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (e3977e0609a0 Revert "kernfs: convert kernfs_idr_lock to an irq safe raw spinlock") +$ 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/loongarch/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/acpi/property.c +Auto-merging drivers/base/arch_topology.c +Auto-merging drivers/base/cpu.c +Auto-merging drivers/base/memory.c +Auto-merging drivers/base/property.c +Auto-merging drivers/edac/edac_pci_sysfs.c +Auto-merging drivers/pmdomain/core.c +Auto-merging include/linux/device.h +Auto-merging include/linux/device/bus.h +Auto-merging include/linux/edac.h +Auto-merging init/initramfs.c +Auto-merging kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-initrd | 8 ++++ + Documentation/admin-guide/kernel-parameters.txt | 5 +- + 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/acpi/property.c | 4 ++ + drivers/base/arch_topology.c | 38 ++++++++++----- + drivers/base/auxiliary.c | 2 +- + drivers/base/bus.c | 8 ++-- + drivers/base/class.c | 1 + + drivers/base/container.c | 2 +- + drivers/base/core.c | 13 +++--- + drivers/base/cpu.c | 39 ++++++++++++---- + drivers/base/dd.c | 2 +- + drivers/base/init.c | 2 +- + drivers/base/isa.c | 2 +- + drivers/base/memory.c | 2 +- + drivers/base/node.c | 11 +++-- + drivers/base/power/clock_ops.c | 2 +- + drivers/base/property.c | 1 + + drivers/base/soc.c | 6 +-- + drivers/base/swnode.c | 11 +++-- + drivers/edac/edac_device.h | 2 +- + drivers/edac/edac_device_sysfs.c | 2 +- + drivers/edac/edac_module.c | 4 +- + drivers/edac/edac_pci_sysfs.c | 2 +- + drivers/pmdomain/core.c | 2 +- + fs/kernfs/dir.c | 62 +++++++++++++++---------- + fs/kernfs/file.c | 2 +- + fs/kernfs/mount.c | 3 -- + fs/sysfs/dir.c | 2 +- + include/linux/container.h | 2 +- + include/linux/cpu.h | 5 ++ + include/linux/device.h | 8 ++-- + include/linux/device/bus.h | 2 +- + include/linux/device/class.h | 2 - + include/linux/edac.h | 4 +- + include/linux/pm_clock.h | 4 +- + init/initramfs.c | 18 ++++++- + kernel/cgroup/cgroup-v1.c | 2 +- + kernel/cgroup/cgroup.c | 35 +++----------- + kernel/cgroup/cpuset.c | 2 +- + 51 files changed, 207 insertions(+), 253 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-initrd +Merging usb/usb-next (933bb7b878dd usb: typec: tipd: fix use of device-specific init function) +$ 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/mediatek/mt8195-cherry.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8916.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8939.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8998.dtsi +Auto-merging arch/arm64/boot/dts/qcom/qcs404.dtsi +Auto-merging arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +Auto-merging drivers/bluetooth/btusb.c +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 | 124 +++- + .../devicetree/bindings/usb/generic-xhci.yaml | 25 +- + .../devicetree/bindings/usb/genesys,gl850g.yaml | 5 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 11 + + .../devicetree/bindings/usb/nxp,ptn5110.yaml | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 217 +++--- + .../bindings/usb/qcom,wcd939x-usbss.yaml | 102 +++ + .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 4 + + .../devicetree/bindings/usb/ti,tps6598x.yaml | 6 + + .../devicetree/bindings/usb/usb-xhci.yaml | 6 + + Documentation/usb/gadget-testing.rst | 20 +- + 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/mediatek/mt8195-cherry.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 - + arch/arm64/boot/dts/qcom/msm8939.dtsi | 12 - + arch/arm64/boot/dts/qcom/msm8996.dtsi | 43 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 5 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 9 - + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 53 +- + drivers/bluetooth/btusb.c | 6 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- + drivers/net/usb/r8152.c | 16 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 2 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 2 +- + drivers/thunderbolt/domain.c | 2 +- + drivers/thunderbolt/icm.c | 2 +- + drivers/thunderbolt/nhi.c | 4 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 33 +- + drivers/thunderbolt/tb.c | 74 +- + drivers/thunderbolt/tb.h | 18 + + drivers/thunderbolt/tmu.c | 2 +- + drivers/thunderbolt/tunnel.c | 46 +- + drivers/thunderbolt/xdomain.c | 54 +- + drivers/tty/tty_io.c | 3 + + drivers/usb/atm/ueagle-atm.c | 19 +- + drivers/usb/cdns3/cdns3-gadget.c | 149 +++- + drivers/usb/cdns3/cdns3-gadget.h | 3 + + drivers/usb/cdns3/cdns3-plat.c | 16 +- + drivers/usb/cdns3/cdns3-starfive.c | 2 +- + drivers/usb/cdns3/cdnsp-debug.h | 354 +++++----- + drivers/usb/chipidea/ci_hdrc_imx.c | 17 +- + drivers/usb/chipidea/core.c | 13 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/class/cdc-acm.c | 3 + + drivers/usb/core/driver.c | 64 +- + drivers/usb/core/generic.c | 16 + + drivers/usb/core/hub.c | 48 +- + drivers/usb/core/quirks.c | 7 + + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 8 +- + drivers/usb/dwc2/params.c | 1 + + drivers/usb/dwc3/core.c | 62 +- + drivers/usb/dwc3/core.h | 6 + + drivers/usb/dwc3/dwc3-imx8mp.c | 4 +- + drivers/usb/dwc3/dwc3-qcom.c | 22 +- + drivers/usb/dwc3/dwc3-xilinx.c | 13 +- + drivers/usb/dwc3/ep0.c | 5 +- + drivers/usb/dwc3/gadget.c | 25 +- + drivers/usb/dwc3/gadget.h | 2 + + 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_ncm.c | 69 +- + 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 | 68 +- + drivers/usb/gadget/function/f_uvc.h | 2 +- + drivers/usb/gadget/function/u_ether.c | 2 + + drivers/usb/gadget/function/u_ncm.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 | 449 +++++++++--- + 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 | 15 +- + drivers/usb/gadget/udc/gr_udc.c | 13 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 13 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 +- + 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-debugfs.c | 2 +- + drivers/usb/host/xhci-mem.c | 110 ++- + drivers/usb/host/xhci-mtk.c | 40 +- + drivers/usb/host/xhci-mtk.h | 2 + + drivers/usb/host/xhci-pci.c | 140 ++-- + drivers/usb/host/xhci-plat.c | 26 +- + drivers/usb/host/xhci-ring.c | 13 +- + drivers/usb/host/xhci.c | 213 +++--- + drivers/usb/host/xhci.h | 19 +- + drivers/usb/misc/iowarrior.c | 1 - + drivers/usb/misc/onboard_usb_hub.c | 26 +- + drivers/usb/misc/onboard_usb_hub.h | 6 + + drivers/usb/misc/qcom_eud.c | 3 + + drivers/usb/misc/yurex.c | 14 +- + drivers/usb/mon/mon_bin.c | 7 +- + 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-mxs-usb.c | 3 +- + drivers/usb/phy/phy-twl6030-usb.c | 8 +- + drivers/usb/serial/bus.c | 2 +- + drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/storage/sierra_ms.c | 16 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/typec/class.c | 17 +- + 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 | 417 ++++++++--- + drivers/usb/typec/tipd/core.c | 177 ++++- + drivers/usb/typec/tipd/tps6598x.h | 18 + + drivers/usb/usbip/stub_main.c | 8 +- + drivers/usb/usbip/vudc.h | 2 +- + drivers/usb/usbip/vudc_dev.c | 3 +- + drivers/usb/usbip/vudc_main.c | 2 +- + include/linux/thunderbolt.h | 2 +- + include/linux/usb.h | 31 +- + include/linux/usb/gadget.h | 1 + + 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 +- + 142 files changed, 3945 insertions(+), 1549 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 (04b99eac389a thunderbolt: Reduce retry timeout to speed up boot for some devices) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (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 (0c84bea0cabc serial: sc16is7xx: refactor EFR lock) +$ 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 arch/um/drivers/chan_user.c +Auto-merging arch/um/drivers/line.c +Auto-merging drivers/bluetooth/btmtkuart.c +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/mfd/rave-sp.c +Auto-merging drivers/tty/hvc/hvc_riscv_sbi.c +Auto-merging drivers/tty/serial/Kconfig +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 +- + .../devicetree/bindings/serial/arm,dcc.yaml | 30 ++ + .../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 | 8 +- + 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 | 16 +- + drivers/tty/serial/8250/8250_em.c | 5 +- + drivers/tty/serial/8250/8250_exar.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_lpss.c | 7 +- + 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 | 61 ++- + drivers/tty/serial/8250/8250_pci1xxxx.c | 210 +++++++- + 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 | 8 +- + drivers/tty/serial/amba-pl011.c | 276 +++++----- + drivers/tty/serial/apbuart.c | 2 +- + 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 | 63 +-- + 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 | 33 +- + 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 | 567 +++++++++++---------- + drivers/tty/serial/sccnxp.c | 13 +- + drivers/tty/serial/serial-tegra.c | 5 +- + drivers/tty/serial/serial_core.c | 88 +++- + 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 | 14 +- + 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/serial_core.h | 4 +- + include/linux/tty.h | 19 +- + include/linux/tty_driver.h | 9 +- + include/linux/tty_port.h | 8 +- + include/linux/virtio_console.h | 38 -- + include/uapi/linux/serial.h | 19 +- + net/bluetooth/rfcomm/tty.c | 2 +- + sound/drivers/serial-generic.c | 4 +- + 172 files changed, 1661 insertions(+), 1556 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/arm,dcc.yaml + delete mode 100644 include/linux/virtio_console.h +Merging char-misc/char-misc-next (5850edccec30 android: removed duplicate linux/errno) +$ 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 .mailmap +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml +Auto-merging Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +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/base/property.c +Auto-merging drivers/bus/moxtet.c +Auto-merging drivers/edac/versal_edac.c +Auto-merging drivers/firmware/arm_scmi/driver.c +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/greybus/gb-beagleplay.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 drivers/iio/pressure/bmp280-spi.c +Auto-merging drivers/interconnect/qcom/icc-rpm.c +Auto-merging drivers/misc/eeprom/at24.c +Auto-merging drivers/misc/vmw_vmci/vmci_handle_array.h +Auto-merging drivers/of/device.c +Auto-merging drivers/of/platform.c +Auto-merging drivers/pci/endpoint/functions/pci-epf-mhi.c +Auto-merging drivers/soc/xilinx/xlnx_event_manager.c +Auto-merging drivers/soc/xilinx/zynqmp_power.c +Auto-merging include/linux/dma-map-ops.h +Auto-merging include/linux/property.h +Auto-merging kernel/dma/debug.c +Auto-merging scripts/checkpatch.pl +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 e5fbf5ba65e8] 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^.. + .mailmap | 7 +- + Documentation/ABI/testing/sysfs-bus-cdx | 7 + + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 16 + + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 159 ++ + Documentation/ABI/testing/sysfs-bus-iio | 42 +- + Documentation/ABI/testing/sysfs-nvmem-cells | 21 + + Documentation/arch/arm64/silicon-errata.rst | 10 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 20 + + .../devicetree/bindings/iio/adc/adi,ad7091r5.yaml | 82 +- + .../bindings/iio/adc/maxim,max34408.yaml | 139 ++ + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 8 +- + .../bindings/iio/adc/qcom,spmi-rradc.yaml | 2 +- + .../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/dac/microchip,mcp4821.yaml | 86 + + .../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 + + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 4 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/w1/amd,axi-1wire-host.yaml | 44 + + Documentation/trace/coresight/coresight.rst | 4 + + MAINTAINERS | 95 +- + arch/arm/common/locomo.c | 4 +- + arch/arm/include/asm/hardware/locomo.h | 2 - + 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/android/binderfs.c | 1 - + drivers/base/property.c | 37 +- + 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/bus/moxtet.c | 2 +- + drivers/cdx/cdx.c | 171 +- + drivers/char/ppdev.c | 6 +- + drivers/comedi/comedi_fops.c | 4 +- + drivers/edac/versal_edac.c | 4 +- + drivers/extcon/extcon-qcom-spmi-misc.c | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 9 +- + drivers/extcon/extcon.c | 3 +- + drivers/firmware/arm_scmi/driver.c | 6 +- + drivers/firmware/arm_scpi.c | 6 +- + drivers/firmware/imx/imx-dsp.c | 6 +- + drivers/firmware/mtk-adsp-ipc.c | 6 +- + drivers/firmware/qemu_fw_cfg.c | 5 +- + drivers/firmware/raspberrypi.c | 6 +- + drivers/firmware/stratix10-rsu.c | 5 +- + drivers/firmware/stratix10-svc.c | 6 +- + drivers/firmware/turris-mox-rwtm.c | 6 +- + drivers/firmware/xilinx/zynqmp.c | 398 ++-- + drivers/fpga/altera-fpga2sdram.c | 6 +- + drivers/fpga/altera-freeze-bridge.c | 6 +- + drivers/fpga/altera-hps2fpga.c | 6 +- + drivers/fpga/dfl-afu-main.c | 6 +- + drivers/fpga/dfl-fme-br.c | 6 +- + drivers/fpga/dfl-fme-main.c | 6 +- + drivers/fpga/dfl-fme-region.c | 6 +- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 6 +- + drivers/fpga/of-fpga-region.c | 6 +- + drivers/fpga/socfpga-a10.c | 6 +- + drivers/fpga/stratix10-soc.c | 6 +- + drivers/fpga/xilinx-pr-decoupler.c | 6 +- + drivers/fpga/zynq-fpga.c | 6 +- + 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/iio/accel/Kconfig | 7 +- + drivers/iio/accel/bmi088-accel-core.c | 2 + + drivers/iio/accel/bmi088-accel-spi.c | 2 + + drivers/iio/adc/Kconfig | 29 +- + drivers/iio/adc/Makefile | 5 +- + drivers/iio/adc/ad7091r-base.c | 288 ++- + drivers/iio/adc/ad7091r-base.h | 83 +- + drivers/iio/adc/ad7091r5.c | 120 +- + drivers/iio/adc/ad7091r8.c | 272 +++ + 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/buffer/industrialio-buffer-dma.c | 87 +- + drivers/iio/chemical/Kconfig | 11 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/ags02ma.c | 165 ++ + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5791.c | 9 +- + drivers/iio/dac/mcp4821.c | 236 ++ + 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 | 22 +- + 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 +++++++++ + 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/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 +- + 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/at24.c | 43 +- + drivers/misc/eeprom/ee1004.c | 113 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 + + 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/pvpanic/pvpanic-mmio.c | 7 +- + drivers/misc/pvpanic/pvpanic-pci.c | 6 +- + drivers/misc/pvpanic/pvpanic.c | 12 +- + drivers/misc/pvpanic/pvpanic.h | 5 + + 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/mux/mmio.c | 19 +- + drivers/nvmem/Kconfig | 1 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 359 +-- + 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 | 29 +- + drivers/nvmem/layouts/sl28vpd.c | 29 +- + drivers/nvmem/mtk-efuse.c | 11 +- + drivers/nvmem/stm32-romem.c | 16 + + drivers/nvmem/u-boot-env.c | 84 +- + drivers/of/device.c | 41 + + drivers/of/platform.c | 40 - + drivers/parport/parport_serial.c | 64 + + drivers/parport/share.c | 8 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 314 ++- + 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/platform/surface/aggregator/bus.c | 5 +- + drivers/sh/maple/maple.c | 4 +- + drivers/soc/xilinx/xlnx_event_manager.c | 33 +- + 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/uio/uio.c | 7 +- + drivers/video/console/Kconfig | 2 +- + drivers/virt/vboxguest/vboxguest_core.c | 156 +- + drivers/virt/vboxguest/vboxguest_linux.c | 22 +- + drivers/virt/vboxguest/vboxguest_utils.c | 33 +- + drivers/virt/vmgenid.c | 2 + + drivers/w1/masters/Kconfig | 11 + + drivers/w1/masters/Makefile | 1 + + drivers/w1/masters/amd_axi_w1.c | 396 ++++ + drivers/w1/masters/ds2490.c | 25 +- + drivers/w1/masters/w1-gpio.c | 118 +- + drivers/w1/slaves/w1_ds2433.c | 162 +- + include/linux/cdx/cdx_bus.h | 12 + + include/linux/coresight.h | 1 + + include/linux/dma-map-ops.h | 4 +- + include/linux/firmware/xlnx-zynqmp.h | 59 +- + include/linux/iio/adc/adi-axi-adc.h | 4 + + include/linux/iio/buffer-dma.h | 7 +- + include/linux/iio/iio.h | 6 - + include/linux/iio/types.h | 1 + + include/linux/maple.h | 1 - + include/linux/mhi.h | 4 + + include/linux/mhi_ep.h | 36 +- + include/linux/moxtet.h | 2 - + include/linux/nvmem-consumer.h | 8 +- + include/linux/nvmem-provider.h | 68 +- + include/linux/of_device.h | 6 + + include/linux/property.h | 12 + + include/linux/rtsx_pci.h | 8 + + include/linux/spmi.h | 3 + + include/linux/surface_aggregator/device.h | 1 - + include/linux/w1-gpio.h | 22 - + include/uapi/linux/android/binder.h | 30 +- + include/uapi/linux/iio/types.h | 2 + + include/uapi/linux/mei.h | 4 +- + include/uapi/linux/nsm.h | 31 + + init/do_mounts.c | 9 +- + kernel/dma/debug.c | 2 +- + scripts/checkpatch.pl | 1 + + scripts/tags.sh | 17 +- + tools/counter/Build | 1 + + tools/counter/Makefile | 12 +- + tools/counter/counter_watch_events.c | 406 ++++ + tools/iio/iio_event_monitor.c | 2 + + tools/testing/nvdimm/test/Kbuild | 1 + + 303 files changed, 24551 insertions(+), 3028 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-nvmem-cells + 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/dac/microchip,mcp4821.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 Documentation/devicetree/bindings/w1/amd,axi-1wire-host.yaml + create mode 100644 drivers/iio/adc/ad7091r8.c + create mode 100644 drivers/iio/adc/max34408.c + create mode 100644 drivers/iio/chemical/ags02ma.c + create mode 100644 drivers/iio/dac/mcp4821.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 + 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 + 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 drivers/w1/masters/amd_axi_w1.c + delete mode 100644 include/linux/w1-gpio.h + create mode 100644 include/uapi/linux/nsm.h + create mode 100644 tools/counter/counter_watch_events.c +Merging accel/habanalabs-next (a9f07790a4b2 accel/habanalabs: fix information leak in sec_attest_info()) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (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 (c849ecb2ae84 fpga: zynq-fpga: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (869b601db3b7 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. + drivers/interconnect/qcom/sc8180x.c | 1 + + drivers/interconnect/qcom/sm8550.c | 575 +----------------------------------- + drivers/interconnect/qcom/sm8550.h | 284 ++++++++---------- + 3 files changed, 124 insertions(+), 736 deletions(-) +Merging iio/togreg (b1a1eaf61836 Merge tag 'iio-for-6.8b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (2029e71482fc phy: ti: j721e-wiz: Add SGMII support in WIZ driver for J784S4) +$ 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 +Auto-merging drivers/phy/ti/phy-gmii-sel.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 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 9 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 5 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 3 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 8 +- + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 2 + + drivers/phy/mediatek/phy-mtk-tphy.c | 25 ++ + drivers/phy/phy-can-transceiver.c | 10 +- + drivers/phy/phy-core.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 174 +++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 65 ++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v7.h | 17 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v7.h | 32 ++ + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 5 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v7.h | 87 ++++++ + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 8 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 1 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h | 4 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_n4.h | 51 +++ + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v7.h | 78 +++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 114 ++++++- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 344 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 6 + + drivers/phy/renesas/Kconfig | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 156 ++++++++-- + drivers/phy/ti/phy-gmii-sel.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 1 + + 31 files changed, 1168 insertions(+), 78 deletions(-) + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v7.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v7.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v7.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_n4.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v7.h +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 +Already up to date. +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 +Already up to date. +Merging vfio/next (78f70c02bdbc vfio/virtio: fix virtio-pci dependency) +$ 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 | 8 + + drivers/vfio/Kconfig | 10 + + drivers/vfio/Makefile | 1 + + drivers/vfio/debugfs.c | 92 ++++ + drivers/vfio/pci/Kconfig | 2 + + drivers/vfio/pci/Makefile | 2 + + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 7 +- + drivers/vfio/pci/pds/dirty.c | 309 ++++++++----- + drivers/vfio/pci/pds/dirty.h | 18 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 57 +-- + drivers/vfio/pci/virtio/Kconfig | 15 + + drivers/vfio/pci/virtio/Makefile | 3 + + drivers/vfio/pci/virtio/main.c | 576 +++++++++++++++++++++++++ + drivers/vfio/vfio.h | 14 + + drivers/vfio/vfio_iommu_type1.c | 8 +- + drivers/vfio/vfio_main.c | 4 + + drivers/virtio/Kconfig | 5 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 37 +- + drivers/virtio/virtio_pci_admin_legacy_io.c | 244 +++++++++++ + drivers/virtio/virtio_pci_common.c | 14 + + drivers/virtio/virtio_pci_common.h | 42 +- + drivers/virtio/virtio_pci_modern.c | 259 ++++++++++- + drivers/virtio/virtio_pci_modern_dev.c | 24 +- + include/linux/vfio.h | 7 + + include/linux/vfio_pci_core.h | 20 + + include/linux/virtio.h | 8 + + include/linux/virtio_config.h | 4 + + include/linux/virtio_pci_admin.h | 23 + + include/linux/virtio_pci_modern.h | 2 + + include/uapi/linux/vfio.h | 1 + + include/uapi/linux/virtio_config.h | 8 +- + include/uapi/linux/virtio_pci.h | 68 +++ + 34 files changed, 1754 insertions(+), 164 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-vfio + create mode 100644 drivers/vfio/debugfs.c + create mode 100644 drivers/vfio/pci/virtio/Kconfig + create mode 100644 drivers/vfio/pci/virtio/Makefile + create mode 100644 drivers/vfio/pci/virtio/main.c + create mode 100644 drivers/virtio/virtio_pci_admin_legacy_io.c + create mode 100644 include/linux/virtio_pci_admin.h +Merging w1/for-next (93c4bb3666a3 w1: ds2433: add support for ds28ec20 eeprom) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging 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 (0a46c21c21c1 Staging: rtl8192e: Rename variable OpMode) +$ 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_cmdpkt.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 41 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 101 +--- + 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 | 226 +++---- + drivers/staging/rtl8192e/rtl819x_HT.h | 35 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 371 +++++------- + drivers/staging/rtl8192e/rtl819x_Qos.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 22 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 156 ++--- + drivers/staging/rtl8192e/rtllib.h | 71 +-- + drivers/staging/rtl8192e/rtllib_module.c | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 82 +-- + drivers/staging/rtl8192e/rtllib_softmac.c | 387 ++---------- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 11 +- + drivers/staging/rtl8192e/rtllib_tx.c | 66 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 9 +- + drivers/staging/rtl8712/rtl8712_recv.c | 3 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 60 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 159 ++--- + drivers/staging/rtl8712/rtl871x_cmd.h | 37 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 203 +++---- + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 2 +- + 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/vme_user/vme.c | 4 +- + 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 +- + 50 files changed, 1261 insertions(+), 2420 deletions(-) + delete mode 100644 drivers/staging/rtl8192e/dot11d.c + delete mode 100644 drivers/staging/rtl8192e/dot11d.h +Merging counter-next/counter-next (49ca40f8d6ce counter: linux/counter.h: fix Excess kernel-doc description warning) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + include/linux/counter.h | 1 - + 1 file changed, 1 deletion(-) +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (3d0b2176e042 dmaengine: xilinx: xdma: statify xdma_prep_interleaved_dma) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/fsl-edma-main.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/idxd/device.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/dma-controller.yaml | 15 - + .../devicetree/bindings/dma/dma-router.yaml | 11 - + .../bindings/dma/loongson,ls2x-apbdma.yaml | 62 ++ + .../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 +- + MAINTAINERS | 7 + + drivers/dma/Kconfig | 14 + + drivers/dma/Makefile | 1 + + drivers/dma/apple-admac.c | 5 +- + drivers/dma/dma-axi-dmac.c | 286 ++++++--- + drivers/dma/dmaengine.c | 3 + + drivers/dma/dmatest.c | 17 +- + drivers/dma/fsl-edma-main.c | 17 +- + drivers/dma/idxd/cdev.c | 4 +- + drivers/dma/idxd/device.c | 9 +- + drivers/dma/ls2x-apb-dma.c | 705 +++++++++++++++++++++ + drivers/dma/milbeaut-hdmac.c | 17 +- + drivers/dma/milbeaut-xdmac.c | 17 +- + drivers/dma/pl330.c | 3 + + drivers/dma/sf-pdma/sf-pdma.c | 44 +- + drivers/dma/sf-pdma/sf-pdma.h | 8 +- + drivers/dma/ste_dma40.c | 12 +- + drivers/dma/tegra210-adma.c | 35 +- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/k3-psil-am62p.c | 325 ++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 2 + + drivers/dma/ti/k3-udma.c | 2 + + drivers/dma/uniphier-mdmac.c | 17 +- + drivers/dma/uniphier-xdmac.c | 17 +- + drivers/dma/xilinx/xdma-regs.h | 30 +- + drivers/dma/xilinx/xdma.c | 350 +++++++--- + drivers/dma/xilinx/xilinx_dpdma.c | 2 +- + include/dt-bindings/dma/fsl-edma.h | 21 + + 39 files changed, 1870 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/loongson,ls2x-apbdma.yaml + create mode 100644 drivers/dma/ls2x-apb-dma.c + create mode 100644 drivers/dma/ti/k3-psil-am62p.c + create mode 100644 include/dt-bindings/dma/fsl-edma.h +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 +Merge made by the 'ort' strategy. +Merging scsi/for-next (2d1fce73f826 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (7d1ae55ffed0 scsi: MAINTAINERS: Update ibmvscsi_tgt maintainer) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 6 ++- + drivers/scsi/fnic/fnic_scsi.c | 1 + + drivers/scsi/initio.c | 3 +- + drivers/scsi/isci/request.c | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 +-- + drivers/scsi/scsi_error.c | 9 ++-- + drivers/scsi/smartpqi/smartpqi.h | 1 - + drivers/scsi/smartpqi/smartpqi_init.c | 89 ++++++++++++++++++++++++++++++---- + drivers/scsi/virtio_scsi.c | 2 - + drivers/target/target_core_device.c | 5 -- + drivers/target/target_core_transport.c | 4 ++ + drivers/ufs/core/ufshcd.c | 14 ++---- + drivers/ufs/host/ufs-qcom.c | 7 +-- + 14 files changed, 106 insertions(+), 45 deletions(-) +Merging vhost/linux-next (f16d65124380 vdpa/mlx5: Add mkey leak detection) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging drivers/virtio/virtio_pci_common.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + drivers/nvdimm/virtio_pmem.c | 36 ++++++- + drivers/scsi/virtio_scsi.c | 78 +++++++++++++- + drivers/vdpa/alibaba/eni_vdpa.c | 6 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 10 +- + drivers/vdpa/mlx5/core/mr.c | 73 ++++++++++--- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 209 +++++++++++++++++++++++++++++++++---- + drivers/vdpa/vdpa.c | 4 +- + drivers/vhost/vdpa.c | 26 ++++- + drivers/virtio/virtio_balloon.c | 57 ++++++++-- + drivers/virtio/virtio_pci_common.c | 34 +++++- + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/mlx5/mlx5_ifc_vdpa.h | 4 + + include/uapi/linux/virtio_pmem.h | 7 ++ + 13 files changed, 480 insertions(+), 67 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 (1979a2807547 gpiolib: replace the GPIO device mutex with a read-write semaphore) +$ 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 +Already up to date. +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 (0ef4b05e2dfb 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 + + .../bindings/pinctrl/qcom,ipq5018-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 9 +- + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 8 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 9 +- + .../bindings/pinctrl/qcom,lpass-lpi-common.yaml | 75 + + .../bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 18 +- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 18 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 8 +- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 18 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 7 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 9 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 56 +- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 9 +- + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 21 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 9 +- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 49 +- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 28 +- + .../bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 20 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 49 +- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 18 +- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 10 +- + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 19 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 10 +- + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 8 +- + .../bindings/pinctrl/qcom,sdx65-tlmm.yaml | 8 +- + .../bindings/pinctrl/qcom,sdx75-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,sm4450-tlmm.yaml | 151 ++ + .../pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml | 48 +- + .../bindings/pinctrl/qcom,sm6115-tlmm.yaml | 8 +- + .../bindings/pinctrl/qcom,sm6125-tlmm.yaml | 20 +- + .../bindings/pinctrl/qcom,sm6350-tlmm.yaml | 20 +- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 18 +- + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 9 +- + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 9 +- + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 49 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 9 +- + .../pinctrl/qcom,sm8350-lpass-lpi-pinctrl.yaml | 49 +- + .../bindings/pinctrl/qcom,sm8350-tlmm.yaml | 20 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 49 +- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 20 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 55 +- + .../bindings/pinctrl/qcom,sm8550-tlmm.yaml | 12 +- + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 107 ++ + .../bindings/pinctrl/qcom,sm8650-tlmm.yaml | 141 ++ + .../bindings/pinctrl/qcom,x1e80100-tlmm.yaml | 137 ++ + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 45 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 2 +- + 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-as3722.c | 17 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 458 +++-- + 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 | 26 + + drivers/pinctrl/qcom/Makefile | 4 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 70 +- + 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-sm4450.c | 1014 +++++++++++ + 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 | 111 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 25 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 11 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 14 + + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 8 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 8 +- + 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 +- + 162 files changed, 8320 insertions(+), 1692 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-common.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm4450-tlmm.yaml + 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-sm4450.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/pwm/for-next (9320fc509b87 pwm: jz4740: Don't use dev_err_probe() in .request()) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-bcm2835.c | 4 +--- + drivers/pwm/pwm-jz4740.c | 7 ++++--- + 3 files changed, 6 insertions(+), 7 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. + kernel/ucount.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 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 (ee9793be08b1 tracing/selftests: Add ownership modification tests for eventfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (539e582a375d kunit: Fix some comments which were mistakenly kerneldoc) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (14688f1a91e1 rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/hpet.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/adi,max31335.yaml | 70 +++ + .../devicetree/bindings/rtc/epson,rx8900.yaml | 2 + + .../bindings/rtc/nuvoton,ma35d1-rtc.yaml | 48 ++ + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 36 +- + MAINTAINERS | 9 +- + 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 | 37 ++ + drivers/rtc/Makefile | 3 + + drivers/rtc/class.c | 2 +- + drivers/rtc/rtc-ac100.c | 4 +- + drivers/rtc/rtc-cmos.c | 28 +- + drivers/rtc/rtc-da9063.c | 88 ++- + drivers/rtc/rtc-ds3232.c | 4 +- + drivers/rtc/rtc-ma35d1.c | 304 +++++++++ + drivers/rtc/rtc-max31335.c | 697 +++++++++++++++++++++ + drivers/rtc/rtc-mc146818-lib.c | 39 +- + drivers/rtc/rtc-nct3018y.c | 52 +- + drivers/rtc/rtc-rv8803.c | 36 +- + drivers/rtc/rtc-tps6594.c | 454 ++++++++++++++ + include/linux/mc146818rtc.h | 3 +- + 23 files changed, 1819 insertions(+), 105 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/adi,max31335.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/nuvoton,ma35d1-rtc.yaml + create mode 100644 drivers/rtc/rtc-ma35d1.c + create mode 100644 drivers/rtc/rtc-max31335.c + create mode 100644 drivers/rtc/rtc-tps6594.c +Merging nvdimm/libnvdimm-for-next (a085a5eb6594 acpi/nfit: Use sysfs_emit() for all attributes) +$ 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 +Already up to date. +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (98b1cc82c4af Linux 6.7-rc2) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (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 +Already up to date. +Merging kgdb/kgdb/for-next (23816724fdbd kdb: Corrects comment for kdballocenv) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (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 +Already up to date. +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 (73bf93edeeea cxl/core: use sysfs_emit() for attr's _show()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/apei/ghes.c +CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c +Auto-merging drivers/base/node.c +Auto-merging drivers/pci/pci.c +Auto-merging include/linux/acpi.h +CONFLICT (content): Merge conflict in include/linux/acpi.h +Auto-merging include/linux/pci.h +Auto-merging lib/fw_table.c +CONFLICT (content): Merge conflict in lib/fw_table.c +Resolved 'drivers/acpi/apei/ghes.c' using previous resolution. +Resolved 'include/linux/acpi.h' using previous resolution. +Resolved 'lib/fw_table.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 154a6ba5e46d] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-cxl | 34 +++ + MAINTAINERS | 1 + + drivers/acpi/apei/ghes.c | 89 ++++++ + drivers/acpi/numa/hmat.c | 193 ++++++++++-- + drivers/acpi/tables.c | 5 +- + drivers/base/node.c | 12 +- + drivers/cxl/Kconfig | 3 + + drivers/cxl/acpi.c | 155 +++++++++- + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/cdat.c | 521 ++++++++++++++++++++++++++++++++ + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/mbox.c | 83 +++-- + drivers/cxl/core/memdev.c | 2 +- + drivers/cxl/core/pci.c | 36 +++ + drivers/cxl/core/pmem.c | 8 +- + drivers/cxl/core/port.c | 167 ++++++++-- + drivers/cxl/core/region.c | 15 +- + drivers/cxl/core/trace.h | 14 +- + drivers/cxl/cxl.h | 47 ++- + drivers/cxl/cxlmem.h | 132 +++----- + drivers/cxl/cxlpci.h | 13 + + drivers/cxl/mem.c | 67 +++- + drivers/cxl/pci.c | 58 +++- + drivers/cxl/port.c | 8 +- + drivers/pci/pci.c | 38 ++- + include/linux/acpi.h | 11 + + include/linux/cxl-event.h | 161 ++++++++++ + include/linux/fw_table.h | 21 +- + include/linux/memory-tiers.h | 10 +- + include/linux/node.h | 8 +- + include/linux/pci.h | 3 + + include/uapi/linux/cxl_mem.h | 1 + + lib/fw_table.c | 73 ++++- + mm/memory-tiers.c | 12 +- + tools/testing/cxl/Kbuild | 1 + + tools/testing/cxl/test/cxl.c | 4 + + tools/testing/cxl/test/mem.c | 163 +++++----- + 37 files changed, 1844 insertions(+), 328 deletions(-) + create mode 100644 drivers/cxl/core/cdat.c + create mode 100644 include/linux/cxl-event.h +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 (4afa688d7141 efi: memmap: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (7f29d6780929 ovl: Reject mounting case-insensitive filesystems) +$ 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 include/linux/fs.h +Merge made by the 'ort' strategy. + fs/overlayfs/params.c | 13 ++++++++++--- + include/linux/fs.h | 9 +++++++++ + 2 files changed, 19 insertions(+), 3 deletions(-) +Merging slab/slab/for-next (61d7e367f8bc 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 +Already up to date. +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (40ab4e0407f6 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 | 176 +++++++++- + security/landlock/fs.h | 2 + + security/landlock/limits.h | 11 +- + 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 | 508 ++++++++++++++++++++++++++- + 10 files changed, 860 insertions(+), 50 deletions(-) +Merging rust/rust-next (711cbfc71765 docs: rust: Clarify that 'rustup override' applies to build directory) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (561429807d50 sysctl: remove struct ctl_path) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (38132920f430 exec: remove useless comment) +$ 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 da8278e07e71] 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 | 3 --- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging bitmap/bitmap-for-next (071ad962baf5 bitmap: Step down as a reviewer) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging drivers/block/null_blk/main.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu.h +Auto-merging drivers/net/ethernet/sfc/rx_common.c +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 +CONFLICT (content): Merge conflict in drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/watch_queue.c +Auto-merging lib/sbitmap.c +Auto-merging sound/pci/hda/hda_codec.c +Resolved 'drivers/tty/serial/sc16is7xx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6f15669cbb06] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + 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/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, 629 insertions(+), 412 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 +Already up to date. +Merging kspp-gustavo/for-next/kspp (5ea9350aab7e 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 +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (47f2bd2ff382 iommufd/selftest: Check the bus type during probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/iommufd/hw_pagetable.c +Auto-merging include/linux/iommu.h +Merge made by the 'ort' strategy. + drivers/iommu/intel/nested.c | 88 +++++++++++++++ + drivers/iommu/iommufd/hw_pagetable.c | 41 +++++++ + drivers/iommu/iommufd/iommufd_private.h | 10 ++ + drivers/iommu/iommufd/iommufd_test.h | 23 ++++ + drivers/iommu/iommufd/main.c | 3 + + drivers/iommu/iommufd/selftest.c | 104 +++++++++++++++--- + include/linux/iommu.h | 77 +++++++++++++ + include/uapi/linux/iommufd.h | 79 +++++++++++++ + tools/testing/selftests/iommu/iommufd.c | 152 ++++++++++++++++++++++++++ + tools/testing/selftests/iommu/iommufd_utils.h | 55 ++++++++++ + 10 files changed, 619 insertions(+), 13 deletions(-) +Merging devicetree/for-next (8ee03a40e9f9 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 drivers/thermal/loongson2_thermal.c +Auto-merging include/linux/of_device.h +Merge made by the 'ort' strategy. + 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/thermal/loongson2_thermal.c | 3 ++- + include/linux/of_device.h | 5 +---- + include/linux/of_platform.h | 4 ++-- + 9 files changed, 28 insertions(+), 48 deletions(-) +Merging header_cleanup/header_cleanup (1e2f2d31997a 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 +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..a1f1c97e5be6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240118 |