diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-02-07 17:39:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-02-07 17:39:19 +1100 |
| commit | 2ae0a045e6814c8c1d676d6153c605a65746aa29 (patch) | |
| tree | 74d06483300ed50c6d676992a35bb04e04563afe | |
| parent | de20c5e21f37ace305a0c754a1ec3bba3a918fe0 (diff) | |
Add linux-next specific files for 20240207next-20240207
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 370 | ||||
| -rw-r--r-- | Next/Trees | 372 | ||||
| -rw-r--r-- | Next/merge.log | 7563 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8306 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5bf76c8bb4dc --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,370 @@ +Name SHA1 +---- ---- +origin 99bd3cb0d12e85d5114425353552121ec8f93adc +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 2fc82eb0f9807b1342bb91c6a27ee81b5596c78d +kbuild-current 41b9fb381a486360b2daaec0c7480f8e3ff72bc7 +arc-current 861deac3b092f37b2c5e6871732f3e11486f7082 +arm-current f54e8634d1366926c807e2af6125b33cff555fa7 +arm64-fixes c7767f5c43df2c453af4651d1f58f489e3eb4ac1 +arm-soc-fixes 1b5af823d703ee183ffdde188aaf584ab93eea19 +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +sophgo-fixes 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8 +powerpc-fixes 1c57b9f63ab34f01b8c73731cc0efacb5a9a2f16 +s390-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 1ce2654d87e2fb91fea83b288bd9b2641045e42a +bpf 577e4432f3ac810049cb7e6b71f4d96ec7c6e894 +ipsec 983a73da1f996faee9997149eb05b12fa7bd8cbf +netfilter 8059918a1377f2f1fff06af4f5a4ed3d5acd6bc4 +ipvs 8059918a1377f2f1fff06af4f5a4ed3d5acd6bc4 +wireless 0647903efbc84b772325b4d24d9487e24d6d1e03 +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes fdfa083549de5d50ebf7f6811f33757781e838c0 +sound-current fddab35fd064414c677e9488c4fb3a1f67725d37 +sound-asoc-fixes 610010737f74482a61896596a0116876ecf9e65c +regmap-fixes 1a1b27115ae1b7c19e48b7ef3712769c4c026f1c +regulator-fixes a3fa9838e8140584a6f338e8516f2b05d3bea812 +spi-fixes c712c05e46c8ce550842951e9e2606e24dbf0475 +pci-current 6613476e225e090cc9aad49be7fa504e290dd33d +driver-core.current 6e7ad1aebb4fc9fed0217dd50ef6e58a53f17d81 +tty.current 7be50f2e8f20fc2299069b28dea59a28e3abe20a +usb.current b55fe36efc22f1f1c8f69e1cdf12c9f5d6ca371e +usb-serial-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +phy 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +staging.current 6613476e225e090cc9aad49be7fa504e290dd33d +iio-fixes 4cb81840d8f29b66d9d05c6d7f360c9560f7e2f4 +counter-current 6613476e225e090cc9aad49be7fa504e290dd33d +char-misc.current 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +soundwire-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +thunderbolt-fixes ec4d82f855ce332de26fe080892483de98cc1a19 +input-current 4255447ad34c5c3785fcdcf76cfa0271d6e5ed39 +crypto-current 24c890dd712f6345e382256cae8c97abb0406b70 +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes b54761f6e9773350c0d1fb8e1e5aacaba7769d0f +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +mtd-fixes e6a30d0c48a1e8a68f1cc413bee65302ab03ddfb +mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v4l-dvb-fixes 346c84e281a963437b9fe9dfcd92c531630289de +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes 59be5c35850171e307ca5d3d703ee9ff4096b948 +at91-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes e459647710070684a48384d67742822379de8c1c +kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77 +hwmon-fixes 34cf8c657cf0365791cdc658ddbca9cc907726ce +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes 6be99530c92c6b8ff7a01903edc42393575ad63b +btrfs-fixes c94bd41cb0b62737d2d05c9e2e9f7aa678046b86 +vfs-fixes dac853a94365a395a4a9f304f3324f0b7380478a +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes 1abdf288b0ef5606f76b6e191fa6df05330e3d7e +samsung-krzk-fixes eab4f56d3e75dad697acf8dc2c8be3c341d6c63e +pinctrl-samsung-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +devicetree-fixes 17adc3f329e922bd1dd5aee45f43d9dab351c1e9 +dt-krzk-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +scsi-fixes 17e94b2585417e04dabc2f13bc03b4665ae687f3 +drm-fixes d0399da9fb5f8e3d897b9776bffee2d3bfe20210 +drm-intel-fixes a99682e839af7be11a606bf802cba5b2bf93b8e9 +mmc-fixes cc9432c4fb159a3913e0ce3173b8218cd5bad2e0 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +hyperv-fixes 564eac2860bdbe6ac651e6909ac07ecd93d778f3 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +riscv-dt-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +riscv-soc-fixes a9d022ae8c4faca73467f70ca4a880787d855f94 +fpga-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +spdx 6613476e225e090cc9aad49be7fa504e290dd33d +gpio-brgl-fixes 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +gpio-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +erofs-fixes d9281660ff3ffb4a05302b485cc59a87e709aefc +kunit-fixes 1a9f2c776d1416c4ea6cb0d0b9917778c41a1a7d +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 6a9531c3a88096a26cf3ac582f7ec44f94a7dcb2 +nfsd-fixes 5ea9a7c5fe4149f165f0e3b624fe08df02b6c301 +renesas-fixes 9eab43facdadb7d00456c2657001ae2e5353c814 +perf-current fdd0ae72b34e56eb5e896d067c49a78ecb451032 +efi-fixes 1ad55cecf22f05f1c884adf63cc09d3c3e609ebf +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes d0266d7ab1618482d58015d67a5220e590333298 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes 28b9f669e10f5584aba9856c5aa9d86d64ec9f69 +rust-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v9fs-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +w1-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +pmdomain-fixes c41336f4d69057cbf88fed47951379b384540df5 +overlayfs-fixes 420332b94119cdc7db4477cc88484691cb92ae71 +i2c-host-fixes 9189526c46f2ad14df25dbdc30443f79d03dc7bd +drm-misc-fixes 5f8408aca66772d3aa9b4831577b2ac5ec41bcd9 +mm-stable 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +mm-nonmm-stable 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +mm fd01e57c7956906afb3aec3e372a5b38acaa5e3b +kbuild a8fdabe1e15ddec9491d3895786a21de492c0fd9 +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf 366fb5f59d470ad1271cd4bbc3c580ad6118943d +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping 7c65aa3cc072cee76f577262fbe381a111a98774 +asm-generic 34b2321cc648a246d08cc51e423532eac690ccf1 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 8790fade1a19caf714ba1d91ce1fdceb9f2067f2 +arm64 1b20d0486a602417defb5bf33320d31b2a7a47f8 +arm-perf bb339db4d363c84e0a8d70827df591397ccd7312 +arm-soc de4b6d6705a75de2c277e123ac30d13f4292771b +amlogic 0dd3ee31125508cd67f7e7172247f05b7fd1753a +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed e60f7a99d3789b5d0b24d3c0571b013309e56815 +at91 859f600457ccfe176d7887bc753bcdb83734c1bd +broadcom 412c6bd2c649bcacc057e274dccb0b93f69fd1c7 +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory 2f542c937c48c2bd5a8ddf180b417fbe7152559f +imx-mxs d93b6c641bc962a298bd8629c6669e97942d1231 +mediatek 8645a7bbcb275e7ae001ae0ef007b40bbaa7065a +mvebu 476887312c6082e2c03efc3f016e8134c076108e +omap 0012c1958460386adc5770baf2f53206aed77ff3 +qcom cff747252a485883d6df6c6a89f25b0ef7961496 +renesas 91487349a9c3f75c983229f900978df1d14e7ff2 +reset c3c46acd5be9a3351c163d2869045cab4d5342dc +rockchip 13c241737fc01d70b614db57efa58d11fb4f213f +samsung-krzk b57058d218ccb203a334806dd326bd46988439d4 +scmi 99f798bdfb75a8e07f90462399930186c8392997 +sophgo 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +stm32 bda732fda19365b7a7397d0d37090f6dc253232c +sunxi 38ed19495066966979ba821b9e0f549ad5ea620d +tee 84ec4fd8883176442d21454bcecd3c29c0aabad6 +tegra b762ac6498e6a16ad70a756102225769e80d01db +ti bc805e337f696a9b96f5019a676333c04938178a +xilinx 2d81f5ef567ce96f29e698939673226d2d1b0fcb +clk efe5a1b888ab0f6acf723e2a12a4644a599294d0 +clk-imx 6613476e225e090cc9aad49be7fa504e290dd33d +clk-renesas 5aaa139b9a03e1a43484a73248c6353a9c4d95c6 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch cca5efe77a6a2d02b3da4960f799fa233e460ab1 +m68k 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8 +m68knommu 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +microblaze 6613476e225e090cc9aad49be7fa504e290dd33d +mips 6613476e225e090cc9aad49be7fa504e290dd33d +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 82b143aeb169b8b55798d7d2063032e1a6ceeeb0 +powerpc 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v cb4ede926134a65bc3bf90ed58dace8451d7e759 +riscv-dt 5669bb5a16a0b8bfc3f2877dbfcd77b62cc9ebf4 +riscv-soc 6613476e225e090cc9aad49be7fa504e290dd33d +s390 8eb3db95a8c8ecd6f8bb082a99ded3bbc79b023f +sh 6613476e225e090cc9aad49be7fa504e290dd33d +uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88 +xtensa a03cd7602a090eae277d2b79d43925661e7fbe9a +bcachefs a655aaa7a8446f50b14c5d7f7c54c708355ab016 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt d3a7bd4200762d11c33ebe7e2c47c5813ddc65b4 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs c76800fdde7816aea0b835645e52745292c26e2e +ceph ded080c86b3f99683774af0441a58fc2e3d60cae +cifs 018edd04d0aab8e8975a99b484e376b802fd232d +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs aa12a790d31be14b289d5a2c6f41ca535fcc7841 +exfat 0991abeddefa118479b0af32c28bcd662dec1561 +exportfs 42c3732fa8073717dd7d924472f1c0bc5b452fdc +ext3 9e9a976eaa1dfbe0752ff0df15f1a60fd0a373e4 +ext4 ec9d669eba4c276d00af88951947fe0e82a6b84c +f2fs 21ec68234826b1b54ab980a8df6e33c74cfbee58 +fsverity 8e43fb06e10d2c811797740dd578c5099a3e6378 +fuse 3f29f1c336c0e8a4bec52f1e5217f88835553e5b +gfs2 6b89b6af459fdd6f2741d0c2e33c67af8193697e +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +nfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd deb2beb8fa2c3cd1d27de4de19b9d79fb3465f52 +ntfs3 622cd3daa8eae37359a6fd3c07c36d19f66606b5 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs adbf4c4954e33e623897058a617c583d65a177f6 +v9fs ff49bf1867578f23a5ffdd38f927f6e1e16796c4 +v9fs-ericvh be57855f505003c5cafff40338d5d0f23b00ba4d +xfs 881f78f472556ed05588172d5b5676b48dc48240 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 23b006406f6bf12029e0104c0586c903d154cec6 +vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +printk 6c3a34e38436a2a3f7a1fa764c108ee19b05b893 +pci 1281aa073d3701b03cc6e716dc128df5ba47509d +pstore 69f381e67d6fe94c4f1416fbd5672b715cae098a +hid b582e8c3ccc7d93150d903d5d0c0744180e4cc6c +i2c 957bd221ac7b2b56cbdf56739e3a94d4f479209e +i2c-host 4b5cb5c1a346d4e5e35a1032ff0a1e8dd3b27052 +i3c 4fa0888f6f3e6a67cac5afafb23e33f8222cfdd0 +hwmon-staging 1f1a48cb443225cb9884cdac94b28fbe72eb3874 +jc_docs f9197538d71a5d3ccd57451e048a0eb302bddc03 +v4l-dvb 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +v4l-dvb-next feb8831be9d468ee961289c6a275536a1ee0011c +pm 7cfffced6d0e76fdc265b75f28903142b3b0ecc9 +cpufreq-arm eaffb10b51bf74415c9252fd8fb4dd77122501ee +cpupower 0086ffec768bec6f5d61fc7e406af640eb912a24 +devfreq aed5ed595960c6d301dcd4ed31aeaa7a8054c0c6 +pmdomain c8634d885a775490914ff4dce3f62df225da0539 +opp ace4b31b297dfd7b8c969ff5046c8128c3e025be +thermal 5314b1543787e6cd5d248186fcfd5c5fc4ca2146 +dlm 5beebc1dda47719dac85830c53bca1a0ab497d96 +rdma aafe4cc5096996873817ff4981a3744e8caf7808 +net-next 60b4dfcda647f86c62dc7b8219d2bfed19bb2698 +bpf-next 92a871ab9fa59a74d013bc04f321026a057618e7 +ipsec-next ab1e1a38de240057ed108075abd1309c02e2a2a4 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next 5264ab612e28058536de8069bcf83eb20fd65c29 +ipvs-next 5264ab612e28058536de8069bcf83eb20fd65c29 +bluetooth a93e9d51834e2cdfe357fcf875e895b3d2605f10 +wireless-next 94dd7ce1885e530a7b10bbe50d5d68ba1bb99e6e +wpan-next 2373699560a754079579b7722b50d1d38de1960e +wpan-staging 2373699560a754079579b7722b50d1d38de1960e +mtd 18af7e357033f1a1cee50db2663ef982b4a2226e +nand 4bd14b2fd8a83a2f5220ba4ef323f741e11bfdfd +spi-nor 3c0e1dfa703cd2a16fbfb1290b0970b61add3cde +crypto 9a14b311f2f786a7ac68f445bc550459b36d3190 +drm f8e4806e0dfa8796b3d7076a7fe054455a59c38b +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-exynos f8e4806e0dfa8796b3d7076a7fe054455a59c38b +drm-misc 1f1626ac0428820f998245478610f452650bcab5 +amdgpu 9217b91c64587459362f211b0310e2bdaeb67719 +drm-intel 074146f4578388b1b7f7832368d1581fceb1441e +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm d4ca26ac4be0d9aea7005c40df75e6775749671b +drm-msm-lumag d4ca26ac4be0d9aea7005c40df75e6775749671b +etnaviv c9959996a8fc171bbb2c2d9c7478306f331a6cca +fbdev 72fee6b0a3a4ad6c5131d4c20e8ab7253b16e38b +regmap 371a2e3c97899587d8fd47813e588ca172dc493b +sound 498e963ec7f0e26d505a84e17723a458b03fca72 +ieee1394 8dff232f6b2ddeed638b57ea781fb574cdd7fef5 +sound-asoc 2d742f069c1c509b39a13777bd7e33e3a1d93a90 +modules 157285397f6a7b35d8f7f115e1be24f49e947ba3 +input d03f030115fe930de1222fef294730ba21b93045 +block 69c95a16fe484e6de5f3cc616953cc31d67e7000 +device-mapper 0a9bab391e336489169b95cb0d4553d921302189 +libata 7f7f2b7624d4770978c15c0ecd720dc703f7ace3 +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 40d83f40c44ba8aa79cba409ace619db3a7f86f2 +mfd 1e0ea9e75ff3f395ad6f85f0be2258ef114a53dc +backlight 3b75d271e161e22aff8171940a77510d2fb2ad6f +battery aa08a0d10f5e67ccf82229cfd3a3fd57f1dff3bd +regulator 8f2344ff71f6e01af9e1bd4eefd4c27fdd619bb1 +security 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +apparmor 8ead196be219adade3bd0d4115cc9b8506643121 +integrity 1ed4b563100230ea68821a2b25a3d9f25388a3e6 +selinux 7c655bee5cd8e060983bd89460fffc1f9f780cda +smack f0816d4332c3f764cd42cf8124a193e17eeccba9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd cebb9ce9b939a91affb1ebb4d24ae12bb3aa7922 +watchdog 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +iommu d2d00e15808c37ec476a5c040ee2cdd23854ef18 +audit aa13b709084a0287ef250a9fbde5993e4dfc3078 +devicetree 574849054d97cee5be78d6c149d84685647fe774 +dt-krzk 8c82b4eef2972200f6171aaa260d7bba2ad29889 +mailbox cd795fb0c352c1f70e5fa437b01572c8693e1b77 +spi 80fa6a033ac8c395a3de4840e204638e92b8b371 +tip 6d461dc4863ffe5f9c26456bbecbe33966df576c +clockevents 0076a37a426b6c850a0b41b814952760e4a70fcf +edac 2f412b51fb42c7e571adeb96364efa7e08982987 +ftrace 4af12c95cbe888b71e905058c48e8d1e779264b5 +rcu 3909f6fb51679ee6f34580958fbccf9dafaecc11 +kvm e459647710070684a48384d67742822379de8c1c +kvm-arm 93c28484d2a0cc532fa5239ca692ad1806d35a4d +kvms390 10f7b1dcdfe05efcd26e90e337daf1bfd8f4a6da +kvm-ppc 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +kvm-riscv 4d0e8f9a361b3a1f7b67418c536b258323de734f +kvm-x86 873eef46b33c86be414d60bd00390e64fc0f006f +xen-tip 2d2db7d40254d5fb53b11ebd703cd1ed0c5de7a1 +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues 40911d4457f288da21b45437a52e1b0cbe5b8508 +drivers-x86 682c259a849610c7864cc75d52415c782c78653a +chrome-platform 6613476e225e090cc9aad49be7fa504e290dd33d +chrome-platform-firmware e3c5df138169b5494a16b20e74db1ee14b1901ce +hsi a0e35a173a86d93040d0e08f9c38526b6cf6c1d1 +leds-lj 54602f38551e89b520611ffb9df05232d1bf73f8 +ipmi 296455ade1fdcf5f8f8c033201633b60946c589a +driver-core f297a3844aa059c53be3f69be85ebc071b8a6d16 +usb ed5551279c9100aff6adf337d809057a7532b6f7 +thunderbolt dec6a613574cd3dea799170b7aaa8fd76e22f176 +usb-serial 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +tty 52b56990d214c7403b20f691ac61861a37c0f0db +char-misc e21817acb23ece75d41a4fa7b40c85550f147389 +accel dddb2e526a3650f3aa19c9ed315ae0f49c768810 +coresight 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +fastrpc 6613476e225e090cc9aad49be7fa504e290dd33d +fpga ff49b00e9621402cf723c3cb11489dff2d09a738 +icc 8b6da6178c6a5bf7917cdd45ba2dde3107478f08 +iio a0295c1bd4a79461f291c9b0df0523cbbeb75560 +phy-next 25ee21fc97db6cb7f476464e4aa8616652b3be49 +soundwire 0707496ff4e416ea08c90053fd5fde5811b11b22 +extcon 7803680964c025f598f827b7ea7433467ef21a56 +gnss 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +vfio 78f70c02bdbccb5e9b0b0c728185d4aeb7044ace +w1 8650843ca42a7fd8255f4dcddbaa20393e01fe11 +spmi b85ea95d086471afb4ad062012a4d73cd328fa86 +staging ce54e9342124ededf0a00ed4e8a8aee535bfbf00 +counter-next 0b3bbd8f9baf245ec77d86f6f5bc902105b4bfa9 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 93bdff7bb83a9ea79f41d4e48e1711fd5f4ec4ed +cgroup 8d4c171f451d384f3a287eb14bd60825d0b2381b +scsi 59828c7b5975f442ad5bb74a031fe388341f323e +scsi-mkp 4ad9465365378d696545a337c4b1a28277de84d7 +vhost f16d65124380ac6de8055c4a8e5373a1043bb09b +rpmsg 929654e8f1add50b01d5a56171a31c311b0a739a +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl a875746f603b86134bd1924b7289fc3542fd45e7 +gpio-intel 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl 47eed1127d2af6fada49565efca4671a56e5839d +pinctrl-intel 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl-renesas fea58424e2523376ece6f734479e63061e17ad7f +pinctrl-samsung 6613476e225e090cc9aad49be7fa504e290dd33d +pwm 67781b5742b5a991def61abccfc60037607895e5 +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 6a71770442b5b7cf8f880ca1c0a72456c918c757 +kunit 6613476e225e090cc9aad49be7fa504e290dd33d +kunit-next 76021a887a50892fd969cd42a5f3467f5696e50e +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc 14688f1a91e1f37bc6bf50ff5241e857f24338e0 +nvdimm a085a5eb6594a3ebe5c275e9c2c2d341f686c23c +at24 6613476e225e090cc9aad49be7fa504e290dd33d +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp b068d070cb99973dfb1cf499da1723ba7676036d +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 04b945e4cf81a12365f8207a4d34dbc81ba17413 +nvmem a0cfd5e997824d0bd8c7620d40cdb324121a2fc7 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay c52391fafcefe4c562bdac62088a2735c185b942 +kgdb 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi ceeb64f41fe6a1eb9fc56d583983a81f8f3dd058 +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl 73bf93edeeea866b0b6efbc8d2595bdaaba7f1a5 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 4afa688d7141ae7a166d32224abbfd536acccfca +unicode 367122c529f35b4655acbe33c0cc4d6d3b32ba71 +slab 7d2ec24bd8a59853c7660d3eac50a3b7ffce8ae3 +random 615d300648869c774bd1fe54b4627bb0c20faed4 +landlock 305aea29fd67a4942038a761139a1676086cd782 +rust f090f0d0eea9666a96702b29bc9a64cbabee85c5 +sysctl 6613476e225e090cc9aad49be7fa504e290dd33d +execve 15fd1dc3dadb4268207fa6797e753541aca09a2a +bitmap 071ad962baf5e857fd965595421cf6fb588610ed +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp 94829c7196fb48fc5e4f2170b9808c156b074caf +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 6613476e225e090cc9aad49be7fa504e290dd33d +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 6613476e225e090cc9aad49be7fa504e290dd33d +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d712c75305b2 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,372 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes git https://github.com/sophgo/linux.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 +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 +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 +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 +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-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/mediatek/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 +sophgo git https://github.com/sophgo/linux.git#for-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 +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +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-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 +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/sysctl/sysctl.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 +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..e477997a2280 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7563 @@ +$ date -R +Wed, 07 Feb 2024 09:27:21 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 93% (4001/4270)
Updating files: 94% (4014/4270)
Updating files: 95% (4057/4270)
Updating files: 96% (4100/4270)
Updating files: 97% (4142/4270)
Updating files: 98% (4185/4270)
Updating files: 99% (4228/4270)
Updating files: 100% (4270/4270)
Updating files: 100% (4270/4270), done. +HEAD is now at 54be6c6c5ae8 Linux 6.8-rc3 +Merging origin/master (99bd3cb0d12e Merge tag 'bcachefs-2024-02-05' of https://evilpiepirate.org/git/bcachefs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 54be6c6c5ae8..99bd3cb0d12e +Fast-forward (no commit created; -m option ignored) + fs/bcachefs/fs-ioctl.c | 4 ++-- + fs/bcachefs/mean_and_variance.h | 2 +- + fs/bcachefs/thread_with_file.c | 2 +- + fs/bcachefs/util.c | 5 +++-- + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (2fc82eb0f980 mm/swap_state: update zswap LRU's protection range with the folio locked) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 2 + + MAINTAINERS | 2 +- + arch/arm/mm/fault.c | 2 + + fs/hugetlbfs/inode.c | 19 +++++-- + fs/nilfs2/file.c | 8 ++- + fs/nilfs2/recovery.c | 7 +-- + fs/nilfs2/segment.c | 8 +-- + fs/proc/array.c | 66 ++++++++++++++----------- + fs/xfs/scrub/xfile.c | 5 ++ + include/linux/pagemap.h | 14 ++++++ + kernel/exit.c | 10 ++-- + kernel/sys.c | 54 ++++++++++++-------- + mm/damon/core.c | 15 ++++-- + mm/damon/sysfs-schemes.c | 2 +- + mm/madvise.c | 1 + + mm/memcontrol.c | 56 +++++++++++++-------- + mm/memory-failure.c | 3 ++ + mm/swap_state.c | 10 ++-- + mm/userfaultfd.c | 14 +++--- + mm/zswap.c | 12 ++--- + tools/testing/selftests/core/close_range_test.c | 1 + + tools/testing/selftests/mm/uffd-unit-tests.c | 6 +++ + 22 files changed, 206 insertions(+), 111 deletions(-) +Merging kbuild-current/fixes (41b9fb381a48 Merge tag 'net-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (c7767f5c43df arm64: vdso32: Remove unused vdso32-offsets.h) +$ 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 (1b5af823d703 soc/tegra: fix build failure on Tegra241) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + drivers/soc/tegra/fuse/fuse-tegra30.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-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 sophgo-fixes/fixes (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-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 (1c57b9f63ab3 powerpc: 85xx: mark local functions static) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Auto-merging arch/powerpc/kernel/iommu.c +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/papr-sysparm.h | 2 +- + arch/powerpc/include/asm/ppc-pci.h | 3 +++ + arch/powerpc/include/asm/reg.h | 2 ++ + arch/powerpc/include/uapi/asm/papr-sysparm.h | 2 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 20 +++++++++++++++++++- + arch/powerpc/kernel/interrupt_64.S | 4 ++-- + arch/powerpc/kernel/iommu.c | 21 ++++++++++++++++----- + arch/powerpc/mm/kasan/init_32.c | 1 + + arch/powerpc/platforms/85xx/mpc8536_ds.c | 2 +- + arch/powerpc/platforms/85xx/mvme2500.c | 2 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 2 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 6 +++--- + arch/powerpc/platforms/85xx/p1022_rdk.c | 6 +++--- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 ++ + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 4 ++++ + arch/powerpc/sysdev/udbg_memcons.c | 6 +++--- + tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c | 4 ++-- + 18 files changed, 66 insertions(+), 25 deletions(-) +Merging s390-fixes/fixes (6613476e225e Linux 6.8-rc1) +$ 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 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 (1ce2654d87e2 net: stmmac: xgmac: fix a typo of register name in DPP safety handling) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/atm/idt77252.c | 2 + + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 +++ + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + + drivers/net/ethernet/engleder/tsnep_main.c | 16 ++- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 ++- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1 + + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 +++++++++- + drivers/net/hyperv/netvsc_drv.c | 82 +++++++++++---- + drivers/net/netdevsim/dev.c | 8 +- + include/trace/events/rxrpc.h | 8 +- + net/core/datagram.c | 2 +- + net/ipv4/af_inet.c | 6 +- + net/ipv4/ip_tunnel_core.c | 2 +- + net/rxrpc/ar-internal.h | 37 +++++-- + net/rxrpc/call_event.c | 12 +-- + net/rxrpc/call_object.c | 1 + + net/rxrpc/conn_event.c | 10 +- + net/rxrpc/input.c | 115 +++++++++++++++++---- + net/rxrpc/output.c | 8 +- + net/rxrpc/proc.c | 2 +- + net/rxrpc/rxkad.c | 4 +- + net/tipc/bearer.c | 6 ++ + tools/testing/selftests/net/big_tcp.sh | 4 +- + tools/testing/selftests/net/pmtu.sh | 23 +++-- + tools/testing/selftests/net/rtnetlink.sh | 6 +- + tools/testing/selftests/net/tcp_ao/unsigned-md5.c | 12 +-- + tools/testing/selftests/net/udpgro_fwd.sh | 14 ++- + tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- + 33 files changed, 381 insertions(+), 103 deletions(-) +Merging bpf/master (577e4432f3ac tcp: add sanity checks to rx zerocopy) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (983a73da1f99 xfrm: Pass UDP encapsulation in TX packet offload) +$ 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_device.c | 2 +- + net/xfrm/xfrm_policy.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging netfilter/main (8059918a1377 netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (8059918a1377 netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations) +$ 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 (0647903efbc8 wifi: mt76: mt7996: fix fortify warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 1 + + drivers/net/wireless/ath/wcn36xx/main.c | 1 + + .../broadcom/brcm80211/brcmfmac/bca/module.c | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- + .../broadcom/brcm80211/brcmfmac/cyw/module.c | 1 + + .../broadcom/brcm80211/brcmfmac/wcc/module.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 9 +- + drivers/net/wireless/intersil/p54/p54spi.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 1 + + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 1 + + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 1 + + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7925/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 1 + + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 1 + + drivers/net/wireless/mediatek/mt76/sdio.c | 1 + + drivers/net/wireless/mediatek/mt76/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/util.c | 1 + + drivers/net/wireless/microchip/wilc1000/netdev.c | 1 + + drivers/net/wireless/microchip/wilc1000/sdio.c | 1 + + drivers/net/wireless/microchip/wilc1000/spi.c | 1 + + drivers/net/wireless/ti/wl1251/sdio.c | 1 + + drivers/net/wireless/ti/wl1251/spi.c | 1 + + drivers/net/wireless/ti/wl12xx/main.c | 1 + + drivers/net/wireless/ti/wl18xx/main.c | 1 + + drivers/net/wireless/ti/wlcore/main.c | 1 + + drivers/net/wireless/ti/wlcore/sdio.c | 1 + + drivers/net/wireless/ti/wlcore/spi.c | 1 + + include/net/cfg80211.h | 4 + + net/mac80211/cfg.c | 16 +-- + net/mac80211/debugfs_netdev.c | 4 +- + net/mac80211/debugfs_netdev.h | 5 - + net/mac80211/iface.c | 2 +- + net/mac80211/mlme.c | 114 +++++++++++++++------ + net/mac80211/scan.c | 30 +++--- + net/mac80211/tx.c | 7 +- + net/mac80211/wbrf.c | 2 - + net/wireless/core.c | 3 +- + net/wireless/scan.c | 59 ++++++++++- + 65 files changed, 247 insertions(+), 88 deletions(-) +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 (fdfa083549de RDMA/srpt: Support specifying the srpt_service_guid parameter) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 43 +++++++++++++++++++++----------- + drivers/infiniband/hw/bnxt_re/main.c | 3 --- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 ++- + drivers/infiniband/hw/hfi1/pio.c | 6 ++++- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/irdma/defs.h | 1 + + drivers/infiniband/hw/irdma/hw.c | 8 ++++++ + drivers/infiniband/hw/irdma/verbs.c | 9 ++++--- + drivers/infiniband/hw/mlx5/cong.c | 6 +++++ + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 8 ++++-- + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/linux/mlx5/qp.h | 5 +++- + 14 files changed, 69 insertions(+), 31 deletions(-) +Merging sound-current/for-linus (fddab35fd064 ALSA: hda/realtek: add IDs for Dell dual spk platform) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_conexant.c | 18 ++++++++++++++++++ + sound/pci/hda/patch_realtek.c | 2 ++ + 2 files changed, 20 insertions(+) +Merging sound-asoc-fixes/for-linus (610010737f74 ASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/google,sc7280-herobrine.yaml | 1 - + include/sound/tas2781.h | 1 + + sound/pci/hda/tas2781_hda_i2c.c | 2 +- + sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ + sound/soc/codecs/cs35l56.c | 2 +- + sound/soc/codecs/tas2781-comlib.c | 3 ++- + sound/soc/codecs/tas2781-i2c.c | 2 +- + sound/soc/intel/avs/core.c | 3 +++ + 8 files changed, 16 insertions(+), 5 deletions(-) +Merging regmap-fixes/for-linus (1a1b27115ae1 Merge remote-tracking branch 'regmap/for-6.7' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (a3fa9838e814 regulator (max5970): Fix IRQ handler) +$ 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 (c712c05e46c8 spi: imx: fix the burst length at DMA mode and CPU mode) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-imx.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) +Merging pci-current/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (6e7ad1aebb4f driver core: fw_devlink: Improve logs for cycle detection) +$ 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 +Merge made by the 'ort' strategy. + drivers/base/arch_topology.c | 13 ++++++------- + drivers/base/core.c | 26 ++++++++++++++++++++------ + 2 files changed, 26 insertions(+), 13 deletions(-) +Merging tty.current/tty-linus (7be50f2e8f20 serial: mxs-auart: fix tx) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_pci1xxxx.c | 2 +- + drivers/tty/serial/mxs-auart.c | 5 ++++- + include/linux/serial_core.h | 32 +++++++++++++++++++++++++++----- + 3 files changed, 32 insertions(+), 7 deletions(-) +Merging usb.current/usb-linus (b55fe36efc22 Merge tag 'thunderbolt-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/tb_regs.h | 2 +- + drivers/thunderbolt/usb4.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging usb-serial-fixes/usb-linus (54be6c6c5ae8 Linux 6.8-rc3) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (4cb81840d8f2 iio: accel: bma400: Fix a compilation problem) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++++++ + drivers/iio/accel/Kconfig | 2 ++ + drivers/iio/adc/ad7091r8.c | 2 +- + drivers/iio/humidity/Kconfig | 12 ++++++++++++ + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/hdc3020.c | 2 +- + drivers/iio/imu/bno055/Kconfig | 1 + + drivers/iio/industrialio-core.c | 5 ++++- + drivers/iio/light/hid-sensor-als.c | 1 + + drivers/iio/magnetometer/rm3100-core.c | 10 ++++++++-- + drivers/iio/pressure/bmp280-spi.c | 1 + + drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- + include/linux/iio/adc/ad_sigma_delta.h | 4 +++- + include/linux/iio/common/st_sensors.h | 4 ++-- + include/linux/iio/imu/adis.h | 3 ++- + include/uapi/linux/iio/types.h | 4 ++-- + 16 files changed, 50 insertions(+), 12 deletions(-) +Merging counter-current/counter-current (6613476e225e Linux 6.8-rc1) +$ 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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (ec4d82f855ce thunderbolt: Fix setting the CNS bit in ROUTER_CS_5) +$ 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 (4255447ad34c Input: i8042 - add Fujitsu Lifebook U728 to i8042 quirk table) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (24c890dd712f crypto: algif_hash - Remove bogus SGL free on zero-length error path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + crypto/algif_hash.c | 5 +++-- + crypto/cbc.c | 3 +++ + drivers/crypto/ccp/sev-dev.c | 10 ++++++++-- + 3 files changed, 14 insertions(+), 4 deletions(-) +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 (b54761f6e977 kselftest/seccomp: Report each expectation we assert as a KTAP test) +$ 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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (e6a30d0c48a1 mtd: rawnand: marvell: fix layouts) +$ 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/mtdcore.c | 1 + + drivers/mtd/nand/raw/marvell_nand.c | 13 +++++-------- + drivers/mtd/nand/spi/gigadevice.c | 6 ++++-- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1) +$ 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 (346c84e281a9 media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + .../platform/rockchip/rkisp1/rkisp1-capture.c | 3 ++ + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 2 + + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 3 ++ + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 24 ++++++++- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 3 ++ + drivers/media/rc/Kconfig | 1 + + drivers/media/rc/bpf-lirc.c | 6 +-- + drivers/media/rc/ir_toy.c | 2 + + drivers/media/rc/lirc_dev.c | 5 +- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 58 ++++++++++++--------- + .../staging/media/atomisp/pci/atomisp_internal.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 52 +++++++++++-------- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 59 ++++++++++++++++------ + 14 files changed, 156 insertions(+), 68 deletions(-) +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 (59be5c358501 mips: Call lose_fpu(0) before initializing fcr31 in mips_set_personality_nan) +$ 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 (6613476e225e Linux 6.8-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 (e45964771007 x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLATFORM) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + arch/riscv/include/uapi/asm/kvm.h | 27 ++++++ + arch/riscv/kvm/vcpu_onereg.c | 54 ++++++++++++ + arch/s390/kvm/priv.c | 8 +- + arch/s390/kvm/vsie.c | 1 - + arch/s390/mm/gmap.c | 1 + + arch/x86/include/asm/coco.h | 5 +- + arch/x86/include/asm/kvm_host.h | 2 + + arch/x86/kernel/kvm.c | 3 +- + arch/x86/kvm/hyperv.c | 50 +++++++++++ + arch/x86/kvm/hyperv.h | 3 + + arch/x86/kvm/x86.c | 7 ++ + tools/testing/selftests/kvm/riscv/get-reg-list.c | 108 +++++++++++++++++++++++ + 12 files changed, 263 insertions(+), 6 deletions(-) +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 +Already up to date. +Merging hwmon-fixes/hwmon (34cf8c657cf0 hwmon: (coretemp) Enlarge per package core count limit) +$ 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/aspeed-pwm-tacho.c | 7 +++++++ + drivers/hwmon/coretemp.c | 42 +++++++++++++++++++++------------------- + 2 files changed, 29 insertions(+), 20 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 (6be99530c92c x86/numa: Fix the sort compare func used in numa_fill_memblks()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + arch/x86/mm/numa.c | 21 ++++++++------------- + drivers/cxl/core/pci.c | 43 +++++++++++++++++++++++++++++++------------ + include/linux/memblock.h | 2 ++ + mm/memblock.c | 5 +++-- + 4 files changed, 44 insertions(+), 27 deletions(-) +Merging btrfs-fixes/next-fixes (c94bd41cb0b6 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 +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (dac853a94365 Revert "get rid of DCACHE_GENOCIDE") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + fs/dcache.c | 5 ++++- + include/linux/dcache.h | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) +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 (1abdf288b0ef platform/x86: touchscreen_dmi: Add info for the TECLAST X16 Plus tablet) +$ 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 (eab4f56d3e75 ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd) +$ 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 (6613476e225e Linux 6.8-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 (17adc3f329e9 net: marvell,prestera: Fix example PCI bus addressing) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml +Auto-merging Documentation/devicetree/bindings/usb/microchip,usb5744.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 5 ++++- + Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml | 3 ++- + .../devicetree/bindings/display/bridge/nxp,tda998x.yaml | 7 +++++-- + .../devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 3 ++- + Documentation/devicetree/bindings/net/marvell,prestera.yaml | 4 ++-- + .../devicetree/bindings/reset/xlnx,zynqmp-reset.yaml | 3 ++- + Documentation/devicetree/bindings/tpm/tpm-common.yaml | 2 +- + Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml | 3 ++- + .../devicetree/bindings/usb/microchip,usb5744.yaml | 3 ++- + Documentation/devicetree/bindings/usb/xlnx,usb2.yaml | 3 ++- + drivers/of/property.c | 2 +- + drivers/of/unittest.c | 12 +++++++++--- + tools/testing/selftests/dt/test_unprobed_devices.sh | 13 +++++++------ + 13 files changed, 41 insertions(+), 22 deletions(-) +Merging dt-krzk-fixes/fixes (6613476e225e Linux 6.8-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 (17e94b258541 scsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_scsi.c | 12 ++++++------ + drivers/scsi/scsi_error.c | 3 ++- + drivers/scsi/scsi_lib.c | 4 +++- + drivers/ufs/core/ufshcd.c | 5 +++-- + 4 files changed, 14 insertions(+), 10 deletions(-) +Merging drm-fixes/drm-fixes (d0399da9fb5f drm/sched: Re-queue run job worker when drm_sched_entity_pop_job() returns NULL) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/scheduler/sched_main.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (a99682e839af Merge tag 'gvt-fixes-2024-02-05' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 3 +-- + drivers/gpu/drm/i915/intel_gvt.c | 2 +- + 4 files changed, 5 insertions(+), 6 deletions(-) +Merging mmc-fixes/fixes (cc9432c4fb15 mmc: slot-gpio: Allow non-sleeping GPIO ro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/slot-gpio.c | 6 +++++- + drivers/mmc/host/sdhci-pci-o2micro.c | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 1 deletion(-) +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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (a9d022ae8c4f Merge branch 'riscv-soc-drivers-fixes' into riscv-soc-fixes) +$ 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 +Merge made by the 'ort' strategy. + drivers/soc/microchip/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fpga-fixes/fixes (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-rc1) +$ 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 (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-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 (d9281660ff3f erofs: relaxed temporary buffers allocation on readahead) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (1a9f2c776d14 Documentation: KUnit: Update the instructions on how to test static functions) +$ 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 (6a9531c3a880 memblock: fix crash when reserved memory is not added to memory) +$ 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 (5ea9a7c5fe41 nfsd: don't take fi_lock in nfsd_break_deleg_cb()) +$ 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. + fs/nfsd/nfs4state.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 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 perf-current/perf-tools (fdd0ae72b34e perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (1ad55cecf22f x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section) +$ 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. + arch/x86/boot/header.S | 14 ++++++-------- + arch/x86/boot/setup.ld | 6 +++--- + drivers/acpi/apei/ghes.c | 26 -------------------------- + drivers/cxl/core/trace.h | 6 +++--- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/firmware/efi/cper.c | 19 +++++++++++++++++++ + drivers/firmware/efi/efi-init.c | 19 ++++++++++--------- + drivers/firmware/efi/libstub/Makefile | 4 ++-- + drivers/firmware/efi/libstub/alignedmem.c | 1 + + drivers/firmware/efi/libstub/efistub.h | 3 ++- + drivers/firmware/efi/libstub/kaslr.c | 2 +- + drivers/firmware/efi/libstub/randomalloc.c | 12 +++++++----- + drivers/firmware/efi/libstub/x86-stub.c | 25 +++++++++++++++---------- + drivers/firmware/efi/libstub/x86-stub.h | 4 ++-- + drivers/firmware/efi/libstub/zboot.c | 2 +- + drivers/firmware/efi/riscv-runtime.c | 2 +- + include/linux/cper.h | 23 +++++++++++++++++++++++ + 17 files changed, 97 insertions(+), 73 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 (d0266d7ab161 Revert "power: supply: qcom_battmgr: Register the power supplies after PDR is up") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (28b9f669e10f iommufd/iova_bitmap: Consider page offset for the pages to be pinned) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/iommufd_test.h | 1 + + drivers/iommu/iommufd/iova_bitmap.c | 68 +++++++++++++++++++---- + drivers/iommu/iommufd/selftest.c | 79 ++++++++++++++++++++------- + tools/testing/selftests/iommu/iommufd.c | 78 +++++++++++++++++++++----- + tools/testing/selftests/iommu/iommufd_utils.h | 39 ++++++++----- + 5 files changed, 205 insertions(+), 60 deletions(-) +Merging rust-fixes/rust-fixes (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-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 (c41336f4d690 pmdomain: mediatek: fix race conditions with genpd) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/core.c | 2 +- + drivers/pmdomain/mediatek/mtk-pm-domains.c | 15 +++++++-------- + drivers/pmdomain/renesas/r8a77980-sysc.c | 3 ++- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging overlayfs-fixes/ovl-fixes (420332b94119 ovl: mark xwhiteouts directory with overlay.opaque='x') +$ 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 i2c-host-fixes/i2c/i2c-host-fixes (9189526c46f2 MAINTAINERS: Update i2c host drivers repository) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (5f8408aca667 accel/ivpu: Add job status for jobs aborted by the driver) +$ 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/nouveau/nvkm/subdev/gsp/r535.c +Merge made by the 'ort' strategy. + drivers/accel/ivpu/ivpu_drv.c | 5 +- + drivers/accel/ivpu/ivpu_fw.c | 1 - + drivers/accel/ivpu/ivpu_hw_37xx.c | 2 +- + drivers/accel/ivpu/ivpu_hw_40xx.c | 7 +-- + drivers/accel/ivpu/ivpu_job.c | 4 +- + drivers/accel/ivpu/ivpu_mmu.c | 36 ++++++----- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 77 ++++++++++++++--------- + include/uapi/drm/ivpu_accel.h | 1 + + 9 files changed, 77 insertions(+), 58 deletions(-) +Merging mm-stable/mm-stable (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (fd01e57c7956 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/kvm.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-dax | 153 ++ + .../ABI/testing/sysfs-kernel-mm-mempolicy | 4 + + .../sysfs-kernel-mm-mempolicy-weighted-interleave | 25 + + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/admin-guide/mm/damon/usage.rst | 42 +- + .../admin-guide/mm/numa_memory_policy.rst | 9 + + Documentation/admin-guide/sysctl/kernel.rst | 15 +- + Documentation/dev-tools/kasan.rst | 20 +- + Documentation/process/changes.rst | 2 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 20 +- + .../translations/zh_CN/dev-tools/kasan.rst | 20 +- + .../zh_TW/admin-guide/mm/damon/usage.rst | 20 +- + .../translations/zh_TW/dev-tools/kasan.rst | 20 +- + MAINTAINERS | 1 + + Makefile | 8 - + arch/Kconfig | 2 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/configs/aspeed_g4_defconfig | 2 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/include/asm/current.h | 8 +- + arch/arm/include/asm/pgtable.h | 2 + + arch/arm/include/asm/ptdump.h | 6 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/machine_kexec.c | 7 - + arch/arm/kernel/setup.c | 4 +- + arch/arm/kernel/vmcore_info.c | 10 + + arch/arm/mm/init.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/Kconfig | 12 +- + .../include/asm/{crash_core.h => crash_reserve.h} | 4 +- + arch/arm64/include/asm/esr.h | 4 + + arch/arm64/include/asm/kexec.h | 2 +- + arch/arm64/include/asm/pgtable.h | 36 +- + arch/arm64/include/asm/ptdump.h | 7 - + arch/arm64/include/asm/tlbflush.h | 16 + + arch/arm64/kernel/Makefile | 2 +- + arch/arm64/kernel/machine_kexec.c | 2 +- + arch/arm64/kernel/machine_kexec_file.c | 10 +- + arch/arm64/kernel/{crash_core.c => vmcore_info.c} | 3 +- + arch/arm64/mm/fault.c | 78 +- + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 30 +- + arch/arm64/mm/ptdump.c | 11 +- + arch/loongarch/kernel/setup.c | 2 +- + arch/mips/kernel/setup.c | 17 +- + arch/nios2/include/asm/pgtable.h | 2 + + arch/powerpc/Kconfig | 8 +- + arch/powerpc/Makefile | 4 +- + arch/powerpc/include/asm/pgtable.h | 2 + + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kexec/Makefile | 1 + + arch/powerpc/kexec/core.c | 28 - + arch/powerpc/kexec/vmcore_info.c | 34 + + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/mmu_decl.h | 6 - + arch/powerpc/mm/nohash/kaslr_booke.c | 4 +- + arch/powerpc/mm/pgtable.c | 5 +- + arch/powerpc/mm/pgtable_32.c | 4 - + arch/powerpc/mm/pgtable_64.c | 3 - + arch/powerpc/mm/ptdump/ptdump.c | 21 +- + arch/powerpc/platforms/powernv/opal-core.c | 2 +- + arch/riscv/Kconfig | 6 +- + .../include/asm/{crash_core.h => crash_reserve.h} | 4 +- + arch/riscv/include/asm/ftrace.h | 14 +- + arch/riscv/include/asm/pgtable.h | 2 + + arch/riscv/include/asm/ptdump.h | 22 - + arch/riscv/kernel/Makefile | 2 +- + arch/riscv/kernel/elf_kexec.c | 9 +- + arch/riscv/kernel/mcount.S | 10 +- + arch/riscv/kernel/{crash_core.c => vmcore_info.c} | 3 +- + arch/riscv/mm/init.c | 5 +- + arch/riscv/mm/ptdump.c | 12 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/ftrace.h | 2 +- + arch/s390/include/asm/pgtable.h | 2 + + arch/s390/include/asm/ptdump.h | 14 - + arch/s390/kernel/Makefile | 1 + + arch/s390/kernel/kexec_elf.c | 2 + + arch/s390/kernel/kexec_image.c | 2 + + arch/s390/kernel/machine_kexec.c | 15 - + arch/s390/kernel/machine_kexec_file.c | 10 + + arch/s390/kernel/vmcore_info.c | 23 + + arch/s390/mm/dump_pagetables.c | 21 +- + arch/s390/mm/init.c | 5 - + arch/s390/mm/pgtable.c | 4 +- + arch/s390/mm/vmem.c | 62 +- + arch/sh/kernel/Makefile | 1 + + arch/sh/kernel/machine_kexec.c | 14 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/kernel/vmcore_info.c | 17 + + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/x86/Kconfig | 2 +- + arch/x86/Makefile | 6 - + .../include/asm/{crash_core.h => crash_reserve.h} | 6 +- + arch/x86/include/asm/mmu.h | 2 +- + arch/x86/include/asm/pgtable.h | 5 +- + arch/x86/kernel/Makefile | 6 +- + arch/x86/kernel/alternative.c | 2 +- + arch/x86/kernel/cpu/mshyperv.c | 10 +- + arch/x86/kernel/kexec-bzimage64.c | 4 + + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 3 + + arch/x86/kernel/reboot.c | 4 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/smp.c | 2 +- + .../kernel/{crash_core_32.c => vmcore_info_32.c} | 2 +- + .../kernel/{crash_core_64.c => vmcore_info_64.c} | 2 +- + arch/x86/mm/dump_pagetables.c | 24 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 2 - + arch/x86/mm/tlb.c | 37 +- + arch/x86/power/Makefile | 2 +- + arch/x86/xen/enlighten_hvm.c | 4 + + arch/x86/xen/mmu_pv.c | 4 +- + crypto/blake2b_generic.c | 2 +- + drivers/android/binder.c | 4 +- + drivers/base/cacheinfo.c | 50 +- + drivers/base/cpu.c | 6 +- + drivers/base/memory.c | 23 +- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/dax/bus.c | 295 +++- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/qemu_fw_cfg.c | 14 +- + 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/of/kexec.c | 2 + + drivers/regulator/Kconfig | 2 +- + drivers/s390/char/sclp_cmd.c | 44 +- + fs/Kconfig | 1 + + fs/fat/nfs.c | 6 + + fs/nilfs2/alloc.c | 89 +- + fs/nilfs2/bmap.c | 3 - + fs/nilfs2/cpfile.c | 323 ++-- + fs/nilfs2/cpfile.h | 10 +- + fs/nilfs2/dat.c | 38 +- + fs/nilfs2/ifile.c | 21 +- + fs/nilfs2/ifile.h | 10 +- + fs/nilfs2/inode.c | 44 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/nilfs.h | 3 +- + fs/nilfs2/page.c | 8 +- + fs/nilfs2/segbuf.c | 4 +- + fs/nilfs2/segment.c | 121 +- + fs/nilfs2/sufile.c | 86 +- + fs/nilfs2/super.c | 31 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/proc/Kconfig | 2 +- + fs/proc/kcore.c | 2 +- + fs/proc/task_mmu.c | 17 +- + fs/userfaultfd.c | 2 +- + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/buildid.h | 2 +- + include/linux/cma.h | 6 +- + include/linux/compiler-clang.h | 10 +- + include/linux/compiler_types.h | 9 +- + include/linux/crash_core.h | 158 +- + include/linux/crash_reserve.h | 48 + + include/linux/flex_proportions.h | 32 - + include/linux/gfp.h | 2 +- + include/linux/highmem.h | 14 + + include/linux/hugetlb.h | 2 +- + include/linux/kexec.h | 47 +- + include/linux/list.h | 15 + + include/linux/list_lru.h | 20 +- + include/linux/memcontrol.h | 1 + + include/linux/memory.h | 9 + + include/linux/memory_hotplug.h | 24 +- + include/linux/memremap.h | 1 + + include/linux/min_heap.h | 42 +- + include/linux/mm.h | 12 +- + include/linux/mmu_context.h | 2 +- + include/linux/moduleloader.h | 8 + + include/linux/padata.h | 2 + + include/linux/page_counter.h | 2 +- + include/linux/pgtable.h | 33 +- + include/linux/poison.h | 3 + + include/linux/ptdump.h | 10 + + include/linux/sched.h | 1 + + include/linux/smp.h | 2 +- + include/linux/start_kernel.h | 2 - + include/linux/swap.h | 5 +- + include/linux/swapops.h | 13 + + include/linux/vmalloc.h | 1 - + include/linux/vmcore_info.h | 81 + + include/linux/win_minmax.h | 4 +- + include/linux/zswap.h | 11 +- + include/trace/events/oom.h | 19 +- + include/uapi/linux/mempolicy.h | 1 + + init/initramfs.c | 2 +- + init/main.c | 16 +- + ipc/ipc_sysctl.c | 37 +- + ipc/mq_sysctl.c | 36 + + kernel/Kconfig.kexec | 12 +- + kernel/Makefile | 5 +- + kernel/bounds.c | 2 +- + kernel/crash_core.c | 816 +++------- + kernel/crash_reserve.c | 464 ++++++ + kernel/{crash_dump.c => elfcorehdr.c} | 0 + kernel/events/uprobes.c | 2 +- + kernel/kallsyms_selftest.c | 1 - + kernel/kexec.c | 11 +- + kernel/kexec_core.c | 250 +-- + kernel/kexec_file.c | 15 +- + kernel/kexec_internal.h | 2 + + kernel/kprobes.c | 4 +- + kernel/ksysfs.c | 10 +- + kernel/module/main.c | 5 + + kernel/padata.c | 14 +- + kernel/panic.c | 9 + + kernel/printk/printk.c | 4 +- + kernel/ptrace.c | 13 +- + kernel/user_namespace.c | 2 +- + kernel/vmcore_info.c | 230 +++ + lib/Kconfig.debug | 4 +- + lib/Kconfig.kasan | 2 +- + lib/Kconfig.ubsan | 14 + + lib/buildid.c | 2 +- + lib/dhry_1.c | 2 +- + lib/dhry_run.c | 1 - + lib/flex_proportions.c | 77 - + lib/maple_tree.c | 6 +- + lib/raid6/Makefile | 2 +- + lib/sort.c | 20 +- + lib/stackdepot.c | 254 +-- + lib/stackinit_kunit.c | 2 +- + lib/test_ubsan.c | 37 + + lib/test_xarray.c | 218 +++ + lib/ubsan.c | 68 + + lib/ubsan.h | 4 + + mm/Kconfig | 31 +- + mm/cma.c | 27 +- + mm/compaction.c | 225 ++- + mm/damon/Kconfig | 7 +- + mm/damon/dbgfs.c | 26 +- + mm/filemap.c | 4 +- + mm/huge_memory.c | 134 +- + mm/hugetlb.c | 259 ++- + mm/hugetlb_vmemmap.c | 55 +- + mm/internal.h | 18 +- + mm/kasan/common.c | 8 +- + mm/kasan/generic.c | 68 +- + mm/kasan/kasan.h | 10 - + mm/kasan/kasan_test.c | 79 + + mm/kasan/kasan_test_module.c | 4 +- + mm/kasan/quarantine.c | 5 +- + mm/khugepaged.c | 22 +- + mm/kmsan/hooks.c | 50 +- + mm/list_lru.c | 20 +- + mm/memcontrol.c | 155 +- + mm/memory-tiers.c | 2 +- + mm/memory.c | 327 ++-- + mm/memory_hotplug.c | 34 +- + mm/mempolicy.c | 492 +++++- + mm/mm_init.c | 1 + + mm/mmap.c | 110 +- + mm/mprotect.c | 4 +- + mm/nommu.c | 2 - + mm/oom_kill.c | 6 +- + mm/page_alloc.c | 89 +- + mm/ptdump.c | 22 + + mm/readahead.c | 6 +- + mm/rmap.c | 10 +- + mm/slab_common.c | 2 +- + mm/sparse.c | 3 +- + mm/swap.h | 5 + + mm/swap_slots.c | 3 + + mm/swapfile.c | 45 +- + mm/userfaultfd.c | 46 +- + mm/vmalloc.c | 1094 +++++++++---- + mm/vmscan.c | 61 +- + mm/z3fold.c | 2 - + mm/zswap.c | 1671 ++++++++++---------- + net/bridge/br_multicast.c | 2 +- + scripts/Makefile.lib | 3 + + scripts/Makefile.ubsan | 3 + + scripts/const_structs.checkpatch | 1 + + scripts/min-tool-version.sh | 2 +- + scripts/recordmcount.pl | 2 +- + security/Kconfig | 2 - + tools/mm/Makefile | 9 +- + tools/mm/thpmaps | 675 ++++++++ + tools/objtool/noreturns.h | 1 - + tools/testing/selftests/cgroup/test_zswap.c | 122 +- + tools/testing/selftests/damon/_chk_dependency.sh | 11 +- + tools/testing/selftests/damon/_debugfs_common.sh | 7 + + .../selftests/damon/debugfs_empty_targets.sh | 12 +- + .../selftests/filesystems/eventfd/.gitignore | 2 + + .../testing/selftests/filesystems/eventfd/Makefile | 7 + + .../selftests/filesystems/eventfd/eventfd_test.c | 186 +++ + tools/testing/selftests/memfd/memfd_test.c | 10 - + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 6 + + .../selftests/mm/charge_reserved_hugetlb.sh | 4 + + tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 124 ++ + .../selftests/mm/hugetlb_reparenting_test.sh | 9 +- + tools/testing/selftests/mm/khugepaged.c | 5 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 4 +- + tools/testing/selftests/mm/map_fixed_noreplace.c | 96 +- + tools/testing/selftests/mm/map_hugetlb.c | 42 +- + tools/testing/selftests/mm/map_populate.c | 37 +- + tools/testing/selftests/mm/mlock-random-test.c | 136 +- + tools/testing/selftests/mm/mlock2-tests.c | 282 ++-- + tools/testing/selftests/mm/mlock2.h | 11 +- + tools/testing/selftests/mm/mrelease_test.c | 80 +- + tools/testing/selftests/mm/mremap_dontunmap.c | 32 +- + tools/testing/selftests/mm/on-fault-limit.c | 38 +- + tools/testing/selftests/mm/protection_keys.c | 34 + + tools/testing/selftests/mm/run_vmtests.sh | 29 +- + tools/testing/selftests/mm/split_huge_page_test.c | 163 +- + tools/testing/selftests/mm/thp_settings.c | 123 +- + tools/testing/selftests/mm/thp_settings.h | 4 +- + tools/testing/selftests/mm/thuge-gen.c | 147 +- + tools/testing/selftests/mm/transhuge-stress.c | 36 +- + tools/testing/selftests/mm/virtual_address_range.c | 44 +- + tools/testing/selftests/mm/vm_util.c | 6 +- + 319 files changed, 8704 insertions(+), 4936 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-dax + 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 arch/arm/kernel/vmcore_info.c + rename arch/arm64/include/asm/{crash_core.h => crash_reserve.h} (81%) + rename arch/arm64/kernel/{crash_core.c => vmcore_info.c} (92%) + create mode 100644 arch/powerpc/kexec/vmcore_info.c + rename arch/riscv/include/asm/{crash_core.h => crash_reserve.h} (78%) + delete mode 100644 arch/riscv/include/asm/ptdump.h + rename arch/riscv/kernel/{crash_core.c => vmcore_info.c} (88%) + delete mode 100644 arch/s390/include/asm/ptdump.h + create mode 100644 arch/s390/kernel/vmcore_info.c + create mode 100644 arch/sh/kernel/vmcore_info.c + rename arch/x86/include/asm/{crash_core.h => crash_reserve.h} (92%) + rename arch/x86/kernel/{crash_core_32.c => vmcore_info_32.c} (90%) + rename arch/x86/kernel/{crash_core_64.c => vmcore_info_64.c} (94%) + create mode 100644 include/linux/crash_reserve.h + create mode 100644 include/linux/vmcore_info.h + create mode 100644 kernel/crash_reserve.c + rename kernel/{crash_dump.c => elfcorehdr.c} (100%) + create mode 100644 kernel/vmcore_info.c + 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 (a8fdabe1e15d kbuild: deb-pkg: call more misc debhelper commands) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + .gitignore | 1 + + Documentation/kbuild/kconfig.rst | 363 ++++++++++++++++++--------------------- + Makefile | 6 +- + scripts/Kbuild.include | 6 - + scripts/Makefile.build | 20 ++- + scripts/Makefile.dtbinst | 32 ++-- + scripts/Makefile.lib | 6 + + scripts/kconfig/lexer.l | 38 ++-- + scripts/package/builddeb | 48 ++---- + scripts/package/debian/rules | 63 ++++++- + 10 files changed, 289 insertions(+), 294 deletions(-) +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 (e024fa6a5566 perf/pmu-events/powerpc: Update json mapfile with Power11 PVR) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/perf/builtin-record.c +Auto-merging tools/perf/builtin-top.c +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-report.txt | 29 ++- + tools/perf/Documentation/perf-script-python.txt | 4 +- + tools/perf/Documentation/perf-top.txt | 32 ++- + tools/perf/Documentation/tips.txt | 31 ++- + tools/perf/Makefile.config | 6 + + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/util/pmu.c | 3 + + tools/perf/arch/arm64/util/mem-events.c | 39 +--- + tools/perf/arch/arm64/util/mem-events.h | 7 + + tools/perf/arch/powerpc/util/Build | 1 + + tools/perf/arch/powerpc/util/mem-events.c | 16 +- + tools/perf/arch/powerpc/util/mem-events.h | 7 + + tools/perf/arch/powerpc/util/pmu.c | 12 ++ + tools/perf/arch/x86/tests/hybrid.c | 5 +- + tools/perf/arch/x86/util/mem-events.c | 99 ++------- + tools/perf/arch/x86/util/mem-events.h | 10 + + tools/perf/arch/x86/util/pmu.c | 19 +- + tools/perf/arch/x86/util/tsc.c | 4 +- + tools/perf/builtin-c2c.c | 45 ++-- + tools/perf/builtin-mem.c | 48 ++--- + tools/perf/builtin-record.c | 14 +- + tools/perf/builtin-report.c | 2 +- + tools/perf/builtin-sched.c | 57 +---- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-version.c | 1 + + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 1 + + tools/perf/pmu-events/jevents.py | 23 ++- + tools/perf/tests/expand-cgroup.c | 3 +- + tools/perf/tests/parse-events.c | 9 +- + tools/perf/tests/pmu-events.c | 22 +- + .../perf/tests/shell/lib/perf_metric_validation.py | 229 +++++++++++---------- + tools/perf/tests/shell/stat_bpf_counters.sh | 12 +- + tools/perf/tests/shell/stat_metrics_values.sh | 4 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 6 + + tools/perf/util/annotate-data.c | 119 +++++++++-- + tools/perf/util/annotate-data.h | 8 +- + tools/perf/util/annotate.c | 153 +++++++++++++- + tools/perf/util/annotate.h | 12 +- + tools/perf/util/data.c | 10 +- + tools/perf/util/data.h | 6 +- + tools/perf/util/dwarf-aux.c | 187 ++++++++++++++--- + tools/perf/util/dwarf-aux.h | 18 ++ + tools/perf/util/evsel.c | 34 ++- + tools/perf/util/evsel.h | 1 + + tools/perf/util/mem-events.c | 221 ++++++++++++-------- + tools/perf/util/mem-events.h | 19 +- + tools/perf/util/parse-events.c | 96 +++++---- + tools/perf/util/parse-events.h | 14 +- + tools/perf/util/parse-events.y | 2 - + tools/perf/util/pmu.c | 25 ++- + tools/perf/util/pmu.h | 7 + + tools/perf/util/pmus.c | 6 - + tools/perf/util/pmus.h | 1 - + tools/perf/util/python-ext-sources | 1 + + .../util/scripting-engines/trace-event-python.c | 8 +- + tools/perf/util/setup.py | 1 + + tools/perf/util/sort.c | 2 +- + tools/perf/util/trace-event-parse.c | 113 ++++++++++ + tools/perf/util/trace-event.h | 3 + + 59 files changed, 1262 insertions(+), 611 deletions(-) + create mode 100644 tools/perf/arch/arm64/util/mem-events.h + create mode 100644 tools/perf/arch/powerpc/util/mem-events.h + create mode 100644 tools/perf/arch/powerpc/util/pmu.c + create mode 100644 tools/perf/arch/x86/util/mem-events.h +$ git reset --hard HEAD^ +HEAD is now at 8eab365761e7 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +Merging next-20240206 version of perf +$ git merge -m next-20240206/perf 366fb5f59d470ad1271cd4bbc3c580ad6118943d +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/perf/builtin-record.c +Auto-merging tools/perf/builtin-top.c +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-report.txt | 29 ++- + tools/perf/Documentation/perf-top.txt | 32 ++- + tools/perf/Documentation/tips.txt | 31 ++- + tools/perf/Makefile.config | 6 + + tools/perf/Makefile.perf | 2 +- + tools/perf/arch/arm/util/pmu.c | 3 + + tools/perf/arch/arm64/util/mem-events.c | 39 +--- + tools/perf/arch/arm64/util/mem-events.h | 7 + + tools/perf/arch/powerpc/util/Build | 1 + + tools/perf/arch/powerpc/util/mem-events.c | 16 +- + tools/perf/arch/powerpc/util/mem-events.h | 7 + + tools/perf/arch/powerpc/util/pmu.c | 12 ++ + tools/perf/arch/x86/util/mem-events.c | 99 ++------- + tools/perf/arch/x86/util/mem-events.h | 10 + + tools/perf/arch/x86/util/pmu.c | 19 +- + tools/perf/builtin-c2c.c | 45 ++-- + tools/perf/builtin-mem.c | 48 ++--- + tools/perf/builtin-record.c | 14 +- + tools/perf/builtin-report.c | 2 +- + tools/perf/builtin-sched.c | 57 +---- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-version.c | 1 + + .../perf/tests/shell/lib/perf_metric_validation.py | 229 +++++++++++---------- + tools/perf/tests/shell/stat_bpf_counters.sh | 12 +- + tools/perf/tests/shell/stat_metrics_values.sh | 4 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 6 + + tools/perf/util/annotate-data.c | 119 +++++++++-- + tools/perf/util/annotate-data.h | 8 +- + tools/perf/util/annotate.c | 153 +++++++++++++- + tools/perf/util/annotate.h | 12 +- + tools/perf/util/data.c | 10 +- + tools/perf/util/data.h | 6 +- + tools/perf/util/dwarf-aux.c | 187 ++++++++++++++--- + tools/perf/util/dwarf-aux.h | 18 ++ + tools/perf/util/evsel.c | 34 ++- + tools/perf/util/evsel.h | 1 + + tools/perf/util/mem-events.c | 221 ++++++++++++-------- + tools/perf/util/mem-events.h | 19 +- + tools/perf/util/pmu.c | 16 +- + tools/perf/util/pmu.h | 7 + + tools/perf/util/pmus.c | 6 - + tools/perf/util/pmus.h | 1 - + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/setup.py | 1 + + tools/perf/util/sort.c | 2 +- + tools/perf/util/trace-event-parse.c | 113 ++++++++++ + tools/perf/util/trace-event.h | 3 + + 47 files changed, 1144 insertions(+), 527 deletions(-) + create mode 100644 tools/perf/arch/arm64/util/mem-events.h + create mode 100644 tools/perf/arch/powerpc/util/mem-events.h + create mode 100644 tools/perf/arch/powerpc/util/pmu.c + create mode 100644 tools/perf/arch/x86/util/mem-events.h +Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 +Already up to date. +Merging asm-generic/master (34b2321cc648 MAINTAINERS: Add Andreas Larsson as co-maintainer for arch/sparc) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +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 (1b20d0486a60 arm64: Fix silcon-errata.rst formatting) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (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 (de4b6d6705a7 Merge branch 'soc/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/configs/multi_v7_defconfig | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +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 (859f600457cc Merge branch 'clk-microchip' 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. + .../bindings/net/can/microchip,mpfs-can.yaml | 6 +- + .../at91sam9g25-gardena-smart-gateway.dts | 2 + + arch/arm/boot/dts/microchip/at91sam9x5ek.dtsi | 2 + + drivers/clk/microchip/clk-mpfs.c | 154 ++++++++++++--------- + include/dt-bindings/clock/microchip,mpfs-clock.h | 5 + + 5 files changed, 100 insertions(+), 69 deletions(-) +Merging broadcom/next (412c6bd2c649 Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml | 1 + + arch/arm/include/debug/brcmstb.S | 8 +++++--- + .../boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 13 +++++++------ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 3 --- + drivers/bus/brcmstb_gisb.c | 15 +++++++++++++++ + 5 files changed, 28 insertions(+), 12 deletions(-) +Merging davinci/davinci/for-next (6613476e225e Linux 6.8-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 (2f542c937c48 dt-bindings: memory-controllers: narrow regex for unit address to hex numbers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../memory-controllers/nvidia,tegra20-emc.yaml | 2 +- + drivers/memory/emif.c | 65 ++++++++-------------- + 2 files changed, 25 insertions(+), 42 deletions(-) +Merging imx-mxs/for-next (d93b6c641bc9 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 40 +- + arch/arm/boot/dts/nxp/imx/Makefile | 2 + + arch/arm/boot/dts/nxp/imx/imx6dl-sielaff.dts | 533 +++++++++++++++++++ + .../boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts | 200 ++++++++ + arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts | 108 +--- + arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi | 120 +++++ + .../arm/boot/dts/nxp/imx/imx6qdl-hummingboard.dtsi | 7 +- + .../boot/dts/nxp/imx/imx6qdl-hummingboard2.dtsi | 5 + + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 10 +- + .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 1 + + .../dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ull-dhcor-som.dtsi | 7 +- + arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 315 +++++++----- + arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 144 +++--- + arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 94 ++-- + arch/arm/boot/dts/nxp/ls/ls1021a.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/mmdc.c | 6 +- + arch/arm64/boot/dts/freescale/Makefile | 6 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 - + .../boot/dts/freescale/imx8-apalis-eval-v1.1.dtsi | 26 + + .../boot/dts/freescale/imx8-apalis-eval-v1.2.dtsi | 124 +++++ + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 22 - + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 330 ++++++++++++ + arch/arm64/boot/dts/freescale/imx8-ss-gpu0.dtsi | 27 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 101 ++++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 12 + + .../boot/dts/freescale/imx8dxp-tqma8xdp-mba8xx.dts | 16 + + .../arm64/boot/dts/freescale/imx8dxp-tqma8xdp.dtsi | 24 + + arch/arm64/boot/dts/freescale/imx8dxp.dtsi | 24 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 36 ++ + .../boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts | 295 ++++------- + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 38 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 567 ++++++++++++++++++++- + .../boot/dts/freescale/imx8mm-kontron-sl.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 40 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 36 ++ + .../boot/dts/freescale/imx8mn-rve-gateway.dts | 2 +- + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 11 +- + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 18 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 10 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 74 +++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 9 +- + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 +- + .../boot/dts/freescale/imx8qm-apalis-eval-v1.2.dts | 16 + + .../boot/dts/freescale/imx8qm-apalis-eval.dts | 2 +- + .../dts/freescale/imx8qm-apalis-v1.1-eval-v1.2.dts | 26 + + .../boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 29 +- + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 41 ++ + .../boot/dts/freescale/imx8qxp-tqma8xqp-mba8xx.dts | 16 + + .../arm64/boot/dts/freescale/imx8qxp-tqma8xqp.dtsi | 14 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 8 + + .../boot/dts/freescale/imx93-phyboard-segin.dts | 117 +++++ + .../boot/dts/freescale/imx93-phycore-som.dtsi | 126 +++++ + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 4 +- + .../boot/dts/freescale/imx93-var-som-symphony.dts | 351 +++++++++++++ + arch/arm64/boot/dts/freescale/imx93-var-som.dtsi | 111 ++++ + arch/arm64/boot/dts/freescale/imx93.dtsi | 4 +- + arch/arm64/boot/dts/freescale/mba8xx.dtsi | 553 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/tqma8xx.dtsi | 265 ++++++++++ + arch/arm64/configs/defconfig | 8 + + drivers/bus/imx-weim.c | 2 +- + 70 files changed, 4516 insertions(+), 692 deletions(-) + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-sielaff.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-gpu0.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp-mba8xx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-eval-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp-mba8xx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/mba8xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/tqma8xx.dtsi +Merging mediatek/for-next (8645a7bbcb27 Merge branch 'v6.8-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 196 ++- + .../bindings/media/mediatek,vcodec-encoder.yaml | 31 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 3 +- + arch/arm64/boot/dts/mediatek/Makefile | 12 + + .../boot/dts/mediatek/mt7981b-xiaomi-ax3000t.dts | 15 + + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 105 ++ + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 7 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 7 +- + .../boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts | 11 + + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 136 ++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 9 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 4 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 4 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 4 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 + + .../boot/dts/mediatek/mt8186-corsola-krabby.dtsi | 129 ++ + .../mediatek/mt8186-corsola-magneton-sku393216.dts | 39 + + .../mediatek/mt8186-corsola-magneton-sku393217.dts | 39 + + .../mediatek/mt8186-corsola-magneton-sku393218.dts | 26 + + .../mediatek/mt8186-corsola-rusty-sku196608.dts | 26 + + .../mediatek/mt8186-corsola-steelix-sku131072.dts | 18 + + .../mediatek/mt8186-corsola-steelix-sku131073.dts | 18 + + .../boot/dts/mediatek/mt8186-corsola-steelix.dtsi | 199 +++ + .../mt8186-corsola-tentacool-sku327681.dts | 57 + + .../mt8186-corsola-tentacool-sku327683.dts | 24 + + .../mt8186-corsola-tentacruel-sku262144.dts | 44 + + .../mt8186-corsola-tentacruel-sku262148.dts | 26 + + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 1681 ++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 40 +- + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 27 +- + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 18 +- + arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 12 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 128 +- + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 17 +- + drivers/soc/mediatek/Kconfig | 9 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mtk-socinfo.c | 191 +++ + 43 files changed, 3190 insertions(+), 154 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-xiaomi-ax3000t.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-krabby.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393216.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393217.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393218.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327681.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262144.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi + create mode 100644 drivers/soc/mediatek/mtk-socinfo.c +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 (0012c1958460 Merge branches 'sgx-for-v6.9' and 'omap-for-v6.9/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../{img,powervr.yaml => img,powervr-rogue.yaml} | 4 +- + .../devicetree/bindings/gpu/img,powervr-sgx.yaml | 138 +++++++++++++++++++++ + MAINTAINERS | 3 +- + arch/arm/boot/dts/ti/omap/am33xx.dtsi | 9 +- + arch/arm/boot/dts/ti/omap/am3517.dtsi | 11 +- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 6 + + arch/arm/boot/dts/ti/omap/dra7.dtsi | 9 +- + arch/arm/boot/dts/ti/omap/omap34xx.dtsi | 11 +- + arch/arm/boot/dts/ti/omap/omap36xx.dtsi | 9 +- + arch/arm/boot/dts/ti/omap/omap4.dtsi | 9 +- + arch/arm/boot/dts/ti/omap/omap5.dtsi | 9 +- + arch/arm/mach-omap2/am33xx-restart.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 2 +- + arch/arm/mach-omap2/clockdomain.c | 4 +- + arch/arm/mach-omap2/cm33xx.c | 2 +- + arch/arm/mach-omap2/cminst44xx.c | 2 +- + arch/arm/mach-omap2/omap-secure.c | 4 +- + arch/arm/mach-omap2/omap_hwmod.c | 9 +- + arch/arm/mach-omap2/omap_hwmod_common_data.c | 6 +- + arch/arm/mach-omap2/pmic-cpcap.c | 24 ++-- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 2 +- + arch/arm/mach-omap2/prm_common.c | 4 +- + arch/arm/mach-omap2/wd_timer.c | 4 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 7 ++ + 25 files changed, 231 insertions(+), 61 deletions(-) + rename Documentation/devicetree/bindings/gpu/{img,powervr.yaml => img,powervr-rogue.yaml} (91%) + create mode 100644 Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml +Merging qcom/for-next (cff747252a48 Merge branches 'arm32-for-6.9', 'arm64-defconfig-for-6.9', 'arm64-fixes-for-6.8', 'arm64-for-6.9', 'clk-for-6.9' and 'drivers-for-6.9' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../bindings/clock/qcom,gcc-sc8180x.yaml | 7 + + .../devicetree/bindings/clock/qcom,gpucc.yaml | 9 + + .../devicetree/bindings/clock/qcom,q6sstopcc.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,pbs.yaml | 46 + + .../bindings/soc/qcom/qcom,rpm-master-stats.yaml | 2 + + arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 38 + + .../dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 7 + + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 38 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 146 ++- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 10 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 2 - + arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 17 +- + arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 15 +- + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 40 + + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 18 +- + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 32 +- + arch/arm/boot/dts/qcom/qcom-sdx65.dtsi | 48 +- + arch/arm64/boot/dts/qcom/Makefile | 2 + + .../dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts | 8 +- + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 8 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 13 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 14 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 9 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +- + .../boot/dts/qcom/{pm2250.dtsi => pm4125.dtsi} | 8 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 56 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 33 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 16 + + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 78 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 68 + + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 3 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 84 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 54 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 63 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 542 ++++++++ + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 5 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 6 + + arch/arm64/boot/dts/qcom/sdm630.dtsi | 62 +- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 6 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 14 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 47 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 25 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 13 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi | 28 + + arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts | 16 + + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 8 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 95 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 93 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 75 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 79 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 1293 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 42 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 107 +- + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 106 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 44 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 10 +- + arch/arm64/configs/defconfig | 9 +- + drivers/clk/qcom/gcc-ipq6018.c | 17 + + drivers/clk/qcom/gcc-sdm845.c | 1 + + drivers/clk/qcom/gcc-sm8150.c | 352 +++--- + drivers/clk/qcom/gdsc.c | 12 +- + drivers/clk/qcom/gpucc-sc8280xp.c | 1 + + drivers/pmdomain/qcom/rpmhpd.c | 1 - + drivers/soc/qcom/Kconfig | 9 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/qcom-pbs.c | 236 ++++ + drivers/soc/qcom/qcom_aoss.c | 103 +- + drivers/soc/qcom/smem.c | 11 - + drivers/soc/qcom/smp2p.c | 6 +- + drivers/soc/qcom/socinfo.c | 4 +- + drivers/soc/qcom/trace-aoss.h | 48 + + include/dt-bindings/arm/qcom,ids.h | 2 + + include/dt-bindings/clock/qcom,gcc-sm8150.h | 3 + + include/linux/soc/qcom/qcom-pbs.h | 30 + + include/soc/qcom/qcom-spmi-pmic.h | 2 +- + 86 files changed, 4104 insertions(+), 554 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,pbs.yaml + rename arch/arm64/boot/dts/qcom/{pm2250.dtsi => pm4125.dtsi} (91%) + create mode 100644 arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-hdk.dts + create mode 100644 drivers/soc/qcom/qcom-pbs.c + create mode 100644 drivers/soc/qcom/trace-aoss.h + create mode 100644 include/linux/soc/qcom/qcom-pbs.h +Merging renesas/next (91487349a9c3 Merge branch 'renesas-dts-for-v6.9' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 13 + + arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 12 + + arch/arm/boot/dts/renesas/r8a73a4.dtsi | 23 +- + arch/arm/boot/dts/renesas/r8a7740.dtsi | 2 + + arch/arm/boot/dts/renesas/r8a7778.dtsi | 9 +- + arch/arm/boot/dts/renesas/r8a7779.dtsi | 9 +- + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 2 - + arch/arm64/boot/dts/renesas/Makefile | 5 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 17 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 17 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +- + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dts | 13 + + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 368 +------------------- + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 58 +--- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 101 +++--- + .../dts/renesas/r8a779g2-white-hawk-single.dts | 26 ++ + arch/arm64/boot/dts/renesas/r8a779g2.dtsi | 12 + + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 57 ++++ + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 132 ++++++++ + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 69 ++++ + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 14 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 53 +++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 42 +-- + arch/arm64/boot/dts/renesas/white-hawk-common.dtsi | 65 ++++ + .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 375 +++++++++++++++++++++ + ...e-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} | 2 +- + ...hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 17 +- + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + .../dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h | 96 ++++++ + include/dt-bindings/power/renesas,r8a779h0-sysc.h | 49 +++ + 49 files changed, 1271 insertions(+), 546 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779h0.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi + rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} (97%) + rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} (76%) + create mode 100644 include/dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h + create mode 100644 include/dt-bindings/power/renesas,r8a779h0-sysc.h +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 (13c241737fc0 Merge branch 'v6.9-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 46 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 29 + + arch/arm/boot/dts/rockchip/rk3128.dtsi | 60 ++ + arch/arm/boot/dts/rockchip/rv1108.dtsi | 8 - + arch/arm64/boot/dts/rockchip/Makefile | 7 + + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 6 + + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 70 +- + .../boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 60 ++ + .../boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 19 + + .../boot/dts/rockchip/rk3566-anbernic-rg-arc.dtsi | 237 ++++++ + .../boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi | 74 ++ + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 74 ++ + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 74 -- + .../boot/dts/rockchip/rk3566-pinetab2-v0.1.dts | 28 + + .../boot/dts/rockchip/rk3566-pinetab2-v2.0.dts | 48 ++ + arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi | 943 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 8 +- + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 +- + .../dts/rockchip/rk3588-edgeble-neu6a-common.dtsi | 466 ++++++++++ + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 10 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 232 +++++ + .../dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso | 56 ++ + .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 25 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 76 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi | 383 +-------- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 31 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 7 + + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 4 +- + .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 14 + + .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 764 +++++++++++++++++ + drivers/clk/rockchip/clk-rk3568.c | 1 + + 38 files changed, 3267 insertions(+), 609 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts +Merging samsung-krzk/for-next (b57058d218cc Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. + .../bindings/clock/google,gs101-clock.yaml | 29 +- + .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 1 + + .../soc/samsung/samsung,exynos-sysreg.yaml | 1 + + MAINTAINERS | 2 - + arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi | 51 ++ + .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 2 +- + arch/arm/boot/dts/samsung/exynos5420-peach-pit.dts | 1 + + .../dts/samsung/exynos5422-odroidxu3-common.dtsi | 16 +- + arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts | 1 + + arch/arm/configs/exynos_defconfig | 3 + + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/mach-s3c/s3c64xx.c | 2 +- + arch/arm/mach-s5pv210/pm.c | 2 +- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 64 +++ + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 14 + + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 75 ++- + drivers/clk/samsung/clk-exynos850.c | 43 +- + drivers/clk/samsung/clk-gs101.c | 595 ++++++++++++++++++++- + include/dt-bindings/clock/exynos850.h | 2 + + include/dt-bindings/clock/google,gs101.h | 81 +++ + 21 files changed, 938 insertions(+), 52 deletions(-) +Merging scmi/for-linux-next (99f798bdfb75 Merge tags 'scmi-fixes-6.8' and 'ffa-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging sophgo/for-next (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +Merging stm32/stm32-next (bda732fda193 ARM: dts: stm32: fix DSI peripheral clock on stm32mp15 boards) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32mp157.dtsi | 2 +- + arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 2 +- + arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 2 +- + arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 2 +- + arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 2 +- + arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 2 +- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) +Merging sunxi/sunxi/for-next (38ed19495066 Merge branch 'sunxi/dt-for-6.9' 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. + .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 + + arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 2 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 7 ++- + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 61 ++++++++++++++++++++++ + drivers/clk/sunxi/clk-a20-gmac.c | 21 ++++---- + drivers/clk/sunxi/clk-sun9i-cpus.c | 7 +-- + drivers/clk/sunxi/clk-usb.c | 9 ++-- + 8 files changed, 90 insertions(+), 21 deletions(-) +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 (b762ac6498e6 Merge branch for-6.9/soc into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging drivers/soc/tegra/fuse/fuse-tegra30.c +Merge made by the 'ort' strategy. + drivers/soc/tegra/Kconfig | 5 ++ + drivers/soc/tegra/fuse/fuse-tegra.c | 118 +++++++++++++++++++++++++-------- + 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 +++++ + 10 files changed, 234 insertions(+), 88 deletions(-) +Merging ti/ti-next (bc805e337f69 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/ti/k3-am65-main.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/keystone/keystone-clocks.dtsi | 2 +- + .../boot/dts/ti/keystone/keystone-k2e-clocks.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2e-evm.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2e-netcp.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2e.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g-evm.dts | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g-ice.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2g-netcp.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 2 +- + .../boot/dts/ti/keystone/keystone-k2hk-clocks.dtsi | 2 +- + .../arm/boot/dts/ti/keystone/keystone-k2hk-evm.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2hk-netcp.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2hk.dtsi | 2 +- + .../boot/dts/ti/keystone/keystone-k2l-clocks.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2l-evm.dts | 2 +- + .../boot/dts/ti/keystone/keystone-k2l-netcp.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone.dtsi | 2 +- + arch/arm64/boot/dts/ti/Makefile | 4 +- + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi | 10 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62.dtsi | 4 +- + .../dts/ti/k3-am625-beagleplay-csi2-ov5640.dtso | 4 +- + .../ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 50 ++-- + .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 5 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am625.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 96 ++++++- + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am62p-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am62p.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 8 +- + arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 6 +- + .../arm64/boot/dts/ti/k3-am62x-sk-csi2-imx219.dtso | 4 +- + .../arm64/boot/dts/ti/k3-am62x-sk-csi2-ov5640.dtso | 4 +- + .../boot/dts/ti/k3-am62x-sk-csi2-tevi-ov5640.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-hdmi-audio.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 23 +- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am64.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 18 +- + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 29 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 12 +- + arch/arm64/boot/dts/ti/k3-am642.dtsi | 4 +- + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 2 +- + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 32 +-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am652.dtsi | 4 +- + .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 2 +- + .../boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 2 +- + .../k3-am654-base-board-rocktech-rk101-panel.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +- + arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-am654-idk.dtso | 4 +- + .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 +- + .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 2 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 2 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 2 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 20 +- + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 37 ++- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 91 ++++++- + .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 303 +++++++++++++++++++-- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 46 +++- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 47 +++- + arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 26 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 4 +- + .../boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-evm-pcie0-ep.dtso | 4 +- + .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 22 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 22 +- + arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 4 +- + .../boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2-evm-pcie1-ep.dtso | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 20 +- + arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 5 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 4 +- + arch/arm64/boot/dts/ti/k3-serdes.h | 4 +- + 118 files changed, 920 insertions(+), 394 deletions(-) +Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 96 +++++++++++++++++++--- + .../devicetree/bindings/fpga/xlnx,versal-fpga.yaml | 2 +- + .../devicetree/bindings/soc/xilinx/xilinx.yaml | 70 +++++++++++++--- + MAINTAINERS | 2 +- + arch/arm/mach-zynq/slcr.c | 5 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 16 +++- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 36 +++++++- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 37 ++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 6 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 6 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 85 +++++++++++-------- + 19 files changed, 298 insertions(+), 83 deletions(-) +Merging clk/clk-next (efe5a1b888ab Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. +Merging clk-imx/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (5aaa139b9a03 clk: renesas: r8a779h0: Add I2C clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/Kconfig | 5 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/clk-mstp.c | 16 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 249 ++++++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a07g043-cpg.c | 31 ++++ + drivers/clk/renesas/r9a08g045-cpg.c | 3 + + drivers/clk/renesas/rcar-gen4-cpg.c | 10 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 117 ++++++++++++++- + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/of/base.c | 123 +++++++++++----- + include/linux/of.h | 11 ++ + 12 files changed, 510 insertions(+), 59 deletions(-) + create mode 100644 drivers/clk/renesas/r8a779h0-cpg-mssr.c +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 (cca5efe77a6a LoongArch: vDSO: Disable UBSAN instrumentation) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 23 ++--------------------- + arch/loongarch/include/asm/acpi.h | 4 +++- + arch/loongarch/kernel/acpi.c | 4 +--- + arch/loongarch/mm/kasan_init.c | 3 +++ + arch/loongarch/vdso/Makefile | 1 + + 5 files changed, 10 insertions(+), 25 deletions(-) +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 (54be6c6c5ae8 Linux 6.8-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (82b143aeb169 Revert "parisc: Only list existing CPUs in cpu_possible_mask") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/processor.c | 8 -------- + 1 file changed, 8 deletions(-) +Merging powerpc/next (41bccc98fb79 Linux 6.8-rc2) +$ 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 (cb4ede926134 riscv: Avoid code duplication with generic bitops implementation) +$ 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/include/asm/pgtable.h +Auto-merging arch/riscv/mm/init.c +Auto-merging include/linux/mm.h +Auto-merging mm/mmap.c +Merge made by the 'ort' strategy. + arch/riscv/Kbuild | 1 + + arch/riscv/Kconfig | 18 +- + arch/riscv/Makefile | 5 + + arch/riscv/crypto/Kconfig | 93 ++++ + arch/riscv/crypto/Makefile | 23 + + arch/riscv/crypto/aes-macros.S | 156 ++++++ + arch/riscv/crypto/aes-riscv64-glue.c | 550 +++++++++++++++++++++ + arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S | 312 ++++++++++++ + arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S | 146 ++++++ + arch/riscv/crypto/aes-riscv64-zvkned.S | 180 +++++++ + arch/riscv/crypto/chacha-riscv64-glue.c | 101 ++++ + arch/riscv/crypto/chacha-riscv64-zvkb.S | 294 +++++++++++ + arch/riscv/crypto/ghash-riscv64-glue.c | 168 +++++++ + arch/riscv/crypto/ghash-riscv64-zvkg.S | 72 +++ + arch/riscv/crypto/sha256-riscv64-glue.c | 137 +++++ + .../crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S | 225 +++++++++ + arch/riscv/crypto/sha512-riscv64-glue.c | 133 +++++ + arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S | 203 ++++++++ + arch/riscv/crypto/sm3-riscv64-glue.c | 112 +++++ + arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S | 123 +++++ + arch/riscv/crypto/sm4-riscv64-glue.c | 107 ++++ + arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S | 117 +++++ + arch/riscv/include/asm/asm.h | 10 + + arch/riscv/include/asm/bitops.h | 138 +----- + arch/riscv/include/asm/pgalloc.h | 53 +- + arch/riscv/include/asm/pgtable.h | 6 + + arch/riscv/include/asm/tlb.h | 18 + + arch/riscv/include/asm/vector.h | 11 + + arch/riscv/kernel/entry.S | 3 + + arch/riscv/kernel/pi/Makefile | 3 + + arch/riscv/kernel/smpboot.c | 1 - + arch/riscv/kernel/traps.c | 17 +- + arch/riscv/lib/uaccess_vector.S | 1 - + arch/riscv/mm/init.c | 6 + + crypto/Kconfig | 3 + + drivers/clocksource/timer-clint.c | 2 +- + drivers/clocksource/timer-riscv.c | 2 +- + include/asm-generic/bitops/__ffs.h | 8 +- + include/asm-generic/bitops/__fls.h | 8 +- + include/asm-generic/bitops/ffs.h | 8 +- + include/asm-generic/bitops/fls.h | 8 +- + include/linux/mm.h | 2 +- + mm/mmap.c | 2 +- + 43 files changed, 3445 insertions(+), 141 deletions(-) + create mode 100644 arch/riscv/crypto/Kconfig + create mode 100644 arch/riscv/crypto/Makefile + create mode 100644 arch/riscv/crypto/aes-macros.S + create mode 100644 arch/riscv/crypto/aes-riscv64-glue.c + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned.S + create mode 100644 arch/riscv/crypto/chacha-riscv64-glue.c + create mode 100644 arch/riscv/crypto/chacha-riscv64-zvkb.S + create mode 100644 arch/riscv/crypto/ghash-riscv64-glue.c + create mode 100644 arch/riscv/crypto/ghash-riscv64-zvkg.S + create mode 100644 arch/riscv/crypto/sha256-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S + create mode 100644 arch/riscv/crypto/sha512-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S + create mode 100644 arch/riscv/crypto/sm3-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S + create mode 100644 arch/riscv/crypto/sm4-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S +Merging riscv-dt/riscv-dt-for-next (5669bb5a16a0 riscv: dts: microchip: add specific compatible for mpfs pdma) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/opencores,pwm.yaml | 55 +++++++++++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 6 +- + .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 11 +++ + arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 108 +++++++++++++++++++++ + .../dts/starfive/jh7100-starfive-visionfive-v1.dts | 22 ++++- + arch/riscv/boot/dts/starfive/jh7100.dtsi | 45 +++++++++ + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 22 +++++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 9 ++ + 8 files changed, 274 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/opencores,pwm.yaml +Merging riscv-soc/riscv-soc-for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (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 +Merge made by the 'ort' strategy. +Merging sh/for-next (6613476e225e Linux 6.8-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 (011776b8e325 time_stats: Kill TIME_STATS_HAVE_QUANTILES) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/md/bcache/sysfs.c +Auto-merging include/linux/sched.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/sort.c +Merge made by the 'ort' strategy. + MAINTAINERS | 16 + + drivers/md/bcache/Kconfig | 1 + + drivers/md/bcache/bcache.h | 1 + + drivers/md/bcache/bset.c | 6 +- + drivers/md/bcache/bset.h | 1 + + drivers/md/bcache/btree.c | 6 +- + drivers/md/bcache/super.c | 7 + + drivers/md/bcache/sysfs.c | 25 +- + drivers/md/bcache/util.c | 30 -- + drivers/md/bcache/util.h | 52 +-- + fs/bcachefs/Kconfig | 11 +- + fs/bcachefs/Makefile | 5 - + fs/bcachefs/alloc_foreground.c | 13 +- + fs/bcachefs/bcachefs.h | 13 +- + fs/bcachefs/bcachefs_format.h | 8 +- + fs/bcachefs/bset.c | 2 +- + fs/bcachefs/btree_cache.c | 20 +- + fs/bcachefs/btree_gc.c | 19 +- + fs/bcachefs/btree_io.c | 12 +- + fs/bcachefs/btree_iter.c | 14 +- + fs/bcachefs/btree_journal_iter.c | 50 ++- + fs/bcachefs/btree_journal_iter.h | 14 +- + fs/bcachefs/btree_locking.h | 2 +- + fs/bcachefs/btree_types.h | 2 +- + fs/bcachefs/btree_update.c | 2 + + fs/bcachefs/btree_update_interior.c | 10 +- + fs/bcachefs/btree_write_buffer_types.h | 2 +- + fs/bcachefs/buckets.c | 29 +- + fs/bcachefs/chardev.c | 24 +- + fs/bcachefs/checksum.c | 2 +- + fs/bcachefs/compress.c | 14 +- + fs/bcachefs/debug.c | 6 +- + fs/bcachefs/dirent.c | 130 +++---- + fs/bcachefs/dirent.h | 2 +- + fs/bcachefs/ec.c | 4 +- + fs/bcachefs/errcode.h | 2 + + fs/bcachefs/error.c | 4 +- + fs/bcachefs/fifo.h | 4 +- + fs/bcachefs/fs-common.c | 19 +- + fs/bcachefs/fs.c | 224 ++++++++----- + fs/bcachefs/fsck.c | 203 +++++------ + fs/bcachefs/inode.c | 28 ++ + fs/bcachefs/inode.h | 3 + + fs/bcachefs/io_read.c | 4 +- + fs/bcachefs/io_write.c | 4 +- + fs/bcachefs/journal.c | 248 ++++++++------ + fs/bcachefs/journal.h | 7 +- + fs/bcachefs/journal_io.c | 357 +++++++++++--------- + fs/bcachefs/journal_io.h | 35 +- + fs/bcachefs/journal_reclaim.c | 29 +- + fs/bcachefs/journal_sb.c | 2 +- + fs/bcachefs/journal_seq_blacklist.c | 6 +- + fs/bcachefs/journal_types.h | 36 +- + fs/bcachefs/migrate.c | 8 +- + fs/bcachefs/nocow_locking.c | 2 +- + fs/bcachefs/replicas.c | 17 +- + fs/bcachefs/replicas.h | 3 +- + fs/bcachefs/sb-clean.c | 16 - + fs/bcachefs/sb-downgrade.c | 3 +- + fs/bcachefs/sb-errors_types.h | 5 +- + fs/bcachefs/sb-members.h | 2 +- + fs/bcachefs/str_hash.h | 15 +- + fs/bcachefs/subvolume.h | 1 - + fs/bcachefs/subvolume_types.h | 2 +- + fs/bcachefs/super-io.h | 2 +- + fs/bcachefs/super.c | 39 +-- + fs/bcachefs/sysfs.c | 4 +- + fs/bcachefs/thread_with_file.c | 299 ----------------- + fs/bcachefs/thread_with_file.h | 41 --- + fs/bcachefs/thread_with_file_types.h | 16 - + fs/bcachefs/util.c | 370 ++------------------ + fs/bcachefs/util.h | 151 +-------- + {fs/bcachefs => include/linux}/darray.h | 61 ++-- + include/linux/darray_types.h | 22 ++ + {fs/bcachefs => include/linux}/eytzinger.h | 56 ++-- + {fs/bcachefs => include/linux}/mean_and_variance.h | 14 +- + include/linux/mempool.h | 13 + + include/linux/sched.h | 4 +- + include/linux/sched/mm.h | 60 ++-- + include/linux/thread_with_file.h | 71 ++++ + include/linux/thread_with_file_types.h | 25 ++ + include/linux/time_stats.h | 167 +++++++++ + lib/Kconfig | 7 + + lib/Kconfig.debug | 9 + + lib/Makefile | 5 +- + {fs/bcachefs => lib}/darray.c | 7 +- + lib/math/Kconfig | 3 + + lib/math/Makefile | 2 + + {fs/bcachefs => lib/math}/mean_and_variance.c | 26 +- + {fs/bcachefs => lib/math}/mean_and_variance_test.c | 3 +- + lib/sort.c | 89 +++++ + lib/thread_with_file.c | 349 +++++++++++++++++++ + lib/time_stats.c | 373 +++++++++++++++++++++ + mm/mempool.c | 13 + + 94 files changed, 2353 insertions(+), 1792 deletions(-) + delete mode 100644 fs/bcachefs/thread_with_file.c + delete mode 100644 fs/bcachefs/thread_with_file.h + delete mode 100644 fs/bcachefs/thread_with_file_types.h + rename {fs/bcachefs => include/linux}/darray.h (66%) + create mode 100644 include/linux/darray_types.h + rename {fs/bcachefs => include/linux}/eytzinger.h (78%) + rename {fs/bcachefs => include/linux}/mean_and_variance.h (96%) + create mode 100644 include/linux/thread_with_file.h + create mode 100644 include/linux/thread_with_file_types.h + create mode 100644 include/linux/time_stats.h + rename {fs/bcachefs => lib}/darray.c (68%) + rename {fs/bcachefs => lib/math}/mean_and_variance.c (93%) + rename {fs/bcachefs => lib/math}/mean_and_variance_test.c (99%) + create mode 100644 lib/thread_with_file.c + create mode 100644 lib/time_stats.c +$ git reset --hard HEAD^ +HEAD is now at 9c95db3e6950 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +Merging next-20240206 version of bcachefs +$ git merge -m next-20240206/bcachefs a655aaa7a8446f50b14c5d7f7c54c708355ab016 +Auto-merging MAINTAINERS +Auto-merging drivers/md/bcache/sysfs.c +Auto-merging include/linux/sched.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/sort.c +Merge made by the 'ort' strategy. + MAINTAINERS | 15 + + drivers/md/bcache/Kconfig | 1 + + drivers/md/bcache/bcache.h | 1 + + drivers/md/bcache/bset.c | 6 +- + drivers/md/bcache/bset.h | 1 + + drivers/md/bcache/btree.c | 6 +- + drivers/md/bcache/super.c | 7 + + drivers/md/bcache/sysfs.c | 25 +- + drivers/md/bcache/util.c | 30 -- + drivers/md/bcache/util.h | 52 +-- + fs/bcachefs/Kconfig | 10 +- + fs/bcachefs/Makefile | 3 - + fs/bcachefs/alloc_foreground.c | 13 +- + fs/bcachefs/bcachefs.h | 11 +- + fs/bcachefs/bcachefs_format.h | 8 +- + fs/bcachefs/bset.c | 2 +- + fs/bcachefs/btree_cache.c | 20 +- + fs/bcachefs/btree_gc.c | 19 +- + fs/bcachefs/btree_io.c | 12 +- + fs/bcachefs/btree_iter.c | 14 +- + fs/bcachefs/btree_journal_iter.c | 49 ++- + fs/bcachefs/btree_journal_iter.h | 14 +- + fs/bcachefs/btree_locking.h | 2 +- + fs/bcachefs/btree_update_interior.c | 8 +- + fs/bcachefs/buckets.c | 29 +- + fs/bcachefs/chardev.c | 14 +- + fs/bcachefs/checksum.c | 2 +- + fs/bcachefs/compress.c | 14 +- + fs/bcachefs/debug.c | 6 +- + fs/bcachefs/dirent.c | 130 ++++---- + fs/bcachefs/dirent.h | 2 +- + fs/bcachefs/ec.c | 4 +- + fs/bcachefs/fifo.h | 4 +- + fs/bcachefs/fs-common.c | 19 +- + fs/bcachefs/fs.c | 224 ++++++++----- + fs/bcachefs/fsck.c | 60 +--- + fs/bcachefs/inode.c | 28 ++ + fs/bcachefs/inode.h | 3 + + fs/bcachefs/io_read.c | 4 +- + fs/bcachefs/io_write.c | 4 +- + fs/bcachefs/journal.c | 248 ++++++++------ + fs/bcachefs/journal.h | 7 +- + fs/bcachefs/journal_io.c | 357 +++++++++++--------- + fs/bcachefs/journal_io.h | 35 +- + fs/bcachefs/journal_reclaim.c | 29 +- + fs/bcachefs/journal_seq_blacklist.c | 6 +- + fs/bcachefs/journal_types.h | 36 +- + fs/bcachefs/nocow_locking.c | 2 +- + fs/bcachefs/replicas.c | 17 +- + fs/bcachefs/replicas.h | 3 +- + fs/bcachefs/sb-clean.c | 16 - + fs/bcachefs/sb-errors_types.h | 3 +- + fs/bcachefs/str_hash.h | 15 +- + fs/bcachefs/super-io.h | 2 +- + fs/bcachefs/super.c | 41 ++- + fs/bcachefs/thread_with_file.c | 299 ++++++++++------- + fs/bcachefs/thread_with_file.h | 47 ++- + fs/bcachefs/thread_with_file_types.h | 15 +- + fs/bcachefs/util.c | 361 ++------------------- + fs/bcachefs/util.h | 122 +------ + {fs/bcachefs => include/linux}/eytzinger.h | 56 ++-- + {fs/bcachefs => include/linux}/mean_and_variance.h | 0 + include/linux/mempool.h | 13 + + include/linux/sched.h | 4 +- + include/linux/sched/mm.h | 60 ++-- + include/linux/time_stats.h | 134 ++++++++ + lib/Kconfig | 4 + + lib/Kconfig.debug | 9 + + lib/Makefile | 2 + + lib/math/Kconfig | 3 + + lib/math/Makefile | 2 + + {fs/bcachefs => lib/math}/mean_and_variance.c | 3 +- + {fs/bcachefs => lib/math}/mean_and_variance_test.c | 3 +- + lib/sort.c | 89 +++++ + lib/time_stats.c | 270 +++++++++++++++ + mm/mempool.c | 13 + + 76 files changed, 1787 insertions(+), 1415 deletions(-) + rename {fs/bcachefs => include/linux}/eytzinger.h (78%) + rename {fs/bcachefs => include/linux}/mean_and_variance.h (100%) + create mode 100644 include/linux/time_stats.h + rename {fs/bcachefs => lib/math}/mean_and_variance.c (99%) + rename {fs/bcachefs => lib/math}/mean_and_variance_test.c (99%) + create mode 100644 lib/time_stats.c +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (d3a7bd420076 fscrypt: clear keyring before calling key_put()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Merge made by the 'ort' strategy. + fs/crypto/keyring.c | 8 ++++++-- + fs/crypto/keysetup.c | 5 ++++- + 2 files changed, 10 insertions(+), 3 deletions(-) +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 (c76800fdde78 Merge branch 'for-next-next-v6.8-20240206' into for-next-20240206) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/accessors.c | 15 +- + fs/btrfs/accessors.h | 11 +- + fs/btrfs/acl.c | 1 - + fs/btrfs/acl.h | 11 ++ + fs/btrfs/async-thread.c | 1 - + fs/btrfs/async-thread.h | 3 + + fs/btrfs/backref.h | 16 +- + fs/btrfs/bio.c | 17 +- + fs/btrfs/bio.h | 2 + + fs/btrfs/block-group.c | 93 ++++++++++- + fs/btrfs/block-group.h | 20 +++ + fs/btrfs/block-rsv.c | 1 - + fs/btrfs/block-rsv.h | 7 + + fs/btrfs/btrfs_inode.h | 22 ++- + fs/btrfs/compression.c | 132 +++++++++------ + fs/btrfs/compression.h | 53 +++--- + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 28 ++-- + fs/btrfs/defrag.c | 155 ++++++++--------- + fs/btrfs/defrag.h | 10 ++ + fs/btrfs/delalloc-space.c | 2 - + fs/btrfs/delalloc-space.h | 4 + + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/delayed-inode.h | 8 + + fs/btrfs/delayed-ref.h | 10 ++ + fs/btrfs/dev-replace.c | 2 - + fs/btrfs/dev-replace.h | 4 + + fs/btrfs/dir-item.h | 6 + + fs/btrfs/disk-io.c | 52 ++++-- + fs/btrfs/disk-io.h | 20 ++- + fs/btrfs/export.c | 12 +- + fs/btrfs/export.h | 4 + + fs/btrfs/extent-io-tree.c | 2 +- + fs/btrfs/extent-io-tree.h | 7 + + fs/btrfs/extent-tree.c | 38 +++-- + fs/btrfs/extent-tree.h | 10 ++ + fs/btrfs/extent_io.c | 347 +++++++++++++++++++++++++-------------- + fs/btrfs/extent_io.h | 46 ++++-- + fs/btrfs/extent_map.c | 20 ++- + fs/btrfs/extent_map.h | 8 + + fs/btrfs/file-item.c | 6 - + fs/btrfs/file-item.h | 13 ++ + fs/btrfs/file.c | 43 +++-- + fs/btrfs/file.h | 15 ++ + fs/btrfs/free-space-cache.c | 4 +- + fs/btrfs/free-space-cache.h | 13 ++ + fs/btrfs/free-space-tree.c | 56 ++++--- + fs/btrfs/free-space-tree.h | 6 + + fs/btrfs/fs.h | 67 +++++++- + fs/btrfs/inode-item.c | 1 - + fs/btrfs/inode-item.h | 5 +- + fs/btrfs/inode.c | 293 ++++++++++++++++++--------------- + fs/btrfs/ioctl.c | 55 ++++--- + fs/btrfs/ioctl.h | 9 + + fs/btrfs/locking.c | 3 +- + fs/btrfs/locking.h | 8 +- + fs/btrfs/lru_cache.h | 2 + + fs/btrfs/lzo.c | 91 +++++----- + fs/btrfs/messages.c | 2 - + fs/btrfs/misc.h | 2 + + fs/btrfs/ordered-data.c | 1 - + fs/btrfs/ordered-data.h | 15 ++ + fs/btrfs/orphan.c | 1 - + fs/btrfs/orphan.h | 5 + + fs/btrfs/print-tree.h | 3 + + fs/btrfs/props.c | 3 +- + fs/btrfs/props.h | 7 +- + fs/btrfs/qgroup.c | 14 ++ + fs/btrfs/qgroup.h | 17 +- + fs/btrfs/raid-stripe-tree.c | 1 - + fs/btrfs/raid-stripe-tree.h | 5 + + fs/btrfs/raid56.c | 31 +++- + fs/btrfs/raid56.h | 9 + + fs/btrfs/rcu-string.h | 6 + + fs/btrfs/ref-verify.h | 9 + + fs/btrfs/reflink.c | 12 +- + fs/btrfs/reflink.h | 4 +- + fs/btrfs/relocation.c | 107 ++++++------ + fs/btrfs/relocation.h | 9 + + fs/btrfs/root-tree.c | 17 +- + fs/btrfs/root-tree.h | 10 ++ + fs/btrfs/scrub.h | 6 + + fs/btrfs/send.c | 49 +++--- + fs/btrfs/send.h | 8 +- + fs/btrfs/space-info.c | 1 - + fs/btrfs/space-info.h | 9 + + fs/btrfs/subpage.h | 5 + + fs/btrfs/super.c | 4 +- + fs/btrfs/super.h | 7 + + fs/btrfs/sysfs.c | 51 +++++- + fs/btrfs/sysfs.h | 9 + + fs/btrfs/tests/extent-io-tests.c | 28 +++- + fs/btrfs/tests/inode-tests.c | 40 ++--- + fs/btrfs/transaction.c | 2 - + fs/btrfs/transaction.h | 17 +- + fs/btrfs/tree-checker.c | 8 +- + fs/btrfs/tree-checker.h | 2 + + fs/btrfs/tree-log.c | 95 ++++++----- + fs/btrfs/tree-log.h | 33 ++++ + fs/btrfs/tree-mod-log.h | 8 +- + fs/btrfs/ulist.c | 1 - + fs/btrfs/ulist.h | 1 + + fs/btrfs/uuid-tree.c | 3 +- + fs/btrfs/uuid-tree.h | 5 + + fs/btrfs/verity.c | 1 - + fs/btrfs/verity.h | 7 + + fs/btrfs/volumes.c | 56 ++++--- + fs/btrfs/volumes.h | 49 +++++- + fs/btrfs/xattr.h | 6 +- + fs/btrfs/zlib.c | 112 +++++++------ + fs/btrfs/zoned.c | 2 - + fs/btrfs/zoned.h | 15 ++ + fs/btrfs/zstd.c | 154 ++++++++--------- + 113 files changed, 1996 insertions(+), 988 deletions(-) +Merging ceph/master (ded080c86b3f 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 +Already up to date. +Merging cifs/for-next (018edd04d0aa cifs: Use more fields from netfs_io_subrequest) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/Makefile | 2 +- + fs/smb/client/cifsfs.c | 6 + + fs/smb/client/cifsglob.h | 79 +++---- + fs/smb/client/cifsproto.h | 33 ++- + fs/smb/client/cifssmb.c | 72 +++--- + fs/smb/client/connect.c | 2 + + fs/smb/client/file.c | 235 +++++++++----------- + fs/smb/client/fs_context.c | 35 +++ + fs/smb/client/fs_context.h | 9 + + fs/smb/client/inode.c | 84 +------ + fs/smb/client/readdir.c | 35 +-- + fs/smb/client/reparse.c | 531 +++++++++++++++++++++++++++++++++++++++++++++ + fs/smb/client/reparse.h | 113 ++++++++++ + fs/smb/client/sess.c | 2 +- + fs/smb/client/smb2glob.h | 3 +- + fs/smb/client/smb2inode.c | 399 ++++++++++++++++++++++++---------- + fs/smb/client/smb2ops.c | 256 +--------------------- + fs/smb/client/smb2pdu.c | 91 +++++--- + fs/smb/client/smb2pdu.h | 36 ++- + fs/smb/client/smb2proto.h | 14 +- + fs/smb/client/trace.h | 2 + + fs/smb/client/transport.c | 10 +- + fs/smb/common/smbfsctl.h | 6 - + 23 files changed, 1310 insertions(+), 745 deletions(-) + create mode 100644 fs/smb/client/reparse.c + create mode 100644 fs/smb/client/reparse.h +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 (0991abeddefa exfat: fix zero the unwritten part for dio read) +$ 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 (42c3732fa807 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 (9e9a976eaa1d Pull UDF and quota fix.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/balloc.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext2/xattr.c | 2 +- + fs/notify/fsnotify.c | 28 +++++++----- + fs/ocfs2/quota_global.c | 12 +++++ + fs/ocfs2/quota_local.c | 3 ++ + fs/quota/dquot.c | 111 ++++++++++++++++++++++++++--------------------- + fs/quota/quota_tree.c | 24 +++++----- + fs/quota/quota_v1.c | 6 +++ + fs/quota/quota_v2.c | 20 ++++++++- + fs/udf/dir.c | 2 +- + fs/udf/inode.c | 2 +- + fs/udf/namei.c | 23 +++++----- + fs/udf/super.c | 44 +++++++++++-------- + include/linux/fsnotify.h | 12 +++-- + 15 files changed, 184 insertions(+), 109 deletions(-) +Merging ext4/dev (ec9d669eba4c ext4: make ext4_set_iomap() recognize IOMAP_DELALLOC map type) +$ 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 (21ec68234826 f2fs: fix to avoid potential panic during recovery) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/f2fs.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 47 ++++++++++---------- + Documentation/filesystems/f2fs.rst | 47 ++++++++++---------- + fs/f2fs/checkpoint.c | 19 ++++++-- + fs/f2fs/compress.c | 45 +++++++++++-------- + fs/f2fs/data.c | 36 ++++++++------- + fs/f2fs/dir.c | 5 +-- + fs/f2fs/f2fs.h | 78 ++++++++++++++++++++++----------- + fs/f2fs/file.c | 51 ++++++++++++++------- + fs/f2fs/namei.c | 11 ++--- + fs/f2fs/node.c | 2 +- + fs/f2fs/recovery.c | 33 +++++++------- + fs/f2fs/segment.c | 4 +- + fs/f2fs/super.c | 57 ++++++++++++++---------- + 13 files changed, 254 insertions(+), 181 deletions(-) +Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Merge made by the 'ort' strategy. + fs/verity/fsverity_private.h | 1 - + fs/verity/open.c | 1 - + fs/verity/verify.c | 48 ++++++++++++++++++++++---------------------- + 3 files changed, 24 insertions(+), 26 deletions(-) +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 (6b89b6af459f Merge tag 'gfs2-v6.8-rc2-revert' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (54be6c6c5ae8 Linux 6.8-rc3) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (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 (deb2beb8fa2c MAINTAINERS: add Alex Aring as Reviewer for file locking code) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/lockd/svc.c | 3 - + fs/nfs/callback.c | 3 - + fs/nfsd/blocklayout.c | 4 +- + fs/nfsd/cache.h | 2 - + fs/nfsd/filecache.c | 76 ++-- + fs/nfsd/filecache.h | 1 + + fs/nfsd/netns.h | 29 +- + fs/nfsd/nfs4callback.c | 96 +++-- + fs/nfsd/nfs4layouts.c | 63 ++-- + fs/nfsd/nfs4proc.c | 6 +- + fs/nfsd/nfs4state.c | 663 ++++++++++++++++++++++++---------- + fs/nfsd/nfs4xdr.c | 19 +- + fs/nfsd/nfscache.c | 43 +-- + fs/nfsd/nfsctl.c | 17 +- + fs/nfsd/nfsd.h | 2 + + fs/nfsd/nfsfh.c | 3 +- + fs/nfsd/nfssvc.c | 16 +- + fs/nfsd/pnfs.h | 8 +- + fs/nfsd/state.h | 52 ++- + fs/nfsd/stats.c | 52 ++- + fs/nfsd/stats.h | 70 ++-- + fs/nfsd/trace.h | 194 +++++++++- + fs/nfsd/vfs.c | 48 ++- + fs/nfsd/vfs.h | 2 + + include/linux/sunrpc/svc.h | 5 +- + include/trace/misc/nfs.h | 34 ++ + net/sunrpc/auth_gss/gss_krb5_crypto.c | 14 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 11 +- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 27 +- + net/sunrpc/stats.c | 2 +- + net/sunrpc/svc.c | 40 +- + net/sunrpc/xprtsock.c | 9 - + 33 files changed, 1089 insertions(+), 526 deletions(-) +Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk()) +$ 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 | 45 +++++++---- + fs/ntfs3/attrlist.c | 12 +-- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/dir.c | 48 ++++++++--- + fs/ntfs3/file.c | 76 ++++++++++++++---- + fs/ntfs3/frecord.c | 19 +++-- + fs/ntfs3/fslog.c | 228 ++++++++++++++++++++++++---------------------------- + fs/ntfs3/fsntfs.c | 29 ++++++- + fs/ntfs3/index.c | 8 +- + fs/ntfs3/inode.c | 32 ++++++-- + fs/ntfs3/namei.c | 12 +++ + fs/ntfs3/ntfs.h | 4 +- + fs/ntfs3/ntfs_fs.h | 29 +++---- + fs/ntfs3/record.c | 18 ++++- + fs/ntfs3/super.c | 54 ++++++++----- + fs/ntfs3/xattr.c | 6 ++ + 16 files changed, 379 insertions(+), 245 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 (be57855f5050 fs/9p: fix dups even in uncached mode) +$ 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 +Merge made by the 'ort' strategy. + fs/9p/v9fs.h | 31 ++------ + fs/9p/v9fs_vfs.h | 11 ++- + fs/9p/vfs_dir.c | 4 +- + fs/9p/vfs_inode.c | 150 ++++++-------------------------------- + fs/9p/vfs_inode_dotl.c | 194 +++++++++---------------------------------------- + fs/9p/vfs_super.c | 45 +----------- + 6 files changed, 71 insertions(+), 364 deletions(-) +Merging xfs/for-next (881f78f47255 xfs: remove conditional building of rt geometry validator functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (23b006406f6b Merge branch 'vfs.super' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging drivers/md/bcache/bcache.h +Auto-merging drivers/md/bcache/super.c +Auto-merging fs/Kconfig +Auto-merging fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4layouts.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4layouts.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/smb/client/cifsfs.c +Auto-merging fs/smb/client/cifssmb.c +Auto-merging fs/smb/client/file.c +Auto-merging include/linux/dcache.h +Auto-merging include/linux/swap.h +Auto-merging init/initramfs.c +Auto-merging kernel/exit.c +Auto-merging mm/filemap.c +Auto-merging mm/swapfile.c +Resolved 'fs/nfsd/nfs4layouts.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b305e4c3bdd5] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 5 + + Documentation/filesystems/index.rst | 1 - + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/ntfs.rst | 466 --- + Documentation/filesystems/vfs.rst | 16 +- + MAINTAINERS | 10 - + block/bdev.c | 259 +- + block/blk.h | 4 + + block/fops.c | 48 +- + block/genhd.c | 12 +- + block/ioctl.c | 9 +- + drivers/block/drbd/drbd_int.h | 4 +- + drivers/block/drbd/drbd_nl.c | 58 +- + drivers/block/pktcdvd.c | 68 +- + drivers/block/rnbd/rnbd-srv.c | 28 +- + drivers/block/rnbd/rnbd-srv.h | 2 +- + drivers/block/xen-blkback/blkback.c | 4 +- + drivers/block/xen-blkback/common.h | 4 +- + drivers/block/xen-blkback/xenbus.c | 37 +- + drivers/block/zram/zram_drv.c | 26 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/md/bcache/bcache.h | 4 +- + drivers/md/bcache/super.c | 74 +- + drivers/md/dm.c | 23 +- + drivers/md/md.c | 12 +- + drivers/md/md.h | 2 +- + drivers/mtd/devices/block2mtd.c | 46 +- + drivers/nvme/target/io-cmd-bdev.c | 16 +- + drivers/nvme/target/nvmet.h | 2 +- + drivers/s390/block/dasd.c | 10 +- + drivers/s390/block/dasd_genhd.c | 36 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/block/dasd_ioctl.c | 2 +- + drivers/target/target_core_iblock.c | 18 +- + drivers/target/target_core_iblock.h | 2 +- + drivers/target/target_core_pscsi.c | 22 +- + drivers/target/target_core_pscsi.h | 2 +- + fs/9p/vfs_file.c | 40 +- + fs/Kconfig | 1 - + fs/Makefile | 1 - + fs/afs/flock.c | 60 +- + fs/attr.c | 2 +- + fs/backing-file.c | 4 +- + fs/bcachefs/super-io.c | 20 +- + fs/bcachefs/super_types.h | 2 +- + fs/btrfs/dev-replace.c | 14 +- + fs/btrfs/ioctl.c | 16 +- + fs/btrfs/volumes.c | 92 +- + fs/btrfs/volumes.h | 4 +- + fs/buffer.c | 10 +- + fs/ceph/locks.c | 74 +- + fs/cramfs/inode.c | 2 +- + fs/dlm/plock.c | 44 +- + fs/erofs/data.c | 6 +- + fs/erofs/internal.h | 2 +- + fs/erofs/super.c | 16 +- + fs/eventfd.c | 14 +- + fs/eventpoll.c | 8 +- + fs/exec.c | 1 - + fs/ext4/ext4.h | 2 +- + fs/ext4/fsmap.c | 8 +- + fs/ext4/super.c | 52 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/super.c | 12 +- + fs/fhandle.c | 2 +- + fs/file_table.c | 36 +- + fs/fs-writeback.c | 25 + + fs/fs_parser.c | 4 +- + fs/fuse/file.c | 14 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 16 +- + fs/inode.c | 3 +- + fs/iomap/buffered-io.c | 602 ++-- + fs/jfs/jfs_logmgr.c | 26 +- + fs/jfs/jfs_logmgr.h | 2 +- + fs/jfs/jfs_mount.c | 2 +- + fs/libfs.c | 2 +- + fs/lockd/clnt4xdr.c | 14 +- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 65 +- + fs/lockd/clntxdr.c | 14 +- + fs/lockd/svc4proc.c | 10 +- + fs/lockd/svclock.c | 64 +- + fs/lockd/svcproc.c | 10 +- + fs/lockd/svcsubs.c | 24 +- + fs/lockd/xdr.c | 14 +- + fs/lockd/xdr4.c | 14 +- + fs/locks.c | 896 +++--- + fs/mbcache.c | 5 +- + fs/mnt_idmapping.c | 2 +- + fs/netfs/buffered_write.c | 3 + + fs/netfs/direct_write.c | 5 +- + fs/netfs/io.c | 2 + + fs/nfs/blocklayout/blocklayout.h | 2 +- + fs/nfs/blocklayout/dev.c | 66 +- + fs/nfs/delegation.c | 4 +- + fs/nfs/file.c | 22 +- + fs/nfs/nfs3proc.c | 2 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4proc.c | 39 +- + fs/nfs/nfs4state.c | 22 +- + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/nfs4xdr.c | 8 +- + fs/nfs/write.c | 8 +- + fs/nfsd/filecache.c | 4 +- + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4layouts.c | 35 +- + fs/nfsd/nfs4state.c | 124 +- + 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/ntfs3/namei.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 32 +- + fs/ocfs2/locks.c | 12 +- + fs/ocfs2/stack_user.c | 2 +- + fs/open.c | 2 +- + fs/overlayfs/copy_up.c | 14 +- + fs/overlayfs/super.c | 52 +- + fs/pipe.c | 81 +- + fs/posix_acl.c | 4 +- + fs/reiserfs/journal.c | 38 +- + fs/reiserfs/procfs.c | 2 +- + fs/reiserfs/reiserfs.h | 8 +- + fs/remap_range.c | 31 +- + fs/romfs/super.c | 2 +- + fs/select.c | 13 +- + fs/smb/client/cifsfs.c | 5 +- + fs/smb/client/cifssmb.c | 8 +- + fs/smb/client/file.c | 76 +- + fs/smb/client/smb2file.c | 2 +- + fs/smb/server/smb2pdu.c | 44 +- + fs/smb/server/vfs.c | 14 +- + fs/super.c | 18 +- + fs/sysv/itree.c | 10 +- + fs/xfs/xfs_aops.c | 9 +- + fs/xfs/xfs_buf.c | 10 +- + fs/xfs/xfs_buf.h | 4 +- + fs/xfs/xfs_super.c | 44 +- + fs/zonefs/file.c | 3 +- + include/asm-generic/barrier.h | 2 - + include/linux/backing-dev.h | 1 - + include/linux/blkdev.h | 13 +- + include/linux/dcache.h | 18 +- + include/linux/device-mapper.h | 2 +- + include/linux/file.h | 2 + + include/linux/filelock.h | 131 +- + include/linux/fs.h | 45 +- + include/linux/iomap.h | 19 +- + include/linux/lockd/lockd.h | 8 +- + include/linux/lockd/xdr.h | 2 +- + include/linux/pid.h | 4 +- + include/linux/pktcdvd.h | 4 +- + include/linux/sched/signal.h | 2 - + include/linux/swap.h | 2 +- + include/trace/events/afs.h | 4 +- + include/trace/events/filelock.h | 102 +- + include/uapi/linux/fs.h | 5 +- + include/uapi/linux/pidfd.h | 3 +- + init/do_mounts.c | 5 + + init/initramfs.c | 2 - + kernel/exit.c | 31 +- + kernel/fork.c | 48 +- + kernel/pid.c | 24 +- + kernel/power/swap.c | 28 +- + kernel/signal.c | 19 +- + lib/iov_iter.c | 60 +- + mm/backing-dev.c | 25 - + mm/filemap.c | 9 - + mm/swapfile.c | 22 +- + .../selftests/filesystems/overlayfs/dev_in_maps.c | 10 +- + .../move_mount_set_group_test.c | 4 +- + 215 files changed, 2514 insertions(+), 31581 deletions(-) + delete mode 100644 Documentation/filesystems/ntfs.rst + 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 (1281aa073d37 Merge branch 'pci/enumeration') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging include/linux/pci.h +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/driver-api/device-io.rst | 2 +- + Documentation/driver-api/pci/pci.rst | 6 + + MAINTAINERS | 1 - + drivers/pci/Kconfig | 5 + + drivers/pci/Makefile | 3 +- + drivers/pci/devres.c | 448 ++++++++++++++++++++++++++++++ + lib/pci_iomap.c => drivers/pci/iomap.c | 5 +- + drivers/pci/irq.c | 204 ++++++++++++++ + drivers/pci/pci-driver.c | 9 - + drivers/pci/pci.c | 484 ++------------------------------- + drivers/pci/pci.h | 31 ++- + drivers/pci/pcie/Makefile | 2 +- + drivers/pci/pcie/aspm.c | 235 ++++++++++++++++ + drivers/pci/pcie/dpc.c | 2 +- + drivers/pci/probe.c | 62 +---- + drivers/pci/setup-irq.c | 64 ----- + include/linux/pci.h | 2 +- + lib/Kconfig | 3 - + lib/Makefile | 1 - + lib/devres.c | 208 +------------- + 20 files changed, 961 insertions(+), 816 deletions(-) + create mode 100644 drivers/pci/devres.c + rename lib/pci_iomap.c => drivers/pci/iomap.c (99%) + delete mode 100644 drivers/pci/setup-irq.c +Merging pstore/for-next/pstore (69f381e67d6f pstore/zone: Add a null pointer check to the psz_kmsg_read) +$ 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/configs/defconfig | 1 + + drivers/firmware/efi/efi-pstore.c | 43 +++++++++++++++++++++++++++++++-------- + fs/pstore/ram.c | 1 + + fs/pstore/zone.c | 2 ++ + 4 files changed, 39 insertions(+), 8 deletions(-) +Merging hid/for-next (b582e8c3ccc7 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-ids.h | 7 + + drivers/hid/hid-lenovo.c | 57 +++-- + drivers/hid/hid-logitech-hidpp.c | 13 +- + drivers/hid/hid-nintendo.c | 10 - + drivers/hid/hid-samsung.c | 437 +++++++++++++++++++++++++++++++++++---- + drivers/hid/wacom_sys.c | 63 ++++-- + 6 files changed, 500 insertions(+), 87 deletions(-) +Merging i2c/i2c/for-next (957bd221ac7b Merge tag 'i2c-host-fixes-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i2c-host/i2c/i2c-host (4b5cb5c1a346 dt-bindings: i2c: renesas,rcar-i2c: Add r8a779h0 support) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/i2c-mux-pca954x.yaml | 30 +++++++++++ + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 1 + + drivers/i2c/busses/i2c-hisi.c | 13 ++++- + drivers/i2c/busses/i2c-i801.c | 12 ++--- + drivers/i2c/busses/i2c-imx.c | 62 ++-------------------- + drivers/i2c/busses/i2c-sh_mobile.c | 27 ++++------ + drivers/i2c/muxes/i2c-mux-pca954x.c | 43 ++++++++++++++- + 7 files changed, 106 insertions(+), 82 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 +Already up to date. +Merging hwmon-staging/hwmon-next (1f1a48cb4432 hwmon: (coretemp) Use dynamic allocated memory for core temp_data) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 27 + + .../devicetree/bindings/hwmon/adi,ltc4282.yaml | 159 ++ + .../bindings/hwmon/amphenol,chipcap2.yaml | 77 + + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 9 + + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/hwmon/asus_rog_ryujin.rst | 47 + + Documentation/hwmon/chipcap2.rst | 73 + + Documentation/hwmon/emc2305.rst | 1 - + Documentation/hwmon/index.rst | 6 + + Documentation/hwmon/ltc4282.rst | 133 ++ + Documentation/hwmon/mpq8785.rst | 94 ++ + Documentation/hwmon/nct6683.rst | 1 + + Documentation/hwmon/nzxt-kraken3.rst | 74 + + Documentation/hwmon/sht3x.rst | 11 + + Documentation/hwmon/surface_fan.rst | 25 + + MAINTAINERS | 56 +- + drivers/hwmon/Kconfig | 55 + + drivers/hwmon/Makefile | 5 + + drivers/hwmon/adm1177.c | 1 - + drivers/hwmon/adt7310.c | 2 +- + drivers/hwmon/adt7410.c | 4 +- + drivers/hwmon/asus_rog_ryujin.c | 609 +++++++ + drivers/hwmon/chipcap2.c | 816 +++++++++ + drivers/hwmon/coretemp.c | 204 +-- + drivers/hwmon/ds1621.c | 1 - + drivers/hwmon/ds620.c | 1 - + drivers/hwmon/emc1403.c | 2 +- + drivers/hwmon/emc2305.c | 5 - + drivers/hwmon/hwmon.c | 3 + + drivers/hwmon/ina209.c | 1 - + drivers/hwmon/ina238.c | 1 - + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/ltc4282.c | 1784 ++++++++++++++++++++ + drivers/hwmon/max127.c | 1 - + drivers/hwmon/max31760.c | 3 +- + drivers/hwmon/max31790.c | 1 - + drivers/hwmon/max31827.c | 1 - + drivers/hwmon/max6621.c | 1 - + drivers/hwmon/max6697.c | 1 - + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nzxt-kraken3.c | 1008 +++++++++++ + drivers/hwmon/occ/p8_i2c.c | 1 - + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ir36021.c | 1 - + drivers/hwmon/pmbus/mpq8785.c | 90 + + drivers/hwmon/pmbus/pmbus_core.c | 2 +- + drivers/hwmon/powr1220.c | 1 - + drivers/hwmon/sbrmi.c | 1 - + drivers/hwmon/sbtsi_temp.c | 1 - + drivers/hwmon/sch5627.c | 2 +- + drivers/hwmon/sht3x.c | 66 +- + drivers/hwmon/surface_fan.c | 91 + + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/w83773g.c | 1 - + include/linux/hwmon.h | 18 +- + 60 files changed, 5454 insertions(+), 155 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml + create mode 100644 Documentation/hwmon/asus_rog_ryujin.rst + create mode 100644 Documentation/hwmon/chipcap2.rst + create mode 100644 Documentation/hwmon/ltc4282.rst + create mode 100644 Documentation/hwmon/mpq8785.rst + create mode 100644 Documentation/hwmon/nzxt-kraken3.rst + create mode 100644 Documentation/hwmon/surface_fan.rst + create mode 100644 drivers/hwmon/asus_rog_ryujin.c + create mode 100644 drivers/hwmon/chipcap2.c + create mode 100644 drivers/hwmon/ltc4282.c + create mode 100644 drivers/hwmon/nzxt-kraken3.c + create mode 100644 drivers/hwmon/pmbus/mpq8785.c + create mode 100644 drivers/hwmon/surface_fan.c +Merging jc_docs/docs-next (f9197538d71a Documentation: admin-guide: tainted-kernels.rst: Add missing article and comma) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/process/changes.rst +Merge made by the 'ort' strategy. + Documentation/RCU/torture.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/tainted-kernels.rst | 4 +- + Documentation/doc-guide/kernel-doc.rst | 45 ++ + Documentation/doc-guide/maintainer-profile.rst | 7 + + Documentation/doc-guide/sphinx.rst | 7 +- + Documentation/driver-api/index.rst | 209 +++--- + .../maintainer/maintainer-entry-profile.rst | 3 + + Documentation/process/changes.rst | 4 +- + Documentation/process/coding-style.rst | 13 +- + Documentation/process/howto.rst | 4 +- + Documentation/subsystem-apis.rst | 2 + + Documentation/translations/it_IT/RCU/index.rst | 19 + + Documentation/translations/it_IT/RCU/torture.rst | 369 +++++++++ + .../translations/it_IT/core-api/index.rst | 12 + + Documentation/translations/it_IT/index.rst | 1 + + Documentation/translations/it_IT/locking/index.rst | 20 + + .../translations/it_IT/locking/lockdep-design.rst | 678 +++++++++++++++++ + .../translations/it_IT/locking/lockstat.rst | 230 ++++++ + .../translations/it_IT/locking/locktorture.rst | 181 +++++ + .../translations/it_IT/locking/locktypes.rst | 547 ++++++++++++++ + .../translations/it_IT/process/coding-style.rst | 6 +- + .../translations/sp_SP/process/coding-style.rst | 6 +- + .../translations/zh_CN/process/coding-style.rst | 4 +- + .../translations/zh_TW/process/coding-style.rst | 4 +- + Documentation/userspace-api/index.rst | 47 +- + Documentation/userspace-api/perf_ring_buffer.rst | 830 +++++++++++++++++++++ + drivers/gpu/drm/drm_gem_vram_helper.c | 44 +- + include/drm/drm_gem_vram_helper.h | 16 +- + scripts/kernel-doc | 13 +- + scripts/sphinx-pre-install | 9 +- + 31 files changed, 3179 insertions(+), 162 deletions(-) + create mode 100644 Documentation/translations/it_IT/RCU/index.rst + create mode 100644 Documentation/translations/it_IT/RCU/torture.rst + create mode 100644 Documentation/translations/it_IT/locking/index.rst + create mode 100644 Documentation/translations/it_IT/locking/lockdep-design.rst + create mode 100644 Documentation/translations/it_IT/locking/lockstat.rst + create mode 100644 Documentation/translations/it_IT/locking/locktorture.rst + create mode 100644 Documentation/translations/it_IT/locking/locktypes.rst + create mode 100644 Documentation/userspace-api/perf_ring_buffer.rst +Merging v4l-dvb/master (41bccc98fb79 Linux 6.8-rc2) +$ 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 (feb8831be9d4 media: ov08x40: Reduce start streaming time) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/staging/media/atomisp/pci/atomisp_cmd.c +CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_cmd.c +Auto-merging drivers/staging/media/atomisp/pci/atomisp_internal.h +Auto-merging drivers/staging/media/atomisp/pci/atomisp_ioctl.c +Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c +Resolved 'drivers/staging/media/atomisp/pci/atomisp_cmd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 69585c83dd92] Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/media/st,stm32mp25-video-codec.yaml | 49 + + .../bindings/media/video-interfaces.yaml | 2 +- + Documentation/driver-api/media/drivers/ccs/ccs.rst | 51 +- + Documentation/userspace-api/media/drivers/ccs.rst | 6 +- + arch/arm/boot/dts/ti/omap/omap3-n9.dts | 2 +- + arch/arm64/boot/dts/st/stm32mp251.dtsi | 12 + + arch/arm64/boot/dts/st/stm32mp255.dtsi | 17 + + drivers/media/i2c/Kconfig | 2 + + drivers/media/i2c/alvium-csi2.c | 2 +- + drivers/media/i2c/ar0521.c | 6 +- + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/imx319.c | 53 +- + drivers/media/i2c/imx334.c | 41 +- + drivers/media/i2c/imx355.c | 53 +- + drivers/media/i2c/imx415.c | 672 ++++++---- + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/mt9v032.c | 2 +- + drivers/media/i2c/ov08x40.c | 1307 ++------------------ + drivers/media/i2c/st-vgxy61.c | 388 +++--- + drivers/media/i2c/tc358743.c | 7 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/mc/mc-devnode.c | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 22 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 19 +- + .../media/platform/mediatek/mdp3/mdp_cfg_data.c | 729 ++++++++++- + drivers/media/platform/mediatek/mdp3/mdp_reg_aal.h | 25 + + .../media/platform/mediatek/mdp3/mdp_reg_color.h | 31 + + drivers/media/platform/mediatek/mdp3/mdp_reg_fg.h | 23 + + drivers/media/platform/mediatek/mdp3/mdp_reg_hdr.h | 31 + + .../media/platform/mediatek/mdp3/mdp_reg_merge.h | 25 + + drivers/media/platform/mediatek/mdp3/mdp_reg_ovl.h | 25 + + drivers/media/platform/mediatek/mdp3/mdp_reg_pad.h | 21 + + .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 24 + + drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 2 + + .../media/platform/mediatek/mdp3/mdp_reg_tdshp.h | 34 + + .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 8 + + .../media/platform/mediatek/mdp3/mdp_sm_mt8195.h | 283 +++++ + drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 4 + + .../media/platform/mediatek/mdp3/mtk-mdp3-cfg.h | 2 + + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 438 +++++-- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 1 + + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 895 +++++++++++++- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 93 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 144 ++- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 50 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 15 + + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 18 + + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 1 + + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 1 - + .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 1 - + .../platform/samsung/exynos4-is/fimc-capture.c | 52 +- + .../media/platform/samsung/exynos4-is/fimc-core.c | 23 +- + .../media/platform/samsung/exynos4-is/fimc-core.h | 23 +- + .../platform/samsung/exynos4-is/fimc-isp-video.c | 2 +- + .../platform/samsung/exynos4-is/fimc-lite-reg.c | 13 +- + .../platform/samsung/exynos4-is/fimc-lite-reg.h | 12 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-m2m.c | 23 +- + .../media/platform/samsung/exynos4-is/fimc-reg.c | 38 +- + .../media/platform/samsung/exynos4-is/fimc-reg.h | 10 +- + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 76 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c | 8 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h | 2 +- + .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c | 6 +- + .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +- + .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c | 8 +- + .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +- + .../platform/samsung/s5p-mfc/s5p_mfc_common.h | 14 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c | 26 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.c | 20 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.h | 3 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 12 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.h | 3 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_opr.c | 7 +- + .../platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c | 28 +- + .../platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h | 2 +- + .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c | 36 +- + .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h | 2 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.c | 51 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.h | 8 +- + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 24 + + drivers/media/platform/verisilicon/Kconfig | 14 +- + drivers/media/platform/verisilicon/Makefile | 3 + + drivers/media/platform/verisilicon/hantro_drv.c | 4 + + drivers/media/platform/verisilicon/hantro_hw.h | 2 + + .../media/platform/verisilicon/stm32mp25_vpu_hw.c | 186 +++ + drivers/media/platform/xilinx/Kconfig | 4 +- + drivers/media/v4l2-core/v4l2-cci.c | 4 +- + drivers/media/v4l2-core/v4l2-common.c | 47 + + drivers/media/v4l2-core/v4l2-mc.c | 23 +- + drivers/staging/media/atomisp/TODO | 10 - + drivers/staging/media/atomisp/i2c/gc2235.h | 5 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 141 +-- + .../media/atomisp/pci/atomisp_compat_css20.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 148 +-- + drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 5 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 1 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 8 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 260 ++-- + .../pci/base/circbuf/interface/ia_css_circbuf.h | 2 +- + .../media/atomisp/pci/base/circbuf/src/circbuf.c | 6 +- + .../staging/media/atomisp/pci/ia_css_acc_types.h | 4 +- + drivers/staging/media/atomisp/pci/ia_css_control.h | 29 +- + .../staging/media/atomisp/pci/ia_css_firmware.h | 6 +- + drivers/staging/media/atomisp/pci/ia_css_irq.h | 6 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 4 +- + .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 4 +- + .../atomisp/pci/isp2400_input_system_global.h | 2 +- + .../atomisp/pci/isp2400_input_system_public.h | 2 +- + .../media/atomisp/pci/runtime/binary/src/binary.c | 2 +- + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 2 +- + .../media/atomisp/pci/runtime/queue/src/queue.c | 22 +- + .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 6 +- + drivers/staging/media/atomisp/pci/sh_css.c | 33 +- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 2 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 4 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 3 - + drivers/staging/media/ipu3/ipu3-v4l2.c | 16 +- + include/media/media-entity.h | 4 - + include/media/v4l2-common.h | 25 + + 123 files changed, 4470 insertions(+), 2770 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_aal.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_color.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_fg.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_hdr.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_merge.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ovl.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_pad.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_tdshp.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_sm_mt8195.h + create mode 100644 drivers/media/platform/verisilicon/stm32mp25_vpu_hw.c +Merging pm/linux-next (7cfffced6d0e Merge branch 'pm-sleep' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging kernel/power/swap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++- + arch/x86/Kconfig | 5 +- + drivers/acpi/cppc_acpi.c | 13 ++ + drivers/acpi/nfit/core.c | 5 +- + drivers/acpi/processor_driver.c | 6 + + drivers/base/power/main.c | 269 +++++++++++------------- + drivers/cpufreq/amd-pstate.c | 183 +++++++++++++++- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/gov_fair_share.c | 16 +- + include/acpi/cppc_acpi.h | 5 + + include/linux/amd-pstate.h | 10 + + include/linux/cpufreq.h | 1 + + include/linux/pm.h | 30 +-- + include/linux/suspend.h | 74 ++----- + include/linux/thermal.h | 4 +- + kernel/power/Kconfig | 26 ++- + kernel/power/hibernate.c | 56 ++++- + kernel/power/main.c | 182 ++++++++++------ + kernel/power/power.h | 21 ++ + kernel/power/suspend.c | 8 +- + kernel/power/swap.c | 189 +++++++++++------ + 22 files changed, 768 insertions(+), 401 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (eaffb10b51bf cpufreq: mediatek-hw: Don't error out if supply is not found) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + Documentation/power/opp.rst | 2 +- + Documentation/translations/zh_CN/power/opp.rst | 2 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 ++ + drivers/cpufreq/imx6q-cpufreq.c | 43 +++++++++----------------- + drivers/cpufreq/mediatek-cpufreq-hw.c | 19 +++++++++++- + 5 files changed, 36 insertions(+), 32 deletions(-) +Merging cpupower/cpupower (0086ffec768b 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 +Already up to date. +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 (c8634d885a77 pmdomain: imx8mp-blk-ctrl: imx8mp_blk: Add fdcc clock to hdmimix domain) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 22 ++-- + drivers/pmdomain/core.c | 133 +++++++++++++-------- + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 9 +- + drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 19 +-- + drivers/pmdomain/mediatek/mtk-scpsys.c | 4 +- + drivers/pmdomain/qcom/rpmpd.c | 13 +- + drivers/pmdomain/renesas/Kconfig | 4 + + drivers/pmdomain/renesas/Makefile | 1 + + drivers/pmdomain/renesas/r8a779a0-sysc.c | 12 -- + drivers/pmdomain/renesas/r8a779f0-sysc.c | 12 -- + drivers/pmdomain/renesas/r8a779g0-sysc.c | 12 -- + drivers/pmdomain/renesas/r8a779h0-sysc.c | 54 +++++++++ + drivers/pmdomain/renesas/rcar-gen4-sysc.c | 3 + + drivers/pmdomain/renesas/rcar-gen4-sysc.h | 1 + + drivers/pmdomain/ti/omap_prm.c | 2 + + 15 files changed, 185 insertions(+), 116 deletions(-) + create mode 100644 drivers/pmdomain/renesas/r8a779h0-sysc.c +Merging opp/opp/linux-next (ace4b31b297d cpufreq: Move dev_pm_opp_{init|free}_cpufreq_table() to pm_opp.h) +$ 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 +Auto-merging include/linux/cpufreq.h +Merge made by the 'ort' strategy. + include/linux/cpufreq.h | 20 -------------------- + include/linux/pm_opp.h | 16 ++++++++++++++++ + 2 files changed, 16 insertions(+), 20 deletions(-) +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 (aafe4cc50969 RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Merge made by the 'ort' strategy. + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - + drivers/infiniband/hw/efa/efa.h | 1 + + drivers/infiniband/hw/efa/efa_main.c | 32 ++- + drivers/infiniband/hw/hfi1/tid_rdma.c | 25 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 16 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 95 ++----- + drivers/infiniband/hw/hns/hns_roce_hem.h | 56 +--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 111 ++++---- + drivers/infiniband/hw/hns/hns_roce_mr.c | 341 ++++++++++++++++++------- + drivers/infiniband/hw/irdma/verbs.c | 3 +- + drivers/infiniband/hw/mana/cq.c | 25 +- + drivers/infiniband/hw/mana/main.c | 40 +-- + drivers/infiniband/hw/mana/mana_ib.h | 20 +- + drivers/infiniband/hw/mana/mr.c | 13 +- + drivers/infiniband/hw/mana/qp.c | 88 ++----- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 - + drivers/infiniband/sw/rxe/rxe.c | 6 +- + drivers/infiniband/sw/rxe/rxe.h | 6 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 18 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 8 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 12 +- + drivers/infiniband/sw/rxe/rxe_task.c | 4 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 218 ++++++++-------- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- + 30 files changed, 597 insertions(+), 573 deletions(-) +Merging net-next/main (60b4dfcda647 Merge branch 'nfc-hci-save-a-few-bytes-of-memory-when-registering-a-nfc_llc-engine') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/media/rc/bpf-lirc.c +Auto-merging drivers/net/ethernet/engleder/tsnep_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/common.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/wireless/microchip/wilc1000/netdev.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../bpf/standardization/instruction-set.rst | 80 +- + Documentation/bpf/verifier.rst | 2 +- + Documentation/dev-tools/kselftest.rst | 12 + + Documentation/devicetree/bindings/leds/common.yaml | 12 + + .../devicetree/bindings/leds/leds-bcm63138.yaml | 4 - + .../devicetree/bindings/leds/leds-bcm6328.yaml | 4 - + .../devicetree/bindings/leds/leds-bcm6358.txt | 2 - + .../bindings/leds/leds-pwm-multicolor.yaml | 4 - + .../devicetree/bindings/leds/leds-pwm.yaml | 5 - + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 1 + + .../devicetree/bindings/net/nfc/ti,trf7970a.yaml | 2 +- + .../devicetree/bindings/net/qca,qca808x.yaml | 54 + + .../devicetree/bindings/net/qcom,ipa.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 15 + + .../devicetree/bindings/net/snps,dwmac.yaml | 11 +- + .../bindings/net/starfive,jh7110-dwmac.yaml | 72 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 5 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 5 +- + Documentation/netlink/netlink-raw.yaml | 15 +- + Documentation/netlink/specs/dpll.yaml | 39 + + Documentation/netlink/specs/tc.yaml | 2134 ++++++++++++++++- + Documentation/networking/bonding.rst | 12 + + .../device_drivers/ethernet/amazon/ena.rst | 6 + + Documentation/networking/devlink/mlx5.rst | 4 + + .../userspace-api/netlink/netlink-raw.rst | 42 + + MAINTAINERS | 11 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/x86/net/bpf_jit_comp.c | 5 + + drivers/dpll/dpll_core.c | 2 +- + drivers/dpll/dpll_netlink.c | 9 +- + drivers/media/rc/bpf-lirc.c | 2 +- + drivers/net/arcnet/arcnet.c | 1 + + drivers/net/bonding/bond_3ad.c | 157 +- + drivers/net/bonding/bond_main.c | 1 + + drivers/net/bonding/bond_netlink.c | 16 + + drivers/net/bonding/bond_options.c | 28 +- + drivers/net/dsa/Kconfig | 2 +- + drivers/net/dsa/b53/b53_common.c | 10 +- + drivers/net/dsa/b53/b53_priv.h | 6 +- + drivers/net/dsa/bcm_sf2.c | 2 +- + drivers/net/dsa/microchip/ksz8795.c | 410 ++-- + drivers/net/dsa/microchip/ksz8795_reg.h | 1 + + drivers/net/dsa/microchip/ksz9477_i2c.c | 4 + + drivers/net/dsa/microchip/ksz_common.c | 47 +- + drivers/net/dsa/microchip/ksz_common.h | 1 + + drivers/net/dsa/microchip/ksz_spi.c | 5 + + drivers/net/dsa/mt7530-mdio.c | 7 +- + drivers/net/dsa/mt7530.c | 173 +- + drivers/net/dsa/mt7530.h | 16 +- + drivers/net/dsa/mv88e6xxx/chip.c | 4 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 19 +- + drivers/net/dsa/qca/qca8k-common.c | 4 +- + drivers/net/dsa/qca/qca8k.h | 4 +- + drivers/net/ethernet/amazon/ena/ena_com.c | 323 +-- + drivers/net/ethernet/amazon/ena/ena_com.h | 7 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 49 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 39 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 161 +- + drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 1 + + drivers/net/ethernet/amazon/ena/ena_xdp.c | 1 - + drivers/net/ethernet/amd/pds_core/adminq.c | 10 +- + drivers/net/ethernet/amd/pds_core/core.c | 92 +- + drivers/net/ethernet/amd/pds_core/core.h | 1 + + drivers/net/ethernet/amd/pds_core/debugfs.c | 8 +- + drivers/net/ethernet/amd/pds_core/dev.c | 22 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 12 +- + drivers/net/ethernet/broadcom/asp2/bcmasp.h | 2 +- + .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 14 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 20 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 20 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 32 +- + drivers/net/ethernet/broadcom/tg3.h | 2 +- + drivers/net/ethernet/ec_bhf.c | 1 + + drivers/net/ethernet/engleder/tsnep_main.c | 33 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 4 +- + drivers/net/ethernet/freescale/fec.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 10 +- + drivers/net/ethernet/freescale/gianfar.c | 4 +- + drivers/net/ethernet/google/gve/gve.h | 144 +- + drivers/net/ethernet/google/gve/gve_dqo.h | 18 +- + drivers/net/ethernet/google/gve/gve_main.c | 862 ++++--- + drivers/net/ethernet/google/gve/gve_rx.c | 135 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 91 +- + drivers/net/ethernet/google/gve/gve_tx.c | 128 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 108 +- + drivers/net/ethernet/google/gve/gve_utils.c | 31 + + drivers/net/ethernet/google/gve/gve_utils.h | 5 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 16 +- + drivers/net/ethernet/intel/ice/ice.h | 2 +- + drivers/net/ethernet/intel/ice/ice_base.c | 134 +- + drivers/net/ethernet/intel/ice/ice_base.h | 10 +- + drivers/net/ethernet/intel/ice/ice_debugfs.c | 3 - + drivers/net/ethernet/intel/ice/ice_dpll.c | 2 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 129 -- + drivers/net/ethernet/intel/ice/ice_lib.h | 10 - + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 233 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 34 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 8 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 22 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 28 +- + drivers/net/ethernet/intel/igc/igc.h | 2 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 28 +- + drivers/net/ethernet/marvell/mvneta.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 15 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 621 ++++- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 14 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 21 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 188 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 8 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_sdp.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 32 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 16 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 9 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 1 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 160 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 15 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 11 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 17 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 15 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 8 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 5 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 4 +- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 2 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 86 +- + drivers/net/ethernet/mscc/ocelot.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 32 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 1 + + drivers/net/ethernet/qualcomm/qca_7k.c | 17 +- + drivers/net/ethernet/qualcomm/qca_7k.h | 16 +- + drivers/net/ethernet/qualcomm/qca_7k_common.c | 17 +- + drivers/net/ethernet/qualcomm/qca_7k_common.h | 29 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 21 +- + drivers/net/ethernet/qualcomm/qca_debug.h | 15 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 71 +- + drivers/net/ethernet/qualcomm/qca_spi.h | 22 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 17 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 1 + + drivers/net/ethernet/realtek/r8169.h | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 141 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 7 + + drivers/net/ethernet/renesas/Kconfig | 1 + + drivers/net/ethernet/renesas/ravb.h | 6 +- + drivers/net/ethernet/renesas/ravb_main.c | 756 +++--- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 1 + + drivers/net/ethernet/smsc/smsc911x.c | 1 + + drivers/net/ethernet/smsc/smsc9420.c | 1 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 6 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 32 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 6 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 87 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +- + drivers/net/ethernet/ti/cpsw-common.c | 1 + + drivers/net/ethernet/ti/cpsw_ethtool.c | 4 +- + drivers/net/ethernet/ti/cpsw_priv.h | 4 +- + drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 - + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 20 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 - + drivers/net/ethernet/wangxun/txgbe/Makefile | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 269 +++ + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h | 7 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 140 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 59 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h | 2 + + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 17 + + drivers/net/ipa/ipa_modem.c | 96 +- + drivers/net/ipa/ipa_power.c | 71 - + drivers/net/ipa/ipa_power.h | 18 - + drivers/net/mdio/mdio-ipq4019.c | 109 +- + drivers/net/pcs/pcs-lynx.c | 1 + + drivers/net/pcs/pcs-mtk-lynxi.c | 1 + + drivers/net/pcs/pcs-xpcs.c | 1 + + drivers/net/phy/Kconfig | 7 +- + drivers/net/phy/Makefile | 2 +- + drivers/net/phy/adin1100.c | 55 + + drivers/net/phy/at803x.c | 2432 -------------------- + drivers/net/phy/dp83867.c | 22 + + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/micrel.c | 71 +- + drivers/net/phy/phy-c45.c | 44 +- + drivers/net/phy/phy.c | 11 +- + drivers/net/phy/phy_device.c | 33 +- + drivers/net/phy/phylink.c | 8 +- + drivers/net/phy/qcom/Kconfig | 22 + + drivers/net/phy/qcom/Makefile | 5 + + drivers/net/phy/qcom/at803x.c | 1140 +++++++++ + drivers/net/phy/qcom/qca808x.c | 944 ++++++++ + drivers/net/phy/qcom/qca83xx.c | 275 +++ + drivers/net/phy/qcom/qcom-phy-lib.c | 429 ++++ + drivers/net/phy/qcom/qcom.h | 120 + + drivers/net/phy/realtek.c | 10 + + drivers/net/phy/xilinx_gmii2rgmii.c | 2 +- + drivers/net/tun.c | 17 +- + drivers/net/usb/ax88179_178a.c | 20 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/r8152.c | 28 +- + drivers/net/wireless/broadcom/b43/b43.h | 16 + + drivers/net/wireless/broadcom/b43/dma.c | 4 +- + drivers/net/wireless/broadcom/b43/main.c | 16 +- + drivers/net/wireless/broadcom/b43/pio.c | 6 +- + .../broadcom/brcm80211/brcmfmac/bca/core.c | 30 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 64 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 18 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +- + .../broadcom/brcm80211/brcmfmac/cyw/core.c | 50 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 154 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 60 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 116 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 125 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwvid.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwvid.h | 48 +- + .../broadcom/brcm80211/brcmfmac/wcc/core.c | 31 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 3 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_int.h | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 11 +- + drivers/net/wireless/intel/iwlegacy/common.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 3 - + drivers/net/wireless/marvell/mwifiex/wmm.c | 2 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 12 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 40 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 12 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 35 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 6 + + drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c | 5 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 20 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 33 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 409 +++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 15 + + drivers/net/wireless/realtek/rtlwifi/efuse.c | 36 +- + drivers/net/wireless/realtek/rtlwifi/efuse.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 164 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 38 +- + drivers/net/wireless/realtek/rtw88/debug.c | 44 +- + drivers/net/wireless/realtek/rtw88/pci.c | 4 + + drivers/net/wireless/realtek/rtw88/reg.h | 3 + + drivers/net/wireless/realtek/rtw89/cam.c | 61 + + drivers/net/wireless/realtek/rtw89/cam.h | 109 + + drivers/net/wireless/realtek/rtw89/chan.c | 2 +- + drivers/net/wireless/realtek/rtw89/core.c | 344 ++- + drivers/net/wireless/realtek/rtw89/core.h | 136 +- + drivers/net/wireless/realtek/rtw89/fw.c | 944 +++++++- + drivers/net/wireless/realtek/rtw89/fw.h | 810 ++++--- + drivers/net/wireless/realtek/rtw89/mac.c | 96 +- + drivers/net/wireless/realtek/rtw89/mac.h | 5 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 18 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 4 +- + drivers/net/wireless/realtek/rtw89/pci.c | 69 +- + drivers/net/wireless/realtek/rtw89/pci.h | 1 + + drivers/net/wireless/realtek/rtw89/phy.c | 46 +- + drivers/net/wireless/realtek/rtw89/phy.h | 72 + + drivers/net/wireless/realtek/rtw89/phy_be.c | 312 +++ + drivers/net/wireless/realtek/rtw89/reg.h | 278 ++- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 15 +- + .../net/wireless/realtek/rtw89/rtw8851b_table.c | 72 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 11 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 15 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 142 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 14 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 705 +++++- + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- + drivers/ptp/Kconfig | 12 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_clock.c | 16 +- + drivers/ptp/ptp_fc3.c | 1016 ++++++++ + drivers/ptp/ptp_fc3.h | 45 + + drivers/ptp/ptp_ocp.c | 9 +- + drivers/ptp/ptp_sysfs.c | 13 +- + include/linux/bitmap.h | 12 + + include/linux/bpf.h | 142 +- + include/linux/bpf_verifier.h | 3 +- + include/linux/btf.h | 13 + + include/linux/cpumask.h | 16 + + include/linux/dpll.h | 1 + + include/linux/ethtool.h | 17 +- + include/linux/filter.h | 3 +- + include/linux/if_tun.h | 16 +- + include/linux/inet_diag.h | 1 + + include/linux/lsm_hook_defs.h | 15 +- + include/linux/mfd/idtRC38xxx_reg.h | 273 +++ + include/linux/mlx5/mlx5_ifc.h | 8 + + include/linux/phy.h | 32 +- + include/linux/phylink.h | 4 +- + include/linux/platform_data/microchip-ksz.h | 1 + + include/linux/ptp_clock_kernel.h | 3 + + include/linux/rtnetlink.h | 1 + + include/linux/security.h | 43 +- + include/linux/sock_diag.h | 10 +- + include/linux/stmmac.h | 1 + + include/net/act_api.h | 2 + + include/net/af_unix.h | 22 +- + include/net/bond_3ad.h | 2 + + include/net/bond_options.h | 1 + + include/net/bonding.h | 23 + + include/net/dsa.h | 4 +- + include/net/dst.h | 1 - + include/net/ip6_fib.h | 6 - + include/net/net_namespace.h | 2 - + include/net/netfilter/nf_tables.h | 6 + + include/net/pkt_cls.h | 2 + + include/net/pkt_sched.h | 2 + + include/net/request_sock.h | 39 + + include/net/scm.h | 1 + + include/net/sctp/structs.h | 5 +- + include/net/sock.h | 25 - + include/net/tcp.h | 45 + + include/uapi/linux/bpf.h | 78 +- + include/uapi/linux/dpll.h | 30 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 6 +- + include/uapi/linux/ptp_clock.h | 13 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 2 +- + kernel/bpf/bpf_lsm.c | 15 +- + kernel/bpf/bpf_struct_ops.c | 447 ++-- + kernel/bpf/bpf_struct_ops_types.h | 12 - + kernel/bpf/btf.c | 276 ++- + kernel/bpf/cgroup.c | 6 +- + kernel/bpf/core.c | 13 +- + kernel/bpf/helpers.c | 7 +- + kernel/bpf/inode.c | 276 ++- + kernel/bpf/syscall.c | 234 +- + kernel/bpf/token.c | 278 +++ + kernel/bpf/verifier.c | 148 +- + kernel/trace/bpf_trace.c | 17 +- + lib/bitmap.c | 7 + + lib/test_blackhole_dev.c | 3 +- + net/Makefile | 2 +- + net/batman-adv/distributed-arp-table.c | 3 +- + net/batman-adv/main.c | 14 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 1 - + net/bpf/bpf_dummy_struct_ops.c | 22 +- + net/bridge/br_fdb.c | 5 +- + net/bridge/netfilter/Kconfig | 7 + + net/bridge/netfilter/Makefile | 2 +- + net/core/dev.c | 39 +- + net/core/dev.h | 1 + + net/core/dst.c | 6 +- + net/core/filter.c | 155 +- + net/core/rtnetlink.c | 11 +- + net/core/scm.c | 5 + + net/core/sock.c | 14 +- + net/core/sock_diag.c | 120 +- + net/core/xdp.c | 6 +- + net/dccp/ackvec.c | 8 +- + net/dccp/diag.c | 1 + + net/dsa/user.c | 12 +- + net/ethtool/common.c | 5 + + net/ethtool/common.h | 1 + + net/ethtool/eee.c | 75 +- + net/ethtool/ioctl.c | 69 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ieee802154/socket.c | 1 + + net/ipv4/bpf_tcp_ca.c | 22 +- + net/ipv4/inet_diag.c | 101 +- + net/ipv4/inetpeer.c | 5 +- + net/ipv4/netfilter/Kconfig | 43 +- + net/ipv4/netfilter/Makefile | 2 +- + net/ipv4/raw_diag.c | 1 + + net/ipv4/syncookies.c | 40 +- + net/ipv4/tcp_diag.c | 1 + + net/ipv4/tcp_input.c | 18 +- + net/ipv4/udp_diag.c | 2 + + net/ipv6/addrconf.c | 3 +- + net/ipv6/ip6_fib.c | 19 +- + net/ipv6/netfilter/Kconfig | 20 +- + net/ipv6/netfilter/Makefile | 2 +- + net/ipv6/route.c | 8 +- + net/ipv6/syncookies.c | 13 +- + net/mptcp/mptcp_diag.c | 1 + + net/mptcp/options.c | 20 +- + net/mptcp/pm.c | 2 +- + net/mptcp/pm_netlink.c | 10 +- + net/mptcp/protocol.c | 52 +- + net/mptcp/protocol.h | 8 +- + net/mptcp/sockopt.c | 2 +- + net/mptcp/subflow.c | 10 +- + net/netfilter/Kconfig | 12 +- + net/netfilter/ipvs/ip_vs_conn.c | 4 +- + net/netfilter/nf_bpf_link.c | 2 +- + net/netfilter/nf_conncount.c | 8 +- + net/netfilter/nf_tables_api.c | 35 +- + net/netlink/diag.c | 1 + + net/nfc/hci/llc.c | 20 +- + net/packet/diag.c | 1 + + net/rds/connection.c | 4 +- + net/sched/act_api.c | 2 +- + net/sched/act_bpf.c | 1 + + net/sched/act_connmark.c | 1 + + net/sched/act_csum.c | 1 + + net/sched/act_ct.c | 1 + + net/sched/act_ctinfo.c | 1 + + net/sched/act_gact.c | 1 + + net/sched/act_gate.c | 1 + + net/sched/act_ife.c | 1 + + net/sched/act_mirred.c | 1 + + net/sched/act_mpls.c | 1 + + net/sched/act_nat.c | 1 + + net/sched/act_pedit.c | 1 + + net/sched/act_police.c | 1 + + net/sched/act_sample.c | 1 + + net/sched/act_simple.c | 1 + + net/sched/act_skbedit.c | 1 + + net/sched/act_skbmod.c | 1 + + net/sched/act_tunnel_key.c | 1 + + net/sched/act_vlan.c | 1 + + net/sched/cls_api.c | 2 +- + net/sched/cls_basic.c | 1 + + net/sched/cls_bpf.c | 1 + + net/sched/cls_cgroup.c | 1 + + net/sched/cls_flow.c | 1 + + net/sched/cls_flower.c | 1 + + net/sched/cls_fw.c | 1 + + net/sched/cls_matchall.c | 1 + + net/sched/cls_route.c | 1 + + net/sched/cls_u32.c | 1 + + net/sched/sch_api.c | 4 +- + net/sched/sch_cake.c | 1 + + net/sched/sch_cbs.c | 1 + + net/sched/sch_choke.c | 1 + + net/sched/sch_codel.c | 1 + + net/sched/sch_drr.c | 1 + + net/sched/sch_etf.c | 1 + + net/sched/sch_ets.c | 1 + + net/sched/sch_fq.c | 1 + + net/sched/sch_fq_codel.c | 1 + + net/sched/sch_gred.c | 1 + + net/sched/sch_hfsc.c | 1 + + net/sched/sch_hhf.c | 1 + + net/sched/sch_htb.c | 1 + + net/sched/sch_ingress.c | 3 +- + net/sched/sch_mqprio.c | 1 + + net/sched/sch_multiq.c | 1 + + net/sched/sch_netem.c | 1 + + net/sched/sch_pie.c | 1 + + net/sched/sch_plug.c | 1 + + net/sched/sch_prio.c | 1 + + net/sched/sch_qfq.c | 1 + + net/sched/sch_red.c | 1 + + net/sched/sch_sfb.c | 1 + + net/sched/sch_sfq.c | 1 + + net/sched/sch_skbprio.c | 1 + + net/sched/sch_taprio.c | 73 +- + net/sched/sch_tbf.c | 1 + + net/sctp/diag.c | 1 + + net/sctp/protocol.c | 10 +- + net/smc/smc_diag.c | 1 + + net/tipc/Makefile | 4 +- + net/tipc/diag.c | 1 + + net/tipc/node.c | 2 - + net/tipc/socket.c | 1 - + net/unix/Kconfig | 5 - + net/unix/Makefile | 2 - + net/unix/af_unix.c | 73 +- + net/unix/diag.c | 1 + + net/unix/garbage.c | 200 +- + net/unix/scm.c | 159 -- + net/unix/scm.h | 10 - + net/vmw_vsock/diag.c | 1 + + net/xdp/xsk_diag.c | 1 + + rust/kernel/net/phy.rs | 24 +- + security/security.c | 101 +- + security/selinux/hooks.c | 47 +- + tools/bpf/bpftool/link.c | 96 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/include/uapi/linux/bpf.h | 79 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 42 +- + tools/lib/bpf/bpf.h | 38 +- + tools/lib/bpf/bpf_core_read.h | 2 +- + tools/lib/bpf/btf.c | 10 +- + tools/lib/bpf/elf.c | 2 - + tools/lib/bpf/features.c | 503 ++++ + tools/lib/bpf/libbpf.c | 604 ++--- + tools/lib/bpf/libbpf.h | 21 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 50 +- + tools/lib/bpf/libbpf_probes.c | 12 +- + tools/lib/bpf/str_error.h | 3 + + tools/net/ynl/Makefile.deps | 2 + + tools/net/ynl/cli.py | 22 +- + tools/net/ynl/generated/Makefile | 5 +- + tools/net/ynl/lib/nlspec.py | 2 + + tools/net/ynl/lib/ynl.py | 200 +- + tools/net/ynl/samples/.gitignore | 1 + + tools/net/ynl/samples/ovs.c | 60 + + tools/net/ynl/ynl-gen-rst.py | 9 +- + tools/testing/selftests/Makefile | 7 +- + tools/testing/selftests/bpf/README.rst | 32 +- + tools/testing/selftests/bpf/bpf_experimental.h | 21 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 10 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 75 + + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 + + tools/testing/selftests/bpf/config | 1 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 44 - + .../selftests/bpf/prog_tests/fill_link_info.c | 114 +- + .../selftests/bpf/prog_tests/kptr_xchg_inline.c | 51 + + .../selftests/bpf/prog_tests/libbpf_probes.c | 4 + + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 6 + + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 90 +- + .../bpf/prog_tests/tcp_custom_syncookie.c | 150 ++ + .../bpf/prog_tests/test_struct_ops_module.c | 75 + + tools/testing/selftests/bpf/prog_tests/token.c | 1052 +++++++++ + tools/testing/selftests/bpf/prog_tests/xdpwall.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 2 +- + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 16 + + tools/testing/selftests/bpf/progs/iters.c | 4 +- + .../testing/selftests/bpf/progs/kptr_xchg_inline.c | 48 + + tools/testing/selftests/bpf/progs/priv_map.c | 13 + + tools/testing/selftests/bpf/progs/priv_prog.c | 13 + + .../selftests/bpf/progs/struct_ops_module.c | 30 + + .../selftests/bpf/progs/test_core_reloc_type_id.c | 2 +- + .../selftests/bpf/progs/test_fill_link_info.c | 6 + + .../testing/selftests/bpf/progs/test_map_in_map.c | 26 + + tools/testing/selftests/bpf/progs/test_siphash.h | 64 + + .../bpf/progs/test_tcp_custom_syncookie.c | 572 +++++ + .../bpf/progs/test_tcp_custom_syncookie.h | 140 ++ + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 10 +- + tools/testing/selftests/bpf/progs/token_lsm.c | 32 + + .../bpf/progs/verifier_direct_packet_access.c | 2 +- + .../testing/selftests/bpf/progs/verifier_loops1.c | 24 + + .../selftests/bpf/progs/verifier_spill_fill.c | 229 +- + tools/testing/selftests/bpf/test_loader.c | 4 +- + tools/testing/selftests/bpf/test_maps.c | 6 +- + tools/testing/selftests/bpf/test_progs.c | 18 - + tools/testing/selftests/bpf/test_sock_addr.c | 3 +- + tools/testing/selftests/bpf/test_verifier.c | 60 +- + tools/testing/selftests/bpf/testing_helpers.c | 92 +- + tools/testing/selftests/bpf/testing_helpers.h | 8 + + .../selftests/bpf/verifier/bpf_loop_inline.c | 6 + + tools/testing/selftests/bpf/verifier/precise.c | 6 +- + .../testing/selftests/drivers/net/bonding/Makefile | 7 +- + .../drivers/net/bonding/bond-eth-type-change.sh | 2 +- + .../drivers/net/bonding/bond_topo_2d1c.sh | 2 +- + .../drivers/net/bonding/dev_addr_lists.sh | 2 +- + .../drivers/net/bonding/mode-1-recovery-updelay.sh | 2 +- + .../drivers/net/bonding/mode-2-recovery-updelay.sh | 2 +- + .../drivers/net/bonding/net_forwarding_lib.sh | 1 - + tools/testing/selftests/drivers/net/dsa/Makefile | 18 +- + .../drivers/net/dsa/bridge_locked_port.sh | 2 +- + .../selftests/drivers/net/dsa/bridge_mdb.sh | 2 +- + .../selftests/drivers/net/dsa/bridge_mld.sh | 2 +- + .../selftests/drivers/net/dsa/bridge_vlan_aware.sh | 2 +- + .../selftests/drivers/net/dsa/bridge_vlan_mcast.sh | 2 +- + .../drivers/net/dsa/bridge_vlan_unaware.sh | 2 +- + tools/testing/selftests/drivers/net/dsa/lib.sh | 1 - + .../selftests/drivers/net/dsa/local_termination.sh | 2 +- + .../selftests/drivers/net/dsa/no_forwarding.sh | 2 +- + .../drivers/net/dsa/run_net_forwarding_test.sh | 9 + + .../selftests/drivers/net/dsa/tc_actions.sh | 2 +- + .../testing/selftests/drivers/net/dsa/tc_common.sh | 1 - + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 2 +- + .../selftests/drivers/net/netdevsim/Makefile | 17 + + .../drivers/net/netdevsim/udp_tunnel_nic.sh | 40 +- + tools/testing/selftests/drivers/net/team/Makefile | 7 +- + .../selftests/drivers/net/team/dev_addr_lists.sh | 4 +- + .../testing/selftests/drivers/net/team/lag_lib.sh | 1 - + .../drivers/net/team/net_forwarding_lib.sh | 1 - + tools/testing/selftests/lib.mk | 19 + + tools/testing/selftests/net/fcnal-test.sh | 34 +- + tools/testing/selftests/net/forwarding/Makefile | 3 + + tools/testing/selftests/net/forwarding/config | 28 + + tools/testing/selftests/net/forwarding/lib.sh | 37 +- + .../selftests/net/forwarding/mirror_gre_lib.sh | 2 +- + .../net/forwarding/mirror_gre_topo_lib.sh | 2 +- + tools/testing/selftests/net/fq_band_pktlimit.sh | 14 +- + .../selftests/net/openvswitch/openvswitch.sh | 62 + + tools/testing/selftests/net/so_txtime.c | 7 +- + tools/testing/selftests/net/txtimestamp.sh | 12 +- + tools/testing/selftests/tc-testing/config | 1 + + .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 2 +- + .../tc-testing/tc-tests/qdiscs/taprio.json | 2 + + tools/testing/selftests/tc-testing/tdc.py | 2 +- + tools/testing/selftests/tc-testing/tdc.sh | 3 +- + tools/testing/vsock/util.c | 17 +- + tools/testing/vsock/util.h | 4 + + tools/testing/vsock/vsock_diag_test.c | 23 +- + tools/testing/vsock/vsock_test.c | 102 +- + tools/testing/vsock/vsock_test_zerocopy.c | 12 +- + tools/testing/vsock/vsock_uring_test.c | 17 +- + 622 files changed, 23754 insertions(+), 9184 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qca,qca808x.yaml + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h + delete mode 100644 drivers/net/phy/at803x.c + create mode 100644 drivers/net/phy/qcom/Kconfig + create mode 100644 drivers/net/phy/qcom/Makefile + create mode 100644 drivers/net/phy/qcom/at803x.c + create mode 100644 drivers/net/phy/qcom/qca808x.c + create mode 100644 drivers/net/phy/qcom/qca83xx.c + create mode 100644 drivers/net/phy/qcom/qcom-phy-lib.c + create mode 100644 drivers/net/phy/qcom/qcom.h + create mode 100644 drivers/ptp/ptp_fc3.c + create mode 100644 drivers/ptp/ptp_fc3.h + create mode 100644 include/linux/mfd/idtRC38xxx_reg.h + delete mode 100644 kernel/bpf/bpf_struct_ops_types.h + create mode 100644 kernel/bpf/token.c + delete mode 100644 net/unix/scm.c + delete mode 100644 net/unix/scm.h + create mode 100644 tools/lib/bpf/features.c + create mode 100644 tools/net/ynl/samples/ovs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kptr_xchg_inline.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/token.c + create mode 100644 tools/testing/selftests/bpf/progs/kptr_xchg_inline.c + create mode 100644 tools/testing/selftests/bpf/progs/priv_map.c + create mode 100644 tools/testing/selftests/bpf/progs/priv_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_module.c + create mode 100644 tools/testing/selftests/bpf/progs/test_siphash.h + create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.h + create mode 100644 tools/testing/selftests/bpf/progs/token_lsm.c + delete mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh + delete mode 120000 tools/testing/selftests/drivers/net/dsa/lib.sh + create mode 100755 tools/testing/selftests/drivers/net/dsa/run_net_forwarding_test.sh + delete mode 120000 tools/testing/selftests/drivers/net/dsa/tc_common.sh + create mode 100644 tools/testing/selftests/drivers/net/netdevsim/Makefile + delete mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh + delete mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh +Merging bpf-next/for-next (92a871ab9fa5 libbpf: Use OPTS_SET() macro in bpf_xdp_query()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging drivers/hid/bpf/hid_bpf_dispatch.c +Auto-merging net/core/xdp.c +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 8 +- + .../bpf/standardization/instruction-set.rst | 72 +++-- + Documentation/networking/af_xdp.rst | 31 +- + arch/riscv/net/bpf_jit.h | 134 +++++++++ + arch/riscv/net/bpf_jit_comp64.c | 215 +++++--------- + drivers/hid/bpf/hid_bpf_dispatch.c | 8 +- + fs/verity/measure.c | 4 +- + include/linux/bpf.h | 1 - + include/linux/bpf_verifier.h | 10 + + include/linux/btf_ids.h | 21 +- + kernel/bpf/bpf_lsm.c | 6 +- + kernel/bpf/bpf_struct_ops.c | 21 +- + kernel/bpf/btf.c | 144 +++++++-- + kernel/bpf/cpumask.c | 4 +- + kernel/bpf/helpers.c | 8 +- + kernel/bpf/map_iter.c | 4 +- + kernel/bpf/token.c | 16 +- + kernel/bpf/verifier.c | 142 +++++++-- + kernel/cgroup/rstat.c | 4 +- + kernel/events/core.c | 6 +- + kernel/trace/bpf_trace.c | 8 +- + net/bpf/test_run.c | 8 +- + net/core/filter.c | 20 +- + net/core/xdp.c | 4 +- + net/ipv4/bpf_tcp_ca.c | 4 +- + net/ipv4/fou_bpf.c | 4 +- + net/ipv4/tcp_bbr.c | 4 +- + net/ipv4/tcp_cubic.c | 4 +- + net/ipv4/tcp_dctcp.c | 4 +- + net/netfilter/nf_conntrack_bpf.c | 4 +- + net/netfilter/nf_nat_bpf.c | 4 +- + net/xdp/xsk.c | 5 +- + net/xfrm/xfrm_interface_bpf.c | 4 +- + net/xfrm/xfrm_state_bpf.c | 4 +- + scripts/bpf_doc.py | 2 +- + tools/bpf/bpftool/gen.c | 9 +- + tools/lib/bpf/bpf.h | 2 +- + tools/lib/bpf/bpf_core_read.h | 13 + + tools/lib/bpf/bpf_helpers.h | 2 + + tools/lib/bpf/btf.c | 33 ++- + tools/lib/bpf/features.c | 58 ++++ + tools/lib/bpf/libbpf.c | 99 ++----- + tools/lib/bpf/libbpf.map | 5 +- + tools/lib/bpf/libbpf_internal.h | 16 + + tools/lib/bpf/linker.c | 2 +- + tools/lib/bpf/netlink.c | 4 +- + tools/testing/selftests/bpf/Makefile | 31 +- + tools/testing/selftests/bpf/bench.c | 12 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 20 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 16 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 2 +- + .../selftests/bpf/prog_tests/decap_sanity.c | 2 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 2 +- + .../selftests/bpf/prog_tests/ip_check_defrag.c | 4 +- + .../selftests/bpf/prog_tests/kptr_xchg_inline.c | 3 +- + .../testing/selftests/bpf/prog_tests/lwt_helpers.h | 2 - + .../selftests/bpf/prog_tests/lwt_redirect.c | 4 +- + .../testing/selftests/bpf/prog_tests/lwt_reroute.c | 3 +- + tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- + .../selftests/bpf/prog_tests/rcu_read_lock.c | 6 + + .../selftests/bpf/prog_tests/sock_destroy.c | 2 +- + .../selftests/bpf/prog_tests/sock_iter_batch.c | 4 +- + tools/testing/selftests/bpf/prog_tests/spin_lock.c | 2 + + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 18 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/progs/connect_unix_prog.c | 3 +- + .../selftests/bpf/progs/getpeername_unix_prog.c | 3 +- + .../selftests/bpf/progs/getsockname_unix_prog.c | 3 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 120 ++++++++ + .../selftests/bpf/progs/recvmsg_unix_prog.c | 3 +- + .../selftests/bpf/progs/sendmsg_unix_prog.c | 3 +- + .../selftests/bpf/progs/sk_storage_omem_uncharge.c | 4 +- + .../testing/selftests/bpf/progs/sock_iter_batch.c | 4 +- + .../selftests/bpf/progs/struct_ops_module.c | 3 +- + .../selftests/bpf/progs/test_cls_redirect.c | 2 + + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 2 + + .../selftests/bpf/progs/test_ptr_untrusted.c | 6 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 65 +++++ + .../selftests/bpf/progs/test_spin_lock_fail.c | 44 +++ + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 2 + + tools/testing/selftests/bpf/progs/type_cast.c | 13 +- + .../selftests/bpf/progs/verifier_global_ptr_args.c | 182 ++++++++++++ + .../selftests/bpf/progs/verifier_spill_fill.c | 324 ++++++++++++++++++++- + .../selftests/bpf/progs/verifier_spin_lock.c | 2 +- + tools/testing/selftests/bpf/test_progs.h | 7 +- + tools/testing/selftests/bpf/trace_helpers.c | 2 +- + 86 files changed, 1621 insertions(+), 498 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c +Merging ipsec-next/master (ab1e1a38de24 xfrm6_tunnel: Use KMEM_CACHE instead of kmem_cache_create) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + net/ipv6/xfrm6_tunnel.c | 5 +- + net/xfrm/xfrm_policy.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 141 insertions(+), 6 deletions(-) +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 (5264ab612e28 selftests/net: calibrate txtimestamp) +$ 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 (5264ab612e28 selftests/net: calibrate txtimestamp) +$ 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 (a93e9d51834e Bluetooth: qca: Fix triggering coredump implementation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 2 +- + drivers/bluetooth/btnxpuart.c | 24 +- + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 14 + + drivers/bluetooth/btusb.c | 8 + + drivers/bluetooth/hci_bcm4377.c | 3 +- + drivers/bluetooth/hci_qca.c | 22 +- + include/net/bluetooth/hci.h | 5 +- + include/net/bluetooth/hci_sync.h | 2 +- + include/net/bluetooth/l2cap.h | 42 -- + net/bluetooth/Kconfig | 8 - + net/bluetooth/Makefile | 1 - + net/bluetooth/a2mp.c | 1054 ------------------------------------- + net/bluetooth/a2mp.h | 154 ------ + net/bluetooth/amp.c | 590 --------------------- + net/bluetooth/amp.h | 60 --- + net/bluetooth/hci_conn.c | 4 - + net/bluetooth/hci_core.c | 135 +++-- + net/bluetooth/hci_event.c | 46 +- + net/bluetooth/hci_request.c | 2 +- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/hci_sync.c | 57 +- + net/bluetooth/l2cap_core.c | 1077 +------------------------------------- + net/bluetooth/l2cap_sock.c | 18 +- + net/bluetooth/mgmt.c | 113 +--- + net/bluetooth/rfcomm/core.c | 2 +- + 26 files changed, 280 insertions(+), 3169 deletions(-) + delete mode 100644 net/bluetooth/a2mp.c + delete mode 100644 net/bluetooth/a2mp.h + delete mode 100644 net/bluetooth/amp.c + delete mode 100644 net/bluetooth/amp.h +Merging wireless-next/for-next (94dd7ce1885e wifi: rtl8xxxu: update rate mask per sta) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +Auto-merging drivers/net/wireless/microchip/wilc1000/spi.c +Auto-merging drivers/net/wireless/ti/wlcore/sdio.c +Auto-merging include/net/cfg80211.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/scan.c +Auto-merging net/wireless/scan.c +Merge made by the 'ort' strategy. + drivers/bcma/main.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 4 +- + drivers/net/wireless/ath/ath10k/coredump.h | 8 +- + drivers/net/wireless/ath/ath10k/htt.c | 3 +- + drivers/net/wireless/ath/ath10k/htt.h | 12 +- + drivers/net/wireless/ath/ath10k/mac.c | 6 +- + drivers/net/wireless/ath/ath10k/pci.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 11 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 4 +- + drivers/net/wireless/ath/ath10k/wmi.c | 22 +- + drivers/net/wireless/ath/ath10k/wmi.h | 62 +- + drivers/net/wireless/ath/ath11k/core.h | 41 + + drivers/net/wireless/ath/ath11k/dp.c | 20 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 6 +- + drivers/net/wireless/ath/ath11k/hal.c | 19 +- + drivers/net/wireless/ath/ath11k/hal.h | 3 +- + drivers/net/wireless/ath/ath11k/hal_rx.c | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 1086 +++++++++++++++----- + drivers/net/wireless/ath/ath11k/mac.h | 5 +- + drivers/net/wireless/ath/ath11k/mhi.c | 4 +- + drivers/net/wireless/ath/ath11k/pci.c | 19 +- + drivers/net/wireless/ath/ath11k/pci.h | 3 +- + drivers/net/wireless/ath/ath11k/reg.c | 267 ++++- + drivers/net/wireless/ath/ath11k/reg.h | 11 +- + drivers/net/wireless/ath/ath11k/testmode.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 293 +++--- + drivers/net/wireless/ath/ath11k/wmi.h | 65 +- + drivers/net/wireless/ath/ath12k/core.c | 217 +++- + drivers/net/wireless/ath/ath12k/core.h | 57 +- + drivers/net/wireless/ath/ath12k/dp.h | 3 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 4 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 8 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 10 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 20 +- + drivers/net/wireless/ath/ath12k/hal_rx.c | 15 +- + drivers/net/wireless/ath/ath12k/hw.c | 9 + + drivers/net/wireless/ath/ath12k/hw.h | 23 +- + drivers/net/wireless/ath/ath12k/mac.c | 860 +++++++++++----- + drivers/net/wireless/ath/ath12k/mac.h | 4 +- + drivers/net/wireless/ath/ath12k/pci.c | 10 + + drivers/net/wireless/ath/ath12k/qmi.c | 377 +++++-- + drivers/net/wireless/ath/ath12k/qmi.h | 34 +- + drivers/net/wireless/ath/ath12k/reg.c | 13 +- + drivers/net/wireless/ath/ath12k/trace.h | 29 +- + drivers/net/wireless/ath/ath12k/wmi.c | 95 +- + drivers/net/wireless/ath/ath9k/ahb.c | 6 +- + drivers/net/wireless/ath/ath9k/antenna.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 9 - + drivers/net/wireless/ath/ath9k/reg_aic.h | 4 - + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 - + drivers/net/wireless/intel/iwlwifi/Kconfig | 9 + + drivers/net/wireless/intel/iwlwifi/Makefile | 3 + + drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 7 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 616 +++-------- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 220 +--- + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 1 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 23 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 28 +- + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 4 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 43 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 489 +++++++++ + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 192 ++++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 422 ++++++-- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 200 +++- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 14 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 57 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 10 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 40 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 129 +++ + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 90 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 9 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 330 +++--- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 138 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 18 + + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 145 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 54 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 74 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 90 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 20 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 + + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 7 +- + drivers/net/wireless/intel/iwlwifi/tests/Makefile | 7 + + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 54 + + drivers/net/wireless/intel/iwlwifi/tests/module.c | 10 + + drivers/net/wireless/marvell/libertas/cmd.c | 13 +- + drivers/net/wireless/marvell/mwifiex/main.h | 2 - + drivers/net/wireless/microchip/wilc1000/spi.c | 4 - + drivers/net/wireless/purelifi/plfxlc/mac.c | 1 - + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 8 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 203 +++- + drivers/net/wireless/realtek/rtw89/coex.h | 1 + + drivers/net/wireless/realtek/rtw89/core.c | 2 + + drivers/net/wireless/realtek/rtw89/core.h | 105 +- + drivers/net/wireless/realtek/rtw89/efuse.h | 1 + + drivers/net/wireless/realtek/rtw89/efuse_be.c | 142 +++ + drivers/net/wireless/realtek/rtw89/fw.c | 1068 ++++++++++++++++++- + drivers/net/wireless/realtek/rtw89/fw.h | 382 ++++++- + drivers/net/wireless/realtek/rtw89/mac.c | 47 +- + drivers/net/wireless/realtek/rtw89/mac.h | 23 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 100 ++ + drivers/net/wireless/realtek/rtw89/pci.c | 67 +- + drivers/net/wireless/realtek/rtw89/pci.h | 6 +- + drivers/net/wireless/realtek/rtw89/pci_be.c | 5 + + drivers/net/wireless/realtek/rtw89/phy.c | 900 ++++++++++++++++ + drivers/net/wireless/realtek/rtw89/phy.h | 34 + + drivers/net/wireless/realtek/rtw89/ps.c | 10 +- + drivers/net/wireless/realtek/rtw89/reg.h | 98 ++ + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 426 ++++++++ + drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 235 +++++ + drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h | 13 + + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 1 + + drivers/net/wireless/rsi/rsi_91x_usb.c | 12 +- + drivers/net/wireless/silabs/wfx/sta.c | 15 +- + drivers/net/wireless/st/cw1200/cw1200_sdio.c | 42 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 79 +- + drivers/net/wireless/ti/wlcore/sdio.c | 1 - + drivers/net/wireless/virtual/mac80211_hwsim.c | 89 +- + drivers/net/wireless/zydas/zd1211rw/zd_def.h | 2 +- + drivers/ssb/main.c | 2 +- + include/linux/ieee80211.h | 89 ++ + include/linux/platform_data/brcmfmac.h | 2 +- + include/linux/platform_data/net-cw1200.h | 4 - + include/net/cfg80211.h | 10 +- + include/net/mac80211.h | 58 +- + include/uapi/linux/nl80211.h | 30 +- + net/mac80211/cfg.c | 27 +- + net/mac80211/driver-ops.h | 19 + + net/mac80211/ht.c | 4 +- + net/mac80211/ieee80211_i.h | 11 + + net/mac80211/iface.c | 16 + + net/mac80211/key.c | 4 + + net/mac80211/link.c | 6 + + net/mac80211/main.c | 26 +- + net/mac80211/mlme.c | 576 +++++++++-- + net/mac80211/rx.c | 22 + + net/mac80211/scan.c | 10 +- + net/mac80211/trace.h | 82 +- + net/mac80211/util.c | 21 +- + net/mac80211/wpa.c | 33 +- + net/wireless/core.h | 47 +- + net/wireless/mlme.c | 146 ++- + net/wireless/nl80211.c | 102 +- + net/wireless/scan.c | 184 +++- + net/wireless/sme.c | 3 +- + net/wireless/tests/scan.c | 277 ++++- + tools/testing/kunit/configs/all_tests.config | 5 + + 186 files changed, 10755 insertions(+), 2853 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/regulatory.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/regulatory.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/Makefile + create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/devinfo.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/module.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h +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 (18af7e357033 mtd: flashchip: explicitly include <linux/wait.h>) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mtd/mtd.yaml | 2 ++ + drivers/mtd/ssfdc.c | 7 ++++--- + include/linux/mtd/flashchip.h | 1 + + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging nand/nand/next (4bd14b2fd8a8 mtd: spinand: esmt: Extend IDs to 5 bytes) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 ++- + drivers/mtd/nand/spi/esmt.c | 9 ++++++--- + drivers/mtd/nand/spi/winbond.c | 12 ++++++++++++ + include/linux/mtd/spinand.h | 2 +- + 4 files changed, 21 insertions(+), 5 deletions(-) +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 (9a14b311f2f7 crypto: ahash - unexport crypto_hash_alg_has_setkey()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 7 + + Documentation/ABI/testing/debugfs-hisi-sec | 7 + + Documentation/ABI/testing/debugfs-hisi-zip | 7 + + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + arch/arm64/crypto/Kconfig | 1 + + arch/arm64/crypto/aes-ce-ccm-core.S | 265 ++++++++------------- + arch/arm64/crypto/aes-ce-ccm-glue.c | 154 ++++++++---- + arch/arm64/crypto/aes-glue.c | 1 + + arch/powerpc/crypto/Kconfig | 20 ++ + arch/powerpc/crypto/Makefile | 20 +- + {drivers/crypto/vmx => arch/powerpc/crypto}/aes.c | 0 + .../crypto/vmx => arch/powerpc/crypto}/aes_cbc.c | 0 + .../crypto/vmx => arch/powerpc/crypto}/aes_ctr.c | 0 + .../crypto/vmx => arch/powerpc/crypto}/aes_xts.c | 0 + .../crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.h | 0 + .../vmx => arch/powerpc/crypto}/aesp8-ppc.pl | 0 + .../crypto/vmx => arch/powerpc/crypto}/ghash.c | 0 + .../vmx => arch/powerpc/crypto}/ghashp8-ppc.pl | 0 + {drivers/crypto/vmx => arch/powerpc/crypto}/vmx.c | 0 + crypto/ahash.c | 21 +- + crypto/asymmetric_keys/verify_pefile.c | 4 +- + crypto/pcbc.c | 4 +- + crypto/testmgr.c | 8 - + drivers/crypto/Kconfig | 14 +- + drivers/crypto/Makefile | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +- + drivers/crypto/hisilicon/debugfs.c | 53 +++++ + drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 33 +-- + drivers/crypto/hisilicon/sec2/sec_main.c | 7 +- + drivers/crypto/hisilicon/zip/zip_main.c | 2 +- + drivers/crypto/intel/iaa/iaa_crypto.h | 25 -- + drivers/crypto/intel/iaa/iaa_crypto_comp_fixed.c | 1 - + drivers/crypto/intel/iaa/iaa_crypto_main.c | 108 +-------- + drivers/crypto/intel/iaa/iaa_crypto_stats.c | 2 - + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 3 + + drivers/crypto/intel/qat/qat_common/adf_isr.c | 2 +- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 12 +- + drivers/crypto/vmx/.gitignore | 3 - + drivers/crypto/vmx/Kconfig | 14 -- + drivers/crypto/vmx/Makefile | 23 -- + drivers/crypto/vmx/ppc-xlate.pl | 231 ------------------ + include/crypto/internal/hash.h | 2 - + include/crypto/public_key.h | 1 + + 45 files changed, 371 insertions(+), 692 deletions(-) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes.c (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_cbc.c (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_ctr.c (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_xts.c (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.h (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.pl (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/ghash.c (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/ghashp8-ppc.pl (100%) + rename {drivers/crypto/vmx => arch/powerpc/crypto}/vmx.c (100%) + delete mode 100644 drivers/crypto/vmx/.gitignore + delete mode 100644 drivers/crypto/vmx/Kconfig + delete mode 100644 drivers/crypto/vmx/Makefile + delete mode 100644 drivers/crypto/vmx/ppc-xlate.pl +Merging drm/drm-next (f8e4806e0dfa Merge tag 'drm-misc-next-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Merge made by the 'ort' strategy. + .../bindings/display/panel/novatek,nt35510.yaml | 4 +- + .../bindings/display/panel/panel-lvds.yaml | 2 + + .../bindings/display/solomon,ssd1307fb.yaml | 20 +- + .../bindings/display/solomon,ssd132x.yaml | 12 +- + .../bindings/display/solomon,ssd133x.yaml | 45 ++ + Documentation/gpu/rfc/xe.rst | 234 -------- + Documentation/gpu/todo.rst | 23 + + MAINTAINERS | 1 - + drivers/accel/qaic/mhi_controller.c | 4 +- + drivers/accel/qaic/qaic.h | 3 +- + drivers/accel/qaic/qaic_data.c | 59 +- + drivers/accel/qaic/qaic_drv.c | 144 +++-- + drivers/gpu/drm/Kconfig | 16 +- + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 8 +- + drivers/gpu/drm/bridge/tc358767.c | 169 ++++-- + drivers/gpu/drm/drm_debugfs.c | 4 - + drivers/gpu/drm/drm_edid.c | 25 +- + drivers/gpu/drm/drm_ioc32.c | 4 +- + drivers/gpu/drm/drm_modes.c | 22 + + drivers/gpu/drm/drm_probe_helper.c | 36 -- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 14 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +- + drivers/gpu/drm/nouveau/nvif/outp.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 ++--- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 97 +++- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 23 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 424 ++++++++++++-- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 3 + + drivers/gpu/drm/rockchip/inno_hdmi.c | 574 +++++++++++-------- + drivers/gpu/drm/rockchip/inno_hdmi.h | 5 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 3 + + drivers/gpu/drm/scheduler/sched_main.c | 11 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 7 + + drivers/gpu/drm/solomon/ssd130x.c | 370 ++++++++++++ + drivers/gpu/drm/solomon/ssd130x.h | 5 +- + drivers/gpu/drm/tegra/dpaux.c | 14 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/gpu/drm/tegra/dsi.c | 59 +- + drivers/gpu/drm/tegra/hdmi.c | 20 +- + drivers/gpu/drm/tegra/output.c | 17 +- + drivers/gpu/drm/tegra/rgb.c | 18 +- + drivers/gpu/drm/tegra/sor.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 +- + drivers/gpu/drm/ttm/tests/Makefile | 3 + + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 622 +++++++++++++++++++++ + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 48 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 3 + + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 3 +- + drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 335 +++++++++++ + drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 295 ++++++++++ + drivers/gpu/drm/ttm/ttm_resource.c | 3 + + drivers/gpu/drm/ttm/ttm_tt.c | 3 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 15 + + drivers/gpu/drm/vc4/vc4_plane.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_submit.c | 6 +- + drivers/gpu/drm/vkms/Kconfig | 15 + + drivers/gpu/drm/vkms/vkms_composer.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 1 - + drivers/video/fbdev/efifb.c | 136 +++-- + drivers/video/fbdev/simplefb.c | 2 +- + drivers/video/fbdev/vesafb.c | 78 ++- + include/drm/drm_atomic.h | 70 ++- + include/drm/drm_edid.h | 46 +- + include/drm/drm_fixed.h | 2 +- + include/drm/drm_modes.h | 2 + + include/drm/drm_probe_helper.h | 1 - + include/uapi/drm/nouveau_drm.h | 56 +- + include/uapi/drm/qaic_accel.h | 13 +- + include/uapi/linux/virtio_gpu.h | 2 + + 84 files changed, 3411 insertions(+), 1111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd133x.yaml + delete mode 100644 Documentation/gpu/rfc/xe.rst + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_resource_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_tt_test.c + create mode 100644 drivers/gpu/drm/vkms/Kconfig +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 (f8e4806e0dfa Merge tag 'drm-misc-next-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ 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 +Already up to date. +Merging drm-misc/for-linux-next (1f36d634670d drm/bridge: imx: add bridge wrapper driver for i.MX8MP DWC HDMI) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/bridge/samsung-dsim.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/bridge/samsung-dsim.c +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Recorded preimage for 'drivers/gpu/drm/bridge/samsung-dsim.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/bridge/samsung-dsim.c'. +[master 08fb82105cd2] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../display/bridge/fsl,imx8mp-hdmi-tx.yaml | 102 ++++ + .../bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- + .../bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml | 84 +++ + .../display/panel/boe,th101mb31ig002-28a.yaml | 58 ++ + .../bindings/display/panel/novatek,nt36672e.yaml | 66 +++ + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/visionox,rm69299.yaml | 3 +- + Documentation/gpu/drm-internals.rst | 12 - + Documentation/gpu/introduction.rst | 2 + + Documentation/gpu/rfc/index.rst | 4 - + MAINTAINERS | 1 + + drivers/dma-buf/dma-fence.c | 8 +- + drivers/dma-buf/dma-resv.c | 4 +- + drivers/gpu/drm/Kconfig | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 11 +- + drivers/gpu/drm/bridge/imx/Kconfig | 18 + + drivers/gpu/drm/bridge/imx/Makefile | 2 + + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 207 +++++++ + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 154 +++++ + drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 1 + + drivers/gpu/drm/bridge/samsung-dsim.c | 11 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 7 +- + drivers/gpu/drm/ci/build.sh | 1 + + drivers/gpu/drm/ci/gitlab-ci.yml | 14 +- + drivers/gpu/drm/ci/test.yml | 26 +- + drivers/gpu/drm/ci/testlist.txt | 49 ++ + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 3 +- + drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt | 30 - + drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt | 17 - + drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 7 - + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 17 + + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 17 + + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 5 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 28 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 7 +- + drivers/gpu/drm/drm_exec.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 - + drivers/gpu/drm/drm_managed.c | 39 ++ + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 37 +- + drivers/gpu/drm/imx/dcss/dcss-blkctl.c | 13 +- + drivers/gpu/drm/imx/dcss/dcss-ctxld.c | 14 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 19 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 1 - + drivers/gpu/drm/imx/dcss/dcss-dpr.c | 21 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 12 +- + drivers/gpu/drm/imx/dcss/dcss-dtg.c | 26 +- + drivers/gpu/drm/imx/dcss/dcss-scaler.c | 21 +- + drivers/gpu/drm/imx/dcss/dcss-ss.c | 12 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 2 +- + drivers/gpu/drm/ingenic/Kconfig | 1 - + drivers/gpu/drm/lima/lima_gem.c | 23 +- + drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- + drivers/gpu/drm/loongson/lsdc_ttm.c | 2 - + drivers/gpu/drm/mcde/Kconfig | 1 - + drivers/gpu/drm/msm/dp/dp_display.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 59 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 1 - + drivers/gpu/drm/nouveau/nouveau_svm.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +- + drivers/gpu/drm/panel/Kconfig | 21 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 18 +- + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 322 +++++++++++ + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 8 +- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 643 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 54 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 1 + + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 1 + + drivers/gpu/drm/pl111/Kconfig | 1 - + drivers/gpu/drm/qxl/qxl_object.c | 2 - + drivers/gpu/drm/qxl/qxl_ttm.c | 2 - + drivers/gpu/drm/radeon/radeon_object.c | 2 - + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 1 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 + + drivers/gpu/drm/tegra/hdmi.c | 1 + + drivers/gpu/drm/tests/drm_managed_test.c | 79 ++- + drivers/gpu/drm/ttm/ttm_bo.c | 28 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +- + drivers/gpu/drm/ttm/ttm_resource.c | 73 +-- + drivers/gpu/drm/ttm/ttm_tt.c | 12 + + drivers/gpu/drm/tve200/Kconfig | 1 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + + drivers/gpu/drm/vmwgfx/ttm_object.c | 6 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 296 ++++------ + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 32 - + drivers/staging/sm750fb/Kconfig | 1 - + drivers/video/Kconfig | 5 +- + drivers/video/Makefile | 3 +- + drivers/video/cmdline.c | 2 + + drivers/video/fbdev/Kconfig | 35 -- + drivers/video/fbdev/core/Kconfig | 2 +- + drivers/video/fbdev/core/fbmem.c | 2 - + drivers/video/fbdev/geode/Kconfig | 3 - + include/drm/drm_exec.h | 4 +- + include/drm/drm_gpuvm.h | 2 +- + include/drm/drm_managed.h | 4 + + include/drm/drm_rect.h | 4 +- + include/drm/ttm/ttm_placement.h | 10 +- + include/drm/ttm/ttm_resource.h | 8 +- + include/drm/ttm/ttm_tt.h | 9 +- + include/linux/fb.h | 7 - + include/sound/hdmi-codec.h | 1 - + include/uapi/drm/vmwgfx_drm.h | 6 +- + include/video/cmdline.h | 8 +- + 119 files changed, 2375 insertions(+), 792 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8mp-hdmi-tx.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,th101mb31ig002-28a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672e.yaml + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt + create mode 100644 drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672e.c +$ git am -3 ../patches/0001-drm-ttm-initialise-places.patch +Applying: drm/ttm: initialise places +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gem/i915_gem_ttm.c +$ git add -A . +$ git commit -v -a --amend +[master 5a18aaadedcf] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc + Date: Wed Feb 7 13:30:01 2024 +1100 +$ git reset --hard HEAD^ +HEAD is now at e6ccf7b1dbca Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +Merging next-20240205 version of drm-misc +$ git merge -m next-20240205/drm-misc 1f1626ac0428820f998245478610f452650bcab5 +Already up to date. +Merging amdgpu/drm-next (9217b91c6458 drm/amdgpu: Reset IH OVERFLOW_CLEAR bit) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/navi10_ih.c +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/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_dpms.c +Auto-merging drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Resolved 'drivers/gpu/drm/amd/display/dc/dc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5ee872a1ce86] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 2 + + Documentation/gpu/amdgpu/display/dcn-blocks.rst | 78 ++ + .../gpu/amdgpu/display/display-contributing.rst | 168 ++++ + .../gpu/amdgpu/display/display-manager.rst | 3 - + Documentation/gpu/amdgpu/display/index.rst | 78 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 879 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 202 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 39 +- + 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_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 186 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 689 ++++++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 155 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +- + 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/clearstate_si.h | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 92 ++- + 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_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +- + 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/mxgpu_ai.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.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/ta_ras_if.h | 36 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 252 ++++-- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 3 + + drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 10 +- + drivers/gpu/drm/amd/display/TODO | 110 --- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 61 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 55 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 119 +-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 4 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 34 + + drivers/gpu/drm/amd/display/dc/basics/conversion.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/dcn32/dcn32_clk_mgr.c | 40 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 40 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 15 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 14 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 14 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 299 ++++++- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 20 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 3 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 70 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 31 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 3 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 55 ++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 38 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 54 ++ + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 106 ++- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 1 + + .../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 | 4 +- + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 41 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 5 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 56 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 99 ++- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 115 ++- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h | 2 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 167 +++- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 2 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 18 + + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.h | 4 + + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 2 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 3 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 39 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 253 ++++-- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 16 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + + .../drm/amd/display/dc/link/hwss/link_hwss_dio.h | 10 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 18 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 58 ++ + .../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 | 3 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 3 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 15 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 19 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 121 ++- + drivers/gpu/drm/amd/display/include/audio_types.h | 15 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/arct_ip_offset.h | 6 +- + .../amd/include/asic_reg/dcn/dcn_3_1_6_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h | 10 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h | 24 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 65 ++ + drivers/gpu/drm/amd/include/atom-bits.h | 2 +- + drivers/gpu/drm/amd/include/beige_goby_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/cgs_common.h | 23 +- + .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 6 +- + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/dm_pp_interface.h | 9 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 6 +- + drivers/gpu/drm/amd/include/navi12_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/pptable.h | 6 +- + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 6 +- + .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/v10_structs.h | 3 +- + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/vega10_ip_offset.h | 6 +- + drivers/gpu/drm/amd/include/vega20_ip_offset.h | 78 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 42 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 18 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 158 +++- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 10 + + drivers/gpu/drm/radeon/atom-bits.h | 2 +- + 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/btc_dpm.c | 90 +-- + drivers/gpu/drm/radeon/ci_dpm.c | 31 +- + drivers/gpu/drm/radeon/ci_dpm.h | 6 +- + drivers/gpu/drm/radeon/clearstate_cayman.h | 9 +- + drivers/gpu/drm/radeon/clearstate_ci.h | 3 +- + drivers/gpu/drm/radeon/evergreen.c | 20 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 4 +- + drivers/gpu/drm/radeon/evergreen_reg.h | 10 +- + drivers/gpu/drm/radeon/evergreen_smc.h | 9 +- + drivers/gpu/drm/radeon/kv_dpm.c | 9 +- + drivers/gpu/drm/radeon/kv_smc.c | 2 +- + drivers/gpu/drm/radeon/ni.c | 31 +- + drivers/gpu/drm/radeon/ni_dpm.c | 3 - + drivers/gpu/drm/radeon/ni_dpm.h | 12 +- + drivers/gpu/drm/radeon/nislands_smc.h | 51 +- + drivers/gpu/drm/radeon/r100.c | 2 +- + drivers/gpu/drm/radeon/r300_reg.h | 2 +- + drivers/gpu/drm/radeon/r600.c | 3 +- + drivers/gpu/drm/radeon/r600_dpm.c | 6 +- + drivers/gpu/drm/radeon/r600_dpm.h | 3 +- + drivers/gpu/drm/radeon/radeon.h | 6 +- + drivers/gpu/drm/radeon/radeon_asic.c | 8 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 44 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 12 +- + drivers/gpu/drm/radeon/radeon_audio.c | 11 +- + drivers/gpu/drm/radeon/radeon_audio.h | 6 +- + drivers/gpu/drm/radeon/radeon_mode.h | 9 +- + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/radeon/rs400.c | 4 +- + drivers/gpu/drm/radeon/rs600.c | 3 +- + drivers/gpu/drm/radeon/rv515.c | 3 +- + drivers/gpu/drm/radeon/rv6xx_dpm.h | 3 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 4 +- + drivers/gpu/drm/radeon/rv770_smc.h | 27 +- + drivers/gpu/drm/radeon/si.c | 63 +- + drivers/gpu/drm/radeon/si_dpm.c | 132 ++-- + drivers/gpu/drm/radeon/si_dpm.h | 21 +- + drivers/gpu/drm/radeon/smu7.h | 6 +- + drivers/gpu/drm/radeon/smu7_discrete.h | 51 +- + drivers/gpu/drm/radeon/smu7_fusion.h | 42 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 18 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 22 +- + drivers/gpu/drm/radeon/trinity_dpm.h | 3 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_ioctl.h | 3 +- + 255 files changed, 6211 insertions(+), 2013 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/display/dcn-blocks.rst + create mode 100644 Documentation/gpu/amdgpu/display/display-contributing.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h + delete mode 100644 drivers/gpu/drm/amd/display/TODO +Merging drm-intel/for-linux-next (074146f45783 drm/i915: Annotate more of the BIOS fb takeover failure paths) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_gmbus.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/i9xx_plane.c | 30 ++ + drivers/gpu/drm/i915/display/i9xx_plane.h | 7 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 6 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 36 +- + drivers/gpu/drm/i915/display/intel_bios.h | 5 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 361 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_crt.c | 5 + + drivers/gpu/drm/i915/display/intel_crtc.c | 128 +------- + drivers/gpu/drm/i915/display/intel_cursor.c | 63 +++- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 231 ++++++------- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 63 +++- + drivers/gpu/drm/i915/display/intel_ddi.c | 67 ++-- + drivers/gpu/drm/i915/display/intel_display.c | 76 ++++- + drivers/gpu/drm/i915/display/intel_display_core.h | 18 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 26 +- + .../i915/display/intel_display_debugfs_params.c | 1 + + .../gpu/drm/i915/display/intel_display_device.c | 2 +- + .../gpu/drm/i915/display/intel_display_driver.c | 165 +++++++++- + .../gpu/drm/i915/display/intel_display_driver.h | 6 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 10 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 27 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 192 ++++++----- + drivers/gpu/drm/i915/display/intel_dp.h | 10 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 29 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 83 +++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 18 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 4 + + drivers/gpu/drm/i915/display/intel_dvo.c | 5 + + drivers/gpu/drm/i915/display/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 5 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 137 +++++++- + drivers/gpu/drm/i915/display/intel_global_state.h | 9 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 5 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 78 +++-- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 28 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 16 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 165 ++++++++-- + drivers/gpu/drm/i915/display/intel_hotplug.h | 4 + + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 176 +++++++--- + drivers/gpu/drm/i915/display/intel_opregion.h | 47 ++- + drivers/gpu/drm/i915/display/intel_panel.c | 4 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 255 +++++++++++---- + drivers/gpu/drm/i915/display/intel_plane_initial.h | 4 +- + drivers/gpu/drm/i915/display/intel_pps.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 130 ++++++-- + drivers/gpu/drm/i915/display/intel_psr.h | 6 - + drivers/gpu/drm/i915/display/intel_psr_regs.h | 6 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 6 + + drivers/gpu/drm/i915/display/intel_tc.c | 40 +-- + drivers/gpu/drm/i915/display/intel_tc.h | 2 +- + drivers/gpu/drm/i915/display/intel_tv.c | 7 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 130 ++++++++ + drivers/gpu/drm/i915/display/intel_vblank.h | 12 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 28 ++ + drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 + + drivers/gpu/drm/i915/display/skl_watermark.c | 54 +-- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 13 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 3 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 25 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 18 +- + drivers/gpu/drm/i915/i915_utils.c | 17 + + drivers/gpu/drm/i915/i915_utils.h | 2 + + drivers/gpu/drm/i915/intel_memory_region.c | 33 +- + drivers/gpu/drm/i915/intel_memory_region.h | 3 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 8 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 4 +- + drivers/gpu/drm/i915/soc/intel_pch.c | 16 +- + drivers/gpu/drm/i915/soc/intel_pch.h | 6 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 67 ++-- + include/drm/display/drm_dp.h | 1 + + include/drm/drm_print.h | 3 + + include/drm/i915_pciids.h | 3 + + 86 files changed, 2228 insertions(+), 1134 deletions(-) +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +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 (c9959996a8fc 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 | 93 ++++++++++++++++++---------- + 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, 154 insertions(+), 44 deletions(-) +Merging fbdev/for-next (72fee6b0a3a4 fbdev: Restrict FB_SH_MOBILE_LCDC to SuperH) +$ 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/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regmap/for-next (371a2e3c9789 Merge remote-tracking branch 'regmap/for-6.9' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache.c | 4 +++- + drivers/base/regmap/regmap.c | 10 ++++++---- + include/linux/regmap.h | 5 +++++ + 5 files changed, 16 insertions(+), 6 deletions(-) +Merging sound/for-next (498e963ec7f0 ALSA: hda/realtek: Remove two HP Laptops using CS35L41) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging MAINTAINERS +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 + + include/sound/emux_synth.h | 2 +- + sound/core/Kconfig | 17 ++ + sound/core/Makefile | 2 + + sound/core/pcm.c | 6 +- + sound/core/sound_kunit.c | 310 +++++++++++++++++++++++++++++++++ + sound/firewire/Kconfig | 2 + + sound/firewire/motu/motu-protocol-v3.c | 9 + + sound/firewire/motu/motu.c | 2 + + sound/firewire/motu/motu.h | 1 + + sound/pci/hda/Kconfig | 4 + + sound/pci/hda/Makefile | 2 + + sound/pci/hda/cs35l41_hda_property.c | 90 ++++++++-- + sound/pci/hda/hda_component.c | 169 ++++++++++++++++++ + sound/pci/hda/hda_component.h | 59 +++++++ + sound/pci/hda/patch_realtek.c | 269 +++++++++------------------- + sound/synth/emux/emux.c | 4 +- + 17 files changed, 743 insertions(+), 212 deletions(-) + create mode 100644 sound/core/sound_kunit.c + create mode 100644 sound/pci/hda/hda_component.c +Merging ieee1394/for-next (8dff232f6b2d firewire: core: fix build failure due to the caller of fw_csr_string()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-device.c | 18 +++++------------- + 1 file changed, 5 insertions(+), 13 deletions(-) +Merging sound-asoc/for-next (2d742f069c1c Merge remote-tracking branch 'asoc/for-6.9' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../bindings/sound/atmel,sam9x5-wm8731-audio.yaml | 76 + + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 35 - + .../bindings/sound/audio-graph-port.yaml | 2 +- + .../devicetree/bindings/sound/fsl,easrc.yaml | 4 +- + .../devicetree/bindings/sound/fsl,micfil.yaml | 14 +- + .../devicetree/bindings/sound/fsl,sai.yaml | 6 + + .../bindings/sound/infineon,peb2466.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd938x.yaml | 81 +- + .../bindings/sound/qcom,wcd939x-sdw.yaml | 69 + + .../devicetree/bindings/sound/qcom,wcd939x.yaml | 96 + + .../bindings/sound/qcom,wcd93xx-common.yaml | 95 + + .../devicetree/bindings/sound/samsung,tm2.yaml | 7 +- + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/amd_init.c | 235 ++ + drivers/soundwire/amd_init.h | 13 + + drivers/soundwire/amd_manager.c | 47 +- + drivers/soundwire/amd_manager.h | 16 +- + include/linux/soundwire/sdw_amd.h | 83 +- + include/linux/spi/spi.h | 2 - + include/sound/sof/dai-amd.h | 7 + + include/sound/sof/dai.h | 2 + + include/uapi/sound/sof/tokens.h | 4 + + sound/soc/amd/Makefile | 2 +- + sound/soc/amd/acp/Kconfig | 7 + + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp-mach-common.c | 6 +- + sound/soc/amd/acp/acp-sof-mach.c | 26 +- + sound/soc/amd/acp/amd-sdw-acpi.c | 62 + + sound/soc/atmel/mikroe-proto.c | 8 +- + sound/soc/codecs/Kconfig | 35 + + sound/soc/codecs/Makefile | 9 + + sound/soc/codecs/cs42l43-jack.c | 27 +- + sound/soc/codecs/cs42l43-sdw.c | 1 + + sound/soc/codecs/cs42l43.c | 82 +- + sound/soc/codecs/cs42l43.h | 25 +- + sound/soc/codecs/es8326.c | 92 +- + sound/soc/codecs/es8326.h | 5 +- + sound/soc/codecs/framer-codec.c | 413 +++ + sound/soc/codecs/nau8540.c | 112 +- + sound/soc/codecs/nau8540.h | 13 +- + sound/soc/codecs/wcd-clsh-v2.h | 1 + + sound/soc/codecs/wcd-mbhc-v2.c | 95 +- + sound/soc/codecs/wcd-mbhc-v2.h | 3 + + sound/soc/codecs/wcd939x-sdw.c | 1551 ++++++++ + sound/soc/codecs/wcd939x.c | 3686 ++++++++++++++++++++ + sound/soc/codecs/wcd939x.h | 989 ++++++ + sound/soc/fsl/eukrea-tlv320.c | 8 +- + sound/soc/fsl/fsl_sai.c | 13 + + sound/soc/fsl/p1022_rdk.c | 33 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 57 + + sound/soc/pxa/Kconfig | 3 - + sound/soc/qcom/common.c | 2 +- + sound/soc/sh/rz-ssi.c | 2 +- + sound/soc/sof/amd/Kconfig | 18 + + sound/soc/sof/amd/acp-common.c | 65 +- + sound/soc/sof/amd/acp-dsp-offset.h | 10 + + sound/soc/sof/amd/acp-loader.c | 34 +- + sound/soc/sof/amd/acp.c | 232 +- + sound/soc/sof/amd/acp.h | 26 +- + sound/soc/sof/amd/pci-acp63.c | 7 + + sound/soc/sof/fw-file-profile.c | 18 +- + sound/soc/sof/ipc3-pcm.c | 25 + + sound/soc/sof/ipc3-topology.c | 40 + + sound/soc/sof/sof-audio.h | 1 + + sound/soc/sof/topology.c | 5 + + sound/soc/ti/j721e-evm.c | 4 +- + sound/soc/ti/omap-hdmi.c | 10 +- + 67 files changed, 8379 insertions(+), 384 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/atmel,sam9x5-wm8731-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd939x-sdw.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd939x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd93xx-common.yaml + create mode 100644 drivers/soundwire/amd_init.c + create mode 100644 drivers/soundwire/amd_init.h + create mode 100644 sound/soc/amd/acp/amd-sdw-acpi.c + create mode 100644 sound/soc/codecs/framer-codec.c + create mode 100644 sound/soc/codecs/wcd939x-sdw.c + create mode 100644 sound/soc/codecs/wcd939x.c + create mode 100644 sound/soc/codecs/wcd939x.h +Merging modules/modules-next (157285397f6a lib/test_kmod: fix kernel-doc warnings) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging init/main.c +Auto-merging kernel/module/main.c +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/mmu.h | 9 +-------- + include/linux/init.h | 4 ---- + init/main.c | 21 +++++++-------------- + kernel/module/internal.h | 6 +++--- + kernel/module/main.c | 8 ++++---- + kernel/module/strict_rwx.c | 22 ++++++++++------------ + lib/test_kmod.c | 6 +++++- + 7 files changed, 30 insertions(+), 46 deletions(-) +Merging input/next (d03f030115fe Input: gameport - make gameport_bus const) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/goodix,gt9916.yaml | 95 +++ + .../bindings/input/touchscreen/goodix.yaml | 5 +- + .../bindings/input/touchscreen/melfas,mms114.yaml | 6 +- + .../bindings/input/touchscreen/silead,gsl1680.yaml | 2 +- + drivers/input/gameport/gameport.c | 4 +- + drivers/input/input-leds.c | 8 +- + drivers/input/input.c | 14 +- + drivers/input/keyboard/bcm-keypad.c | 2 +- + drivers/input/keyboard/matrix_keypad.c | 170 ++--- + drivers/input/misc/88pm80x_onkey.c | 14 +- + drivers/input/mouse/Kconfig | 12 - + drivers/input/mouse/Makefile | 1 - + drivers/input/mouse/navpoint.c | 350 ---------- + drivers/input/rmi4/rmi_driver.c | 6 +- + drivers/input/touchscreen/Kconfig | 31 + + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/goodix_berlin.h | 24 + + drivers/input/touchscreen/goodix_berlin_core.c | 755 +++++++++++++++++++++ + drivers/input/touchscreen/goodix_berlin_i2c.c | 75 ++ + drivers/input/touchscreen/goodix_berlin_spi.c | 178 +++++ + include/linux/input/navpoint.h | 8 - + 21 files changed, 1246 insertions(+), 517 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml + delete mode 100644 drivers/input/mouse/navpoint.c + create mode 100644 drivers/input/touchscreen/goodix_berlin.h + create mode 100644 drivers/input/touchscreen/goodix_berlin_core.c + create mode 100644 drivers/input/touchscreen/goodix_berlin_i2c.c + create mode 100644 drivers/input/touchscreen/goodix_berlin_spi.c + delete mode 100644 include/linux/input/navpoint.h +Merging block/for-next (69c95a16fe48 Merge branch 'for-6.9/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/blk.h +CONFLICT (content): Merge conflict in block/blk.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/sched.h +Auto-merging net/core/dev.c +Resolved 'block/blk.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e214b5042394] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + block/bfq-cgroup.c | 14 +- + block/bfq-iosched.c | 28 ++-- + block/blk-cgroup.c | 2 +- + block/blk-cgroup.h | 1 + + block/blk-core.c | 3 + + block/blk-flush.c | 2 +- + block/blk-iocost.c | 8 +- + block/blk-iolatency.c | 6 +- + block/blk-mq.c | 121 ++++++++------- + block/blk-throttle.c | 10 +- + block/blk-wbt.c | 6 +- + block/blk.h | 68 +++++++++ + drivers/block/rbd.c | 2 +- + include/linux/blk_types.h | 42 ----- + include/linux/blkdev.h | 17 +++ + include/linux/io_uring_types.h | 111 ++++++++------ + include/linux/sched.h | 2 +- + include/net/busy_poll.h | 4 + + include/trace/events/io_uring.h | 24 ++- + include/uapi/linux/io_uring.h | 12 ++ + io_uring/Makefile | 1 + + io_uring/cancel.c | 3 +- + io_uring/cancel.h | 10 ++ + io_uring/filetable.h | 2 +- + io_uring/io_uring.c | 198 +++++++++++------------- + io_uring/io_uring.h | 66 +++++++- + io_uring/kbuf.c | 16 +- + io_uring/kbuf.h | 41 +++-- + io_uring/napi.c | 331 ++++++++++++++++++++++++++++++++++++++++ + io_uring/napi.h | 104 +++++++++++++ + io_uring/poll.c | 14 +- + io_uring/register.c | 13 ++ + io_uring/rw.c | 8 +- + io_uring/sqpoll.c | 33 +++- + io_uring/xattr.c | 2 +- + kernel/sched/core.c | 6 +- + net/core/dev.c | 57 +++++-- + 37 files changed, 1021 insertions(+), 367 deletions(-) + create mode 100644 io_uring/napi.c + create mode 100644 io_uring/napi.h +Merging device-mapper/for-next (076f0dbc1ae2 dm vdo: move encoding constants to encodings.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/vdo-design.rst | 415 ++ + Documentation/admin-guide/device-mapper/vdo.rst | 388 ++ + MAINTAINERS | 8 + + drivers/md/Kconfig | 2 + + drivers/md/Makefile | 1 + + drivers/md/dm-bufio.c | 43 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-ebs-target.c | 8 +- + drivers/md/dm-integrity.c | 12 +- + drivers/md/dm-io.c | 23 +- + drivers/md/dm-kcopyd.c | 4 +- + drivers/md/dm-log.c | 4 +- + drivers/md/dm-raid1.c | 6 +- + drivers/md/dm-snap-persistent.c | 8 +- + drivers/md/dm-thin.c | 20 +- + drivers/md/dm-vdo/Kconfig | 17 + + drivers/md/dm-vdo/Makefile | 60 + + drivers/md/dm-vdo/action-manager.c | 388 ++ + drivers/md/dm-vdo/action-manager.h | 110 + + drivers/md/dm-vdo/admin-state.c | 506 ++ + drivers/md/dm-vdo/admin-state.h | 178 + + drivers/md/dm-vdo/block-map.c | 3320 +++++++++++++ + drivers/md/dm-vdo/block-map.h | 379 ++ + drivers/md/dm-vdo/chapter-index.c | 291 ++ + drivers/md/dm-vdo/chapter-index.h | 63 + + drivers/md/dm-vdo/completion.c | 140 + + drivers/md/dm-vdo/completion.h | 152 + + drivers/md/dm-vdo/config.c | 378 ++ + drivers/md/dm-vdo/config.h | 124 + + drivers/md/dm-vdo/constants.h | 96 + + drivers/md/dm-vdo/cpu.h | 59 + + drivers/md/dm-vdo/data-vio.c | 2064 ++++++++ + drivers/md/dm-vdo/data-vio.h | 669 +++ + drivers/md/dm-vdo/dedupe.c | 3065 ++++++++++++ + drivers/md/dm-vdo/dedupe.h | 120 + + drivers/md/dm-vdo/delta-index.c | 1990 ++++++++ + drivers/md/dm-vdo/delta-index.h | 278 ++ + drivers/md/dm-vdo/dm-vdo-target.c | 2956 ++++++++++++ + drivers/md/dm-vdo/dump.c | 278 ++ + drivers/md/dm-vdo/dump.h | 17 + + drivers/md/dm-vdo/encodings.c | 1481 ++++++ + drivers/md/dm-vdo/encodings.h | 1305 +++++ + drivers/md/dm-vdo/errors.c | 312 ++ + drivers/md/dm-vdo/errors.h | 80 + + drivers/md/dm-vdo/flush.c | 560 +++ + drivers/md/dm-vdo/flush.h | 44 + + drivers/md/dm-vdo/funnel-queue.c | 171 + + drivers/md/dm-vdo/funnel-queue.h | 110 + + drivers/md/dm-vdo/funnel-requestqueue.c | 283 ++ + drivers/md/dm-vdo/funnel-requestqueue.h | 31 + + drivers/md/dm-vdo/funnel-workqueue.c | 638 +++ + drivers/md/dm-vdo/funnel-workqueue.h | 51 + + drivers/md/dm-vdo/geometry.c | 200 + + drivers/md/dm-vdo/geometry.h | 140 + + drivers/md/dm-vdo/hash-utils.h | 65 + + drivers/md/dm-vdo/index-layout.c | 1768 +++++++ + drivers/md/dm-vdo/index-layout.h | 43 + + drivers/md/dm-vdo/index-page-map.c | 174 + + drivers/md/dm-vdo/index-page-map.h | 50 + + drivers/md/dm-vdo/index-session.c | 760 +++ + drivers/md/dm-vdo/index-session.h | 84 + + drivers/md/dm-vdo/index.c | 1399 ++++++ + drivers/md/dm-vdo/index.h | 83 + + drivers/md/dm-vdo/int-map.c | 713 +++ + drivers/md/dm-vdo/int-map.h | 39 + + drivers/md/dm-vdo/io-factory.c | 415 ++ + drivers/md/dm-vdo/io-factory.h | 64 + + drivers/md/dm-vdo/io-submitter.c | 477 ++ + drivers/md/dm-vdo/io-submitter.h | 47 + + drivers/md/dm-vdo/logger.c | 291 ++ + drivers/md/dm-vdo/logger.h | 105 + + drivers/md/dm-vdo/logical-zone.c | 375 ++ + drivers/md/dm-vdo/logical-zone.h | 89 + + drivers/md/dm-vdo/memory-alloc.c | 442 ++ + drivers/md/dm-vdo/memory-alloc.h | 162 + + drivers/md/dm-vdo/message-stats.c | 1215 +++++ + drivers/md/dm-vdo/message-stats.h | 13 + + drivers/md/dm-vdo/murmurhash3.c | 175 + + drivers/md/dm-vdo/murmurhash3.h | 15 + + drivers/md/dm-vdo/numeric.h | 78 + + drivers/md/dm-vdo/open-chapter.c | 427 ++ + drivers/md/dm-vdo/open-chapter.h | 79 + + drivers/md/dm-vdo/packer.c | 784 +++ + drivers/md/dm-vdo/packer.h | 122 + + drivers/md/dm-vdo/permassert.c | 26 + + drivers/md/dm-vdo/permassert.h | 46 + + drivers/md/dm-vdo/physical-zone.c | 646 +++ + drivers/md/dm-vdo/physical-zone.h | 115 + + drivers/md/dm-vdo/pool-sysfs-stats.c | 2063 ++++++++ + drivers/md/dm-vdo/pool-sysfs.c | 198 + + drivers/md/dm-vdo/pool-sysfs.h | 19 + + drivers/md/dm-vdo/priority-table.c | 226 + + drivers/md/dm-vdo/priority-table.h | 47 + + drivers/md/dm-vdo/radix-sort.c | 332 ++ + drivers/md/dm-vdo/radix-sort.h | 26 + + drivers/md/dm-vdo/recovery-journal.c | 1764 +++++++ + drivers/md/dm-vdo/recovery-journal.h | 312 ++ + drivers/md/dm-vdo/repair.c | 1756 +++++++ + drivers/md/dm-vdo/repair.h | 14 + + drivers/md/dm-vdo/slab-depot.c | 5098 ++++++++++++++++++++ + drivers/md/dm-vdo/slab-depot.h | 595 +++ + drivers/md/dm-vdo/sparse-cache.c | 580 +++ + drivers/md/dm-vdo/sparse-cache.h | 46 + + drivers/md/dm-vdo/statistics.h | 278 ++ + drivers/md/dm-vdo/status-codes.c | 123 + + drivers/md/dm-vdo/status-codes.h | 110 + + drivers/md/dm-vdo/string-utils.c | 28 + + drivers/md/dm-vdo/string-utils.h | 23 + + drivers/md/dm-vdo/sysfs.c | 82 + + drivers/md/dm-vdo/thread-cond-var.c | 46 + + drivers/md/dm-vdo/thread-device.c | 36 + + drivers/md/dm-vdo/thread-device.h | 20 + + drivers/md/dm-vdo/thread-registry.c | 92 + + drivers/md/dm-vdo/thread-registry.h | 32 + + drivers/md/dm-vdo/time-utils.h | 28 + + drivers/md/dm-vdo/types.h | 393 ++ + drivers/md/dm-vdo/uds-sysfs.c | 186 + + drivers/md/dm-vdo/uds-sysfs.h | 12 + + drivers/md/dm-vdo/uds-threads.c | 183 + + drivers/md/dm-vdo/uds-threads.h | 115 + + drivers/md/dm-vdo/uds.h | 329 ++ + drivers/md/dm-vdo/vdo.c | 1785 +++++++ + drivers/md/dm-vdo/vdo.h | 376 ++ + drivers/md/dm-vdo/vio.c | 501 ++ + drivers/md/dm-vdo/vio.h | 199 + + drivers/md/dm-vdo/volume-index.c | 1290 +++++ + drivers/md/dm-vdo/volume-index.h | 192 + + drivers/md/dm-vdo/volume.c | 1711 +++++++ + drivers/md/dm-vdo/volume.h | 171 + + drivers/md/dm-vdo/wait-queue.c | 205 + + drivers/md/dm-vdo/wait-queue.h | 138 + + drivers/md/dm-verity-fec.c | 21 +- + drivers/md/dm-verity-target.c | 15 +- + drivers/md/dm-writecache.c | 8 +- + drivers/md/persistent-data/dm-block-manager.c | 6 +- + include/linux/dm-bufio.h | 5 +- + include/linux/dm-io.h | 3 +- + 137 files changed, 57169 insertions(+), 83 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/vdo-design.rst + create mode 100644 Documentation/admin-guide/device-mapper/vdo.rst + create mode 100644 drivers/md/dm-vdo/Kconfig + create mode 100644 drivers/md/dm-vdo/Makefile + create mode 100644 drivers/md/dm-vdo/action-manager.c + create mode 100644 drivers/md/dm-vdo/action-manager.h + create mode 100644 drivers/md/dm-vdo/admin-state.c + create mode 100644 drivers/md/dm-vdo/admin-state.h + create mode 100644 drivers/md/dm-vdo/block-map.c + create mode 100644 drivers/md/dm-vdo/block-map.h + create mode 100644 drivers/md/dm-vdo/chapter-index.c + create mode 100644 drivers/md/dm-vdo/chapter-index.h + create mode 100644 drivers/md/dm-vdo/completion.c + create mode 100644 drivers/md/dm-vdo/completion.h + create mode 100644 drivers/md/dm-vdo/config.c + create mode 100644 drivers/md/dm-vdo/config.h + create mode 100644 drivers/md/dm-vdo/constants.h + create mode 100644 drivers/md/dm-vdo/cpu.h + create mode 100644 drivers/md/dm-vdo/data-vio.c + create mode 100644 drivers/md/dm-vdo/data-vio.h + create mode 100644 drivers/md/dm-vdo/dedupe.c + create mode 100644 drivers/md/dm-vdo/dedupe.h + create mode 100644 drivers/md/dm-vdo/delta-index.c + create mode 100644 drivers/md/dm-vdo/delta-index.h + create mode 100644 drivers/md/dm-vdo/dm-vdo-target.c + create mode 100644 drivers/md/dm-vdo/dump.c + create mode 100644 drivers/md/dm-vdo/dump.h + create mode 100644 drivers/md/dm-vdo/encodings.c + create mode 100644 drivers/md/dm-vdo/encodings.h + create mode 100644 drivers/md/dm-vdo/errors.c + create mode 100644 drivers/md/dm-vdo/errors.h + create mode 100644 drivers/md/dm-vdo/flush.c + create mode 100644 drivers/md/dm-vdo/flush.h + create mode 100644 drivers/md/dm-vdo/funnel-queue.c + create mode 100644 drivers/md/dm-vdo/funnel-queue.h + create mode 100644 drivers/md/dm-vdo/funnel-requestqueue.c + create mode 100644 drivers/md/dm-vdo/funnel-requestqueue.h + create mode 100644 drivers/md/dm-vdo/funnel-workqueue.c + create mode 100644 drivers/md/dm-vdo/funnel-workqueue.h + create mode 100644 drivers/md/dm-vdo/geometry.c + create mode 100644 drivers/md/dm-vdo/geometry.h + create mode 100644 drivers/md/dm-vdo/hash-utils.h + create mode 100644 drivers/md/dm-vdo/index-layout.c + create mode 100644 drivers/md/dm-vdo/index-layout.h + create mode 100644 drivers/md/dm-vdo/index-page-map.c + create mode 100644 drivers/md/dm-vdo/index-page-map.h + create mode 100644 drivers/md/dm-vdo/index-session.c + create mode 100644 drivers/md/dm-vdo/index-session.h + create mode 100644 drivers/md/dm-vdo/index.c + create mode 100644 drivers/md/dm-vdo/index.h + create mode 100644 drivers/md/dm-vdo/int-map.c + create mode 100644 drivers/md/dm-vdo/int-map.h + create mode 100644 drivers/md/dm-vdo/io-factory.c + create mode 100644 drivers/md/dm-vdo/io-factory.h + create mode 100644 drivers/md/dm-vdo/io-submitter.c + create mode 100644 drivers/md/dm-vdo/io-submitter.h + create mode 100644 drivers/md/dm-vdo/logger.c + create mode 100644 drivers/md/dm-vdo/logger.h + create mode 100644 drivers/md/dm-vdo/logical-zone.c + create mode 100644 drivers/md/dm-vdo/logical-zone.h + create mode 100644 drivers/md/dm-vdo/memory-alloc.c + create mode 100644 drivers/md/dm-vdo/memory-alloc.h + create mode 100644 drivers/md/dm-vdo/message-stats.c + create mode 100644 drivers/md/dm-vdo/message-stats.h + create mode 100644 drivers/md/dm-vdo/murmurhash3.c + create mode 100644 drivers/md/dm-vdo/murmurhash3.h + create mode 100644 drivers/md/dm-vdo/numeric.h + create mode 100644 drivers/md/dm-vdo/open-chapter.c + create mode 100644 drivers/md/dm-vdo/open-chapter.h + create mode 100644 drivers/md/dm-vdo/packer.c + create mode 100644 drivers/md/dm-vdo/packer.h + create mode 100644 drivers/md/dm-vdo/permassert.c + create mode 100644 drivers/md/dm-vdo/permassert.h + create mode 100644 drivers/md/dm-vdo/physical-zone.c + create mode 100644 drivers/md/dm-vdo/physical-zone.h + create mode 100644 drivers/md/dm-vdo/pool-sysfs-stats.c + create mode 100644 drivers/md/dm-vdo/pool-sysfs.c + create mode 100644 drivers/md/dm-vdo/pool-sysfs.h + create mode 100644 drivers/md/dm-vdo/priority-table.c + create mode 100644 drivers/md/dm-vdo/priority-table.h + create mode 100644 drivers/md/dm-vdo/radix-sort.c + create mode 100644 drivers/md/dm-vdo/radix-sort.h + create mode 100644 drivers/md/dm-vdo/recovery-journal.c + create mode 100644 drivers/md/dm-vdo/recovery-journal.h + create mode 100644 drivers/md/dm-vdo/repair.c + create mode 100644 drivers/md/dm-vdo/repair.h + create mode 100644 drivers/md/dm-vdo/slab-depot.c + create mode 100644 drivers/md/dm-vdo/slab-depot.h + create mode 100644 drivers/md/dm-vdo/sparse-cache.c + create mode 100644 drivers/md/dm-vdo/sparse-cache.h + create mode 100644 drivers/md/dm-vdo/statistics.h + create mode 100644 drivers/md/dm-vdo/status-codes.c + create mode 100644 drivers/md/dm-vdo/status-codes.h + create mode 100644 drivers/md/dm-vdo/string-utils.c + create mode 100644 drivers/md/dm-vdo/string-utils.h + create mode 100644 drivers/md/dm-vdo/sysfs.c + create mode 100644 drivers/md/dm-vdo/thread-cond-var.c + create mode 100644 drivers/md/dm-vdo/thread-device.c + create mode 100644 drivers/md/dm-vdo/thread-device.h + create mode 100644 drivers/md/dm-vdo/thread-registry.c + create mode 100644 drivers/md/dm-vdo/thread-registry.h + create mode 100644 drivers/md/dm-vdo/time-utils.h + create mode 100644 drivers/md/dm-vdo/types.h + create mode 100644 drivers/md/dm-vdo/uds-sysfs.c + create mode 100644 drivers/md/dm-vdo/uds-sysfs.h + create mode 100644 drivers/md/dm-vdo/uds-threads.c + create mode 100644 drivers/md/dm-vdo/uds-threads.h + create mode 100644 drivers/md/dm-vdo/uds.h + create mode 100644 drivers/md/dm-vdo/vdo.c + create mode 100644 drivers/md/dm-vdo/vdo.h + create mode 100644 drivers/md/dm-vdo/vio.c + create mode 100644 drivers/md/dm-vdo/vio.h + create mode 100644 drivers/md/dm-vdo/volume-index.c + create mode 100644 drivers/md/dm-vdo/volume-index.h + create mode 100644 drivers/md/dm-vdo/volume.c + create mode 100644 drivers/md/dm-vdo/volume.h + create mode 100644 drivers/md/dm-vdo/wait-queue.c + create mode 100644 drivers/md/dm-vdo/wait-queue.h +$ git reset --hard HEAD^ +HEAD is now at e214b5042394 Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +Merging next-20240206 version of device-mapper +$ git merge -m next-20240206/device-mapper 0a9bab391e336489169b95cb0d4553d921302189 +Already up to date. +Merging libata/for-next (7f7f2b7624d4 dt-bindings: ata: atmel: remove at91 compact flash documentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/atmel-at91_cf.txt | 19 ------------------- + drivers/ata/pata_parport/pata_parport.c | 2 +- + 2 files changed, 1 insertion(+), 20 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/atmel-at91_cf.txt +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 (40d83f40c44b mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 6 +++++- + drivers/memstick/core/memstick.c | 2 +- + drivers/mmc/core/block.c | 14 +++++++------- + drivers/mmc/core/bus.c | 2 +- + drivers/mmc/core/host.c | 5 +++-- + drivers/mmc/core/queue.c | 2 -- + drivers/mmc/core/sdio_bus.c | 2 +- + 7 files changed, 18 insertions(+), 15 deletions(-) +Merging mfd/for-mfd-next (1e0ea9e75ff3 mfd: wm831x: Remove redundant forever while loop) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + drivers/mfd/cros_ec_dev.c | 9 +++++ + drivers/mfd/intel-lpss-pci.c | 28 ++++++++++---- + drivers/mfd/intel-lpss.c | 9 ++++- + drivers/mfd/intel-lpss.h | 14 ++++++- + drivers/mfd/lpc_ich.c | 3 +- + drivers/mfd/omap-usb-host.c | 2 +- + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/wm831x-auxadc.c | 43 +++++++++------------- + include/linux/mfd/sun4i-gpadc.h | 4 +- + 11 files changed, 77 insertions(+), 41 deletions(-) +Merging backlight/for-backlight-next (3b75d271e161 backlight: hx8357: Fix potential NULL pointer dereference) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + drivers/video/backlight/hx8357.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging battery/for-next (aa08a0d10f5e power: supply: axp20x_usb_power: enable usb_type reporting) +$ 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. + drivers/power/supply/axp20x_usb_power.c | 147 +++++++++++++++++++++++++--- + drivers/power/supply/bq27xxx_battery.c | 41 +++++--- + drivers/power/supply/bq27xxx_battery_i2c.c | 46 ++++----- + drivers/power/supply/da9030_battery.c | 6 +- + drivers/power/supply/da9052-battery.c | 4 +- + drivers/power/supply/da9150-charger.c | 72 ++++---------- + drivers/power/supply/ds2760_battery.c | 4 +- + drivers/power/supply/goldfish_battery.c | 24 ++--- + drivers/power/supply/lp8727_charger.c | 35 ++----- + drivers/power/supply/lp8788-charger.c | 21 ++-- + drivers/power/supply/max14577_charger.c | 8 +- + drivers/power/supply/max77693_charger.c | 10 +- + drivers/power/supply/max8925_power.c | 37 ++----- + drivers/power/supply/pcf50633-charger.c | 23 ++--- + drivers/power/supply/rt5033_battery.c | 14 +-- + drivers/power/supply/rx51_battery.c | 57 +++-------- + drivers/power/supply/tps65090-charger.c | 18 ++-- + drivers/power/supply/twl4030_madc_battery.c | 59 +++-------- + drivers/power/supply/wm831x_backup.c | 13 +-- + drivers/power/supply/wm831x_power.c | 24 ++--- + drivers/power/supply/wm8350_power.c | 30 ++---- + include/linux/power/bq27xxx_battery.h | 1 - + 22 files changed, 301 insertions(+), 393 deletions(-) +Merging regulator/for-next (8f2344ff71f6 Merge remote-tracking branch 'regulator/for-6.9' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mcp16502-regulator.txt | 144 ----------------- + .../bindings/regulator/microchip,mcp16502.yaml | 180 +++++++++++++++++++++ + .../devicetree/bindings/regulator/ti,tps65132.yaml | 84 ++++++++++ + .../bindings/regulator/tps65132-regulator.txt | 46 ------ + drivers/regulator/fixed-helper.c | 4 +- + drivers/regulator/qcom_smd-regulator.c | 19 +-- + 6 files changed, 276 insertions(+), 201 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65132.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/tps65132-regulator.txt +Merging security/next (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 +Already up to date. +Merging integrity/next-integrity (1ed4b5631002 Revert "KEYS: encrypted: Add check for strsep") +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (7c655bee5cd8 selinux: only filter copy-up xattrs following initialization) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) +Merging smack/next (f0816d4332c3 ramfs: Initialize security of in-memory inodes) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + fs/ramfs/inode.c | 32 +++++++++++++- + security/smack/smack_lsm.c | 105 ++++++++++++++++++++++++++------------------- + 2 files changed, 91 insertions(+), 46 deletions(-) +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 (cebb9ce9b939 tpm/tpm_ftpm_tee: fix all kernel-doc warnings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm_ftpm_tee.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging watchdog/master (41bccc98fb79 Linux 6.8-rc2) +$ 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 (d2d00e15808c powerpc: iommu: Bring back table group release_ownership() call) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (aa13b709084a audit: use KMEM_CACHE() instead of kmem_cache_create()) +$ 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. + kernel/audit.c | 4 +--- + kernel/auditfilter.c | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging devicetree/for-next (574849054d97 of: property: use unsigned int return on of_graph_get_endpoint_count()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/Makefile +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/property.c +Recorded preimage for 'Documentation/devicetree/bindings/trivial-devices.yaml' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/trivial-devices.yaml'. +[master 8de4bc0d3ae3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/Makefile | 3 - + .../devicetree/bindings/fpga/fpga-region.txt | 479 --------------------- + .../devicetree/bindings/fpga/fpga-region.yaml | 358 +++++++++++++++ + .../devicetree/bindings/gpio/mrvl-gpio.yaml | 2 +- + Documentation/devicetree/bindings/i2c/i2c-pxa.yaml | 2 +- + .../mediatek,mt6577-sysirq.yaml | 85 ++++ + .../interrupt-controller/mediatek,sysirq.txt | 44 -- + .../devicetree/bindings/misc/xlnx,sd-fec.txt | 58 --- + .../devicetree/bindings/misc/xlnx,sd-fec.yaml | 140 ++++++ + .../devicetree/bindings/mux/mux-controller.yaml | 2 +- + .../devicetree/bindings/rtc/sa1100-rtc.yaml | 2 +- + .../devicetree/bindings/submitting-patches.rst | 23 +- + .../devicetree/bindings/timer/mrvl,mmp-timer.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 79 ++-- + Documentation/misc-devices/xilinx_sdfec.rst | 2 +- + MAINTAINERS | 7 +- + drivers/of/property.c | 12 +- + include/linux/of_graph.h | 4 +- + 18 files changed, 653 insertions(+), 651 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/fpga/fpga-region.txt + create mode 100644 Documentation/devicetree/bindings/fpga/fpga-region.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,mt6577-sysirq.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt + delete mode 100644 Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt + create mode 100644 Documentation/devicetree/bindings/misc/xlnx,sd-fec.yaml +Merging dt-krzk/for-next (8c82b4eef297 ARM: dts: sti: minor whitespace cleanup around '=') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/marvell/dove-cubox.dts | 4 ++-- + arch/arm/boot/dts/marvell/mmp2-brownstone.dts | 2 +- + arch/arm/boot/dts/st/stih407-pinctrl.dtsi | 8 ++++---- + arch/arm/boot/dts/ti/davinci/da850.dtsi | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) +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 +Already up to date. +Merging spi/for-next (80fa6a033ac8 Merge remote-tracking branch 'spi/for-6.9' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/samsung,spi.yaml | 1 + + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 1 + + .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 18 ++- + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-axi-spi-engine.c | 17 +-- + drivers/spi/spi-bcm2835.c | 27 ++--- + drivers/spi/spi-cs42l43.c | 22 +++- + drivers/spi/spi-fsl-dspi.c | 15 +-- + drivers/spi/spi-intel.c | 34 +++++- + drivers/spi/spi-mt65xx.c | 5 + + drivers/spi/spi-nxp-fspi.c | 2 +- + drivers/spi/spi-rockchip.c | 13 +-- + drivers/spi/spi-s3c64xx.c | 27 +++-- + drivers/spi/spi.c | 130 +++++++-------------- + include/linux/spi/spi.h | 6 +- + 15 files changed, 155 insertions(+), 165 deletions(-) +Merging tip/master (6d461dc4863f Merge branch into tip/master: 'x86/sev') +$ 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 MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/alternative.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/kernel/kvm.c +Auto-merging arch/x86/kernel/smp.c +Auto-merging arch/x86/mm/dump_pagetables.c +Auto-merging arch/x86/mm/tlb.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging include/linux/bitmap.h +Auto-merging net/sched/sch_api.c +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Documentation/admin-guide/hw-vuln/spectre.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 15 +- + Documentation/arch/x86/amd-memory-encryption.rst | 16 +- + Documentation/arch/x86/pti.rst | 6 +- + Documentation/arch/x86/x86_64/fred.rst | 96 ++ + Documentation/arch/x86/x86_64/index.rst | 1 + + Documentation/process/maintainer-tip.rst | 4 +- + Documentation/virt/coco/sev-guest.rst | 52 + + MAINTAINERS | 10 + + arch/x86/Kbuild | 2 + + arch/x86/Kconfig | 66 +- + arch/x86/Makefile | 11 +- + arch/x86/boot/compressed/acpi.c | 2 + + arch/x86/boot/compressed/cmdline.c | 2 + + arch/x86/boot/compressed/efi.c | 2 + + arch/x86/boot/compressed/efi.h | 9 - + arch/x86/boot/compressed/ident_map_64.c | 6 +- + arch/x86/boot/compressed/misc.c | 44 +- + arch/x86/boot/compressed/misc.h | 3 + + arch/x86/boot/compressed/pgtable_64.c | 1 + + arch/x86/boot/compressed/sev.c | 5 + + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/entry/Makefile | 5 +- + arch/x86/entry/calling.h | 55 +- + arch/x86/entry/entry_32.S | 6 +- + arch/x86/entry/entry_64.S | 29 +- + arch/x86/entry/entry_64_fred.S | 131 +++ + arch/x86/entry/entry_fred.c | 294 ++++++ + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/include/asm/asm-prototypes.h | 1 + + arch/x86/include/asm/barrier.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/current.h | 9 +- + arch/x86/include/asm/desc.h | 2 - + arch/x86/include/asm/disabled-features.h | 26 +- + arch/x86/include/asm/efi.h | 14 +- + arch/x86/include/asm/extable_fixup_types.h | 4 +- + arch/x86/include/asm/fpu/sched.h | 10 +- + arch/x86/include/asm/fred.h | 97 ++ + arch/x86/include/asm/ia32.h | 4 +- + arch/x86/include/asm/idtentry.h | 88 +- + arch/x86/include/asm/iommu.h | 1 + + arch/x86/include/asm/kexec.h | 1 - + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/asm/linkage.h | 16 +- + arch/x86/include/asm/mem_encrypt.h | 2 +- + arch/x86/include/asm/msr-index.h | 24 +- + arch/x86/include/asm/msr.h | 18 + + arch/x86/include/asm/nospec-branch.h | 53 +- + arch/x86/include/asm/page.h | 6 +- + arch/x86/include/asm/pci.h | 13 - + 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/ptrace.h | 104 +- + arch/x86/include/asm/setup_data.h | 32 + + arch/x86/include/asm/sev.h | 41 +- + arch/x86/include/asm/static_call.h | 2 +- + arch/x86/include/asm/switch_to.h | 8 +- + arch/x86/include/asm/text-patching.h | 2 + + arch/x86/include/asm/thread_info.h | 12 +- + arch/x86/include/asm/trap_pf.h | 20 +- + arch/x86/include/asm/trapnr.h | 12 + + arch/x86/include/asm/uaccess_64.h | 11 +- + arch/x86/include/asm/vmx.h | 17 +- + arch/x86/include/asm/x86_init.h | 2 - + arch/x86/include/uapi/asm/bootparam.h | 72 +- + arch/x86/include/uapi/asm/processor-flags.h | 7 + + arch/x86/include/uapi/asm/setup_data.h | 83 ++ + arch/x86/kernel/Makefile | 1 + + 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/acrn.c | 4 +- + arch/x86/kernel/cpu/amd.c | 23 +- + arch/x86/kernel/cpu/bugs.c | 43 +- + arch/x86/kernel/cpu/common.c | 46 +- + arch/x86/kernel/cpu/cpuid-deps.c | 2 + + arch/x86/kernel/cpu/mce/core.c | 28 +- + arch/x86/kernel/cpu/mshyperv.c | 15 +- + arch/x86/kernel/cpu/mtrr/generic.c | 3 + + arch/x86/kernel/cpu/resctrl/core.c | 18 +- + arch/x86/kernel/cpu/resctrl/internal.h | 8 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 48 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 29 +- + arch/x86/kernel/crash.c | 4 + + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/espfix_64.c | 8 + + arch/x86/kernel/fpu/signal.c | 13 +- + arch/x86/kernel/fred.c | 59 ++ + arch/x86/kernel/ftrace.c | 3 +- + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/head_64.S | 39 +- + arch/x86/kernel/idt.c | 4 +- + arch/x86/kernel/irqinit.c | 7 +- + arch/x86/kernel/kprobes/opt.c | 2 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/ldt.c | 8 +- + arch/x86/kernel/nmi.c | 48 +- + arch/x86/kernel/process_32.c | 7 +- + arch/x86/kernel/process_64.c | 74 +- + arch/x86/kernel/sev-shared.c | 104 +- + arch/x86/kernel/sev.c | 15 +- + arch/x86/kernel/smp.c | 10 +- + arch/x86/kernel/static_call.c | 2 +- + arch/x86/kernel/traps.c | 78 +- + arch/x86/kernel/vmlinux.lds.S | 11 +- + arch/x86/kvm/lapic.c | 5 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 2 +- + arch/x86/kvm/svm/nested.c | 2 +- + arch/x86/kvm/svm/sev.c | 37 +- + arch/x86/kvm/svm/svm.c | 19 +- + arch/x86/kvm/svm/svm.h | 1 + + arch/x86/kvm/svm/vmenter.S | 4 +- + arch/x86/kvm/vmx/vmx.c | 14 +- + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/cmpxchg16b_emu.S | 12 +- + arch/x86/lib/cmpxchg8b_emu.S | 30 +- + arch/x86/lib/getuser.S | 24 +- + arch/x86/lib/putuser.S | 20 +- + arch/x86/lib/retpoline.S | 26 +- + arch/x86/lib/x86-opcode-map.txt | 4 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/debug_pagetables.c | 4 +- + arch/x86/mm/dump_pagetables.c | 4 +- + arch/x86/mm/extable.c | 78 ++ + arch/x86/mm/fault.c | 37 +- + arch/x86/mm/mem_encrypt.c | 56 +- + arch/x86/mm/mem_encrypt_identity.c | 19 +- + 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/platform/efi/efi.c | 5 + + arch/x86/platform/pvh/enlighten.c | 1 + + arch/x86/purgatory/Makefile | 2 +- + arch/x86/virt/svm/Makefile | 3 + + arch/x86/virt/svm/sev.c | 560 +++++++++++ + arch/x86/xen/enlighten_pvh.c | 1 + + arch/x86/xen/vga.c | 1 - + arch/x86/xen/xen-asm.S | 10 +- + drivers/crypto/ccp/sev-dev.c | 1156 ++++++++++++++++++++-- + drivers/crypto/ccp/sev-dev.h | 5 + + drivers/iommu/amd/amd_iommu.h | 1 - + drivers/iommu/amd/init.c | 124 ++- + drivers/irqchip/irq-gic-v3.c | 51 +- + drivers/irqchip/irq-gic.c | 27 +- + drivers/xen/events/events_base.c | 2 +- + include/linux/amd-iommu.h | 6 +- + include/linux/bitmap.h | 3 + + include/linux/compiler-gcc.h | 2 +- + include/linux/compiler.h | 2 +- + include/linux/hrtimer.h | 4 +- + include/linux/indirect_call_wrapper.h | 2 +- + include/linux/irq.h | 2 +- + include/linux/irqhandler.h | 2 +- + include/linux/module.h | 2 +- + include/linux/objtool.h | 2 +- + include/linux/psp-sev.h | 321 +++++- + include/linux/pti.h | 2 +- + include/net/netfilter/nf_tables_core.h | 2 +- + include/net/tc_wrapper.h | 2 +- + include/uapi/linux/psp-sev.h | 59 ++ + kernel/cpu.c | 5 +- + kernel/irq/irq_sim.c | 28 +- + kernel/irq/irqdesc.c | 112 ++- + kernel/time/hrtimer.c | 3 + + 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/cpufeatures.h | 3 + + tools/arch/x86/include/asm/disabled-features.h | 18 +- + tools/arch/x86/include/asm/msr-index.h | 13 +- + tools/arch/x86/lib/x86-opcode-map.txt | 4 +- + tools/objtool/arch/x86/decode.c | 19 +- + tools/objtool/arch/x86/special.c | 2 +- + tools/objtool/check.c | 4 +- + 194 files changed, 4760 insertions(+), 1057 deletions(-) + create mode 100644 Documentation/arch/x86/x86_64/fred.rst + create mode 100644 arch/x86/entry/entry_64_fred.S + create mode 100644 arch/x86/entry/entry_fred.c + create mode 100644 arch/x86/include/asm/fred.h + create mode 100644 arch/x86/include/asm/setup_data.h + create mode 100644 arch/x86/include/uapi/asm/setup_data.h + create mode 100644 arch/x86/kernel/fred.c + create mode 100644 arch/x86/virt/svm/Makefile + create mode 100644 arch/x86/virt/svm/sev.c +Merging clockevents/timers/drivers/next (0076a37a426b dt-bindings: timer: renesas,tmu: Document input capture interrupt) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/renesas,tmu.yaml | 18 ++++++++++++++++-- + .../bindings/timer/samsung,exynos4210-mct.yaml | 2 ++ + drivers/clocksource/timer-imx-gpt.c | 3 +-- + drivers/clocksource/timer-stm32.c | 4 ++-- + drivers/clocksource/timer-ti-32k.c | 2 +- + 5 files changed, 22 insertions(+), 7 deletions(-) +Merging edac/edac-for-next (2f412b51fb42 Merge ras/edac-amd-atl into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../admin-guide/RAS/address-translation.rst | 24 + + .../ras.rst => admin-guide/RAS/error-decoding.rst} | 11 +- + Documentation/admin-guide/RAS/index.rst | 7 + + .../admin-guide/{ras.rst => RAS/main.rst} | 10 +- + Documentation/admin-guide/index.rst | 2 +- + Documentation/index.rst | 1 - + MAINTAINERS | 9 +- + drivers/edac/Kconfig | 2 + + drivers/edac/amd64_edac.c | 334 ++-------- + drivers/edac/i10nm_base.c | 1 + + drivers/edac/igen6_edac.c | 2 + + drivers/edac/synopsys_edac.c | 4 +- + drivers/ras/Kconfig | 1 + + drivers/ras/Makefile | 2 + + drivers/ras/amd/atl/Kconfig | 20 + + drivers/ras/amd/atl/Makefile | 18 + + drivers/ras/amd/atl/access.c | 133 ++++ + drivers/ras/amd/atl/core.c | 225 +++++++ + drivers/ras/amd/atl/dehash.c | 500 ++++++++++++++ + drivers/ras/amd/atl/denormalize.c | 719 +++++++++++++++++++++ + drivers/ras/amd/atl/internal.h | 306 +++++++++ + drivers/ras/amd/atl/map.c | 682 +++++++++++++++++++ + drivers/ras/amd/atl/reg_fields.h | 606 +++++++++++++++++ + drivers/ras/amd/atl/system.c | 288 +++++++++ + drivers/ras/amd/atl/umc.c | 290 +++++++++ + drivers/ras/ras.c | 31 + + include/linux/ras.h | 16 + + 27 files changed, 3949 insertions(+), 295 deletions(-) + create mode 100644 Documentation/admin-guide/RAS/address-translation.rst + rename Documentation/{RAS/ras.rst => admin-guide/RAS/error-decoding.rst} (73%) + create mode 100644 Documentation/admin-guide/RAS/index.rst + rename Documentation/admin-guide/{ras.rst => RAS/main.rst} (99%) + create mode 100644 drivers/ras/amd/atl/Kconfig + create mode 100644 drivers/ras/amd/atl/Makefile + create mode 100644 drivers/ras/amd/atl/access.c + create mode 100644 drivers/ras/amd/atl/core.c + create mode 100644 drivers/ras/amd/atl/dehash.c + create mode 100644 drivers/ras/amd/atl/denormalize.c + create mode 100644 drivers/ras/amd/atl/internal.h + create mode 100644 drivers/ras/amd/atl/map.c + create mode 100644 drivers/ras/amd/atl/reg_fields.h + create mode 100644 drivers/ras/amd/atl/system.c + create mode 100644 drivers/ras/amd/atl/umc.c +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 +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (3909f6fb5167 rcu-tasks: Maintain real-time response in rcu_tasks_postscan()) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/hrtimer.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + Documentation/RCU/checklist.rst | 32 +- + Documentation/RCU/rcu_dereference.rst | 5 +- + Documentation/RCU/whatisRCU.rst | 19 +- + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 489 +++++++++++---------- + Documentation/atomic_t.txt | 4 +- + Documentation/litmus-tests/README | 45 ++ + .../atomic/cmpxchg-fail-ordered-1.litmus | 34 ++ + .../atomic/cmpxchg-fail-ordered-2.litmus | 30 ++ + .../atomic/cmpxchg-fail-unordered-1.litmus | 33 ++ + .../atomic/cmpxchg-fail-unordered-2.litmus | 30 ++ + arch/x86/kernel/tsc.c | 2 +- + fs/proc/bootconfig.c | 12 +- + include/linux/hrtimer.h | 1 + + include/linux/rcu_sync.h | 1 - + include/linux/rcupdate.h | 4 +- + include/linux/sched.h | 2 + + init/init_task.c | 1 + + kernel/context_tracking.c | 4 + + kernel/fork.c | 1 + + kernel/rcu/Kconfig | 13 + + kernel/rcu/rcu.h | 13 +- + kernel/rcu/rcuscale.c | 6 +- + kernel/rcu/rcutorture.c | 13 +- + kernel/rcu/srcutree.c | 24 +- + kernel/rcu/sync.c | 16 - + kernel/rcu/tasks.h | 107 +++-- + kernel/rcu/tree.c | 235 ++++++---- + kernel/rcu/tree.h | 20 +- + kernel/rcu/tree_exp.h | 83 +--- + kernel/rcu/tree_nocb.h | 69 +-- + kernel/rcu/tree_plugin.h | 52 +-- + tools/testing/selftests/rcutorture/bin/torture.sh | 2 +- + 33 files changed, 839 insertions(+), 564 deletions(-) + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus +Merging kvm/next (e45964771007 x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLATFORM) +$ 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 (93c28484d2a0 Merge branch kvm-arm64/kerneldoc into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Merge made by the 'ort' strategy. + arch/arm64/kvm/debug.c | 3 ++- + arch/arm64/kvm/guest.c | 7 +++++-- + arch/arm64/kvm/hyp/aarch32.c | 4 ++-- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 2 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 4 ++-- + arch/arm64/kvm/sys_regs.c | 7 +++++-- + arch/arm64/kvm/vgic/vgic-init.c | 4 +++- + arch/arm64/kvm/vgic/vgic-its.c | 4 ++-- + arch/arm64/kvm/vgic/vgic.c | 2 +- + tools/testing/selftests/kvm/aarch64/set_id_regs.c | 18 +++++++++++------- + 11 files changed, 35 insertions(+), 22 deletions(-) +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 (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (4d0e8f9a361b KVM: riscv: selftests: Add Zfa extension to get-reg-list test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (873eef46b33c Merge branches 'asyncpf', 'asyncpf_abi', 'fixes', 'generic', 'misc', 'mmu', 'pmu', 'selftests' and 'svm') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/kvm.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/sev.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/riscv/get-reg-list.c +Recorded preimage for 'arch/x86/kvm/svm/sev.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/kvm/svm/sev.c'. +[master cd85b7429976] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/x86/msr.rst | 19 +- + arch/x86/include/asm/kvm-x86-pmu-ops.h | 4 +- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/uapi/asm/kvm_para.h | 1 - + arch/x86/kernel/kvm.c | 11 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/kvm_emulate.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 4 +- + arch/x86/kvm/pmu.c | 163 ++++-- + arch/x86/kvm/pmu.h | 57 +- + arch/x86/kvm/svm/pmu.c | 22 +- + arch/x86/kvm/svm/sev.c | 58 +- + arch/x86/kvm/trace.h | 10 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/kvm/vmx/pmu_intel.c | 224 +++----- + arch/x86/kvm/x86.c | 63 +-- + include/linux/kvm_host.h | 1 - + tools/testing/selftests/kvm/Makefile | 2 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 12 +- + tools/testing/selftests/kvm/aarch64/hypercalls.c | 16 +- + .../selftests/kvm/aarch64/page_fault_test.c | 6 +- + tools/testing/selftests/kvm/aarch64/smccc_filter.c | 2 +- + .../selftests/kvm/aarch64/vpmu_counter_access.c | 12 +- + tools/testing/selftests/kvm/demand_paging_test.c | 4 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 4 +- + tools/testing/selftests/kvm/dirty_log_test.c | 54 +- + tools/testing/selftests/kvm/get-reg-list.c | 2 +- + tools/testing/selftests/kvm/guest_print_test.c | 8 +- + .../testing/selftests/kvm/hardware_disable_test.c | 6 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 4 + + tools/testing/selftests/kvm/include/test_util.h | 2 + + tools/testing/selftests/kvm/include/x86_64/pmu.h | 97 ++++ + .../selftests/kvm/include/x86_64/processor.h | 150 +++-- + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 4 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 4 +- + tools/testing/selftests/kvm/lib/elf.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 81 ++- + tools/testing/selftests/kvm/lib/memstress.c | 2 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 2 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 2 +- + tools/testing/selftests/kvm/lib/test_util.c | 25 + + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 2 +- + tools/testing/selftests/kvm/lib/x86_64/pmu.c | 31 ++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 36 +- + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 6 +- + .../kvm/memslot_modification_stress_test.c | 2 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 6 +- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 2 +- + tools/testing/selftests/kvm/rseq_test.c | 4 +- + tools/testing/selftests/kvm/s390x/resets.c | 4 +- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 20 +- + .../testing/selftests/kvm/set_memory_region_test.c | 6 +- + .../selftests/kvm/system_counter_offset_test.c | 2 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 6 +- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 4 +- + .../kvm/x86_64/dirty_log_page_splitting_test.c | 21 +- + .../testing/selftests/kvm/x86_64/flds_emulation.h | 2 +- + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 5 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 9 +- + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 2 +- + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 +- + .../testing/selftests/kvm/x86_64/kvm_clock_test.c | 42 +- + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 6 +- + .../selftests/kvm/x86_64/platform_info_test.c | 2 +- + .../selftests/kvm/x86_64/pmu_counters_test.c | 617 +++++++++++++++++++++ + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 145 ++--- + .../selftests/kvm/x86_64/sev_migrate_tests.c | 28 +- + .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 6 +- + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 10 +- + .../selftests/kvm/x86_64/ucna_injection_test.c | 8 +- + .../selftests/kvm/x86_64/userspace_io_test.c | 2 +- + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 29 +- + .../selftests/kvm/x86_64/vmx_apic_access_test.c | 2 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 16 +- + .../vmx_exception_with_invalid_guest_state.c | 2 +- + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 19 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +- + .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 8 +- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 2 +- + tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 2 +- + virt/kvm/async_pf.c | 73 ++- + virt/kvm/kvm_main.c | 4 +- + 84 files changed, 1616 insertions(+), 732 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/x86_64/pmu.h + create mode 100644 tools/testing/selftests/kvm/lib/x86_64/pmu.c + create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_counters_test.c +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 (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. + arch/riscv/mm/tlbflush.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging workqueues/for-next (40911d4457f2 Merge branch 'for-6.8-fixes' into for-6.9) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/core-api/workqueue.rst +Merge made by the 'ort' strategy. + Documentation/core-api/workqueue.rst | 43 +- + include/linux/workqueue.h | 91 ++- + kernel/softirq.c | 3 + + kernel/workqueue.c | 1220 +++++++++++++++++++++++++++------- + rust/kernel/workqueue.rs | 6 +- + tools/workqueue/wq_dump.py | 104 ++- + 6 files changed, 1173 insertions(+), 294 deletions(-) +Merging drivers-x86/for-next (682c259a8496 platform/x86/intel/ifs: Remove unnecessary initialization of 'ret') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging drivers/platform/x86/intel/ifs/load.c +Auto-merging drivers/platform/x86/wmi.c +Merge made by the 'ort' strategy. + .../admin-guide/laptops/thinkpad-acpi.rst | 7 +- + drivers/platform/mellanox/mlxbf-bootctl.c | 14 +- + drivers/platform/x86/Kconfig | 6 - + drivers/platform/x86/amd/Kconfig | 2 +- + drivers/platform/x86/amd/hsmp.c | 584 ++++++++++++++++----- + drivers/platform/x86/asus-wmi.c | 1 - + drivers/platform/x86/dell/Kconfig | 3 - + drivers/platform/x86/dell/dell-laptop.c | 2 - + drivers/platform/x86/dell/dell-wmi-privacy.c | 1 - + drivers/platform/x86/huawei-wmi.c | 1 - + drivers/platform/x86/intel/ifs/load.c | 2 +- + drivers/platform/x86/intel/ifs/runtest.c | 101 ++-- + drivers/platform/x86/silicom-platform.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 29 +- + drivers/platform/x86/wmi.c | 2 +- + include/trace/events/intel_ifs.h | 12 +- + 16 files changed, 571 insertions(+), 203 deletions(-) +Merging chrome-platform/for-next (6613476e225e Linux 6.8-rc1) +$ 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 (e3c5df138169 firmware: coreboot: make coreboot_bus_type const) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + drivers/firmware/google/coreboot_table.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hsi/for-next (a0e35a173a86 hsi: hsi_core: make hsi_bus_type const) +$ 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/hsi_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds-lj/for-leds-next (54602f38551e leds: Make flash and multicolor dependencies unconditional) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-led-trigger-netdev | 12 + + .../ABI/testing/sysfs-class-led-trigger-tty | 14 +- + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 82 ++++- + drivers/leds/Kconfig | 4 +- + drivers/leds/flash/Kconfig | 4 +- + drivers/leds/led-class.c | 6 + + drivers/leds/led-triggers.c | 9 + + drivers/leds/leds-aw200xx.c | 2 +- + drivers/leds/rgb/leds-qcom-lpg.c | 346 +++++++++++++++++++-- + drivers/leds/trigger/ledtrig-audio.c | 2 + + drivers/leds/trigger/ledtrig-default-on.c | 1 + + drivers/leds/trigger/ledtrig-netdev.c | 98 +++++- + drivers/leds/trigger/ledtrig-panic.c | 23 +- + drivers/staging/greybus/Kconfig | 2 +- + drivers/staging/greybus/light.c | 21 -- + include/dt-bindings/leds/common.h | 3 + + include/linux/led-class-flash.h | 24 -- + include/linux/led-class-multicolor.h | 29 -- + include/linux/leds.h | 19 -- + 19 files changed, 541 insertions(+), 160 deletions(-) +Merging ipmi/for-next (296455ade1fd Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ 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 (f297a3844aa0 driver core: component: fix spellos) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/cpu.c +Merge made by the 'ort' strategy. + drivers/base/component.c | 4 ++-- + drivers/base/cpu.c | 2 +- + fs/kernfs/dir.c | 31 ++++++++++++++++++++----------- + fs/kernfs/file.c | 8 +++++--- + fs/kernfs/kernfs-internal.h | 2 ++ + include/linux/cpu.h | 2 +- + include/linux/kernfs.h | 10 ++++++---- + 7 files changed, 37 insertions(+), 22 deletions(-) +Merging usb/usb-next (ed5551279c91 Merge 6.8-rc3 into usb-next) +$ 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 tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-ffs | 12 +- + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 2 +- + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 12 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 12 +- + .../devicetree/bindings/usb/ite,it5205.yaml | 72 ++ + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 5 +- + .../devicetree/bindings/usb/nxp,ptn36502.yaml | 12 +- + .../devicetree/bindings/usb/onnn,nb7vpq904m.yaml | 13 +- + .../bindings/usb/qcom,wcd939x-usbss.yaml | 12 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 7 + + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 11 +- + .../devicetree/bindings/usb/usb-switch.yaml | 67 + + Documentation/devicetree/bindings/usb/usb.yaml | 2 + + Documentation/usb/gadget-testing.rst | 8 + + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-core.c | 47 + + drivers/phy/realtek/Kconfig | 32 + + drivers/phy/realtek/Makefile | 3 + + drivers/phy/realtek/phy-rtk-usb2.c | 1312 ++++++++++++++++++++ + drivers/phy/realtek/phy-rtk-usb3.c | 748 +++++++++++ + drivers/usb/core/Kconfig | 17 + + drivers/usb/core/driver.c | 8 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hub.c | 29 + + drivers/usb/core/phy.c | 120 ++ + drivers/usb/core/phy.h | 3 + + drivers/usb/dwc3/core.c | 3 + + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/dwc3-of-simple.c | 3 +- + drivers/usb/dwc3/host.c | 51 + + drivers/usb/gadget/function/f_fs.c | 20 + + drivers/usb/host/ehci-orion.c | 18 +- + drivers/usb/host/xhci-caps.h | 85 ++ + drivers/usb/host/xhci-port.h | 176 +++ + drivers/usb/host/xhci.h | 262 +--- + drivers/usb/mtu3/mtu3_host.c | 30 + + drivers/usb/phy/phy-generic.c | 55 +- + drivers/usb/storage/sddr55.c | 4 +- + drivers/usb/typec/altmodes/displayport.c | 162 ++- + drivers/usb/typec/bus.c | 102 ++ + drivers/usb/typec/class.c | 59 + + drivers/usb/typec/class.h | 1 + + drivers/usb/typec/mux/Kconfig | 10 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/it5205.c | 294 +++++ + drivers/usb/typec/tcpm/fusb302.c | 2 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 228 +--- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h | 27 + + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 159 ++- + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 92 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 290 ++++- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h | 172 +-- + drivers/usb/typec/tcpm/tcpci.c | 26 +- + drivers/usb/typec/tcpm/tcpci_maxim.h | 1 + + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 38 +- + drivers/usb/typec/tcpm/tcpm.c | 1028 ++++++++++++--- + drivers/usb/typec/tcpm/wcove.c | 2 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 92 +- + include/linux/phy/phy.h | 21 + + include/linux/usb/audio-v2.h | 4 +- + include/linux/usb/pd.h | 1 + + include/linux/usb/pd_vdo.h | 8 +- + include/linux/usb/tcpci.h | 13 + + include/linux/usb/tcpm.h | 16 +- + include/linux/usb/typec.h | 7 + + include/linux/usb/typec_altmode.h | 30 + + include/uapi/linux/usb/ch9.h | 2 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/devices/Makefile | 4 + + .../devices/boards/Dell Inc.,XPS 13 9300.yaml | 40 + + .../selftests/devices/boards/google,spherion.yaml | 50 + + tools/testing/selftests/devices/ksft.py | 90 ++ + .../selftests/devices/test_discoverable_devices.py | 318 +++++ + 75 files changed, 5652 insertions(+), 1037 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ite,it5205.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb-switch.yaml + create mode 100644 drivers/phy/realtek/Kconfig + create mode 100644 drivers/phy/realtek/Makefile + create mode 100644 drivers/phy/realtek/phy-rtk-usb2.c + create mode 100644 drivers/phy/realtek/phy-rtk-usb3.c + create mode 100644 drivers/usb/host/xhci-caps.h + create mode 100644 drivers/usb/host/xhci-port.h + create mode 100644 drivers/usb/typec/mux/it5205.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h + create mode 100644 tools/testing/selftests/devices/Makefile + create mode 100644 tools/testing/selftests/devices/boards/Dell Inc.,XPS 13 9300.yaml + create mode 100644 tools/testing/selftests/devices/boards/google,spherion.yaml + create mode 100644 tools/testing/selftests/devices/ksft.py + create mode 100755 tools/testing/selftests/devices/test_discoverable_devices.py +Merging thunderbolt/next (dec6a613574c thunderbolt: Remove usage of the deprecated ida_simple_xx() API) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/tb_regs.h +Auto-merging drivers/thunderbolt/usb4.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/domain.c | 11 ++-- + drivers/thunderbolt/icm.c | 2 +- + drivers/thunderbolt/lc.c | 45 ++++++++++++++ + drivers/thunderbolt/nhi.c | 25 +++++--- + drivers/thunderbolt/nvm.c | 4 +- + drivers/thunderbolt/path.c | 13 ++++ + drivers/thunderbolt/switch.c | 138 ++++++++++++++++++++++++++++++++++++------ + drivers/thunderbolt/tb.c | 26 +++++--- + drivers/thunderbolt/tb.h | 7 ++- + drivers/thunderbolt/tb_regs.h | 6 ++ + drivers/thunderbolt/usb4.c | 39 ++++++++++++ + drivers/thunderbolt/xdomain.c | 12 ++-- + 12 files changed, 278 insertions(+), 50 deletions(-) +Merging usb-serial/usb-next (54be6c6c5ae8 Linux 6.8-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (52b56990d214 Revert "tty: serial: amba-pl011: Remove QDF2xxx workarounds") +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/mfd/rave-sp.c +Auto-merging drivers/net/ethernet/qualcomm/qca_uart.c +Auto-merging drivers/tty/serial/8250/8250_pci1xxxx.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/cdns,uart.yaml | 1 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 1 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + Documentation/driver-api/tty/console.rst | 45 ++ + Documentation/driver-api/tty/index.rst | 1 + + arch/m68k/amiga/config.c | 2 +- + arch/m68k/hp300/config.c | 6 +- + drivers/bluetooth/btmtkuart.c | 4 +- + drivers/bluetooth/btnxpuart.c | 4 +- + drivers/bluetooth/hci_serdev.c | 4 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/greybus/gb-beagleplay.c | 6 +- + drivers/iio/chemical/pms7003.c | 4 +- + drivers/iio/chemical/scd30_serial.c | 4 +- + drivers/iio/chemical/sps30_serial.c | 4 +- + drivers/iio/imu/bno055/bno055_ser_core.c | 4 +- + drivers/input/keyboard/amikbd.c | 6 +- + drivers/mfd/rave-sp.c | 4 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/s3fwrn5/uart.c | 4 +- + drivers/platform/chrome/cros_ec_uart.c | 4 +- + drivers/platform/surface/aggregator/core.c | 4 +- + drivers/tty/Kconfig | 7 +- + drivers/tty/serdev/serdev-ttyport.c | 10 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 140 ++++- + drivers/tty/serial/8250/8250_port.c | 7 + + drivers/tty/serial/fsl_linflexuart.c | 1 - + drivers/tty/serial/max310x.c | 327 +++++----- + drivers/tty/serial/qcom_geni_serial.c | 27 +- + drivers/tty/serial/samsung_tty.c | 251 ++++---- + drivers/tty/serial/serial_txx9.c | 3 +- + drivers/tty/serial/stm32-usart.c | 223 ++++--- + drivers/tty/serial/stm32-usart.h | 38 +- + drivers/tty/serial/xilinx_uartps.c | 236 +++++++- + drivers/tty/vt/Makefile | 4 +- + drivers/tty/vt/selection.c | 43 +- + drivers/tty/vt/vt.c | 659 ++++++++++----------- + drivers/tty/vt/vt_ioctl.c | 6 +- + drivers/video/console/dummycon.c | 38 +- + drivers/video/console/mdacon.c | 43 +- + drivers/video/console/newport_con.c | 69 +-- + drivers/video/console/sticon.c | 79 +-- + drivers/video/console/vgacon.c | 152 +++-- + drivers/video/fbdev/core/bitblit.c | 13 +- + drivers/video/fbdev/core/fbcon.c | 123 ++-- + drivers/video/fbdev/core/fbcon.h | 4 +- + drivers/video/fbdev/core/fbcon_ccw.c | 13 +- + drivers/video/fbdev/core/fbcon_cw.c | 13 +- + drivers/video/fbdev/core/fbcon_ud.c | 13 +- + drivers/video/fbdev/core/tileblit.c | 4 +- + drivers/video/fbdev/tgafb.c | 2 +- + include/linux/console.h | 126 ++-- + include/linux/console_struct.h | 1 - + include/linux/selection.h | 48 +- + include/linux/serdev.h | 8 +- + include/linux/serial_8250.h | 6 + + include/linux/soc/qcom/geni-se.h | 1 + + include/linux/vt_kern.h | 12 +- + include/uapi/linux/fb.h | 8 +- + include/uapi/linux/vesa.h | 18 + + lib/Kconfig.kgdb | 2 +- + sound/drivers/serial-generic.c | 4 +- + 65 files changed, 1654 insertions(+), 1253 deletions(-) + create mode 100644 Documentation/driver-api/tty/console.rst + create mode 100644 include/uapi/linux/vesa.h +Merging char-misc/char-misc-next (e21817acb23e Merge 6.8-rc3 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Merge made by the 'ort' strategy. + drivers/misc/hpilo.c | 8 ++++---- + drivers/misc/mei/gsc-me.c | 5 +++++ + drivers/misc/mei/hdcp/Kconfig | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 14 ++++++++++++-- + drivers/misc/mei/pxp/Kconfig | 2 +- + drivers/misc/mei/pxp/mei_pxp.c | 14 ++++++++++++-- + 6 files changed, 35 insertions(+), 10 deletions(-) +Merging accel/habanalabs-next (dddb2e526a36 accel/habanalabs: use kcalloc() instead of kzalloc()) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Merge made by the 'ort' strategy. + .../accel/habanalabs/common/command_submission.c | 3 +- + drivers/accel/habanalabs/common/device.c | 49 ++- + drivers/accel/habanalabs/common/habanalabs.h | 33 +- + drivers/accel/habanalabs/common/hw_queue.c | 17 + + drivers/accel/habanalabs/common/mmu/Makefile | 2 +- + drivers/accel/habanalabs/common/mmu/mmu.c | 223 ++++++++++++- + drivers/accel/habanalabs/common/mmu/mmu_v1.c | 354 +++------------------ + drivers/accel/habanalabs/common/mmu/mmu_v2.c | 338 ++++++++++++++++++++ + drivers/accel/habanalabs/gaudi/gaudi.c | 1 + + drivers/accel/habanalabs/gaudi2/gaudi2.c | 258 +++++++++++---- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 12 +- + drivers/accel/habanalabs/goya/goya_coresight.c | 3 +- + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 2 + + 13 files changed, 899 insertions(+), 396 deletions(-) + create mode 100644 drivers/accel/habanalabs/common/mmu/mmu_v2.c +Merging coresight/next (41bccc98fb79 Linux 6.8-rc2) +$ 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 (6613476e225e Linux 6.8-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 (ff49b00e9621 fpga: dfl: make dfl_bus_type const) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + Documentation/driver-api/fpga/fpga-mgr.rst | 34 ++++++----- + drivers/fpga/dfl.c | 2 +- + drivers/fpga/fpga-mgr.c | 93 +++++++++++++++++++----------- + include/linux/fpga/fpga-mgr.h | 29 ++++++++-- + 4 files changed, 104 insertions(+), 54 deletions(-) +Merging icc/icc-next (8b6da6178c6a 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. + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 3 + + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/msm8909.c | 1329 ++++++++++++++++++++ + drivers/interconnect/qcom/sc8180x.c | 1 + + drivers/interconnect/qcom/sm8550.c | 575 +-------- + drivers/interconnect/qcom/sm8550.h | 284 ++--- + drivers/interconnect/qcom/sm8650.c | 2 +- + drivers/interconnect/qcom/x1e80100.c | 316 +---- + include/dt-bindings/interconnect/qcom,msm8909.h | 93 ++ + .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 24 - + 11 files changed, 1562 insertions(+), 1076 deletions(-) + create mode 100644 drivers/interconnect/qcom/msm8909.c + create mode 100644 include/dt-bindings/interconnect/qcom,msm8909.h +Merging iio/togreg (a0295c1bd4a7 iio: frequency: admfm2000: New driver) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/Kconfig +Auto-merging drivers/iio/industrialio-core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 86 ++++ + .../bindings/iio/adc/richtek,rtq6056.yaml | 9 +- + .../bindings/iio/frequency/adi,admfm2000.yaml | 127 +++++ + .../devicetree/bindings/iio/light/ams,as73211.yaml | 7 +- + .../iio/pressure/honeywell,mprls0025pa.yaml | 98 +++- + MAINTAINERS | 24 +- + drivers/iio/accel/Kconfig | 8 +- + drivers/iio/accel/Makefile | 1 + + drivers/iio/accel/bmc150-accel-i2c.c | 2 +- + drivers/iio/accel/bmc150-accel-spi.c | 3 +- + drivers/iio/accel/bmi088-accel-i2c.c | 70 +++ + drivers/iio/accel/da280.c | 66 ++- + drivers/iio/accel/kxcjk-1013.c | 33 +- + drivers/iio/accel/mma9551.c | 4 +- + drivers/iio/accel/mma9553.c | 4 +- + drivers/iio/accel/mxc4005.c | 4 +- + drivers/iio/accel/mxc6255.c | 4 +- + drivers/iio/accel/st_accel_i2c.c | 5 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/Kconfig | 16 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7380.c | 462 +++++++++++++++++++ + drivers/iio/adc/ad_sigma_delta.c | 7 +- + drivers/iio/adc/rtq6056.c | 275 ++++++++++- + drivers/iio/adc/ti-adc108s102.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 3 +- + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 2 +- + drivers/iio/dummy/iio_dummy_evgen.c | 2 - + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/admfm2000.c | 282 +++++++++++ + drivers/iio/gyro/bmg160_i2c.c | 4 +- + drivers/iio/health/afe4403.c | 65 +-- + drivers/iio/health/afe4404.c | 65 +-- + drivers/iio/humidity/hts221_i2c.c | 4 +- + drivers/iio/imu/adis16475.c | 8 +- + drivers/iio/imu/adis16480.c | 9 +- + drivers/iio/imu/fxos8700_i2c.c | 3 +- + drivers/iio/imu/fxos8700_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/industrialio-core.c | 4 +- + drivers/iio/light/Kconfig | 5 +- + drivers/iio/light/as73211.c | 142 ++++-- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/ltr501.c | 3 +- + drivers/iio/light/max44000.c | 6 +- + drivers/iio/light/rpr0521.c | 4 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/us5182d.c | 4 +- + drivers/iio/light/vcnl4000.c | 36 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 3 +- + drivers/iio/magnetometer/mmc35240.c | 4 +- + drivers/iio/potentiometer/max5487.c | 4 +- + drivers/iio/pressure/Kconfig | 14 +- + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/hp206c.c | 6 +- + drivers/iio/pressure/mprls0025pa.c | 313 ++++++------- + drivers/iio/pressure/mprls0025pa.h | 102 ++++ + drivers/iio/pressure/mprls0025pa_i2c.c | 100 ++++ + drivers/iio/pressure/mprls0025pa_spi.c | 92 ++++ + drivers/iio/pressure/st_pressure_i2c.c | 5 +- + drivers/iio/test/Kconfig | 14 + + drivers/iio/test/Makefile | 1 + + drivers/iio/test/iio-test-gts.c | 513 +++++++++++++++++++++ + tools/iio/iio_utils.c | 2 +- + 67 files changed, 2724 insertions(+), 455 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml + create mode 100644 drivers/iio/accel/bmi088-accel-i2c.c + create mode 100644 drivers/iio/adc/ad7380.c + create mode 100644 drivers/iio/frequency/admfm2000.c + create mode 100644 drivers/iio/pressure/mprls0025pa.h + create mode 100644 drivers/iio/pressure/mprls0025pa_i2c.c + create mode 100644 drivers/iio/pressure/mprls0025pa_spi.c + create mode 100644 drivers/iio/test/iio-test-gts.c +Merging phy-next/next (25ee21fc97db phy: qcom: sgmii-eth: move PCS registers to separate header) +$ 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-usb.c +CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp-usb.c +Resolved 'drivers/phy/qualcomm/phy-qcom-qmp-usb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6418977d1da2] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml | 184 ++++ + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 22 - + drivers/phy/marvell/phy-armada38x-comphy.c | 7 +- + drivers/phy/qualcomm/Makefile | 2 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 3 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 109 +- + drivers/phy/qualcomm/phy-qcom-qmp-common.h | 59 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-com-v3.h | 18 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v3.h | 21 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v4.h | 19 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h | 13 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h | 13 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy.h | 62 ++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 70 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 288 +++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-sgmii.h | 20 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 2 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 8 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 242 +++-- + drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c | 76 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 422 +------ + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 1149 ++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 101 +- + drivers/phy/qualcomm/phy-qcom-sgmii-eth.c | 417 +++---- + 31 files changed, 2198 insertions(+), 1146 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-common.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-com-v3.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v3.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v4.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-sgmii.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usbc.c +Merging soundwire/next (0707496ff4e4 soundwire: stream: add missing const to Documentation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + Documentation/driver-api/soundwire/stream.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 +Already up to date. +Merging w1/for-next (8650843ca42a w1: make w1_bus_type const) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/w1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (ce54e9342124 staging: Remove board staging code) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/board/Kconfig | 12 - + drivers/staging/board/Makefile | 4 - + drivers/staging/board/TODO | 2 - + drivers/staging/board/armadillo800eva.c | 88 - + drivers/staging/board/board.c | 204 -- + drivers/staging/board/board.h | 46 - + drivers/staging/board/kzm9d.c | 26 - + drivers/staging/emxx_udc/Kconfig | 11 - + drivers/staging/emxx_udc/Makefile | 2 - + drivers/staging/emxx_udc/TODO | 6 - + drivers/staging/emxx_udc/emxx_udc.c | 3223 --------------------- + drivers/staging/emxx_udc/emxx_udc.h | 554 ---- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 6 +- + drivers/staging/fieldbus/dev_core.c | 6 +- + drivers/staging/greybus/audio_manager.c | 8 +- + drivers/staging/greybus/authentication.c | 6 +- + drivers/staging/greybus/fw-download.c | 7 +- + drivers/staging/greybus/fw-management.c | 20 +- + drivers/staging/greybus/gbphy.c | 8 +- + drivers/staging/greybus/loopback.c | 6 +- + drivers/staging/greybus/raw.c | 6 +- + drivers/staging/greybus/vibrator.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 33 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192e/rtllib.h | 26 +- + drivers/staging/rtl8192e/rtllib_rx.c | 6 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 86 +- + drivers/staging/rtl8192e/rtllib_tx.c | 10 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + drivers/staging/vt6655/card.c | 74 +- + drivers/staging/vt6655/rxtx.h | 1 - + 38 files changed, 168 insertions(+), 4359 deletions(-) + delete mode 100644 drivers/staging/board/Kconfig + delete mode 100644 drivers/staging/board/Makefile + delete mode 100644 drivers/staging/board/TODO + delete mode 100644 drivers/staging/board/armadillo800eva.c + delete mode 100644 drivers/staging/board/board.c + delete mode 100644 drivers/staging/board/board.h + delete mode 100644 drivers/staging/board/kzm9d.c + delete mode 100644 drivers/staging/emxx_udc/Kconfig + delete mode 100644 drivers/staging/emxx_udc/Makefile + delete mode 100644 drivers/staging/emxx_udc/TODO + delete mode 100644 drivers/staging/emxx_udc/emxx_udc.c + delete mode 100644 drivers/staging/emxx_udc/emxx_udc.h +Merging counter-next/counter-next (0b3bbd8f9baf 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 (93bdff7bb83a dmaengine: ti: k3-psil-j721s2: Add entry for CSI2RX) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 12 +- + drivers/dma/Kconfig | 14 +- + drivers/dma/bestcomm/sram.c | 5 - + drivers/dma/pl330.c | 1 + + drivers/dma/ti/k3-psil-j721s2.c | 73 +++++ + drivers/dma/ti/k3-udma-glue.c | 314 +++++++++++++++------ + drivers/dma/xilinx/xilinx_dma.c | 6 + + include/linux/dma/k3-udma-glue.h | 10 + + 8 files changed, 328 insertions(+), 107 deletions(-) +Merging cgroup/for-next (8d4c171f451d docs: cgroup-v1: add missing code-block tags) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) +Merging scsi/for-next (59828c7b5975 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. + drivers/message/fusion/mptfc.c | 4 +- + drivers/scsi/3w-9xxx.c | 44 ++-- + drivers/scsi/3w-sas.c | 36 +-- + drivers/scsi/3w-xxxx.c | 44 ++-- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/Kconfig | 9 + + drivers/scsi/aacraid/aachba.c | 6 +- + drivers/scsi/ch.c | 27 ++- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 49 +++-- + drivers/scsi/device_handler/scsi_dh_rdac.c | 84 +++---- + drivers/scsi/fnic/fnic_attrs.c | 7 +- + drivers/scsi/fnic/fnic_scsi.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 26 ++- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 22 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 24 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/megaraid.c | 2 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 12 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 113 ++++++---- + drivers/scsi/mpt3sas/mpt3sas_base.h | 8 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 54 +++++ + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 10 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 + + drivers/scsi/pm8001/pm8001_ctl.c | 6 +- + drivers/scsi/scsi_devinfo.c | 6 +- + drivers/scsi/scsi_lib.c | 124 ++++++++++- + drivers/scsi/scsi_lib_test.c | 330 ++++++++++++++++++++++++++++ + drivers/scsi/scsi_scan.c | 105 +++++---- + drivers/scsi/scsi_transport_spi.c | 35 +-- + drivers/scsi/sd.c | 220 ++++++++++++------- + drivers/scsi/ses.c | 66 ++++-- + drivers/scsi/sr.c | 38 ++-- + drivers/ufs/core/ufs-mcq.c | 12 +- + drivers/ufs/core/ufs-sysfs.c | 49 +++++ + drivers/ufs/core/ufshcd.c | 90 ++++++-- + drivers/ufs/host/ufs-mediatek.c | 90 +++++--- + drivers/ufs/host/ufs-mediatek.h | 7 +- + drivers/ufs/host/ufs-qcom.c | 28 ++- + include/scsi/scsi_device.h | 48 ++++ + include/scsi/scsi_host.h | 6 +- + include/ufs/ufshcd.h | 7 + + include/ufs/ufshci.h | 3 + + 43 files changed, 1391 insertions(+), 477 deletions(-) + create mode 100644 drivers/scsi/scsi_lib_test.c +Merging scsi-mkp/for-next (4ad946536537 scsi: target: tcm_loop: Make tcm_loop_lld_bus const) +$ 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 drivers/scsi/lpfc/lpfc_scsi.c +Merge made by the 'ort' strategy. + drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 94 ++++---- + drivers/scsi/lpfc/lpfc_attr.c | 107 ++++----- + drivers/scsi/lpfc/lpfc_bsg.c | 8 +- + drivers/scsi/lpfc/lpfc_ct.c | 154 ++++++------- + drivers/scsi/lpfc/lpfc_debugfs.c | 14 +- + drivers/scsi/lpfc/lpfc_els.c | 446 ++++++++++++++++-------------------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 350 ++++++++++++---------------- + drivers/scsi/lpfc/lpfc_hw4.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 137 ++++++----- + drivers/scsi/lpfc/lpfc_mbox.c | 10 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 91 ++++---- + drivers/scsi/lpfc/lpfc_nvme.c | 20 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 14 +- + drivers/scsi/lpfc/lpfc_scsi.c | 10 +- + drivers/scsi/lpfc/lpfc_sli.c | 56 +++-- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 69 +++--- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/target/loopback/tcm_loop.c | 2 +- + 21 files changed, 724 insertions(+), 880 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 +Already up to date. +Merging rpmsg/for-next (929654e8f1ad 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,sm8550-pas.yaml | 45 +++++- + drivers/remoteproc/imx_dsp_rproc.c | 11 +- + drivers/remoteproc/imx_rproc.c | 16 +-- + drivers/remoteproc/qcom_q6v5_pas.c | 150 +++++++++++++++----- + drivers/remoteproc/remoteproc_core.c | 29 +++- + drivers/remoteproc/remoteproc_virtio.c | 6 +- + drivers/remoteproc/st_remoteproc.c | 15 +- + drivers/remoteproc/stm32_rproc.c | 10 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 156 +++++++-------------- + drivers/rpmsg/rpmsg_char.c | 12 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/rpmsg_ctrl.c | 12 +- + 12 files changed, 271 insertions(+), 193 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 (a875746f603b gpio: gpiolib: make gpio_bus_type const) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging Documentation/userspace-api/index.rst +CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/gpio-eic-sprd.c +Resolved 'Documentation/userspace-api/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 655248b62861] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-gpio | 4 +- + Documentation/ABI/testing/gpio-cdev | 9 +- + Documentation/admin-guide/gpio/gpio-mockup.rst | 8 ++ + Documentation/admin-guide/gpio/index.rst | 6 +- + Documentation/admin-guide/gpio/obsolete.rst | 13 ++ + .../devicetree/bindings/gpio/gpio-mvebu.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 3 + + .../bindings/gpio/renesas,rcar-gpio.yaml | 1 + + Documentation/userspace-api/gpio/chardev.rst | 116 ++++++++++++++++ + Documentation/userspace-api/gpio/chardev_v1.rst | 131 ++++++++++++++++++ + Documentation/userspace-api/gpio/error-codes.rst | 79 +++++++++++ + .../userspace-api/gpio/gpio-get-chipinfo-ioctl.rst | 41 ++++++ + .../gpio/gpio-get-lineevent-ioctl.rst | 84 ++++++++++++ + .../gpio/gpio-get-linehandle-ioctl.rst | 125 +++++++++++++++++ + .../userspace-api/gpio/gpio-get-lineinfo-ioctl.rst | 54 ++++++++ + .../gpio/gpio-get-lineinfo-unwatch-ioctl.rst | 49 +++++++ + .../gpio/gpio-get-lineinfo-watch-ioctl.rst | 74 ++++++++++ + .../gpio/gpio-handle-get-line-values-ioctl.rst | 56 ++++++++ + .../gpio/gpio-handle-set-config-ioctl.rst | 63 +++++++++ + .../gpio/gpio-handle-set-line-values-ioctl.rst | 48 +++++++ + .../gpio/gpio-lineevent-data-read.rst | 84 ++++++++++++ + .../gpio/gpio-lineinfo-changed-read.rst | 87 ++++++++++++ + .../userspace-api/gpio/gpio-v2-get-line-ioctl.rst | 152 +++++++++++++++++++++ + .../gpio/gpio-v2-get-lineinfo-ioctl.rst | 50 +++++++ + .../gpio/gpio-v2-get-lineinfo-watch-ioctl.rst | 67 +++++++++ + .../userspace-api/gpio/gpio-v2-line-event-read.rst | 83 +++++++++++ + .../gpio/gpio-v2-line-get-values-ioctl.rst | 51 +++++++ + .../gpio/gpio-v2-line-set-config-ioctl.rst | 58 ++++++++ + .../gpio/gpio-v2-line-set-values-ioctl.rst | 47 +++++++ + .../gpio/gpio-v2-lineinfo-changed-read.rst | 81 +++++++++++ + Documentation/userspace-api/gpio/index.rst | 18 +++ + Documentation/userspace-api/gpio/obsolete.rst | 11 ++ + .../{admin-guide => userspace-api}/gpio/sysfs.rst | 27 ++-- + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 5 +- + drivers/gpio/gpio-eic-sprd.c | 10 +- + drivers/gpio/gpiolib-cdev.c | 5 - + drivers/gpio/gpiolib-legacy.c | 12 ++ + drivers/gpio/gpiolib-of.c | 2 + + drivers/gpio/gpiolib.c | 95 ++++++------- + include/linux/gpio/driver.h | 22 +-- + include/uapi/linux/gpio.h | 52 +++---- + 43 files changed, 1859 insertions(+), 128 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/obsolete.rst + create mode 100644 Documentation/userspace-api/gpio/chardev.rst + create mode 100644 Documentation/userspace-api/gpio/chardev_v1.rst + create mode 100644 Documentation/userspace-api/gpio/error-codes.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-chipinfo-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineevent-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-linehandle-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-unwatch-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-watch-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-handle-get-line-values-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-handle-set-config-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-handle-set-line-values-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-lineevent-data-read.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-lineinfo-changed-read.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-line-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-watch-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-event-read.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-get-values-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-set-config-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-set-values-ioctl.rst + create mode 100644 Documentation/userspace-api/gpio/gpio-v2-lineinfo-changed-read.rst + create mode 100644 Documentation/userspace-api/gpio/index.rst + create mode 100644 Documentation/userspace-api/gpio/obsolete.rst + rename Documentation/{admin-guide => userspace-api}/gpio/sysfs.rst (89%) +Merging gpio-intel/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (47eed1127d2a dt-bindings: pinctrl: amlogic: narrow regex for unit address to hex numbers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 2 +- + .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 2 +- + .../amlogic,meson-pinctrl-g12a-periphs.yaml | 2 +- + .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 2 +- + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 24 ++++++++++++++++++++-- + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 2 +- + drivers/pinctrl/pinctrl-st.c | 3 +-- + drivers/pinctrl/pinctrl-zynqmp.c | 8 ++++---- + 9 files changed, 33 insertions(+), 14 deletions(-) +Merging pinctrl-intel/for-next (6613476e225e Linux 6.8-rc1) +$ 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 (fea58424e252 pinctrl: renesas: pinctrl-rzg2l: Add the missing port pins P19 to P28) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 + + drivers/pinctrl/renesas/core.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a779g0.c | 14 ++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 309 +++++++++++++++++++++++----- + 4 files changed, 277 insertions(+), 54 deletions(-) +Merging pinctrl-samsung/for-next (6613476e225e Linux 6.8-rc1) +$ 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 (67781b5742b5 pwm: bcm2835: Drop write-only member of driver private data) +$ 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. + .../devicetree/bindings/pwm/marvell,pxa-pwm.yaml | 51 ++ + Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 - + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 - + drivers/pwm/core.c | 640 ++++++++++----------- + drivers/pwm/pwm-atmel-hlcdc.c | 2 +- + drivers/pwm/pwm-bcm2835.c | 3 - + drivers/pwm/pwm-clps711x.c | 11 - + drivers/pwm/pwm-cros-ec.c | 1 - + drivers/pwm/pwm-mediatek.c | 1 - + drivers/pwm/pwm-pxa.c | 4 +- + include/linux/pwm.h | 2 - + 11 files changed, 363 insertions(+), 383 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt +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 (6a71770442b5 selftests: livepatch: Test livepatching a heavily called syscall) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging Documentation/dev-tools/kselftest.rst +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging tools/testing/selftests/lib.mk +Auto-merging tools/testing/selftests/livepatch/functions.sh +Merge made by the 'ort' strategy. + Documentation/dev-tools/kselftest.rst | 4 + + MAINTAINERS | 1 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + lib/Kconfig.debug | 22 ---- + lib/Makefile | 2 - + lib/livepatch/Makefile | 14 --- + tools/testing/selftests/lib.mk | 26 ++++- + tools/testing/selftests/livepatch/Makefile | 5 +- + tools/testing/selftests/livepatch/README | 25 +++-- + tools/testing/selftests/livepatch/config | 1 - + tools/testing/selftests/livepatch/functions.sh | 34 +++--- + .../testing/selftests/livepatch/test-callbacks.sh | 50 ++++----- + tools/testing/selftests/livepatch/test-ftrace.sh | 6 +- + .../testing/selftests/livepatch/test-livepatch.sh | 10 +- + .../selftests/livepatch/test-shadow-vars.sh | 2 +- + tools/testing/selftests/livepatch/test-state.sh | 18 ++-- + tools/testing/selftests/livepatch/test-syscall.sh | 53 ++++++++++ + tools/testing/selftests/livepatch/test-sysfs.sh | 6 +- + .../selftests/livepatch/test_klp-call_getpid.c | 44 ++++++++ + .../selftests/livepatch/test_modules/Makefile | 20 ++++ + .../test_modules}/test_klp_atomic_replace.c | 0 + .../test_modules}/test_klp_callbacks_busy.c | 0 + .../test_modules}/test_klp_callbacks_demo.c | 0 + .../test_modules}/test_klp_callbacks_demo2.c | 0 + .../test_modules}/test_klp_callbacks_mod.c | 0 + .../livepatch/test_modules}/test_klp_livepatch.c | 0 + .../livepatch/test_modules}/test_klp_shadow_vars.c | 0 + .../livepatch/test_modules}/test_klp_state.c | 0 + .../livepatch/test_modules}/test_klp_state2.c | 0 + .../livepatch/test_modules}/test_klp_state3.c | 0 + .../livepatch/test_modules/test_klp_syscall.c | 116 +++++++++++++++++++++ + 32 files changed, 340 insertions(+), 121 deletions(-) + delete mode 100644 lib/livepatch/Makefile + create mode 100755 tools/testing/selftests/livepatch/test-syscall.sh + create mode 100644 tools/testing/selftests/livepatch/test_klp-call_getpid.c + create mode 100644 tools/testing/selftests/livepatch/test_modules/Makefile + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_atomic_replace.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_busy.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_demo.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_demo2.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_mod.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_livepatch.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_shadow_vars.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state2.c (100%) + rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state3.c (100%) + create mode 100644 tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c +Merging kunit/test (6613476e225e Linux 6.8-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 (76021a887a50 kunit: Mark filter* params as rw) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging lib/kunit/executor.c +Merge made by the 'ort' strategy. + lib/kunit/executor.c | 6 +++--- + tools/testing/kunit/kunit_kernel.py | 1 + + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +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 +Already up to date. +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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (b068d070cb99 selftests/seccomp: Pin benchmark to single CPU) +$ 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 +Auto-merging tools/testing/selftests/seccomp/seccomp_benchmark.c +Merge made by the 'ort' strategy. + .../testing/selftests/seccomp/seccomp_benchmark.c | 38 ++++++++++++++++++-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 41 ++++++++++++++++------ + 2 files changed, 67 insertions(+), 12 deletions(-) +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 (04b945e4cf81 slimbus: qcom-ngd-ctrl: Make QMI message rules const) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging nvmem/for-next (a0cfd5e99782 dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-nvmem-cells | 16 ++++---- + .../bindings/nvmem/layouts/fixed-cell.yaml | 22 +++++------ + .../bindings/nvmem/xlnx,zynqmp-nvmem.txt | 46 ---------------------- + .../bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 42 ++++++++++++++++++++ + drivers/nvmem/core.c | 5 ++- + drivers/nvmem/mtk-efuse.c | 21 +++++++++- + 6 files changed, 83 insertions(+), 69 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (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 (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local()) +$ 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 (6613476e225e Linux 6.8-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 (ceeb64f41fe6 bus: mhi: host: Add tracing support) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/common.h | 38 +++--- + drivers/bus/mhi/ep/main.c | 5 +- + drivers/bus/mhi/host/boot.c | 11 +- + drivers/bus/mhi/host/init.c | 79 ++++++------ + drivers/bus/mhi/host/internal.h | 50 ++++++- + drivers/bus/mhi/host/main.c | 19 ++- + drivers/bus/mhi/host/pm.c | 27 +++- + drivers/bus/mhi/host/trace.h | 280 ++++++++++++++++++++++++++++++++++++++++ + include/linux/mhi.h | 2 - + 9 files changed, 423 insertions(+), 88 deletions(-) + create mode 100644 drivers/bus/mhi/host/trace.h +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 +Already up to date. +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 +Already up to date. +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (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 (367122c529f3 libfs: Attempt exact-match comparison first during casefolded lookup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/libfs.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/libfs.c | 40 +++++++++++++++++++++++----------------- + fs/overlayfs/params.c | 13 ++++++++++--- + include/linux/fs.h | 9 +++++++++ + 3 files changed, 42 insertions(+), 20 deletions(-) +Merging slab/slab/for-next (7d2ec24bd8a5 Merge branch 'slab/for-6.9/optimize-get-freelist' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 79 +++++++++++-------------- + Documentation/mm/slub.rst | 60 +++++++++---------- + drivers/misc/lkdtm/heap.c | 2 +- + mm/Kconfig.debug | 6 +- + mm/slab.h | 6 +- + mm/slab_common.c | 17 +++--- + mm/slub.c | 75 +++++++++++------------ + 7 files changed, 117 insertions(+), 128 deletions(-) +Merging random/master (615d30064886 Merge tag 'trace-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ 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 (305aea29fd67 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 tools/testing/kunit/configs/all_tests.config +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/.kunitconfig | 4 + + security/landlock/Kconfig | 15 + + security/landlock/common.h | 2 + + security/landlock/fs.c | 410 ++++++++++++++++++++- + security/landlock/fs.h | 2 + + security/landlock/limits.h | 11 +- + security/landlock/ruleset.h | 2 +- + security/landlock/syscalls.c | 19 +- + tools/testing/kunit/configs/all_tests.config | 1 + + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/common.h | 85 +++-- + tools/testing/selftests/landlock/fs_test.c | 520 ++++++++++++++++++++++++++- + tools/testing/selftests/landlock/net_test.c | 13 +- + 16 files changed, 1184 insertions(+), 92 deletions(-) + create mode 100644 security/landlock/.kunitconfig +Merging rust/rust-next (f090f0d0eea9 rust: sync: update integer types in CondVar) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging scripts/min-tool-version.sh +Resolved 'Documentation/process/changes.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9e740a4c931c] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/process/changes.rst | 2 +- + rust/alloc/alloc.rs | 9 +++- + rust/alloc/boxed.rs | 20 +++++--- + rust/alloc/lib.rs | 7 +-- + rust/alloc/raw_vec.rs | 19 +++++-- + rust/alloc/vec/mod.rs | 16 +++--- + rust/bindings/bindings_helper.h | 1 + + rust/kernel/lib.rs | 2 +- + rust/kernel/sync.rs | 2 +- + rust/kernel/sync/condvar.rs | 104 ++++++++++++++++++++++++++++++-------- + rust/kernel/sync/lock.rs | 4 +- + rust/kernel/task.rs | 18 ++++++- + rust/kernel/time.rs | 20 ++++++++ + scripts/min-tool-version.sh | 2 +- + 14 files changed, 177 insertions(+), 49 deletions(-) + create mode 100644 rust/kernel/time.rs +Merging sysctl/sysctl-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (15fd1dc3dadb fs: binfmt_elf_efpic: don't use missing interpreter's properties) +$ 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 +Merge made by the 'ort' strategy. + fs/binfmt_elf_fdpic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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/rtw88/pci.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/scsi/scsi_lib.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 include/linux/cpumask.h +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 501978436724] 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 (94829c7196fb ubsan: Reintroduce signed overflow sanitizer) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging fs/namei.c +Auto-merging kernel/printk/printk.c +Auto-merging lib/Kconfig.ubsan +Auto-merging lib/Makefile +Auto-merging lib/test_ubsan.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.ubsan +Merge made by the 'ort' strategy. + Documentation/dev-tools/ubsan.rst | 28 +++------ + MAINTAINERS | 16 +++++ + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/word-at-a-time.h | 3 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/word-at-a-time.h | 3 +- + arch/mips/Kconfig | 2 +- + arch/parisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/word-at-a-time.h | 4 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/word-at-a-time.h | 3 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/word-at-a-time.h | 3 +- + arch/sh/include/asm/word-at-a-time.h | 2 + + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/word-at-a-time.h | 3 +- + arch/x86/kvm/mmu/mmu.c | 1 + + drivers/misc/lkdtm/bugs.c | 3 +- + drivers/misc/lkdtm/core.c | 22 ++++--- + drivers/misc/vmw_vmci/vmci_datagram.c | 7 ++- + fs/namei.c | 2 +- + include/asm-generic/word-at-a-time.h | 3 +- + include/linux/kernel.h | 8 --- + include/linux/overflow.h | 100 ++++++++++++++++++++++++++---- + include/linux/wordpart.h | 13 ++++ + kernel/printk/printk.c | 11 ---- + lib/Kconfig.ubsan | 13 +--- + lib/Makefile | 1 + + lib/overflow_kunit.c | 65 +++++++++++++++++-- + lib/string.c | 19 +++--- + lib/test_ubsan.c | 4 +- + scripts/Makefile.lib | 2 +- + scripts/Makefile.ubsan | 2 +- + 34 files changed, 248 insertions(+), 109 deletions(-) + create mode 100644 include/linux/wordpart.h +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-mm-swap-fix-race-condition-in-direct-swap.patch +Applying: fix up for "mm/swap: fix race condition in direct swapin path" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1d2365e9de02 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240207 |