diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-12 11:47:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-12 11:47:19 +1100 |
| commit | d9771d0dbe18dd643760431870a6abf9b0866bb0 (patch) | |
| tree | afebeb97160183899a12fe5f08d0b2e9fc351e6c | |
| parent | ba3924f84048c3bae183ae49e8408894f06cf39c (diff) | |
| download | linux-next-master.tar.gz | |
Add linux-next specific files for 20251212HEADnext-20251212master
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 409 | ||||
| -rw-r--r-- | Next/Trees | 409 | ||||
| -rw-r--r-- | Next/merge.log | 2820 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3639 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 00000000000000..5a9dc124da76d6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,409 @@ +Name SHA1 +---- ---- +origin d358e5254674b70f34c847715ca509e46eb81e6f +fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +ext4-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +vfs-brauner-fixes fe93446b5ebdaa89a8f97b15668c077921a65140 +fscrypt-current 1e39da974ce621ed874c6d3aaf65ad14848c9f0d +fsverity-current 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs-fixes df1fc7645847de4cc40dc08cdde4f582f3b1603c +vfs-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +erofs-fixes f2a12cc3b97f062186568a7b94ddb7aa2ef68140 +nfsd-fixes ebae102897e760e9e6bc625f701dd666b2163bd1 +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +overlayfs-fixes e8bd877fb76bb9f35253e8f41ce0c772269934dd +fscrypt 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs 9e0e6577b3e5e5cf7c1acd178eb648e8f830ba17 +ceph 21c1466ea25114871707d95745a16ebcf231e197 +cifs ab0347e67dacd121eedc2d3a6ee6484e5ccca43d +configfs f7f78098690d60a03b47942ac7d73ea17b42239e +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 8e40210788636619404871df07445fa4590138b4 +erofs 0bdbf89a8bbeb155644b69dc2d071a1ce23414f8 +exfat f5a5c9b4049047cdf4b5fff5e487974826116c57 +exportfs adc218676eef25575469234709c2d87185ca223a +ext3 25554ea0b42b65dd1156430c711fc502292f4a5e +ext4 6fb67ac896900e60f46ee4efba97b372a80370e0 +f2fs cb015814f8b6eebcbb8e46e111d108892c5e6821 +fsverity 211ddde0823f1442e4ad052a2f30f050145ccada +fuse 8da059f2a497a2427150faae5adc3bb78e73b3e2 +gfs2 c2ffb7a0cb4abb6060dd2f321ebe2b6f36a209a1 +jfs eb0cfcf265714b419cc3549895a00632e76732ae +ksmbd 2e0d224d89884819e6f25953bbe860ae6a49555f +nfs bd3b04b46c7a9940989ff4b29376e899e93d3a4a +nfs-anna b623390045a81fc559decb9bfeb79319721d3dfb +nfsd c2f2b01b74be8b40a2173372bcd770723f87e7b2 +ntfs3 1b2ae190ea43bebb8c73d21f076addc8a8c71849 +orangefs 11f6bce77e27e82015a0d044e6c1eec8b139831a +overlayfs ad1423922781e6552f18d055a5742b1cff018cdc +ubifs 0695aef23d674815c352293c49d944a2375ee9c9 +v9fs 3e281113f871d7f9c69ca55a4d806a72180b7e8a +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs 79c47bc68efb705b83610ca0465c99a6b59abf2a +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner 5b629fa4cc9b8254b054834fa60ee86f99d336cb +vfs eb028c33451af08bb34f45c6be6967ef1c98cbd1 +mm-hotfixes e540489acb50c615c667540a330e6a5e317fa44f +fs-current 49e73452c673178516e9ef19f17bf4843a0470a2 +kbuild-current 4ab2ee307983548b29ddaab0ecaef82d526cf4c9 +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current fd2dee1c6e2256f726ba33fd3083a7be0efc80d3 +arm64-fixes 165eb13e485c5c25c7cb276ac85f788a2bd200cb +arm-soc-fixes e9191383d28da31831cee84bb04029d0e46c514b +davinci-current 3a8660878839faadb4f1a6dd72c3179c1df56787 +drivers-memory-fixes 6f37469a933030692741710db809722076f71973 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current aaf4e92341b081bac1230f22619b0a298e285dab +powerpc-fixes 0843ba458439f38efdc14aa359c14ad0127edb01 +s390-fixes 51d90a15fedf8366cb96ef68d0ea2d0bf15417d2 +net 885bebac9909994050bbbeed0829c727e42bd1b7 +bpf 1d528e794f3db5d32279123a89957c44c4406a09 +ipsec 3d5221af9c7711b7aec8da1298c8fc393ef6183d +netfilter 885bebac9909994050bbbeed0829c727e42bd1b7 +ipvs de0337d641bfa5b6d6b489e479792f1039274e84 +wireless 0ff8eeafba5c5742effb9e2cfdb52daa17b1b7d7 +ath d0309c054362a235077327b46f727bc48878a3bc +iwlwifi 1a222625b468effd13d1ebb662c36a41c28a835a +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes ac3fd01e4c1efce8f2c054cdeb2ddd2fc0fb150d +sound-current fd324768eb2c132bb111ba76675b4c72406251d9 +sound-asoc-fixes c8d8605fc53e8072848aadc7a5aa00c2f5143cac +regmap-fixes 6146a0f1dfae5d37442a9ddcba012add260bceb0 +regulator-fixes 56edaa508ed2dd3dc377186ba9f388a58c573a9a +spi-fixes 865a1f17d5e41c0b34929afcab0afa6bdb90d33e +pci-current 94bf74830a977a027042f685c7231c5e07cc3372 +driver-core.current d358e5254674b70f34c847715ca509e46eb81e6f +tty.current d358e5254674b70f34c847715ca509e46eb81e6f +usb.current d358e5254674b70f34c847715ca509e46eb81e6f +usb-serial-fixes 523bf0a59e674b52e4b5607a2aba655fbfa20ff2 +phy 3a8660878839faadb4f1a6dd72c3179c1df56787 +staging.current d358e5254674b70f34c847715ca509e46eb81e6f +iio-fixes 74f97a46835664c28bc34c0bba58c6b3eaaaa648 +counter-current 109ff654934a4752f8875ded672efd1fbfe4d31d +char-misc.current d358e5254674b70f34c847715ca509e46eb81e6f +soundwire-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +thunderbolt-fixes 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +input-current 429c4727011ead99129b14dc9ff4c87a747a50ab +crypto-current 48bc9da3c97c15f1ea24934bcb3b736acd30163d +libcrypto-fixes f6a458746f905adb7d70e50e8b9383dc9e3fd75f +vfio-fixes d323ad739666761646048fca587734f4ae64f2c8 +kselftest-fixes dd4adb986a86727ed8f56c48b6d0695f1e211e65 +dmaengine-fixes f52c6c5eb159538efa4bfa1c8cbf0f5a4c72dd67 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes 97315e7c901a1de60e8ca9b11e0e96d0f9253e18 +mfd-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +v4l-dvb-fixes 27afd6e066cfd80ddbe22a4a11b99174ac89cced +reset-fixes 997c06330fd5c2e220b692f2a358986c6c8fd5a2 +mips-fixes 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +at91-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +omap-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +kvm-fixes 32bd348be3fa07b26c5ea6b818a161c142dcc2f2 +kvms390-fixes 5f9df945d4e862979b50e4ecaba3dc81fb06e8ed +hwmon-fixes cb015814f8b6eebcbb8e46e111d108892c5e6821 +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes 214291cbaaceeb28debd773336642b1fca393ae0 +dma-mapping-fixes 31b931bebd11a0f00967114f62c8c38952f483e5 +drivers-x86-fixes 9d588a1140b9ae211581a7a154d0b806d8cd8238 +samsung-krzk-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +pinctrl-samsung-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +devicetree-fixes 3a058541627a9379e5eef07f86896d7e33da2bdd +dt-krzk-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +scsi-fixes 90449f2d1e1f020835cba5417234636937dd657e +drm-fixes 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +drm-intel-fixes 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +mmc-fixes 6cd5045ad4708b17d9824cb5c458d44c63dceacf +rtc-fixes 162f24cbb0f6ec596e7e9f3e91610d79dc805229 +gnss-fixes dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +hyperv-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +risc-v-fixes e2285bd4a46744768f2c8b0ee158495e038ed075 +riscv-dt-fixes 5ef13c3636400bec51c334ac368c8d2fbb26bc3a +riscv-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx d358e5254674b70f34c847715ca509e46eb81e6f +gpio-brgl-fixes ea513dd3c066074b12e788114b45e0f2bda382cc +gpio-intel-fixes 6a23ae0a96a600d1d12557add110e0bb6e32730c +pinctrl-intel-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +auxdisplay-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +kunit-fixes f3903ec76ae6afcdba0347681d1dda005fb145cd +memblock-fixes c42af83c59b65d01c0f7a074e450bbbb43b22f0d +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 2eeb09fe1c5173b659929f92fee4461796ca8c14 +efi-fixes e5f0a698b34ed76002dc5cff3804a61c80233a7a +battery-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +iommufd-fixes b07bf253ef8e48e7ff0b378f441a180a8ad37124 +rust-fixes 559e608c46553c107dbba19dae0854af7b219400 +w1-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +pmdomain-fixes c98c99d5dbdf9fb0063650594edfd7d49b5f4e29 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes 3c493b524ffdb3fae7f0d9dc6b887359ce13cd34 +thead-clk-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +pwrseq-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +thead-dt-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes b042fdf18e89a347177a49e795d8e5184778b5b6 +trace-fixes 2c22361ab628adbca82ab2da6d41b7cfeb14b83c +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +tip-fixes 097fc16ddca68365737826ec8c9b38899ce2b259 +slab-fixes 53ca00a19d345197a37a1bf552e8d1e7b091666c +drm-msm-fixes f5d079564c44baaeedf5e25f4b943aa042ea0eb1 +uml-fixes df447a3b4a4b961c9979b4b3ffb74317394b9b40 +fwctl-fixes 211ddde0823f1442e4ad052a2f30f050145ccada +devsec-tsm-fixes fba4ceaa242d2bdf4c04b77bda41d32d02d3925d +drm-rust-fixes 211ddde0823f1442e4ad052a2f30f050145ccada +tenstorrent-dt-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc-fixes 6cb31fba137d45e682ce455b8ea364f44d5d4f98 +mm-stable dafdba0964bd10913fbaa5537201cbbe05df5b9c +mm-nonmm-stable 601cc399a01049efa76be8f496541315dc9cf914 +mm-unstable f233a43c8ad76fb3c3d148a9b6498a8733c6e979 +mm-nonmm-unstable c792b028db47ee6b6ee620ec5b6352590300f924 +kbuild 2a9c8c0b59d366acabb8f891e84569376f3e2709 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf cb015814f8b6eebcbb8e46e111d108892c5e6821 +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping 131971f67e258170c678fe572fda95f8cef88e66 +asm-generic edcc8a38b5ac1a3dbd05e113a38a25b937ebefe5 +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm dd9143371a8619f496e29160390fcafcee1371d1 +arm64 edde060637b92607f3522252c03d64ad06369933 +arm-perf e6a27290d8001538fec94e91ff8c7f956ee7e3e5 +arm-soc e5b2299997d3760840111ff2e6c5df9f2224f253 +amlogic 3b2ecf0c3cc319358d7ff3f2f0f262d47b497b5d +asahi-soc 5d21b7ca05c8c43a79c51764d1fafe798062ddcd +at91 fde90d654751425c7b104b8fda930ed6c34cfa85 +bmc a452f0ffe50be9f4fe6ce93f67b771150b8d7fb8 +broadcom 37c3a91e9730e274fe2eca9703033ae0f154cb62 +cix 4889f68b824df835bab956bab1519b132df32536 +davinci 3a8660878839faadb4f1a6dd72c3179c1df56787 +drivers-memory 84ac371ee4b33158b44d43855aebf432352ca919 +fsl 40657ab03e2031160580d0966ded9217fb2976df +imx-mxs 89d95dbad2a3857f06cb6002566bbdcbe53bbfef +mediatek 67ed5843a67b7ba63d79f2ba3fd21bee151d3138 +mvebu f0e6bc0c3ef4b4afb299bd6912586cafd5d864e9 +omap 2c85858e7c6839011e423109df556ef894a71cff +qcom 82ed018b3df9046243e5279e13b541208ccaa3a5 +renesas fbec5d4783d5f16684bdc3ad84876cdcc75ed231 +reset a0d57f7504b6027bc73b96711bcafa39565a9bac +rockchip 8e0b927d58488dcd61e238b5b2626225a3f02ae8 +samsung-krzk bca42080637ce3a21092fc0f7d5411e853b0c3b3 +scmi e5db90f4c044fab4073686e80c463b32e4770aa3 +sophgo c7f013d4c8c07a87d19cec90fc4d4633ad713fde +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 5a97a38c22799a802f33001dcb022d2942fe4a41 +stm32 a6961e2ced5190c68acd78a7e372de07f565fcd6 +sunxi ef541cc2e208a91707b5b4ebc03309dbcd108a84 +tee eb4bb32c8117c0c7c8d093c06a565fd3d5dbeb0f +tegra e016a50e00e68c67c0ecaa8b2069f2a694a1cf12 +tenstorrent-dt a71e6e8eea8ae2d624f097911f43357bba06d2a5 +thead-dt d8a174babf649346b6dad6784ae1e9bc8417af71 +ti 34729c8b27fdc064e7c15aade42a83fe635c8048 +xilinx a35dc981c5d87ed146fea91d275bfd2f14152446 +clk 6f172175b6f3fe35b5d519fc314f7a0b603a9af9 +clk-imx fdc1dc7dd53b95805d3943ed36785c1ec812915e +clk-renesas 5fb2f67341bd4b7c482f2bbda6b78244a51c3923 +thead-clk 3a8660878839faadb4f1a6dd72c3179c1df56787 +csky 817d21578d51e801df58ab012654486a71073074 +loongarch be77cf43d2fd6eca150594e997e40ca7df90f251 +m68k aaf4e92341b081bac1230f22619b0a298e285dab +m68knommu ac3fd01e4c1efce8f2c054cdeb2ddd2fc0fb150d +microblaze 7f7072574127c9e971cad83a0274e86f6275c0d5 +mips 2b6d718c8dbe61aedffd7d12cf7bc60fab6f3d0e +openrisc 8c30b0018f9d93391573e091960d257fd9de120a +parisc-hd 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +powerpc 9b36c7fc5aa5f2c6e6eeb9f312fdfe61b4291c9f +risc-v 0f226cf6026f3756022e387a869c031add683365 +riscv-dt a4aad736716d345d98c0eecbb0061fc9b6e578a1 +riscv-soc 719362b8a9724f96d33fecd95b3223d3a935a186 +s390 70075e3d0ca0b72cc983d03f7cd9796e43492980 +sh 8f5ae30d69d7543eee0d70083daf4de8fe15d585 +sparc fe0126702a40b2f3d315bc943ef10dc2f707e29d +uml a3209bb94b36351f11e0d9e72ac44e5dd777a069 +xtensa 4c8bad3ed035ab85ad9b0d247154be43a53ef84d +fs-next d411768e1372dab59ad745382d7aec6bc7233518 +printk 322530a9c2ab1da67e5b0988fa29aca64d96ec8f +pci 43dfc13ca972988e620a6edb72956981b75ab6b0 +pstore b692553573683b9e4ebab40c2782a3163f984cfd +hid 1c772200c9dcb23a304f84a9334fe2e0d9529ab0 +i2c d202341d9b0c5b5965787061ba0d10daafb9d6c5 +i2c-host 172368d013901e5d9352de7a2debddc66d1e1a20 +i3c 6a6d77ee7d619e3851c6db8133c1751cd1214c07 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 30ca0e049f507001c6377e28482a636689351f64 +jc_docs 464257baf99200d1be1c053f15aa617056361e81 +v4l-dvb f7231cff1f3ff8259bef02dc4999bc132abf29cf +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm d573d1f5141dbfc4ec411bf56d73b57fc57fb9e1 +cpufreq-arm 49505d17fe594e2da43ee65994a41cabc75c0579 +cpupower 059835bbfa282918a1e8e5e2d9628aa600093052 +devfreq d9600d57668c49308f705a660c5ad17fa3a53f73 +pmdomain 1f67707fafa598e2338dba08e3de0db3e468afd1 +opp 33ffb0aa8ce8b18aaa65e0f9346d52b4e314ad7d +thermal c411d8bf06992dade7abb88690dc2d467a868cc4 +rdma 80a85a771deb113cfe2e295fb9e84467a43ebfe4 +net-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +bpf-next 835a50753579aa8368a08fca307e638723207768 +ipsec-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +mlx5-next 5422318e27d7a4662701f518e2e51b9f73a331b1 +netfilter-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +ipvs-next c9dfb92de0738eb7fe6a591ad1642333793e8b6e +bluetooth 305c1c5dd5f4a915cb5a4a5c7115c0e3b3aa20c1 +wireless-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +ath-next c99ebb6132595b4b288a413981197eb076547c5a +iwlwifi-next 85d002b2ac56d74f09de7a2ef5f448ec94ceebd6 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 801b0840b09d93c51d23df9f92c063979058c153 +nand f6dffe2a9ed1bdcee1879e2728310fb1e08602cf +spi-nor ed26bd40df11ee438d623adc9c6cc2a7bf9c5dd3 +crypto 48bc9da3c97c15f1ea24934bcb3b736acd30163d +libcrypto 3f9f0252130e7dd60d41be0802bf58f6471c691d +drm c7685d11108acb387e44e3d81194d0d8959eaa44 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 308eeb8ca3fdee54bcd3ec7272c05688e178299a +amdgpu f24e96d69f5b9eb0f3b9c49e53c385c50729edfd +drm-intel 1c7f9e528f8f488b060b786bfb90b40540854db3 +drm-msm 7bc29d5fb6faff2f547323c9ee8d3a0790cd2530 +drm-msm-lumag e2f085ab8636fae2ebe0adf42071e7558234cd7b +drm-rust 57dc2ea0b7bdb828c5d966d9135c28fe854933a4 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +drm-xe 7319c2ceb2d74d54f24b7f5409b97aed406f0189 +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +regmap d40e1d95246b33019dfd066d6eb6bb7ff98ad7be +sound fd324768eb2c132bb111ba76675b4c72406251d9 +ieee1394 036176d9dba74e23e3ef358e171a77b75837fee0 +sound-asoc c8d8605fc53e8072848aadc7a5aa00c2f5143cac +modules 1ddac5cd7f278345b2e8298c930e4bffe0911a45 +input 70f62e52176df0f1f4684919546a6198d5e82529 +block d678712ead7318d5650158aa00113f63ccd4e210 +device-mapper 13ea55ea20176736516b20b9ea2d8cf97dbe74f5 +libata a26a0b4b48e181ff5ff340f9dc83612c74f2ccad +pcmcia 4a81f78caa53e0633cf311ca1526377d9bff7479 +mmc 79cf71c0b177c0e23d411e2469435e2c2f83f563 +mfd 44c603f35cad3f3b0f58fece99502d81620da9b2 +backlight d3cc7cd7bc46af587747399e956cf4508221476f +battery 8e8856396b54bea5c00a7ae88d87c6254aef2d94 +regulator 56edaa508ed2dd3dc377186ba9f388a58c573a9a +security 9a948eefad594c42717f29824dd40d6dc0b7aa13 +apparmor 8f5ae30d69d7543eee0d70083daf4de8fe15d585 +integrity 738c9738e690f5cea24a3ad6fd2d9a323cf614f6 +selinux cdcf0b369d400615355cdf8b389d7fdfa9fbc0a0 +smack 29c701f90b9341f1f9c1854a9c22b71c2318457d +tomoyo 834a7ef0b9df194a41409094b316e4a5d5d41391 +tpmdd 416f99c3b16f582a3fc6d64a1f77f39d94b76de5 +watchdog 5bcc5786a0cfa9249ccbe539833040a6285d0de3 +iommu 0d081b16946ef449fcb35b6edc1ef6f9fea6f0a0 +audit c8a3dfe7315945ebcc80ed5be8267920b609649a +devicetree 954c55c658e11c0cdc4cfa85968a0a5df975e26a +dt-krzk 3a8660878839faadb4f1a6dd72c3179c1df56787 +mailbox 1ec6e0e8c0dd6599472af944b8d703d526ff1031 +spi 865a1f17d5e41c0b34929afcab0afa6bdb90d33e +tip 528296f905ad05866e35c895ef685dccbf80c761 +clockevents d1780dce9575072303b9c574614b72b5c8c5c44c +edac 814b332921b6c9b4b4c6c98a024f2dd9f33a8178 +ftrace 5a63f3faf6569e3aac81595b6318ac76674a282f +rcu 9a08942f17017b708991c5089843d4a1bfac4420 +paulmck 7f8fcc6f09fb732745b3252f481def76b18fb99c +kvm e0c26d47def7382d7dbd9cad58bc653aed75737a +kvm-arm 3eef0c83c3f3e58933e98e678ddf4e95457d4d14 +kvms390 2bd1337a1295e012e60008ee21a64375e5234e12 +kvm-ppc c17b750b3ad9f45f2b6f7e6f7f4679844244f0b9 +kvm-riscv 3239c52fd21257c80579875e74c9956c2f9cd1f9 +kvm-x86 58e10b63777d0aebee2cf4e6c67e1a83e7edbe0f +xen-tip 150215b89bcf708356abcb7d3cafdd1e6068598b +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues 51cd2d2decf365a248ddc304b7aa6f0cadc748c3 +sched-ext 9f769637a93fac81689b80df6855f545839cf999 +drivers-x86 9d588a1140b9ae211581a7a154d0b806d8cd8238 +chrome-platform 52075d2c7595cfd6c1ce211a9cd138a9b067c448 +chrome-platform-firmware 3a8660878839faadb4f1a6dd72c3179c1df56787 +hsi 3a8660878839faadb4f1a6dd72c3179c1df56787 +leds-lj 072cd5f458d76b9e15d89ebdaea8b5cb1312eeef +ipmi 35bcedc1a7938da808f54510d8bc7d90cebb6278 +driver-core d358e5254674b70f34c847715ca509e46eb81e6f +usb d358e5254674b70f34c847715ca509e46eb81e6f +thunderbolt 479d186fc946b16c440f57995d5cb2151bfe61c0 +usb-serial 072f2c49572547f4b0776fe2da6b8f61e4b34699 +tty d358e5254674b70f34c847715ca509e46eb81e6f +char-misc d358e5254674b70f34c847715ca509e46eb81e6f +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 9e9182cab5ebc3ee7544e60ef08ba19fdf216920 +fastrpc 3a8660878839faadb4f1a6dd72c3179c1df56787 +fpga c9243d6df0d617535e842aa4c3d1d7dfdb91d07b +icc 60b52af082b1462e878d10a0298fad40a26a8b35 +iio f9e05791642810a0cf6237d39fafd6fec5e0b4bb +phy-next 716311dad200edf01a3776b62466571dfd217106 +soundwire 188d194be2bfe03afcc02c90d9d905b46a17f3ef +extcon b4338338aa3d44bf58973b9e44e0856ba597838f +gnss f5ef3f722d76eb8fdd11be3f1f1f1cc4fefbf45b +vfio d721f52e31553a848e0e9947ca15a49c5674aef3 +w1 a5d908e0ec05bd4f5dd818160f0252861879a5a2 +spmi 0ff41df1cb268fc69e703a08a57ee14ae967d0ca +staging d358e5254674b70f34c847715ca509e46eb81e6f +counter-next b462fcd08dd589d9cf9eb7f9d8fc7777b5c5521d +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine 2b11e7403a8ed816fce38b57cb88e04d997aa7af +cgroup 6ee43047e8ada63c4dfee01e2ea7e7eadfcda2ab +scsi 47ea324062527f5b044f5f6a9252d7dfc8203b89 +scsi-mkp 946574434aa9cfe175c3e8234734a3822410ff53 +vhost 1bac705c2ce781c988462cfc109ac04cc2bc41f4 +rpmsg f1f6eaa1e5450bba4458b9297271280edbe93c5f +gpio-brgl dae9750105cf93ac1e156ef91f4beeb53bd64777 +gpio-intel b2a186cced1199bb2777e229dc37a04d33507c6d +pinctrl 666065caa31aeb812978740bae21871067bb14b6 +pinctrl-intel 8daf70e6aa4118fa71a9eb5f361f1a29567e12ed +pinctrl-renesas 3b0cf6ab35909d7ac8d561e18159c62d42d914c2 +pinctrl-samsung 3cfc60e09bdc95483875f0b63cfdc23aea67135b +pwm 3c180003dffbc252a72dec4f0c697e12922e0417 +ktest d3042cbe84a060b4df764eb6c5300bbe20d125ca +kselftest a2f7990d330937a204b86b9cafbfef82f87a8693 +kunit 3a8660878839faadb4f1a6dd72c3179c1df56787 +kunit-next 7bc16e72ddb993d706f698c2f6cee694e485f557 +livepatching 5cb5575308bce9d63178fe943bf89c520a348808 +rtc 16bd954c93360145bc77cc601e350913fc28182d +nvdimm 30065e73d7c018cf2e1bec68e2d6ffafc17b3c25 +at24 aef72ebe9c86b516c6e126d4b453c96496547f0b +ntb 68113d26067408736fc3be948c2fe8db935aff1c +seccomp 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +slimbus 3a8660878839faadb4f1a6dd72c3179c1df56787 +nvmem 3a8660878839faadb4f1a6dd72c3179c1df56787 +xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66 +hyperv 01e70c839863f9052ce5be6016ef0c0c94b3c1ec +auxdisplay 00de283c53c99690807f5c875f8c715679a560ef +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 3a8660878839faadb4f1a6dd72c3179c1df56787 +mhi ac35e04f8000aaaf98635792464647e7a6f3422e +memblock 83c8f7b5e194eaf3fb268c513e23e23e892de8ed +cxl ea5514e300568cbe8f19431c3e424d4791db8291 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 7a2ff00c3b5e3ca1bbeb13cda52efe870be8501b +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab a8ec08bf32595ea4b109e3c7f679d4457d1c58c0 +random 3f9f0252130e7dd60d41be0802bf58f6471c691d +landlock eee654ca9a55fd1e8632afb119975cba6af7d4ad +rust 559e608c46553c107dbba19dae0854af7b219400 +rust-alloc 3a8660878839faadb4f1a6dd72c3179c1df56787 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 42415d163e5df6db799c7de6262d707e402c2c7e +rust-timekeeping 4521438fb076f8a6a52f45b0e508f6ef10ac0c49 +rust-xarray fa616196fbea12462107774fb6a1908c95f71cf0 +sysctl 564195c1a33c8fc631cd3d306e350b0e3d3e9555 +execve 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +bitmap 5ba71195a9cb8bb573c7165685a63654af4d7401 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp 7454048db27d685a155aaf4ea03bb9ad0d086bb9 +nolibc 1d573464749cfcdfee695c256bcf9ec9cffcbdce +iommufd c8ed57e24380d4f455822fc2759a86c9ace19502 +turbostat 0aff79a1ff35e7e1e15e78867a7a08faa4357fda +pwrseq 3a8660878839faadb4f1a6dd72c3179c1df56787 +capabilities-next 9891d2f79a9fe9b77ad290f950eb8fa3e375330e +ipe 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +kcsan dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +crc dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +fwctl 211ddde0823f1442e4ad052a2f30f050145ccada +devsec-tsm 7dfbe9a6751973c17138ddc0d33deff5f5f35b94 +hisilicon 6c177775dcc5e70a64ddf4ee842c66af498f2c7c +kthread d8b4bf4ea04dd96fe43f6010c614149aba4c9b91 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 00000000000000..beb69e60712ab5 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,409 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes ../next-fixes#fixes +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +exportfs https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git#exportfs-next +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://github.com/spacemit-com/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-fixes +tenstorrent-dt-fixes https://github.com/tenstorrent/linux.git#tenstorrent-dt-fixes +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.pengutronix.de/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://github.com/spacemit-com/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://github.com/tenstorrent/linux.git#tenstorrent-dt-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +siox https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git://git.infradead.org/users/willy/xarray.git#main +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..37e4f0876fa22d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2820 @@ +$ date -R +Fri, 12 Dec 2025 07:58:51 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0048fbb4011e Merge tag 'locking-futex-2025-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 0048fbb4011e..d358e5254674 +Fast-forward (no commit created; -m option ignored) + .../admin-guide/device-mapper/dm-raid.rst | 80 ++++- + Documentation/admin-guide/device-mapper/verity.rst | 6 +- + MAINTAINERS | 1 + + arch/alpha/include/asm/console.h | 4 +- + arch/alpha/include/asm/page.h | 4 +- + arch/alpha/include/asm/pal.h | 4 +- + arch/alpha/include/asm/thread_info.h | 8 +- + arch/alpha/include/uapi/asm/ioctls.h | 8 +- + arch/arm/Kconfig | 4 +- + arch/arm/include/asm/word-at-a-time.h | 10 +- + arch/arm/mm/alignment.c | 6 +- + arch/arm/mm/fault.c | 100 ++++-- + arch/s390/Kconfig | 2 + + arch/s390/boot/vmem.c | 16 +- + arch/s390/include/asm/bug.h | 5 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/pci.h | 5 + + arch/s390/mm/gmap_helpers.c | 9 +- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/vmem.c | 14 +- + arch/s390/pci/pci.c | 6 + + arch/s390/pci/pci_bus.c | 18 +- + arch/s390/pci/pci_irq.c | 392 +++++++++++++-------- + drivers/md/Kconfig | 2 + + drivers/md/dm-bufio.c | 10 +- + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 117 +++--- + drivers/md/dm-ebs-target.c | 2 +- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-log-writes.c | 1 + + drivers/md/dm-mpath.c | 63 ++-- + drivers/md/dm-pcache/cache.c | 13 +- + drivers/md/dm-pcache/cache_segment.c | 13 +- + drivers/md/dm-raid.c | 2 + + drivers/md/dm-snap.c | 73 ++-- + drivers/md/dm-sysfs.c | 8 +- + drivers/md/dm-table.c | 4 + + drivers/md/dm-thin.c | 19 +- + drivers/md/dm-vdo/action-manager.c | 2 +- + drivers/md/dm-vdo/admin-state.c | 75 ++-- + drivers/md/dm-vdo/block-map.c | 51 ++- + drivers/md/dm-vdo/completion.c | 5 + + drivers/md/dm-vdo/data-vio.c | 34 +- + drivers/md/dm-vdo/dedupe.c | 42 +-- + drivers/md/dm-vdo/dm-vdo-target.c | 5 +- + drivers/md/dm-vdo/encodings.c | 26 +- + drivers/md/dm-vdo/flush.c | 6 +- + drivers/md/dm-vdo/funnel-workqueue.c | 7 + + drivers/md/dm-vdo/io-submitter.c | 26 +- + drivers/md/dm-vdo/logical-zone.c | 20 +- + drivers/md/dm-vdo/packer.c | 15 +- + drivers/md/dm-vdo/physical-zone.c | 5 +- + drivers/md/dm-vdo/recovery-journal.c | 30 +- + drivers/md/dm-vdo/slab-depot.c | 96 ++--- + drivers/md/dm-vdo/vdo.c | 9 +- + drivers/md/dm-vdo/vdo.h | 4 +- + drivers/md/dm-vdo/vio.c | 3 +- + drivers/md/dm-vdo/vio.h | 6 +- + drivers/md/dm-verity-fec.c | 41 +-- + drivers/md/dm-verity-fec.h | 10 +- + drivers/md/dm-verity-target.c | 209 ++++++++--- + drivers/md/dm-verity.h | 52 ++- + drivers/md/dm-zone.c | 3 - + drivers/md/dm.c | 46 ++- + drivers/regulator/core.c | 13 +- + drivers/regulator/fixed.c | 11 +- + drivers/regulator/spacemit-p1.c | 4 +- + drivers/s390/char/sclp_mem.c | 16 + + drivers/s390/char/vmur.c | 8 +- + drivers/spi/spi-microchip-core-spi.c | 1 + + include/linux/dma-mapping.h | 2 +- + include/linux/irqdesc.h | 6 +- + include/linux/slab.h | 7 + + kernel/dma/pool.c | 2 +- + kernel/irq/irqdesc.c | 6 +- + mm/slab.h | 1 + + mm/slab_common.c | 52 ++- + mm/slub.c | 57 +-- + 78 files changed, 1290 insertions(+), 760 deletions(-) +Merging fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of ../next-fixes fixes/fixes +Already up to date. +Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (fe93446b5ebd vfs: use UAPI types for new struct delegation definition) +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (1e39da974ce6 fscrypt: fix left shift underflow when inode->i_blkbits > PAGE_SHIFT) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (df1fc7645847 Merge branch 'misc-6.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/inode.c | 1 + + fs/btrfs/qgroup.c | 27 ++++--------------------- + fs/btrfs/tests/qgroup-tests.c | 1 - + fs/btrfs/tree-log.c | 46 +++++++++++++++++++++++++++++++++++-------- + 4 files changed, 43 insertions(+), 32 deletions(-) +Merging vfs-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (f2a12cc3b97f erofs: avoid infinite loop due to incomplete zstd-compressed data) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (ebae102897e7 nfsd: Mark variable __maybe_unused to avoid W=1 build break) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +++++-- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (e8bd877fb76b ovl: fix possible double unlink) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (9e0e6577b3e5 btrfs: remove unnecessary inode key in btrfs_log_all_parents()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Already up to date. +Merging ceph/master (21c1466ea251 rbd: stop selecting CRC32, CRYPTO, and CRYPTO_AES) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + drivers/block/Kconfig | 3 - + fs/ceph/Kconfig | 3 - + fs/ceph/caps.c | 4 + + fs/ceph/mds_client.c | 20 +++- + fs/ceph/snap.c | 2 +- + fs/ceph/super.c | 3 + + include/trace/events/ceph.h | 234 ++++++++++++++++++++++++++++++++++++++++++++ + net/ceph/osd_client.c | 6 +- + net/ceph/osdmap.c | 120 ++++++++++------------- + 9 files changed, 316 insertions(+), 79 deletions(-) + create mode 100644 include/trace/events/ceph.h +Merging cifs/for-next (ab0347e67dac smb/client: remove DeviceType Flags and Device Characteristics definitions) +$ 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/cifspdu.h | 65 --- + fs/smb/client/nterr.c | 5 + + fs/smb/client/nterr.h | 1014 ++++++++++++++++++++++++----------------------- + fs/smb/common/fscc.h | 56 +++ + fs/smb/common/smb2pdu.h | 48 +-- + 5 files changed, 581 insertions(+), 607 deletions(-) +Merging configfs/configfs-next (f7f78098690d configfs: Constify ct_item_ops in struct config_item_type) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/keystore.c +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging dlm/next (8e4021078863 dlm: check for undefined release_option values) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (0bdbf89a8bbe erofs: switch on-disk header `erofs_fs.h` to MIT license) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (f5a5c9b40490 fs: exfat: improve error code handling in exfat_find_empty_entry()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/namei.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging exportfs/exportfs-next (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'exportfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (25554ea0b42b Pull udf extent block verification.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (6fb67ac89690 ext4: drop the TODO comment in ext4_es_insert_extent()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + fs/ext4/extents.c | 137 +++++++++++++++++++++++++++++------------------ + fs/ext4/extents_status.c | 124 ++++++++++++++++++++++++++++++++---------- + fs/ext4/inode.c | 18 +++---- + 3 files changed, 188 insertions(+), 91 deletions(-) +Merging f2fs/dev (cb015814f8b6 Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (8da059f2a497 fuse: Uninitialized variable in fuse_epoch_work()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (c2ffb7a0cb4a gfs: Use fixed GL_GLOCK_MIN_HOLD time) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/glock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging jfs/jfs-next (eb0cfcf26571 jfs: Add missing set_freezable() for freezable kthread) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 ++++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging ksmbd/ksmbd-for-next (2e0d224d8988 smb/server: add comment to FileSystemName of FileFsAttributeInformation) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/nterr.h | 543 --------------------------------------------- + fs/smb/server/smb2misc.c | 1 - + fs/smb/server/smb2pdu.c | 7 + + fs/smb/server/smb_common.h | 7 +- + 4 files changed, 10 insertions(+), 548 deletions(-) + delete mode 100644 fs/smb/server/nterr.h +Merging nfs/linux-next (bd3b04b46c7a NFSv4: Handle NFS4ERR_NOTSUPP errors for directory delegations) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/localio.c +Auto-merging fs/nfs/pnfs.c +Merge made by the 'ort' strategy. + fs/nfs/callback.c | 4 +- + fs/nfs/callback.h | 3 +- + fs/nfs/client.c | 21 ++++++-- + fs/nfs/delegation.c | 8 +++ + fs/nfs/delegation.h | 13 +++++ + fs/nfs/dir.c | 46 ++++++++++++---- + fs/nfs/inode.c | 3 ++ + fs/nfs/internal.h | 3 +- + fs/nfs/localio.c | 4 +- + fs/nfs/namespace.c | 16 +++++- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4client.c | 27 +++++++--- + fs/nfs/nfs4proc.c | 111 +++++++++++++++++++++++++++++++------- + fs/nfs/nfs4trace.h | 1 + + fs/nfs/nfs4xdr.c | 106 ++++++++++++++++++++++++++++++++++++ + fs/nfs/pnfs.c | 1 + + fs/nfs/proc.c | 3 +- + fs/nfs/super.c | 33 ++---------- + fs/nfs/unlink.c | 3 +- + include/linux/nfs_fs.h | 1 + + include/linux/nfs_fs_sb.h | 6 +++ + include/linux/nfs_xdr.h | 10 +++- + include/linux/sunrpc/bc_xprt.h | 7 +++ + net/sunrpc/backchannel_rqst.c | 37 +++++++++++-- + net/sunrpc/xprtrdma/backchannel.c | 8 +-- + 25 files changed, 386 insertions(+), 92 deletions(-) +Merging nfs-anna/linux-next (b623390045a8 NFS: Fix LTP test failures when timestamps are delegated) +$ 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 (c2f2b01b74be Merge tag 'i3c/for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (1b2ae190ea43 fs/ntfs3: check for shutdown in fsync) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (11f6bce77e27 fs/orangefs: Replace kzalloc + copy_from_user with memdup_user_nul) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (ad1423922781 ovl: make sure that ovl_create_real() returns a hashed dentry) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (0695aef23d67 ubifs: vmalloc(array_size()) -> vmalloc_array()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (3e281113f871 9p: fix new mount API cache option handling) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (79c47bc68efb Merge branch 'xfs-6.19-merge' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_inode_item.c +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/xfs_attr_item.c | 27 ++-- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 19 +-- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode_item.c | 49 ++++--- + fs/xfs/xfs_log.c | 292 ++++++++++++++++------------------------- + fs/xfs/xfs_log.h | 65 ++------- + fs/xfs/xfs_log_cil.c | 111 ++++++++++++++-- + fs/xfs/xfs_log_priv.h | 20 +++ + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trans.h | 4 +- + 16 files changed, 313 insertions(+), 347 deletions(-) +Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (5b629fa4cc9b Merge branch 'vfs.fixes' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Merge made by the 'ort' strategy. +Merging vfs/for-next (eb028c33451a d_make_discardable(): warn if given a non-persistent dentry) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (e540489acb50 kasan-unpoison-vms-addresses-with-a-common-tag-v4) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/page.h +Auto-merging arch/arm64/mm/fault.c +Auto-merging include/linux/kasan.h +Auto-merging mm/kasan/common.c +Auto-merging mm/kasan/shadow.c +Auto-merging mm/page_alloc.c +Auto-merging mm/vmalloc.c +Merge made by the 'ort' strategy. + .mailmap | 3 ++- + MAINTAINERS | 1 + + arch/x86/kernel/setup.c | 14 ++++++++++++++ + include/linux/genalloc.h | 1 + + include/linux/kasan.h | 16 ++++++++++++++++ + lib/idr.c | 2 ++ + mm/kasan/common.c | 32 ++++++++++++++++++++++++++++++++ + mm/kasan/hw_tags.c | 2 +- + mm/kasan/shadow.c | 4 +++- + mm/page_alloc.c | 10 +++++++++- + mm/vmalloc.c | 8 ++++---- + tools/testing/radix-tree/idr-test.c | 21 +++++++++++++++++++++ + 12 files changed, 106 insertions(+), 8 deletions(-) +Merging fs-current (49e73452c673 Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/btrfs/inode.c | 1 + + fs/btrfs/qgroup.c | 27 ++++------------------- + fs/btrfs/tests/qgroup-tests.c | 1 - + fs/btrfs/tree-log.c | 46 ++++++++++++++++++++++++++++++++------- + fs/nfsd/export.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 ++++-- + 7 files changed, 51 insertions(+), 36 deletions(-) +Merging kbuild-current/kbuild-fixes (4ab2ee307983 kbuild: install-extmod-build: Properly fix CC expansion when ccache is used) +$ git merge -m Merge branch 'kbuild-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes +Already up to date. +Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (fd2dee1c6e22 ARM: fix branch predictor hardening) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (165eb13e485c arm64: proton-pack: Fix hard lockup when !MITIGATE_SPECTRE_BRANCH_HISTORY) +$ git merge -m Merge branch 'for-next/fixes' of https://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 (e9191383d28d Merge tag 'sunxi-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. +Merging davinci-current/davinci/for-current (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://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 (6f37469a9330 memory: tegra210: Fix incorrect client ids) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (aaf4e92341b0 m68k: defconfig: Update defconfigs for v6.18-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (0843ba458439 powerpc/fadump: skip parameter area allocation when fadump is disabled) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (51d90a15fedf Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (885bebac9909 nfc: pn533: Fix error code in pn533_acr122_poweron_rdr()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging tools/testing/selftests/net/tls.c +Merge made by the 'ort' strategy. + drivers/net/can/Kconfig | 5 +- + drivers/net/can/Makefile | 2 +- + drivers/net/can/dev/Makefile | 5 +- + drivers/net/can/usb/gs_usb.c | 2 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 8 ++- + drivers/net/ethernet/broadcom/b44.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/google/gve/gve_main.c | 17 +++-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 1 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 11 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 2 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 27 ++++---- + drivers/net/ethernet/realtek/r8169_main.c | 5 +- + drivers/net/ethernet/ti/Kconfig | 3 +- + drivers/net/ipvlan/ipvlan_core.c | 3 + + drivers/net/phy/marvell-88q2xxx.c | 2 +- + drivers/net/phy/realtek/realtek_main.c | 4 -- + drivers/net/phy/sfp.c | 2 + + drivers/nfc/pn533/usb.c | 2 +- + include/net/inet_frag.h | 18 +---- + include/net/ipv6_frag.h | 9 ++- + include/uapi/linux/energy_model.h | 1 + + include/uapi/linux/mptcp.h | 1 + + kernel/power/em_netlink_autogen.c | 1 + + kernel/power/em_netlink_autogen.h | 1 + + net/caif/cffrml.c | 9 ++- + net/can/Kconfig | 1 - + net/handshake/request.c | 2 + + net/hsr/hsr_forward.c | 2 + + net/ipv4/inet_fragment.c | 55 +++++++++++++-- + net/ipv4/ip_fragment.c | 22 +++--- + net/mptcp/Kconfig | 2 +- + net/mptcp/pm_netlink.c | 3 +- + net/mptcp/protocol.c | 22 +++--- + net/netfilter/ipvs/ip_vs_xmit.c | 3 + + net/netfilter/nf_conncount.c | 25 ++++--- + net/netfilter/nf_conntrack_core.c | 3 + + net/netfilter/nf_flow_table_path.c | 4 +- + net/netrom/nr_out.c | 4 +- + net/openvswitch/flow_netlink.c | 13 +++- + net/sched/sch_ets.c | 6 +- + net/unix/garbage.c | 2 +- + tools/net/ynl/Makefile.deps | 2 + + tools/testing/selftests/net/af_unix/Makefile | 7 +- + tools/testing/selftests/net/forwarding/config | 1 + + .../net/forwarding/vxlan_bridge_1q_mc_ul.sh | 76 +++++++++------------ + tools/testing/selftests/net/lib.sh | 3 +- + tools/testing/selftests/net/lib/ksft.h | 6 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 4 ++ + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 11 +++ + .../selftests/net/netfilter/conntrack_clash.sh | 9 ++- + tools/testing/selftests/net/tfo.c | 3 +- + tools/testing/selftests/net/tls.c | 2 +- + .../tc-testing/tc-tests/infra/qdiscs.json | 78 ++++++++++++++++++++++ + 56 files changed, 358 insertions(+), 168 deletions(-) +Merging bpf/master (1d528e794f3d Merge branch 'bpf-fix-bpf_d_path-helper-prototype') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Merge made by the 'ort' strategy. + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/x86/kernel/unwind_orc.c | 39 +++++++--- + arch/x86/net/bpf_jit_comp.c | 12 +++ + include/linux/bpf.h | 3 + + kernel/bpf/core.c | 16 ++++ + kernel/bpf/dmabuf_iter.c | 56 +++++++++++-- + kernel/trace/bpf_trace.c | 2 +- + net/smc/Kconfig | 4 +- + tools/bpf/bpftool/Makefile | 2 + + tools/lib/bpf/libbpf.c | 7 +- + tools/testing/selftests/bpf/Makefile | 2 + + tools/testing/selftests/bpf/prog_tests/d_path.c | 91 +++++++++++++++++----- + .../testing/selftests/bpf/prog_tests/dmabuf_iter.c | 47 +++++++++-- + tools/testing/selftests/bpf/progs/test_d_path.c | 23 ++++++ + 14 files changed, 257 insertions(+), 49 deletions(-) +Merging ipsec/master (3d5221af9c77 xfrm: Fix inner mode lookup in tunnel mode GSO segmentation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv4/esp4_offload.c | 4 ++-- + net/ipv6/esp6_offload.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging netfilter/main (885bebac9909 nfc: pn533: Fix error code in pn533_acr122_poweron_rdr()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (de0337d641bf net: ionic: map SKB after pseudo-header checksum prep) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (0ff8eeafba5c Merge tag 'rtw-2025-11-20' of https://github.com/pkshih/rtw) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (d0309c054362 Merge tag 'net-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (1a222625b468 wifi: iwlwifi: mld: always take beacon ies in link grading) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (ac3fd01e4c1e Linux 6.18-rc7) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (fd324768eb2c ALSA: hda/tas2781: Add new quirk for HP new project) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging arch/arm/configs/lpc32xx_defconfig +Auto-merging arch/arm/configs/omap1_defconfig +Auto-merging arch/arm/configs/tegra_defconfig +Auto-merging arch/mips/configs/gcw0_defconfig +Auto-merging arch/mips/configs/loongson1_defconfig +Auto-merging arch/sh/configs/edosk7760_defconfig +Auto-merging arch/sh/configs/se7724_defconfig +Auto-merging arch/sh/configs/sh7785lcr_32bit_defconfig +Auto-merging sound/usb/mixer_quirks.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs42xx8.yaml | 5 +- + .../bindings/sound/cix,sky1-ipbloq-hda.yaml | 62 +++ + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/tegra_defconfig | 1 - + arch/mips/configs/gcw0_defconfig | 1 - + arch/mips/configs/loongson1_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 1 - + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/configs/rs90_defconfig | 1 - + arch/powerpc/configs/85xx-hw.config | 1 - + arch/powerpc/configs/86xx-hw.config | 1 - + arch/powerpc/configs/mpc5200_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + include/sound/hdaudio.h | 3 + + include/uapi/sound/asound.h | 2 +- + sound/core/Kconfig | 2 +- + sound/firewire/motu/motu-hwdep.c | 7 +- + sound/hda/codecs/realtek/alc269.c | 4 + + sound/hda/codecs/side-codecs/cs35l41_hda.c | 2 + + sound/hda/controllers/Kconfig | 14 + + sound/hda/controllers/Makefile | 2 + + sound/hda/controllers/cix-ipbloq.c | 436 +++++++++++++++++++++ + sound/hda/core/bus.c | 1 + + sound/hda/core/controller.c | 12 +- + sound/hda/core/intel-dsp-config.c | 3 +- + sound/hda/core/stream.c | 10 +- + sound/soc/amd/acp/acp-i2s.c | 2 + + sound/soc/amd/acp/acp-legacy-common.c | 30 +- + sound/soc/bcm/bcm63xx-pcm-whistler.c | 4 +- + sound/soc/codecs/Kconfig | 3 +- + sound/soc/codecs/ak4458.c | 10 +- + sound/soc/codecs/ak5558.c | 10 +- + sound/soc/codecs/cs-amp-lib.c | 29 +- + sound/soc/codecs/cs35l41.c | 7 +- + sound/soc/codecs/nau8325.c | 4 +- + sound/soc/codecs/wcd937x.c | 4 +- + sound/soc/codecs/wcd938x.c | 3 +- + sound/soc/codecs/wcd939x.c | 3 +- + sound/soc/qcom/qdsp6/q6afe.c | 4 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/usb/mixer_quirks.c | 1 + + 46 files changed, 626 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cix,sky1-ipbloq-hda.yaml + create mode 100644 sound/hda/controllers/cix-ipbloq.c +Merging sound-asoc-fixes/for-linus (c8d8605fc53e Merge remote-tracking branch 'asoc/for-6.18' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regmap-fixes/for-linus (6146a0f1dfae Linux 6.18-rc4) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (56edaa508ed2 Merge remote-tracking branch 'regulator/for-6.18' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (865a1f17d5e4 Merge remote-tracking branch 'spi/for-6.18' into spi-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. +Merging pci-current/for-linus (94bf74830a97 PCI: rzg3s-host: Initialize MSI status bitmap before use) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/controller/pcie-rzg3s-host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging driver-core.current/driver-core-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (523bf0a59e67 USB: serial: option: add support for Rolling RW101R-GL) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (74f97a468356 iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/at91-sama5d2_adc.c | 1 + + 1 file changed, 1 insertion(+) +Merging counter-current/counter-current (109ff654934a counter: microchip-tcb-capture: Allow shared IRQ for multi-channel TCBs) +$ git merge -m Merge branch 'counter-current' of https://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 (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-linus' of https://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 (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (429c4727011e Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (48bc9da3c97c crypto: zstd - fix double-free in per-CPU stream cleanup) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging libcrypto-fixes/libcrypto-fixes (f6a458746f90 crypto: arm64/ghash - Fix incorrect output from ghash-neon) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + arch/arm64/crypto/aes-glue.c | 75 ++++++++++++++++------------------ + arch/arm64/crypto/aes-neonbs-glue.c | 44 ++++++++++---------- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/sm4-ce-glue.c | 46 ++++++++++----------- + arch/riscv/crypto/Kconfig | 12 ++++-- + lib/crypto/Kconfig | 9 ++-- + lib/crypto/Makefile | 1 - + lib/crypto/blake2b.c | 44 +++++++++----------- + lib/crypto/blake2s.c | 38 ++++++++--------- + lib/crypto/riscv/chacha-riscv64-zvkb.S | 5 +-- + 10 files changed, 132 insertions(+), 144 deletions(-) +Merging vfio-fixes/for-linus (d323ad739666 vfio: selftests: replace iova=vaddr with allocated iovas) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (dd4adb986a86 selftests/tracing: Run sample events to clear page cache events) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (f52c6c5eb159 dmaengine: ti: k3-udma: fix device leak on udma lookup) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Auto-merging drivers/dma/at_hdmac.c +Merge made by the 'ort' strategy. + drivers/dma/at_hdmac.c | 9 +++++++-- + drivers/dma/bcm-sba-raid.c | 6 +++++- + drivers/dma/cv1800b-dmamux.c | 17 ++++++++++------- + drivers/dma/dw/rzn1-dmamux.c | 4 +++- + drivers/dma/idxd/compat.c | 23 +++++++++++++++++++---- + drivers/dma/lpc18xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/lpc32xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/mmp_pdma.c | 20 ++++++++------------ + drivers/dma/sh/rz-dmac.c | 13 +++++++++++-- + drivers/dma/stm32/stm32-dmamux.c | 31 +++++++++++++++++++------------ + drivers/dma/ti/dma-crossbar.c | 35 ++++++++++++++++++++--------------- + drivers/dma/ti/k3-udma-private.c | 2 +- + drivers/dma/xilinx/xdma-regs.h | 1 + + drivers/dma/xilinx/xdma.c | 2 +- + 14 files changed, 133 insertions(+), 68 deletions(-) +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://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 (97315e7c901a mtd: onenand: Pass correct pointer to IRQ handler) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-mfd-fixes' of https://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 (27afd6e066cf media: videobuf2: forbid remove_bufs when legacy fileio is active) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (997c06330fd5 reset: imx8mp-audiomix: Fix bad mask values) +$ 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 (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (32bd348be3fa KVM: Fix last_boosted_vcpu index assignment bug) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (5f9df945d4e8 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (cb015814f8b6 Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (214291cbaace acpi/hmat: Fix lockdep warning for hmem_register_resource()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (31b931bebd11 dma-mapping: Fix DMA_BIT_MASK() macro being broken) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (9d588a1140b9 Merge tag 'platform-drivers-x86-v6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'fixes' of https://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 (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (3a058541627a cpufreq: dt-platdev: Fix creating device on OPPv1 platforms) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/sprd,sc9860-clk.yaml | 26 ---------------------- + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +-- + .../bindings/display/ti/ti,j721e-dss.yaml | 3 +-- + drivers/cpufreq/cpufreq-dt-platdev.c | 7 +++--- + drivers/of/fdt.c | 2 +- + 5 files changed, 7 insertions(+), 34 deletions(-) +Merging dt-krzk-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (90449f2d1e1f scsi: sg: Do not sleep in atomic context) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (6cd5045ad470 dt-bindings: mmc: sdhci-of-aspeed: Switch ref to sdhci-common.yaml) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (162f24cbb0f6 rtc: rx8025: fix incorrect register reference) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (e2285bd4a467 riscv: fix KUnit test_kprobes crash when building with Clang) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 29 ++++++++++++++++++++++ + 1 file changed, 29 insertions(+) +Merging riscv-dt-fixes/riscv-dt-fixes (5ef13c363640 riscv: dts: microchip: remove BeagleV Fire fabric.dtsi) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Auto-merging arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts +Merge made by the 'ort' strategy. + .../dts/microchip/mpfs-beaglev-fire-fabric.dtsi | 82 ---------------------- + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 5 -- + 2 files changed, 87 deletions(-) + delete mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi +Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'spdx-linus' of https://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 (ea513dd3c066 gpio: shared: make locking more fine-grained) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-mmio.c | 10 +++---- + drivers/gpio/gpio-regmap.c | 2 +- + drivers/gpio/gpiolib-acpi-quirks.c | 22 ++++++++++++++++ + drivers/gpio/gpiolib-shared.c | 54 ++++++++++++++++++++++++-------------- + 5 files changed, 63 insertions(+), 27 deletions(-) +Merging gpio-intel-fixes/fixes (6a23ae0a96a6 Linux 6.18-rc6) +$ git merge -m Merge branch 'fixes' of https://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 (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (f3903ec76ae6 MAINTAINERS: Update KUnit email address for Rae Moar) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (c42af83c59b6 memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (2eeb09fe1c51 libperf: Use 'extern' in LIBPERF_API visibility macro) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (e5f0a698b34e Linux 6.17) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (b07bf253ef8e iommufd/iommufd_private.h: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (559e608c4655 Merge tag 'ntfs3_for_6.19' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ 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 w1-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (c98c99d5dbdf pmdomain: tegra: Add GENPD_FLAG_NO_STAY_ON flag) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (3c493b524ffd Merge tag 'sunxi-clk-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1a fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (b042fdf18e89 tracing: Fix WARN_ON in tracing_buffers_mmap_close for split VMAs) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (2c22361ab628 MAINTAINERS: Add tracepoint-update.c to TRACING section) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (097fc16ddca6 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + Documentation/arch/x86/boot.rst | 4 ++-- + .../translations/zh_CN/core-api/irq/irq-domain.rst | 4 ---- + arch/x86/events/amd/uncore.c | 5 +---- + arch/x86/kernel/fpu/xstate.c | 4 ++-- + drivers/irqchip/irq-mchp-eic.c | 2 +- + include/linux/irqdomain.h | 16 -------------- + include/linux/rseq_entry.h | 2 +- + kernel/cpu.c | 25 ++++++++++++++-------- + kernel/events/core.c | 22 ++++++++++--------- + kernel/events/uprobes.c | 8 +++---- + kernel/irq/manage.c | 3 +++ + lib/bug.c | 6 +++++- + 12 files changed, 47 insertions(+), 54 deletions(-) +Merging slab-fixes/slab/for-next-fixes (53ca00a19d34 mm/slub: reset KASAN tag in defer_free() before accessing freed memory) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging drm-msm-fixes/msm-fixes (f5d079564c44 drm/msm/dpu: Fix adjusted mode clock check for 3d merge) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (df447a3b4a4b um: Fix FD copy size in os_rcv_fd_msg()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://github.com/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (6cb31fba137d drm/mgag200: Fix big-endian support) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/tilcdc/tilcdc_crtc.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 11 +++- + drivers/gpu/drm/drm_plane.c | 8 +-- + drivers/gpu/drm/mgag200/mgag200_mode.c | 25 +++++++++ + .../gpu/drm/nouveau/dispnv04/nouveau_i2c_encoder.c | 20 ------- + .../drm/nouveau/include/dispnv04/i2c/encoder_i2c.h | 19 ++++++- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4 ++ + drivers/gpu/drm/nouveau/nouveau_fence.c | 6 +-- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 61 +++++++++++++++------- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 3 ++ + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 10 +++- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 8 +-- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 53 ++++++++++++------- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++ + 16 files changed, 166 insertions(+), 76 deletions(-) +Merging mm-stable/mm-stable (dafdba0964bd mm/damon/tests/core-kunit: avoid damos_test_commit stack warning) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/platforms/pseries/cmm.c +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/mm.h +Auto-merging mm/huge_memory.c +Auto-merging mm/vmscan.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/powerpc/platforms/pseries/cmm.c | 3 +- + include/linux/huge_mm.h | 13 ++- + include/linux/mm.h | 2 +- + include/linux/mmzone.h | 2 +- + mm/damon/tests/core-kunit.h | 9 +- + mm/huge_memory.c | 167 +++++++++++++++++++---------------- + mm/hugetlb.c | 25 ++++-- + mm/vmscan.c | 8 +- + 9 files changed, 132 insertions(+), 98 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (601cc399a010 mm: memfd_luo: add CONFIG_SHMEM dependency) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging Documentation/dev-tools/checkpatch.rst +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/ocfs2/xattr.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/checkpatch.rst | 23 ++++++++++++++++++++ + fs/fat/cache.c | 7 +------ + fs/ocfs2/alloc.c | 12 ++++++----- + fs/ocfs2/buffer_head_io.c | 2 +- + fs/ocfs2/cluster/nodemanager.c | 3 ++- + fs/ocfs2/dir.c | 10 ++++----- + fs/ocfs2/file.c | 14 +++++++++---- + fs/ocfs2/inode.c | 11 ++++++++-- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 3 ++- + fs/ocfs2/ocfs2.h | 18 ++++++++++++++++ + fs/ocfs2/resize.c | 4 ++-- + fs/ocfs2/stackglue.c | 3 ++- + fs/ocfs2/suballoc.c | 13 +++++++++++- + fs/ocfs2/super.c | 2 +- + fs/ocfs2/xattr.c | 38 ++++++++++++++++++++++++++++++---- + include/linux/args.h | 4 ++-- + kernel/liveupdate/Kconfig | 1 + + kernel/liveupdate/luo_core.c | 4 +--- + kernel/liveupdate/luo_file.c | 7 +++++-- + mm/shmem.c | 11 ++++++++-- + scripts/checkpatch.pl | 6 ++++++ + 22 files changed, 154 insertions(+), 44 deletions(-) +Merging mm-unstable/mm-unstable (f233a43c8ad7 mm/damon/vaddr: fix missing pte_unmap_unlock in damos_va_migrate_pmd_entry()) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging include/linux/mm.h +Merge made by the 'ort' strategy. + include/asm-generic/tlb.h | 69 ++++++++++++++++++++++++- + include/linux/hugetlb.h | 21 +++++--- + include/linux/mm.h | 3 +- + mm/damon/vaddr.c | 2 +- + mm/hugetlb.c | 129 +++++++++++++++++++++++++--------------------- + mm/mmu_gather.c | 6 +++ + mm/mprotect.c | 2 +- + mm/rmap.c | 45 ++++++++-------- + 8 files changed, 181 insertions(+), 96 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (c792b028db47 tests/liveupdate: add in-kernel liveupdate test) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging MAINTAINERS +Auto-merging kernel/watchdog.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/core-api/liveupdate.rst | 11 + + MAINTAINERS | 1 + + include/linux/kho/abi/luo.h | 81 +++++ + include/linux/liveupdate.h | 143 ++++++++ + kernel/liveupdate/Makefile | 1 + + kernel/liveupdate/luo_core.c | 7 +- + kernel/liveupdate/luo_file.c | 32 +- + kernel/liveupdate/luo_flb.c | 656 ++++++++++++++++++++++++++++++++++ + kernel/liveupdate/luo_internal.h | 15 + + kernel/watchdog.c | 16 +- + lib/Kconfig.debug | 23 ++ + lib/build_OID_registry | 26 +- + lib/tests/Makefile | 1 + + lib/tests/liveupdate.c | 158 ++++++++ + 14 files changed, 1152 insertions(+), 19 deletions(-) + create mode 100644 kernel/liveupdate/luo_flb.c + create mode 100644 lib/tests/liveupdate.c +Merging kbuild/kbuild-next (2a9c8c0b59d3 kbuild: add target to build a cpio containing modules) +$ git merge -m Merge branch 'kbuild-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-next +Already up to date. +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1'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 (cb015814f8b6 Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Already up to date. +Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (131971f67e25 dma-mapping: remove unused map_page callback) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (edcc8a38b5ac once: fix race by moving DO_ONCE to separate section) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (dd9143371a86 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Already up to date. +Merging arm64/for-next/core (edde060637b9 Merge branch 'for-next/set_memory' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (e6a27290d800 perf: arm_spe: Add support for filtering on data source) +$ git merge -m Merge branch 'for-next/perf' of https://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 (e5b2299997d3 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 177 +++++++++++++++++++++++++++++++++ + 1 file changed, 177 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (3b2ecf0c3cc3 Merge branch 'v6.19/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (5d21b7ca05c8 Merge branch 'apple-soc/drivers-6.19' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (fde90d654751 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (a452f0ffe50b Merge branch 'aspeed/arm/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 6 - + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 39 +++- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 +- + .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 29 ++- + .../boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts | 246 +++++++++++++++++++++ + 7 files changed, 316 insertions(+), 14 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts +Merging broadcom/next (37c3a91e9730 arm64: dts: broadcom: bcm2712: Add watchdog DT node) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) +Merging cix/for-next (4889f68b824d Merge remote-tracking branch 'cix/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (84ac371ee4b3 Merge branch 'mem-ctrl-next' into for-next) +$ 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. +Merging fsl/soc_fsl (40657ab03e20 bus: fsl-mc: Cope for unbound devices in fsl_mc_shutdown) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/bus/fsl-mc/fsl-mc-bus.c | 77 +++++++++++++++++------------------------ + 1 file changed, 32 insertions(+), 45 deletions(-) +Merging imx-mxs/for-next (89d95dbad2a3 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (67ed5843a67b Merge branch 'v6.18-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (f0e6bc0c3ef4 clk: mvebu: cp110 add CLK_IGNORE_UNUSED to pcie_x10, pcie_x11 & pcie_x4) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date. +Merging omap/for-next (2c85858e7c68 Merge branch 'omap-for-v6.19/drivers' into tmp/omap-next-20251117.085514) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (82ed018b3df9 Merge branches 'arm32-fixes-for-6.19', 'arm64-defconfig-for-6.19', 'arm64-fixes-for-6.19', 'clk-for-6.19' and 'drivers-for-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging .mailmap +Auto-merging drivers/pmdomain/qcom/rpmhpd.c +Auto-merging include/dt-bindings/power/qcom,rpmhpd.h +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 13 ------ + .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 12 ------ + .../boot/dts/qcom/qcom-msm8974-samsung-hlte.dts | 12 ------ + .../dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 12 ------ + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 50 ++++++++++++++++++++-- + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 8 ---- + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 11 ----- + .../dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 9 ---- + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 11 ++--- + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 12 ------ + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 +++++-- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 - + arch/arm64/boot/dts/qcom/sm8650.dtsi | 3 -- + arch/arm64/boot/dts/qcom/talos.dtsi | 4 +- + drivers/pmdomain/qcom/rpmhpd.c | 4 ++ + include/dt-bindings/power/qcom,rpmhpd.h | 1 + + 18 files changed, 73 insertions(+), 112 deletions(-) +Merging renesas/next (fbec5d4783d5 Merge branches 'renesas-drivers-for-v6.19' and 'renesas-dts-for-v6.19' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (a0d57f7504b6 reset: gpio: add the "compatible" property) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/core.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging rockchip/for-next (8e0b927d5848 Merge branch 'v6.19-clk/next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (bca42080637c Merge branch 'next/drivers-late' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging scmi/for-linux-next (e5db90f4c044 Merge branch 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) +Merging sophgo/for-next (c7f013d4c8c0 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (5a97a38c2279 riscv: dts: spacemit: define all missing I2C controller nodes) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Already up to date. +Merging stm32/stm32-next (a6961e2ced51 arm64: dts: st: set RIFSC as an access controller on stm32mp21x platforms) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (ef541cc2e208 Merge branch 'sunxi/fixes-for-6.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (eb4bb32c8117 Merge branch 'qcomtee_fixes_for_6.18' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (e016a50e00e6 Merge branch for-6.19/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging tenstorrent-dt/tenstorrent-dt-for-next (a71e6e8eea8a riscv: defconfig: Enable Tenstorrent SoCs) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://github.com/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (d8a174babf64 riscv: dts: thead: Add reset controllers of more subsystems for TH1520) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (34729c8b27fd Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (a35dc981c5d8 Merge branch 'zynqmp/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 4 +-- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +-- + arch/arm64/configs/defconfig | 42 ++++++++++++++++++++++++++++++ + 3 files changed, 46 insertions(+), 4 deletions(-) +Merging clk/clk-next (6f172175b6f3 Merge branches 'clk-visconti', 'clk-imx', 'clk-microchip', 'clk-rockchip' and 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (fdc1dc7dd53b clk: imx: add driver for imx8ulp's sim lpav) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (5fb2f67341bd clk: renesas: r9a09g077: Add SPI module clocks) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging thead-clk/thead-clk-for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51 csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (be77cf43d2fd LoongArch: Adjust default config files for 32BIT/64BIT) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/configs/loongson64_defconfig +Auto-merging arch/loongarch/include/asm/loongarch.h +Auto-merging arch/loongarch/kvm/vcpu.c +Auto-merging arch/loongarch/vdso/Makefile +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 5 + + arch/loongarch/Makefile | 7 +- + arch/loongarch/configs/loongson32_defconfig | 1105 ++++++++++++++++++++ + .../{loongson3_defconfig => loongson64_defconfig} | 7 +- + arch/loongarch/include/asm/Kbuild | 1 + + arch/loongarch/include/asm/addrspace.h | 15 +- + arch/loongarch/include/asm/asm.h | 77 +- + arch/loongarch/include/asm/asmmacro.h | 118 ++- + arch/loongarch/include/asm/atomic-amo.h | 206 ++++ + arch/loongarch/include/asm/atomic-llsc.h | 100 ++ + arch/loongarch/include/asm/atomic.h | 197 +--- + arch/loongarch/include/asm/bitops.h | 11 + + arch/loongarch/include/asm/bitrev.h | 2 +- + arch/loongarch/include/asm/checksum.h | 4 + + arch/loongarch/include/asm/cmpxchg.h | 48 +- + arch/loongarch/include/asm/cpu-features.h | 3 - + arch/loongarch/include/asm/dmi.h | 2 +- + arch/loongarch/include/asm/elf.h | 31 + + arch/loongarch/include/asm/inst.h | 12 +- + arch/loongarch/include/asm/irq.h | 12 + + arch/loongarch/include/asm/jump_label.h | 12 +- + arch/loongarch/include/asm/local.h | 37 + + arch/loongarch/include/asm/loongarch.h | 102 +- + arch/loongarch/include/asm/module.h | 11 + + arch/loongarch/include/asm/page.h | 2 +- + arch/loongarch/include/asm/percpu.h | 44 +- + arch/loongarch/include/asm/pgtable-bits.h | 36 +- + arch/loongarch/include/asm/pgtable.h | 81 +- + arch/loongarch/include/asm/stackframe.h | 34 +- + arch/loongarch/include/asm/string.h | 2 + + arch/loongarch/include/asm/timex.h | 33 +- + arch/loongarch/include/asm/uaccess.h | 63 +- + arch/loongarch/include/asm/vdso/gettimeofday.h | 4 + + arch/loongarch/include/uapi/asm/Kbuild | 1 + + arch/loongarch/include/uapi/asm/ptrace.h | 10 + + arch/loongarch/include/uapi/asm/unistd.h | 6 + + arch/loongarch/kernel/Makefile.syscalls | 1 + + arch/loongarch/kernel/cpu-probe.c | 13 +- + arch/loongarch/kernel/efi-header.S | 4 + + arch/loongarch/kernel/efi.c | 4 +- + arch/loongarch/kernel/entry.S | 22 +- + arch/loongarch/kernel/env.c | 5 +- + arch/loongarch/kernel/fpu.S | 111 ++ + arch/loongarch/kernel/head.S | 39 +- + arch/loongarch/kernel/module-sections.c | 1 + + arch/loongarch/kernel/module.c | 204 +++- + arch/loongarch/kernel/proc.c | 10 +- + arch/loongarch/kernel/process.c | 11 +- + arch/loongarch/kernel/ptrace.c | 5 + + arch/loongarch/kernel/relocate.c | 13 +- + arch/loongarch/kernel/setup.c | 8 +- + arch/loongarch/kernel/switch.S | 28 +- + arch/loongarch/kernel/syscall.c | 15 +- + arch/loongarch/kernel/time.c | 31 +- + arch/loongarch/kernel/traps.c | 15 +- + arch/loongarch/kernel/unaligned.c | 30 +- + arch/loongarch/kvm/vcpu.c | 5 +- + arch/loongarch/lib/bswapdi.c | 13 + + arch/loongarch/lib/bswapsi.c | 13 + + arch/loongarch/lib/clear_user.S | 22 +- + arch/loongarch/lib/copy_user.S | 28 +- + arch/loongarch/lib/dump_tlb.c | 14 +- + arch/loongarch/lib/unaligned.S | 72 +- + arch/loongarch/mm/init.c | 4 +- + arch/loongarch/mm/page.S | 118 +-- + arch/loongarch/mm/tlb.c | 12 +- + arch/loongarch/mm/tlbex.S | 322 ++++-- + arch/loongarch/pci/pci.c | 2 + + arch/loongarch/power/hibernate.c | 6 +- + arch/loongarch/power/platform.c | 4 +- + arch/loongarch/power/suspend.c | 24 +- + arch/loongarch/power/suspend_asm.S | 72 +- + arch/loongarch/vdso/Makefile | 7 +- + arch/loongarch/vdso/vdso.lds.S | 4 +- + arch/loongarch/vdso/vgetcpu.c | 8 + + drivers/firmware/efi/libstub/loongarch.c | 8 +- + drivers/irqchip/irq-loongarch-avec.c | 5 +- + 77 files changed, 3002 insertions(+), 772 deletions(-) + create mode 100644 arch/loongarch/configs/loongson32_defconfig + rename arch/loongarch/configs/{loongson3_defconfig => loongson64_defconfig} (99%) + create mode 100644 arch/loongarch/include/asm/atomic-amo.h + create mode 100644 arch/loongarch/include/asm/atomic-llsc.h + create mode 100644 arch/loongarch/lib/bswapdi.c + create mode 100644 arch/loongarch/lib/bswapsi.c +Merging m68k/for-next (aaf4e92341b0 m68k: defconfig: Update defconfigs for v6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (ac3fd01e4c1e Linux 6.18-rc7) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (7f7072574127 Merge tag 'kbuild-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux) +$ 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 (2b6d718c8dbe MIPS: Fix whitespace damage in r4k_wait from VS timer fix) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (8c30b0018f9d openrisc: Add jump label support) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (9b36c7fc5aa5 macintosh/via-pmu-backlight: Include <linux/fb.h> and <linux/of.h>) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (0f226cf6026f kselftest/riscv: add kselftest for user mode cfi) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/riscv/extensions.yaml +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/hwcap.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging tools/testing/selftests/riscv/hwprobe/which-cpus.c +Resolved 'arch/riscv/include/asm/hwcap.h' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 410b87a6ad56] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/arch/riscv/hwprobe.rst | 12 + + Documentation/arch/riscv/index.rst | 2 + + Documentation/arch/riscv/zicfilp.rst | 122 +++++ + Documentation/arch/riscv/zicfiss.rst | 194 ++++++++ + .../devicetree/bindings/riscv/extensions.yaml | 50 ++ + arch/riscv/Kconfig | 22 + + arch/riscv/Makefile | 8 +- + arch/riscv/configs/hardening.config | 4 + + arch/riscv/include/asm/asm-prototypes.h | 1 + + arch/riscv/include/asm/assembler.h | 44 ++ + arch/riscv/include/asm/atomic.h | 8 +- + arch/riscv/include/asm/cpufeature.h | 12 + + arch/riscv/include/asm/csr.h | 14 + + arch/riscv/include/asm/entry-common.h | 2 + + arch/riscv/include/asm/hwcap.h | 4 + + arch/riscv/include/asm/hwprobe.h | 3 +- + arch/riscv/include/asm/mman.h | 26 + + arch/riscv/include/asm/mmu_context.h | 7 + + arch/riscv/include/asm/pgtable.h | 46 +- + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/sbi.h | 29 ++ + arch/riscv/include/asm/thread_info.h | 3 + + arch/riscv/include/asm/usercfi.h | 97 ++++ + arch/riscv/include/asm/vdso.h | 13 +- + arch/riscv/include/asm/vector.h | 3 + + arch/riscv/include/uapi/asm/hwprobe.h | 7 + + arch/riscv/include/uapi/asm/ptrace.h | 34 ++ + arch/riscv/include/uapi/asm/sigcontext.h | 1 + + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 10 + + arch/riscv/kernel/cpufeature.c | 49 ++ + arch/riscv/kernel/entry.S | 38 ++ + arch/riscv/kernel/head.S | 27 + + arch/riscv/kernel/process.c | 27 +- + arch/riscv/kernel/ptrace.c | 95 ++++ + arch/riscv/kernel/signal.c | 148 +++++- + arch/riscv/kernel/sys_hwprobe.c | 168 ++++--- + arch/riscv/kernel/sys_riscv.c | 10 + + arch/riscv/kernel/traps.c | 54 ++ + arch/riscv/kernel/usercfi.c | 544 +++++++++++++++++++++ + arch/riscv/kernel/vdso.c | 7 + + arch/riscv/kernel/vdso/Makefile | 40 +- + arch/riscv/kernel/vdso/flush_icache.S | 4 + + arch/riscv/kernel/vdso/gen_vdso_offsets.sh | 4 +- + arch/riscv/kernel/vdso/getcpu.S | 4 + + arch/riscv/kernel/vdso/note.S | 3 + + arch/riscv/kernel/vdso/rt_sigreturn.S | 4 + + arch/riscv/kernel/vdso/sys_hwprobe.S | 4 + + arch/riscv/kernel/vdso/vgetrandom-chacha.S | 5 +- + arch/riscv/kernel/vdso_cfi/Makefile | 25 + + arch/riscv/kernel/vdso_cfi/vdso-cfi.S | 11 + + arch/riscv/mm/init.c | 2 +- + arch/riscv/mm/pgtable.c | 16 + + include/linux/cpu.h | 4 + + include/linux/mm.h | 5 + + include/uapi/linux/elf.h | 2 + + include/uapi/linux/prctl.h | 27 + + kernel/sys.c | 30 ++ + tools/testing/selftests/riscv/Makefile | 2 +- + tools/testing/selftests/riscv/cfi/.gitignore | 2 + + tools/testing/selftests/riscv/cfi/Makefile | 23 + + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 82 ++++ + tools/testing/selftests/riscv/cfi/cfitests.c | 173 +++++++ + tools/testing/selftests/riscv/cfi/shadowstack.c | 385 +++++++++++++++ + tools/testing/selftests/riscv/cfi/shadowstack.h | 27 + + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 18 +- + 67 files changed, 2738 insertions(+), 120 deletions(-) + create mode 100644 Documentation/arch/riscv/zicfilp.rst + create mode 100644 Documentation/arch/riscv/zicfiss.rst + create mode 100644 arch/riscv/configs/hardening.config + create mode 100644 arch/riscv/include/asm/mman.h + create mode 100644 arch/riscv/include/asm/usercfi.h + create mode 100644 arch/riscv/kernel/usercfi.c + create mode 100644 arch/riscv/kernel/vdso_cfi/Makefile + create mode 100644 arch/riscv/kernel/vdso_cfi/vdso-cfi.S + create mode 100644 tools/testing/selftests/riscv/cfi/.gitignore + create mode 100644 tools/testing/selftests/riscv/cfi/Makefile + create mode 100644 tools/testing/selftests/riscv/cfi/cfi_rv_test.h + create mode 100644 tools/testing/selftests/riscv/cfi/cfitests.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.h +Merging riscv-dt/riscv-dt-for-next (a4aad736716d riscv: dts: microchip: convert clock and reset to use syscon) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 34 +++++++++++++++++++++++---------- + 1 file changed, 24 insertions(+), 10 deletions(-) +Merging riscv-soc/riscv-soc-for-next (719362b8a972 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging s390/for-next (70075e3d0ca0 s390/bug: Add missing alignment) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8f5ae30d69d7 Linux 6.17-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (fe0126702a40 sparc: Replace deprecated strcpy() with strscpy() in handle_nextprop_quirks()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (a3209bb94b36 um: Disable KASAN_INLINE when STATIC_LINK is selected) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (4c8bad3ed035 xtensa: use HZ_PER_MHZ in platform_calibrate_ccount) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (d411768e1372 Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Merge made by the 'ort' strategy. + drivers/block/Kconfig | 3 - + fs/ceph/Kconfig | 3 - + fs/ceph/caps.c | 4 + + fs/ceph/mds_client.c | 20 +- + fs/ceph/snap.c | 2 +- + fs/ceph/super.c | 3 + + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/exfat/namei.c | 4 +- + fs/ext4/extents.c | 137 +++-- + fs/ext4/extents_status.c | 124 +++-- + fs/ext4/inode.c | 18 +- + fs/gfs2/glock.h | 2 +- + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 +- + fs/nfs/callback.c | 4 +- + fs/nfs/callback.h | 3 +- + fs/nfs/client.c | 21 +- + fs/nfs/delegation.c | 8 + + fs/nfs/delegation.h | 13 + + fs/nfs/dir.c | 46 +- + fs/nfs/inode.c | 3 + + fs/nfs/internal.h | 3 +- + fs/nfs/localio.c | 4 +- + fs/nfs/namespace.c | 16 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4client.c | 27 +- + fs/nfs/nfs4proc.c | 111 +++- + fs/nfs/nfs4trace.h | 1 + + fs/nfs/nfs4xdr.c | 106 ++++ + fs/nfs/pnfs.c | 1 + + fs/nfs/proc.c | 3 +- + fs/nfs/super.c | 33 +- + fs/nfs/unlink.c | 3 +- + fs/smb/client/cifspdu.h | 65 --- + fs/smb/client/nterr.c | 5 + + fs/smb/client/nterr.h | 1014 +++++++++++++++++++------------------ + fs/smb/common/fscc.h | 56 ++ + fs/smb/common/smb2pdu.h | 48 +- + fs/smb/server/nterr.h | 543 -------------------- + fs/smb/server/smb2misc.c | 1 - + fs/smb/server/smb2pdu.c | 7 + + fs/smb/server/smb_common.h | 7 +- + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/xfs_attr_item.c | 27 +- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 19 +- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode_item.c | 49 +- + fs/xfs/xfs_log.c | 292 ++++------- + fs/xfs/xfs_log.h | 65 +-- + fs/xfs/xfs_log_cil.c | 111 +++- + fs/xfs/xfs_log_priv.h | 20 + + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trans.h | 4 +- + include/linux/nfs_fs.h | 1 + + include/linux/nfs_fs_sb.h | 6 + + include/linux/nfs_xdr.h | 10 +- + include/linux/sunrpc/bc_xprt.h | 7 + + include/trace/events/ceph.h | 234 +++++++++ + net/ceph/osd_client.c | 6 +- + net/ceph/osdmap.c | 120 ++--- + net/sunrpc/backchannel_rqst.c | 37 +- + net/sunrpc/xprtrdma/backchannel.c | 8 +- + 69 files changed, 1805 insertions(+), 1773 deletions(-) + delete mode 100644 fs/smb/server/nterr.h + create mode 100644 include/trace/events/ceph.h +Merging printk/for-next (322530a9c2ab Merge branch 'rework/nbcon-in-kdb' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (43dfc13ca972 Merge tag 'pci-v6.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (b69255357368 pstore/ram: Update module parameters from platform data) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (1c772200c9dc Merge branch 'for-6.18/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (d202341d9b0c i2c: qcom-cci: Add msm8953 compatible) +$ git merge -m Merge branch 'i2c/for-next' of https://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 (172368d01390 dt-bindings: i2c: qcom-cci: Document SM8750 compatible) +$ git merge -m Merge branch 'i2c/i2c-host' of https://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/qcom,i2c-cci.yaml | 2 ++ + .../bindings/i2c/snps,designware-i2c.yaml | 7 ++++++ + Documentation/i2c/busses/i2c-i801.rst | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-bcm-iproc.c | 3 +-- + drivers/i2c/busses/i2c-designware-master.c | 27 ++++++++++++---------- + drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++-- + drivers/i2c/busses/i2c-i801.c | 3 +++ + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + 10 files changed, 34 insertions(+), 18 deletions(-) +Merging i3c/i3c/next (6a6d77ee7d61 i3c: adi: Fix confusing cleanup.h syntax) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 17 +++-------------- + drivers/i3c/master/adi-i3c-master.c | 18 ++++++++---------- + drivers/i3c/master/dw-i3c-master.c | 8 ++++---- + drivers/i3c/master/i3c-master-cdns.c | 8 ++++---- + drivers/i3c/master/mipi-i3c-hci/core.c | 8 ++++---- + drivers/i3c/master/renesas-i3c.c | 6 +++--- + include/linux/i3c/master.h | 11 +---------- + 7 files changed, 27 insertions(+), 49 deletions(-) +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (30ca0e049f50 hwmon: (dell-smm) Add Dell G5 5505 to fan control whitelist) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (464257baf992 docs: makefile: move rustdoc check to the build wrapper) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/next (f7231cff1f3f media: uapi: c3-isp: Fix documentation warning) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +Merging v4l-dvb-next/master (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (d573d1f5141d Merge branch 'pm-runtime' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (49505d17fe59 rust: cpufreq: add __rust_helper to helpers) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging rust/kernel/cpufreq.rs +Merge made by the 'ort' strategy. + rust/helpers/cpufreq.c | 3 ++- + rust/kernel/cpufreq.rs | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging cpupower/cpupower (059835bbfa28 tools/power/cpupower: Support building libcpupower statically) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (d9600d57668c PM / devfreq: Fix typo in DFSO_DOWNDIFFERENTIAL macro name) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (1f67707fafa5 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (33ffb0aa8ce8 rust: opp: simplify callers of `to_c_str_array`) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (c411d8bf0699 thermal/drivers/imx91: Add support for i.MX91 thermal monitoring unit) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (80a85a771deb RDMA/rxe: reclassify sockets in order to avoid false positives from lockdep) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (835a50753579 selftests/bpf: Add -fms-extensions to bpf build flags) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (5422318e27d7 net/mlx5: Expose definition for 1600Gbps link mode) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (c9dfb92de073 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (305c1c5dd5f4 Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++ + include/net/bluetooth/hci_core.h | 2 ++ + net/bluetooth/hci_conn.c | 17 +++++++++++------ + net/bluetooth/hci_event.c | 26 +++++++++++++++++++++++--- + net/bluetooth/mgmt.c | 6 ++++++ + 5 files changed, 75 insertions(+), 9 deletions(-) +Merging wireless-next/for-next (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (c99ebb613259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (85d002b2ac56 wifi: iwlwifi: mld: remove unused variable in d3.c) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 12 - + drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c | 12 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 158 +++++++++++- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 41 ++- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 95 ++++++- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mld/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 2 - + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 88 ++++++- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 + + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 3 + + drivers/net/wireless/intel/iwlwifi/mld/nan.c | 287 +++++++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/mld/nan.h | 28 ++ + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 13 + + drivers/net/wireless/intel/iwlwifi/mld/notif.h | 1 + + drivers/net/wireless/intel/iwlwifi/mld/power.c | 39 ++- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 142 +++++++++- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 85 +++++- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 11 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 14 + + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 10 +- + 26 files changed, 1009 insertions(+), 85 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.h +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (801b0840b09d Merge tag 'nand/for-6.19' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (f6dffe2a9ed1 mtd: spinand: add support for FudanMicro FM25S01BI3) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (ed26bd40df11 mailmap: update Pratyush Yadav's email address) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (48bc9da3c97c crypto: zstd - fix double-free in per-CPU stream cleanup) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (3f9f0252130e Merge tag 'random-6.19-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (c7685d11108a Merge tag 'topic/drm-intel-plane-color-pipeline-2025-12-04' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://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 (308eeb8ca3fd drm/rcar-du: dsi: Handle both DRM_MODE_FLAG_N.SYNC and !DRM_MODE_FLAG_P.SYNC) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panthor/panthor_sched.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/panthor/panthor_sched.c | 19 +++++++++++++++---- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 4 ++-- + 4 files changed, 19 insertions(+), 8 deletions(-) +Merging amdgpu/drm-next (f24e96d69f5b drm/amdgpu: Set xcp id for mes ring) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/amd_overview_block.svg | 687 + + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 48 + + Documentation/gpu/amdgpu/display/dc-glossary.rst | 3 - + Documentation/gpu/amdgpu/driver-core.rst | 31 + + Documentation/gpu/amdgpu/enforce_isolation.svg | 654 + + Documentation/gpu/amdgpu/gc/index.rst | 24 +- + Documentation/gpu/amdgpu/gfx_pipeline_seq.svg | 413 + + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/amdgpu/no_enforce_isolation.svg | 707 + + Documentation/gpu/amdgpu/process-isolation.rst | 1 + + Documentation/gpu/amdgpu/ring-buffer.rst | 95 + + Documentation/gpu/amdgpu/ring_buffers.svg | 1633 + + Documentation/gpu/amdgpu/userq.rst | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 281 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 3 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 3 - + drivers/gpu/drm/amd/amdgpu/cik.c | 5 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 3969 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 475 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c | 890 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 606 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 160 + + drivers/gpu/drm/amd/amdgpu/imu_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 43 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 1864 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 915 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 13 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 4 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 5 - + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 342 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 1813 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h | 5673 +++ + drivers/gpu/drm/amd/amdgpu/si.c | 5 - + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c | 213 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 1 - + drivers/gpu/drm/amd/amdgpu/soc21.c | 5 - + drivers/gpu/drm/amd/amdgpu/soc24.c | 5 - + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 786 + + drivers/gpu/drm/amd/amdgpu/soc_v1_0.h | 34 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 2 + + drivers/gpu/drm/amd/amdgpu/vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/Makefile | 3 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 62 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 37 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 89 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 75 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 34 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + .../amd/amdkfd/kfd_device_queue_manager_v12_1.c | 98 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c | 391 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 61 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 657 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 245 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 77 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 27 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 51 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 59 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 8 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 224 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 22 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 89 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 18 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 47 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 8 +- + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 3 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 3 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 43 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.h | 11 +- + .../amd/display/dc/dio/dcn20/dcn20_link_encoder.c | 3 + + .../display/dc/dio/dcn30/dcn30_dio_link_encoder.c | 3 + + .../dc/dio/dcn301/dcn301_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn32/dcn32_dio_link_encoder.c | 3 + + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 4 +- + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 8 +- + .../drm/amd/display/dc/dml2_0/display_mode_core.c | 134 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 3 +- + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h | 7 +- + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c | 599 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 9 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 604 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h | 25 + + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 6 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 14 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 25 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 17 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 7 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 55 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 7 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 290 +- + .../display/dc/link/protocols/link_dp_capability.c | 2 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 177 +- + .../dc/link/protocols/link_edp_panel_control.h | 7 +- + .../drm/amd/display/dc/link/protocols/link_hpd.c | 171 +- + .../drm/amd/display/dc/link/protocols/link_hpd.h | 1 - + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 6 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 5 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 186 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h | 8 - + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.c | 4 +- + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.h | 4 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.c | 31 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.h | 16 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.c | 155 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.h | 35 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.c | 27 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.h | 3 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.c | 11 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.h | 4 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c | 78 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h | 56 +- + drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h | 9 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 33 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- + drivers/gpu/drm/amd/display/include/audio_types.h | 14 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 6 + + .../amd/display/modules/info_packet/info_packet.c | 369 +- + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 12407 ++++++ + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 44620 +++++++++++++++++++ + .../include/asic_reg/mmhub/mmhub_4_2_0_offset.h | 802 + + .../include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h | 3013 ++ + .../drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h | 868 + + .../amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h | 616 + + .../amd/include/asic_reg/oss/osssys_7_1_0_offset.h | 280 + + .../include/asic_reg/oss/osssys_7_1_0_sh_mask.h | 1024 + + .../include/asic_reg/smuio/smuio_15_0_8_offset.h | 512 + + .../include/asic_reg/smuio/smuio_15_0_8_sh_mask.h | 1113 + + .../drm/amd/include/ivsrcid/vmc/irqsrcs_vmc_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 39 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/include/soc_v1_0_enum.h | 38 + + drivers/gpu/drm/amd/include/v12_structs.h | 2054 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 19 - + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 81 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 16 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 65 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 87 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 141 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 52 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 211 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 28 - + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 31 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 8 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 49 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 47 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 47 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 188 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 17 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 387 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 212 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 40 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 39 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 52 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 249 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 86 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 226 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 34 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 24 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 25 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 385 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 4 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 226 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 81 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 24 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 236 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 118 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 10 + + drivers/gpu/drm/amd/ras/ras_mgr/Makefile | 1 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 5 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 45 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 1 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 469 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h | 57 + + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 33 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.c | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 29 +- + include/uapi/drm/amdgpu_drm.h | 3 +- + include/uapi/linux/kfd_ioctl.h | 9 +- + 282 files changed, 97104 insertions(+), 4823 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/amd_overview_block.svg + create mode 100644 Documentation/gpu/amdgpu/enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/gfx_pipeline_seq.svg + create mode 100644 Documentation/gpu/amdgpu/no_enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/ring-buffer.rst + create mode 100644 Documentation/gpu/amdgpu/ring_buffers.svg + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_enum.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h +Merging drm-intel/for-linux-next (1c7f9e528f8f drm/i915: Fix format string truncation warning) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_fbdev.c | 11 +++++++---- + drivers/gpu/drm/i915/intel_memory_region.h | 2 +- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging drm-msm/msm-next (7bc29d5fb6fa dt-bindings: display/msm/gmu: Add Adreno X2-85 GMU) +$ 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 (e2f085ab8636 dt-bindings: display: msm: sm6150-mdss: Fix example indentation and OPP values) +$ 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 drm-rust/drm-rust-next (57dc2ea0b7bd rust: slice: fix broken intra-doc links) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Already up to date. +Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging drm-xe/drm-xe-next (7319c2ceb2d7 drm/xe/vf: Reset recovery_queued after issuing RESFIX_START) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/tests/xe_mocs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/tests/xe_mocs.c +Auto-merging drivers/gpu/drm/xe/xe_devcoredump.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_irq.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vram.c +Auto-merging drivers/vfio/pci/Kconfig +Auto-merging drivers/vfio/pci/Makefile +Resolved 'drivers/gpu/drm/xe/tests/xe_mocs.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_ct.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 937c07f9492c] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + .../ABI/testing/sysfs-driver-intel-xe-sriov | 2 +- + MAINTAINERS | 1 - + drivers/gpu/drm/drm_gpusvm.c | 3 + + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 67 ++- + drivers/gpu/drm/xe/abi/guc_lfd_abi.h | 171 +++++++ + drivers/gpu/drm/xe/abi/guc_lic_abi.h | 77 ++++ + drivers/gpu/drm/xe/abi/guc_log_abi.h | 42 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 23 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 31 +- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_mert_regs.h | 21 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 8 + + drivers/gpu/drm/xe/tests/xe_bo.c | 10 +- + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 3 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 10 +- + drivers/gpu/drm/xe/tests/xe_mocs.c | 27 +- + drivers/gpu/drm/xe/xe_bo.c | 26 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 28 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 30 +- + drivers/gpu/drm/xe/xe_device.c | 33 +- + drivers/gpu/drm/xe/xe_device.h | 5 + + drivers/gpu/drm/xe/xe_device_sysfs.c | 33 +- + drivers/gpu/drm/xe/xe_device_types.h | 8 + + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- + drivers/gpu/drm/xe/xe_drm_client.c | 67 ++- + drivers/gpu/drm/xe/xe_exec_queue.c | 26 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 3 + + drivers/gpu/drm/xe/xe_execlist.c | 2 +- + drivers/gpu/drm/xe/xe_force_wake.c | 7 + + drivers/gpu/drm/xe/xe_force_wake.h | 40 ++ + drivers/gpu/drm/xe/xe_ggtt.c | 3 +- + drivers/gpu/drm/xe/xe_gsc.c | 21 +- + drivers/gpu/drm/xe/xe_gsc_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 17 +- + drivers/gpu/drm/xe/xe_gt.c | 174 +++---- + drivers/gpu/drm/xe/xe_gt.h | 2 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 30 +- + drivers/gpu/drm/xe/xe_gt_freq.c | 31 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 49 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 12 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 172 +++++-- + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 12 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 13 + + drivers/gpu/drm/xe/xe_gt_stats.c | 4 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_throttle.c | 11 +- + drivers/gpu/drm/xe/xe_guc.c | 76 ++- + drivers/gpu/drm/xe/xe_guc.h | 2 + + drivers/gpu/drm/xe/xe_guc_buf.c | 2 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 16 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 248 +++++----- + drivers/gpu/drm/xe/xe_guc_ct.h | 2 + + drivers/gpu/drm/xe/xe_guc_debugfs.c | 15 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 6 +- + drivers/gpu/drm/xe/xe_guc_log.c | 507 +++++++++++++++++---- + drivers/gpu/drm/xe/xe_guc_log.h | 30 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 62 +-- + drivers/gpu/drm/xe/xe_guc_submit.c | 64 ++- + drivers/gpu/drm/xe/xe_guc_submit.h | 6 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 4 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 4 +- + drivers/gpu/drm/xe/xe_huc.c | 7 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 3 + + drivers/gpu/drm/xe/xe_hwmon.c | 52 +-- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 25 +- + drivers/gpu/drm/xe/xe_lrc.c | 44 +- + drivers/gpu/drm/xe/xe_lrc.h | 4 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 3 + + drivers/gpu/drm/xe/xe_mert.c | 82 ++++ + drivers/gpu/drm/xe/xe_mert.h | 32 ++ + drivers/gpu/drm/xe/xe_migrate.c | 57 ++- + drivers/gpu/drm/xe/xe_migrate.h | 3 + + drivers/gpu/drm/xe/xe_mocs.c | 18 +- + drivers/gpu/drm/xe/xe_oa.c | 49 +- + drivers/gpu/drm/xe/xe_oa_types.h | 1 + + drivers/gpu/drm/xe/xe_pat.c | 212 ++++++--- + drivers/gpu/drm/xe/xe_pat.h | 11 + + drivers/gpu/drm/xe/xe_pci.c | 18 + + drivers/gpu/drm/xe/xe_pci_sriov.c | 10 +- + drivers/gpu/drm/xe/xe_pci_types.h | 2 + + drivers/gpu/drm/xe/xe_pcode_api.h | 2 + + drivers/gpu/drm/xe/xe_pm.c | 10 +- + drivers/gpu/drm/xe/xe_pxp.c | 55 +-- + drivers/gpu/drm/xe/xe_query.c | 23 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 17 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 62 ++- + drivers/gpu/drm/xe/xe_sa.c | 67 ++- + drivers/gpu/drm/xe/xe_sa.h | 20 +- + drivers/gpu/drm/xe/xe_sa_types.h | 3 + + drivers/gpu/drm/xe/xe_sriov_packet.c | 2 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c | 6 +- + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_sriov_vf.c | 84 +++- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 27 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 + + drivers/gpu/drm/xe/xe_survivability_mode.c | 270 +++++++---- + drivers/gpu/drm/xe/xe_survivability_mode_types.h | 28 +- + drivers/gpu/drm/xe/xe_svm.c | 59 +-- + drivers/gpu/drm/xe/xe_svm.h | 2 +- + drivers/gpu/drm/xe/xe_sync.c | 7 +- + drivers/gpu/drm/xe/xe_tile_debugfs.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_uc.c | 35 +- + drivers/gpu/drm/xe/xe_uc.h | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 10 +- + drivers/gpu/drm/xe/xe_vm.c | 146 +++++- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 1 + + drivers/gpu/drm/xe/xe_vram.c | 6 +- + drivers/gpu/drm/xe/xe_wa.c | 15 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + + include/uapi/drm/xe_drm.h | 34 +- + 120 files changed, 2845 insertions(+), 1260 deletions(-) + create mode 100644 drivers/gpu/drm/xe/abi/guc_lfd_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/guc_lic_abi.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_mert_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_mert.c + create mode 100644 drivers/gpu/drm/xe/xe_mert.h +Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (d40e1d95246b Merge remote-tracking branch 'regmap/for-6.19' into regmap-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (fd324768eb2c ALSA: hda/tas2781: Add new quirk for HP new project) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (036176d9dba7 firewire: core: abort pending transactions at card removal) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (c8d8605fc53e Merge remote-tracking branch 'asoc/for-6.18' into asoc-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (1ddac5cd7f27 MAINTAINERS: Add myself as reviewer for module support) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (70f62e52176d Input: ti_am335x_tsc - clamp coordinate_readouts to DT maximum (6)) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (d678712ead73 Merge branch 'block-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Merge made by the 'ort' strategy. + block/bio.c | 6 +++++- + block/blk-mq-dma.c | 1 + + block/blk-mq.c | 29 ++++++++++------------------- + block/blk-zoned.c | 2 +- + drivers/block/ublk_drv.c | 28 +++++++++++++++++++++------- + drivers/md/bcache/request.c | 6 +++--- + io_uring/io_uring.c | 3 +++ + 7 files changed, 44 insertions(+), 31 deletions(-) +Merging device-mapper/for-next (13ea55ea2017 dm pcache: fix segment info indexing) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (a26a0b4b48e1 ata: libata: Allow more quirks) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + drivers/ata/libata-core.c | 233 ++++++++++++++++++------ + drivers/ata/libata-eh.c | 3 +- + drivers/ata/libata-scsi.c | 8 +- + drivers/ata/libata.h | 1 + + include/linux/ata.h | 3 - + include/linux/libata.h | 70 ++++--- + 7 files changed, 225 insertions(+), 98 deletions(-) +Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem()) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (79cf71c0b177 mmc: sdhci-of-dwcmshc: reduce CIT for better performance) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (44c603f35cad mfd: sec: Drop a stray semicolon) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (d3cc7cd7bc46 backlight: aw99706: Fix unused function warnings from suspend/resume ops) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (8e8856396b54 Revert "power: supply: qcom_battmgr: support disabling charge control") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (56edaa508ed2 Merge remote-tracking branch 'regulator/for-6.18' into regulator-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (9a948eefad59 lsm: use unrcu_pointer() for current->cred in security_init()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (738c9738e690 ima: Handle error code returned by ima_filter_rule_match()) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (cdcf0b369d40 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://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. +Merging smack/next (29c701f90b93 Smack: function parameter 'gfp' not described) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (834a7ef0b9df RDMA/core: add device registration debugging) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging drivers/infiniband/core/device.c +Auto-merging include/linux/netdevice.h +Auto-merging kernel/workqueue.c +Auto-merging net/core/dev.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 105 +++++++++++++++++- + drivers/infiniband/core/core_priv.h | 6 ++ + drivers/infiniband/core/device.c | 32 ++++++ + drivers/infiniband/core/roce_gid_mgmt.c | 17 ++- + include/linux/netdevice.h | 15 +++ + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + net/can/j1939/j1939-priv.h | 6 ++ + net/can/j1939/main.c | 93 ++++++++++++++++ + net/can/j1939/transport.c | 3 + + net/core/dev.c | 184 ++++++++++++++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++-- + security/tomoyo/domain.c | 9 +- + 14 files changed, 495 insertions(+), 16 deletions(-) +Merging tpmdd/next (416f99c3b16f Merge tag 'driver-core-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (5bcc5786a0cf watchdog: starfive: Fix resource leak in probe error path) +$ 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 (0d081b16946e Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'nvidia/tegra', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (c8a3dfe73159 audit: merge loops in __audit_inode_child()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (954c55c658e1 dt-bindings: kbuild: Skip validating empty examples) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (1ec6e0e8c0dd mailbox: mtk-cmdq: Add driver data to support for MT8196) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Merge made by the 'ort' strategy. + .../bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml | 49 ++++++ + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 6 +- + .../bindings/mailbox/qcom,cpucp-mbox.yaml | 1 + + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + drivers/mailbox/Kconfig | 22 ++- + drivers/mailbox/Makefile | 4 + + drivers/mailbox/mailbox-mchp-ipc-sbi.c | 22 +-- + drivers/mailbox/mailbox.c | 6 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 74 ++++++++- + drivers/mailbox/mtk-vcp-mailbox.c | 170 +++++++++++++++++++++ + drivers/mailbox/pcc.c | 118 +++----------- + drivers/mailbox/rcar-mfis-mailbox.c | 168 ++++++++++++++++++++ + include/acpi/pcc.h | 29 ---- + include/linux/mailbox/mtk-cmdq-mailbox.h | 19 +++ + include/linux/mailbox/mtk-vcp-mailbox.h | 32 ++++ + 15 files changed, 578 insertions(+), 144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml + create mode 100644 drivers/mailbox/mtk-vcp-mailbox.c + create mode 100644 drivers/mailbox/rcar-mfis-mailbox.c + create mode 100644 include/linux/mailbox/mtk-vcp-mailbox.h +Merging spi/for-next (865a1f17d5e4 Merge remote-tracking branch 'spi/for-6.18' into spi-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (528296f905ad Merge branch into tip/master: 'x86/boot') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + Documentation/arch/x86/boot.rst | 188 ++++++++++++++++++++-------------------- + arch/x86/kernel/acpi/boot.c | 12 ++- + arch/x86/kernel/cpu/topology.c | 15 ---- + 3 files changed, 102 insertions(+), 113 deletions(-) +Merging clockevents/timers/drivers/next (d1780dce9575 clocksource/drivers: Add Realtek system timer driver) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (814b332921b6 Merge ras/edac-amd-atl into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (5a63f3faf656 Merge unused-tracepoints/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/next (9a08942f1701 Merge branch 'rcu/misc' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (7f8fcc6f09fb memory-barriers.txt: Sort wait_event* and wait_on_bit* list alphabetically) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (e0c26d47def7 Merge tag 'kvm-s390-next-6.19-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (3eef0c83c3f3 Merge branch 'kvm-arm64/nv-xnx-haf' into kvmarm/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (2bd1337a1295 KVM: s390: Use generic VIRT_XFER_TO_GUEST_WORK functions) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (c17b750b3ad9 Linux 6.17-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://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 (3239c52fd212 RISC-V: KVM: Flush VS-stage TLB after VCPU migration for Andes cores) +$ 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 (58e10b63777d Merge branch 'fixes') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/cpuid.c | 11 +++++++++-- + arch/x86/kvm/svm/nested.c | 4 ++-- + arch/x86/kvm/svm/svm.c | 2 ++ + arch/x86/kvm/svm/svm.h | 7 ++++--- + arch/x86/kvm/vmx/nested.c | 3 ++- + arch/x86/kvm/vmx/vmx.c | 9 --------- + arch/x86/kvm/x86.c | 7 +++++++ + tools/testing/selftests/kvm/rseq_test.c | 1 + + tools/testing/selftests/kvm/x86/cpuid_test.c | 15 +++++++++++++++ + virt/kvm/kvm_main.c | 17 ++++++++++++++++- + 10 files changed, 58 insertions(+), 18 deletions(-) +Merging xen-tip/linux-next (150215b89bcf drivers/xen: use min() instead of min_t()) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (51cd2d2decf3 workqueue: Process extra works in rescuer on memory pressure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 121 ++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 92 insertions(+), 29 deletions(-) +Merging sched-ext/for-next (9f769637a93f sched_ext: Fix bypass depth leak on scx_enable() failure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Merge made by the 'ort' strategy. + kernel/sched/ext.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (9d588a1140b9 Merge tag 'platform-drivers-x86-v6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (52075d2c7595 platform/chrome: sensorhub: Support devices without FIFO_INT_ENABLE) +$ git merge -m Merge branch 'for-next' of https://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 (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (072cd5f458d7 leds: rgb: leds-qcom-lpg: Don't enable TRILED when configuring PWM) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (35bcedc1a793 MAINTAINERS: Add entry on Loongson-2K IPMI driver) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (479d186fc946 thunderbolt: Fix typos in xdomain.c) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (072f2c495725 USB: serial: option: move Telit 0x10c7 composition in the right place) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (9e9182cab5eb coresight: etm4x: Remove the state_needs_restore flag) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (c9243d6df0d6 fpga: altera-cvp: Use pci_find_vsec_capability() when probing FPGA device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (60b52af082b1 Merge branch 'icc-sm6350' into icc-next) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (f9e057916428 staging: iio: adt7316: replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (716311dad200 MAINTAINERS: phy: Add Neil Armstrong as reviewers for phy subsystem) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (188d194be2bf soundwire: intel_ace2x: handle multi BPT sections) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging include/linux/of.h +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 8 +- + drivers/of/property.c | 33 +++ + drivers/soundwire/bus.c | 10 +- + drivers/soundwire/bus.h | 22 +- + drivers/soundwire/cadence_master.c | 237 +++++++++++++------ + drivers/soundwire/cadence_master.h | 19 +- + drivers/soundwire/debugfs.c | 14 +- + drivers/soundwire/generic_bandwidth_allocation.c | 3 + + drivers/soundwire/intel_ace2x.c | 104 +++++++-- + drivers/soundwire/qcom.c | 257 ++++++++++++--------- + include/linux/of.h | 9 + + include/sound/hda-sdw-bpt.h | 7 + + sound/soc/sof/intel/hda-sdw-bpt.c | 13 ++ + 13 files changed, 530 insertions(+), 206 deletions(-) +Merging extcon/extcon-next (b4338338aa3d extcon: usbc-tusb320: Make typec-power-opmode optional) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 3 ++ + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-intel-int3496.c | 4 +- + drivers/extcon/extcon-ptn5150.c | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-usbc-tusb320.c | 24 +++++----- + drivers/extcon/extcon.c | 4 +- + 6 files changed, 75 insertions(+), 17 deletions(-) +Merging gnss/gnss-next (f5ef3f722d76 dt-bindings: gnss: fix timepulse description) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (d721f52e3155 vfio: selftests: Add vfio_pci_device_init_perf_test) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (a5d908e0ec05 w1: omap-hdq: Remove redundant pm_runtime_mark_last_busy() calls) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (b462fcd08dd5 MAINTAINERS: Update Intel Quadrature Encoder Peripheral maintainer) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) +$ 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 (2b11e7403a8e dt-bindings: dma: xilinx: Simplify dma-coherent property) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (6ee43047e8ad cpuset: Remove unnecessary checks in rebuild_sched_domains_locked) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + fs/fs-writeback.c | 2 +- + include/linux/memcontrol.h | 2 +- + kernel/cgroup/cgroup.c | 4 +- + kernel/cgroup/cpuset.c | 52 +++++++--------------- + kernel/cgroup/rstat.c | 13 +++--- + mm/memcontrol.c | 2 +- + mm/page_owner.c | 2 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 21 +++++++++ + .../selftests/cgroup/lib/include/cgroup_util.h | 5 +++ + tools/testing/selftests/cgroup/test_kmem.c | 33 +++++++------- + tools/testing/selftests/cgroup/test_memcontrol.c | 20 ++++++++- + 11 files changed, 90 insertions(+), 66 deletions(-) +Merging scsi/for-next (47ea32406252 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Merge made by the 'ort' strategy. + drivers/misc/Kconfig | 1 - + drivers/scsi/imm.c | 1 + + drivers/scsi/ipr.c | 28 +++++++++++++++++++++++- + drivers/scsi/libsas/sas_internal.h | 14 ------------ + drivers/scsi/mpi3mr/mpi3mr.h | 4 ++-- + drivers/scsi/mpi3mr/mpi3mr_os.c | 4 +++- + drivers/scsi/qla2xxx/qla_os.c | 30 +++++++++++++++++++++++++ + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/target/sbp/sbp_target.c | 3 +-- + drivers/target/target_core_transport.c | 1 + + drivers/ufs/Kconfig | 1 + + drivers/ufs/core/ufshcd.c | 40 +++++++++++++++++++++++++--------- + 13 files changed, 98 insertions(+), 33 deletions(-) +Merging scsi-mkp/for-next (946574434aa9 scsi: ufs: qcom: Fix confusing cleanup.h syntax) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/md/dm-mpath.c +Merge made by the 'ort' strategy. + drivers/md/dm-mpath.c | 13 +++++++++++++ + drivers/scsi/libsas/sas_init.c | 1 + + drivers/scsi/libsas/sas_internal.h | 1 + + drivers/scsi/libsas/sas_phy.c | 33 ++++++++++++++++++++++++++++++--- + drivers/scsi/scsi_dh.c | 8 +++++--- + drivers/ufs/core/ufshcd.c | 32 +++++++++++++++++--------------- + drivers/ufs/host/ufs-qcom.c | 6 ++---- + 7 files changed, 69 insertions(+), 25 deletions(-) +Merging vhost/linux-next (1bac705c2ce7 vhost/vsock: improve RCU read sections around vhost_vsock_get()) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Auto-merging tools/virtio/linux/compiler.h +Merge made by the 'ort' strategy. + drivers/vhost/vhost.c | 8 +-- + drivers/vhost/vsock.c | 15 ++++-- + include/linux/virtio.h | 2 + + include/linux/virtio_features.h | 2 + + tools/virtio/Makefile | 8 +-- + tools/virtio/linux/compiler.h | 6 +++ + tools/virtio/linux/cpumask.h | 4 ++ + tools/virtio/linux/device.h | 8 +++ + tools/virtio/linux/dma-mapping.h | 4 ++ + tools/virtio/linux/kernel.h | 16 ++++++ + tools/virtio/linux/module.h | 2 + + tools/virtio/linux/ucopysize.h | 21 ++++++++ + tools/virtio/linux/virtio.h | 73 +------------------------- + tools/virtio/linux/virtio_config.h | 102 +------------------------------------ + tools/virtio/oot-stubs.h | 10 ++++ + 15 files changed, 97 insertions(+), 184 deletions(-) + create mode 100644 tools/virtio/linux/ucopysize.h + create mode 100644 tools/virtio/oot-stubs.h +Merging rpmsg/for-next (f1f6eaa1e545 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +Merging gpio-brgl/gpio/for-next (dae9750105cf gpio: loongson: Switch 2K2000/3000 GPIO to BYTE_CTRL_MODE) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (b2a186cced11 gpiolib: acpi: use min() instead of min_t()) +$ git merge -m Merge branch 'for-next' of https://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 (666065caa31a pinctrl: add CONFIG_OF dependencies for microchip drivers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (8daf70e6aa41 Merge patch series "pinctrl: intel: Export intel_gpio_add_pin_ranges() and use it") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (3b0cf6ab3590 pinctrl: renesas: rzg2l: Refactor OEN register PWPR handling) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (3cfc60e09bdc pinctrl: samsung: Add ARTPEC-9 SoC specific configuration) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (3c180003dffb pwm: th1520: Fix missing Kconfig dependencies) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + drivers/pwm/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) +Merging ktest/for-next (d3042cbe84a0 ktest.pl: Fix uninitialized var in config-bisect.pl) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (a2f7990d3309 selftests: tracing: Update fprobe selftest for ftrace based fprobe) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (7bc16e72ddb9 kunit: Make filter parameters configurable via Kconfig) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (5cb5575308bc selftests: livepatch: use canonical ftrace path) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Already up to date. +Merging rtc/rtc-next (16bd954c9336 rtc: spacemit: MFD_SPACEMIT_P1 as dependencies) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging drivers/rtc/rtc-rx8025.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/rtc-cdev | 2 +- + .../devicetree/bindings/mfd/apple,smc.yaml | 9 + + .../bindings/rtc/andestech,atcrtc100.yaml | 43 ++ + .../devicetree/bindings/rtc/apple,smc-rtc.yaml | 35 ++ + .../devicetree/bindings/rtc/nvidia,vrs-10.yaml | 59 +++ + .../devicetree/bindings/rtc/renesas,rz-rtca3.yaml | 46 +- + MAINTAINERS | 15 + + drivers/rtc/Kconfig | 41 +- + drivers/rtc/Makefile | 3 + + drivers/rtc/rtc-amlogic-a4.c | 32 +- + drivers/rtc/rtc-atcrtc100.c | 381 +++++++++++++++ + drivers/rtc/rtc-ds1685.c | 3 - + drivers/rtc/rtc-gamecube.c | 4 + + drivers/rtc/rtc-isl12026.c | 7 + + drivers/rtc/rtc-macsmc.c | 140 ++++++ + drivers/rtc/rtc-max31335.c | 6 +- + drivers/rtc/rtc-nvidia-vrs10.c | 542 +++++++++++++++++++++ + drivers/rtc/rtc-pic32.c | 2 - + drivers/rtc/rtc-renesas-rtca3.c | 3 +- + drivers/rtc/rtc-rv3028.c | 2 - + drivers/rtc/rtc-rv3032.c | 2 - + drivers/rtc/rtc-rv8803.c | 2 - + drivers/rtc/rtc-rx6110.c | 2 - + drivers/rtc/rtc-rx8010.c | 1 - + drivers/rtc/rtc-rx8025.c | 2 - + drivers/rtc/rtc-s35390a.c | 18 +- + drivers/rtc/rtc-sa1100.c | 3 - + drivers/rtc/rtc-sh.c | 1 - + drivers/rtc/rtc-tegra.c | 45 +- + include/linux/rtc/ds1685.h | 1 - + 30 files changed, 1352 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/andestech,atcrtc100.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/apple,smc-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,vrs-10.yaml + create mode 100644 drivers/rtc/rtc-atcrtc100.c + create mode 100644 drivers/rtc/rtc-macsmc.c + create mode 100644 drivers/rtc/rtc-nvidia-vrs10.c +Merging nvdimm/libnvdimm-for-next (30065e73d7c0 nvdimm: Prevent integer overflow in ramdax_get_config_data()) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (aef72ebe9c86 dt-bindings: eeprom: at24: Add compatible for Belling BL24S64) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (68113d260674 NTB/msi: Remove unused functions) +$ 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/mscc/ntb_hw_switchtec.c | 14 ++++++-- + drivers/ntb/msi.c | 64 ---------------------------------- + include/linux/ntb.h | 14 -------- + 3 files changed, 11 insertions(+), 81 deletions(-) +Merging seccomp/for-next/seccomp (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 60 +++++++++++++++++++++++++++----------------------- + lib/xarray.c | 3 +-- + 2 files changed, 34 insertions(+), 29 deletions(-) +Merging hyperv/hyperv-next (01e70c839863 mshv: Move function prototypes to the generic header) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Merge made by the 'ort' strategy. + arch/x86/include/asm/mshyperv.h | 2 -- + drivers/hv/mshv_regions.c | 16 ++++++++-------- + include/asm-generic/mshyperv.h | 2 ++ + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging auxdisplay/for-next (00de283c53c9 Merge patch series "auxdisplay: linedisp: support attribute attachment to auxdisplay devices") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30a kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (ac35e04f8000 bus: mhi: host: pci_generic: Add Foxconn T99W760 modem) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (83c8f7b5e194 mm/mm_init: Introduce a boot parameter for check_pages) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (ea5514e30056 Merge branch 'for-6.19/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (7a2ff00c3b5e docs: efi: add CPER functions to driver-api) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (a8ec08bf3259 Merge branch 'slab/for-6.19/mempool_alloc_bulk' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Already up to date. +Merging random/master (3f9f0252130e Merge tag 'random-6.19-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (eee654ca9a55 Merge tag 'landlock-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (559e608c4655 Merge tag 'ntfs3_for_6.19' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-alloc/alloc-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (42415d163e5d rust: pin-init: add references to previously initialized fields) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (4521438fb076 rust: time: Implement basic arithmetic operations for Delta) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging sysctl/sysctl-next (564195c1a33c sysctl: Wrap do_proc_douintvec with the public function proc_douintvec_conv) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (5ba71195a9cb rust_binder: use bitmap for allocation of handles) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (7454048db27d kbuild: Enable GCC diagnostic context for value-tracking warnings) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging nolibc/for-next (1d573464749c selftests/nolibc: error out on linker warnings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Already up to date. +Merging iommufd/for-next (c8ed57e24380 iommufd/selftest: Do not leak the hwpt if IOMMU_TEST_OP_MD_CHECK_MAP fails) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/io_pagetable.c | 6 +++++- + drivers/iommu/iommufd/selftest.c | 6 ++++-- + tools/testing/selftests/iommu/iommufd.c | 8 +++----- + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging turbostat/next (0aff79a1ff35 tools/power turbostat.8: Document the "--force" option) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 4 + + tools/power/x86/turbostat/turbostat.c | 143 +++++++++++++++++++++------------- + 2 files changed, 94 insertions(+), 53 deletions(-) +Merging pwrseq/pwrseq/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (9891d2f79a9f Clarify the rootid_owns_currentns) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging fwctl/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (7dfbe9a67519 crypto/ccp: Fix CONFIG_PCI=n build) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (6c177775dcc5 Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 00000000000000..12aef958098328 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20251212 |
