diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-19 14:12:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-19 14:12:19 +1100 |
| commit | cc3aa43b44bdb43dfbac0fcb51c56594a11338a8 (patch) | |
| tree | 3fe6fda59635d07449ffedb69ab7a8085805e8b4 | |
| parent | 729e9293725fab4e5ec90cefe4f5687f841fe75f (diff) | |
Add linux-next specific files for 20251219next/masternext/HEAD
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 407 | ||||
| -rw-r--r-- | Next/Trees | 407 | ||||
| -rw-r--r-- | Next/merge.log | 4648 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5463 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..58deee2d08e3 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,407 @@ +Name SHA1 +---- ---- +origin dd9b004b7ff3289fb7bae35130c0a5c0537266af +ext4-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +vfs-brauner-fixes 24835a96f21ebb295d24e265b5466d9e40f12cbd +fscrypt-current 1e39da974ce621ed874c6d3aaf65ad14848c9f0d +fsverity-current 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs-fixes 5c94889f8419a8141ea048e11c79986178606810 +vfs-fixes e1b4c6a58304fd490124cc2b454d80edc786665c +erofs-fixes f2a12cc3b97f062186568a7b94ddb7aa2ef68140 +nfsd-fixes 913f7cf77bf14c13cfea70e89bcb6d0b22239562 +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +overlayfs-fixes e8bd877fb76bb9f35253e8f41ce0c772269934dd +fscrypt 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs 58d1993910c4912d9c9198e76b3904a2b5304195 +ceph 375068b6c206cfb592208c00abfab228f0ea9372 +cifs d8a4af8f3d9d3367b2c49b0d9dee529556bdd2f4 +configfs f7f78098690d60a03b47942ac7d73ea17b42239e +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 8e40210788636619404871df07445fa4590138b4 +erofs e68e6eb58221ce30497c238d37704d230321869d +exfat f5a5c9b4049047cdf4b5fff5e487974826116c57 +ext3 6f7c877cc397ba3c6d8ba44d4a604df3d4182eec +ext4 6fb67ac896900e60f46ee4efba97b372a80370e0 +f2fs 4a210a5be279bfd5514dac3f5ef2c737cd984e84 +fsverity 211ddde0823f1442e4ad052a2f30f050145ccada +fuse 8da059f2a497a2427150faae5adc3bb78e73b3e2 +gfs2 02e96fafcb3696e66694e64abd16f38f31ea00f5 +jfs eb0cfcf265714b419cc3549895a00632e76732ae +ksmbd 53ec4a79ff4b36d9711cfe030eeebc36afbc51dd +nfs bd3b04b46c7a9940989ff4b29376e899e93d3a4a +nfs-anna b623390045a81fc559decb9bfeb79319721d3dfb +nfsd 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +ntfs3 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +orangefs 11f6bce77e27e82015a0d044e6c1eec8b139831a +overlayfs ad1423922781e6552f18d055a5742b1cff018cdc +ubifs 0695aef23d674815c352293c49d944a2375ee9c9 +v9fs 3e281113f871d7f9c69ca55a4d806a72180b7e8a +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs f401306d72f2cffa9837b7d194c8e528be5e63b2 +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner 981be27a72d163610e8e1c342373930bae80ac99 +vfs eb028c33451af08bb34f45c6be6967ef1c98cbd1 +mm-hotfixes 201037a59604abdb9f6d565ba3fb58820ede1de1 +fs-current 3bfe1da11c0dc2e284f69028b274aa07731fb952 +kbuild-current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current fd2dee1c6e2256f726ba33fd3083a7be0efc80d3 +arm64-fixes 98a97bf41528ef738b06eb07ec2b2eb1cfde6ce6 +arm-soc-fixes ececfba255bf3616301419e47a5c824e04b60ab8 +davinci-current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drivers-memory-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current aaf4e92341b081bac1230f22619b0a298e285dab +powerpc-fixes 0843ba458439f38efdc14aa359c14ad0127edb01 +s390-fixes 489e96651dfe59794195c6b2ddb78835edd9f2ed +net 21a88f5d9ce0c328486073b75d082d85a1e98a8b +bpf ea1013c1539270e372fc99854bc6e4d94eaeff66 +ipsec c196def07bbc6e8306d7a274433913444b0db20a +netfilter 21a88f5d9ce0c328486073b75d082d85a1e98a8b +ipvs de0337d641bfa5b6d6b489e479792f1039274e84 +wireless 81d90d93d22ca4f61833cba921dce9a0bd82218f +ath d0309c054362a235077327b46f727bc48878a3bc +iwlwifi 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 85463eb6a46caf2f1e0e1a6d0731f2f3bab17780 +sound-current f7cede182c963720edd1e5fb50ea4f1c7eafa30e +sound-asoc-fixes fa43ab13c59f4c047c479673792ed033ab567c65 +regmap-fixes 5eb484d5b2ac39c12539667230931f179636253c +regulator-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +spi-fixes 9d651a6c62832ac8d1c445f5fa8c61a03ebfb649 +pci-current 94bf74830a977a027042f685c7231c5e07cc3372 +driver-core.current e2f1081ca8f18c146e8f928486deac61eca2b517 +tty.current 5edb7338d6117bb0ce17ead7973c67390da42258 +usb.current 3b4961313d31e200c9e974bb1536cdea217f78b5 +usb-serial-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +phy 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +staging.current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iio-fixes 74f97a46835664c28bc34c0bba58c6b3eaaaa648 +counter-current 109ff654934a4752f8875ded672efd1fbfe4d31d +char-misc.current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +soundwire-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +thunderbolt-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +input-current aed3716db7fff74919cc5775ca3a80c8bb246489 +crypto-current 48bc9da3c97c15f1ea24934bcb3b736acd30163d +libcrypto-fixes 5a0b1882506858b12cc77f0e2439a5f3c5052761 +vfio-fixes d323ad739666761646048fca587734f4ae64f2c8 +kselftest-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dmaengine-fixes 747213b08a1ab6a76e3e3b3e7a209cc1d402b5d0 +backlight-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mtd-fixes 2f6d2c8d9ac05a7a1c02333f6ad30868246880d8 +mfd-fixes aa6e63373d91f82628b20f6fae7ffe9b97b568a5 +v4l-dvb-fixes 27afd6e066cfd80ddbe22a4a11b99174ac89cced +reset-fixes 997c06330fd5c2e220b692f2a358986c6c8fd5a2 +mips-fixes 680ad315caaa2860df411cb378bf3614d96c7648 +at91-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +omap-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +kvm-fixes 0499add8efd72456514c6218c062911ccc922a99 +kvms390-fixes 5f9df945d4e862979b50e4ecaba3dc81fb06e8ed +hwmon-fixes 6cde588e64934858bb1553119c6b915b2fec9011 +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes 214291cbaaceeb28debd773336642b1fca393ae0 +dma-mapping-fixes 608bf0c7be29bce3f0ccc80607bf32fab95398b1 +drivers-x86-fixes 4dcb6e4af15bf45aa1526834e8f5e296ad7ce867 +samsung-krzk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl-samsung-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +devicetree-fixes 54de247a0efa4c6176ba6840a58e2fb0b2130e2d +dt-krzk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +scsi-fixes c9f36f04a8a2725172cdf2b5e32363e4addcb14c +drm-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drm-intel-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mmc-fixes d3ecb12e2e04ce53c95f933c462f2d8b150b965b +rtc-fixes 162f24cbb0f6ec596e7e9f3e91610d79dc805229 +gnss-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +hyperv-fixes 173d6f64f9558ff022a777a72eb8669b6cdd2649 +risc-v-fixes e2285bd4a46744768f2c8b0ee158495e038ed075 +riscv-dt-fixes 5ef13c3636400bec51c334ac368c8d2fbb26bc3a +riscv-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx d358e5254674b70f34c847715ca509e46eb81e6f +gpio-brgl-fixes a05543d6b05ba998fdbb4b383319ae5121bb7407 +gpio-intel-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl-intel-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +auxdisplay-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kunit-fixes c33b68801fbe9d5ee8a9178beb5747ec65873530 +memblock-fixes c42af83c59b65d01c0f7a074e450bbbb43b22f0d +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 800ad1f0e27792cddf5928f590d3f2d4ab3c68ee +efi-fixes e5f0a698b34ed76002dc5cff3804a61c80233a7a +battery-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iommufd-fixes e6a973af11135439de32ece3b9cbe3bfc043bea8 +rust-fixes 559e608c46553c107dbba19dae0854af7b219400 +w1-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pmdomain-fixes c98c99d5dbdf9fb0063650594edfd7d49b5f4e29 +i2c-host-fixes 880977fdc7f67923d1904ee23ca75fa1e375ea46 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes 3c493b524ffdb3fae7f0d9dc6b887359ce13cd34 +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pwrseq-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +thead-dt-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes b042fdf18e89a347177a49e795d8e5184778b5b6 +trace-fixes 39263f986da55c5b7bc328c757fe378a6a41799d +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +tip-fixes a51826582e8bcc75a14b23b3c4dc802bf23b7d8b +slab-fixes 53ca00a19d345197a37a1bf552e8d1e7b091666c +drm-msm-fixes f5d079564c44baaeedf5e25f4b943aa042ea0eb1 +uml-fixes df447a3b4a4b961c9979b4b3ffb74317394b9b40 +fwctl-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +devsec-tsm-fixes fba4ceaa242d2bdf4c04b77bda41d32d02d3925d +drm-rust-fixes b58c87b0fde0ac06d550659a7e3ddbcd9183b7b9 +tenstorrent-dt-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc-fixes 6b991ad8dc3abfe5720fc2e9ee96be63ae43e362 +rust 559e608c46553c107dbba19dae0854af7b219400 +rust-alloc 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 42415d163e5df6db799c7de6262d707e402c2c7e +rust-timekeeping 4521438fb076f8a6a52f45b0e508f6ef10ac0c49 +rust-xarray fa616196fbea12462107774fb6a1908c95f71cf0 +mm-stable 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mm-nonmm-stable 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mm-unstable edeb51ec1667baf92dc4b54363817435cff07d35 +mm-nonmm-unstable bda39f9485fb20e66ec5339e493178e8f65d4968 +kbuild a4df2071f1a2bb5b003eb179e1a51625d26b04d5 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf cb015814f8b6eebcbb8e46e111d108892c5e6821 +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +asm-generic edcc8a38b5ac1a3dbd05e113a38a25b937ebefe5 +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm dd9143371a8619f496e29160390fcafcee1371d1 +arm64 edde060637b92607f3522252c03d64ad06369933 +arm-perf e6a27290d8001538fec94e91ff8c7f956ee7e3e5 +arm-soc e5b2299997d3760840111ff2e6c5df9f2224f253 +amlogic 3b2ecf0c3cc319358d7ff3f2f0f262d47b497b5d +asahi-soc 074986379c03bca7a1de45fa81836c596c24aa1d +at91 fde90d654751425c7b104b8fda930ed6c34cfa85 +bmc 459a5aa171c0f13fcd78faa9594dc4aa5a95770b +broadcom 37c3a91e9730e274fe2eca9703033ae0f154cb62 +cix 4889f68b824df835bab956bab1519b132df32536 +davinci 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drivers-memory 9805f2cfc883018f7bf84c84e3af3786c37dac7b +fsl c8dff80a3108a2cb85ac7ac5b1a75c247ac55fd2 +imx-mxs 89d95dbad2a3857f06cb6002566bbdcbe53bbfef +mediatek 67ed5843a67b7ba63d79f2ba3fd21bee151d3138 +mvebu f0e6bc0c3ef4b4afb299bd6912586cafd5d864e9 +omap 2c85858e7c6839011e423109df556ef894a71cff +qcom 689a433e9d6bee62282a9f0e9c4e97fccb04b873 +renesas fec0b9c25cfb056aceb90d630174f17c8b98b338 +reset a0d57f7504b6027bc73b96711bcafa39565a9bac +rockchip 4a4070c80fe694c684fbb67dae3294e4c9f14f55 +samsung-krzk cb4cfbcf27641ea87c18f5a72b93fc3748f03bc3 +scmi 98675bc92a9ea56b21a362faa8b866fb8403feb7 +sophgo c7f013d4c8c07a87d19cec90fc4d4633ad713fde +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 5a97a38c22799a802f33001dcb022d2942fe4a41 +stm32 a6961e2ced5190c68acd78a7e372de07f565fcd6 +sunxi 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tee e8fd8a160bbb34925abb5e6918a7fbb0bc4b820a +tegra e016a50e00e68c67c0ecaa8b2069f2a694a1cf12 +tenstorrent-dt a71e6e8eea8ae2d624f097911f43357bba06d2a5 +thead-dt 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +ti 109d58039d30b0f0cb0f5f3519c3c6a2331b6ea0 +xilinx 43da9849395e1924ad0928a7323720a269310b3e +clk 6f172175b6f3fe35b5d519fc314f7a0b603a9af9 +clk-imx fdc1dc7dd53b95805d3943ed36785c1ec812915e +clk-renesas d8921e42a1983024227c0e64253ea96b25a1ae9a +thead-clk 30441a56b1d1e10582721b6a3b2ab3ad4aaff8ef +csky 817d21578d51e801df58ab012654486a71073074 +loongarch be77cf43d2fd6eca150594e997e40ca7df90f251 +m68k aaf4e92341b081bac1230f22619b0a298e285dab +m68knommu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +microblaze 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mips 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +openrisc 8c30b0018f9d93391573e091960d257fd9de120a +parisc-hd 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +powerpc 9b36c7fc5aa5f2c6e6eeb9f312fdfe61b4291c9f +risc-v 7e40c6791cc81e98a191d976a6f6366c77c33292 +riscv-dt a4aad736716d345d98c0eecbb0061fc9b6e578a1 +riscv-soc 719362b8a9724f96d33fecd95b3223d3a935a186 +s390 ca4a4090a9bb3f4049a753ddf28614ca1292be7f +sh 8f5ae30d69d7543eee0d70083daf4de8fe15d585 +sparc fe0126702a40b2f3d315bc943ef10dc2f707e29d +uml a3209bb94b36351f11e0d9e72ac44e5dd777a069 +xtensa 0d4b3ca115b5436d7e68453527566db3e87ab7f0 +fs-next e9fad83f1229ae84c676b88e5e5937d1765377fa +printk 34793812e59224a3ba0dbe9383a5b6aea7b2fd5a +pci 43dfc13ca972988e620a6edb72956981b75ab6b0 +pstore b692553573683b9e4ebab40c2782a3163f984cfd +hid 1c772200c9dcb23a304f84a9334fe2e0d9529ab0 +i2c d202341d9b0c5b5965787061ba0d10daafb9d6c5 +i2c-host 6a28174326289834c6767bdeb1ba348aa9831e91 +i3c 136209e6bd981e60db6c0e78f2919ff2f92312d4 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 1d9d442ab179b11c629ae8f87533c9ae381cc15f +jc_docs 464257baf99200d1be1c053f15aa617056361e81 +v4l-dvb b70886ff5833cf499e77af77d2324ce8f68b60ce +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm 5c062ebfa0762c42ead017e4a748aba733be8214 +cpufreq-arm f98c414030d28a1294323e7eac4c07e158e43a6b +cpupower ff72619e11348ab189e232c59515dd5c33780d7c +devfreq d9600d57668c49308f705a660c5ad17fa3a53f73 +pmdomain 1f67707fafa598e2338dba08e3de0db3e468afd1 +opp 33ffb0aa8ce8b18aaa65e0f9346d52b4e314ad7d +thermal c411d8bf06992dade7abb88690dc2d467a868cc4 +rdma 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +net-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +bpf-next ec439c38013550420aecc15988ae6acb670838c1 +ipsec-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +mlx5-next 5422318e27d7a4662701f518e2e51b9f73a331b1 +netfilter-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +ipvs-next c9dfb92de0738eb7fe6a591ad1642333793e8b6e +bluetooth 98246938a0e66e4100e95b6b7881843a9a4e4882 +wireless-next 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88 +ath-next 631ee338f04db713ba611883f28e94157ebb68e5 +iwlwifi-next 85d002b2ac56d74f09de7a2ef5f448ec94ceebd6 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +nand a75a1dec037ff3de863375fa3a74569619667184 +spi-nor ed26bd40df11ee438d623adc9c6cc2a7bf9c5dd3 +crypto 48bc9da3c97c15f1ea24934bcb3b736acd30163d +libcrypto 325c29e7d11caaf3b4f04f2c8f7d6bc4861cce5a +drm 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 332070795bd96193756cb4446eddc3ec9ff6a0e8 +amdgpu 0a54edc19158b3402b6c39cc682789be05e3d47d +drm-intel 0c8afa67aaa2d6cf523361f493d9b8224448ebea +drm-msm 7bc29d5fb6faff2f547323c9ee8d3a0790cd2530 +drm-msm-lumag e2f085ab8636fae2ebe0adf42071e7558234cd7b +drm-rust 97cf6bc0abd381fd84e5d8e978322a62a58fb00e +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +drm-xe c7b83a916d62c4d4447d7edf0bc5e06dc2afbdf8 +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +regmap 82845bc8d13c63a82ab9b8d6241d305d0ef39e25 +sound 03f705b9ca58b91c6dffe64875ea3d9a38cad9b5 +ieee1394 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +sound-asoc fa41400e9b5c6388742db7127cc61ade35ec12d6 +modules 1ddac5cd7f278345b2e8298c930e4bffe0911a45 +input d79f302f2f9829d04b0ab6181c38716c5a68804d +block e68d68450f764da134f004ca61cad3e429ca7305 +device-mapper 13ea55ea20176736516b20b9ea2d8cf97dbe74f5 +libata f474c70065e14bac928716100eebfcfb15e1a725 +pcmcia 4a81f78caa53e0633cf311ca1526377d9bff7479 +mmc 1c6c8cf3002229d120ae655c872b4b2acc26a469 +mfd 44c603f35cad3f3b0f58fece99502d81620da9b2 +backlight d3cc7cd7bc46af587747399e956cf4508221476f +battery 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +regulator 2bb202416d33347102b12bbd1db4837fb6685617 +security 1c0860d4415d52f3ad1c8e0a15c1272869278a06 +apparmor 8f5ae30d69d7543eee0d70083daf4de8fe15d585 +integrity 738c9738e690f5cea24a3ad6fd2d9a323cf614f6 +selinux 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +smack 29c701f90b9341f1f9c1854a9c22b71c2318457d +tomoyo 88fe48f74ec2e76a13da7d199fa5eb54de16a875 +tpmdd 416f99c3b16f582a3fc6d64a1f77f39d94b76de5 +watchdog 5bcc5786a0cfa9249ccbe539833040a6285d0de3 +iommu 7a089c5d35aa307147e78c5cbeeb1352b92790b1 +audit 15b0c43aa621fb77b32c46eb642eaf25557e9fdb +devicetree 5530836fb91487d915ece36b1fa8bdc3d0f4547f +dt-krzk b7fdd9926b22975562b1d2f76feafbdea5e5b9ad +mailbox 1ec6e0e8c0dd6599472af944b8d703d526ff1031 +spi 81e4a2ef2782eb1c9902843ba7676e78cee2cb6f +tip eff801f5c2b85f1969d5436b6b86c6d8078129aa +clockevents d1780dce9575072303b9c574614b72b5c8c5c44c +edac 814b332921b6c9b4b4c6c98a024f2dd9f33a8178 +ftrace 5a63f3faf6569e3aac81595b6318ac76674a282f +rcu 9a08942f17017b708991c5089843d4a1bfac4420 +paulmck 7f8fcc6f09fb732745b3252f481def76b18fb99c +kvm 0499add8efd72456514c6218c062911ccc922a99 +kvm-arm 3eef0c83c3f3e58933e98e678ddf4e95457d4d14 +kvms390 2bd1337a1295e012e60008ee21a64375e5234e12 +kvm-ppc c17b750b3ad9f45f2b6f7e6f7f4679844244f0b9 +kvm-riscv 3239c52fd21257c80579875e74c9956c2f9cd1f9 +kvm-x86 58e10b63777d0aebee2cf4e6c67e1a83e7edbe0f +xen-tip e5aff444e3a7bdeef5ea796a2099fc3c60a070fa +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues 51cd2d2decf365a248ddc304b7aa6f0cadc748c3 +sched-ext b0101ccb5b4641885f30fecc352ef891ed06e083 +drivers-x86 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +chrome-platform 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +chrome-platform-firmware 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +hsi 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +leds-lj 072cd5f458d76b9e15d89ebdaea8b5cb1312eeef +ipmi 35bcedc1a7938da808f54510d8bc7d90cebb6278 +driver-core e4b3118b61b6d93d4289069b9cccbffe8e714aa0 +usb dd1fbe324a548e8057d5f3c72ce1a64a80f1753e +thunderbolt 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +usb-serial 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tty 284da5de616aaebf9c2c62e5fc7cb464a064eff7 +char-misc 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 7009646d937f9a1147b401362260939bba52082f +fastrpc 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +fpga c9243d6df0d617535e842aa4c3d1d7dfdb91d07b +icc 60b52af082b1462e878d10a0298fad40a26a8b35 +iio f9e05791642810a0cf6237d39fafd6fec5e0b4bb +phy-next 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +soundwire 59946373755d71dbd7614ba235e0093159f80b69 +extcon b4338338aa3d44bf58973b9e44e0856ba597838f +gnss 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +vfio d721f52e31553a848e0e9947ca15a49c5674aef3 +w1 761fcf46a1bd797bd32d23f3ea0141ffd437668a +spmi 0ff41df1cb268fc69e703a08a57ee14ae967d0ca +staging 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +counter-next b462fcd08dd589d9cf9eb7f9d8fc7777b5c5521d +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine de4761fb57f6a71eeb5a4c1167ae3606b08d8f59 +cgroup e02fe7ba29a2fa599885c72cb977aaaaccbfe80d +scsi 98bcf5e5ddfd74a445ff49779c0bd8081d529d27 +scsi-mkp 8334f93075dce0a4536c096a7d471ef90506a7a4 +vhost 1bac705c2ce781c988462cfc109ac04cc2bc41f4 +rpmsg 8d201aac4d4c5fcfb90fd472a92c02f74dd7205b +gpio-brgl 47d8cb678081d12704d52ed42b625e96f38470e0 +gpio-intel 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl 666065caa31aeb812978740bae21871067bb14b6 +pinctrl-intel 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl-renesas 3b0cf6ab35909d7ac8d561e18159c62d42d914c2 +pinctrl-samsung 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pwm 9580ecfbc57d2fe4145b990de2b56362ea978f34 +ktest d3042cbe84a060b4df764eb6c5300bbe20d125ca +kselftest 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kunit 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kunit-next 2115b53400fb82ab54fc4c95a4b40e8ce0d0a7df +livepatching 51ab33fc0a8bef9454849371ef897a1241911b37 +rtc 16bd954c93360145bc77cc601e350913fc28182d +nvdimm 30065e73d7c018cf2e1bec68e2d6ffafc17b3c25 +at24 7a29af24b288eace769ccd9eb8044742dfbd5944 +ntb 68113d26067408736fc3be948c2fe8db935aff1c +seccomp 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +slimbus 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +nvmem 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +xarray 863810caeb3cf04ee479f3944a678574001af7a9 +hyperv 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +auxdisplay 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 3a8660878839faadb4f1a6dd72c3179c1df56787 +mhi ac35e04f8000aaaf98635792464647e7a6f3422e +memblock 83c8f7b5e194eaf3fb268c513e23e23e892de8ed +cxl ea5514e300568cbe8f19431c3e424d4791db8291 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi c5a8f13f1e476c90f4bc184a58751d3e7ff88f2b +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab 58d6fcb6ee9432e5584e8845be23a1e805c65711 +random 3f9f0252130e7dd60d41be0802bf58f6471c691d +landlock 1a3cedbdc156e100eb1a5208a8562a3265c35d87 +sysctl 564195c1a33c8fc631cd3d306e350b0e3d3e9555 +execve 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +bitmap abb934acc479f070bc8e78ceda5b191e17266126 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp 7454048db27d685a155aaf4ea03bb9ad0d086bb9 +nolibc 5203a78a7c60eb35557acff441d7758ce9eea476 +iommufd 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +turbostat b65a8280c76670e70b85b39ab63df3114ac45826 +pwrseq 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +capabilities-next 9891d2f79a9fe9b77ad290f950eb8fa3e375330e +ipe 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +kcsan dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +crc dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +fwctl 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +devsec-tsm 7dfbe9a6751973c17138ddc0d33deff5f5f35b94 +hisilicon 6c177775dcc5e70a64ddf4ee842c66af498f2c7c +kthread d8b4bf4ea04dd96fe43f6010c614149aba4c9b91 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..fa207ed5364a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,407 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +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 +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 +i2c-host-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-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 +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 +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 +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 +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 000000000000..ee996aa0f30f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4648 @@ +$ date -R +Fri, 19 Dec 2025 08:49:43 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ea1013c15392 Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf +Merging origin/master (dd9b004b7ff3 Merge tag 'trace-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating ea1013c15392..dd9b004b7ff3 +Fast-forward (no commit created; -m option ignored) + CREDITS | 1 + + MAINTAINERS | 2 +- + arch/arm64/include/asm/simd.h | 9 +- + drivers/acpi/acpi_pcc.c | 2 +- + drivers/acpi/cppc_acpi.c | 3 +- + drivers/base/power/runtime.c | 22 ++--- + drivers/iommu/iommufd/io_pagetable.c | 6 +- + drivers/iommu/iommufd/selftest.c | 14 +++- + drivers/net/can/Kconfig | 7 +- + drivers/net/can/Makefile | 2 +- + drivers/net/can/dev/Makefile | 5 +- + drivers/net/can/usb/gs_usb.c | 2 +- + drivers/net/dsa/lantiq/lantiq_gswip.c | 3 - + drivers/net/dsa/lantiq/lantiq_gswip.h | 2 - + drivers/net/dsa/lantiq/lantiq_gswip_common.c | 19 +++-- + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 46 ++++++++-- + drivers/net/ethernet/broadcom/b44.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 3 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/google/gve/gve_main.c | 17 ++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 ++ + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 97 +++++++++++++++++++--- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 ++ + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 48 +++++++++-- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 1 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 11 ++- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + + 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 +- + drivers/powercap/intel_rapl_common.c | 24 ++++-- + drivers/powercap/intel_rapl_msr.c | 4 +- + drivers/powercap/powercap_sys.c | 22 +++-- + .../int340x_thermal/processor_thermal_device_pci.c | 3 +- + drivers/thermal/thermal_core.c | 4 +- + fs/file_attr.c | 2 + + fs/notify/fsnotify.c | 9 +- + fs/smb/client/cifsfs.h | 4 +- + fs/smb/client/cifspdu.h | 2 +- + fs/smb/common/smb1pdu.h | 56 +++++++++++++ + fs/smb/common/smb2pdu.h | 41 +-------- + fs/smb/common/smbglob.h | 2 - + fs/smb/server/smb_common.h | 1 + + include/linux/intel_rapl.h | 4 + + include/net/inet_frag.h | 18 +--- + include/net/ipv6_frag.h | 9 +- + include/net/netfilter/nf_tables.h | 34 ++++++-- + 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 + + kernel/trace/ftrace.c | 7 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 2 + + lib/crypto/riscv/.gitignore | 2 + + net/caif/cffrml.c | 9 +- + net/can/Kconfig | 1 - + net/can/j1939/socket.c | 6 ++ + net/can/j1939/transport.c | 2 + + net/ethtool/ioctl.c | 30 +++++-- + net/handshake/request.c | 8 +- + 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/netfilter/nf_nat_core.c | 14 +--- + net/netfilter/nf_tables_api.c | 84 +++++++++++++++---- + net/netrom/nr_out.c | 4 +- + net/openvswitch/flow_netlink.c | 13 ++- + net/sched/act_mirred.c | 9 ++ + net/sched/sch_ets.c | 6 +- + net/sctp/ipv6.c | 2 + + net/sctp/socket.c | 7 +- + net/unix/garbage.c | 2 +- + tools/net/ynl/Makefile.deps | 2 + + tools/testing/selftests/iommu/iommufd.c | 8 +- + 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 +- + .../net/netfilter/conntrack_reverse_clash.c | 13 ++- + .../net/netfilter/conntrack_reverse_clash.sh | 2 + + .../packetdrill/conntrack_syn_challenge_ack.pkt | 2 +- + tools/testing/selftests/net/tfo.c | 3 +- + tools/testing/selftests/net/tls.c | 2 +- + .../tc-testing/tc-tests/actions/mirred.json | 46 ++++++++++ + .../tc-testing/tc-tests/infra/qdiscs.json | 78 +++++++++++++++++ + 113 files changed, 935 insertions(+), 359 deletions(-) + create mode 100644 fs/smb/common/smb1pdu.h + create mode 100644 lib/crypto/riscv/.gitignore +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 (24835a96f21e Merge patch series "filelock: fix conflict detection with userland file delegations") +$ 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 +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 1 + + drivers/media/mc/mc-request.c | 6 +- + fs/iomap/buffered-io.c | 50 +++++++++----- + fs/iomap/iter.c | 6 +- + fs/locks.c | 119 +++++++++++++++++----------------- + fs/nfsd/nfs4layouts.c | 23 ++++++- + fs/nfsd/nfs4state.c | 19 ++++++ + fs/xfs/xfs_iomap.c | 11 ++-- + include/linux/filelock.h | 1 + + include/linux/iomap.h | 8 ++- + 10 files changed, 156 insertions(+), 88 deletions(-) +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 (5c94889f8419 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 +Merge made by the 'ort' strategy. + fs/btrfs/delayed-inode.c | 32 +++++++++++++++++--------------- + fs/btrfs/extent_io.c | 8 ++++---- + fs/btrfs/inode.c | 22 +++++++++++++++------- + fs/btrfs/qgroup.c | 21 +++++++++++++++++++-- + fs/btrfs/transaction.c | 11 ++++++----- + fs/btrfs/tree-log.c | 6 ++---- + include/trace/events/btrfs.h | 3 ++- + 7 files changed, 65 insertions(+), 38 deletions(-) +Merging vfs-fixes/fixes (e1b4c6a58304 shmem: fix recovery on rename failures) +$ 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 (913f7cf77bf1 NFSD: NFSv4 file creation neglects setting ACL) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/vfs.h +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4xdr.c | 5 +++++ + fs/nfsd/nfsd.h | 8 +++++++- + fs/nfsd/nfssvc.c | 5 ++++- + fs/nfsd/vfs.h | 3 ++- + net/sunrpc/auth_gss/svcauth_gss.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +++++-- + 7 files changed, 26 insertions(+), 7 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 (58d1993910c4 Merge branch 'for-next-next-v6.19-20251218' into for-next-20251218) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 9 +- + fs/btrfs/bio.c | 19 ++- + fs/btrfs/bio.h | 16 ++- + fs/btrfs/block-group.c | 11 +- + fs/btrfs/compression.c | 1 - + fs/btrfs/ctree.c | 49 +++---- + fs/btrfs/ctree.h | 9 ++ + fs/btrfs/defrag.c | 5 +- + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/direct-io.c | 29 ++-- + fs/btrfs/disk-io.c | 87 +++--------- + fs/btrfs/extent-io-tree.c | 7 +- + fs/btrfs/extent-tree.c | 80 +++++------ + fs/btrfs/extent_io.c | 70 ++++++---- + fs/btrfs/file-item.c | 4 - + fs/btrfs/file.c | 9 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/fs.c | 102 ++++++++++++-- + fs/btrfs/fs.h | 23 ++- + fs/btrfs/inode-item.c | 7 +- + fs/btrfs/inode.c | 338 +++++++++++++++++++++++++++------------------ + fs/btrfs/messages.c | 26 +--- + fs/btrfs/messages.h | 76 +++++----- + fs/btrfs/qgroup.c | 103 ++++++++++---- + fs/btrfs/relocation.c | 5 +- + fs/btrfs/root-tree.c | 47 +++---- + fs/btrfs/scrub.c | 39 ++---- + fs/btrfs/space-info.c | 18 +-- + fs/btrfs/space-info.h | 16 +++ + fs/btrfs/super.c | 29 ++-- + fs/btrfs/sysfs.c | 58 +------- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/volumes.c | 19 ++- + fs/btrfs/zoned.c | 55 ++++++++ + fs/btrfs/zoned.h | 8 ++ + 35 files changed, 766 insertions(+), 627 deletions(-) +Merging ceph/master (375068b6c206 libceph: prevent potential out-of-bounds reads in handle_auth_done()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + net/ceph/messenger_v2.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging cifs/for-next (d8a4af8f3d9d cifs: update internal module version number) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +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 (e68e6eb58221 erofs: make z_erofs_crypto[] static) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/decompressor_crypto.c | 2 +- + fs/erofs/zdata.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 ext3/for_next (6f7c877cc397 fs: send fsnotify_xattr()/IN_ATTRIB from vfs_fileattr_set()/chattr(1)) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Already up to date. +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 (4a210a5be279 f2fs: improve check for enough free sections) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 43 +++++++ + fs/f2fs/data.c | 248 +++++++++++++++++++++++++++++++++++-- + fs/f2fs/f2fs.h | 16 +++ + fs/f2fs/file.c | 4 + + fs/f2fs/gc.c | 2 +- + fs/f2fs/inode.c | 6 +- + fs/f2fs/segment.h | 99 +++++++-------- + include/trace/events/f2fs.h | 12 +- + 8 files changed, 365 insertions(+), 65 deletions(-) +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 (02e96fafcb36 gfs2: Fix slab-use-after-free in qd_put) +$ 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.c | 85 ++++++++++++++++++++++++++-------------------------- + fs/gfs2/glock.h | 6 ++-- + fs/gfs2/glops.c | 34 ++++++++++----------- + fs/gfs2/incore.h | 16 ++++++++-- + fs/gfs2/lock_dlm.c | 28 ++++++++--------- + fs/gfs2/log.c | 7 +++-- + fs/gfs2/lops.c | 70 +++++++++++++++++++++++-------------------- + fs/gfs2/lops.h | 4 +-- + fs/gfs2/meta_io.c | 6 ++-- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/quota.c | 5 ++-- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trace_gfs2.h | 48 ++++++++++++++--------------- + fs/gfs2/trans.c | 4 +-- + 14 files changed, 168 insertions(+), 149 deletions(-) +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 (53ec4a79ff4b Merge tag 'v6.19-rc1-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (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 +Already up to date. +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (f401306d72f2 xfs: factor out a xlog_write_space_advance helper) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/libxfs/xfs_sb.c | 15 +++ + fs/xfs/scrub/attr_repair.c | 2 +- + fs/xfs/xfs_attr_item.c | 29 ++-- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 20 ++- + fs/xfs/xfs_discard.c | 27 +--- + fs/xfs/xfs_discard.h | 2 +- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_file.c | 58 ++++++-- + 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_rtalloc.c | 14 +- + fs/xfs/xfs_trans.h | 4 +- + 22 files changed, 393 insertions(+), 388 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 (981be27a72d1 Merge branch 'vfs-7.0.atomic_open' 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 +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/locking.rst | 8 - + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/porting.rst | 7 +- + Documentation/filesystems/vfs.rst | 58 +---- + arch/arm/configs/neponset_defconfig | 2 +- + fs/buffer.c | 6 +- + fs/char_dev.c | 2 +- + fs/exec.c | 2 +- + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fat/dir.c | 4 +- + fs/fat/file.c | 3 +- + fs/fs_context.c | 208 +--------------- + fs/fsopen.c | 10 - + fs/fuse/dev.c | 2 +- + fs/fuse/file.c | 8 +- + fs/init.c | 14 -- + fs/internal.h | 1 - + fs/locks.c | 14 +- + fs/namei.c | 80 ++++++- + fs/namespace.c | 102 +++++--- + fs/nfsd/nfs4proc.c | 11 +- + fs/open.c | 39 --- + fs/splice.c | 2 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 5 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 - + include/linux/initrd.h | 2 - + include/linux/ns/ns_common_types.h | 4 +- + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/sysctl.h | 1 - + init/do_mounts.c | 11 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +-------- + init/do_mounts_rd.c | 24 +- + kernel/pid.c | 131 +++++++---- + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 +++++++++++++++++++-- + .../filesystems/statmount/statmount_test_ns.c | 101 +++++++- + 46 files changed, 685 insertions(+), 650 deletions(-) +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 (201037a59604 mm/memremap: fix spurious large folio warning for FS-DAX) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 4 +-- + MAINTAINERS | 5 ++- + arch/x86/kernel/setup.c | 14 ++++++++ + include/linux/genalloc.h | 1 + + include/linux/hugetlb.h | 4 +-- + include/linux/kasan.h | 16 +++++++++ + include/linux/kexec.h | 4 +-- + include/linux/leafops.h | 4 +-- + include/linux/memory-failure.h | 2 ++ + include/linux/mm.h | 12 +++---- + kernel/kexec_core.c | 16 ++++++--- + lib/idr.c | 2 ++ + mm/damon/vaddr.c | 2 +- + mm/hugetlb.c | 4 +-- + mm/kasan/common.c | 32 +++++++++++++++++ + mm/kasan/hw_tags.c | 2 +- + mm/kasan/shadow.c | 4 ++- + mm/memcontrol.c | 4 +-- + mm/memory-failure.c | 51 +++++++++++++++++----------- + mm/memremap.c | 7 +++- + mm/page_alloc.c | 34 ++++++++++++------- + mm/vmalloc.c | 8 ++--- + rust/kernel/maple_tree.rs | 11 +++++- + security/integrity/ima/ima_kexec.c | 4 +-- + tools/mm/page_owner_sort.c | 6 +++- + tools/testing/radix-tree/idr-test.c | 21 ++++++++++++ + tools/testing/selftests/mm/uffd-unit-tests.c | 2 +- + 27 files changed, 206 insertions(+), 70 deletions(-) +Merging fs-current (3bfe1da11c0d 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. + Documentation/filesystems/locking.rst | 1 + + drivers/media/mc/mc-request.c | 6 +- + fs/btrfs/delayed-inode.c | 32 ++++----- + fs/btrfs/extent_io.c | 8 +-- + fs/btrfs/inode.c | 22 +++++-- + fs/btrfs/qgroup.c | 21 +++++- + fs/btrfs/transaction.c | 11 ++-- + fs/btrfs/tree-log.c | 6 +- + fs/iomap/buffered-io.c | 50 +++++++++----- + fs/iomap/iter.c | 6 +- + fs/locks.c | 119 +++++++++++++++++----------------- + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4layouts.c | 23 ++++++- + fs/nfsd/nfs4state.c | 19 ++++++ + fs/nfsd/nfs4xdr.c | 5 ++ + fs/nfsd/nfsd.h | 8 ++- + fs/nfsd/nfssvc.c | 5 +- + fs/nfsd/vfs.h | 3 +- + fs/xfs/xfs_iomap.c | 11 ++-- + include/linux/filelock.h | 1 + + include/linux/iomap.h | 8 ++- + include/trace/events/btrfs.h | 3 +- + net/sunrpc/auth_gss/svcauth_gss.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +- + 24 files changed, 247 insertions(+), 133 deletions(-) +Merging kbuild-current/kbuild-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (98a97bf41528 arm64/gcs: Flush the GCS locking state on exec) +$ 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 +Merge made by the 'ort' strategy. + arch/arm64/kernel/fpsimd.c | 130 +++++--------------------------- + arch/arm64/kernel/process.c | 1 + + arch/arm64/mm/mmu.c | 33 ++++---- + drivers/misc/lkdtm/bugs.c | 53 +++++++++++++ + tools/testing/selftests/lkdtm/tests.txt | 2 + + 5 files changed, 92 insertions(+), 127 deletions(-) +Merging arm-soc-fixes/arm/fixes (ececfba255bf ARM: dts: ixp4xx: Fix up Actiontec MI424WR DTS files) +$ 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. + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts | 11 +++++++++++ + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts | 11 +++++++++++ + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi | 1 - + 3 files changed, 22 insertions(+), 1 deletion(-) +Merging davinci-current/davinci/for-current (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (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 (489e96651dfe s390/stacktrace: Do not fallback to RA register) +$ 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 (21a88f5d9ce0 Merge tag 'linux-can-fixes-for-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (ea1013c15392 Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (c196def07bbc xfrm: set ipv4 no_pmtu_disc flag only on output sa when direction is set) +$ 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 ++-- + net/xfrm/xfrm_state.c | 1 + + 3 files changed, 5 insertions(+), 4 deletions(-) +Merging netfilter/main (21a88f5d9ce0 Merge tag 'linux-can-fixes-for-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ 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 (81d90d93d22c wifi: iwlwifi: Implement settime64 as stub for MVM/MLD PTP) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++-- + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 7 +++++++ + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 7 +++++++ + drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 3 ++- + drivers/net/wireless/realtek/rtw88/sdio.c | 4 +++- + drivers/net/wireless/realtek/rtw88/usb.c | 3 +-- + drivers/net/wireless/ti/wlcore/tx.c | 5 +++++ + net/mac80211/cfg.c | 10 ---------- + net/mac80211/iface.c | 2 +- + net/mac80211/mlme.c | 5 ++++- + net/mac80211/ocb.c | 3 +++ + net/mac80211/rx.c | 5 +++++ + net/wireless/sme.c | 2 +- + 13 files changed, 41 insertions(+), 19 deletions(-) +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 (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 '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 (85463eb6a46c RDMA/efa: Remove possible negative shift) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/addr.c | 33 ++++++++++----------------------- + drivers/infiniband/core/cma.c | 3 +++ + drivers/infiniband/hw/efa/efa_verbs.c | 4 ---- + drivers/infiniband/hw/irdma/utils.c | 3 ++- + drivers/infiniband/hw/mana/cq.c | 4 ++++ + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 32 +++++++++++++++++++++----------- + drivers/infiniband/ulp/rtrs/rtrs.h | 24 +++++++++++++++--------- + include/uapi/rdma/irdma-abi.h | 2 +- + include/uapi/rdma/rdma_user_cm.h | 4 +++- + 9 files changed, 59 insertions(+), 50 deletions(-) +Merging sound-current/for-linus (f7cede182c96 ALSA: hda/realtek: Add Asus quirk for TAS amplifiers) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/codecs/realtek/alc269.c | 30 +++++++++++++++++++++++++----- + sound/hda/controllers/cix-ipbloq.c | 4 +--- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 8 +++++++- + sound/pcmcia/vx/vxpocket.c | 8 +++++++- + sound/usb/endpoint.c | 8 ++++---- + sound/usb/format.c | 5 ++++- + sound/usb/mixer_us16x08.c | 20 ++++++++++++++------ + sound/usb/quirks.c | 14 ++++++++++++-- + 8 files changed, 74 insertions(+), 23 deletions(-) +Merging sound-asoc-fixes/for-linus (fa43ab13c59f ASoC: fsl-asoc-card: Use of_property_present() for non-boolean properties) +$ 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. + include/sound/soc-acpi.h | 5 ++- + sound/soc/amd/yc/acp6x-mach.c | 7 ++++ + sound/soc/codecs/ak4458.c | 4 -- + sound/soc/codecs/rt1320-sdw.c | 16 ++++--- + sound/soc/fsl/fsl-asoc-card.c | 8 ++-- + sound/soc/fsl/fsl_sai.c | 13 +++++- + sound/soc/fsl/fsl_xcvr.c | 3 ++ + sound/soc/intel/common/soc-acpi-intel-nvl-match.c | 49 ---------------------- + sound/soc/intel/common/sof-function-topology-lib.c | 5 ++- + sound/soc/intel/common/sof-function-topology-lib.h | 2 +- + sound/soc/qcom/sdm845.c | 2 + + sound/soc/sdw_utils/soc_sdw_utils.c | 8 +++- + sound/soc/sof/intel/pci-mtl.c | 6 +-- + sound/soc/sof/ipc4-topology.c | 49 ++++++++++++++-------- + sound/soc/sof/topology.c | 26 +++++++++--- + sound/soc/tegra/tegra210_ahub.c | 6 +-- + 16 files changed, 108 insertions(+), 101 deletions(-) +Merging regmap-fixes/for-linus (5eb484d5b2ac Merge remote-tracking branch 'regmap/for-6.18' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (9d651a6c6283 spi: cadence-quadspi: Fix probe error path and logging) +$ 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. + Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 6 +++--- + drivers/spi/spi-cadence-quadspi.c | 8 ++++++-- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-mpfs.c | 1 + + drivers/spi/spi-mt65xx.c | 2 +- + 5 files changed, 12 insertions(+), 7 deletions(-) +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 +Already up to date. +Merging driver-core.current/driver-core-linus (e2f1081ca8f1 samples: rust: fix endianness issue in rust_driver_pci) +$ 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 +Merge made by the 'ort' strategy. + rust/helpers/dma.c | 21 +++++++++++++++++++++ + samples/rust/rust_driver_pci.rs | 2 +- + 2 files changed, 22 insertions(+), 1 deletion(-) +Merging tty.current/tty-linus (5edb7338d611 serial: 8250: longson: Fix NULL vs IS_ERR() bug in probe) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_loongson.c | 4 ++-- + drivers/tty/serial/serial_base_bus.c | 10 ++++++---- + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging usb.current/usb-linus (3b4961313d31 usb: dwc3: of-simple: fix clock resource leak in dwc3_of_simple_probe) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/dwc3/dwc3-of-simple.c | 7 ++++--- + drivers/usb/dwc3/gadget.c | 2 +- + drivers/usb/dwc3/host.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 21 +++++++++++++++------ + drivers/usb/host/xhci-dbgtty.c | 2 +- + drivers/usb/phy/phy-fsl-usb.c | 1 + + drivers/usb/renesas_usbhs/pipe.c | 2 ++ + drivers/usb/typec/altmodes/displayport.c | 8 ++++++-- + drivers/usb/typec/ucsi/Kconfig | 1 + + drivers/usb/typec/ucsi/ucsi.c | 2 +- + 10 files changed, 33 insertions(+), 15 deletions(-) +Merging usb-serial-fixes/usb-linus (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (aed3716db7ff Input: i8042 - add TUXEDO InfinityBook Max Gen10 AMD to i8042 quirk table) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/keyboard/atkbd.c | 7 +++++++ + drivers/input/keyboard/lkkbd.c | 5 ++++- + drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ + 3 files changed, 18 insertions(+), 1 deletion(-) +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 (5a0b18825068 lib/crypto: riscv: Add poly1305-core.S to .gitignore) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (747213b08a1a dmaengine: sh: rz-dmac: Fix rz_dmac_terminate_all()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +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/fsl-edma-common.c | 1 + + drivers/dma/idxd/compat.c | 23 +++++++++++++++++++---- + drivers/dma/lpc18xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/lpc32xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/mmp_pdma.c | 26 ++++++++++++++------------ + drivers/dma/sh/rz-dmac.c | 18 ++++++++++++++++-- + drivers/dma/stm32/stm32-dmamux.c | 31 +++++++++++++++++++------------ + drivers/dma/tegra210-adma.c | 10 +++++++++- + 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 +- + drivers/dma/xilinx/xilinx_dma.c | 7 +++++-- + 17 files changed, 159 insertions(+), 71 deletions(-) +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481 Linux 6.19-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 (2f6d2c8d9ac0 Revert "mtd: spinand: esmt: fix id code for F50D1G41LB") +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/esmt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91 mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ 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 +Merge made by the 'ort' strategy. + drivers/mfd/ls2k-bmc-core.c | 38 ++++++++++---------------------------- + 1 file changed, 10 insertions(+), 28 deletions(-) +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 (680ad315caaa MIPS: Fix a reference leak bug in ip22_check_gio()) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/alchemy/common/setup.c | 3 +-- + arch/mips/sgi-ip22/ip22-gio.c | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 (0499add8efd7 Merge tag 'kvm-x86-fixes-6.19-rc1' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + arch/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 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 (6cde588e6493 hwmon: (DS620) Update broken Datasheet URL in driver documentation) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/hwmon/ds620.rst | 4 ++-- + drivers/hwmon/dell-smm-hwmon.c | 9 +++++++++ + drivers/hwmon/ibmpex.c | 9 +++++++-- + drivers/hwmon/tmp401.c | 2 +- + 4 files changed, 19 insertions(+), 5 deletions(-) +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 (608bf0c7be29 parisc: Set valid bit in high byte of 64‑bit physical address) +$ 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 +Merge made by the 'ort' strategy. + arch/parisc/include/asm/special_insns.h | 15 --------------- + drivers/parisc/sba_iommu.c | 4 ++-- + 2 files changed, 2 insertions(+), 17 deletions(-) +Merging drivers-x86-fixes/fixes (4dcb6e4af15b platform/x86/uniwill: Add TUXEDO Book BA15 Gen10) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/x86/dell/alienware-wmi-wmax.c | 32 ++++++++++++++++++++++++++ + drivers/platform/x86/uniwill/uniwill-acpi.c | 7 ++++++ + 2 files changed, 39 insertions(+) +Merging samsung-krzk-fixes/fixes (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (54de247a0efa dt-bindings: Updates Linus Walleij's mail address) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,integrator.yaml | 2 +- + .../devicetree/bindings/arm/arm,realview.yaml | 2 +- + Documentation/devicetree/bindings/arm/arm,scu.yaml | 2 +- + .../bindings/arm/arm,versatile-sysreg.yaml | 2 +- + .../devicetree/bindings/arm/arm,versatile.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +- + Documentation/devicetree/bindings/arm/gemini.yaml | 2 +- + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 +- + Documentation/devicetree/bindings/arm/ux500.yaml | 2 +- + .../devicetree/bindings/ata/ata-generic.yaml | 2 +- + .../bindings/ata/cortina,gemini-sata-bridge.yaml | 2 +- + .../devicetree/bindings/ata/faraday,ftide010.yaml | 2 +- + .../bindings/ata/intel,ixp4xx-compact-flash.yaml | 2 +- + .../devicetree/bindings/ata/pata-common.yaml | 2 +- + .../devicetree/bindings/ata/sata-common.yaml | 2 +- + .../bindings/auxdisplay/arm,versatile-lcd.yaml | 2 +- + .../devicetree/bindings/clock/sprd,sc9860-clk.yaml | 26 ---------------------- + .../bindings/clock/stericsson,u8500-clks.yaml | 2 +- + .../bindings/crypto/intel,ixp4xx-crypto.yaml | 2 +- + .../bindings/display/dsi-controller.yaml | 2 +- + .../bindings/display/faraday,tve200.yaml | 2 +- + .../bindings/display/panel/arm,rtsm-display.yaml | 2 +- + .../display/panel/arm,versatile-tft-panel.yaml | 2 +- + .../bindings/display/panel/ilitek,ili9322.yaml | 2 +- + .../bindings/display/panel/novatek,nt35510.yaml | 2 +- + .../bindings/display/panel/samsung,lms380kf01.yaml | 2 +- + .../bindings/display/panel/samsung,lms397kf04.yaml | 2 +- + .../bindings/display/panel/samsung,s6d16d0.yaml | 2 +- + .../bindings/display/panel/sony,acx424akp.yaml | 2 +- + .../bindings/display/panel/ti,nspire.yaml | 2 +- + .../bindings/display/panel/tpo,tpg110.yaml | 2 +- + .../devicetree/bindings/display/ste,mcde.yaml | 2 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +-- + .../bindings/display/ti/ti,j721e-dss.yaml | 3 +-- + .../devicetree/bindings/dma/stericsson,dma40.yaml | 2 +- + .../devicetree/bindings/extcon/fcs,fsa880.yaml | 2 +- + .../intel,ixp4xx-network-processing-engine.yaml | 2 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 2 +- + .../bindings/gpio/faraday,ftgpio010.yaml | 2 +- + .../bindings/gpio/gpio-consumer-common.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-ep9301.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-mmio.yaml | 2 +- + .../bindings/gpio/intel,ixp4xx-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/mrvl-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/pl061-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/st,nomadik-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 4 +++- + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 2 +- + .../devicetree/bindings/hwmon/winbond,w83781d.yaml | 2 +- + .../devicetree/bindings/i2c/arm,i2c-versatile.yaml | 2 +- + .../devicetree/bindings/i2c/st,nomadik-i2c.yaml | 2 +- + .../bindings/iio/accel/bosch,bma255.yaml | 2 +- + .../bindings/iio/adc/qcom,pm8018-adc.yaml | 2 +- + .../bindings/iio/gyroscope/invensense,mpu3050.yaml | 2 +- + .../bindings/iio/light/capella,cm3605.yaml | 2 +- + .../bindings/iio/light/sharp,gp2ap002.yaml | 2 +- + .../iio/magnetometer/asahi-kasei,ak8974.yaml | 2 +- + .../bindings/iio/magnetometer/yamaha,yas530.yaml | 2 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 +- + .../devicetree/bindings/input/atmel,maxtouch.yaml | 2 +- + .../input/touchscreen/cypress,cy8ctma140.yaml | 2 +- + .../input/touchscreen/cypress,cy8ctma340.yaml | 2 +- + .../bindings/input/touchscreen/melfas,mms114.yaml | 2 +- + .../bindings/input/touchscreen/zinitix,bt400.yaml | 2 +- + .../arm,versatile-fpga-irq.yaml | 2 +- + .../interrupt-controller/faraday,ftintc010.yaml | 2 +- + .../intel,ixp4xx-interrupt.yaml | 2 +- + .../bindings/leds/backlight/kinetic,ktd253.yaml | 2 +- + .../devicetree/bindings/leds/register-bit-led.yaml | 2 +- + .../devicetree/bindings/leds/regulator-led.yaml | 2 +- + .../devicetree/bindings/leds/richtek,rt8515.yaml | 2 +- + .../intel,ixp4xx-expansion-bus-controller.yaml | 2 +- + .../intel,ixp4xx-expansion-peripheral-props.yaml | 2 +- + .../bindings/mfd/arm,dev-platforms-syscon.yaml | 2 +- + .../devicetree/bindings/mfd/st,stmpe.yaml | 2 +- + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 2 +- + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 2 +- + .../misc/intel,ixp4xx-ahb-queue-manager.yaml | 2 +- + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + .../mtd/partitions/arm,arm-firmware-suite.yaml | 2 +- + .../bindings/mtd/partitions/redboot-fis.yaml | 2 +- + .../devicetree/bindings/mtd/partitions/seama.yaml | 2 +- + .../bindings/net/bluetooth/brcm,bluetooth.yaml | 2 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 2 +- + .../devicetree/bindings/net/dsa/micrel,ks8995.yaml | 2 +- + .../devicetree/bindings/net/dsa/realtek.yaml | 2 +- + .../bindings/net/dsa/vitesse,vsc73xx.yaml | 2 +- + .../bindings/net/intel,ixp46x-ptp-timer.yaml | 2 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 2 +- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 2 +- + .../devicetree/bindings/pci/faraday,ftpci100.yaml | 2 +- + .../devicetree/bindings/pci/intel,ixp4xx-pci.yaml | 2 +- + .../devicetree/bindings/pci/v3,v360epc-pci.yaml | 2 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 2 +- + .../devicetree/bindings/pinctrl/pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 2 +- + .../bindings/power/supply/samsung,battery.yaml | 2 +- + .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 2 +- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 2 +- + .../bindings/spi/arm,pl022-peripheral-props.yaml | 2 +- + .../devicetree/bindings/spi/spi-pl022.yaml | 2 +- + .../bindings/timer/faraday,fttmr010.yaml | 2 +- + .../bindings/timer/intel,ixp4xx-timer.yaml | 2 +- + .../devicetree/bindings/timer/st,nomadik-mtu.yaml | 2 +- + .../devicetree/bindings/usb/faraday,fotg210.yaml | 2 +- + .../devicetree/bindings/usb/intel,ixp4xx-udc.yaml | 2 +- + .../bindings/watchdog/faraday,ftwdt010.yaml | 2 +- + .../bindings/watchdog/maxim,max63xx.yaml | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 7 +++--- + drivers/of/fdt.c | 2 +- + 111 files changed, 115 insertions(+), 140 deletions(-) +Merging dt-krzk-fixes/fixes (8f0b4cce4481 Linux 6.19-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 (c9f36f04a8a2 scsi: ufs: core: Add ufshcd_update_evt_hist() for UFS suspend error) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1 + + drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 ++ + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/sg.c | 20 +++++++++++++------- + drivers/ufs/core/ufshcd.c | 5 ++++- + 5 files changed, 21 insertions(+), 9 deletions(-) +Merging drm-fixes/drm-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (d3ecb12e2e04 mmc: sdhci-esdhc-imx: add alternate ARCH_S32 dependency to Kconfig) +$ 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 +- + drivers/mmc/host/Kconfig | 4 ++-- + drivers/mmc/host/sdhci-of-arasan.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (173d6f64f955 mshv: release mutex on region invalidation failure) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/hv/mshv_common.c | 2 ++ + drivers/hv/mshv_regions.c | 20 +++++++++++--------- + include/hyperv/hvgdk_mini.h | 7 +++++-- + 3 files changed, 18 insertions(+), 11 deletions(-) +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 (a05543d6b05b gpio: it87: balance superio enter/exit calls in error path) +$ 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/gpio-it87.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) +Merging gpio-intel-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (c33b68801fbe kunit: make FAULT_TEST default to n when PANIC_ON_OOPS) +$ 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 +Merge made by the 'ort' strategy. + lib/kunit/Kconfig | 2 +- + lib/kunit/device.c | 7 +++---- + 2 files changed, 4 insertions(+), 5 deletions(-) +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 (800ad1f0e277 perf tools: Disable BPF skeleton if no libopenssl found) +$ 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 +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 6 ++++-- + tools/build/feature/Makefile | 8 ++++++-- + tools/build/feature/test-all.c | 5 +++++ + tools/build/feature/test-libopenssl.c | 7 +++++++ + tools/perf/Makefile.config | 8 ++++++++ + 5 files changed, 30 insertions(+), 4 deletions(-) + create mode 100644 tools/build/feature/test-libopenssl.c +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 (8f0b4cce4481 Linux 6.19-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 (e6a973af1113 iommufd/selftest: Check for overflow in IOMMU_TEST_OP_ADD_RESERVED) +$ 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 (8f0b4cce4481 Linux 6.19-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 i2c-host-fixes/i2c/i2c-host-fixes (880977fdc7f6 dt-bindings: i2c: qcom-cci: Document SM8750 compatible) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml | 2 ++ + Documentation/devicetree/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-i801.c | 3 +++ + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + 8 files changed, 17 insertions(+), 4 deletions(-) +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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (39263f986da5 ftrace: Fix address for jmp mode in t_show()) +$ 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 (a51826582e8b 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 | 192 ++++++++++++++++++++-------------------- + arch/x86/include/asm/uv/bios.h | 2 +- + arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + include/linux/mm_types.h | 1 - + include/trace/events/tlb.h | 5 +- + kernel/irq/manage.c | 2 +- + 7 files changed, 104 insertions(+), 104 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (b58c87b0fde0 gpu: nova-core: gsp: replace firmware version with "bindings" alias) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + drivers/gpu/nova-core/Kconfig | 2 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 14 +-- + drivers/gpu/nova-core/gsp/fw.rs | 78 ++++++++-------- + drivers/gpu/nova-core/gsp/fw/r570_144.rs | 11 ++- + drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 105 ++++++++++++---------- + 6 files changed, 115 insertions(+), 99 deletions(-) +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 (6b991ad8dc3a drm/imagination: Disallow exporting of PM/FW protected objects) +$ 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 +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/aie2_pci.c | 6 + + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/imagination/pvr_gem.c | 11 ++ + drivers/gpu/drm/panel/Kconfig | 1 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 2 + + drivers/gpu/drm/tests/drm_atomic_state_test.c | 40 +++++- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 143 +++++++++++++++++++++ + 7 files changed, 204 insertions(+), 7 deletions(-) +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 (8f0b4cce4481 Linux 6.19-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 mm-stable/mm-stable (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (8f0b4cce4481 Linux 6.19-rc1) +$ 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 +Already up to date. +Merging mm-unstable/mm-unstable (edeb51ec1667 mm/hugetlb: fix excessive IPI broadcasts when unsharing PMD tables using mmu_gather) +$ 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 arch/arm64/mm/mmu.c +Auto-merging include/linux/mm_types.h +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 41 +- + arch/arm64/include/asm/thread_info.h | 3 +- + arch/arm64/mm/mmu.c | 8 +- + arch/arm64/mm/pageattr.c | 4 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 20 +- + arch/powerpc/include/asm/thread_info.h | 2 - + arch/powerpc/kernel/process.c | 25 - + arch/powerpc/mm/book3s64/hash_tlb.c | 14 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/tlbflush_64.h | 5 +- + arch/sparc/mm/tlb.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/boot/startup/sme.c | 1 + + arch/x86/include/asm/paravirt.h | 1 - + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/mmu_pv.c | 6 +- + fs/proc/base.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/asm-generic/tlb.h | 74 ++- + include/linux/hugetlb.h | 21 +- + include/linux/mm.h | 58 +- + include/linux/mm_types.h | 4 +- + include/linux/mm_types_task.h | 5 + + include/linux/oom.h | 12 +- + include/linux/percpu_counter_tree.h | 242 +++++++ + include/linux/pgtable.h | 158 ++++- + include/linux/sched.h | 45 ++ + include/trace/events/huge_memory.h | 3 +- + include/trace/events/kmem.h | 2 +- + init/main.c | 2 + + kernel/fork.c | 24 +- + lib/Makefile | 1 + + lib/alloc_tag.c | 5 +- + lib/percpu_counter_tree.c | 705 +++++++++++++++++++++ + mm/Kconfig | 19 + + mm/Makefile | 1 + + mm/damon/core.c | 20 +- + mm/hugetlb.c | 129 ++-- + mm/kasan/shadow.c | 8 +- + mm/khugepaged.c | 48 +- + mm/madvise.c | 18 +- + mm/memory.c | 16 +- + mm/migrate_device.c | 8 +- + mm/mmu_gather.c | 7 + + mm/mprotect.c | 6 +- + mm/mremap.c | 4 +- + mm/oom_kill.c | 72 ++- + mm/rmap.c | 45 +- + mm/shmem.c | 12 + + mm/tests/lazy_mmu_mode_kunit.c | 74 +++ + mm/userfaultfd.c | 4 +- + mm/vmalloc.c | 62 +- + mm/vmscan.c | 110 ++-- + 59 files changed, 1825 insertions(+), 366 deletions(-) + create mode 100644 include/linux/percpu_counter_tree.h + create mode 100644 lib/percpu_counter_tree.c + create mode 100644 mm/tests/lazy_mmu_mode_kunit.c +Merging mm-nonmm-unstable/mm-nonmm-unstable (bda39f9485fb fork-comment-fix: remove ambiguous question mark in CLONE_CHILD_CLEARTID comment) +$ 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 arch/arm64/net/bpf_jit_comp.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/trace/ftrace.c +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + .editorconfig | 2 - + Documentation/admin-guide/kernel-parameters.txt | 10 +- + Documentation/admin-guide/sysctl/kernel.rst | 2 +- + Documentation/core-api/liveupdate.rst | 11 + + MAINTAINERS | 3 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/include/asm/syscall.h | 2 - + arch/arm64/include/asm/syscall.h | 18 +- + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/kernel/setup.c | 1 + + arch/mips/rb532/devices.c | 1 + + arch/openrisc/configs/or1klitex_defconfig | 2 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 2 +- + arch/powerpc/kernel/btext.c | 1 + + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/s390/kernel/alternative.c | 1 + + arch/s390/kernel/stackprotector.c | 1 + + arch/um/drivers/vector_kern.c | 1 + + arch/xtensa/include/asm/syscall.h | 1 - + arch/xtensa/platforms/iss/network.c | 1 + + certs/blacklist.c | 1 + + crypto/asymmetric_keys/asymmetric_type.c | 1 + + crypto/asymmetric_keys/x509_public_key.c | 1 + + crypto/krb5/selftest.c | 1 + + drivers/atm/nicstar.c | 1 + + drivers/auxdisplay/hd44780_common.c | 1 + + drivers/auxdisplay/lcd2s.c | 1 + + drivers/block/floppy.c | 2 - + drivers/bus/moxtet.c | 1 + + drivers/char/tpm/tpm.h | 1 + + drivers/comedi/drivers/jr3_pci.c | 1 + + drivers/firmware/broadcom/bcm47xx_sprom.c | 1 + + drivers/gpio/gpio-macsmc.c | 1 + + drivers/gpu/drm/ci/arm.config | 2 +- + drivers/gpu/drm/ci/arm64.config | 2 +- + drivers/gpu/drm/ci/x86_64.config | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 1 + + drivers/hwmon/pmbus/q54sj108a2.c | 1 + + drivers/hwmon/pmbus/ucd9000.c | 1 + + drivers/infiniband/ulp/srp/ib_srp.c | 1 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + + drivers/input/touchscreen/iqs5xx.c | 1 + + drivers/md/dm-crypt.c | 1 + + drivers/md/dm-integrity.c | 1 + + drivers/md/dm-verity-target.c | 1 + + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 1 + + drivers/media/cec/usb/rainshadow/rainshadow-cec.c | 1 + + drivers/media/i2c/ccs/ccs-reg-access.c | 1 + + drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 1 + + drivers/misc/kgdbts.c | 1 + + drivers/misc/pch_phub.c | 1 + + drivers/net/bonding/bond_options.c | 1 + + drivers/net/can/can327.c | 1 + + drivers/net/can/slcan/slcan-core.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/common.h | 1 + + .../mellanox/mlx5/core/steering/sws/dr_dbg.c | 1 + + drivers/net/ethernet/micrel/ksz884x.c | 1 + + drivers/net/ethernet/pasemi/pasemi_mac.c | 1 + + drivers/net/netconsole.c | 1 + + drivers/net/netdevsim/dev.c | 1 + + drivers/net/usb/r8152.c | 1 + + drivers/net/usb/usbnet.c | 1 + + drivers/net/wireless/ath/ath6kl/debug.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 + + drivers/net/wireless/realtek/rtw89/debug.c | 1 + + drivers/net/wireless/silabs/wfx/fwio.c | 1 + + drivers/nvme/target/configfs.c | 1 + + drivers/nvme/target/core.c | 1 + + drivers/nvmem/brcm_nvram.c | 1 + + drivers/nvmem/layouts/u-boot-env.c | 1 + + drivers/platform/x86/intel/wmi/thunderbolt.c | 1 + + drivers/pnp/support.c | 1 + + drivers/ptp/ptp_pch.c | 1 + + drivers/rapidio/rio-scan.c | 2 +- + drivers/s390/cio/blacklist.c | 1 + + drivers/s390/crypto/ap_bus.c | 1 + + drivers/s390/crypto/zcrypt_cex4.c | 1 + + drivers/s390/virtio/virtio_ccw.c | 1 + + drivers/scsi/aacraid/rx.c | 1 + + drivers/scsi/ips.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 1 + + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1 + + drivers/scsi/scsi_transport_fc.c | 1 + + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 + + drivers/target/iscsi/iscsi_target_auth.c | 1 + + drivers/target/target_core_fabric_lib.c | 1 + + drivers/target/target_core_spc.c | 1 + + drivers/target/tcm_fc/tfc_conf.c | 1 + + drivers/thunderbolt/switch.c | 1 + + drivers/tty/vt/vt.c | 1 + + drivers/ufs/core/ufshcd.c | 1 + + drivers/usb/atm/speedtch.c | 1 + + drivers/usb/atm/ueagle-atm.c | 1 + + drivers/usb/gadget/function/u_ether.c | 1 + + drivers/usb/gadget/function/uvc_configfs.c | 1 + + drivers/usb/typec/ucsi/debugfs.c | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 1 + + drivers/watchdog/hpwdt.c | 1 + + fs/adfs/dir.c | 1 + + fs/binfmt_misc.c | 1 + + fs/ecryptfs/ecryptfs_kernel.h | 1 + + fs/efivarfs/vars.c | 1 + + fs/fat/cache.c | 4 +- + fs/fat/dir.c | 1 + + fs/fat/namei_vfat.c | 1 + + fs/gfs2/lock_dlm.c | 1 + + fs/nfsd/nfs4recover.c | 1 + + fs/ntfs3/ntfs_fs.h | 1 + + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/cluster/nodemanager.c | 8 +- + fs/ocfs2/export.c | 6 +- + fs/ocfs2/inode.c | 32 +- + fs/ocfs2/slot_map.c | 27 +- + fs/ocfs2/suballoc.c | 334 ++++++++++- + fs/ocfs2/xattr.c | 5 +- + fs/overlayfs/namei.c | 1 + + fs/proc/array.c | 1 + + fs/seq_file.c | 1 + + fs/udf/unicode.c | 1 + + include/asm-generic/atomic64.h | 2 +- + include/asm-generic/rqspinlock.h | 2 +- + include/linux/array_size.h | 6 + + include/linux/filter.h | 26 +- + include/linux/ftrace.h | 6 +- + include/linux/instrumented.h | 15 + + include/linux/kernel.h | 1 - + include/linux/kho/abi/luo.h | 81 +++ + include/linux/liveupdate.h | 143 +++++ + include/linux/module.h | 9 + + include/linux/ns/ns_common_types.h | 4 +- + include/linux/types.h | 2 +- + kernel/audit.c | 1 + + kernel/bpf/core.c | 5 +- + kernel/bpf/rqspinlock.c | 1 - + kernel/bpf/syscall.c | 1 + + kernel/crash_core.c | 17 +- + kernel/crash_dump_dm_crypt.c | 4 +- + kernel/debug/gdbstub.c | 1 + + kernel/fork.c | 2 +- + kernel/hung_task.c | 66 ++- + kernel/kallsyms.c | 73 ++- + kernel/kcsan/kcsan_test.c | 4 +- + 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/module/kallsyms.c | 9 +- + kernel/pid.c | 134 +++-- + kernel/trace/ftrace.c | 5 +- + kernel/vmcore_info.c | 6 +- + kernel/watchdog.c | 24 +- + lib/Kconfig.debug | 68 ++- + lib/Makefile | 1 - + lib/build_OID_registry | 26 +- + lib/hexdump.c | 1 + + lib/string_helpers.c | 1 + + lib/test_uuid.c | 134 ----- + lib/tests/Makefile | 2 + + lib/tests/liveupdate.c | 158 +++++ + lib/tests/uuid_kunit.c | 106 ++++ + lib/uuid.c | 1 + + lib/vsprintf.c | 1 + + mm/kfence/kfence_test.c | 4 +- + mm/kmemleak.c | 2 +- + mm/kmsan/kmsan_test.c | 2 +- + mm/memcontrol-v1.c | 4 +- + net/bridge/br_sysfs_br.c | 1 + + net/core/pktgen.c | 1 + + net/core/utils.c | 1 + + net/ipv4/arp.c | 1 + + net/mac80211/debugfs_netdev.c | 1 + + net/sunrpc/cache.c | 1 + + net/tipc/core.h | 1 + + security/integrity/evm/evm_crypto.c | 1 + + security/integrity/ima/ima_api.c | 1 + + security/ipe/digest.c | 1 + + security/keys/encrypted-keys/encrypted.c | 1 + + security/keys/trusted-keys/trusted_core.c | 1 + + security/keys/trusted-keys/trusted_tpm1.c | 1 + + security/loadpin/loadpin.c | 1 + + security/selinux/selinuxfs.c | 1 + + sound/pci/riptide/riptide.c | 1 + + sound/usb/6fire/firmware.c | 1 + + tools/testing/selftests/bpf/config | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 2 +- + 204 files changed, 2109 insertions(+), 385 deletions(-) + create mode 100644 kernel/liveupdate/luo_flb.c + delete mode 100644 lib/test_uuid.c + create mode 100644 lib/tests/liveupdate.c + create mode 100644 lib/tests/uuid_kunit.c +$ git am -3 ../patches/0001-Revert-atomic-add-option-for-weaker-alignment-check.patch +Applying: Revert "atomic: add option for weaker alignment check" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/instrumented.h +M lib/Kconfig.debug +$ git add -A . +$ git commit -v -a --amend +[master c0a917988d81] Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Dec 19 10:21:57 2025 +1100 +$ git am -3 ../patches/0002-Revert-atomic-add-alignment-check-to-instrumented-at.patch +Applying: Revert "atomic: add alignment check to instrumented atomic operations" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/instrumented.h +M lib/Kconfig.debug +$ git add -A . +$ git commit -v -a --amend +[master 851cceece6df] Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Dec 19 10:21:57 2025 +1100 +Merging kbuild/kbuild-next (a4df2071f1a2 modpost: drop '*_probe' from section check whitelist) +$ git merge -m Merge branch 'kbuild-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-next +Merge made by the 'ort' strategy. + scripts/mod/modpost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (074986379c03 Merge branch 'apple-soc/dt-6.20' 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. + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 ++++++ + arch/arm64/boot/dts/apple/t602x-die0.dtsi | 6 ++++++ + arch/arm64/boot/dts/apple/t8103.dtsi | 6 ++++++ + arch/arm64/boot/dts/apple/t8112.dtsi | 6 ++++++ + 4 files changed, 24 insertions(+) +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 (459a5aa171c0 ARM: dts: aspeed: bletchley: Fix ADC vref property names) +$ 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 + + arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts | 7 +- + .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 106 ++++----- + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 43 +++- + .../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 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 12 +- + 9 files changed, 374 insertions(+), 79 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 (8f0b4cce4481 Linux 6.19-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 (9805f2cfc883 dt-bindings: memory: SDRAM channel: standardise node name) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../memory-controllers/ddr/jedec,ddr4.yaml | 34 ++++++++ + .../memory-controllers/ddr/jedec,lpddr-props.yaml | 74 ----------------- + .../memory-controllers/ddr/jedec,lpddr2.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr4.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr5.yaml | 2 +- + ...lpddr-channel.yaml => jedec,sdram-channel.yaml} | 40 ++++++--- + .../memory-controllers/ddr/jedec,sdram-props.yaml | 94 ++++++++++++++++++++++ + drivers/memory/mtk-smi.c | 38 +++++---- + 9 files changed, 181 insertions(+), 107 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,ddr4.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-props.yaml + rename Documentation/devicetree/bindings/memory-controllers/ddr/{jedec,lpddr-channel.yaml => jedec,sdram-channel.yaml} (76%) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,sdram-props.yaml +Merging fsl/soc_fsl (c8dff80a3108 bus: fsl-mc: Convert to bus callbacks) +$ 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 (689a433e9d6b Merge branches 'arm32-fixes-for-6.19', 'arm64-defconfig-for-6.20', 'arm64-fixes-for-6.19', 'arm64-for-6.20', 'clk-fixes-for-6.19', 'clk-for-6.20' and 'drivers-for-6.20' 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 +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 13 + + .../devicetree/bindings/cache/qcom,llcc.yaml | 47 +- + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + .../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/Makefile | 4 + + arch/arm64/boot/dts/qcom/glymur-ipcc.h | 68 + + arch/arm64/boot/dts/qcom/hamoa.dtsi | 26 + + arch/arm64/boot/dts/qcom/kaanapali-ipcc.h | 58 + + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 754 +++++ + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 712 ++++ + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 1606 +++++++++ + 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 +- + .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts | 1515 +++++++++ + arch/arm64/configs/defconfig | 4 + + drivers/clk/qcom/Kconfig | 17 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/clk-rpmh.c | 60 +- + drivers/clk/qcom/gcc-glymur.c | 4 +- + drivers/clk/qcom/gcc-kaanapali.c | 3541 ++++++++++++++++++++ + drivers/clk/qcom/gcc-milos.c | 6 +- + drivers/clk/qcom/gcc-qdu1000.c | 4 +- + drivers/clk/qcom/gcc-sdx75.c | 4 +- + drivers/clk/qcom/gcc-sm4450.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 4 +- + drivers/clk/qcom/gcc-sm8750.c | 4 +- + drivers/clk/qcom/gcc-x1e80100.c | 4 +- + drivers/clk/qcom/tcsrcc-kaanapali.c | 141 + + drivers/firmware/qcom/qcom_scm.c | 1 + + drivers/pmdomain/qcom/rpmhpd.c | 4 + + drivers/soc/qcom/llcc-qcom.c | 207 ++ + drivers/soc/qcom/smem.c | 4 +- + include/dt-bindings/power/qcom,rpmhpd.h | 1 + + include/linux/soc/qcom/llcc-qcom.h | 4 + + 49 files changed, 8869 insertions(+), 143 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/glymur-ipcc.h + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-ipcc.h + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-qrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts + create mode 100644 drivers/clk/qcom/gcc-kaanapali.c + create mode 100644 drivers/clk/qcom/tcsrcc-kaanapali.c +Merging renesas/next (fec0b9c25cfb Merge branches 'renesas-arm-defconfig-for-v6.20' and 'renesas-dts-for-v6.20' 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 6 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 30 ++ + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 11 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 350 +++++++++++++++++++++ + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 28 ++ + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 60 ++++ + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 30 ++ + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 72 +++++ + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 3 + + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 72 +++++ + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 3 + + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 8 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 11 + + arch/arm64/configs/defconfig | 2 + + 16 files changed, 755 insertions(+), 1 deletion(-) +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 (4a4070c80fe6 Merge branch 'v6.20-armsoc/dts64' 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. + arch/arm/boot/dts/rockchip/rk3288.dtsi | 17 +++++++++++- + arch/arm64/boot/dts/rockchip/Makefile | 5 ++++ + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 10 +++++-- + .../boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso | 31 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 23 ++++++++++++++++ + 5 files changed, 83 insertions(+), 3 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso +Merging samsung-krzk/for-next (cb4cfbcf2764 Merge branch 'next/dt64' 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. + .../bindings/rng/samsung,exynos5250-trng.yaml | 13 ++++++-- + .../bindings/soc/samsung/exynos-pmu.yaml | 4 ++- + arch/arm/boot/dts/samsung/s3c6400.dtsi | 38 ---------------------- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 11 ++++++- + 4 files changed, 23 insertions(+), 43 deletions(-) + delete mode 100644 arch/arm/boot/dts/samsung/s3c6400.dtsi +Merging scmi/for-linux-next (98675bc92a9e Merge branches 'for-next/juno/updates', 'for-next/ffa/updates' and 'for-next/scmi/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. + arch/arm64/boot/dts/arm/morello-sdp.dts | 7 +++ + drivers/firmware/arm_ffa/driver.c | 48 +++++++++++--- + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/arm_scmi/pinctrl.c | 108 ++++++++++++++------------------ + drivers/firmware/arm_scmi/reset.c | 50 ++++++++++----- + drivers/firmware/arm_scmi/shmem.c | 5 +- + 6 files changed, 131 insertions(+), 89 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 +Already up to date. +Merging tee/next (e8fd8a160bbb Merge branch 'tee_bus_callback_for_6.20' 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. + Documentation/driver-api/tee.rst | 18 ++------- + drivers/rtc/rtc-optee.c | 27 ++++--------- + drivers/tee/tee_core.c | 84 ++++++++++++++++++++++++++++++++++++++++ + include/linux/tee_drv.h | 12 ++++++ + 4 files changed, 106 insertions(+), 35 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (109d58039d30 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. + arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 8 ++++++ + arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 8 ++++++ + arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi | 2 +- + .../ti/k3-am642-phyboard-electra-peb-c-010.dtso | 7 ++---- + ...m642-phyboard-electra-x27-gpio1-spi1-uart3.dtso | 8 +++--- + arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4 +-- + arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4 +-- + drivers/firmware/ti_sci.h | 29 ++++++++++++---------- + 9 files changed, 44 insertions(+), 28 deletions(-) +Merging xilinx/for-next (43da9849395e Merge remote-tracking branch 'git/zynqmp/dt' 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. + .../bindings/watchdog/xlnx,versal-wwdt.yaml | 3 ++ + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 4 +-- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 25 ++++++------- + arch/arm64/configs/defconfig | 42 ++++++++++++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 6 ++-- + 6 files changed, 61 insertions(+), 21 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 (d8921e42a198 clk: renesas: r9a09g056: Add entries for the RSPIs) +$ 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 +Merge made by the 'ort' strategy. + drivers/clk/renesas/r9a09g056-cpg.c | 46 +++++ + drivers/clk/renesas/r9a09g077-cpg.c | 195 ++++++++++++++++++++- + drivers/clk/renesas/rzg2l-cpg.c | 6 +- + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 2 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 2 + + 5 files changed, 244 insertions(+), 7 deletions(-) +Merging thead-clk/thead-clk-for-next (30441a56b1d1 clk: thead: th1520-ap: Support CPU frequency scaling) +$ 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 +Merge made by the 'ort' strategy. + drivers/clk/thead/clk-th1520-ap.c | 350 +++++++++++++++++++++++- + include/dt-bindings/clock/thead,th1520-clk-ap.h | 1 + + 2 files changed, 344 insertions(+), 7 deletions(-) +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 +Already up to date. +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (7e40c6791cc8 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 c6a42e04f0be] 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 (ca4a4090a9bb Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging drivers/s390/crypto/ap_bus.c +Merge made by the 'ort' strategy. + arch/s390/boot/Makefile | 1 + + arch/s390/include/asm/ptrace.h | 37 ++++++++++++++++++++++++++----------- + arch/s390/purgatory/Makefile | 1 + + drivers/s390/crypto/ap_bus.c | 12 ++++++------ + drivers/s390/crypto/zcrypt_api.c | 2 +- + 5 files changed, 35 insertions(+), 18 deletions(-) +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 (0d4b3ca115b5 xtensa: align: validate access in fast_load_store) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/align.S | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fs-next (e9fad83f1229 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/fat/dir.c +Auto-merging fs/gfs2/lock_dlm.c +Auto-merging kernel/pid.c +CONFLICT (content): Merge conflict in kernel/pid.c +Resolved 'kernel/pid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f271e6e7ce7] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/f2fs.rst | 43 +++ + Documentation/filesystems/locking.rst | 8 - + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/porting.rst | 7 +- + Documentation/filesystems/vfs.rst | 58 +--- + arch/arm/configs/neponset_defconfig | 2 +- + fs/btrfs/Kconfig | 9 +- + fs/btrfs/bio.c | 19 +- + fs/btrfs/bio.h | 16 +- + fs/btrfs/block-group.c | 11 +- + fs/btrfs/compression.c | 1 - + fs/btrfs/ctree.c | 49 ++- + fs/btrfs/ctree.h | 9 + + fs/btrfs/defrag.c | 5 +- + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/direct-io.c | 29 +- + fs/btrfs/disk-io.c | 87 ++---- + fs/btrfs/extent-io-tree.c | 7 +- + fs/btrfs/extent-tree.c | 80 +++-- + fs/btrfs/extent_io.c | 70 +++-- + fs/btrfs/file-item.c | 4 - + fs/btrfs/file.c | 9 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/fs.c | 102 ++++++- + fs/btrfs/fs.h | 23 +- + fs/btrfs/inode-item.c | 7 +- + fs/btrfs/inode.c | 338 +++++++++++++-------- + fs/btrfs/messages.c | 26 +- + fs/btrfs/messages.h | 76 ++--- + fs/btrfs/qgroup.c | 103 +++++-- + fs/btrfs/relocation.c | 5 +- + fs/btrfs/root-tree.c | 47 ++- + fs/btrfs/scrub.c | 39 +-- + fs/btrfs/space-info.c | 18 +- + fs/btrfs/space-info.h | 16 + + fs/btrfs/super.c | 29 +- + fs/btrfs/sysfs.c | 58 +--- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/volumes.c | 19 +- + fs/btrfs/zoned.c | 55 ++++ + fs/btrfs/zoned.h | 8 + + fs/buffer.c | 6 +- + fs/char_dev.c | 2 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/erofs/decompressor_crypto.c | 2 +- + fs/erofs/zdata.c | 4 +- + fs/exec.c | 2 +- + fs/exfat/namei.c | 4 +- + fs/ext4/extents.c | 137 +++++---- + fs/ext4/extents_status.c | 124 ++++++-- + fs/ext4/inode.c | 18 +- + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/data.c | 248 ++++++++++++++- + fs/f2fs/f2fs.h | 16 + + fs/f2fs/file.c | 4 + + fs/f2fs/gc.c | 2 +- + fs/f2fs/inode.c | 6 +- + fs/f2fs/segment.h | 99 +++--- + fs/fat/dir.c | 4 +- + fs/fat/file.c | 3 +- + fs/fs_context.c | 208 +------------ + fs/fsopen.c | 10 - + fs/fuse/dev.c | 2 +- + fs/fuse/file.c | 8 +- + fs/gfs2/glock.c | 85 +++--- + fs/gfs2/glock.h | 6 +- + fs/gfs2/glops.c | 34 +-- + fs/gfs2/incore.h | 16 +- + fs/gfs2/lock_dlm.c | 28 +- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 70 +++-- + fs/gfs2/lops.h | 4 +- + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/quota.c | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trace_gfs2.h | 48 +-- + fs/gfs2/trans.c | 4 +- + fs/init.c | 14 - + fs/internal.h | 1 - + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 +- + fs/locks.c | 14 +- + fs/namei.c | 80 ++++- + fs/namespace.c | 102 ++++--- + fs/nfsd/nfs4proc.c | 11 +- + fs/open.c | 39 --- + fs/splice.c | 2 +- + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/libxfs/xfs_sb.c | 15 + + fs/xfs/scrub/attr_repair.c | 2 +- + fs/xfs/xfs_attr_item.c | 29 +- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 20 +- + fs/xfs/xfs_discard.c | 27 +- + fs/xfs/xfs_discard.h | 2 +- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_file.c | 58 +++- + 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_rtalloc.c | 14 +- + fs/xfs/xfs_trans.h | 4 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 5 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 - + include/linux/initrd.h | 2 - + include/trace/events/f2fs.h | 12 +- + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/sysctl.h | 1 - + init/do_mounts.c | 11 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +------ + init/do_mounts_rd.c | 24 +- + kernel/pid.c | 19 +- + net/ceph/messenger_v2.c | 2 + + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 +++++++++++++++- + .../filesystems/statmount/statmount_test_ns.c | 101 +++++- + 136 files changed, 2502 insertions(+), 1943 deletions(-) +Merging printk/for-next (34793812e592 Merge branch 'rework/atomic-flush-softlockup' 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. + kernel/printk/nbcon.c | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) +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 (6a2817432628 i2c: designware: Add dedicated algorithm for AMD NAVI) +$ 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. + drivers/i2c/busses/i2c-designware-master.c | 27 +++++++++++++++------------ + drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++-- + 2 files changed, 17 insertions(+), 14 deletions(-) +Merging i3c/i3c/next (136209e6bd98 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 +Already up to date. +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 (1d9d442ab179 hwmon: (fam15h_power) Use generic power management) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/hwmon/microchip,sparx5-temp.yaml | 8 ++++++-- + Documentation/hwmon/asus_ec_sensors.rst | 2 ++ + Documentation/hwmon/sht3x.rst | 18 +++++++++++++----- + Documentation/hwmon/submitting-patches.rst | 5 ++++- + drivers/hwmon/Kconfig | 4 ++-- + drivers/hwmon/asus-ec-sensors.c | 12 ++++++++++++ + drivers/hwmon/fam15h_power.c | 11 +++++------ + drivers/hwmon/sht3x.c | 1 + + 8 files changed, 45 insertions(+), 16 deletions(-) +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 (b70886ff5833 media: vb2: drop wait_prepare/finish callbacks) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Merge made by the 'ort' strategy. + Documentation/driver-api/media/v4l2-dev.rst | 8 ++-- + Documentation/userspace-api/media/conf_nitpick.py | 2 - + drivers/media/common/videobuf2/videobuf2-core.c | 49 +++++------------------ + drivers/media/common/videobuf2/videobuf2-v4l2.c | 14 ------- + drivers/media/dvb-core/dmxdev.c | 46 +++++++++------------ + drivers/media/dvb-core/dvb_vb2.c | 45 +++++++-------------- + include/media/dvb_vb2.h | 17 ++++---- + include/media/videobuf2-core.h | 23 +++-------- + include/media/videobuf2-v4l2.h | 18 --------- + 9 files changed, 62 insertions(+), 160 deletions(-) +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 (5c062ebfa076 Merge branch 'fixes' 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. + Documentation/power/runtime_pm.rst | 7 +-- + drivers/acpi/acpi_pnp.c | 19 +----- + drivers/acpi/device_pm.c | 3 +- + drivers/acpi/nfit/core.c | 47 +++++++++------ + drivers/acpi/pci_root.c | 2 +- + drivers/acpi/scan.c | 120 +++++++++++++++++++++++++++++++++++-- + drivers/base/power/main.c | 7 ++- + drivers/cpufreq/cpufreq.c | 13 ++-- + drivers/pci/pci-acpi.c | 15 ++--- + drivers/platform/x86/intel/hid.c | 41 +------------ + drivers/platform/x86/intel/vbtn.c | 30 +--------- + include/linux/pci-acpi.h | 3 +- + kernel/power/main.c | 2 +- + 13 files changed, 171 insertions(+), 138 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (f98c414030d2 dt-bindings: cpufreq: qcom-hw: document Milos CPUFREQ Hardware) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 ++ + rust/helpers/cpufreq.c | 3 ++- + rust/kernel/cpufreq.rs | 2 ++ + 3 files changed, 6 insertions(+), 1 deletion(-) +Merging cpupower/cpupower (ff72619e1134 tools/power cpupower: Show C0 in idle-info dump) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/lib/cpuidle.c | 7 +++---- + tools/power/cpupower/utils/cpufreq-info.c | 2 +- + tools/power/cpupower/utils/cpuidle-info.c | 2 +- + tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +- + 4 files changed, 6 insertions(+), 7 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (ec439c380135 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1) +$ 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 +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/syscall.c +Merge made by the 'ort' strategy. + include/linux/bpf.h | 16 ++ + include/uapi/linux/bpf.h | 17 ++ + kernel/bpf/bpf_iter.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 88 ++++++++++ + kernel/bpf/core.c | 3 + + kernel/bpf/cpumap.c | 21 ++- + kernel/bpf/syscall.c | 46 +++++ + kernel/bpf/verifier.c | 26 +-- + tools/include/uapi/linux/bpf.h | 17 ++ + tools/lib/bpf/bpf.c | 19 ++ + tools/lib/bpf/bpf.h | 21 +++ + tools/lib/bpf/btf.c | 29 +++- + tools/lib/bpf/libbpf.c | 62 +++++-- + tools/lib/bpf/libbpf.h | 16 ++ + tools/lib/bpf/libbpf.map | 2 + + .../bpf/prog_tests/test_struct_ops_assoc.c | 191 +++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/verifier.c | 4 + + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 19 +- + .../testing/selftests/bpf/progs/struct_ops_assoc.c | 105 +++++++++++ + .../bpf/progs/struct_ops_assoc_in_timer.c | 77 +++++++++ + .../selftests/bpf/progs/struct_ops_assoc_reuse.c | 75 ++++++++ + .../selftests/bpf/progs/verifier_arena_globals1.c | 87 ++++++++++ + .../selftests/bpf/progs/verifier_arena_globals2.c | 49 ++++++ + .../selftests/bpf/progs/verifier_arena_large.c | 21 ++- + .../testing/selftests/bpf/progs/verifier_subreg.c | 68 ++++++++ + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 17 ++ + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 1 + + .../selftests/bpf/verifier/direct_value_access.c | 4 +- + 28 files changed, 1052 insertions(+), 51 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_assoc.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc_in_timer.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc_reuse.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_globals1.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_globals2.c +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 (98246938a0e6 Bluetooth: L2CAP: Add support for setting BT_PHY) +$ 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/btmtksdio.c | 8 +- + drivers/bluetooth/btusb.c | 14 +- + drivers/bluetooth/hci_bcm4377.c | 11 +- + drivers/bluetooth/hci_qca.c | 33 ++++ + include/net/bluetooth/bluetooth.h | 39 +++-- + include/net/bluetooth/hci.h | 332 ++++++++++++++++++++++++++++++++++++++ + include/net/bluetooth/hci_core.h | 9 ++ + include/net/bluetooth/hci_sync.h | 3 + + net/bluetooth/hci_conn.c | 127 ++++++++++++++- + net/bluetooth/hci_event.c | 56 ++++++- + net/bluetooth/hci_sync.c | 89 +++++++++- + net/bluetooth/l2cap_sock.c | 20 ++- + net/bluetooth/mgmt.c | 6 + + net/bluetooth/mgmt_config.c | 21 +++ + 14 files changed, 725 insertions(+), 43 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 (631ee338f04d Merge branch 'ath12k-ng' into ath-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/Makefile | 8 +- + drivers/net/wireless/ath/ath12k/ahb.c | 171 +- + drivers/net/wireless/ath/ath12k/ahb.h | 31 +- + drivers/net/wireless/ath/ath12k/ce.c | 326 +- + drivers/net/wireless/ath/ath12k/ce.h | 7 +- + drivers/net/wireless/ath/ath12k/cmn_defs.h | 20 + + drivers/net/wireless/ath/ath12k/core.c | 75 +- + drivers/net/wireless/ath/ath12k/core.h | 176 +- + drivers/net/wireless/ath/ath12k/dbring.c | 6 +- + drivers/net/wireless/ath/ath12k/debug.c | 8 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 8 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 4 +- + drivers/net/wireless/ath/ath12k/debugfs_sta.c | 62 +- + drivers/net/wireless/ath/ath12k/dp.c | 563 +--- + drivers/net/wireless/ath/ath12k/dp.h | 1752 ++-------- + drivers/net/wireless/ath/ath12k/dp_cmn.h | 106 + + drivers/net/wireless/ath/ath12k/dp_htt.c | 1353 ++++++++ + drivers/net/wireless/ath/ath12k/dp_htt.h | 1546 +++++++++ + drivers/net/wireless/ath/ath12k/dp_mon.c | 3517 +------------------- + drivers/net/wireless/ath/ath12k/dp_mon.h | 58 +- + drivers/net/wireless/ath/ath12k/dp_peer.c | 690 ++++ + drivers/net/wireless/ath/ath12k/dp_peer.h | 182 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 3482 ++----------------- + drivers/net/wireless/ath/ath12k/dp_rx.h | 191 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 1638 +-------- + drivers/net/wireless/ath/ath12k/dp_tx.h | 39 +- + drivers/net/wireless/ath/ath12k/hal.c | 2258 ++----------- + drivers/net/wireless/ath/ath12k/hal.h | 1475 ++++---- + drivers/net/wireless/ath/ath12k/htc.c | 3 +- + drivers/net/wireless/ath/ath12k/hw.c | 1680 ---------- + drivers/net/wireless/ath/ath12k/hw.h | 94 +- + drivers/net/wireless/ath/ath12k/mac.c | 1076 +++--- + drivers/net/wireless/ath/ath12k/mac.h | 139 +- + drivers/net/wireless/ath/ath12k/mhi.c | 132 +- + drivers/net/wireless/ath/ath12k/mhi.h | 5 +- + drivers/net/wireless/ath/ath12k/pci.c | 241 +- + drivers/net/wireless/ath/ath12k/pci.h | 42 +- + drivers/net/wireless/ath/ath12k/peer.c | 453 +-- + drivers/net/wireless/ath/ath12k/peer.h | 112 +- + drivers/net/wireless/ath/ath12k/testmode.c | 3 +- + drivers/net/wireless/ath/ath12k/wifi7/Makefile | 19 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 75 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/ce.c | 973 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/ce.h | 22 + + drivers/net/wireless/ath/ath12k/wifi7/core.c | 68 + + drivers/net/wireless/ath/ath12k/wifi7/core.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/dp.c | 181 + + drivers/net/wireless/ath/ath12k/wifi7/dp.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 3385 +++++++++++++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h | 23 + + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 2202 ++++++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h | 59 + + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c | 978 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h | 16 + + drivers/net/wireless/ath/ath12k/wifi7/hal.c | 705 ++++ + drivers/net/wireless/ath/ath12k/wifi7/hal.h | 564 ++++ + .../net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h | 298 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.c | 1032 ++++++ + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.h | 45 + + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c | 221 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h | 422 +-- + .../ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} | 55 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c | 23 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h | 30 +- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 805 +++++ + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.h | 39 + + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 945 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/hw.h | 13 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.c | 138 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/pci.c | 191 ++ + drivers/net/wireless/ath/ath12k/wifi7/pci.h | 12 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.c | 105 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.h | 15 + + drivers/net/wireless/ath/ath12k/wmi.c | 138 +- + drivers/net/wireless/ath/ath12k/wmi.h | 7 +- + drivers/net/wireless/ath/ath12k/wow.c | 5 +- + 78 files changed, 20196 insertions(+), 17407 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath12k/cmn_defs.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_cmn.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.h + delete mode 100644 drivers/net/wireless/ath/ath12k/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/Makefile + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h (91%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c (84%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h (75%) + rename drivers/net/wireless/ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} (97%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c (87%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h (88%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.h +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (a75a1dec037f mtd: spinand: add support for Dosilicon DS35Q1GA/DS35M1GA) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/Makefile | 4 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/dosilicon.c | 91 ++++++++++++++++++++++++++++++++++++++++ + include/linux/mtd/spinand.h | 1 + + 4 files changed, 95 insertions(+), 2 deletions(-) + create mode 100644 drivers/mtd/nand/spi/dosilicon.c +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 (325c29e7d11c lib/crypto: md5: Use rol32() instead of open-coding it) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 5 - + arch/arm/crypto/Kconfig | 10 - + arch/arm/crypto/Makefile | 2 - + arch/arm/crypto/nhpoly1305-neon-glue.c | 80 - + arch/arm64/crypto/Kconfig | 10 - + arch/arm64/crypto/Makefile | 3 - + arch/arm64/crypto/nhpoly1305-neon-glue.c | 79 - + arch/x86/crypto/Kconfig | 20 - + arch/x86/crypto/Makefile | 5 - + arch/x86/crypto/nhpoly1305-avx2-glue.c | 81 - + arch/x86/crypto/nhpoly1305-sse2-glue.c | 80 - + crypto/Kconfig | 8 +- + crypto/Makefile | 1 - + crypto/adiantum.c | 460 ++--- + crypto/nhpoly1305.c | 255 --- + crypto/testmgr.c | 10 +- + crypto/testmgr.h | 1372 -------------- + include/crypto/mldsa.h | 60 + + include/crypto/nh.h | 52 + + include/crypto/nhpoly1305.h | 74 - + lib/crypto/Kconfig | 20 + + lib/crypto/Makefile | 16 + + {arch/arm/crypto => lib/crypto/arm}/nh-neon-core.S | 0 + lib/crypto/arm/nh.h | 33 + + .../crypto => lib/crypto/arm64}/nh-neon-core.S | 3 +- + lib/crypto/arm64/nh.h | 34 + + lib/crypto/md5.c | 2 +- + lib/crypto/mldsa.c | 652 +++++++ + lib/crypto/nh.c | 82 + + lib/crypto/tests/Kconfig | 17 + + lib/crypto/tests/Makefile | 2 + + lib/crypto/tests/mldsa-testvecs.h | 1887 ++++++++++++++++++++ + lib/crypto/tests/mldsa_kunit.c | 438 +++++ + lib/crypto/tests/nh-testvecs.h | 298 ++++ + lib/crypto/tests/nh_kunit.c | 43 + + .../nh-avx2-x86_64.S => lib/crypto/x86/nh-avx2.S | 3 +- + .../nh-sse2-x86_64.S => lib/crypto/x86/nh-sse2.S | 3 +- + lib/crypto/x86/nh.h | 45 + + scripts/crypto/gen-hash-testvecs.py | 40 + + 39 files changed, 3978 insertions(+), 2307 deletions(-) + delete mode 100644 arch/arm/crypto/nhpoly1305-neon-glue.c + delete mode 100644 arch/arm64/crypto/nhpoly1305-neon-glue.c + delete mode 100644 arch/x86/crypto/nhpoly1305-avx2-glue.c + delete mode 100644 arch/x86/crypto/nhpoly1305-sse2-glue.c + delete mode 100644 crypto/nhpoly1305.c + create mode 100644 include/crypto/mldsa.h + create mode 100644 include/crypto/nh.h + delete mode 100644 include/crypto/nhpoly1305.h + rename {arch/arm/crypto => lib/crypto/arm}/nh-neon-core.S (100%) + create mode 100644 lib/crypto/arm/nh.h + rename {arch/arm64/crypto => lib/crypto/arm64}/nh-neon-core.S (97%) + create mode 100644 lib/crypto/arm64/nh.h + create mode 100644 lib/crypto/mldsa.c + create mode 100644 lib/crypto/nh.c + create mode 100644 lib/crypto/tests/mldsa-testvecs.h + create mode 100644 lib/crypto/tests/mldsa_kunit.c + create mode 100644 lib/crypto/tests/nh-testvecs.h + create mode 100644 lib/crypto/tests/nh_kunit.c + rename arch/x86/crypto/nh-avx2-x86_64.S => lib/crypto/x86/nh-avx2.S (98%) + rename arch/x86/crypto/nh-sse2-x86_64.S => lib/crypto/x86/nh-sse2.S (97%) + create mode 100644 lib/crypto/x86/nh.h +Merging drm/drm-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (332070795bd9 accel/amdxdna: Enable hardware context priority) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/accel/amdxdna/aie2_pci.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Merge made by the 'ort' strategy. + .../bindings/display/bridge/renesas,dsi.yaml | 120 ++- + .../bindings/display/panel/lg,sw43408.yaml | 13 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/samsung,s6e3fc2x01.yaml | 20 +- + .../display/rockchip/rockchip,dw-hdmi.yaml | 1 + + .../bindings/display/sitronix,st7571.yaml | 25 + + .../bindings/display/sitronix,st7920.yaml | 58 ++ + Documentation/gpu/drm-mm.rst | 29 +- + Documentation/gpu/todo.rst | 45 + + Documentation/process/debugging/kgdb.rst | 28 - + MAINTAINERS | 10 + + drivers/accel/amdxdna/Makefile | 1 - + drivers/accel/amdxdna/aie2_ctx.c | 18 +- + drivers/accel/amdxdna/aie2_message.c | 92 +- + drivers/accel/amdxdna/aie2_msg_priv.h | 8 +- + drivers/accel/amdxdna/aie2_pci.c | 2 +- + drivers/accel/amdxdna/aie2_pci.h | 4 + + drivers/accel/amdxdna/aie2_pm.c | 17 +- + drivers/accel/amdxdna/aie2_psp.c | 15 + + drivers/accel/amdxdna/aie2_smu.c | 27 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 1 + + drivers/accel/amdxdna/amdxdna_mailbox.c | 46 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 30 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 2 - + drivers/accel/amdxdna/amdxdna_pm.c | 22 +- + drivers/accel/amdxdna/npu1_regs.c | 2 + + drivers/accel/amdxdna/npu2_regs.c | 115 --- + drivers/accel/amdxdna/npu4_regs.c | 3 + + drivers/accel/amdxdna/npu5_regs.c | 2 + + drivers/accel/amdxdna/npu6_regs.c | 2 + + drivers/accel/ivpu/ivpu_gem.c | 2 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 20 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 5 +- + drivers/dma-buf/Kconfig | 2 +- + drivers/dma-buf/dma-buf.c | 128 ++- + drivers/dma-buf/dma-fence.c | 100 +- + drivers/dma-buf/st-dma-fence.c | 55 +- + drivers/gpu/drm/Kconfig | 213 ++--- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +- + drivers/gpu/drm/ast/ast_cursor.c | 83 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 86 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/drm_atomic.c | 1 + + drivers/gpu/drm/drm_bridge.c | 62 ++ + drivers/gpu/drm/drm_fb_helper.c | 108 --- + drivers/gpu/drm/drm_gem.c | 203 +++- + drivers/gpu/drm/drm_gem_shmem_helper.c | 86 +- + drivers/gpu/drm/drm_panic.c | 77 +- + drivers/gpu/drm/drm_plane.c | 4 +- + drivers/gpu/drm/drm_syncobj.c | 65 +- + drivers/gpu/drm/drm_vblank.c | 52 +- + drivers/gpu/drm/hyperv/Kconfig | 14 + + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 71 -- + drivers/gpu/drm/i915/gem/i915_gemfs.h | 14 - + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 15 +- + drivers/gpu/drm/i915/i915_drv.h | 5 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 24 +- + drivers/gpu/drm/panel/Kconfig | 13 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 3 + + drivers/gpu/drm/panel/panel-lg-sw43408.c | 64 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 175 ++-- + drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c | 179 ++++ + drivers/gpu/drm/panel/panel-simple.c | 28 + + drivers/gpu/drm/panfrost/panfrost_device.c | 3 + + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 107 ++- + drivers/gpu/drm/panfrost/panfrost_drv.h | 9 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 257 +++++ + drivers/gpu/drm/panfrost/panfrost_gem.h | 12 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 26 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 10 +- + drivers/gpu/drm/panthor/panthor_device.c | 13 +- + drivers/gpu/drm/panthor/panthor_drv.c | 89 +- + drivers/gpu/drm/panthor/panthor_drv.h | 9 + + drivers/gpu/drm/panthor/panthor_fw.c | 8 +- + drivers/gpu/drm/panthor/panthor_gem.c | 258 ++++- + drivers/gpu/drm/panthor/panthor_gem.h | 8 + + drivers/gpu/drm/panthor/panthor_gpu.c | 21 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 314 +++--- + drivers/gpu/drm/panthor/panthor_sched.c | 256 ++--- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 29 +- + drivers/gpu/drm/pl111/pl111_nomadik.c | 4 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 4 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 53 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 74 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 23 +- + drivers/gpu/drm/radeon/radeon_mode.h | 10 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 453 +++++++++ + .../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 34 + + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 + + drivers/gpu/drm/scheduler/sched_main.c | 40 +- + drivers/gpu/drm/sitronix/Kconfig | 48 +- + drivers/gpu/drm/sitronix/Makefile | 3 + + drivers/gpu/drm/sitronix/st7571-i2c.c | 1003 +------------------- + drivers/gpu/drm/sitronix/st7571-spi.c | 76 ++ + drivers/gpu/drm/sitronix/st7571.c | 918 ++++++++++++++++++ + drivers/gpu/drm/sitronix/st7571.h | 91 ++ + drivers/gpu/drm/sitronix/st7920.c | 867 +++++++++++++++++ + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 64 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 57 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +- + drivers/gpu/drm/ttm/ttm_device.c | 5 +- + drivers/gpu/drm/ttm/ttm_pool.c | 26 +- + drivers/gpu/drm/ttm/ttm_resource.c | 14 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/v3d/Makefile | 3 +- + drivers/gpu/drm/v3d/v3d_bo.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_gem.c | 21 +- + drivers/gpu/drm/v3d/v3d_gemfs.c | 62 -- + drivers/gpu/drm/vgem/Kconfig | 9 + + drivers/gpu/drm/xe/xe_hw_fence.c | 4 +- + drivers/video/fbdev/core/fbcon.c | 24 - + drivers/video/fbdev/core/fbcon.h | 1 - + include/drm/drm_atomic.h | 5 + + include/drm/drm_bridge.h | 12 + + include/drm/drm_device.h | 15 + + include/drm/drm_fb_helper.h | 21 - + include/drm/drm_file.h | 7 +- + include/drm/drm_gem.h | 45 +- + include/drm/drm_gem_shmem_helper.h | 3 - + include/drm/drm_modeset_helper_vtables.h | 23 - + include/drm/drm_vblank.h | 3 +- + include/drm/gpu_scheduler.h | 52 + + include/linux/dma-fence.h | 35 +- + include/linux/fb.h | 4 - + include/trace/events/dma_buf.h | 157 +++ + include/uapi/drm/amdxdna_accel.h | 8 + + include/uapi/drm/panfrost_drm.h | 76 +- + include/uapi/drm/panthor_drm.h | 157 ++- + 142 files changed, 6078 insertions(+), 2928 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7920.yaml + delete mode 100644 drivers/accel/amdxdna/npu2_regs.c + create mode 100644 drivers/gpu/drm/hyperv/Kconfig + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.c + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + create mode 100644 drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_drv.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.h + create mode 100644 drivers/gpu/drm/sitronix/st7571-spi.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.h + create mode 100644 drivers/gpu/drm/sitronix/st7920.c + delete mode 100644 drivers/gpu/drm/v3d/v3d_gemfs.c + create mode 100644 drivers/gpu/drm/vgem/Kconfig + create mode 100644 include/trace/events/dma_buf.h +Merging amdgpu/drm-next (0a54edc19158 drm/radeon: Convert legacy DRM logging in evergreen.c to drm_* helpers) +$ 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/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_queue.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.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 | 128 +- + 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 | 347 +- + 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_doorbell_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + 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_ip.c | 315 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 125 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 35 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + 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 | 131 +- + 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 | 22 +- + 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 | 3991 ++ + 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 | 879 + + 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 | 128 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 603 + + 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 | 65 +- + 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 | 1890 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 916 + + 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/vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/Makefile | 3 + + 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 | 9 +- + 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_flat_memory.c | 10 +- + 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 | 63 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 33 +- + 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 | 7 + + 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 | 575 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 22 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 31 +- + drivers/gpu/drm/amd/display/dc/dc.h | 89 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 18 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 31 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + + .../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 | 18 +- + .../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/dml21/dml21_utils.c | 3 +- + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h | 7 +- + .../dml2_0/dml21/inc/dml_top_display_cfg_types.h | 1 + + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 5 +- + .../dml21/src/dml2_core/dml2_core_shared_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 + + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.h | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 9 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 96 +- + .../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 | 30 +- + .../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 | 18 +- + 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 | 23 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 290 +- + .../display/dc/link/protocols/link_dp_capability.c | 9 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 180 +- + .../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 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 10 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 10 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 1 + + 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 | 76 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 + + .../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 + + .../amd/include/ivsrcid/gfx/irqsrcs_gfx_12_1_0.h | 136 + + .../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 | 63 +- + 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/soc_v1_0_ih_clientid.h | 52 + + 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 | 86 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 61 +- + .../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 +- + drivers/gpu/drm/radeon/evergreen.c | 112 +- + drivers/gpu/drm/radeon/radeon_display.c | 66 +- + include/uapi/drm/amdgpu_drm.h | 3 +- + include/uapi/linux/kfd_ioctl.h | 11 +- + include/uapi/linux/kfd_sysfs.h | 3 +- + 301 files changed, 98421 insertions(+), 5335 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/ivsrcid/gfx/irqsrcs_gfx_12_1_0.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_ih_clientid.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 (0c8afa67aaa2 drm/i915: Add intel_gvt_driver_remove() onto error cleanup path) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 19 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 5 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 9 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 5 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 76 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bo.c | 6 + + drivers/gpu/drm/i915/display/intel_bo.h | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 5 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 13 +- + drivers/gpu/drm/i915/display/intel_cmtg.c | 3 +- + drivers/gpu/drm/i915/display/intel_connector.c | 14 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 31 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 2 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1074 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 29 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 116 ++- + drivers/gpu/drm/i915/display/intel_display.c | 102 +- + drivers/gpu/drm/i915/display/intel_display.h | 1 + + drivers/gpu/drm/i915/display/intel_display_core.h | 18 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.c | 5 + + .../gpu/drm/i915/display/intel_display_device.h | 9 +- + .../gpu/drm/i915/display/intel_display_driver.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 203 ++-- + drivers/gpu/drm/i915/display/intel_display_irq.h | 2 + + drivers/gpu/drm/i915/display/intel_display_power.c | 40 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 48 +- + .../drm/i915/display/intel_display_power_well.c | 64 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 23 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 31 +- + drivers/gpu/drm/i915/display/intel_display_rps.h | 21 - + drivers/gpu/drm/i915/display/intel_display_types.h | 52 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 4 + + drivers/gpu/drm/i915/display/intel_display_wa.h | 2 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 20 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 16 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 24 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 336 +++++- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 +- + drivers/gpu/drm/i915/{soc => display}/intel_dram.c | 397 ++++---- + drivers/gpu/drm/i915/{soc => display}/intel_dram.h | 12 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 42 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.c | 43 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 13 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 266 +++-- + drivers/gpu/drm/i915/display/intel_fbc.h | 3 + + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 12 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 109 ++ + drivers/gpu/drm/i915/display/intel_gmbus.c | 10 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 22 - + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 78 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 5 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 1 - + drivers/gpu/drm/i915/display/intel_lt_phy.c | 18 +- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 2 - + drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 1 - + drivers/gpu/drm/i915/display/intel_panic.c | 27 - + drivers/gpu/drm/i915/display/intel_panic.h | 14 - + drivers/gpu/drm/i915/display/intel_parent.c | 197 ++++ + drivers/gpu/drm/i915/display/intel_parent.h | 66 ++ + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 8 +- + drivers/gpu/drm/i915/display/intel_plane.c | 96 +- + drivers/gpu/drm/i915/display/intel_plane.h | 4 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 6 +- + drivers/gpu/drm/i915/display/intel_pps.c | 63 +- + drivers/gpu/drm/i915/display/intel_pps.h | 14 +- + drivers/gpu/drm/i915/display/intel_psr.c | 317 +++--- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/{soc => display}/intel_rom.c | 0 + drivers/gpu/drm/i915/{soc => display}/intel_rom.h | 0 + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/intel_tc.c | 40 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vga.c | 44 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 19 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 21 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_print.h | 5 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 4 - + drivers/gpu/drm/i915/gt/intel_rps.c | 40 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 2 + + drivers/gpu/drm/i915/gt/intel_wopcm.c | 3 - + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 - + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 17 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 60 +- + drivers/gpu/drm/i915/i915_driver.c | 73 +- + drivers/gpu/drm/i915/i915_drv.h | 3 - + drivers/gpu/drm/i915/i915_edram.c | 44 + + drivers/gpu/drm/i915/i915_edram.h | 11 + + drivers/gpu/drm/i915/i915_freq.c | 111 ++ + drivers/gpu/drm/i915/i915_freq.h | 13 + + drivers/gpu/drm/i915/i915_gem.c | 4 +- + .../gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} | 61 +- + drivers/gpu/drm/i915/i915_gmch.h | 13 + + .../{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} | 22 +- + drivers/gpu/drm/i915/i915_hdcp_gsc.h | 9 + + drivers/gpu/drm/i915/i915_irq.c | 16 + + drivers/gpu/drm/i915/i915_irq.h | 2 + + drivers/gpu/drm/i915/i915_panic.c | 35 + + drivers/gpu/drm/i915/i915_panic.h | 9 + + drivers/gpu/drm/i915/i915_params.c | 5 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 6 +- + drivers/gpu/drm/i915/i915_utils.c | 30 +- + drivers/gpu/drm/i915/i915_utils.h | 22 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 10 +- + drivers/gpu/drm/i915/intel_clock_gating.h | 6 +- + drivers/gpu/drm/i915/intel_gvt.c | 3 - + drivers/gpu/drm/i915/intel_mchbar_regs.h | 68 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_wakeref.c | 2 +- + drivers/gpu/drm/i915/intel_wakeref.h | 14 +- + drivers/gpu/drm/i915/soc/intel_gmch.h | 20 - + drivers/gpu/drm/i915/vlv_suspend.c | 2 +- + drivers/gpu/drm/xe/Makefile | 19 +- + .../xe/compat-i915-headers/gem/i915_gem_object.h | 13 - + .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 40 - + .../drm/xe/compat-i915-headers/gt/intel_gt_types.h | 11 - + .../gpu/drm/xe/compat-i915-headers/i915_active.h | 22 - + .../drm/xe/compat-i915-headers/i915_active_types.h | 13 - + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 15 - + drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h | 6 - + .../gpu/drm/xe/compat-i915-headers/i915_utils.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 18 - + .../gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 10 - + .../gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 29 - + .../drm/xe/compat-i915-headers/soc/intel_dram.h | 6 - + .../drm/xe/compat-i915-headers/soc/intel_gmch.h | 6 - + .../gpu/drm/xe/compat-i915-headers/soc/intel_rom.h | 6 - + drivers/gpu/drm/xe/display/ext/i915_irq.c | 85 -- + drivers/gpu/drm/xe/display/intel_bo.c | 8 +- + drivers/gpu/drm/xe/display/xe_display.c | 28 +- + drivers/gpu/drm/xe/display/xe_display_misc.c | 16 - + drivers/gpu/drm/xe/display/xe_display_rpm.c | 3 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 49 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 27 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.h | 9 + + drivers/gpu/drm/xe/display/xe_panic.c | 16 +- + drivers/gpu/drm/xe/display/xe_panic.h | 9 + + drivers/gpu/drm/xe/display/xe_plane_initial.c | 6 +- + drivers/gpu/drm/xe/display/xe_stolen.c | 62 +- + drivers/gpu/drm/xe/display/xe_stolen.h | 9 + + drivers/gpu/drm/xe/xe_device_types.h | 8 - + include/drm/intel/display_parent_interface.h | 79 ++ + 167 files changed, 3544 insertions(+), 2451 deletions(-) + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.c (57%) + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.h (68%) + delete mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.h + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.c + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.h + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.c (100%) + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.h (100%) + create mode 100644 drivers/gpu/drm/i915/i915_edram.c + create mode 100644 drivers/gpu/drm/i915/i915_edram.h + create mode 100644 drivers/gpu/drm/i915/i915_freq.c + create mode 100644 drivers/gpu/drm/i915/i915_freq.h + rename drivers/gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} (68%) + create mode 100644 drivers/gpu/drm/i915/i915_gmch.h + rename drivers/gpu/drm/i915/{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} (89%) + create mode 100644 drivers/gpu/drm/i915/i915_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/i915/i915_panic.c + create mode 100644 drivers/gpu/drm/i915/i915_panic.h + delete mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h + delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_irq.c + delete mode 100644 drivers/gpu/drm/xe/display/xe_display_misc.c + create mode 100644 drivers/gpu/drm/xe/display/xe_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/xe/display/xe_panic.h + create mode 100644 drivers/gpu/drm/xe/display/xe_stolen.h +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 (97cf6bc0abd3 rust: drm: use `pin_init::zeroed()` for file operations initialization) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/tyr/driver.rs | 2 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 4 ++-- + drivers/gpu/nova-core/vbios.rs | 2 +- + rust/helpers/drm.c | 7 ++++--- + rust/kernel/drm/gem/mod.rs | 6 ++---- + 5 files changed, 10 insertions(+), 11 deletions(-) +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 (c7b83a916d62 drm/xe: Fix documentation heading levels in xe_guc_pc.c) +$ 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/display/xe_hdcp_gsc.c +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_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.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_sriov_vfio.c +CONFLICT (add/add): Merge conflict in drivers/gpu/drm/xe/xe_sriov_vfio.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_gt_sriov_pf_migration.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. +Resolved 'drivers/gpu/drm/xe/xe_sriov_vfio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 816a7181ac38] 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 +- + Documentation/gpu/xe/xe_exec_queue.rst | 14 + + MAINTAINERS | 2 +- + drivers/gpu/drm/drm_gpusvm.c | 3 + + drivers/gpu/drm/xe/Makefile | 2 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 6 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 67 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 9 + + 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/instructions/xe_gpu_commands.h | 1 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 1 + + 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 | 17 + + drivers/gpu/drm/xe/tests/xe_args_test.c | 54 ++ + 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_args.h | 27 + + drivers/gpu/drm/xe/xe_bo.c | 41 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 143 +++- + drivers/gpu/drm/xe/xe_devcoredump.c | 30 +- + drivers/gpu/drm/xe/xe_device.c | 102 ++- + 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 | 27 + + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- + drivers/gpu/drm/xe/xe_drm_client.c | 67 +- + drivers/gpu/drm/xe/xe_eu_stall.c | 2 +- + drivers/gpu/drm/xe/xe_exec.c | 12 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 455 ++++++++++++- + drivers/gpu/drm/xe/xe_exec_queue.h | 68 ++ + drivers/gpu/drm/xe/xe_exec_queue_types.h | 62 ++ + 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 | 181 +++--- + 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_config.c | 19 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 21 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 2 +- + 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 | 10 + + drivers/gpu/drm/xe/xe_gt_stats.h | 32 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 5 + + drivers/gpu/drm/xe/xe_gt_throttle.c | 11 +- + drivers/gpu/drm/xe/xe_gt_types.h | 5 + + drivers/gpu/drm/xe/xe_guc.c | 80 ++- + drivers/gpu/drm/xe/xe_guc.h | 23 + + drivers/gpu/drm/xe/xe_guc_ads.c | 6 +- + 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 | 273 +++++--- + 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 | 10 +- + .../gpu/drm/xe/xe_guc_klv_thresholds_set_types.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 | 66 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 717 +++++++++++++++++++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 9 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 + + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 41 +- + 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 | 79 ++- + drivers/gpu/drm/xe/xe_hw_engine_group.h | 4 +- + drivers/gpu/drm/xe/xe_hwmon.c | 52 +- + drivers/gpu/drm/xe/xe_i2c.c | 2 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 25 +- + drivers/gpu/drm/xe/xe_lrc.c | 73 ++- + drivers/gpu/drm/xe/xe_lrc.h | 7 +- + 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_nvm.c | 34 +- + drivers/gpu/drm/xe/xe_oa.c | 106 ++- + drivers/gpu/drm/xe/xe_oa_types.h | 1 + + drivers/gpu/drm/xe/xe_page_reclaim.c | 136 ++++ + drivers/gpu/drm/xe/xe_page_reclaim.h | 105 +++ + drivers/gpu/drm/xe/xe_pat.c | 220 +++++-- + drivers/gpu/drm/xe/xe_pat.h | 21 + + drivers/gpu/drm/xe/xe_pci.c | 29 + + drivers/gpu/drm/xe/xe_pci_sriov.c | 10 +- + drivers/gpu/drm/xe/xe_pci_types.h | 6 + + drivers/gpu/drm/xe/xe_pcode_api.h | 2 + + drivers/gpu/drm/xe/xe_pm.c | 10 +- + drivers/gpu/drm/xe/xe_pt.c | 135 +++- + drivers/gpu/drm/xe/xe_pt_types.h | 5 + + 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 | 81 ++- + drivers/gpu/drm/xe/xe_ring_ops.c | 70 +- + 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_sriov_vfio.c | 2 +- + drivers/gpu/drm/xe/xe_survivability_mode.c | 275 +++++--- + drivers/gpu/drm/xe/xe_survivability_mode_types.h | 28 +- + drivers/gpu/drm/xe/xe_svm.c | 88 ++- + drivers/gpu/drm/xe/xe_svm.h | 2 +- + drivers/gpu/drm/xe/xe_sync.c | 33 +- + drivers/gpu/drm/xe/xe_sync.h | 2 + + drivers/gpu/drm/xe/xe_tile.c | 5 + + 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_tlb_inval.c | 27 +- + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 36 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.h | 4 + + drivers/gpu/drm/xe/xe_tlb_inval_types.h | 5 +- + drivers/gpu/drm/xe/xe_trace.h | 46 ++ + 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 | 158 ++++- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 3 +- + drivers/gpu/drm/xe/xe_vram.c | 6 +- + drivers/gpu/drm/xe/xe_wa.c | 60 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 +- + include/uapi/drm/xe_drm.h | 82 ++- + 155 files changed, 5372 insertions(+), 1516 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 + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.c + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.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 (82845bc8d13c Merge branch 'regmap-linus' 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 (03f705b9ca58 ALSA: usb-audio: Relax __free() variable declarations) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/hda/codecs/realtek/alc269.c +Merge made by the 'ort' strategy. + include/sound/seq_device.h | 2 + + sound/core/compress_offload.c | 28 +++--- + sound/core/control.c | 12 +-- + sound/core/control_compat.c | 21 +++-- + sound/core/control_led.c | 12 +-- + sound/core/oss/mixer_oss.c | 64 +++++++------ + sound/core/oss/pcm_oss.c | 19 ++-- + sound/core/pcm.c | 4 +- + sound/core/pcm_compat.c | 9 +- + sound/core/pcm_native.c | 50 +++++----- + sound/core/seq/oss/seq_oss.c | 4 +- + sound/core/seq/oss/seq_oss_init.c | 4 +- + sound/core/seq/oss/seq_oss_midi.c | 45 +++++---- + sound/core/seq/oss/seq_oss_synth.c | 35 ++++--- + sound/core/seq/oss/seq_oss_synth.h | 4 +- + sound/core/seq/seq_clientmgr.c | 171 ++++++++++++++++++----------------- + sound/core/seq/seq_compat.c | 4 +- + sound/core/seq/seq_midi.c | 25 +++-- + sound/core/seq/seq_ports.c | 11 +-- + sound/core/seq/seq_queue.c | 32 ++++--- + sound/core/seq/seq_ump_client.c | 27 +++--- + sound/core/seq/seq_virmidi.c | 4 +- + sound/core/seq_device.c | 26 +++++- + sound/core/timer.c | 12 +-- + sound/core/vmaster.c | 12 +-- + sound/drivers/opl3/opl3_seq.c | 13 +-- + sound/drivers/opl4/opl4_seq.c | 13 +-- + sound/hda/codecs/generic.c | 4 +- + sound/hda/codecs/realtek/alc269.c | 4 +- + sound/hda/codecs/realtek/realtek.c | 5 +- + sound/hda/common/codec.c | 4 +- + sound/hda/common/sysfs.c | 5 +- + sound/isa/sb/emu8000_synth.c | 13 +-- + sound/pci/emu10k1/emu10k1_synth.c | 13 +-- + sound/usb/fcp.c | 36 ++++---- + sound/usb/mixer_scarlett2.c | 21 ++--- + sound/usb/quirks.c | 13 ++- + sound/usb/usx2y/us144mkii.c | 4 +- + sound/usb/usx2y/us144mkii_controls.c | 4 +- + sound/usb/usx2y/us144mkii_pcm.c | 4 +- + 40 files changed, 408 insertions(+), 385 deletions(-) +Merging ieee1394/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (fa41400e9b5c Merge remote-tracking branch 'asoc/for-6.20' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + drivers/firmware/cirrus/cs_dsp.c | 31 +- + include/linux/pci_ids.h | 3 +- + include/sound/sof.h | 3 + + sound/hda/controllers/intel.c | 2 +- + sound/hda/core/intel-dsp-config.c | 4 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 8 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 8 +- + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/cs-amp-lib.c | 27 +- + sound/soc/codecs/rt1320-sdw.c | 1247 ++++++++++++++++++++- + sound/soc/codecs/rt1320-sdw.h | 66 ++ + sound/soc/codecs/rt274.c | 12 +- + sound/soc/codecs/rt286.c | 12 +- + sound/soc/codecs/rt298.c | 12 +- + sound/soc/codecs/sdw-mockup.c | 6 - + sound/soc/codecs/tas2780.c | 31 +- + sound/soc/codecs/tas2783-sdw.c | 347 +++--- + sound/soc/codecs/tas2783.h | 1 + + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/intel/avs/board_selection.c | 2 +- + sound/soc/intel/avs/core.c | 2 +- + sound/soc/intel/catpt/core.h | 7 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/catpt/ipc.c | 12 +- + sound/soc/intel/catpt/loader.c | 8 +- + sound/soc/intel/catpt/messages.c | 89 +- + sound/soc/intel/catpt/pcm.c | 46 +- + sound/soc/intel/catpt/sysfs.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 14 +- + sound/soc/mediatek/mt8189/mt8189-nau8825.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 44 +- + sound/soc/qcom/qdsp6/audioreach.c | 148 ++- + sound/soc/qcom/qdsp6/audioreach.h | 39 + + sound/soc/qcom/qdsp6/q6adm.c | 2 + + sound/soc/qcom/qdsp6/q6afe.c | 20 +- + sound/soc/qcom/qdsp6/q6apm.c | 9 +- + sound/soc/qcom/qdsp6/q6asm.c | 19 +- + sound/soc/qcom/qdsp6/q6prm.c | 16 +- + sound/soc/renesas/rz-ssi.c | 119 +- + sound/soc/sdca/sdca_asoc.c | 2 +- + sound/soc/sdca/sdca_functions.c | 28 +- + sound/soc/sdw_utils/soc_sdw_ti_amp.c | 4 + + sound/soc/sdw_utils/soc_sdw_utils.c | 22 +- + sound/soc/sof/compress.c | 8 + + sound/soc/sof/control.c | 13 +- + sound/soc/sof/core.c | 1 + + sound/soc/sof/debug.c | 7 +- + sound/soc/sof/intel/hda-sdw-bpt.c | 11 + + sound/soc/sof/intel/hda.c | 32 +- + sound/soc/sof/intel/pci-apl.c | 2 +- + sound/soc/sof/intel/pci-lnl.c | 1 + + sound/soc/sof/intel/pci-nvl.c | 1 + + sound/soc/sof/intel/pci-ptl.c | 2 + + sound/soc/sof/ipc3-dtrace.c | 7 +- + sound/soc/sof/ipc4-loader.c | 19 +- + sound/soc/sof/ipc4.c | 13 + + sound/soc/sof/pcm.c | 10 + + sound/soc/sof/pm.c | 175 +-- + sound/soc/sof/sof-client-ipc-flood-test.c | 7 +- + sound/soc/sof/sof-client-ipc-kernel-injector.c | 4 +- + sound/soc/sof/sof-client-ipc-msg-injector.c | 14 +- + sound/soc/sof/sof-client-probes.c | 26 +- + sound/soc/sof/sof-client.c | 6 + + sound/soc/sof/sof-client.h | 3 + + sound/soc/sof/sof-priv.h | 3 + + sound/soc/ti/davinci-mcasp.c | 7 +- + 67 files changed, 2204 insertions(+), 659 deletions(-) +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 (d79f302f2f98 dt-bindings: input: touchscreen: sitronix,st1232: Add Sitronix ST1624) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/sitronix,st1232.yaml | 10 +++++++--- + MAINTAINERS | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 3 ++- + drivers/input/keyboard/omap4-keypad.c | 4 ---- + drivers/input/misc/cs40l50-vibra.c | 4 ---- + drivers/input/misc/pf1550-onkey.c | 2 +- + drivers/input/mouse/byd.c | 6 ++---- + drivers/input/mouse/cyapa.c | 3 --- + drivers/input/mouse/cyapa_gen5.c | 1 - + drivers/input/touchscreen/stmfts.c | 21 +++++++++------------ + 10 files changed, 22 insertions(+), 34 deletions(-) +Merging block/for-next (e68d68450f76 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. + Documentation/admin-guide/blockdev/zoned_loop.rst | 2 +- + block/bfq-iosched.c | 2 +- + block/blk-settings.c | 14 +++-- + block/blk-sysfs.c | 2 +- + block/blk-wbt.c | 20 +++++-- + block/blk-wbt.h | 5 ++ + block/elevator.c | 4 -- + block/elevator.h | 1 - + block/ioctl.c | 9 ++-- + drivers/block/loop.c | 22 ++++---- + drivers/block/rnbd/rnbd-clt.c | 13 +++-- + drivers/block/ublk_drv.c | 32 ++++++++++-- + drivers/block/zloop.c | 8 +-- + include/linux/bio.h | 30 +++++------ + include/uapi/linux/pr.h | 2 + + io_uring/rsrc.c | 1 + + tools/testing/selftests/ublk/Makefile | 8 +++ + tools/testing/selftests/ublk/file_backed.c | 7 +-- + tools/testing/selftests/ublk/kublk.c | 64 ++++++++++++++++++++--- + tools/testing/selftests/ublk/kublk.h | 23 +++++--- + tools/testing/selftests/ublk/stripe.c | 2 +- + tools/testing/selftests/ublk/test_common.sh | 5 +- + tools/testing/selftests/ublk/test_generic_04.sh | 2 +- + tools/testing/selftests/ublk/test_generic_05.sh | 2 +- + tools/testing/selftests/ublk/test_generic_11.sh | 2 +- + tools/testing/selftests/ublk/test_generic_14.sh | 40 ++++++++++++++ + tools/testing/selftests/ublk/test_loop_06.sh | 25 +++++++++ + tools/testing/selftests/ublk/test_loop_07.sh | 21 ++++++++ + tools/testing/selftests/ublk/test_null_03.sh | 24 +++++++++ + tools/testing/selftests/ublk/test_stress_04.sh | 12 +++-- + tools/testing/selftests/ublk/test_stress_05.sh | 10 ++-- + tools/testing/selftests/ublk/test_stress_06.sh | 39 ++++++++++++++ + tools/testing/selftests/ublk/test_stress_07.sh | 39 ++++++++++++++ + tools/testing/selftests/ublk/test_stripe_05.sh | 26 +++++++++ + tools/testing/selftests/ublk/test_stripe_06.sh | 21 ++++++++ + tools/testing/selftests/ublk/trace/seq_io.bt | 3 +- + 36 files changed, 451 insertions(+), 91 deletions(-) + create mode 100755 tools/testing/selftests/ublk/test_generic_14.sh + create mode 100755 tools/testing/selftests/ublk/test_loop_06.sh + create mode 100755 tools/testing/selftests/ublk/test_loop_07.sh + create mode 100755 tools/testing/selftests/ublk/test_null_03.sh + create mode 100755 tools/testing/selftests/ublk/test_stress_06.sh + create mode 100755 tools/testing/selftests/ublk/test_stress_07.sh + create mode 100755 tools/testing/selftests/ublk/test_stripe_05.sh + create mode 100755 tools/testing/selftests/ublk/test_stripe_06.sh +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 (f474c70065e1 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 (1c6c8cf30022 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 2 + + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 5 + + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/mmc.c | 12 + + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/host/dw_mmc-exynos.c | 9 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 6 +- + drivers/mmc/host/dw_mmc-hi3798mv200.c | 17 +- + drivers/mmc/host/dw_mmc-k3.c | 21 +- + drivers/mmc/host/dw_mmc-pltfm.c | 2 +- + drivers/mmc/host/dw_mmc-rockchip.c | 9 +- + drivers/mmc/host/dw_mmc-starfive.c | 5 +- + drivers/mmc/host/dw_mmc.c | 624 +++++++++------------ + drivers/mmc/host/dw_mmc.h | 83 +-- + drivers/mmc/host/mtk-sd.c | 32 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 + + drivers/mmc/host/sdhci-msm.c | 77 +++ + include/linux/mmc/card.h | 1 + + 20 files changed, 460 insertions(+), 477 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (2bb202416d33 Add support for MAX77675 device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/adi,max77675.yaml | 184 ++++ + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/max77675-regulator.c | 1056 ++++++++++++++++++++ + rust/helpers/regulator.c | 24 +- + 5 files changed, 1264 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/adi,max77675.yaml + create mode 100644 drivers/regulator/max77675-regulator.c +Merging security/next (1c0860d4415d lsm: fix kernel-doc struct member names) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + include/linux/lsm_hooks.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +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 (88fe48f74ec2 RDMA/core: check device status when manipulating ib_gid_table_entry) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging net/can/j1939/transport.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 111 ++++++++++++++++++- + drivers/infiniband/core/core_priv.h | 7 ++ + drivers/infiniband/core/device.c | 33 ++++++ + drivers/infiniband/core/roce_gid_mgmt.c | 27 ++++- + 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 ++++-- + 13 files changed, 507 insertions(+), 13 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 (7a089c5d35aa iommupt: Return ERR_PTR from _table_alloc()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Merge made by the 'ort' strategy. + drivers/iommu/generic_pt/iommu_pt.h | 3 +++ + 1 file changed, 3 insertions(+) +Merging audit/next (15b0c43aa621 audit: include source and destination ports to NETFILTER_PKT) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/audit.c +Merge made by the 'ort' strategy. + include/asm-generic/audit_change_attr.h | 3 + + include/linux/audit.h | 8 ++ + kernel/audit.c | 159 ++++++++++++++++++++++++++++++++ + net/netfilter/nft_log.c | 58 +----------- + net/netfilter/xt_AUDIT.c | 58 +----------- + 5 files changed, 172 insertions(+), 114 deletions(-) +Merging devicetree/for-next (5530836fb914 of: replace strcmp_suffix() with strends()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 5 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 6 + + .../devicetree/bindings/arm/vexpress-config.yaml | 6 +- + .../bindings/bus/aspeed,ast2600-ahbc.yaml | 8 +- + .../bindings/bus/st,stm32mp25-rifsc.yaml | 2 +- + .../bindings/crypto/aspeed,ast2600-acry.yaml | 7 + + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 21 +- + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/writing-schema.rst | 16 +- + MAINTAINERS | 1 + + Makefile | 16 +- + arch/arm/Kbuild | 2 + + arch/arm64/Kbuild | 2 + + arch/mips/Kbuild | 2 + + arch/riscv/Kbuild | 2 + + drivers/of/property.c | 15 +- + include/dt-bindings/clock/oxsemi,ox810se.h | 19 -- + include/dt-bindings/clock/oxsemi,ox820.h | 29 --- + include/dt-bindings/clock/qcom,mss-sc7180.h | 12 - + include/dt-bindings/clock/xlnx-versal-clk.h | 123 ---------- + include/dt-bindings/clock/xlnx-zynqmp-clk.h | 133 ----------- + include/dt-bindings/dma/jz4775-dma.h | 44 ---- + include/dt-bindings/dma/x2000-dma.h | 54 ----- + include/dt-bindings/gce/mt6779-gce.h | 222 ------------------ + include/dt-bindings/memory/mt6779-larb-port.h | 206 ----------------- + include/dt-bindings/mux/ti-serdes.h | 190 --------------- + include/dt-bindings/pinctrl/mt6397-pinfunc.h | 257 --------------------- + .../dt-bindings/power/allwinner,sun20i-d1-ppu.h | 10 - + include/dt-bindings/reset/bcm6318-reset.h | 20 -- + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 ----- + include/dt-bindings/reset/oxsemi,ox810se.h | 42 ---- + include/dt-bindings/reset/oxsemi,ox820.h | 42 ---- + include/dt-bindings/sound/audio-jack-events.h | 10 - + scripts/Makefile.dtbs | 4 + + 34 files changed, 86 insertions(+), 1503 deletions(-) + delete mode 100644 include/dt-bindings/clock/oxsemi,ox810se.h + delete mode 100644 include/dt-bindings/clock/oxsemi,ox820.h + delete mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h + delete mode 100644 include/dt-bindings/clock/xlnx-versal-clk.h + delete mode 100644 include/dt-bindings/clock/xlnx-zynqmp-clk.h + delete mode 100644 include/dt-bindings/dma/jz4775-dma.h + delete mode 100644 include/dt-bindings/dma/x2000-dma.h + delete mode 100644 include/dt-bindings/gce/mt6779-gce.h + delete mode 100644 include/dt-bindings/memory/mt6779-larb-port.h + delete mode 100644 include/dt-bindings/mux/ti-serdes.h + delete mode 100644 include/dt-bindings/pinctrl/mt6397-pinfunc.h + delete mode 100644 include/dt-bindings/power/allwinner,sun20i-d1-ppu.h + delete mode 100644 include/dt-bindings/reset/bcm6318-reset.h + delete mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h + delete mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h + delete mode 100644 include/dt-bindings/reset/oxsemi,ox820.h + delete mode 100644 include/dt-bindings/sound/audio-jack-events.h +Merging dt-krzk/for-next (b7fdd9926b22 Merge branch 'next/dt64' into for-next) +$ 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 +Merge made by the 'ort' strategy. + arch/arm/boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 4 ++-- + arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 4 ++-- + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 4 ++-- + arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) +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 (81e4a2ef2782 Merge remote-tracking branch 'spi/for-6.20' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/spi/andestech,ae350-spi.yaml | 85 ++ + .../devicetree/bindings/spi/nxp,imx94-xspi.yaml | 88 ++ + .../bindings/spi/renesas,rzv2h-rspi.yaml | 8 + + .../devicetree/bindings/spi/st,stm32-spi.yaml | 3 + + MAINTAINERS | 15 + + drivers/spi/Kconfig | 19 + + drivers/spi/Makefile | 2 + + drivers/spi/spi-atcspi200.c | 680 ++++++++++ + drivers/spi/spi-cadence-quadspi.c | 16 +- + drivers/spi/spi-cadence-xspi.c | 47 +- + drivers/spi/spi-fsl-lpspi.c | 10 +- + drivers/spi/spi-geni-qcom.c | 127 +- + drivers/spi/spi-imx.c | 647 +++++++-- + drivers/spi/spi-nxp-xspi.c | 1385 ++++++++++++++++++++ + drivers/spi/spi-qpic-snand.c | 4 - + drivers/spi/spi-rzv2h-rspi.c | 281 +++- + drivers/spi/spi-stm32-ospi.c | 107 +- + drivers/spi/spi-stm32-qspi.c | 111 +- + drivers/spi/spi-virtio.c | 4 +- + 19 files changed, 3227 insertions(+), 412 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/andestech,ae350-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/nxp,imx94-xspi.yaml + create mode 100644 drivers/spi/spi-atcspi200.c + create mode 100644 drivers/spi/spi-nxp-xspi.c +Merging tip/master (3e0483bc1554 Merge branch into tip/master: 'x86/cpu') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/arm64/boot/dts/renesas/r9a09g077.dtsi +Auto-merging arch/arm64/boot/dts/renesas/r9a09g087.dtsi +Auto-merging arch/x86/kernel/setup.c +Auto-merging include/linux/sched.h +Auto-merging lib/Kconfig.debug +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + .../renesas,r9a09g077-icu.yaml | 236 +++++ + .../interrupt-controller/renesas,rzv2h-icu.yaml | 1 + + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 73 ++ + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 73 ++ + arch/mips/include/asm/cevt-r4k.h | 1 - + arch/mips/kernel/cevt-r4k.c | 11 - + arch/mips/sgi-ip27/ip27-timer.c | 10 +- + arch/mips/sgi-ip30/ip30-timer.c | 5 +- + arch/x86/entry/entry_fred.c | 1 + + arch/x86/events/amd/core.c | 2 + + arch/x86/events/core.c | 38 +- + arch/x86/events/intel/core.c | 6 + + arch/x86/events/intel/cstate.c | 33 +- + arch/x86/events/msr.c | 1 + + arch/x86/include/asm/e820/api.h | 3 +- + arch/x86/include/asm/e820/types.h | 2 +- + arch/x86/include/asm/hardirq.h | 3 + + arch/x86/include/asm/idtentry.h | 6 + + arch/x86/include/asm/irq_vectors.h | 4 +- + arch/x86/include/asm/perf_event.h | 6 + + arch/x86/include/asm/unwind_user.h | 27 +- + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/cpu/amd.c | 40 +- + arch/x86/kernel/cpu/centaur.c | 6 - + arch/x86/kernel/cpu/cyrix.c | 6 - + arch/x86/kernel/cpu/hygon.c | 6 - + arch/x86/kernel/cpu/topology.c | 15 - + arch/x86/kernel/e820.c | 477 +++++----- + arch/x86/kernel/idt.c | 3 + + arch/x86/kernel/irq.c | 19 + + arch/x86/kernel/setup.c | 10 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/platform/efi/efi.c | 3 +- + drivers/clocksource/mips-gic-timer.c | 10 +- + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-aclint-sswi.c | 2 +- + drivers/irqchip/irq-renesas-rzt2h.c | 280 ++++++ + drivers/irqchip/irq-renesas-rzv2h.c | 1 + + drivers/irqchip/irq-riscv-aplic-direct.c | 10 + + drivers/irqchip/irq-riscv-aplic-main.c | 166 +++- + drivers/irqchip/irq-riscv-aplic-main.h | 19 + + drivers/irqchip/irq-riscv-imsic-early.c | 39 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 127 ++- + drivers/pci/controller/dwc/pcie-designware.h | 7 +- + drivers/soc/renesas/Kconfig | 1 + + include/linux/compiler_types.h | 19 + + include/linux/interrupt.h | 24 +- + include/linux/irq.h | 13 +- + include/linux/irqchip/irq-renesas-rzt2h.h | 23 + + include/linux/irqdesc.h | 17 +- + include/linux/msi.h | 13 +- + include/linux/perf_event.h | 35 +- + include/linux/sched.h | 13 +- + include/linux/timecounter.h | 31 +- + include/linux/unwind_user.h | 18 +- + init/Kconfig | 4 + + kernel/events/core.c | 523 ++++++++--- + kernel/irq/Kconfig | 3 - + kernel/irq/Makefile | 4 - + kernel/irq/chip.c | 22 +- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 110 --- + kernel/irq/irqdesc.c | 86 +- + kernel/irq/manage.c | 63 +- + kernel/irq/timings.c | 959 --------------------- + kernel/sched/core.c | 46 +- + kernel/sched/deadline.c | 14 +- + kernel/sched/ext.c | 9 +- + kernel/sched/fair.c | 361 ++++---- + kernel/sched/idle.c | 3 - + kernel/sched/rt.c | 9 +- + kernel/sched/sched.h | 60 +- + kernel/sched/stop_task.c | 3 - + kernel/time/timecounter.c | 35 - + kernel/unwind/user.c | 12 +- + lib/Kconfig.debug | 8 - + .../beauty/arch/x86/include/asm/irq_vectors.h | 3 +- + virt/kvm/kvm_main.c | 3 + + 79 files changed, 2328 insertions(+), 2031 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,r9a09g077-icu.yaml + create mode 100644 drivers/irqchip/irq-renesas-rzt2h.c + create mode 100644 include/linux/irqchip/irq-renesas-rzt2h.h + delete mode 100644 kernel/irq/timings.c +$ git reset --hard HEAD^ +HEAD is now at 7157d5509361 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +Merging next-20251217 version of tip +$ git merge -m next-20251217/tip eff801f5c2b85f1969d5436b6b86c6d8078129aa +Auto-merging arch/arm64/boot/dts/renesas/r9a09g077.dtsi +Auto-merging arch/arm64/boot/dts/renesas/r9a09g087.dtsi +Auto-merging arch/x86/kernel/setup.c +Auto-merging include/linux/sched.h +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + .../renesas,r9a09g077-icu.yaml | 236 +++++ + .../interrupt-controller/renesas,rzv2h-icu.yaml | 1 + + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 73 ++ + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 73 ++ + arch/mips/include/asm/cevt-r4k.h | 1 - + arch/mips/kernel/cevt-r4k.c | 11 - + arch/mips/sgi-ip27/ip27-timer.c | 10 +- + arch/mips/sgi-ip30/ip30-timer.c | 5 +- + arch/x86/events/intel/cstate.c | 32 +- + arch/x86/include/asm/e820/api.h | 3 +- + arch/x86/include/asm/e820/types.h | 2 +- + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/cpu/amd.c | 40 +- + arch/x86/kernel/cpu/centaur.c | 6 - + arch/x86/kernel/cpu/cyrix.c | 6 - + arch/x86/kernel/cpu/hygon.c | 6 - + arch/x86/kernel/cpu/topology.c | 15 - + arch/x86/kernel/e820.c | 477 +++++----- + arch/x86/kernel/setup.c | 10 +- + arch/x86/platform/efi/efi.c | 3 +- + drivers/clocksource/mips-gic-timer.c | 10 +- + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-aclint-sswi.c | 2 +- + drivers/irqchip/irq-renesas-rzt2h.c | 280 ++++++ + drivers/irqchip/irq-renesas-rzv2h.c | 1 + + drivers/irqchip/irq-riscv-aplic-direct.c | 10 + + drivers/irqchip/irq-riscv-aplic-main.c | 166 +++- + drivers/irqchip/irq-riscv-aplic-main.h | 19 + + drivers/irqchip/irq-riscv-imsic-early.c | 39 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 127 ++- + drivers/pci/controller/dwc/pcie-designware.h | 7 +- + drivers/soc/renesas/Kconfig | 1 + + include/linux/compiler_types.h | 19 + + include/linux/interrupt.h | 24 +- + include/linux/irq.h | 13 +- + include/linux/irqchip/irq-renesas-rzt2h.h | 23 + + include/linux/irqdesc.h | 17 +- + include/linux/msi.h | 13 +- + include/linux/sched.h | 13 +- + include/linux/timecounter.h | 31 +- + kernel/irq/Kconfig | 3 - + kernel/irq/Makefile | 4 - + kernel/irq/chip.c | 22 +- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 110 --- + kernel/irq/irqdesc.c | 86 +- + kernel/irq/manage.c | 63 +- + kernel/irq/timings.c | 959 --------------------- + kernel/sched/core.c | 45 +- + kernel/sched/deadline.c | 14 +- + kernel/sched/ext.c | 7 +- + kernel/sched/fair.c | 361 ++++---- + kernel/sched/idle.c | 3 - + kernel/sched/rt.c | 9 +- + kernel/sched/sched.h | 59 +- + kernel/sched/stop_task.c | 3 - + kernel/time/timecounter.c | 35 - + lib/Kconfig.debug | 8 - + 59 files changed, 1763 insertions(+), 1876 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,r9a09g077-icu.yaml + create mode 100644 drivers/irqchip/irq-renesas-rzt2h.c + create mode 100644 include/linux/irqchip/irq-renesas-rzt2h.h + delete mode 100644 kernel/irq/timings.c +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 (0499add8efd7 Merge tag 'kvm-x86-fixes-6.19-rc1' of https://github.com/kvm-x86/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 +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (e5aff444e3a7 x86/xen: Fix sparse warning in enlighten_pv.c) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/enlighten_pv.c +Merge made by the 'ort' strategy. + arch/x86/xen/enlighten_pv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (b0101ccb5b46 sched_ext: fix uninitialized ret on alloc_percpu() 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 +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + kernel/sched/ext.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging drivers-x86/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (e4b3118b61b6 rust: scatterlist: add __rust_helper to helpers) +$ 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 +Auto-merging rust/helpers/dma.c +Merge made by the 'ort' strategy. + rust/helpers/auxiliary.c | 6 +++-- + rust/helpers/device.c | 16 ++++++------ + rust/helpers/dma.c | 15 ++++++----- + rust/helpers/io.c | 64 ++++++++++++++++++++++++---------------------- + rust/helpers/irq.c | 6 +++-- + rust/helpers/pci.c | 23 +++++++++-------- + rust/helpers/platform.c | 2 +- + rust/helpers/property.c | 2 +- + rust/helpers/scatterlist.c | 12 +++++---- + 9 files changed, 81 insertions(+), 65 deletions(-) +Merging usb/usb-next (dd1fbe324a54 usb: linux/usb.h: Correct the description of the usb_device_driver member) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-midi | 17 ++-- + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 22 ++++- + .../devicetree/bindings/usb/generic-ehci.yaml | 2 + + .../devicetree/bindings/usb/generic-ohci.yaml | 2 + + Documentation/usb/gadget-testing.rst | 17 ++-- + drivers/usb/gadget/function/f_midi.c | 110 +++++++++++---------- + drivers/usb/gadget/function/u_midi.h | 2 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 30 ++++++ + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 + + drivers/usb/typec/bus.c | 25 ++++- + drivers/usb/typec/bus.h | 6 -- + drivers/usb/typec/class.c | 36 ++++--- + drivers/usb/typec/ucsi/psy.c | 54 +++++++--- + include/linux/usb.h | 3 +- + include/linux/usb/typec.h | 3 + + include/linux/usb/typec_altmode.h | 8 ++ + 16 files changed, 235 insertions(+), 103 deletions(-) +Merging thunderbolt/next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (284da5de616a platform/surface: Migrate to serdev specific shutdown function) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/bluetooth/hci_qca.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/renesas,rsci.yaml | 99 ++++++- + drivers/bluetooth/hci_aml.c | 16 +- + drivers/bluetooth/hci_qca.c | 5 +- + drivers/platform/surface/aggregator/core.c | 6 +- + drivers/tty/n_hdlc.c | 2 + + drivers/tty/serdev/core.c | 21 ++ + drivers/tty/serial/8250/8250_dw.c | 23 +- + drivers/tty/serial/8250/8250_keba.c | 27 +- + drivers/tty/serial/8250/8250_men_mcb.c | 12 +- + drivers/tty/serial/rsci.c | 310 ++++++++++++++++++--- + drivers/tty/serial/rsci.h | 3 +- + drivers/tty/serial/sh-sci-common.h | 10 +- + drivers/tty/serial/sh-sci.c | 80 +++--- + drivers/tty/vt/keyboard.c | 233 ++++++++-------- + include/linux/serdev.h | 1 + + 15 files changed, 619 insertions(+), 229 deletions(-) +Merging char-misc/char-misc-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (7009646d937f dt-binding: Update oss email address for Coresight documents) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../sysfs-bus-coresight-devices-dummy-source | 4 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 56 +++++++++++----------- + .../bindings/arm/arm,coresight-dummy-sink.yaml | 2 +- + .../bindings/arm/arm,coresight-dummy-source.yaml | 2 +- + .../bindings/arm/qcom,coresight-ctcu.yaml | 6 +-- + .../bindings/arm/qcom,coresight-remote-etm.yaml | 4 +- + .../bindings/arm/qcom,coresight-tnoc.yaml | 2 +- + .../bindings/arm/qcom,coresight-tpda.yaml | 4 +- + .../bindings/arm/qcom,coresight-tpdm.yaml | 4 +- + 9 files changed, 42 insertions(+), 42 deletions(-) +Merging fastrpc/for-next (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (59946373755d soundwire: dmi-quirks: add mapping for Avell B.ON (OEM rebranded of NUC15)) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/dmi-quirks.c | 11 +++++++++++ + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/qcom.c | 12 +++++------- + 3 files changed, 17 insertions(+), 7 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (761fcf46a1bd w1: therm: Fix off-by-one buffer overflow in alarms_store) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/slaves/w1_therm.c | 60 ++++++++++++++------------------------------ + 1 file changed, 19 insertions(+), 41 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 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 (de4761fb57f6 dmaengine: shdma: correct most kernel-doc issues in shdma-base.h) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 1 + + Documentation/driver-api/dmaengine/provider.rst | 5 +- + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/at_xdmac.c | 11 -- + drivers/dma/dw-edma/dw-edma-pcie.c | 4 +- + drivers/dma/pl330.c | 8 +- + drivers/dma/qcom/bam_dma.c | 152 +++++++++---------- + drivers/dma/ste_dma40.c | 14 +- + drivers/dma/stm32/stm32-dma3.c | 165 +++++++++++++++++---- + drivers/dma/ti/Kconfig | 5 +- + drivers/dma/ti/cppi41.c | 5 - + drivers/dma/xilinx/zynqmp_dma.c | 2 - + include/linux/dma/edma.h | 24 ++- + include/linux/shdma-base.h | 28 ++-- + 14 files changed, 244 insertions(+), 182 deletions(-) +Merging cgroup/for-next (e02fe7ba29a2 Merge branch 'for-6.20' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging mm/memcontrol.c +Merge made by the 'ort' strategy. + fs/fs-writeback.c | 2 +- + include/linux/cpuset.h | 2 + + include/linux/memcontrol.h | 2 +- + kernel/cgroup/cgroup.c | 4 +- + kernel/cgroup/cpuset-internal.h | 42 ++- + kernel/cgroup/cpuset-v1.c | 241 ++++++++++++++- + kernel/cgroup/cpuset.c | 326 +++++---------------- + 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 +- + 13 files changed, 410 insertions(+), 292 deletions(-) +Merging scsi/for-next (98bcf5e5ddfd 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 +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (8334f93075dc Merge patch series "qla2xxx: Misc feature and bug fixes") +$ 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/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/target/target_core_spc.c +Merge made by the 'ort' strategy. + drivers/base/transport_class.c | 8 + + drivers/scsi/lpfc/lpfc_attr.c | 40 + + drivers/scsi/lpfc/lpfc_debugfs.c | 7 + + drivers/scsi/lpfc/lpfc_disc.h | 7 + + drivers/scsi/lpfc/lpfc_els.c | 57 ++ + drivers/scsi/lpfc/lpfc_hbadisc.c | 1 + + drivers/scsi/lpfc/lpfc_hw4.h | 11 +- + drivers/scsi/lpfc/lpfc_init.c | 5 + + drivers/scsi/lpfc/lpfc_logmsg.h | 3 +- + drivers/scsi/lpfc/lpfc_sli.c | 62 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 14 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 4 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1332 ++++++++++++++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_bsg.c | 147 +++- + drivers/scsi/qla2xxx/qla_bsg.h | 12 + + drivers/scsi/qla2xxx/qla_def.h | 30 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 + + drivers/scsi/qla2xxx/qla_gs.c | 41 +- + drivers/scsi/qla2xxx/qla_init.c | 232 +++++- + drivers/scsi/qla2xxx/qla_isr.c | 19 +- + drivers/scsi/qla2xxx/qla_mbx.c | 88 +++ + drivers/scsi/qla2xxx/qla_nx.h | 1 + + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/qla2xxx/qla_sup.c | 29 + + drivers/scsi/qla2xxx/qla_version.h | 8 +- + drivers/scsi/scsi_debug.c | 118 ++- + drivers/scsi/scsi_lib.c | 11 +- + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_transport_fc.c | 42 ++ + drivers/target/target_core_configfs.c | 50 ++ + drivers/target/target_core_spc.c | 86 +++ + drivers/ufs/core/ufs-mcq.c | 3 +- + include/linux/transport_class.h | 1 + + include/scsi/scsi.h | 13 +- + include/scsi/scsi_transport_fc.h | 12 + + include/target/target_core_base.h | 4 + + include/ufs/ufshci.h | 1 + + 39 files changed, 2296 insertions(+), 220 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 (8d201aac4d4c Merge branches 'rproc-next' and 'rpmsg-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. + .../bindings/remoteproc/ti,keystone-rproc.txt | 2 +- + drivers/remoteproc/imx_dsp_rproc.c | 87 ++++++++++++------ + drivers/remoteproc/imx_rproc.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 66 ++++++-------- + drivers/rpmsg/virtio_rpmsg_bus.c | 101 +++++++-------------- + 5 files changed, 120 insertions(+), 138 deletions(-) +Merging gpio-brgl/gpio/for-next (47d8cb678081 gpio: realtek-otto: use larger type for dev_flags) +$ 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 +Auto-merging Documentation/devicetree/bindings/gpio/gpio-mmio.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/gpio-mmio.yaml | 15 +++++++---- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 2 ++ + Documentation/driver-api/gpio/pca953x.rst | 12 +++++++++ + drivers/gpio/Kconfig | 6 ++--- + drivers/gpio/gpio-aggregator.c | 8 +++--- + drivers/gpio/gpio-pca953x.c | 6 +++++ + drivers/gpio/gpio-realtek-otto.c | 5 ++-- + drivers/gpio/gpio-sim.c | 16 ++++++------ + drivers/gpio/gpio-virtuser.c | 8 +++--- + drivers/gpio/gpiolib-of.c | 4 +++ + drivers/gpio/gpiolib-swnode.c | 11 +++----- + drivers/gpio/gpiolib.c | 30 +++++++++------------- + 12 files changed, 71 insertions(+), 52 deletions(-) +Merging gpio-intel/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (9580ecfbc57d rust: pwm: Add UnregisteredChip wrapper around Chip) +$ 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/pwm_th1520.rs | 2 +- + rust/kernel/pwm.rs | 71 ++++++++++++++++++++++++++++++----------------- + 2 files changed, 47 insertions(+), 26 deletions(-) +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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (8f0b4cce4481 Linux 6.19-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 (2115b53400fb rust: kunit: add __rust_helper to helpers) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + rust/helpers/kunit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging livepatching/for-next (51ab33fc0a8b Merge tag 'livepatching-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching) +$ 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 +Already up to date. +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 (7a29af24b288 eeprom: at24: use dev_err_probe() consistently) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 3 +++ + drivers/misc/eeprom/at24.c | 20 +++++++------------- + 2 files changed, 10 insertions(+), 13 deletions(-) +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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-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 (863810caeb3c XArray: Add CONFIG_DEBUG_XARRAY) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging lib/Kconfig.debug +Auto-merging lib/idr.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 63 ++++++++++++++++++++---------------- + lib/Kconfig.debug | 8 +++++ + lib/idr.c | 1 - + lib/test_xarray.c | 10 ++++-- + lib/xarray.c | 11 ++++--- + tools/testing/radix-tree/xarray.c | 2 +- + tools/testing/shared/xarray-shared.h | 2 +- + 7 files changed, 59 insertions(+), 38 deletions(-) +Merging hyperv/hyperv-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ 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 (c5a8f13f1e47 efi: Support EDID information) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/x86/kernel/setup.c +Merge made by the 'ort' strategy. + arch/arm64/kernel/image-vars.h | 2 +- + arch/loongarch/kernel/efi.c | 31 +++--- + arch/loongarch/kernel/image-vars.h | 2 +- + arch/riscv/kernel/image-vars.h | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 4 +- + arch/x86/kernel/setup.c | 16 ++- + arch/x86/video/video-common.c | 4 +- + drivers/firmware/efi/earlycon.c | 42 ++++---- + drivers/firmware/efi/efi-init.c | 38 +++---- + drivers/firmware/efi/efi.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/efi-stub-entry.c | 17 +-- + drivers/firmware/efi/libstub/efi-stub.c | 43 +++++--- + drivers/firmware/efi/libstub/efistub.h | 7 +- + drivers/firmware/efi/libstub/primary_display.c | 56 ++++++++++ + drivers/firmware/efi/libstub/screen_info.c | 53 --------- + drivers/firmware/efi/libstub/zboot.c | 4 +- + drivers/firmware/efi/sysfb_efi.c | 144 ++++++++++++++++++------- + drivers/firmware/sysfb.c | 13 +-- + drivers/firmware/sysfb_simplefb.c | 2 +- + drivers/gpu/drm/sysfb/efidrm.c | 14 +-- + drivers/gpu/drm/sysfb/vesadrm.c | 14 +-- + drivers/hv/vmbus_drv.c | 6 +- + drivers/pci/vgaarb.c | 4 +- + drivers/video/Kconfig | 8 +- + drivers/video/fbdev/core/fbmon.c | 8 +- + drivers/video/fbdev/efifb.c | 10 +- + drivers/video/fbdev/vesafb.c | 10 +- + drivers/video/fbdev/vga16fb.c | 8 +- + drivers/video/screen_info_pci.c | 5 +- + include/linux/efi.h | 9 +- + include/linux/screen_info.h | 2 - + include/linux/sysfb.h | 23 +++- + include/video/edid.h | 4 - + 34 files changed, 359 insertions(+), 252 deletions(-) + create mode 100644 drivers/firmware/efi/libstub/primary_display.c + delete mode 100644 drivers/firmware/efi/libstub/screen_info.c +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 (58d6fcb6ee94 slub: keep empty main sheaf as spare in __pcs_replace_empty_main()) +$ 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 +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +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 (1a3cedbdc156 landlock: Fix wrong type usage) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + security/landlock/audit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (abb934acc479 rust: cpumask: add __rust_helper to helpers) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + include/linux/bitfield.h | 5 +++-- + rust/helpers/bitmap.c | 1 + + rust/helpers/bitops.c | 4 ++++ + rust/helpers/cpumask.c | 13 +++++++++++++ + 4 files changed, 21 insertions(+), 2 deletions(-) +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 (5203a78a7c60 tools/nolibc: always use 64-bit mode for s390 header checks) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 6 +++- + tools/include/nolibc/nolibc.h | 1 + + tools/include/nolibc/sys/ptrace.h | 44 ++++++++++++++++++++++++++++ + tools/testing/selftests/nolibc/nolibc-test.c | 2 ++ + 4 files changed, 52 insertions(+), 1 deletion(-) + create mode 100644 tools/include/nolibc/sys/ptrace.h +Merging iommufd/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (b65a8280c766 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 (8f0b4cce4481 Linux 6.19-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 (8f0b4cce4481 Linux 6.19-rc1) +$ 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 000000000000..bd19e67f6ec7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20251219 |