diff options
| -rw-r--r-- | Next/SHA1s | 407 | ||||
| -rw-r--r-- | Next/Trees | 409 | ||||
| -rw-r--r-- | Next/merge.log | 3398 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4215 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f945b59060c0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,407 @@ +Name SHA1 +---- ---- +origin 6e64f4580381e32c06ee146ca807c555b8f73e24 +fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +ext4-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +vfs-brauner-fixes 8b3c655fa2406b9853138142746a39b7615c54a2 +fscrypt-current 0af2f6be1b4281385b618cb86ad946eded089ac8 +fsverity-current 0af2f6be1b4281385b618cb86ad946eded089ac8 +btrfs-fixes c712ad52351095c1612ac2e805aa1f6b02d9283e +vfs-fixes 33927f3d0ecdcff06326d6e4edb6166aed42811c +erofs-fixes e2d8ad009150b636482756d16ea542794cafa8cc +nfsd-fixes bee47cb026e762841f3faece47b51f985e215edb +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +overlayfs-fixes 924577e4f6ca473de1528953a0e13505fae61d7b +bcachefs 631fadd4fdc250b4754c74660e51444e2e21a4b9 +fscrypt fa65058063cbaba6e519b5291a7e2e9e0fa24ae3 +btrfs 442ee950ea05968ab5bfaeeb0c6660c567c61bfa +ceph b828b4bf29d10a3e505a76a39c4daea969e19dc9 +cifs 62cfd11c01d319a88b76c68e40eada00a2355966 +configfs c6b1908224593db76f77b904894cd51933559ae9 +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 6f8b4788266c7df3b7cfc6c665f663b4c3d09aad +erofs df0ce6cefa453d2236381645e529a27ef2f0a573 +exfat b33f91c6276255ca0b90c42142828de05496ed1d +exportfs adc218676eef25575469234709c2d87185ca223a +ext3 17e58687367a5d9488106067112ef7dfb201d985 +ext4 261a2abe20b034c5383a1474133bad3110291ece +f2fs 7e161a991ea71e6ec526abc8f40c6852ebe3d946 +fsverity d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +fuse f0e84022479b4700609e874cf220b5d7d0363403 +gfs2 a90f1b6ad6649d553c9d76f50a42e4ba5783164b +jfs 856db37592021e9155384094e331e2d4589f28b1 +ksmbd 8e7d178d06e8937454b6d2f2811fa6a15656a214 +nfs 4ec752ce6debd5a0e7e0febf6bcf780ccda6ab5e +nfs-anna 38074de35b015df5623f524d6f2b49a0cd395c40 +nfsd e339967eecf1305557f7c697e1bc10b5cc495454 +ntfs3 a49f0abd8959048af18c6c690b065eb0d65b2d21 +orangefs 2138e89cb066b40386b1d9ddd61253347d356474 +overlayfs 6f9ccdad0feaef58b05f07e0fc9d31004147177c +ubifs 99dbb2a1bd661418be33b1ff1462c09b7d2221cf +v9fs 4210030d8bc4834fcb774babc458d02a2432ee76 +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs ded74fddcaf685a9440c5612f7831d0c4c1473ca +zonefs 6982100bb8297c46122cac4f684dcf44cb7d0d8c +vfs-brauner 66639db858112bf6b0f76677f7517643d586e575 +vfs dd589648208a4deab9049805e94b680a15149e61 +mm-hotfixes bebbba259241aae8967e2038608b5fb46f058338 +fs-current 2fd3ef5f1ff90cb1f4cb69ef0df5af351ca746e9 +kbuild-current e04c78d86a9699d136910cfc0bdcf01087e3267e +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes d42e6c20de6192f8e4ab4cf10be8c694ef27e8cb +arm-soc-fixes 9f9d41d643224e1cc7eac89794cf5e5997f8171f +davinci-current 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drivers-memory-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current c8995932db2bad6fa093ac64dbaf7a3e8870eafa +powerpc-fixes ab107276607af90b13a5994997e19b7b9731e251 +s390-fixes 62355f1f87b8c7f8785a8dd3cd5ca6e5b513566a +net ae633388cae349886f1a3cfb27aa092854b24c1b +bpf 0e260fc798bfef6b0dd24627afa01879f901e23e +ipsec 42e42562c9cfcdacf000f1b42284a4fad24f8546 +netfilter d942fe13f72bec92f6c689fbd74c5ec38228c16a +ipvs d942fe13f72bec92f6c689fbd74c5ec38228c16a +wireless 6832a9317eee280117cd695fa885b2b7a7a38daf +ath d9104cec3e8fe4b458b74709853231385779001f +iwlwifi 6832a9317eee280117cd695fa885b2b7a7a38daf +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes a9a9e68954f29b1e197663f76289db4879fd51bb +sound-current e8e4f3c242cc26de9d69bd8b3a678d1e50980abe +sound-asoc-fixes 4bafaff30f0f61c1c09b4baec2b1495b445742ff +regmap-fixes 067aa458a064cd860baef7503c3264bb3482d37e +regulator-fixes 10dfd36f078423c51602a9a21ed85e8e6c947a00 +spi-fixes afa03b83aa4d0401c1ed9051f55e6ef43d26a489 +pci-current d5c647b08ee02cb7fa50d89414ed0f5dc7c1ca0e +driver-core.current d632ab86aff2cef21f794e337a8e7f2320ac3973 +tty.current 55a984928bfa30c7877e28f16910e6de1c170f1f +usb.current d632ab86aff2cef21f794e337a8e7f2320ac3973 +usb-serial-fixes ad1244e1ce18f8c1a5ebad8074bfcf10eacb0311 +phy 89be9a83ccf1f88522317ce02f854f30d6115c41 +staging.current d632ab86aff2cef21f794e337a8e7f2320ac3973 +iio-fixes 187d5553e33ea656c2a93d3e98309dfc166a0de5 +counter-current 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +char-misc.current d632ab86aff2cef21f794e337a8e7f2320ac3973 +soundwire-fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +thunderbolt-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +input-current ab93e0dd72c37d378dd936f031ffb83ff2bd87ce +crypto-current 9d9b193ed73a65ec47cf1fd39925b09da8216461 +libcrypto-fixes 68279380266a5fa70e664de754503338e2ec3f43 +vfio-fixes c1d9dac0db168198b6f63f460665256dedad9b6e +kselftest-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +dmaengine-fixes 2f8a2cfd0994adf5f71737bb0946a76800479220 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes 6463cbe08b0cbf9bba8763306764f5fd643023e1 +mfd-fixes d9d79e4f7dc935fea96dbf3de524404c08d08b03 +v4l-dvb-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +reset-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +mips-fixes 86731a2a651e58953fc949573895f2fa6d456841 +at91-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +omap-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kvm-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +kvms390-fixes d8dfda5af0be6e48178b6f4b46c6af30b06335b2 +hwmon-fixes 9c62e2282900332c8b711d9f9e37af369a8ef71b +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +dma-mapping-fixes aa807b9f22df2eee28593cbbabba0f93f4aa26c1 +drivers-x86-fixes e2967b50b709970547b5cdfa1b42526835327f36 +samsung-krzk-fixes 8d2c2fa2209e83d0eb10f7330d8a0bbdc1df32ff +pinctrl-samsung-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devicetree-fixes 79aef1a3705bbc95b36dad892af1f313490bd65c +dt-krzk-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +scsi-fixes 021f243627ead17eb6500170256d3d9be787dad8 +drm-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +drm-intel-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +mmc-fixes 4b290aae788e06561754b28c6842e4080957d3f7 +rtc-fixes 08d82d0cad51c2b1d454fe41ea1ff96ade676961 +gnss-fixes 86731a2a651e58953fc949573895f2fa6d456841 +hyperv-fixes a4131a50d072b369bfed0b41e741c41fd8048641 +risc-v-fixes b65ca21835ed615907ba231a60db80a2605b94dc +riscv-dt-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +riscv-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx beb6c8326eb4e7006c4aa16b0fee3e303d42e685 +gpio-brgl-fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +gpio-intel-fixes 9ab29ed505557bd106e292184fa4917955eb8e6e +pinctrl-intel-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +auxdisplay-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kunit-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +memblock-fixes da8bf5daa5e55a6af2b285ecda460d6454712ff4 +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 6235ce77749f45cac27f630337e2fdf04e8a6c73 +efi-fixes 64e135f1eaba0bbb0cdee859af3328c68d5b9789 +battery-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +iommufd-fixes 9a96876e3c6578031fa5dc5dde7759d383b2fb75 +rust-fixes 479058002c32b77acac43e883b92174e22c4be2d +w1-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +pmdomain-fixes 621a88dbfe9006c318a0cafbd12e677ccfe006e7 +i2c-host-fixes 7e161a991ea71e6ec526abc8f40c6852ebe3d946 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes e4b2a0c2b9be6d10b0e50a7485fe9f569a6f2436 +thead-clk-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +pwrseq-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +thead-dt-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +ftrace-fixes 327e28664307d49ce3fa71ba30dcc0007c270974 +ring-buffer-fixes e4d4b8670c44cdd22212cab3c576e2d317efa67c +trace-fixes b5e8acc14dcb314a9b61ff19dcd9fdd0d88f70df +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +tip-fixes 2a8be06e6de51a37442cd427c5e73c0943edb58b +slab-fixes be8250786ca94952a19ce87f98ad9906448bc9ef +drm-msm-fixes 42464c51ccccb6343a932a7ea8bc9181e589f270 +uml-fixes 2dca89df0d1116f722b4be100e4bfcff858058e8 +fwctl-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devsec-tsm-fixes fba4ceaa242d2bdf4c04b77bda41d32d02d3925d +drm-misc-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +linus ffd294d346d185b70e28b1a28abe367bbfe53c04 +mm-stable 6bcdbd62bd56e6d7383f9e06d9d148935b3c9b73 +mm-nonmm-stable 6bcdbd62bd56e6d7383f9e06d9d148935b3c9b73 +mm-unstable bbd7b37250697a1622af12fce69a3f2d1587a73d +mm-nonmm-unstable e2d11e52598fbc1fe2372109792fe5baf167080d +kbuild 8d6841d5cb20dcee7bf9ba98cb6dbcbf5bccfea5 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 6235ce77749f45cac27f630337e2fdf04e8a6c73 +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping fbf5e2234169067a811ab38dc89cc0d260499622 +asm-generic 582847f9702461b0a1cba3efdb2b8135bf940d53 +alpha 1523226edda566057bdd3264ceb56631ddf5f6f7 +arm 8dd85887ad83438750fa09237da9342ce966dd0f +arm64 5b1ae9de71335865d06ff0e60eadcf368a735edf +arm-perf e480898e767c54a883e965fc306e2ece013cbca5 +arm-soc 9f9d41d643224e1cc7eac89794cf5e5997f8171f +amlogic 58abdca0eb653c1a2e755ba9ba406ee475d87636 +asahi-soc 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +at91 e99113d11171a03c865ca5b10e0ae9b587034ae2 +bmc 88bca15c33c18d000a27240677bbe1838d9925f3 +broadcom 89abb622d518a917e16b6cd441dc75f547300303 +davinci 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drivers-memory 93a7aedc4cc4476da54ea45f3ed5308aabafef75 +fsl 8b3da0519ae664dd7e3d840c3a6851ec5a7f42de +imx-mxs cdc22fb12efffa2357cea791a7c4a1a4407a66a7 +mediatek 6cbb623586d5cd1abf2b1b8500294546b8543058 +mvebu 88084e0358ff6f5c39accddf3f0da4162e6d0ccf +omap db91121f001a3a1fad41ff816bdbddb7da443297 +qcom dd98924ac360bb801d640645649539ae0dd1985a +renesas 7a323accaf6bf40f0d345694978e3657363c3772 +reset 335bb23abed39d9ec174ea520bc2337e2fe605ef +rockchip 1f0c7abd82357d425e34645fa086280f552ae822 +samsung-krzk 94f19ac4670d5867609484329ee62f6bf254c090 +scmi d2eedaa3909be9102d648a4a0a50ccf64f96c54f +sophgo 349ae53a949ce96d0e1453170d31d26ed54ba68e +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 6be7a5a768aafcb07d177bd2ae36ab84e4e0acde +stm32 1a32f7427eb3d1248bc64cd745b93f88cc838933 +sunxi cbe908fc8ebbea52f2d674773c2ddaf8cbfa4757 +tee 84c5f44d24c6a26d38642d996507f08ac92eb3ed +tegra 499b75defe5654ba29e838bd2f5e79d3a16229af +thead-dt c31f2899eab084b3557e9f9e10fc7898113ef18d +ti 65f6e3eb6351ff402a03f2b6b56ab1fd61511334 +xilinx 3a0e3f82b8ee4386bfbc2cdcdf4243a3e8de4bad +clk 64c21f253a3737c15ab745e9276b2352d86aed26 +clk-imx c78865241ecffaff7ce5db00ed5b71c1a70c0ff1 +clk-renesas 0ab2d84f94dae48c3e7605cdc99dbb4e7c7b206a +thead-clk 54edba916e2913b0893b0f6404b73155d48374ea +csky 2b48804336be69272d43939ff0dc3b0c0a703395 +loongarch d35ec48fa6c8fe0cfa4a03155109fec7677911d4 +m68k c8995932db2bad6fa093ac64dbaf7a3e8870eafa +m68knommu 89be9a83ccf1f88522317ce02f854f30d6115c41 +microblaze c0e7bb02f7962cd4b2327196aa1b0f9568c783e4 +mips 3ebcbf079c26ab6e82faa7f896b66def55547eee +openrisc f0eedcf22581ca1cc438fb38a479ff41ab882d51 +parisc-hd 89f686a0fb6e473a876a9a60a13aec67a62b9a7e +powerpc cf2a6de32cabbf84a889e24a9ee7c51dee4a1f70 +risc-v 7b388bf7a9d9fe528559f896ab6c215e0194361e +riscv-dt 28fa0dcb571ab8f3be4d919f0e20e01d4e44bcb1 +riscv-soc bd4d5d3faadcdf5d65377f14dcbaa4dbb27ee637 +s390 85f744617f1a633d91c066f3e1733e998e97d7a4 +sh c32969d0362a790fbc6117e0b6a737a7e510b843 +sparc 2cec2c4dc90cbf5194c1acef08c1e74f0437af95 +uml fc9ed2f6589dc2c11f05883e5c323be5f39fd241 +xtensa 44a4ef59d5506c6dc7599d876a3a1014697ec480 +fs-next 9083de2b71ec5e1ff67165d6ca5cd58a8b3cb9f3 +printk dcc3191a3dde4027ac3a995d852b957e398cf6cc +pci 0bd0a41a5120f78685a132834865b0a631b9026a +pstore d679c2e1e8d96f71f85e2ef3877407d264212cc3 +hid 1330eb33bddca5f8dd163bbe3a8f8e828697c0fd +i2c 976990f4120c220816b46650d840019451698a28 +i2c-host 7e161a991ea71e6ec526abc8f40c6852ebe3d946 +i3c 3b661ca549b9e5bb11d0bc97ada6110aac3282d2 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging de1fffd88600c5ee1c095c84b86484cd0329a9e8 +jc_docs 35293ebbb65e0295d3b9357f786004ae1026d00f +v4l-dvb d968e50b5c26642754492dea23cbd3592bde62d8 +v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3 +pm 77d832285656c59238e7992f12296e18657251ee +cpufreq-arm bbd67be5546d6080a7dc9903355a54ac4b865caa +cpupower e6c3f96141ebab688d96cf582bcab67f930e0baa +devfreq 7da2fdaaa1e6062686ac96a9f096c2d7847533e4 +pmdomain 05e35bd07d56780f0a5119973995b97a16843579 +opp 22679d807dea5c065d8019acfce48f20e87ba5ca +thermal 1d264d3a198839c7483580acdce17e1015d0ef91 +rdma c18646248fed07683d4cee8a8af933fc4fe83c0d +net-next d9104cec3e8fe4b458b74709853231385779001f +bpf-next 821c9e515db512904250e1d460109a1dc4c7ef6b +ipsec-next d9104cec3e8fe4b458b74709853231385779001f +mlx5-next 888a7776f4fb04c19bec70c737c61c2f383c6b1e +netfilter-next d9104cec3e8fe4b458b74709853231385779001f +ipvs-next d9104cec3e8fe4b458b74709853231385779001f +bluetooth 3e383124ce63360852a6992b8e36d944112ab233 +wireless-next 126d85fb040559ba6654f51c0b587d280b041abb +ath-next 708243c62efde8241e2c66e9c3f377658855149d +iwlwifi-next d2af710d6d50b3a3e691c4e2b262ed9de3038e96 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 9cf9db888f387844e063efc6296e9fa5c042995e +nand fb2fae70e7e985c4acb1ad96110d8b98bb64a87c +spi-nor 2e3a7476ec3989e77270b9481e76e137824b17c0 +crypto 9d9b193ed73a65ec47cf1fd39925b09da8216461 +libcrypto 2a1a127aecf628a7629c860e2ad645174b5d3211 +drm 64c627519474e687b876e6e50cc28ece16d10564 +drm-exynos 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drm-misc c0a8e4443d768e5c86ddb52a3a744a151e7b72b0 +amdgpu 111821e4b5a3105c42c7c99f4abd4d8af9f64248 +drm-intel 5a569ef4d4ab184a481dd8ecb58f464a89b44d2f +drm-msm 8290d37ad2b087bbcfe65fa5bcaf260e184b250a +drm-msm-lumag cd86e80b77b2f3d9e72c2d27a967b666d2c47a44 +drm-nova 14ae91a81ec8fa0bc23170d4aa16dd2a20d54105 +drm-xe 9b7ca35ed28fe5fad86e9d9c24ebd1271e4c9c3e +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev e4fc307d8e24f122402907ebf585248cad52841d +regmap 067aa458a064cd860baef7503c3264bb3482d37e +sound e8e4f3c242cc26de9d69bd8b3a678d1e50980abe +ieee1394 95a042a0c8ecd3c1e886648f6f6ab9c7e4403db9 +sound-asoc 4bafaff30f0f61c1c09b4baec2b1495b445742ff +modules 40a826bd6c82ae45cfd3a19cd2a60a10f56b74c0 +input 4f67c41894674d351a4b4e7dd3471380b71b5bb3 +block 9c28ff6c60ff3ceb587864b1a5d7b1ba28276e25 +device-mapper 55a0fbd2ac3fe8f61a30ea697b2eb3034f6778c8 +libata 6cb43739b93c64c4a2148222bd606e6920257752 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc 4b290aae788e06561754b28c6842e4080957d3f7 +mfd 006aa8f57f55dd5bf68c4ada1e0d3f4e59027d71 +backlight 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +battery 7b41a2341fa62babda5d5c7a32c632e9eba2ee11 +regulator 10dfd36f078423c51602a9a21ed85e8e6c947a00 +security 5d8b97c946777118930e1cfb075cab59a139ca7c +apparmor 5f49c2d1f422c660c726ac5e0499c66c901633c2 +integrity aa9bb1b32594cd67cafd29b330b158128b503882 +selinux 850dada4b3afd014e2c69226bf9bb85469338000 +smack 6ddd169d0288ebee8ec9afcd75825ce8476edb00 +tomoyo 038d61fd642278bab63ee8ef722c50d10ab01e8f +tpmdd 7f0c6675b3194461ad7bb8db1d822445121fb029 +watchdog 48defdf6b083f74a44e1f742db284960d3444aec +iommu b9e6e8ae0a5f9edae7cc1b5972a1d3dea9223fe2 +audit ae1ae11fb277f1335d6bcd4935ba0ea985af3c32 +devicetree 0121898ec05fa4c1f566fc05c7e8b3caf0998f97 +dt-krzk 6cd594ed969d5cfc7f97029f8ca0d240637ebb8d +mailbox e1584a533a1eca9633cec2d4557d2f41734cf220 +spi afa03b83aa4d0401c1ed9051f55e6ef43d26a489 +tip f31b0ec5758022cf4ad4a81232be289df9bbbbff +clockevents d7b8f8e20813f0179d8ef519541a3527e7661d3a +edac 1fb0ddddf5d139089675b86702933cbca992b4d4 +ftrace 39f069d5a466cb9a572ee10c5391e822cdccaf05 +rcu cc1d1365f0f414f6522378867baa997642a7e6b2 +paulmck b706eec9304fc3cbc48a6a09aff8533081815ebc +kvm 196d9e72c4b0bd68b74a4ec7f52d248f37d0f030 +kvm-arm 7b8346bd9fce6b76a96c6780d2e5bba76687f97f +kvms390 efe54612bdb634c8548f004f3470f3df50b3d9a8 +kvm-ppc fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +kvm-riscv 07a289a031404ec583c01d8e87680d434fc62c1f +kvm-x86 33f843444e28920d6e624c6c24637b4bb5d3c8de +xen-tip 114a2de6fa86d99ed9546cc9113a3cad58beef79 +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues 324cee0c272cb3fa6c4d3c0de4b68a9c5357d2e7 +sched-ext 9f0744a0e87e4e74725d495bba2aa540dec4a77a +drivers-x86 1798561befd8be1e52feb54f850efcab5a595f43 +chrome-platform cc2d5b72b13b3af2b9b4bed3d5dfd0de14414230 +chrome-platform-firmware 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +hsi 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +leds-lj 4903924ac7ef31fbbe48b3261b1bc86ce6cd7e97 +ipmi ec50ec378e3fd83bde9b3d622ceac3509a60b6b5 +driver-core d632ab86aff2cef21f794e337a8e7f2320ac3973 +usb d632ab86aff2cef21f794e337a8e7f2320ac3973 +thunderbolt 2d1beba54fdaac0d624b016025d4ec5856713fb1 +usb-serial bdf2ab177e2fca85394fce86629f5e35aa7fa33a +tty 89748acdf226fd1a8775ff6fa2703f8412b286c8 +char-misc d632ab86aff2cef21f794e337a8e7f2320ac3973 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight a80198ba650f50d266d7fc4a6c5262df9970f9f2 +fastrpc 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga 4f156ee58bb84a081ae4a8ac0bbc425176882014 +icc ca652cf0c2612add5d3c9283bbc742dabc704a77 +iio 0a686b9c4f847dc21346df8e56d5b119918fefef +phy-next 4a3556b81b99f0c8c0358f7cc6801a62b4538fe2 +soundwire 34b1cb4ec286603127aa8c4191ea527eb8dd3567 +extcon 5f09caafc652bcee7a5247e40dd34d1de1ad7d7f +gnss e326371f3002dbf54befd8ada9570fa489a46991 +vfio b1779e4f209c7ff7e32f3c79d69bca4e3a3a68b6 +w1 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spmi 0ff41df1cb268fc69e703a08a57ee14ae967d0ca +staging d632ab86aff2cef21f794e337a8e7f2320ac3973 +counter-next 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine e3a9ccd21897a59d02cf2b7a95297086249306d6 +cgroup d445d2ab8129b1da93f25a9a71e36f43223d5543 +scsi 3aaa3b2d116ee37ab4833389364e454595ee96c3 +scsi-mkp 72fc388d8bc0b49fd038477b74618cc15ce18b56 +vhost 878676525147eb3544db2719439428eb955b2042 +rpmsg 01d7d9241256597eb38ec8a119ff89062b9fa10a +gpio-brgl d9d87d90cc0b10cd56ae353f50b11417e7d21712 +gpio-intel 9ab29ed505557bd106e292184fa4917955eb8e6e +pinctrl a3fe1324c3c5c292ec79bd756497c1c44ff247d2 +pinctrl-intel 3b4408038da935be7b1efb7589cc1badb6d10a67 +pinctrl-renesas 7000167796a00d64322dc3ed0c0970e31d481ed6 +pinctrl-samsung 683d532dfc9657ab8aae25204f378352ed144646 +pwm 65c6f742ab14ab1a2679fba72b82dcc0289d96f1 +ktest a5e71638ddd7f1dc0b9f3a5ac8ab8bef48b9f0ee +kselftest 30fb5e134f05800dc424f8aa1d69841a6bdd9a54 +kunit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kunit-next 34db4fba81916a2001d7a503dfcf718c08ed5c42 +livepatching a8e905a819fdfb4ce674363896320e36657d0f16 +rtc bb5b0b4317c9516bdc5e9a4235e3b5f1a73b7e48 +nvdimm 9f97e61bde6a91a429f48da1a461488a15b01813 +at24 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +ntb 0cadf92e93d4caed1714faac53e9a0051810f4b0 +seccomp b0c9bfbab925ac6385d4d06a134fd89cadf771fe +slimbus 0af2f6be1b4281385b618cb86ad946eded089ac8 +nvmem 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66 +hyperv d9016a249be5316ec2476f9947356711e70a16ec +auxdisplay 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kgdb afdbe49276accb87a0c7414e75864c78289ece2f +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +mhi 00559ba3ae740e7544b48fb509b2b97f56615892 +memblock 3b394dff15e14550a26b133fc7b556b5b526f6a5 +cxl f11a5f89910a7ae970fbce4fdc02d86a8ba8570f +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 02eb7a8eee20b9ec6aafd5e17c5c41b53e8b13ef +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab 8185696483dcb29688fc23c45c99d86b73754982 +random 3778dcb2dcc1ce03a2b25e5d951fe9912e843d1e +landlock 6dde339a3df80a57ac3d780d8cfc14d9262e2acd +rust 479058002c32b77acac43e883b92174e22c4be2d +rust-alloc d49ac7744f578bcc8708a845cce24d3b91f86260 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init fc3870dc5cadb701b4122e4a8daa85f9fa2f57b9 +rust-timekeeping d4b29ddf82a458935f1bd4909b8a7a13df9d3bdc +rust-xarray fa616196fbea12462107774fb6a1908c95f71cf0 +sysctl 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +execve 7f71195c15dcf5f34c4c7f056603659374e3a525 +bitmap 89748acdf226fd1a8775ff6fa2703f8412b286c8 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp f627b51aaa041cba715b59026cf2d9cb1476c7ed +nolibc b9e50363178a40c76bebaf2f00faa2b0b6baf8d1 +iommufd 2c78e74493d33b002312296fbab1d688bfd0f76f +turbostat 447c98c1ca4a4b0d43be99f76c558c09956484f3 +pwrseq 07d59dec6795428983a840de85aa02febaf7e01b +capabilities-next cdd73b1666079a73d061396f361df55d59fe96e6 +ipe 038d61fd642278bab63ee8ef722c50d10ab01e8f +kcsan 9872916ad1a1a5e7d089e05166c85dbd65e5b0e8 +crc 118da22eb6fbd48f896d17411f942399283d600c +fwctl 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devsec-tsm 9d948b8804096d940022b1a3c483a5beb8b46574 +hisilicon b1136432c97241f0e5c40d58597da00d49cd9917 +kthread d8b4bf4ea04dd96fe43f6010c614149aba4c9b91 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2477ec47fb71 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,409 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +ext4-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +bcachefs git git://evilpiepirate.org/bcachefs.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +fs-current git linux-next +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes git https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes git https://github.com/sophgo/linux.git#soc-fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes git https://github.com/spacemit-com/linux#fixes +tip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes git https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes git git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +linus git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#for-next +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +alpha git git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl git https://github.com/chleroy/linux.git#soc_fsl +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo git https://github.com/sophgo/linux.git#for-next +sophgo-soc git https://github.com/sophgo/linux.git#soc-for-next +spacemit git https://github.com/spacemit-com/linux#for-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +thead-dt git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fs-next git linux-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm git https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-nova git https://gitlab.freedesktop.org/drm/nova.git#nova-next +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git#next +paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +rust-alloc git https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io git https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init git https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping git https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray git https://github.com/Rust-for-Linux/linux.git#xarray-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe git https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan git git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +fwctl git git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm git git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon git https://github.com/hisilicon/linux-hisi.git#for-next +kthread git git://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..fa861d707b6e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3398 @@ +$ date -R +Fri, 08 Aug 2025 09:00:54 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at cca7a0aae895 Merge tag 'for-6.17-fix-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (6e64f4580381 Merge tag 'input-for-v6.17-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating cca7a0aae895..6e64f4580381 +Fast-forward (no commit created; -m option ignored) + .../devicetree/bindings/input/syna,rmi4.yaml | 20 ++ + .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 + + .../bindings/input/touchscreen/lpc32xx-tsc.txt | 16 -- + .../input/touchscreen/nxp,lpc3220-tsc.yaml | 43 ++++ + .../input/touchscreen/sitronix,st1232.yaml | 29 +++ + .../bindings/input/touchscreen/ti.tsc2007.yaml | 75 ++++++ + .../bindings/input/touchscreen/touchscreen.yaml | 119 +++++++++ + .../bindings/input/touchscreen/tsc2007.txt | 39 --- + Documentation/input/devices/edt-ft5x06.rst | 21 +- + Documentation/input/gamepad.rst | 19 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 4 +- + MAINTAINERS | 8 +- + drivers/char/ipmi/ipmi_msghandler.c | 8 +- + drivers/char/ipmi/ipmi_si_intf.c | 4 - + drivers/char/ipmi/ipmi_watchdog.c | 59 +++-- + drivers/hid/hid-debug.c | 2 + + drivers/hid/hid-steam.c | 35 ++- + drivers/infiniband/sw/siw/siw_qp_tx.c | 5 +- + drivers/input/Makefile | 2 +- + drivers/input/evdev.c | 8 +- + drivers/input/input.c | 2 +- + drivers/input/joystick/xpad.c | 64 ++--- + drivers/input/keyboard/adp5588-keys.c | 9 +- + drivers/input/keyboard/atkbd.c | 12 +- + drivers/input/keyboard/mtk-pmic-keys.c | 17 ++ + drivers/input/keyboard/samsung-keypad.c | 137 +++++----- + drivers/input/misc/Kconfig | 7 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/cs40l50-vibra.c | 1 - + drivers/input/misc/max77693-haptic.c | 41 ++- + drivers/input/misc/max8997_haptic.c | 98 ++++---- + drivers/input/misc/pcf50633-input.c | 113 --------- + drivers/input/rmi4/Kconfig | 15 ++ + drivers/input/rmi4/Makefile | 2 + + drivers/input/rmi4/rmi_bus.c | 6 + + drivers/input/rmi4/rmi_driver.h | 2 + + drivers/input/rmi4/rmi_f1a.c | 143 +++++++++++ + drivers/input/rmi4/rmi_f21.c | 179 +++++++++++++ + drivers/input/touch-overlay.c | 277 +++++++++++++++++++++ + drivers/input/touchscreen/ad7879.c | 11 +- + drivers/input/touchscreen/edt-ft5x06.c | 26 +- + drivers/input/touchscreen/goodix.c | 50 +++- + drivers/input/touchscreen/st1232.c | 35 ++- + drivers/vfio/device_cdev.c | 38 ++- + drivers/vfio/group.c | 7 +- + drivers/vfio/iommufd.c | 4 + + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + + drivers/vfio/pci/mlx5/cmd.c | 4 +- + drivers/vfio/pci/mlx5/main.c | 1 + + drivers/vfio/pci/nvgrace-gpu/main.c | 2 + + drivers/vfio/pci/pds/vfio_dev.c | 2 + + drivers/vfio/pci/qat/main.c | 5 +- + drivers/vfio/pci/vfio_pci.c | 1 + + drivers/vfio/pci/vfio_pci_core.c | 24 +- + drivers/vfio/pci/virtio/main.c | 3 + + drivers/vfio/vfio_iommu_type1.c | 7 + + drivers/vfio/vfio_main.c | 3 +- + include/linux/input/touch-overlay.h | 25 ++ + include/linux/vfio.h | 4 + + include/linux/vfio_pci_core.h | 2 + + include/uapi/linux/input-event-codes.h | 8 + + include/uapi/linux/vfio.h | 12 +- + 62 files changed, 1443 insertions(+), 475 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/nxp,lpc3220-tsc.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti.tsc2007.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt + delete mode 100644 drivers/input/misc/pcf50633-input.c + create mode 100644 drivers/input/rmi4/rmi_f1a.c + create mode 100644 drivers/input/rmi4/rmi_f21.c + create mode 100644 drivers/input/touch-overlay.c + create mode 100644 include/linux/input/touch-overlay.h +Merging fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (8b3c655fa240 afs: Set vllist to NULL if addr parsing fails) +$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (c712ad523510 Merge branch 'misc-6.17' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/extent_io.c | 11 ++++++----- + fs/btrfs/inode.c | 8 +++++--- + fs/btrfs/qgroup.c | 3 +-- + fs/btrfs/relocation.c | 19 +++++++++++++++++++ + fs/btrfs/tree-log.c | 19 +++++++------------ + fs/btrfs/zoned.c | 2 +- + 6 files changed, 39 insertions(+), 23 deletions(-) +Merging vfs-fixes/fixes (33927f3d0ecd habanalabs: fix UAF in export_dmabuf()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/accel/habanalabs/common/memory.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) +Merging erofs-fixes/fixes (e2d8ad009150 erofs: fix atomic context detection when !CONFIG_DEBUG_LOCK_ALLOC) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/Kconfig | 20 ++++++++++---------- + fs/erofs/super.c | 24 ++++++++++++++---------- + fs/erofs/zdata.c | 13 +++++++++++-- + 3 files changed, 35 insertions(+), 22 deletions(-) +Merging nfsd-fixes/nfsd-fixes (bee47cb026e7 sunrpc: fix handling of server side tls alerts) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/vfs.c +Merge made by the 'ort' strategy. + fs/nfsd/localio.c | 5 +++-- + fs/nfsd/vfs.c | 10 +++++++++- + net/sunrpc/svcsock.c | 43 +++++++++++++++++++++++++++++++++++-------- + 3 files changed, 47 insertions(+), 11 deletions(-) +Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (924577e4f6ca ovl: Fix nested backing file paths) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging bcachefs/for-next (631fadd4fdc2 bcachefs: Don't lock inode around page_symlink) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs-io-buffered.c +Auto-merging fs/bcachefs/fs.c +Merge made by the 'ort' strategy. + fs/bcachefs/acl.c | 29 +- + fs/bcachefs/alloc_background.c | 570 +++++++++---------- + fs/bcachefs/alloc_background.h | 9 +- + fs/bcachefs/alloc_foreground.c | 258 ++++----- + fs/bcachefs/alloc_foreground.h | 9 +- + fs/bcachefs/async_objs.c | 29 +- + fs/bcachefs/async_objs.h | 7 +- + fs/bcachefs/async_objs_types.h | 2 +- + fs/bcachefs/backpointers.c | 167 +++--- + fs/bcachefs/bcachefs.h | 91 ++-- + fs/bcachefs/bcachefs_format.h | 42 +- + fs/bcachefs/bkey.c | 4 +- + fs/bcachefs/bkey_methods.c | 6 +- + fs/bcachefs/bkey_types.h | 5 + + fs/bcachefs/bset.c | 74 ++- + fs/bcachefs/btree_cache.c | 44 +- + fs/bcachefs/btree_cache.h | 19 + + fs/bcachefs/btree_gc.c | 258 ++++----- + fs/bcachefs/btree_io.c | 123 +++-- + fs/bcachefs/btree_iter.c | 424 ++++++++------- + fs/bcachefs/btree_iter.h | 348 ++++++------ + fs/bcachefs/btree_journal_iter.c | 20 +- + fs/bcachefs/btree_key_cache.c | 69 ++- + fs/bcachefs/btree_locking.c | 17 +- + fs/bcachefs/btree_node_scan.c | 36 +- + fs/bcachefs/btree_trans_commit.c | 125 +++-- + fs/bcachefs/btree_types.h | 43 +- + fs/bcachefs/btree_update.c | 339 ++++++------ + fs/bcachefs/btree_update.h | 150 +++-- + fs/bcachefs/btree_update_interior.c | 387 ++++++------- + fs/bcachefs/btree_update_interior.h | 12 +- + fs/bcachefs/btree_write_buffer.c | 78 ++- + fs/bcachefs/btree_write_buffer.h | 8 +- + fs/bcachefs/buckets.c | 258 ++++----- + fs/bcachefs/buckets_waiting_for_journal.c | 30 +- + fs/bcachefs/chardev.c | 120 ++-- + fs/bcachefs/checksum.c | 54 +- + fs/bcachefs/clock.c | 17 +- + fs/bcachefs/compress.c | 29 +- + fs/bcachefs/compress.h | 36 +- + fs/bcachefs/data_update.c | 58 +- + fs/bcachefs/data_update.h | 1 + + fs/bcachefs/debug.c | 88 ++- + fs/bcachefs/dirent.c | 88 ++- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 270 +++++---- + fs/bcachefs/disk_accounting.h | 19 +- + fs/bcachefs/disk_groups.c | 27 +- + fs/bcachefs/ec.c | 362 +++++------- + fs/bcachefs/ec.h | 2 +- + fs/bcachefs/enumerated_ref.c | 4 +- + fs/bcachefs/errcode.c | 3 +- + fs/bcachefs/errcode.h | 14 + + fs/bcachefs/error.c | 65 +-- + fs/bcachefs/error.h | 3 +- + fs/bcachefs/extent_update.c | 67 ++- + fs/bcachefs/extent_update.h | 2 - + fs/bcachefs/extents.c | 55 +- + fs/bcachefs/extents.h | 4 + + fs/bcachefs/fast_list.c | 32 +- + fs/bcachefs/fast_list.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 96 ++-- + fs/bcachefs/fs-io-direct.c | 26 +- + fs/bcachefs/fs-io-pagecache.c | 55 +- + fs/bcachefs/fs-io.c | 141 +++-- + fs/bcachefs/fs-io.h | 19 +- + fs/bcachefs/fs-ioctl.c | 33 +- + fs/bcachefs/fs.c | 254 ++++----- + fs/bcachefs/fsck.c | 649 +++++++++++----------- + fs/bcachefs/inode.c | 252 ++++----- + fs/bcachefs/io_misc.c | 83 ++- + fs/bcachefs/io_read.c | 235 ++++---- + fs/bcachefs/io_read.h | 24 +- + fs/bcachefs/io_write.c | 97 ++-- + fs/bcachefs/journal.c | 253 ++++----- + fs/bcachefs/journal.h | 3 +- + fs/bcachefs/journal_io.c | 248 +++++---- + fs/bcachefs/journal_io.h | 7 + + fs/bcachefs/journal_reclaim.c | 220 ++++---- + fs/bcachefs/journal_seq_blacklist.c | 56 +- + fs/bcachefs/journal_seq_blacklist.h | 3 + + fs/bcachefs/logged_ops.c | 16 +- + fs/bcachefs/logged_ops.h | 2 +- + fs/bcachefs/lru.c | 48 +- + fs/bcachefs/lru.h | 10 + + fs/bcachefs/migrate.c | 31 +- + fs/bcachefs/move.c | 316 +++++------ + fs/bcachefs/move.h | 14 +- + fs/bcachefs/movinggc.c | 218 +++++--- + fs/bcachefs/namei.c | 154 +++--- + fs/bcachefs/nocow_locking.c | 10 +- + fs/bcachefs/opts.c | 33 +- + fs/bcachefs/opts.h | 8 +- + fs/bcachefs/printbuf.h | 4 + + fs/bcachefs/progress.c | 6 +- + fs/bcachefs/progress.h | 3 + + fs/bcachefs/quota.c | 103 ++-- + fs/bcachefs/rebalance.c | 221 ++++---- + fs/bcachefs/recovery.c | 412 ++++---------- + fs/bcachefs/recovery_passes.c | 68 +-- + fs/bcachefs/recovery_passes.h | 9 +- + fs/bcachefs/reflink.c | 137 ++--- + fs/bcachefs/replicas.c | 161 +++--- + fs/bcachefs/sb-clean.c | 36 +- + fs/bcachefs/sb-counters_format.h | 12 +- + fs/bcachefs/sb-downgrade.c | 19 +- + fs/bcachefs/sb-errors.c | 45 +- + fs/bcachefs/sb-errors_format.h | 11 +- + fs/bcachefs/sb-members.c | 164 +++--- + fs/bcachefs/sb-members.h | 44 +- + fs/bcachefs/sb-members_format.h | 2 +- + fs/bcachefs/six.c | 21 +- + fs/bcachefs/snapshot.c | 435 ++++++--------- + fs/bcachefs/snapshot.h | 32 +- + fs/bcachefs/snapshot_types.h | 2 +- + fs/bcachefs/str_hash.c | 57 +- + fs/bcachefs/str_hash.h | 47 +- + fs/bcachefs/subvolume.c | 246 ++++----- + fs/bcachefs/subvolume.h | 20 +- + fs/bcachefs/super-io.c | 112 ++-- + fs/bcachefs/super.c | 876 +++++++++++++++++------------- + fs/bcachefs/sysfs.c | 28 +- + fs/bcachefs/tests.c | 340 +++++------- + fs/bcachefs/thread_with_file.c | 48 +- + fs/bcachefs/time_stats.c | 7 +- + fs/bcachefs/trace.h | 157 ++---- + fs/bcachefs/util.c | 28 +- + fs/bcachefs/util.h | 10 +- + fs/bcachefs/xattr.c | 58 +- + lib/closure.c | 12 +- + 130 files changed, 6332 insertions(+), 6791 deletions(-) +Merging fscrypt/for-next (fa65058063cb ceph: Remove gfp_t argument from ceph_fscrypt_encrypt_*()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (442ee950ea05 Merge branch 'for-next-current-v6.15-20250722' into for-next-20250722) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (b828b4bf29d1 ceph: fix variable dereferenced before check in ceph_umount_begin()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (62cfd11c01d3 smb: client: make use of smbdirect_socket.status_wait) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/Makefile | 2 +- + fs/smb/client/cifs_debug.c | 24 +- + fs/smb/client/cifsfs.c | 8 +- + fs/smb/client/cifsglob.h | 23 +- + fs/smb/client/cifsproto.h | 15 + + fs/smb/client/cifssmb.c | 4 +- + fs/smb/client/cifstransport.c | 566 +++++++++++++++++++++++++++ + fs/smb/client/connect.c | 35 +- + fs/smb/client/fs_context.c | 19 +- + fs/smb/client/fs_context.h | 18 +- + fs/smb/client/link.c | 13 +- + fs/smb/client/reparse.c | 2 +- + fs/smb/client/smb1ops.c | 19 +- + fs/smb/client/smb2inode.c | 5 +- + fs/smb/client/smb2ops.c | 63 ++- + fs/smb/client/smb2transport.c | 4 +- + fs/smb/client/smbdirect.c | 566 ++++++++++++++------------- + fs/smb/client/smbdirect.h | 97 ----- + fs/smb/client/transport.c | 602 ++--------------------------- + fs/smb/common/smbdirect/smbdirect_socket.h | 133 ++++++- + 20 files changed, 1149 insertions(+), 1069 deletions(-) + create mode 100644 fs/smb/client/cifstransport.c +Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust abstractions) +$ git merge -m Merge branch 'configfs-next' of git://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 git://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 +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 (6f8b4788266c dlm: drop SCTP Kconfig dependency) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (df0ce6cefa45 erofs: support to readahead dirent blocks in erofs_readdir()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (b33f91c62762 exfat: optimize allocation bitmap loading time) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 12 +++++++++++- + fs/exfat/dir.c | 1 - + fs/exfat/exfat_fs.h | 1 + + 3 files changed, 12 insertions(+), 2 deletions(-) +Merging exportfs/exportfs-next (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (17e58687367a Merge fsnotify changes with fixed up authorship.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (261a2abe20b0 ext4: fix unused variable warning in ext4_init_new_dir) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. + fs/ext4/namei.c | 2 -- + 1 file changed, 2 deletions(-) +Merging f2fs/dev (7e161a991ea7 Merge tag 'i2c-for-6.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (f0e84022479b virtio_fs: Remove redundant spinlock in virtio_fs_request_complete()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging MAINTAINERS +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging include/linux/wait.h +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + .../filesystems/{ => fuse}/fuse-io-uring.rst | 0 + Documentation/filesystems/{ => fuse}/fuse-io.rst | 2 +- + .../filesystems/{ => fuse}/fuse-passthrough.rst | 0 + Documentation/filesystems/{ => fuse}/fuse.rst | 20 ++- + Documentation/filesystems/fuse/index.rst | 14 ++ + Documentation/filesystems/index.rst | 5 +- + MAINTAINERS | 3 +- + fs/fuse/dev.c | 5 +- + fs/fuse/file.c | 1 - + fs/fuse/virtio_fs.c | 3 - + include/linux/wait.h | 12 ++ + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/fuse/.gitignore | 3 + + tools/testing/selftests/filesystems/fuse/Makefile | 21 +++ + .../testing/selftests/filesystems/fuse/fuse_mnt.c | 146 +++++++++++++++++++++ + .../selftests/filesystems/fuse/fusectl_test.c | 140 ++++++++++++++++++++ + 16 files changed, 361 insertions(+), 15 deletions(-) + rename Documentation/filesystems/{ => fuse}/fuse-io-uring.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse-io.rst (99%) + rename Documentation/filesystems/{ => fuse}/fuse-passthrough.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse.rst (95%) + create mode 100644 Documentation/filesystems/fuse/index.rst + create mode 100644 tools/testing/selftests/filesystems/fuse/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fuse/Makefile + create mode 100644 tools/testing/selftests/filesystems/fuse/fuse_mnt.c + create mode 100644 tools/testing/selftests/filesystems/fuse/fusectl_test.c +Merging gfs2/for-next (a90f1b6ad664 Merge tag 'gfs2-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (856db3759202 jfs: fix metapage reference count leak in dbAllocCtl) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8e7d178d06e8 smb: server: Fix extension string in ksmbd_extract_shortname()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/smb/server/transport_tcp.c +Merge made by the 'ort' strategy. + fs/smb/server/connection.h | 1 + + fs/smb/server/smb_common.c | 2 +- + fs/smb/server/transport_rdma.c | 97 +++++++++++++++--------------------------- + fs/smb/server/transport_tcp.c | 17 ++++++++ + 4 files changed, 54 insertions(+), 63 deletions(-) +Merging nfs/linux-next (4ec752ce6deb NFS/localio: nfs_uuid_put() fix the wake up after unlinking the file) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/write.c +Auto-merging include/linux/sunrpc/xdr.h +Auto-merging net/sunrpc/xdr.c +Merge made by the 'ort' strategy. + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/blocklayout/dev.c | 5 +- + fs/nfs/blocklayout/extent_tree.c | 104 ++++++++++++++--- + fs/nfs/client.c | 47 +++++++- + fs/nfs/delegation.c | 114 +++++++++++------- + fs/nfs/delegation.h | 3 + + fs/nfs/dir.c | 4 +- + fs/nfs/export.c | 11 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +++-- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 42 +++++++ + fs/nfs/inode.c | 69 ++++++++++- + fs/nfs/internal.h | 12 +- + fs/nfs/localio.c | 7 +- + fs/nfs/mount_clnt.c | 68 ----------- + fs/nfs/nfs4_fs.h | 5 +- + fs/nfs/nfs4client.c | 185 +++++++++++++----------------- + fs/nfs/nfs4file.c | 25 +--- + fs/nfs/nfs4getroot.c | 14 +-- + fs/nfs/nfs4proc.c | 139 +++++++++++++--------- + fs/nfs/nfs4trace.c | 2 + + fs/nfs/nfs4trace.h | 168 ++++++++++++++++++++++++++- + fs/nfs/nfs4xdr.c | 24 ++++ + fs/nfs/nfstrace.h | 11 +- + fs/nfs/pnfs.c | 39 +++---- + fs/nfs/pnfs_nfs.c | 14 ++- + fs/nfs/write.c | 8 +- + fs/nfs_common/nfslocalio.c | 28 +++-- + include/linux/nfs_fs.h | 8 ++ + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 57 ++++----- + include/linux/sunrpc/xdr.h | 9 -- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/xdr.c | 110 ------------------ + net/sunrpc/xprtsock.c | 40 +++++-- + 35 files changed, 858 insertions(+), 562 deletions(-) +Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of NFS level errors in I/O) +$ 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 (e339967eecf1 nfsd: Drop dprintk in blocklayout xdr functions) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (a49f0abd8959 Revert "fs/ntfs3: Replace inode_trylock with inode_lock") +$ 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 (2138e89cb066 fs/orangefs: Allow 2 more characters in do_c_string()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_entry with __counted_by()) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache documentation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (ded74fddcaf6 xfs: don't use a xfs_log_iovec for ri_buf in log recovery) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (6982100bb829 zonefs: use ZONEFS_SUPER_SIZE instead of PAGE_SIZE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (66639db85811 Merge branch 'vfs-6.17.iomap' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/fuse/file.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/testing/selftests/coredump/stackdump_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/coredump/stackdump_test.c +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Resolved 'fs/coredump.c' using previous resolution. +Resolved 'tools/testing/selftests/coredump/stackdump_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 4410daf3075b] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + +Merging vfs/for-next (dd589648208a Merge branch 'work.mount' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 9083de2b71ec] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + +Merging mm-hotfixes/mm-hotfixes-unstable (bebbba259241 mm/userfaultfd: fix kmap_local LIFO ordering for CONFIG_HIGHPTE) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/proc/task_mmu.c | 20 +++++++++++++++---- + include/linux/kexec.h | 3 ++- + mm/debug_vm_pgtable.c | 9 +++++++-- + mm/kasan/kasan_test_c.c | 4 +++- + mm/khugepaged.c | 2 +- + mm/kmemleak.c | 10 +++++++++- + mm/memory-failure.c | 7 +++++++ + mm/memory_hotplug.c | 21 ++++++++++++-------- + mm/mprotect.c | 23 ++++++++++------------ + mm/sparse.c | 1 + + mm/userfaultfd.c | 24 +++++++++++++++-------- + tools/testing/selftests/mm/cow.c | 4 ++-- + tools/testing/selftests/mm/guard-regions.c | 2 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 4 +++- + tools/testing/selftests/mm/migration.c | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 2 +- + tools/testing/selftests/mm/split_huge_page_test.c | 7 +++++-- + tools/testing/selftests/mm/vm_util.h | 2 +- + tools/testing/selftests/proc/proc-maps-race.c | 6 +++--- + 20 files changed, 103 insertions(+), 51 deletions(-) +Merging fs-current (2fd3ef5f1ff9 Merge branch 'nfsd-fixes' of git://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. + drivers/accel/habanalabs/common/memory.c | 23 ++++++----------- + fs/btrfs/extent_io.c | 11 ++++---- + fs/btrfs/inode.c | 8 +++--- + fs/btrfs/qgroup.c | 3 +-- + fs/btrfs/relocation.c | 19 ++++++++++++++ + fs/btrfs/tree-log.c | 19 ++++++-------- + fs/btrfs/zoned.c | 2 +- + fs/erofs/Kconfig | 20 +++++++-------- + fs/erofs/super.c | 24 ++++++++++-------- + fs/erofs/zdata.c | 13 ++++++++-- + fs/nfsd/localio.c | 5 ++-- + fs/nfsd/vfs.c | 10 +++++++- + net/sunrpc/svcsock.c | 43 ++++++++++++++++++++++++++------ + 13 files changed, 128 insertions(+), 72 deletions(-) +Merging kbuild-current/fixes (e04c78d86a96 Linux 6.16-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (d42e6c20de61 arm64/entry: Mask DAIF in cpu_switch_to(), call_on_irq_stack()) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm7445.dtsi | 9 +- + arch/arm/mach-s3c/gpio-samsung.c | 2 +- + drivers/clk/clk-rp1.c | 976 ++++++++++++++++++++- + include/dt-bindings/clock/raspberrypi,rp1-clocks.h | 4 + + 4 files changed, 979 insertions(+), 12 deletions(-) +Merging davinci-current/davinci/for-current (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (19272b37aa4f Linux 6.16-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 (c8995932db2b m68k: mac: Improve clocksource driver commentary) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (ab107276607a powerpc: Fix struct termio related ioctl macros) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (62355f1f87b8 s390/pci: Allow automatic recovery with minimal driver support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (ae633388cae3 pptp: fix pptp_xmit() error path) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/adi,adin.yaml | 2 +- + .../devicetree/bindings/net/adi,adin1110.yaml | 2 +- + Documentation/netlink/specs/ethtool.yaml | 6 +- + drivers/dpll/zl3073x/Kconfig | 10 +- + drivers/net/ethernet/airoha/airoha_npu.c | 2 + + drivers/net/ethernet/airoha/airoha_ppe.c | 26 +++-- + drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 7 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 ++- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 1 + + drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 14 ++- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 4 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 6 +- + drivers/net/ethernet/sfc/tc_encap_actions.c | 2 +- + drivers/net/ethernet/ti/icssg/icss_iep.c | 23 ++++- + drivers/net/ethernet/ti/icssg/icssg_common.c | 15 +-- + drivers/net/ipa/Kconfig | 2 +- + drivers/net/ipa/ipa_sysfs.c | 6 +- + drivers/net/mdio/mdio-bcm-unimac.c | 5 +- + drivers/net/phy/mscc/mscc_ptp.c | 1 + + drivers/net/phy/mscc/mscc_ptp.h | 1 + + drivers/net/phy/smsc.c | 1 + + drivers/net/ppp/pptp.c | 18 ++-- + include/linux/skbuff.h | 23 +++++ + include/net/dst.h | 12 +++ + include/net/udp.h | 24 +++-- + net/core/dev.c | 26 ++--- + net/core/devmem.c | 6 +- + net/core/devmem.h | 7 +- + net/core/netpoll.c | 7 ++ + net/ipv4/ip_output.c | 15 ++- + net/ipv6/ip6_offload.c | 4 +- + net/kcm/kcmsock.c | 6 ++ + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 12 +-- + net/sched/sch_mqprio.c | 2 +- + net/sched/sch_taprio.c | 21 +++- + tools/testing/selftests/drivers/net/Makefile | 1 + + .../testing/selftests/drivers/net/napi_threaded.py | 111 +++++++++++++++++++++ + .../selftests/drivers/net/netdevsim/nexthop.sh | 2 +- + .../selftests/net/packetdrill/ksft_runner.sh | 19 +--- + tools/testing/selftests/net/test_neigh.sh | 6 +- + tools/testing/selftests/net/vlan_hw_filter.sh | 16 +-- + 46 files changed, 363 insertions(+), 138 deletions(-) + create mode 100755 tools/testing/selftests/drivers/net/napi_threaded.py +Merging bpf/master (0e260fc798bf Merge branch 'perf-s390-regression-move-uid-filtering-to-bpf-filters') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/bpf/verifier.c | 3 +++ + tools/lib/bpf/libbpf.c | 13 ++++++++----- + tools/lib/bpf/libbpf.h | 4 +++- + tools/perf/util/bpf-filter.c | 5 ++++- + 4 files changed, 18 insertions(+), 7 deletions(-) +Merging ipsec/master (42e42562c9cf xfrm: flush all states in xfrm_state_fini) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv6/xfrm6_tunnel.c | 2 +- + net/xfrm/xfrm_state.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging netfilter/main (d942fe13f72b net: ti: icssg-prueth: Fix skb handling for XDP_PASS) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (d942fe13f72b net: ti: icssg-prueth: Fix skb handling for XDP_PASS) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (a9a9e68954f2 RDMA/mlx5: Fix vport loopback for MPV device) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (e8e4f3c242cc ALSA: hda/cirrus: Restrict prompt only for CONFIG_EXPERT) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + include/sound/tas2781-tlv.h | 2 +- + sound/hda/codecs/ca0132.c | 5 +++- + sound/hda/codecs/cirrus/Kconfig | 20 ++++++++----- + sound/hda/codecs/hdmi/Kconfig | 20 ++++++++----- + sound/hda/codecs/realtek/Kconfig | 28 ++++++++++-------- + sound/hda/codecs/realtek/alc269.c | 1 + + sound/hda/codecs/side-codecs/tas2781_hda.c | 47 ++++++++++++++++++++---------- + sound/hda/codecs/side-codecs/tas2781_hda.h | 2 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 3 ++ + sound/soc/amd/acp/acp-sdw-sof-mach.c | 1 + + sound/soc/amd/acp/soc_amd_sdw_common.h | 2 ++ + sound/soc/amd/ps/acp63.h | 1 + + sound/soc/amd/ps/pci-ps.c | 4 +++ + sound/soc/amd/ps/ps-sdw-dma.c | 5 ++++ + sound/soc/codecs/wm8962.c | 11 +++++++ + sound/soc/intel/avs/core.c | 3 +- + sound/soc/intel/boards/sof_sdw.c | 8 +++++ + sound/soc/sof/amd/acp-loader.c | 6 ++-- + sound/soc/sof/amd/acp.c | 8 +++++ + sound/soc/sof/amd/acp.h | 1 + + sound/soc/sof/amd/pci-acp70.c | 1 + + sound/soc/sof/intel/Kconfig | 3 +- + sound/usb/pcm.c | 9 +++--- + sound/x86/intel_hdmi_audio.c | 2 +- + 24 files changed, 137 insertions(+), 56 deletions(-) +Merging sound-asoc-fixes/for-linus (4bafaff30f0f Merge remote-tracking branch 'asoc/for-6.16' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regmap-fixes/for-linus (067aa458a064 Merge remote-tracking branch 'regmap/for-6.16' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) +Merging regulator-fixes/for-linus (10dfd36f0784 regulator: core: correct convergence check in regulator_set_voltage()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (afa03b83aa4d Merge remote-tracking branch 'spi/for-6.16' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-mem.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++++++ + drivers/spi/spi-cs42l43.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 8 +++----- + drivers/spi/spi-mem.c | 4 ++++ + drivers/spi/spi-qpic-snand.c | 22 +++++++++++++++------- + 5 files changed, 31 insertions(+), 13 deletions(-) +Merging pci-current/for-linus (d5c647b08ee0 PCI: vmd: Fix wrong kfree() in vmd_msi_free()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/controller/vmd.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging driver-core.current/driver-core-linus (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (55a984928bfa Revert "tty: vt: use _IO() to define ioctl numbers") +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + include/uapi/linux/vt.h | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) +Merging usb.current/usb-linus (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (ad1244e1ce18 USB: serial: option: add Foxconn T99W709) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (187d5553e33e iio: adc: ad7124: fix channel lookup in syscalib functions) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/sca3300.c | 2 +- + drivers/iio/adc/ad7124.c | 14 ++--- + drivers/iio/adc/ad7173.c | 87 ++++++++++++++++++++++++---- + drivers/iio/proximity/isl29501.c | 14 +++-- + drivers/iio/temperature/maxim_thermocouple.c | 26 +++++---- + 5 files changed, 109 insertions(+), 34 deletions(-) +Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (ab93e0dd72c3 Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (9d9b193ed73a crypto: hash - Increase HASH_MAX_DESCSIZE for hmac(sha3-224-s390)) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Auto-merging include/crypto/hash.h +Merge made by the 'ort' strategy. + include/crypto/hash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging libcrypto-fixes/libcrypto-fixes (68279380266a crypto: s390/sha - Fix uninitialized variable in SHA-1 and SHA-2) +$ git merge -m Merge branch 'libcrypto-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (2f8a2cfd0994 dmaengine: qcom: bam_dma: Fix DT error handling for num-channels/ees) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml | 4 ++++ + drivers/dma/qcom/bam_dma.c | 8 ++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (6463cbe08b0c mtd: spinand: fix memory leak of ECC engine conf) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (d9d79e4f7dc9 mfd: Fix building without CONFIG_OF) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ 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 (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (9c62e2282900 hwmon: (gsc-hwmon) fix fan pwm setpoint show functions) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (aa807b9f22df dma-contiguous: hornor the cma address limit setup by user) +$ git merge -m Merge branch 'dma-mapping-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (e2967b50b709 MAINTAINERS: Update entries for IFS and SBL drivers) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (8d2c2fa2209e firmware: exynos-acpm: fix timeouts on xfers handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (79aef1a3705b of: Clarify OF device context in of_match_device() comment) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + drivers/of/device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging dt-krzk-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (021f243627ea scsi: ufs: core: Fix spelling of a sysfs attribute name) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (038d61fd6422 Linux 6.16) +$ 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 (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4b290aae788e Merge tag 'sysctl-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (08d82d0cad51 rtc: pcf2127: add missing semicolon after statement) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (a4131a50d072 tools/hv: fcopy: Fix irregularities with size of ring buffer) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (b65ca21835ed riscv: uaccess: Fix -Wuninitialized and -Wshadow in __put_user_nocheck) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (beb6c8326eb4 Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (9ab29ed50555 gpiolib: acpi: Add a quirk for Acer Nitro V15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (da8bf5daa5e5 memblock: Accept allocated memory before use in memblock_double_array()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (6235ce77749f perf record: Cache build-ID of hit DSOs only) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (64e135f1eaba efivarfs: Fix memory leak of efivarfs_fs_info in fs_context error paths) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (9a96876e3c65 iommufd/selftest: Fix build warnings due to uninitialized mfd) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (479058002c32 Merge tag 'ata-6.17-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (621a88dbfe90 cpuidle: psci: Fix cpuhotplug routine with PREEMPT_RT=y) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (7e161a991ea7 Merge tag 'i2c-for-6.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://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 (e4b2a0c2b9be Merge tag 'sunxi-clk-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of git://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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of git://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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of git://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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of git://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 (327e28664307 fgraph: Do not enable function_graph tracer when setting funcgraph-args) +$ git merge -m Merge branch 'ftrace/fixes' of git://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 (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio()) +$ git merge -m Merge branch 'ring-buffer/fixes' of git://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 (b5e8acc14dcb tracing: Add down_write(trace_event_sem) when adding trace event) +$ git merge -m Merge branch 'trace/fixes' of git://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 git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (19272b37aa4f Linux 6.16-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 (2a8be06e6de5 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/x86/include/asm/hw_irq.h | 12 +++--- + arch/x86/include/asm/intel-family.h | 5 +++ + arch/x86/kernel/irq.c | 63 +++++++++++++++++++++++------- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-gic-v5-its.c | 1 - + drivers/irqchip/irq-gic-v5-iwb.c | 11 +----- + drivers/irqchip/irq-msi-lib.c | 6 +-- + drivers/irqchip/irq-mvebu-gicp.c | 10 +++++ + drivers/irqchip/irq-riscv-imsic-platform.c | 2 +- + kernel/cpu.c | 3 -- + kernel/fork.c | 2 +- + kernel/irq/irq_test.c | 4 +- + kernel/smp.c | 2 +- + 13 files changed, 82 insertions(+), 40 deletions(-) +Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up slab->obj_exts always) +$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (42464c51cccc drm/msm: Fix objtool warning in submit_lock_objects()) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_gpuvm.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 47 +++++++++---- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 38 +++++------ + .../gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 19 ++++-- + .../gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 10 +-- + .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 34 +++++----- + drivers/gpu/drm/msm/msm_debugfs.c | 11 ++-- + drivers/gpu/drm/msm/msm_gem.c | 13 +++- + drivers/gpu/drm/msm/msm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 76 ++++++++++++---------- + drivers/gpu/drm/msm/msm_gem_vma.c | 60 ++++++++++++----- + drivers/gpu/drm/msm/msm_gpu.c | 11 +++- + drivers/gpu/drm/msm/msm_iommu.c | 16 +++-- + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 14 +++- + 14 files changed, 227 insertions(+), 126 deletions(-) +Merging uml-fixes/fixes (2dca89df0d11 Merge tag 'uml-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-rc' of git//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 git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (038d61fd6422 Linux 6.16) +$ 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 +Already up to date. +Merging linus/for-next (ffd294d346d1 Linux 6.13) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next +Already up to date. +Merging mm-stable/mm-stable (6bcdbd62bd56 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (6bcdbd62bd56 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (bbd7b3725069 mm-filemap-align-last_index-to-folio-size-fix) +$ git merge -m Merge branch 'mm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Merge made by the 'ort' strategy. + include/linux/pagemap.h | 6 ++++++ + include/uapi/linux/mempolicy.h | 12 +++++++++--- + mm/filemap.c | 5 +++-- + 3 files changed, 18 insertions(+), 5 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (e2d11e52598f ocfs2: kill osb->system_file_mutex lock) +$ git merge -m Merge branch 'mm-nonmm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Merge made by the 'ort' strategy. + Documentation/dev-tools/kcov.rst | 7 +++- + arch/x86/kernel/kexec-bzimage64.c | 47 ++++++++++++++++++++-- + fs/ocfs2/ocfs2.h | 2 - + fs/ocfs2/super.c | 2 - + fs/ocfs2/sysfile.c | 9 ++--- + include/linux/idr.h | 8 ---- + include/linux/kexec.h | 5 ++- + include/linux/nvmem-provider.h | 2 +- + include/uapi/linux/kexec.h | 4 ++ + kernel/hung_task.c | 78 +++++++++++++++++++------------------ + kernel/kcov.c | 9 +++++ + kernel/kexec_file.c | 1 + + lib/ref_tracker.c | 6 +-- + tools/testing/radix-tree/idr-test.c | 16 ++++---- + 14 files changed, 123 insertions(+), 73 deletions(-) +Merging kbuild/for-next (8d6841d5cb20 MAINTAINERS: hand over Kbuild maintenance) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (6235ce77749f perf record: Cache build-ID of hit DSOs only) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Already up to date. +Merging compiler-attributes/compiler-attributes (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 (fbf5e2234169 dma-mapping: properly calculate offset in the page) +$ git merge -m Merge branch 'dma-mapping-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Auto-merging Documentation/core-api/dma-api.rst +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging mm/hmm.c +Merge made by the 'ort' strategy. + Documentation/core-api/dma-api.rst | 4 +-- + arch/powerpc/kernel/dma-iommu.c | 4 +-- + drivers/iommu/dma-iommu.c | 14 ++++---- + drivers/virtio/virtio_ring.c | 4 +-- + include/linux/dma-map-ops.h | 8 ++--- + include/linux/dma-mapping.h | 13 ++++++++ + include/linux/iommu-dma.h | 7 ++-- + include/linux/kmsan.h | 12 ++++--- + include/trace/events/dma.h | 4 +-- + kernel/dma/debug.c | 28 ++++++++++------ + kernel/dma/debug.h | 16 ++++----- + kernel/dma/direct.c | 6 ++-- + kernel/dma/direct.h | 13 ++++---- + kernel/dma/mapping.c | 68 +++++++++++++++++++++++++++----------- + kernel/dma/ops_helpers.c | 6 ++-- + mm/hmm.c | 8 ++--- + mm/kmsan/hooks.c | 36 ++++++++++++++++---- + tools/virtio/linux/kmsan.h | 2 +- + 18 files changed, 160 insertions(+), 93 deletions(-) +Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compiler option unconditionally in CFLAGS_KCOV) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported()) +$ git merge -m Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (8dd85887ad83 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (5b1ae9de7133 Merge branch 'for-next/feat_mte_store_only' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (e480898e767c drivers/perf: hisi: Support PMUs with no interrupt) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux into arm/fixes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging at91/at91-next (e99113d11171 Merge branch 'clk-microchip' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (88bca15c33c1 Merge branches 'aspeed/drivers', 'aspeed/dt', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Auto-merging arch/arm64/boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 + + arch/arm/boot/dts/aspeed/Makefile | 3 + + .../dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 12 +- + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 12 +- + .../dts/aspeed/aspeed-bmc-asrock-romed8hm3.dts | 12 +- + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 18 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-darwin.dts | 72 ++ + .../boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts | 12 + + .../dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts | 1256 ++++++++++++++++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts | 1247 +------------------ + .../aspeed/aspeed-bmc-facebook-wedge400-data64.dts | 375 ++++++ + .../dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 366 +----- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 24 +- + .../boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 3 +- + .../dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts | 54 +- + .../arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 3 +- + .../boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +- + .../arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 3 +- + .../boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 +- + .../dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 22 +- + .../facebook-bmc-flash-layout-128-data64.dtsi | 60 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 12 +- + arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi | 12 +- + .../boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 2 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm750.dtsi | 2 +- + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 669 ++++++++++- + .../arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts | 6 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 14 +- + drivers/soc/aspeed/aspeed-p2a-ctrl.c | 14 +- + 33 files changed, 2596 insertions(+), 1706 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-darwin.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400-data64.dts + create mode 100644 arch/arm/boot/dts/aspeed/facebook-bmc-flash-layout-128-data64.dtsi +Merging broadcom/next (89abb622d518 Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (93a7aedc4cc4 dt-bindings: memory: renesas,rzg3e-xspi: Document RZ/V2H(P) and RZ/V2N support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging fsl/soc_fsl (8b3da0519ae6 soc: fsl: qe: convert set_multiple() to returning an integer) +$ git merge -m Merge branch 'soc_fsl' of https://github.com/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (cdc22fb12eff Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6cbb623586d5 Merge branches 'v6.16-next/arm32', 'v6.16-next/dts32', 'v6.16-next/dts64' and 'v6.16-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (88084e0358ff Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (db91121f001a Merge branch 'omap-for-v6.17/soc' into tmp/omap-next-20250707.142928) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Merge made by the 'ort' strategy. +Merging qcom/for-next (dd98924ac360 Merge branches 'arm32-for-6.17', 'arm64-defconfig-fixes-for-6.16', 'arm64-defconfig-for-6.17', 'arm64-fixes-for-6.16', 'arm64-for-6.17', 'clk-fixes-for-6.17' and 'drivers-fixes-for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 9 + + arch/arm/boot/dts/qcom/Makefile | 1 + + arch/arm/boot/dts/qcom/pm8921.dtsi | 6 + + arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi | 40 +++ + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 5 + + .../boot/dts/qcom/qcom-msm8960-sony-huashan.dts | 361 +++++++++++++++++++++ + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 32 ++ + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 226 ++++++++++++- + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 - + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 4 +- + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 8 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 104 +++++- + .../boot/dts/qcom/{qcs615.dtsi => sm6150.dtsi} | 6 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 11 + + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 36 ++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 - + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 143 ++++++++ + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 7 + + arch/arm64/boot/dts/qcom/x1p42100-crd.dts | 4 + + arch/arm64/boot/dts/qcom/x1p42100.dtsi | 120 ++++++- + drivers/clk/qcom/tcsrcc-x1e80100.c | 4 + + drivers/soc/qcom/mdt_loader.c | 12 +- + 27 files changed, 1184 insertions(+), 65 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts + rename arch/arm64/boot/dts/qcom/{qcs615.dtsi => sm6150.dtsi} (99%) +Merging renesas/next (7a323accaf6b Merge branches 'renesas-arm-defconfig-for-v6.17', 'renesas-drivers-for-v6.17', 'renesas-dt-bindings-for-v6.17' and 'renesas-dts-for-v6.17' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (335bb23abed3 MAINTAINERS: Use https:// protocol for Reset Controller Framework tree) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (1f0c7abd8235 Merge branch 'v6.16-armsoc/dtsfixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (94f19ac4670d Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (d2eedaa3909b Merge tag 'rtc-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging sophgo/for-next (349ae53a949c 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. +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 (6be7a5a768aa Merge branch 'spacemit-clk-for-6.17' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (1a32f7427eb3 arm64: dts: st: remove empty line in stm32mp251.dtsi) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (cbe908fc8ebb Merge branch 'sunxi/dt-for-6.17' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (84c5f44d24c6 Merge branch 'tee_fixes_for_v6.17' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/core.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tee/tee_shm.c | 14 ++++++++++---- + 3 files changed, 12 insertions(+), 6 deletions(-) +Merging tegra/for-next (499b75defe56 Merge branch for-6.17/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 ++++ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 3 --- + drivers/firmware/tegra/bpmp-tegra186.c | 5 ++++- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging thead-dt/thead-dt-for-next (c31f2899eab0 riscv: dts: thead: Add PVT node) +$ git merge -m Merge branch 'thead-dt-for-next' of git://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 (65f6e3eb6351 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (3a0e3f82b8ee Merge branch 'zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/soc/xilinx/xilinx.yaml | 81 ++++ + arch/arm64/boot/dts/xilinx/Makefile | 24 ++ + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 2 +- + .../boot/dts/xilinx/zynqmp-sck-kd-g-revA.dtso | 390 ++++++++++++++++++ + .../boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso | 438 ++++++++++++++++++++ + .../boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso | 451 +++++++++++++++++++++ + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 19 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 35 +- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k24-revA.dts | 23 ++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 7 +- + arch/arm64/boot/dts/xilinx/zynqmp-smk-k24-revA.dts | 21 + + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 1 - + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 1 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 21 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 18 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 18 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 18 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 10 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 20 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 14 +- + drivers/firmware/xilinx/zynqmp-debug.c | 13 + + drivers/firmware/xilinx/zynqmp.c | 114 ++++-- + drivers/pinctrl/pinctrl-zynqmp.c | 7 +- + drivers/soc/xilinx/xlnx_event_manager.c | 8 +- + drivers/soc/xilinx/zynqmp_power.c | 10 +- + include/linux/firmware/xlnx-zynqmp.h | 30 +- + 26 files changed, 1713 insertions(+), 81 deletions(-) + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kd-g-revA.dtso + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k24-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k24-revA.dts +Merging clk/clk-next (64c21f253a37 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (c78865241ecf MAINTAINERS: Update i.MX Clock Entry) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (0ab2d84f94da clk: renesas: r9a08g045: Add MSTOP for coupled clocks as well) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging thead-clk/thead-clk-for-next (54edba916e29 clk: thead: th1520-ap: Describe mux clocks with clk_mux) +$ git merge -m Merge branch 'thead-clk-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/mm/fault.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging loongarch/loongarch-next (d35ec48fa6c8 LoongArch: vDSO: Remove -nostdlib complier flag) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/kernel/setup.c +Merge made by the 'ort' strategy. + arch/loongarch/boot/dts/loongson-2k0500-ref.dts | 9 + + arch/loongarch/boot/dts/loongson-2k0500.dtsi | 28 +- + arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 13 + + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 24 +- + arch/loongarch/boot/dts/loongson-2k2000-ref.dts | 10 + + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 18 + + arch/loongarch/include/asm/inst.h | 3 + + arch/loongarch/include/asm/loongarch.h | 7 + + arch/loongarch/kernel/env.c | 13 +- + arch/loongarch/kernel/inst.c | 74 +++ + arch/loongarch/kernel/relocate_kernel.S | 2 +- + arch/loongarch/kernel/setup.c | 18 +- + arch/loongarch/kernel/unwind_orc.c | 2 +- + arch/loongarch/net/bpf_jit.c | 701 +++++++++++++++++++++--- + arch/loongarch/net/bpf_jit.h | 6 + + arch/loongarch/vdso/Makefile | 2 +- + 16 files changed, 841 insertions(+), 89 deletions(-) +Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver commentary) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Auto-merging arch/microblaze/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/microblaze/Kconfig.platform | 10 +++++----- + arch/microblaze/include/asm/asm-compat.h | 2 +- + arch/microblaze/include/asm/current.h | 4 ++-- + arch/microblaze/include/asm/entry.h | 4 ++-- + arch/microblaze/include/asm/exceptions.h | 4 ++-- + arch/microblaze/include/asm/fixmap.h | 4 ++-- + arch/microblaze/include/asm/ftrace.h | 2 +- + arch/microblaze/include/asm/kgdb.h | 4 ++-- + arch/microblaze/include/asm/mmu.h | 4 ++-- + arch/microblaze/include/asm/page.h | 8 ++++---- + arch/microblaze/include/asm/pgtable.h | 18 +++++++++--------- + arch/microblaze/include/asm/processor.h | 8 ++++---- + arch/microblaze/include/asm/ptrace.h | 4 ++-- + arch/microblaze/include/asm/sections.h | 4 ++-- + arch/microblaze/include/asm/setup.h | 4 ++-- + arch/microblaze/include/asm/thread_info.h | 4 ++-- + arch/microblaze/include/asm/unistd.h | 4 ++-- + arch/microblaze/include/asm/xilinx_mb_manager.h | 4 ++-- + arch/microblaze/include/uapi/asm/ptrace.h | 4 ++-- + 19 files changed, 50 insertions(+), 50 deletions(-) +Merging mips/mips-next (3ebcbf079c26 MIPS: Don't use %pK through printk) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (89f686a0fb6e parisc: Revise __get_user() to probe user read access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (cf2a6de32cab powerpc64/bpf: Add jit support for load_acquire and store_release) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (7b388bf7a9d9 Merge patch series "Linux SBI MPXY and RPMI drivers") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/irq.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/uapi/asm/kvm.h +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/riscv/kernel/pi/Makefile +Auto-merging arch/riscv/kernel/ptrace.c +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/clk/Makefile +CONFLICT (content): Merge conflict in drivers/clk/Makefile +Auto-merging drivers/iommu/riscv/iommu.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/irqchip/irq-riscv-imsic-early.c +Auto-merging drivers/mailbox/Kconfig +CONFLICT (content): Merge conflict in drivers/mailbox/Kconfig +Auto-merging drivers/mailbox/Makefile +CONFLICT (content): Merge conflict in drivers/mailbox/Makefile +Auto-merging include/linux/cpu.h +Auto-merging include/linux/mm.h +Auto-merging include/uapi/linux/prctl.h +Auto-merging kernel/sys.c +Auto-merging lib/raid6/recov_rvv.c +Recorded preimage for 'drivers/clk/Makefile' +Recorded preimage for 'drivers/mailbox/Kconfig' +Recorded preimage for 'drivers/mailbox/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/clk/Makefile'. +Recorded resolution for 'drivers/mailbox/Kconfig'. +Recorded resolution for 'drivers/mailbox/Makefile'. +[master 72b021df59f3] Merge branch 'for-next' of git://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 | 9 + + Documentation/arch/riscv/index.rst | 2 + + Documentation/arch/riscv/zicfilp.rst | 115 +++ + Documentation/arch/riscv/zicfiss.rst | 179 ++++ + .../bindings/clock/riscv,rpmi-clock.yaml | 64 ++ + .../bindings/clock/riscv,rpmi-mpxy-clock.yaml | 64 ++ + .../riscv,rpmi-mpxy-system-msi.yaml | 67 ++ + .../riscv,rpmi-system-msi.yaml | 74 ++ + .../bindings/mailbox/riscv,rpmi-shmem-mbox.yaml | 124 +++ + .../bindings/mailbox/riscv,sbi-mpxy-mbox.yaml | 51 + + .../devicetree/bindings/riscv/extensions.yaml | 20 + + MAINTAINERS | 16 + + arch/riscv/Kconfig | 23 + + arch/riscv/Kconfig.errata | 40 + + arch/riscv/Kconfig.vendor | 13 + + arch/riscv/Makefile | 5 +- + arch/riscv/configs/defconfig | 7 +- + arch/riscv/configs/hardening.config | 4 + + arch/riscv/errata/Makefile | 1 + + arch/riscv/errata/mips/Makefile | 5 + + arch/riscv/errata/mips/errata.c | 67 ++ + arch/riscv/errata/thead/errata.c | 20 + + arch/riscv/include/asm/alternative-macros.h | 12 +- + arch/riscv/include/asm/alternative.h | 5 +- + arch/riscv/include/asm/asm-extable.h | 6 +- + arch/riscv/include/asm/asm-prototypes.h | 1 + + arch/riscv/include/asm/asm.h | 12 +- + arch/riscv/include/asm/assembler.h | 46 +- + arch/riscv/include/asm/barrier.h | 4 +- + arch/riscv/include/asm/cache.h | 4 +- + arch/riscv/include/asm/cmpxchg.h | 3 +- + arch/riscv/include/asm/cpu_ops_sbi.h | 2 +- + arch/riscv/include/asm/cpufeature.h | 12 + + arch/riscv/include/asm/csr.h | 20 +- + arch/riscv/include/asm/current.h | 4 +- + arch/riscv/include/asm/entry-common.h | 2 + + arch/riscv/include/asm/errata_list.h | 38 +- + arch/riscv/include/asm/errata_list_vendors.h | 30 + + arch/riscv/include/asm/ftrace.h | 6 +- + arch/riscv/include/asm/gpr-num.h | 6 +- + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/hwprobe.h | 3 +- + arch/riscv/include/asm/image.h | 4 +- + arch/riscv/include/asm/insn-def.h | 8 +- + arch/riscv/include/asm/insn.h | 215 ++++- + arch/riscv/include/asm/io.h | 4 + + arch/riscv/include/asm/irq.h | 6 + + arch/riscv/include/asm/jump_label.h | 4 +- + arch/riscv/include/asm/kasan.h | 2 +- + arch/riscv/include/asm/kgdb.h | 4 +- + arch/riscv/include/asm/mman.h | 26 + + arch/riscv/include/asm/mmu.h | 4 +- + arch/riscv/include/asm/mmu_context.h | 7 + + arch/riscv/include/asm/page.h | 4 +- + arch/riscv/include/asm/pgtable.h | 35 +- + arch/riscv/include/asm/processor.h | 5 +- + arch/riscv/include/asm/ptrace.h | 4 +- + arch/riscv/include/asm/rwonce.h | 34 + + arch/riscv/include/asm/sbi.h | 63 ++ + arch/riscv/include/asm/scs.h | 4 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/swab.h | 87 ++ + arch/riscv/include/asm/thread_info.h | 9 +- + arch/riscv/include/asm/uaccess.h | 2 +- + arch/riscv/include/asm/usercfi.h | 95 ++ + arch/riscv/include/asm/vdso.h | 4 +- + arch/riscv/include/asm/vdso/getrandom.h | 4 +- + arch/riscv/include/asm/vdso/gettimeofday.h | 4 +- + arch/riscv/include/asm/vdso/processor.h | 7 +- + arch/riscv/include/asm/vdso/vsyscall.h | 4 +- + arch/riscv/include/asm/vector.h | 3 + + arch/riscv/include/asm/vendor_extensions/mips.h | 37 + + .../include/asm/vendor_extensions/mips_hwprobe.h | 22 + + arch/riscv/include/asm/vendorid_list.h | 1 + + arch/riscv/include/uapi/asm/hwprobe.h | 3 + + arch/riscv/include/uapi/asm/kvm.h | 2 +- + arch/riscv/include/uapi/asm/ptrace.h | 38 +- + arch/riscv/include/uapi/asm/sigcontext.h | 5 +- + arch/riscv/include/uapi/asm/vendor/mips.h | 3 + + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/acpi.c | 3 + + arch/riscv/kernel/alternative.c | 5 + + arch/riscv/kernel/asm-offsets.c | 11 +- + arch/riscv/kernel/cpufeature.c | 33 +- + arch/riscv/kernel/entry.S | 40 +- + arch/riscv/kernel/head.S | 27 + + arch/riscv/kernel/machine_kexec_file.c | 2 +- + arch/riscv/kernel/pi/Makefile | 2 +- + arch/riscv/kernel/pi/cmdline_early.c | 4 +- + arch/riscv/kernel/pi/fdt_early.c | 40 + + arch/riscv/kernel/pi/pi.h | 1 + + arch/riscv/kernel/probes/simulate-insn.c | 94 +- + arch/riscv/kernel/process.c | 27 +- + arch/riscv/kernel/ptrace.c | 95 ++ + arch/riscv/kernel/signal.c | 148 ++- + arch/riscv/kernel/sys_hwprobe.c | 20 +- + arch/riscv/kernel/sys_riscv.c | 12 +- + arch/riscv/kernel/tests/Kconfig.debug | 12 + + arch/riscv/kernel/tests/Makefile | 1 + + arch/riscv/kernel/tests/kprobes/Makefile | 1 + + arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 229 +++++ + arch/riscv/kernel/tests/kprobes/test-kprobes.c | 56 ++ + arch/riscv/kernel/tests/kprobes/test-kprobes.h | 24 + + arch/riscv/kernel/traps.c | 54 ++ + arch/riscv/kernel/traps_misaligned.c | 144 +-- + arch/riscv/kernel/usercfi.c | 545 +++++++++++ + arch/riscv/kernel/vdso/Makefile | 11 +- + arch/riscv/kernel/vdso/flush_icache.S | 4 + + arch/riscv/kernel/vdso/getcpu.S | 4 + + 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/vector.c | 2 +- + arch/riscv/kernel/vendor_extensions.c | 10 + + arch/riscv/kernel/vendor_extensions/Makefile | 2 + + arch/riscv/kernel/vendor_extensions/mips.c | 22 + + arch/riscv/kernel/vendor_extensions/mips_hwprobe.c | 23 + + arch/riscv/kvm/vcpu_insn.c | 128 +-- + arch/riscv/mm/init.c | 14 +- + arch/riscv/mm/pgtable.c | 16 + + drivers/acpi/Kconfig | 6 +- + drivers/acpi/property.c | 128 +-- + drivers/acpi/riscv/Kconfig | 7 + + drivers/acpi/riscv/Makefile | 1 + + drivers/acpi/riscv/init.c | 2 + + drivers/acpi/riscv/init.h | 1 + + drivers/acpi/riscv/irq.c | 75 +- + drivers/acpi/riscv/rimt.c | 520 ++++++++++ + drivers/acpi/scan.c | 6 + + drivers/base/property.c | 2 +- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-rpmi.c | 616 ++++++++++++ + drivers/iommu/riscv/iommu-platform.c | 17 +- + drivers/iommu/riscv/iommu.c | 10 + + drivers/irqchip/Kconfig | 7 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-riscv-imsic-early.c | 2 + + drivers/irqchip/irq-riscv-rpmi-sysmsi.c | 328 +++++++ + drivers/mailbox/Kconfig | 11 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/mailbox.c | 65 +- + drivers/mailbox/riscv-sbi-mpxy-mbox.c | 1017 ++++++++++++++++++++ + include/asm-generic/rwonce.h | 2 + + include/linux/acpi_rimt.h | 28 + + include/linux/byteorder/generic.h | 16 + + include/linux/cpu.h | 4 + + include/linux/mailbox/riscv-rpmi-message.h | 243 +++++ + include/linux/mailbox_controller.h | 3 + + include/linux/mm.h | 7 + + include/linux/wordpart.h | 16 + + include/uapi/linux/elf.h | 2 + + include/uapi/linux/prctl.h | 27 + + kernel/sys.c | 30 + + lib/raid6/recov_rvv.c | 9 +- + lib/raid6/rvv.c | 362 +++---- + lib/raid6/rvv.h | 17 + + lib/raid6/test/Makefile | 8 + + tools/arch/riscv/include/asm/csr.h | 6 +- + tools/arch/riscv/include/asm/vdso/processor.h | 31 +- + tools/testing/selftests/riscv/Makefile | 2 +- + tools/testing/selftests/riscv/cfi/.gitignore | 3 + + tools/testing/selftests/riscv/cfi/Makefile | 16 + + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 82 ++ + tools/testing/selftests/riscv/cfi/riscv_cfi_test.c | 173 ++++ + tools/testing/selftests/riscv/cfi/shadowstack.c | 385 ++++++++ + tools/testing/selftests/riscv/cfi/shadowstack.h | 27 + + .../testing/selftests/riscv/misaligned/.gitignore | 1 + + tools/testing/selftests/riscv/misaligned/Makefile | 12 + + tools/testing/selftests/riscv/misaligned/common.S | 33 + + tools/testing/selftests/riscv/misaligned/fpu.S | 180 ++++ + tools/testing/selftests/riscv/misaligned/gp.S | 113 +++ + .../selftests/riscv/misaligned/misaligned.c | 288 ++++++ + 174 files changed, 7994 insertions(+), 808 deletions(-) + create mode 100644 Documentation/arch/riscv/zicfilp.rst + create mode 100644 Documentation/arch/riscv/zicfiss.rst + create mode 100644 Documentation/devicetree/bindings/clock/riscv,rpmi-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/riscv,rpmi-mpxy-clock.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,rpmi-mpxy-system-msi.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,rpmi-system-msi.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/riscv,rpmi-shmem-mbox.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/riscv,sbi-mpxy-mbox.yaml + create mode 100644 arch/riscv/configs/hardening.config + create mode 100644 arch/riscv/errata/mips/Makefile + create mode 100644 arch/riscv/errata/mips/errata.c + create mode 100644 arch/riscv/include/asm/errata_list_vendors.h + create mode 100644 arch/riscv/include/asm/mman.h + create mode 100644 arch/riscv/include/asm/rwonce.h + create mode 100644 arch/riscv/include/asm/swab.h + create mode 100644 arch/riscv/include/asm/usercfi.h + create mode 100644 arch/riscv/include/asm/vendor_extensions/mips.h + create mode 100644 arch/riscv/include/asm/vendor_extensions/mips_hwprobe.h + create mode 100644 arch/riscv/include/uapi/asm/vendor/mips.h + create mode 100644 arch/riscv/kernel/tests/kprobes/Makefile + create mode 100644 arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S + create mode 100644 arch/riscv/kernel/tests/kprobes/test-kprobes.c + create mode 100644 arch/riscv/kernel/tests/kprobes/test-kprobes.h + create mode 100644 arch/riscv/kernel/usercfi.c + create mode 100644 arch/riscv/kernel/vendor_extensions/mips.c + create mode 100644 arch/riscv/kernel/vendor_extensions/mips_hwprobe.c + create mode 100644 drivers/acpi/riscv/Kconfig + create mode 100644 drivers/acpi/riscv/rimt.c + create mode 100644 drivers/clk/clk-rpmi.c + create mode 100644 drivers/irqchip/irq-riscv-rpmi-sysmsi.c + create mode 100644 drivers/mailbox/riscv-sbi-mpxy-mbox.c + create mode 100644 include/linux/acpi_rimt.h + create mode 100644 include/linux/mailbox/riscv-rpmi-message.h + 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/riscv_cfi_test.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.h + create mode 100644 tools/testing/selftests/riscv/misaligned/.gitignore + create mode 100644 tools/testing/selftests/riscv/misaligned/Makefile + create mode 100644 tools/testing/selftests/riscv/misaligned/common.S + create mode 100644 tools/testing/selftests/riscv/misaligned/fpu.S + create mode 100644 tools/testing/selftests/riscv/misaligned/gp.S + create mode 100644 tools/testing/selftests/riscv/misaligned/misaligned.c +Merging riscv-dt/riscv-dt-for-next (28fa0dcb571a dt-bindings: riscv: cpus: Add AMD MicroBlaze V 64bit compatible) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (bd4d5d3faadc riscv: defconfig: spacemit: enable sdhci driver for K1 SoC) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (85f744617f1a Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/setup.c +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 3 +++ + arch/s390/boot/startup.c | 2 +- + arch/s390/include/asm/ap.h | 2 +- + arch/s390/include/asm/pgtable.h | 45 +++++++++++++++++++++++++++++++++++++++++ + arch/s390/kernel/debug.c | 2 +- + arch/s390/kernel/setup.c | 6 ++++++ + arch/s390/mm/vmem.c | 5 ++--- + drivers/s390/crypto/ap_bus.h | 2 +- + 8 files changed, 60 insertions(+), 7 deletions(-) +Merging sh/for-next (c32969d0362a sh: Do not use hyphen in exported variable name) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (fc9ed2f6589d um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/include/asm/pgtable.h +Auto-merging arch/xtensa/include/asm/ptrace.h +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/bootparam.h | 2 +- + arch/xtensa/include/asm/cmpxchg.h | 4 ++-- + arch/xtensa/include/asm/coprocessor.h | 8 ++++---- + arch/xtensa/include/asm/current.h | 2 +- + arch/xtensa/include/asm/ftrace.h | 8 ++++---- + arch/xtensa/include/asm/initialize_mmu.h | 4 ++-- + arch/xtensa/include/asm/jump_label.h | 4 ++-- + arch/xtensa/include/asm/kasan.h | 2 +- + arch/xtensa/include/asm/kmem_layout.h | 2 +- + arch/xtensa/include/asm/page.h | 4 ++-- + arch/xtensa/include/asm/pgtable.h | 8 ++++---- + arch/xtensa/include/asm/processor.h | 4 ++-- + arch/xtensa/include/asm/ptrace.h | 6 +++--- + arch/xtensa/include/asm/signal.h | 4 ++-- + arch/xtensa/include/asm/thread_info.h | 8 ++++---- + arch/xtensa/include/asm/tlbflush.h | 4 ++-- + arch/xtensa/include/uapi/asm/ptrace.h | 2 +- + arch/xtensa/include/uapi/asm/signal.h | 6 +++--- + arch/xtensa/include/uapi/asm/types.h | 4 ++-- + 19 files changed, 43 insertions(+), 43 deletions(-) +Merging fs-next (9083de2b71ec Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../filesystems/{ => fuse}/fuse-io-uring.rst | 0 + Documentation/filesystems/{ => fuse}/fuse-io.rst | 2 +- + .../filesystems/{ => fuse}/fuse-passthrough.rst | 0 + Documentation/filesystems/{ => fuse}/fuse.rst | 20 +- + Documentation/filesystems/fuse/index.rst | 14 + + Documentation/filesystems/index.rst | 5 +- + MAINTAINERS | 3 +- + fs/bcachefs/acl.c | 29 +- + fs/bcachefs/alloc_background.c | 570 ++++++-------- + fs/bcachefs/alloc_background.h | 9 +- + fs/bcachefs/alloc_foreground.c | 258 +++--- + fs/bcachefs/alloc_foreground.h | 9 +- + fs/bcachefs/async_objs.c | 29 +- + fs/bcachefs/async_objs.h | 7 +- + fs/bcachefs/async_objs_types.h | 2 +- + fs/bcachefs/backpointers.c | 167 ++-- + fs/bcachefs/bcachefs.h | 91 +-- + fs/bcachefs/bcachefs_format.h | 42 +- + fs/bcachefs/bkey.c | 4 +- + fs/bcachefs/bkey_methods.c | 6 +- + fs/bcachefs/bkey_types.h | 5 + + fs/bcachefs/bset.c | 74 +- + fs/bcachefs/btree_cache.c | 44 +- + fs/bcachefs/btree_cache.h | 19 + + fs/bcachefs/btree_gc.c | 258 +++--- + fs/bcachefs/btree_io.c | 123 +-- + fs/bcachefs/btree_iter.c | 424 +++++----- + fs/bcachefs/btree_iter.h | 348 ++++---- + fs/bcachefs/btree_journal_iter.c | 20 +- + fs/bcachefs/btree_key_cache.c | 69 +- + fs/bcachefs/btree_locking.c | 17 +- + fs/bcachefs/btree_node_scan.c | 36 +- + fs/bcachefs/btree_trans_commit.c | 125 ++- + fs/bcachefs/btree_types.h | 43 +- + fs/bcachefs/btree_update.c | 339 ++++---- + fs/bcachefs/btree_update.h | 150 ++-- + fs/bcachefs/btree_update_interior.c | 387 ++++----- + fs/bcachefs/btree_update_interior.h | 12 +- + fs/bcachefs/btree_write_buffer.c | 78 +- + fs/bcachefs/btree_write_buffer.h | 8 +- + fs/bcachefs/buckets.c | 258 +++--- + fs/bcachefs/buckets_waiting_for_journal.c | 30 +- + fs/bcachefs/chardev.c | 120 +-- + fs/bcachefs/checksum.c | 54 +- + fs/bcachefs/clock.c | 17 +- + fs/bcachefs/compress.c | 29 +- + fs/bcachefs/compress.h | 36 +- + fs/bcachefs/data_update.c | 58 +- + fs/bcachefs/data_update.h | 1 + + fs/bcachefs/debug.c | 88 +-- + fs/bcachefs/dirent.c | 88 +-- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 270 +++---- + fs/bcachefs/disk_accounting.h | 19 +- + fs/bcachefs/disk_groups.c | 27 +- + fs/bcachefs/ec.c | 362 ++++----- + fs/bcachefs/ec.h | 2 +- + fs/bcachefs/enumerated_ref.c | 4 +- + fs/bcachefs/errcode.c | 3 +- + fs/bcachefs/errcode.h | 14 + + fs/bcachefs/error.c | 65 +- + fs/bcachefs/error.h | 3 +- + fs/bcachefs/extent_update.c | 67 +- + fs/bcachefs/extent_update.h | 2 - + fs/bcachefs/extents.c | 55 +- + fs/bcachefs/extents.h | 4 + + fs/bcachefs/fast_list.c | 32 +- + fs/bcachefs/fast_list.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 96 +-- + fs/bcachefs/fs-io-direct.c | 26 +- + fs/bcachefs/fs-io-pagecache.c | 55 +- + fs/bcachefs/fs-io.c | 141 ++-- + fs/bcachefs/fs-io.h | 19 +- + fs/bcachefs/fs-ioctl.c | 33 +- + fs/bcachefs/fs.c | 254 +++--- + fs/bcachefs/fsck.c | 649 ++++++++------- + fs/bcachefs/inode.c | 252 +++--- + fs/bcachefs/io_misc.c | 83 +- + fs/bcachefs/io_read.c | 235 +++--- + fs/bcachefs/io_read.h | 24 +- + fs/bcachefs/io_write.c | 97 ++- + fs/bcachefs/journal.c | 253 +++--- + fs/bcachefs/journal.h | 3 +- + fs/bcachefs/journal_io.c | 248 +++--- + fs/bcachefs/journal_io.h | 7 + + fs/bcachefs/journal_reclaim.c | 220 +++--- + fs/bcachefs/journal_seq_blacklist.c | 56 +- + fs/bcachefs/journal_seq_blacklist.h | 3 + + fs/bcachefs/logged_ops.c | 16 +- + fs/bcachefs/logged_ops.h | 2 +- + fs/bcachefs/lru.c | 48 +- + fs/bcachefs/lru.h | 10 + + fs/bcachefs/migrate.c | 31 +- + fs/bcachefs/move.c | 316 ++++---- + fs/bcachefs/move.h | 14 +- + fs/bcachefs/movinggc.c | 218 +++-- + fs/bcachefs/namei.c | 154 ++-- + fs/bcachefs/nocow_locking.c | 10 +- + fs/bcachefs/opts.c | 33 +- + fs/bcachefs/opts.h | 8 +- + fs/bcachefs/printbuf.h | 4 + + fs/bcachefs/progress.c | 6 +- + fs/bcachefs/progress.h | 3 + + fs/bcachefs/quota.c | 103 +-- + fs/bcachefs/rebalance.c | 221 +++--- + fs/bcachefs/recovery.c | 412 +++------- + fs/bcachefs/recovery_passes.c | 68 +- + fs/bcachefs/recovery_passes.h | 9 +- + fs/bcachefs/reflink.c | 137 ++-- + fs/bcachefs/replicas.c | 161 ++-- + fs/bcachefs/sb-clean.c | 36 +- + fs/bcachefs/sb-counters_format.h | 12 +- + fs/bcachefs/sb-downgrade.c | 19 +- + fs/bcachefs/sb-errors.c | 45 +- + fs/bcachefs/sb-errors_format.h | 11 +- + fs/bcachefs/sb-members.c | 164 ++-- + fs/bcachefs/sb-members.h | 44 +- + fs/bcachefs/sb-members_format.h | 2 +- + fs/bcachefs/six.c | 21 +- + fs/bcachefs/snapshot.c | 435 ++++------ + fs/bcachefs/snapshot.h | 32 +- + fs/bcachefs/snapshot_types.h | 2 +- + fs/bcachefs/str_hash.c | 57 +- + fs/bcachefs/str_hash.h | 47 +- + fs/bcachefs/subvolume.c | 246 +++--- + fs/bcachefs/subvolume.h | 20 +- + fs/bcachefs/super-io.c | 112 ++- + fs/bcachefs/super.c | 876 ++++++++++++--------- + fs/bcachefs/sysfs.c | 28 +- + fs/bcachefs/tests.c | 340 ++++---- + fs/bcachefs/thread_with_file.c | 48 +- + fs/bcachefs/time_stats.c | 7 +- + fs/bcachefs/trace.h | 157 +--- + fs/bcachefs/util.c | 28 +- + fs/bcachefs/util.h | 10 +- + fs/bcachefs/xattr.c | 58 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/exfat/balloc.c | 12 +- + fs/exfat/dir.c | 1 - + fs/exfat/exfat_fs.h | 1 + + fs/ext4/namei.c | 2 - + fs/fuse/dev.c | 5 +- + fs/fuse/file.c | 1 - + fs/fuse/virtio_fs.c | 3 - + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/blocklayout/dev.c | 5 +- + fs/nfs/blocklayout/extent_tree.c | 104 ++- + fs/nfs/client.c | 47 +- + fs/nfs/delegation.c | 114 ++- + fs/nfs/delegation.h | 3 + + fs/nfs/dir.c | 4 +- + fs/nfs/export.c | 11 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 42 + + fs/nfs/inode.c | 69 +- + fs/nfs/internal.h | 12 +- + fs/nfs/localio.c | 7 +- + fs/nfs/mount_clnt.c | 68 -- + fs/nfs/nfs4_fs.h | 5 +- + fs/nfs/nfs4client.c | 185 ++--- + fs/nfs/nfs4file.c | 25 +- + fs/nfs/nfs4getroot.c | 14 +- + fs/nfs/nfs4proc.c | 139 ++-- + fs/nfs/nfs4trace.c | 2 + + fs/nfs/nfs4trace.h | 168 +++- + fs/nfs/nfs4xdr.c | 24 + + fs/nfs/nfstrace.h | 11 +- + fs/nfs/pnfs.c | 39 +- + fs/nfs/pnfs_nfs.c | 14 +- + fs/nfs/write.c | 8 +- + fs/nfs_common/nfslocalio.c | 28 +- + fs/smb/client/Makefile | 2 +- + fs/smb/client/cifs_debug.c | 24 +- + fs/smb/client/cifsfs.c | 8 +- + fs/smb/client/cifsglob.h | 23 +- + fs/smb/client/cifsproto.h | 15 + + fs/smb/client/cifssmb.c | 4 +- + fs/smb/client/cifstransport.c | 566 +++++++++++++ + fs/smb/client/connect.c | 35 +- + fs/smb/client/fs_context.c | 19 +- + fs/smb/client/fs_context.h | 18 +- + fs/smb/client/link.c | 13 +- + fs/smb/client/reparse.c | 2 +- + fs/smb/client/smb1ops.c | 19 +- + fs/smb/client/smb2inode.c | 5 +- + fs/smb/client/smb2ops.c | 63 +- + fs/smb/client/smb2transport.c | 4 +- + fs/smb/client/smbdirect.c | 566 ++++++------- + fs/smb/client/smbdirect.h | 97 --- + fs/smb/client/transport.c | 602 +------------- + fs/smb/common/smbdirect/smbdirect_socket.h | 133 +++- + fs/smb/server/connection.h | 1 + + fs/smb/server/smb_common.c | 2 +- + fs/smb/server/transport_rdma.c | 97 +-- + fs/smb/server/transport_tcp.c | 17 + + include/linux/nfs_fs.h | 8 + + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 57 +- + include/linux/sunrpc/xdr.h | 9 - + include/linux/wait.h | 12 + + lib/closure.c | 12 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/xdr.c | 110 --- + net/sunrpc/xprtsock.c | 40 +- + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/fuse/.gitignore | 3 + + tools/testing/selftests/filesystems/fuse/Makefile | 21 + + .../testing/selftests/filesystems/fuse/fuse_mnt.c | 146 ++++ + .../selftests/filesystems/fuse/fusectl_test.c | 140 ++++ + 212 files changed, 8769 insertions(+), 8508 deletions(-) + rename Documentation/filesystems/{ => fuse}/fuse-io-uring.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse-io.rst (99%) + rename Documentation/filesystems/{ => fuse}/fuse-passthrough.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse.rst (95%) + create mode 100644 Documentation/filesystems/fuse/index.rst + create mode 100644 fs/smb/client/cifstransport.c + create mode 100644 tools/testing/selftests/filesystems/fuse/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fuse/Makefile + create mode 100644 tools/testing/selftests/filesystems/fuse/fuse_mnt.c + create mode 100644 tools/testing/selftests/filesystems/fuse/fusectl_test.c +Merging printk/for-next (dcc3191a3dde Merge branch 'rework/ringbuffer-kunit-test' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + init/Kconfig | 12 + + kernel/printk/.kunitconfig | 3 + + kernel/printk/Makefile | 2 + + kernel/printk/printk_ringbuffer.c | 5 + + kernel/printk/printk_ringbuffer_kunit_test.c | 315 +++++++++++++++++++++++++++ + 5 files changed, 337 insertions(+) + create mode 100644 kernel/printk/.kunitconfig + create mode 100644 kernel/printk/printk_ringbuffer_kunit_test.c +Merging pci/next (0bd0a41a5120 Merge tag 'pci-v6.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/zone.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) +Merging hid/for-next (1330eb33bddc Merge branch 'for-6.17/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (976990f4120c Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. +Merging i2c-host/i2c/i2c-host (7e161a991ea7 Merge tag 'i2c-for-6.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Already up to date. +Merging i3c/i3c/next (3b661ca549b9 i3c: add missing include to internal header) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging 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 git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (de1fffd88600 dt-bindings: hwmon: Replace bouncing Alexandru Tachici emails) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (35293ebbb65e scripts: add origin commit identification based on specific patterns) +$ 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 (d968e50b5c26 media: rkvdec: Unstage the driver) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) +$ 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 (77d832285656 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (bbd67be5546d cpufreq: mediatek-hw: Add support for MT8196) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + .../cpufreq/mediatek,mt8196-cpufreq-hw.yaml | 82 +++++++++++++ + drivers/cpufreq/mediatek-cpufreq-hw.c | 132 +++++++++++++++++---- + 2 files changed, 191 insertions(+), 23 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/mediatek,mt8196-cpufreq-hw.yaml +Merging cpupower/cpupower (e6c3f96141eb cpupower: Allow control of boost feature on non-x86 based systems with boost support.) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/man/cpupower-set.1 | 7 +-- + tools/power/cpupower/utils/cpufreq-info.c | 16 +++++- + tools/power/cpupower/utils/cpupower-set.c | 5 +- + tools/power/cpupower/utils/helpers/helpers.h | 14 ++--- + tools/power/cpupower/utils/helpers/misc.c | 76 ++++++++++++++++++++-------- + 5 files changed, 83 insertions(+), 35 deletions(-) +Merging devfreq/devfreq-next (7da2fdaaa1e6 PM / devfreq: Add HiSilicon uncore frequency scaling driver) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (05e35bd07d56 pmdomain: qcom: rpmhpd: Add Glymur RPMh Power Domains) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (22679d807dea rust: opp: use c_* types via kernel prelude) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (1d264d3a1988 dt-bindings: thermal: tegra: Document Tegra210B01) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (c18646248fed RDMA/siw: Fix the sendmsg byte count in siw_tcp_sendpages) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (821c9e515db5 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (888a7776f4fb net/mlx5: Add support for device steering tag) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (3e383124ce63 Bluetooth: hci_sync: Prevent unintended PA sync when SID is 0xFF) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 3 ++ + drivers/bluetooth/btintel_pcie.c | 103 ++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btmtk.c | 7 +-- + drivers/bluetooth/btusb.c | 2 + + include/net/bluetooth/bluetooth.h | 4 +- + include/net/bluetooth/hci_core.h | 14 +++++- + net/bluetooth/hci_conn.c | 14 +++++- + net/bluetooth/hci_event.c | 7 ++- + net/bluetooth/hci_sync.c | 25 +++++---- + net/bluetooth/iso.c | 16 +++--- + net/bluetooth/mgmt.c | 12 ++--- + 11 files changed, 172 insertions(+), 35 deletions(-) +Merging wireless-next/for-next (126d85fb0405 Merge tag 'wireless-next-2025-07-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (708243c62efd wifi: mac80211: fix unassigned variable access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (d2af710d6d50 wifi: iwlwifi: mvm/fw: Avoid -Wflex-array-member-not-at-end warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Already up to date. +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of git://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 git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (9cf9db888f38 Merge tag 'nand/for-6.17' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (fb2fae70e7e9 mtd: spinand: winbond: Add comment about the maximum frequency) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (2e3a7476ec39 mtd: spi-nor: Fix spi_nor_try_unlock_all()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9d9b193ed73a crypto: hash - Increase HASH_MAX_DESCSIZE for hmac(sha3-224-s390)) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (2a1a127aecf6 Merge branches 'libcrypto-conversions' and 'libcrypto-tests' into libcrypto-next) +$ git merge -m Merge branch 'libcrypto-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Merge made by the 'ort' strategy. +Merging drm/drm-next (64c627519474 Merge tag 'amd-drm-fixes-6.17-2025-08-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 76 +++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 3 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 57 +++++----- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 121 +++++++++++++++++++-- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 61 +++++++++-- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 20 +++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 9 ++ + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 - + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 5 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 19 ++-- + .../amd/display/dc/resource/dce60/dce60_resource.c | 34 +++--- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 16 +++ + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 21 +++- + drivers/gpu/drm/xe/Kconfig | 1 + + drivers/gpu/drm/xe/xe_device.c | 8 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 57 +++++++++- + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 4 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 6 + + drivers/gpu/drm/xe/xe_module.c | 8 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 27 +++++ + drivers/gpu/drm/xe/xe_sriov_pf.h | 1 + + 31 files changed, 456 insertions(+), 141 deletions(-) +Merging drm-exynos/for-linux-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (c0a8e4443d76 drm/radeon: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/aux-bridge.c | 2 ++ + drivers/gpu/drm/drm_bridge.c | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 9 ++---- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 ++ + drivers/gpu/drm/omapdrm/omap_fb.c | 23 +++++++-------- + drivers/gpu/drm/omapdrm/omap_fb.h | 2 ++ + drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 +++- + drivers/gpu/drm/radeon/radeon_display.c | 5 ++-- + drivers/gpu/drm/radeon/radeon_fbdev.c | 11 +++---- + drivers/gpu/drm/radeon/radeon_mode.h | 2 ++ + include/drm/drm_bridge.h | 48 +++++++++++++++++++++++++++++++ + 11 files changed, 84 insertions(+), 27 deletions(-) +Merging amdgpu/drm-next (111821e4b5a3 drm/amdgpu/vcn: Hold pg_lock before vcn power off) + 0333052d9068 ("drm/amdkfd: Destroy KFD debugfs after destroy KFD wq") + 21c6764ed4bf ("drm/amdgpu: Update external revid for GC v9.5.0") + 26a609e053a6 ("drm/amd: Restore cached power limit during resume") + 2a2681eda73b ("drm/amdgpu: update mmhub 3.0.1 client id mappings") + 35222b5934ec ("drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming.") + 4e9526924d09 ("drm/amd: Restore cached manual clock settings during resume") + 582bf7c5158d ("drm/amdgpu: Add NULL check for asic_funcs") + 62eedd150fa1 ("drm/amdgpu/discovery: fix fw based ip discovery") + 6ec8a5cbec75 ("drm/amd/display: Revert "drm/amd/display: Fix AMDGPU_MAX_BL_LEVEL value"") + 92e244924151 ("drm/amdgpu: Update SDMA firmware version check for user queue support") + 9d1ac25c7f83 ("drm/amdgpu: Update supported modes for GC v9.5.0") + 9dd8e2ba268c ("drm/amd/display: fix a Null pointer dereference vulnerability") + 9ed3d7bdf2dc ("amdgpu/amdgpu_discovery: increase timeout limit for IFWI init") + a578f2a58c3a ("drm/amdkfd: Fix checkpoint-restore on multi-xcc") + aae94897b666 ("drm/amdgpu: add missing vram lost check for LEGACY RESET") + bbddcbe36a68 ("drm/amd/display: Don't overwrite dce60_clk_mgr") + cc7bfba95966 ("drm/amd/display: Add primary plane to commits for correct VRR handling") + e932f4779a2d ("drm/amdgpu: update mmhub 3.3 client id mappings") + ed76936c6b10 ("drm/amdgpu: Retain job->vm in amdgpu_job_prepare_job") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Merge made by the 'ort' strategy. + .../gpu/amdgpu/amd-hardware-list-info.rst | 4 +- + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 34 +-- + Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 58 ++-- + Documentation/gpu/amdgpu/display/dc-glossary.rst | 2 +- + .../gpu/amdgpu/display/display-contributing.rst | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 51 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 141 +++++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 37 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 282 +++++++++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 21 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 90 ++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 38 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 17 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 21 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 57 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 57 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 47 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 61 ++--- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 89 +----- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 93 +------ + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 89 +----- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 90 +----- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 94 +------ + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 92 +------ + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 96 +------ + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h | 5 - + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 72 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 73 +++-- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 13 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 56 +++- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 102 +++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 35 ++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 1 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 16 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 163 +++-------- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 7 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 73 ++++- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 56 ++-- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 20 +- + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 31 +++ + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.h | 6 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 9 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 26 ++ + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h | 8 +- + .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 15 + + .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.h | 6 +- + .../gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 3 + + .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 3 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 41 +++ + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 8 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 39 ++- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.h | 7 + + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 63 ++++- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 2 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 48 ++++ + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 5 + + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 + + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 1 + + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 34 ++- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 1 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 21 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 5 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 30 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 - + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 + + .../gpu/drm/amd/display/dc/link/link_validation.c | 6 +- + .../display/dc/link/protocols/link_dp_capability.c | 37 +++ + .../display/dc/link/protocols/link_dp_capability.h | 6 + + .../display/dc/link/protocols/link_dp_dpia_bw.c | 71 ++--- + .../display/dc/link/protocols/link_dp_training.c | 9 +- + .../dc/link/protocols/link_edp_panel_control.c | 10 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 5 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.h | 3 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 3 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 1 + + .../display/dc/resource/dcn401/dcn401_resource.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 7 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 114 +++++--- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 5 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 81 ++++++ + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 64 ++++- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 135 +++++++++ + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 48 ++++ + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 103 +++++++ + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 74 ++++- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 303 ++++++++++++++++++++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 76 +++++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 5 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 26 ++ + 164 files changed, 2989 insertions(+), 1448 deletions(-) +Merging drm-intel/for-linux-next (5a569ef4d4ab drm/i915/display: Set C10_VDR_CTRL_MSGBUS_ACCESS before phy reg read) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Already up to date. +Merging drm-msm/msm-next (8290d37ad2b0 drm/msm: Small function param doc fix) +$ 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 (cd86e80b77b2 drm/msm/dp: add linux/io.h header to fix build errors) +$ 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-nova/nova-next (14ae91a81ec8 gpu: nova-core: fix bounds check in PmuLookupTableEntry::new) +$ 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 (9b7ca35ed28f drm/xe/migrate: prevent potential UAF) + 0521a868222f ("Mark xe driver as BROKEN if kernel page size is not 4kB") + 1fdc4c381ff7 ("drm/xe/devcoredump: Defer devcoredump initialization during probe") + a2b461bd6f3b ("drm/xe/pf: Enable SR-IOV PF mode by default") + a424353937c2 ("drm/xe/pf: Disable PF restart worker on device removal") + c6c86441c465 ("drm/xe/pf: Make sure PF is ready to configure VFs") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/display/xe_plane_initial.c +Auto-merging drivers/gpu/drm/xe/xe_configfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_configfs.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_sriov_pf.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_hw_engine_group.c +Auto-merging drivers/gpu/drm/xe/xe_module.c +Resolved 'drivers/gpu/drm/xe/xe_configfs.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/xe/xe_gt_sriov_pf.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/xe/xe_gt_sriov_pf.c'. +[master cdb12c5b846c] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_gpusvm.c | 4 +- + drivers/gpu/drm/drm_pagemap.c | 142 +++++--- + drivers/gpu/drm/xe/Makefile | 4 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 8 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 3 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 3 +- + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 2 +- + drivers/gpu/drm/xe/regs/xe_pmt.h | 10 + + drivers/gpu/drm/xe/xe_assert.h | 4 +- + drivers/gpu/drm/xe/xe_bb.c | 35 ++ + drivers/gpu/drm/xe/xe_bb.h | 3 + + drivers/gpu/drm/xe/xe_bo.c | 54 ++- + drivers/gpu/drm/xe/xe_bo.h | 4 +- + drivers/gpu/drm/xe/xe_bo_types.h | 4 + + drivers/gpu/drm/xe/xe_configfs.c | 139 ++++++-- + drivers/gpu/drm/xe/xe_debugfs.c | 107 ++++++ + drivers/gpu/drm/xe/xe_dep_job_types.h | 29 ++ + drivers/gpu/drm/xe/xe_dep_scheduler.c | 143 ++++++++ + drivers/gpu/drm/xe/xe_dep_scheduler.h | 21 ++ + drivers/gpu/drm/xe/xe_device.c | 24 ++ + drivers/gpu/drm/xe/xe_device_types.h | 69 +--- + drivers/gpu/drm/xe/xe_exec_queue.c | 96 +++++ + drivers/gpu/drm/xe/xe_exec_queue.h | 4 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 15 + + drivers/gpu/drm/xe/xe_ggtt.c | 3 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 13 + + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 1 + + drivers/gpu/drm/xe/xe_gt.c | 16 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 56 ++- + drivers/gpu/drm/xe/xe_gt_mcr.c | 4 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 13 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 24 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 13 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_tlb_inval_job.c | 274 ++++++++++++++ + drivers/gpu/drm/xe/xe_gt_tlb_inval_job.h | 34 ++ + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 + + drivers/gpu/drm/xe/xe_gt_types.h | 2 + + drivers/gpu/drm/xe/xe_guc.c | 19 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 103 +++--- + drivers/gpu/drm/xe/xe_guc_buf.c | 2 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 5 + + drivers/gpu/drm/xe/xe_guc_submit.c | 209 ++++++++++- + drivers/gpu/drm/xe/xe_guc_submit.h | 10 + + drivers/gpu/drm/xe/xe_guc_types.h | 6 + + drivers/gpu/drm/xe/xe_hw_engine_group.c | 4 +- + drivers/gpu/drm/xe/xe_lmtt.c | 9 +- + drivers/gpu/drm/xe/xe_lrc.c | 172 ++++++++- + drivers/gpu/drm/xe/xe_lrc.h | 9 + + drivers/gpu/drm/xe/xe_migrate.c | 431 ++++++++++++++++++----- + drivers/gpu/drm/xe/xe_migrate.h | 29 +- + drivers/gpu/drm/xe/xe_mmio_gem.c | 226 ++++++++++++ + drivers/gpu/drm/xe/xe_mmio_gem.h | 20 ++ + drivers/gpu/drm/xe/xe_module.c | 29 +- + drivers/gpu/drm/xe/xe_pci.c | 11 + + drivers/gpu/drm/xe/xe_pm.c | 4 + + drivers/gpu/drm/xe/xe_pt.c | 178 ++++------ + drivers/gpu/drm/xe/xe_query.c | 9 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 10 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 8 +- + drivers/gpu/drm/xe/xe_sa.c | 1 - + drivers/gpu/drm/xe/xe_sa.h | 15 +- + drivers/gpu/drm/xe/xe_sa_types.h | 1 - + drivers/gpu/drm/xe/xe_sriov.c | 19 + + drivers/gpu/drm/xe/xe_sriov.h | 1 + + drivers/gpu/drm/xe/xe_sriov_vf.c | 78 +++- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 372 +++++++++++++++++++ + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 17 + + drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h | 53 +++ + drivers/gpu/drm/xe/xe_sriov_vf_types.h | 6 + + drivers/gpu/drm/xe/xe_svm.c | 112 +++--- + drivers/gpu/drm/xe/xe_svm.h | 4 +- + drivers/gpu/drm/xe/xe_tile.c | 62 ++-- + drivers/gpu/drm/xe/xe_tile.h | 14 +- + drivers/gpu/drm/xe/xe_trace.h | 16 - + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 10 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 22 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 3 +- + drivers/gpu/drm/xe/xe_vm.c | 6 +- + drivers/gpu/drm/xe/xe_vram.c | 211 +++++++---- + drivers/gpu/drm/xe/xe_vram.h | 11 + + drivers/gpu/drm/xe/xe_vram_types.h | 85 +++++ + drivers/gpu/drm/xe/xe_wa.c | 13 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 3 + + include/drm/drm_gpusvm.h | 4 +- + include/drm/drm_pagemap.h | 50 +-- + include/uapi/drm/xe_drm.h | 6 +- + 92 files changed, 3391 insertions(+), 720 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_dep_job_types.h + create mode 100644 drivers/gpu/drm/xe/xe_dep_scheduler.c + create mode 100644 drivers/gpu/drm/xe/xe_dep_scheduler.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_tlb_inval_job.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_tlb_inval_job.h + create mode 100644 drivers/gpu/drm/xe/xe_mmio_gem.c + create mode 100644 drivers/gpu/drm/xe/xe_mmio_gem.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h + create mode 100644 drivers/gpu/drm/xe/xe_vram_types.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 (e4fc307d8e24 Revert "vgacon: Add check for vc_origin address range in vgacon_scroll()") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/core/fbcon.c +Merge made by the 'ort' strategy. + drivers/video/console/vgacon.c | 2 +- + drivers/video/fbdev/core/fbcon.c | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging regmap/for-next (067aa458a064 Merge remote-tracking branch 'regmap/for-6.16' into regmap-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (e8e4f3c242cc ALSA: hda/cirrus: Restrict prompt only for CONFIG_EXPERT) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (95a042a0c8ec firewire: ohci: reduce the size of common context structure by extracting members into AT structure) +$ 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 (4bafaff30f0f Merge remote-tracking branch 'asoc/for-6.16' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (40a826bd6c82 module: Rename MAX_PARAM_PREFIX_LEN to __MODULE_NAME_LEN) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (4f67c4189467 HID: hid-steam: Use new BTN_GRIP* buttons) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (9c28ff6c60ff Merge branch 'block-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging drivers/md/dm-raid.c +Merge made by the 'ort' strategy. + block/bfq-iosched.c | 66 ++++-------- + block/bfq-iosched.h | 13 ++- + block/blk-ioc.c | 16 ++- + block/blk-mq-sched.c | 223 ++++++++++++++++++++++++++++------------- + block/blk-mq-sched.h | 12 ++- + block/blk-mq.c | 16 ++- + block/blk-settings.c | 33 ++++-- + block/blk.h | 4 +- + block/elevator.c | 38 +++++-- + block/elevator.h | 16 ++- + block/kyber-iosched.c | 20 +--- + block/mq-deadline.c | 30 +----- + drivers/block/zloop.c | 3 +- + drivers/md/dm-raid.c | 42 ++++---- + drivers/md/md-bitmap.c | 8 +- + drivers/md/md-cluster.c | 16 +-- + drivers/md/md.c | 73 ++++++++------ + drivers/md/md.h | 2 +- + drivers/md/raid0.c | 6 +- + drivers/md/raid1-10.c | 2 +- + drivers/md/raid1.c | 94 +++++++---------- + drivers/md/raid1.h | 22 +--- + drivers/md/raid10.c | 16 +-- + drivers/md/raid5-ppl.c | 6 +- + drivers/md/raid5.c | 30 +++--- + drivers/nvme/host/auth.c | 4 +- + drivers/nvme/host/core.c | 16 +++ + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/pci.c | 2 +- + drivers/nvme/host/tcp.c | 2 +- + drivers/nvme/target/core.c | 18 ++-- + drivers/nvme/target/fc.c | 6 +- + drivers/nvme/target/passthru.c | 2 + + drivers/nvme/target/rdma.c | 6 +- + include/linux/ioprio.h | 3 +- + include/linux/sbitmap.h | 19 +--- + include/uapi/linux/io_uring.h | 4 + + include/uapi/linux/raid/md_p.h | 2 +- + io_uring/net.c | 9 +- + lib/sbitmap.c | 74 ++++++++------ + 40 files changed, 532 insertions(+), 446 deletions(-) +Merging device-mapper/for-next (55a0fbd2ac3f dm: set DM_TARGET_PASSES_CRYPTO feature for dm-thin) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (6cb43739b93c ata: pata_pdc2027x: Remove space before newline and abbreviations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (4b290aae788e Merge tag 'sysctl-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (006aa8f57f55 mfd: dt-bindings: Convert TPS65910 to DT schema) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7b41a2341fa6 power: supply: core: fix static checker warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (10dfd36f0784 regulator: core: correct convergence check in regulator_set_voltage()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (5d8b97c94677 MAINTAINERS: Add Xiu and myself as Lockdown maintainers) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (5f49c2d1f422 apparmor: fix: oops when trying to free null ruleset) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (aa9bb1b32594 ima: add a knob ima= to allow disabling IMA in kdump kernel) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (850dada4b3af Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. +Merging smack/next (6ddd169d0288 smack: fix kernel-doc warnings for smk_import_valid_label()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/Smack.rst | 16 +- + security/smack/smack.h | 3 + + security/smack/smack_access.c | 95 ++++++++--- + security/smack/smack_lsm.c | 277 +++++++++++++++++++++----------- + 4 files changed, 273 insertions(+), 118 deletions(-) +Merging tomoyo/master (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd/next (7f0c6675b319 tpm_crb_ffa: handle tpm busy return code) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (48defdf6b083 watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition) +$ 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 (b9e6e8ae0a5f Merge branch 'arm/smmu/updates' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (ae1ae11fb277 audit,module: restore audit logging in load failure case) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (0121898ec05f dt-bindings: Correct indentation and style in DTS example) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (6cd594ed969d ARM: dts: vt8500: Add L2 cache controller on WM8850/WM8950) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (e1584a533a1e mailbox/pcc: support mailbox management of the shared buffer) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Auto-merging drivers/mailbox/Kconfig +CONFLICT (content): Merge conflict in drivers/mailbox/Kconfig +Auto-merging drivers/mailbox/Makefile +CONFLICT (content): Merge conflict in drivers/mailbox/Makefile +Recorded preimage for 'drivers/mailbox/Kconfig' +Recorded preimage for 'drivers/mailbox/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/mailbox/Kconfig'. +Recorded resolution for 'drivers/mailbox/Makefile'. +[master 66d7755a9abe] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git +$ git diff -M --stat --summary HEAD^.. + .../mailbox/allwinner,sun6i-a31-msgbox.yaml | 14 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 10 +- + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 16 +- + .../bindings/mailbox/aspeed,ast2700-mailbox.yaml | 68 +++ + .../bindings/mailbox/brcm,bcm74110-mbox.yaml | 64 ++ + .../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + .../bindings/mailbox/ti,omap-mailbox.yaml | 10 +- + .../bindings/mailbox/ti,secure-proxy.yaml | 18 +- + drivers/mailbox/Kconfig | 19 + + drivers/mailbox/Makefile | 4 + + drivers/mailbox/ast2700-mailbox.c | 235 ++++++++ + drivers/mailbox/bcm74110-mailbox.c | 656 +++++++++++++++++++++ + drivers/mailbox/mtk-cmdq-mailbox.c | 10 +- + drivers/mailbox/pcc.c | 119 +++- + drivers/mailbox/qcom-ipcc.c | 3 +- + include/acpi/pcc.h | 29 + + 18 files changed, 1222 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/aspeed,ast2700-mailbox.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,bcm74110-mbox.yaml + create mode 100644 drivers/mailbox/ast2700-mailbox.c + create mode 100644 drivers/mailbox/bcm74110-mailbox.c +Merging spi/for-next (afa03b83aa4d Merge remote-tracking branch 'spi/for-6.16' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (f31b0ec57580 Merge branch into tip/master: 'timers/clocksource') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/faraday,fttmr010.txt | 38 --------- + .../bindings/timer/faraday,fttmr010.yaml | 89 ++++++++++++++++++++ + .../devicetree/bindings/timer/fsl,ftm-timer.yaml | 7 +- + .../devicetree/bindings/timer/fsl,timrot.yaml | 48 +++++++++++ + .../devicetree/bindings/timer/mediatek,timer.yaml | 2 + + arch/arm64/include/asm/bug.h | 2 +- + arch/loongarch/include/asm/bug.h | 27 +++--- + arch/parisc/include/asm/bug.h | 6 +- + arch/powerpc/include/asm/bug.h | 12 +-- + arch/riscv/include/asm/bug.h | 10 +-- + arch/s390/include/asm/bug.h | 96 +++++++++------------- + arch/sh/include/asm/bug.h | 4 +- + arch/x86/include/asm/bug.h | 30 +++---- + drivers/clocksource/exynos_mct.c | 24 ++++-- + drivers/clocksource/scx200_hrt.c | 1 + + drivers/clocksource/timer-cs5535.c | 1 + + drivers/clocksource/timer-econet-en751221.c | 2 +- + drivers/clocksource/timer-nxp-stm.c | 2 + + drivers/clocksource/timer-stm32-lp.c | 1 + + drivers/clocksource/timer-sun5i.c | 2 + + drivers/clocksource/timer-tegra186.c | 30 ++++--- + drivers/of/irq.c | 1 + + include/asm-generic/bug.h | 13 ++- + kernel/panic.c | 16 ++-- + kernel/time/sched_clock.c | 4 +- + lib/Kconfig.debug | 10 +++ + 26 files changed, 308 insertions(+), 170 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.txt + create mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.yaml + create mode 100644 Documentation/devicetree/bindings/timer/fsl,timrot.yaml +Merging clockevents/timers/drivers/next (d7b8f8e20813 Linux 6.16-rc5) +$ git merge -m Merge branch 'timers/drivers/next' of git://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 (1fb0ddddf5d1 Merge branch 'edac-drivers' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/mem_repair.c +CONFLICT (content): Merge conflict in drivers/edac/mem_repair.c +Resolved 'drivers/edac/mem_repair.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ee7a9300caa1] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git +$ git diff -M --stat --summary HEAD^.. + +Merging ftrace/for-next (39f069d5a466 Merge unwind/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/next (cc1d1365f0f4 Merge branches 'rcu-exp.23.07.2025', 'rcu.22.07.2025', 'torture-scripts.16.07.2025', 'srcu.19.07.2025', 'rcu.nocb.18.07.2025' and 'refscale.07.07.2025' into rcu.merge.23.07.2025) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next +Already up to date. +Merging paulmck/non-rcu/next (b706eec9304f Merge branches 'lkmm.2025.07.09a', 'ratelimit.2025.06.24a' and 'stop-machine.2025.07.17a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Merge made by the 'ort' strategy. +Merging kvm/next (196d9e72c4b0 Merge tag 'kvm-s390-next-6.17-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (7b8346bd9fce KVM: arm64: Don't attempt vLPI mappings when vPE allocation is disabled) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Merge made by the 'ort' strategy. + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 ++++++++ + arch/arm64/kvm/vgic/vgic.h | 10 +--------- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging kvms390/next (efe54612bdb6 improve interrupt cpu) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'ort' strategy. + arch/s390/include/asm/kvm_host.h | 2 +- + arch/s390/kvm/interrupt.c | 20 +++++++++----------- + 2 files changed, 10 insertions(+), 12 deletions(-) +Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (07a289a03140 RISC-V: KVM: Avoid re-acquiring memslot in kvm_riscv_gstage_map()) +$ 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 (33f843444e28 Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. + Documentation/virt/kvm/x86/intel-tdx.rst | 22 ++++++++++++++++++- + arch/x86/include/uapi/asm/kvm.h | 7 ++++++- + arch/x86/kvm/vmx/tdx.c | 36 +++++++++++++++++++++++++------- + 3 files changed, 55 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (114a2de6fa86 xen/netfront: Fix TX response spurious interrupts) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (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 git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (324cee0c272c Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. +Merging sched-ext/for-next (9f0744a0e87e Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Merge made by the 'ort' strategy. +Merging drivers-x86/for-next (1798561befd8 platform/x86: oxpec: Add support for OneXPlayer X1 Mini Pro (Strix Point)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (cc2d5b72b13b platform/chrome: Fix typo in CROS_USBPD_NOTIFY help text) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://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 (4903924ac7ef dt-bindings: leds: ncp5623: Add 0x39 as a valid I2C address) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (ec50ec378e3f ipmi: Use dev_warn_ratelimited() for incorrect message warnings) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (2d1beba54fda thunderbolt: Fix typos in documentation comments) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (bdf2ab177e2f USB: serial: cp210x: use new GPIO line value setter callbacks) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (89748acdf226 Merge tag 'drm-next-2025-08-01' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-next' of git://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 git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (a80198ba650f coresight: fix indentation error in cscfg_remove_owned_csdev_configs()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../bindings/arm/qcom,coresight-tnoc.yaml | 113 ++++++++++ + drivers/hwtracing/coresight/Kconfig | 12 + + drivers/hwtracing/coresight/Makefile | 1 + + drivers/hwtracing/coresight/coresight-core.c | 6 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 1 + + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 1 + + drivers/hwtracing/coresight/coresight-stm.c | 8 +- + drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 22 +- + drivers/hwtracing/coresight/coresight-tnoc.c | 242 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/hwtracing/coresight/ultrasoc-smb.h | 1 + + 13 files changed, 389 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml + create mode 100644 drivers/hwtracing/coresight/coresight-tnoc.c +Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (4f156ee58bb8 fpga: zynq_fpga: Fix the wrong usage of dma_map_sgtable()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/zynq-fpga.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging icc/icc-next (ca652cf0c261 Merge branch 'icc-milos' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (0a686b9c4f84 iio: adc: ad_sigma_delta: Select IIO_BUFFER_DMAENGINE and SPI_OFFLOAD) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (4a3556b81b99 phy: qcom: phy-qcom-m31: Update IPQ5332 M31 USB phy initialization sequence) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (34b1cb4ec286 soundwire: amd: Add support for acp7.2 platform) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (5f09caafc652 extcon: fsa9480: Avoid buffer overflow in fsa9480_handle_change()) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/maxim,max14526.yaml | 80 ++++++ + drivers/extcon/Kconfig | 13 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-adc-jack.c | 2 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-fsa9480.c | 6 +- + drivers/extcon/extcon-max14526.c | 302 +++++++++++++++++++++ + drivers/extcon/extcon-qcom-spmi-misc.c | 2 +- + 8 files changed, 404 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/maxim,max14526.yaml + create mode 100644 drivers/extcon/extcon-max14526.c +Merging gnss/gnss-next (e326371f3002 dt-bindings: gnss: u-blox: add u-blox,neo-9m compatible) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (b1779e4f209c vfio/type1: conditional rescheduling while pinning) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (d632ab86aff2 Merge tag 'for-6.17/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (e3a9ccd21897 dt-bindings: dma: fsl-mxs-dma: allow interrupt-names for fsl,imx23-dma-apbx) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (d445d2ab8129 Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (3aaa3b2d116e Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/scsi_sysfs.c +Merge made by the 'ort' strategy. + drivers/scsi/scsi_debug.c | 91 +++++++++++++++++++++++++++++------------------ + drivers/scsi/scsi_sysfs.c | 4 +-- + 2 files changed, 59 insertions(+), 36 deletions(-) +Merging scsi-mkp/for-next (72fc388d8bc0 scsi: ufs: core: Remove error print for devm_add_action_or_reset()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_debugfs.c | 1 - + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/ufs/core/ufshcd.c | 12 ++++++++---- + drivers/ufs/host/ufs-mediatek.c | 2 +- + 4 files changed, 10 insertions(+), 7 deletions(-) +Merging vhost/linux-next (878676525147 Revert "virtio: reject shm region if length is zero") +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/vhost/net.c | 9 +++++++-- + drivers/vhost/vhost.c | 1 + + drivers/virtio/virtio_pci_legacy_dev.c | 4 ++-- + drivers/virtio/virtio_pci_modern_dev.c | 4 ++-- + include/linux/virtio_config.h | 2 -- + 5 files changed, 12 insertions(+), 8 deletions(-) +Merging rpmsg/for-next (01d7d9241256 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging gpio-brgl/gpio/for-next (d9d87d90cc0b treewide: rename GPIO set callbacks back to their original names) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging arch/arm/mach-s3c/gpio-samsung.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c/gpio-samsung.c +Auto-merging sound/soc/codecs/wm8962.c +Recorded preimage for 'arch/arm/mach-s3c/gpio-samsung.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm/mach-s3c/gpio-samsung.c'. +[master 87f16e4f78dc] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/common/sa1111.c | 4 +-- + arch/arm/common/scoop.c | 2 +- + arch/arm/mach-s3c/gpio-samsung.c | 4 +-- + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/neponset.c | 2 +- + arch/arm/plat-orion/gpio.c | 2 +- + arch/m68k/coldfire/gpio.c | 2 +- + arch/mips/alchemy/common/gpiolib.c | 6 ++--- + arch/mips/bcm63xx/gpio.c | 2 +- + arch/mips/kernel/gpio_txx9.c | 2 +- + arch/mips/rb532/gpio.c | 2 +- + arch/mips/txx9/generic/setup.c | 2 +- + arch/powerpc/platforms/44x/gpio.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 2 +- + arch/powerpc/platforms/8xx/cpm1.c | 4 +-- + arch/powerpc/sysdev/cpm_common.c | 2 +- + drivers/bcma/driver_gpio.c | 2 +- + drivers/gpio/gpio-74x164.c | 4 +-- + drivers/gpio/gpio-adnp.c | 2 +- + drivers/gpio/gpio-adp5520.c | 2 +- + drivers/gpio/gpio-adp5585.c | 2 +- + drivers/gpio/gpio-aggregator.c | 4 +-- + drivers/gpio/gpio-altera-a10sr.c | 2 +- + drivers/gpio/gpio-altera.c | 2 +- + drivers/gpio/gpio-amd-fch.c | 2 +- + drivers/gpio/gpio-amd8111.c | 2 +- + drivers/gpio/gpio-arizona.c | 2 +- + drivers/gpio/gpio-aspeed-sgpio.c | 2 +- + drivers/gpio/gpio-aspeed.c | 2 +- + drivers/gpio/gpio-bcm-kona.c | 2 +- + drivers/gpio/gpio-bd71815.c | 2 +- + drivers/gpio/gpio-bd71828.c | 2 +- + drivers/gpio/gpio-bd9571mwv.c | 2 +- + drivers/gpio/gpio-bt8xx.c | 2 +- + drivers/gpio/gpio-cgbc.c | 2 +- + drivers/gpio/gpio-creg-snps.c | 2 +- + drivers/gpio/gpio-cros-ec.c | 2 +- + drivers/gpio/gpio-crystalcove.c | 2 +- + drivers/gpio/gpio-cs5535.c | 2 +- + drivers/gpio/gpio-da9052.c | 2 +- + drivers/gpio/gpio-da9055.c | 2 +- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-dln2.c | 2 +- + drivers/gpio/gpio-eic-sprd.c | 2 +- + drivers/gpio/gpio-em.c | 2 +- + drivers/gpio/gpio-exar.c | 2 +- + drivers/gpio/gpio-f7188x.c | 2 +- + drivers/gpio/gpio-graniterapids.c | 2 +- + drivers/gpio/gpio-gw-pld.c | 2 +- + drivers/gpio/gpio-htc-egpio.c | 2 +- + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-imx-scu.c | 2 +- + drivers/gpio/gpio-it87.c | 2 +- + drivers/gpio/gpio-janz-ttl.c | 2 +- + drivers/gpio/gpio-kempld.c | 2 +- + drivers/gpio/gpio-latch.c | 4 +-- + drivers/gpio/gpio-ljca.c | 2 +- + drivers/gpio/gpio-logicvc.c | 2 +- + drivers/gpio/gpio-loongson-64bit.c | 2 +- + drivers/gpio/gpio-loongson.c | 2 +- + drivers/gpio/gpio-lp3943.c | 2 +- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-lp87565.c | 2 +- + drivers/gpio/gpio-lpc18xx.c | 2 +- + drivers/gpio/gpio-lpc32xx.c | 10 +++---- + drivers/gpio/gpio-macsmc.c | 2 +- + drivers/gpio/gpio-madera.c | 2 +- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-max732x.c | 4 +-- + drivers/gpio/gpio-max77620.c | 2 +- + drivers/gpio/gpio-max77650.c | 2 +- + drivers/gpio/gpio-max77759.c | 2 +- + drivers/gpio/gpio-mb86s7x.c | 2 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 2 +- + drivers/gpio/gpio-mlxbf2.c | 2 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mmio.c | 24 ++++++++--------- + drivers/gpio/gpio-mockup.c | 4 +-- + drivers/gpio/gpio-moxtet.c | 2 +- + drivers/gpio/gpio-mpc5200.c | 4 +-- + drivers/gpio/gpio-mpfs.c | 2 +- + drivers/gpio/gpio-mpsse.c | 4 +-- + drivers/gpio/gpio-msc313.c | 2 +- + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/gpio/gpio-nomadik.c | 2 +- + drivers/gpio/gpio-npcm-sgpio.c | 4 +-- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-omap.c | 4 +-- + drivers/gpio/gpio-palmas.c | 2 +- + drivers/gpio/gpio-pca953x.c | 4 +-- + drivers/gpio/gpio-pca9570.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 4 +-- + drivers/gpio/gpio-pch.c | 2 +- + drivers/gpio/gpio-pl061.c | 2 +- + drivers/gpio/gpio-pxa.c | 10 ++----- + drivers/gpio/gpio-raspberrypi-exp.c | 2 +- + drivers/gpio/gpio-rc5t583.c | 2 +- + drivers/gpio/gpio-rcar.c | 4 +-- + drivers/gpio/gpio-rdc321x.c | 2 +- + drivers/gpio/gpio-reg.c | 6 ++--- + drivers/gpio/gpio-regmap.c | 4 +-- + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-rtd.c | 2 +- + drivers/gpio/gpio-sa1100.c | 2 +- + drivers/gpio/gpio-sama5d2-piobu.c | 2 +- + drivers/gpio/gpio-sch.c | 2 +- + drivers/gpio/gpio-sch311x.c | 2 +- + drivers/gpio/gpio-sim.c | 4 +-- + drivers/gpio/gpio-siox.c | 2 +- + drivers/gpio/gpio-spear-spics.c | 2 +- + drivers/gpio/gpio-sprd.c | 2 +- + drivers/gpio/gpio-stmpe.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-syscon.c | 4 +-- + drivers/gpio/gpio-tangier.c | 2 +- + drivers/gpio/gpio-tc3589x.c | 2 +- + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-tegra186.c | 2 +- + drivers/gpio/gpio-thunderx.c | 4 +-- + drivers/gpio/gpio-timberdale.c | 2 +- + drivers/gpio/gpio-tpic2810.c | 4 +-- + drivers/gpio/gpio-tps65086.c | 2 +- + drivers/gpio/gpio-tps65218.c | 2 +- + drivers/gpio/gpio-tps65219.c | 4 +-- + drivers/gpio/gpio-tps6586x.c | 2 +- + drivers/gpio/gpio-tps65910.c | 2 +- + drivers/gpio/gpio-tps65912.c | 2 +- + drivers/gpio/gpio-tps68470.c | 2 +- + drivers/gpio/gpio-tqmx86.c | 2 +- + drivers/gpio/gpio-ts4900.c | 2 +- + drivers/gpio/gpio-ts5500.c | 2 +- + drivers/gpio/gpio-twl4030.c | 2 +- + drivers/gpio/gpio-twl6040.c | 2 +- + drivers/gpio/gpio-uniphier.c | 4 +-- + drivers/gpio/gpio-viperboard.c | 4 +-- + drivers/gpio/gpio-virtio.c | 2 +- + drivers/gpio/gpio-vx855.c | 2 +- + drivers/gpio/gpio-wcd934x.c | 2 +- + drivers/gpio/gpio-wcove.c | 2 +- + drivers/gpio/gpio-winbond.c | 2 +- + drivers/gpio/gpio-wm831x.c | 2 +- + drivers/gpio/gpio-wm8350.c | 2 +- + drivers/gpio/gpio-wm8994.c | 2 +- + drivers/gpio/gpio-xgene.c | 2 +- + drivers/gpio/gpio-xilinx.c | 4 +-- + drivers/gpio/gpio-xlp.c | 2 +- + drivers/gpio/gpio-xra1403.c | 2 +- + drivers/gpio/gpio-xtensa.c | 2 +- + drivers/gpio/gpio-zevio.c | 2 +- + drivers/gpio/gpio-zynq.c | 2 +- + drivers/gpio/gpio-zynqmp-modepin.c | 2 +- + drivers/gpio/gpiolib.c | 31 ++++++---------------- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- + drivers/hid/hid-cp2112.c | 2 +- + drivers/hid/hid-mcp2200.c | 4 +-- + drivers/hid/hid-mcp2221.c | 2 +- + drivers/hwmon/ltc2992.c | 4 +-- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +- + drivers/iio/adc/ad4130.c | 2 +- + drivers/iio/adc/ad4170-4.c | 2 +- + drivers/iio/adc/ad7768-1.c | 2 +- + drivers/iio/adc/rohm-bd79124.c | 4 +-- + drivers/iio/adc/ti-ads7950.c | 2 +- + drivers/iio/addac/ad74115.c | 2 +- + drivers/iio/addac/ad74413r.c | 4 +-- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/input/keyboard/adp5588-keys.c | 2 +- + drivers/input/touchscreen/ad7879.c | 2 +- + drivers/leds/blink/leds-lgm-sso.c | 2 +- + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-tca6507.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/i2c/ds90ub913.c | 2 +- + drivers/media/i2c/ds90ub953.c | 2 +- + drivers/media/i2c/max9286.c | 2 +- + drivers/media/i2c/max96717.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 2 +- + drivers/misc/ti_fpc202.c | 2 +- + drivers/net/can/spi/mcp251x.c | 4 +-- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 2 +- + drivers/net/phy/qcom/qca807x.c | 2 +- + drivers/pinctrl/actions/pinctrl-owl.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +-- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 2 +- + drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 2 +- + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-intel.c | 2 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-airoha.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-ma35.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/pinctrl/pinctrl-amdisp.c | 2 +- + drivers/pinctrl/pinctrl-apple-gpio.c | 2 +- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +-- + drivers/pinctrl/pinctrl-at91.c | 4 +-- + drivers/pinctrl/pinctrl-aw9523.c | 4 +-- + drivers/pinctrl/pinctrl-axp209.c | 4 +-- + drivers/pinctrl/pinctrl-cy8c95x0.c | 4 +-- + drivers/pinctrl/pinctrl-da9062.c | 2 +- + drivers/pinctrl/pinctrl-digicolor.c | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 2 +- + drivers/pinctrl/pinctrl-keembay.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 4 +-- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 2 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 2 +- + drivers/pinctrl/pinctrl-rk805.c | 2 +- + drivers/pinctrl/pinctrl-rp1.c | 2 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-stmfx.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 4 +-- + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/renesas/gpio.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 2 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + drivers/pinctrl/sunplus/sppctl.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- + drivers/platform/cznic/turris-omnia-mcu-gpio.c | 4 +-- + drivers/platform/x86/barco-p50-gpio.c | 2 +- + drivers/platform/x86/intel/int0002_vgpio.c | 2 +- + drivers/platform/x86/portwell-ec.c | 4 +-- + drivers/platform/x86/silicom-platform.c | 2 +- + drivers/pwm/pwm-pca9685.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/soc/fsl/qe/gpio.c | 4 +-- + drivers/soc/renesas/pwc-rzv2m.c | 2 +- + drivers/spi/spi-xcomm.c | 2 +- + drivers/ssb/driver_gpio.c | 4 +-- + drivers/staging/greybus/gpio.c | 2 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/usb/serial/cp210x.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 4 +-- + drivers/video/fbdev/via/via-gpio.c | 2 +- + include/linux/gpio/driver.h | 22 +++++---------- + include/linux/gpio/generic.h | 4 +-- + sound/hda/codecs/side-codecs/cirrus_scodec_test.c | 2 +- + sound/soc/codecs/idt821034.c | 2 +- + sound/soc/codecs/peb2466.c | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/tlv320adc3xxx.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/zl38060.c | 2 +- + sound/soc/soc-ac97.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + 283 files changed, 359 insertions(+), 388 deletions(-) +Merging gpio-intel/for-next (9ab29ed50555 gpiolib: acpi: Add a quirk for Acer Nitro V15) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (a3fe1324c3c5 pinctrl: mediatek: Add pinctrl driver for mt8189) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (3b4408038da9 pinctrl: intel: fix build warnings about export.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (7000167796a0 pinctrl: renesas: Simplify PINCTRL_RZV2M logic) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (683d532dfc96 pinctrl: samsung: Fix gs101 irq chip) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (65c6f742ab14 pwm: imx-tpm: Reset counter if CMOD is 0) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Already up to date. +Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (30fb5e134f05 selftests/pidfd: Fix duplicate-symbol warnings for SCHED_ CPP symbols) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (34db4fba8191 kunit: fix longest symbol length test) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-test' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (bb5b0b4317c9 rtc: ds1685: Update Joshua Kinard's email address.) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (9f97e61bde6a cxl: Include range.h in cxl.h) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/msi.c +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 (b0c9bfbab925 selftests/seccomp: Add a test for the WAIT_KILLABLE_RECV fast reply race) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Merge made by the 'ort' strategy. + kernel/seccomp.c | 12 +-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 131 ++++++++++++++++++++++++++ + 2 files changed, 136 insertions(+), 7 deletions(-) +Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 60 +++++++++++++++++++++++++++----------------------- + lib/xarray.c | 3 +-- + 2 files changed, 34 insertions(+), 29 deletions(-) +Merging hyperv/hyperv-next (d9016a249be5 hv/hv_kvp_daemon: Prevent similar logs in kvp_key_add_or_modify()) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Merge made by the 'ort' strategy. + tools/hv/hv_get_dhcp_info.sh | 87 ++++++++++++++++++++++++++++++++++++++------ + tools/hv/hv_kvp_daemon.c | 18 ++++----- + 2 files changed, 82 insertions(+), 23 deletions(-) +Merging auxdisplay/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (00559ba3ae74 bus: mhi: host: pci_generic: Add Telit FN990B40 modem support) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblock_set_node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (f11a5f89910a Documentation/ABI/testing/debugfs-cxl: Add 'cxl' to clear_poison path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (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 (02eb7a8eee20 efi: add API doc entry for ovmf_debug_log) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-efi | 7 ++ + drivers/firmware/efi/Kconfig | 8 ++ + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 8 ++ + drivers/firmware/efi/libstub/printk.c | 4 +- + drivers/firmware/efi/ovmf-debug-log.c | 111 +++++++++++++++++++++++++++ + include/linux/efi.h | 4 + + 7 files changed, 141 insertions(+), 2 deletions(-) + create mode 100644 drivers/firmware/efi/ovmf-debug-log.c +Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (8185696483dc MAINTAINERS: add missing files to slab section) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Already up to date. +Merging random/master (3778dcb2dcc1 random: use offstack cpumask when necessary) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging drivers/media/test-drivers/vivid/vivid-vid-cap.c +Merge made by the 'ort' strategy. + drivers/char/random.c | 23 ++++++++++++++--------- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +++- + include/linux/prandom.h | 6 ------ + 3 files changed, 17 insertions(+), 16 deletions(-) +Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/namei.c | 2 +- + include/linux/fs.h | 1 + + security/landlock/errata/abi-1.h | 16 + + security/landlock/fs.c | 194 +++- + security/landlock/ruleset.c | 12 +- + security/landlock/ruleset.h | 2 +- + tools/testing/selftests/landlock/fs_test.c | 1317 +++++++++++++++++++++++++++- + 7 files changed, 1503 insertions(+), 41 deletions(-) + create mode 100644 security/landlock/errata/abi-1.h +Merging rust/rust-next (479058002c32 Merge tag 'ata-6.17-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) +$ 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 (d49ac7744f57 MAINTAINERS: add mm folks as reviewers to rust alloc) +$ 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 (fc3870dc5cad rust: pin-init: examples, tests: use `ignore` instead of conditionally compiling tests) +$ 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 (d4b29ddf82a4 rust: time: Add wrapper for fsleep() function) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging sysctl/sysctl-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (7f71195c15dc fork: reorder function qualifiers for copy_clone_args_from_user) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (89748acdf226 Merge tag 'drm-next-2025-08-01' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (f627b51aaa04 compiler_types: Provide __no_kstack_erase to disable coverage only on Clang) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging nolibc/for-next (b9e50363178a selftests/nolibc: add x32 test configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Already up to date. +Merging iommufd/for-next (2c78e74493d3 iommu/arm-smmu-v3: Replace vsmmu_size/type with get_viommu_size) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Auto-merging tools/power/x86/turbostat/turbostat.8 +CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8 +Auto-merging tools/power/x86/turbostat/turbostat.c +CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c +Resolved 'tools/power/x86/turbostat/turbostat.8' using previous resolution. +Resolved 'tools/power/x86/turbostat/turbostat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 58c886c897ef] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git +$ git diff -M --stat --summary HEAD^.. + tools/power/x86/turbostat/turbostat.8 | 17 +- + tools/power/x86/turbostat/turbostat.c | 534 ++++++++-------------------------- + 2 files changed, 131 insertions(+), 420 deletions(-) +Merging pwrseq/pwrseq/for-next (07d59dec6795 power: sequencing: qcom-wcn: fix bluetooth-wifi copypasta for WCN6855) +$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (cdd73b166607 uapi: fix broken link in linux/capability.h) +$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (038d61fd6422 Linux 6.16) +$ 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 (9872916ad1a1 kcsan: test: Initialize dummy variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (118da22eb6fb lib/crc: x86/crc32c: Enable VPCLMULQDQ optimization where beneficial) +$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (b1136432c972 soc: hisilicon: kunpeng_hccs: Fix incorrect log information) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Already up to date. +Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code) +$ git merge -m Merge branch 'for-next' of git://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..4c324c52a794 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20250808 |