From ed9a4ad6e5bd3a443e81446476718abebee47e82 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 26 Nov 2024 15:33:55 +1100 Subject: [PATCH] Add linux-next specific files for 20241126 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 390 +++ Next/Trees | 392 +++ Next/merge.log | 6905 +++++++++++++++++++++++++++++++++++++++++++++ localversion-next | 1 + 4 files changed, 7688 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 0000000000000..35769cf03a1fb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,390 @@ +Name SHA1 +---- ---- +origin 9f16d5e6f220661f73b36a4be1b21575651d8833 +fixes 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +ext4-fixes 4a622e4d477bb12ad5ed4abbc7ad1365de1fa347 +vfs-brauner-fixes 088f294609d8f8816dc316681aef2eb61982e0da +fscrypt-current 8e929cb546ee42c9a61d24fae60605e9e3192354 +fsverity-current 8e929cb546ee42c9a61d24fae60605e9e3192354 +btrfs-fixes d22160d9bdb1b42aa2b7f34367a0e4d6aec2557e +vfs-fixes 678379e1d4f7443b170939525d3312cfc37bf86b +erofs-fixes ae54567eaa87fd863ab61084a3828e1c36b0ffb0 +nfsd-fixes adc218676eef25575469234709c2d87185ca223a +v9fs-fixes 684a64bf32b6e488004e0ad7f0d7e922798f65b6 +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +bcachefs 4ad62b440f279daf784a0c17809e09c3ca6be5b1 +fscrypt 8e929cb546ee42c9a61d24fae60605e9e3192354 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 5f1be03698412ec217b526a4634917cf9dd54525 +ceph c5cf420303256dcd6ff175643e9e9558543c2047 +cifs 0d28f8330087234c4bc77e3a2e66ef280bb613f5 +configfs 84147f4e84c4f4822006161c5ad43612ac906407 +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 200b977ebbc313a59174ba971006a231b3533dc5 +erofs 0bc8061ffc733a0a246b8689b2d32a3e9204f43c +exfat 8a3f5711ad74db9881b289a6e34d7f3b700df720 +exportfs adc218676eef25575469234709c2d87185ca223a +ext3 b5d19c2cd05bbc6c6e8e8ccd7911a2773029b3bd +ext4 3e7c69cdb053f9edea95502853f35952ab6cbf06 +f2fs bc8aeb04fd80cb8cfae3058445c84410fd0beb5e +fsverity 8e929cb546ee42c9a61d24fae60605e9e3192354 +fuse d1dfb5f52ffc4a142d88da5c0ed0514f3602c4b8 +gfs2 ffd1cf0443a208b80e40100ed02892d2ec74c7e9 +jfs a174706ba4dad895c40b1d2277bade16dfacdcd9 +ksmbd e36e96504139b4abe86b4a191ee6ec15ef009653 +nfs 20fde6c34d8e56ad6a08cbda19342769cae6a8ef +nfs-anna 867da60d463bb2a3e28c9235c487e56e96cffa00 +nfsd 583772eec7b0096516a8ee8b1cc31401894f1e3a +ntfs3 bac89bb33d91cdd75092e15cf59fe6be34571142 +orangefs 96319dacaf15f666bcba7275953d780e23fe9e75 +overlayfs c8b359dddb418c60df1a69beea01d1b3322bfe83 +ubifs bcdcb115eaed5e988cf37cc9a1dd5f5dd200e927 +v9fs e0260d530b73ee969ae971d14daa02376dcfc93f +v9fs-ericvh 684a64bf32b6e488004e0ad7f0d7e922798f65b6 +xfs a8581099604dfa609a34a3fac8ef5af0d300d2c1 +zonefs c4b3c1332f55c48785e6661cebeb7269a92a45fd +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 5c9e141c6f61d518af02ce98a882f715023fef00 +vfs 1751606ac8dc5b74126f865e3e8c29bf5073aed3 +mm-hotfixes e44738abfeef964a0771547ec4dcb6307ccaf194 +fs-current 00328354d016a7014898dcdd2d93959f061285ba +kbuild-current 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +arc-current 91544a63920f73f670380af390e5374d530a03a4 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes dfdf714fed559c09021df1d2a4bb64c0ad5f53bc +arm-soc-fixes d62c9c5c4cbc77e65e83183a18c9ce4aab8eccd2 +davinci-current 9852d85ec9d492ebef56dc5f229416c925758edc +drivers-memory-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +sophgo-fixes d99913e1b80b51a058020835e7ea1a44397cb4d7 +m68k-current 647619b6bd27d2b7c3c6055f3f0d996e61884202 +powerpc-fixes a373830f96db288a3eb43a8692b6bcd0bd88dfe1 +s390-fixes 3f020399e4f1c690ce87b4c472f75b1fc89e07d5 +net 9bb88c659673003453fd42e0ddf95c9628409094 +bpf ef3ba8c258ee368a5343fa9329df85b4bcb9e8b5 +ipsec c05c5e5aa163f4682ca97a2f0536575fc7dbdecb +netfilter 8ffade77b6337a8767fae9820d57d7a6413dd1a1 +ipvs 35f56c554eb1b56b77b3cf197a6b00922d49033d +wireless c05c62850a8f035a267151dd86ea3daf887e28b8 +ath c05c62850a8f035a267151dd86ea3daf887e28b8 +wpan eb09fbeb48709fe66c0d708aed81e910a577a30a +rdma-fixes 6abe2a90808192a5a8b2825293e5f10e80fdea56 +sound-current a3dd4d63eeb452cfb064a13862fb376ab108f6a6 +sound-asoc-fixes cbc86dd0a4fe9f8c41075328c2e740b68419d639 +regmap-fixes 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b +regulator-fixes 831e9a7556ac879bff732a2a792843c3f7aae3f7 +spi-fixes df01c32d29f6e94f0dcb53b0ba1d8c70af554d43 +pci-current 9852d85ec9d492ebef56dc5f229416c925758edc +driver-core.current 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +tty.current 42f7652d3eb527d03665b09edac47f85fb600924 +usb.current 742afcc22d8eb5dcc67c1dc58ed249851e7cdbdf +usb-serial-fixes 2d5404caa8c7bb5c4e0435f94b28834ae5456623 +phy 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +staging.current 807babf69027b4f1c55e72b06879658e83830880 +iio-fixes f5a0ea554ca9d1b27e6338d61c9f38ea6f4be8fe +counter-current 1437d9f1c56fce9c24e566508bce1d218dd5497a +char-misc.current 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +soundwire-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +thunderbolt-fixes adc218676eef25575469234709c2d87185ca223a +input-current 0201710ba6308a61f1a775c418fe74b8a31ace08 +crypto-current 4223414efeae3a8efb4da1e9c9c52a1a44c1c5bf +vfio-fixes 5a88a3f67e37e39f933b38ebb4985ba5822e9eca +kselftest-fixes dc1308bee1ed03b4d698d77c8bd670d399dcd04d +dmaengine-fixes 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1 +v4l-dvb-fixes ecf2b43018da9579842c774b7f35dbe11b5c38dd +reset-fixes 2cf59663660799ce16f4dfbed97cdceac7a7fa11 +mips-fixes 81983758430957d9a5cb3333fe324fd70cf63e7e +at91-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +omap-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +kvm-fixes 5b47f5a72574237ba171e795dcaa173abc9d6d9d +kvms390-fixes cff59d8631e1409ffdd22d9d717e15810181b32c +hwmon-fixes 998b5a78a9ce1cc4378e7281e4ea310e37596170 +nvdimm-fixes d5240fa65db071909e9d1d5adcc5fd1abc8e96fe +cxl-fixes 3a2b97b3210bd5758f66fad04c5171f85a016a04 +dma-mapping-fixes 78b2770c935fc1434a95cc17613fe31165b02dfe +drivers-x86-fixes 43fb83c17ba2d63dfb798f0be7453ed55ca3f9c2 +samsung-krzk-fixes a03c246d4ec836ae5827a4a16f6b9e730ec5ee8c +pinctrl-samsung-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +devicetree-fixes bc7acc0bd0f94c26bc0defc902311794a3d0fae9 +dt-krzk-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +scsi-fixes 54c814c8b23bc7617be3d46abdb896937695dbfa +drm-fixes adc218676eef25575469234709c2d87185ca223a +drm-intel-fixes adc218676eef25575469234709c2d87185ca223a +mmc-fixes 1635e407a4a64d08a8517ac59ca14ad4fc785e75 +rtc-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +gnss-fixes 8e929cb546ee42c9a61d24fae60605e9e3192354 +hyperv-fixes 895384881ec960aa4c602397a69f0a44a8169405 +risc-v-fixes 57f7c7dc78cd09622b12920d92b40c1ce11b234e +riscv-dt-fixes 8e929cb546ee42c9a61d24fae60605e9e3192354 +riscv-soc-fixes 384f2024e1a100b9b977a697f5e7cb151b00550d +fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +spdx de2f378f2b771b39594c04695feee86476743a69 +gpio-brgl-fixes f57c084928661969a337c731cd05e1da97320829 +gpio-intel-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +pinctrl-intel-fixes adc218676eef25575469234709c2d87185ca223a +auxdisplay-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +kunit-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +memblock-fixes 8043832e2a123fd9372007a29192f2f3ba328cd6 +renesas-fixes 124f4f1a18696c4198f9f903fd74034ea8b7d352 +perf-current 6d78089da9805787a72e52604ad4b2ed7380be3f +efi-fixes ae835a96d72cd025421910edb0e8faf706998727 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 7c626ce4bae1ac14f60076d00eafe71af30450ba +iommufd-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +rust-fixes 2313ab74c3004089ecac5f0f91f7274829f3825b +w1-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +pmdomain-fixes d2fab3fc27cbca7ba65c539a2c5fc7f941231983 +i2c-host-fixes 523930e4528f8e2267e8223245f0339eaec591c4 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes 714398d8742d5e019a8e5512de2abb8db69ba0a3 +pwrseq-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +thead-dt-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +ftrace-fixes fae4078c289a2f24229c0de652249948b1cd6bdb +ring-buffer-fixes 09663753bb7c50b33f8e5fa562c20ce275b88237 +trace-fixes 2a13ca2e8abb12ee43ada8a107dadca83f140937 +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 81983758430957d9a5cb3333fe324fd70cf63e7e +tip-fixes 6e464fa43516c987506aa22b5a7aac3969e6e46f +slab-fixes 9c9201afebea1efc7ea4b8f721ee18a05bb8aca1 +drm-misc-fixes 78ac1c3558810486d90aa533b0039aa70487a3da +mm-stable 2532e6c74a67e65b95f310946e0c0e0a41b3a34b +mm-nonmm-stable 2c259a91d8d23a8266092b0dd51b8092877717a4 +mm 3f8828bf146a37409db6b8ee76389bf94c4c9b54 +kbuild 3596c721c4348b2a964e43f9296a0c01509ba927 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 6d78089da9805787a72e52604ad4b2ed7380be3f +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping 22293c33738c14bb84b9d3e771bc37150e7cf8e7 +asm-generic 0af8e32343f8d0db31f593464fc140eaef25a281 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 6139f7913689e081d4bf120d4e6de543c55ccb65 +arm64 83ef4a378e563d085ddd7214c2a393116b5f3435 +arm-perf 845fd2cbedaf299ee61680a678b279dfeb6fe77c +arm-soc daa20223dee942ebea45bc72b517480af226c370 +amlogic 171aa289a6fe65faffeb92a1fda283c055435a62 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 2eff056a229e21d9e287a74f1305f947ff6b141b +at91 44339d0de195eeb531e2e89815084f567c6cd5c4 +broadcom f4733d5e77517dfa54ee6772222346ad9ed9006f +davinci 9852d85ec9d492ebef56dc5f229416c925758edc +drivers-memory 1f1d847a657523e182df87f88158b607afe7d559 +imx-mxs 6451378c27355f929b7327465f17e9cfe8214f04 +mediatek 3102ce10f3111e4c3b8fb233dc93f29e220adaf7 +mvebu 5f55ff35bfaa3d5c06a1b4130fd197ac0c671f2b +omap 1aedd4a93c6caf229c39374850a327503f9b95ad +qcom 30eb6f0b08b13fd25ea12a3a6fa0a85915190c1c +renesas 96a4838563231539fa7f7c6dc2d0253dcf2dd557 +reset cf3e10cc0e88bba51d330ef851bcffa0bce1070c +rockchip 41286036c994af081e9c1f7229a94d68cadf0561 +samsung-krzk 59a22cf03f67574c8f31d26116fc3660b92ac8f6 +scmi 7aaa234c5ac60d50c048ffcf141e72ccd6110a0e +sophgo b5cf65cc0fd00aa30ff218ec8170dd48e3cbe78d +spacemit 81983758430957d9a5cb3333fe324fd70cf63e7e +stm32 b0191a5cbc222fc7af3f9511b44d1f330ef980e9 +sunxi f13fea5381e26ef2601551fc099bc6b7cb2c451f +tee 9852d85ec9d492ebef56dc5f229416c925758edc +tegra 2a4425682b6f01969de601a71775f8865e80e763 +thead-dt 7e756671a664b73b2a3c0cc37fd25abf6bcd851e +ti 6eaad8fca267090eb5b14970701fa2b8da494f4b +xilinx 0e355cb69e1980a22476c76805a3b3fac20c94cf +clk 21a5352dc702d8e6dc874e0eb6ba6d81291a788a +clk-imx 81a206d736c19139d3863b79e7174f9e98b45499 +clk-renesas 3b42450ce1771c7b11d8f3563f4bbfe9b8d26611 +csky 2b48804336be69272d43939ff0dc3b0c0a703395 +loongarch 7eb5d00d948bb5158daf3300cd08a7a1604b667c +m68k 647619b6bd27d2b7c3c6055f3f0d996e61884202 +m68knommu 63a24cf8cc330e5a68ebd2e20ae200096974c475 +microblaze eb01f8f3c446ed81e3b2c44b7fbed8a5d6be9d3d +mips 4fbd66d8254cedfd1218393f39d83b6c07a01917 +openrisc 1037d186edfc551fa7ba2d4336e74e7575a07a65 +parisc-hd a5f05a138a8cac035bf9da9b6ed0e532bc7942c8 +powerpc 3c592ce7991cdf03bc7d139d790ce58c82c5903b +risc-v 0eb512779d642b21ced83778287a0f7a3ca8f2a1 +riscv-dt c8b72c301dbe71a7a55298d542dff7b2c3612765 +riscv-soc 8400291e289ee6b2bf9779ff1c83a291501f017b +s390 ff123eb7741638d55abf82fac090bb3a543c1e74 +sh 9852d85ec9d492ebef56dc5f229416c925758edc +sparc b6370b338e71cf24c61e33880b8f1a0dd5ad0a44 +uml bed2cc482600296fe04edbc38005ba2851449c10 +xtensa 43a611dc43e43814030f3c593b5cb5490c0ab833 +fs-next fd6359d103b48a1465b7bbed068d7b6eb49f27f0 +printk 4022ef25504db2fb79a2acac0afe9bac934f8dd6 +pci 10099266dec8275a6899e6a27dcdfebbcc726cc7 +pstore 9852d85ec9d492ebef56dc5f229416c925758edc +hid 3be025406a0e339a8d9b9a65f8099adf3f86d50a +i2c f81ffa69edb9540a3c0524ec944ce8bb4ce869dc +i2c-host 68e7aa7ae92f5d5af1a3bfd0aae566e687b980fe +i3c 6cf7b65f7029914dc0cd7db86fac9ee5159008c6 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 3996187f80a0e24bff1959609065d49041cf648d +jc_docs 83a474c11e8cb59e230a43365cb42fa00d3bddaa +v4l-dvb 72ad4ff638047bbbdf3232178fea4bec1f429319 +v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3 +pm 7a3dfa39143cb1b3dd32b3804f27e7b4f7886f26 +cpufreq-arm b5e2058a7a60a25234db959f78d1e0bfec682ea0 +cpupower 47d7650b9cb10381e5472840cf180a803f61fb0e +devfreq d47552124bb0b9527da7a95357ae7d2e6046c4f6 +pmdomain 5812b95b7ff47d2ccc07b8f050652604ac54cdcf +opp d78653dcd8bfca8193934e1545a915e564d78c77 +thermal 7d8abc5f3b5ce0f53d499279d8defc0f72bf7557 +rdma 68b3bca2df00f0a63f0aa2db2b2adc795665229e +net-next fcc79e1714e8c2b8e216dc3149812edd37884eef +bpf-next fc39fb56917bb3cb53e99560ca3612a84456ada2 +ipsec-next a35672819f8d85e2ae38b80d40b923e3ef81e4ea +mlx5-next 8ab3138a9b2dcb0ddf281240cf8cba414eb1224a +netfilter-next 38f83a57aa8e644f37a88d4771d756303cfa7365 +ipvs-next 544070db6c8b0c403e4c6befbc76b52831b897da +bluetooth 4ae007fdffc9715ae0729ca0d2cb446b83f8b64d +wireless-next a71c69f51d1119db5f7812b35f16e8ef7786b3f2 +ath-next cdad737160571a98cc4933a62c9f2728e965ab27 +wpan-next aad4b41a34191b07ad0cb78b4009b46fd23382f7 +wpan-staging aad4b41a34191b07ad0cb78b4009b46fd23382f7 +mtd 944477516bda30bc11e2c30e355da8dd6df48aaf +nand af264e5989055ac33f413c4c80874345cda0cc97 +spi-nor 98d1fb94ce75f39febd456d6d3cbbe58b6678795 +crypto 4223414efeae3a8efb4da1e9c9c52a1a44c1c5bf +drm a163b895077861598be48c1cf7f4a88413c28b22 +drm-exynos 086ed1d51544bfc1123b93eccc2ae88e0fbf3d51 +drm-misc 818956c76517e127fad8cf02cd29866e0a852072 +amdgpu 979bfe291b5b30a9132c2fd433247e677b24c6aa +drm-intel 376a33c4a0d8344bb575e1a6eeb748ee4d4675d3 +drm-msm 86313a9cd152330c634b25d826a281c6a002eb77 +drm-msm-lumag 86313a9cd152330c634b25d826a281c6a002eb77 +drm-xe 4fe70f664a105391321c85b2af241001e8118d24 +etnaviv 2c7ac7dd1b6c295636849c242685b0dd15beb093 +fbdev 8d7493133bfd89322349be3daaf39a256e4354ac +regmap d1f4390dd28ba110f232615dc4610ac1bb2f39f2 +sound 5ebe792a5139f1ce6e4aed22bef12e7e2660df96 +ieee1394 4752e8cde8344cb8673abdefe0dd74e9a2fe23ad +sound-asoc cbc86dd0a4fe9f8c41075328c2e740b68419d639 +modules 2466b31201424ccb7eda00277222302a4d6576cb +input 04337738629e8020c272c0dfcd56b9ae0a55ce98 +block 7eb75c9e3b246d996d87d57b60e9cdbfaaf44a98 +device-mapper a573e404cbf269d46b3a96b18f7316aa57161fdf +libata e8a2389ea808c3902d9938b20e40e2df36c3702b +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc c0baf6ead75d6db16798ae48a4ac38c3af4e9280 +mfd 8ece9d248b851b97e1e0779caa2ca98df9bc41f7 +backlight 3adec6f907b698b32ab62f70da31b41abed00c59 +battery 05d9044177c3e910921522e0209640d3b825a6ae +regulator 831e9a7556ac879bff732a2a792843c3f7aae3f7 +security 0554c22185fb66cdcfef7d9cddaccd725f56af67 +apparmor 1432b850e9f3e4269551ad20f17bae06a32c6ab5 +integrity 08ae3e5f5fc8edb9bd0c7ef9696ff29ef18b26ef +selinux d7b6918e22c74f2b354d8dc0ef31ab17ae334b93 +smack 2749749afa071f8a0e405605de9da615e771a7ce +tomoyo adc218676eef25575469234709c2d87185ca223a +tpmdd 5578b4347bb5d5dfc8eeb8ee2eb8248658707d9b +watchdog 4962ee045d8f06638714d801ab0fb72f89c16690 +iommu 42f0cbb2a253bcd7d4f20e80462014622f19d88e +audit 89282beaf75d81c9e04da7bc7c97bb261c2a0204 +devicetree 28b513b5a683cf1e7125ba54ffe7ecb206ef4984 +dt-krzk 9852d85ec9d492ebef56dc5f229416c925758edc +mailbox 7f9e19f207be0c534d517d65e01417ba968cdd34 +spi df01c32d29f6e94f0dcb53b0ba1d8c70af554d43 +tip d319ed2d7105ddbe7da21a5386e9220e5af8dfec +clockevents 08b97fbd13de79744b31d2b3c8a0ab1a409b94fa +edac 21c093a1626aab38767d5d499715a581a6bb26b0 +ftrace af24728406c36268d03f706b3a344eb5c93bce53 +rcu d8dfba2c606ac9fa763ce3c51dcbf7335544b815 +paulmck b6f62437f43156e376069c4bf46c459ce97c0568 +kvm 1508bae37044ebffd7c7e09915f041936f338123 +kvm-arm 60ad25e14ab5a4e56c8bf7f7d6846eacb9cd53df +kvms390 7a1f3143377adb655a3912b8dea714949f819fa3 +kvm-ppc 590d2f9347f7974d7954400e5d937672fd844a8b +kvm-riscv c74bfe4ffe8c1ca94e3d60ec7af06cf679e23583 +kvm-x86 c55f6b8a2441b20ef12e4b35d4888a22299ddc90 +xen-tip afc545da381ba0c651b2658966ac737032676f01 +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues 85f0d8e39affb7b88401b1e0542230a7af985b96 +sched-ext fc39fb56917bb3cb53e99560ca3612a84456ada2 +drivers-x86 43fb83c17ba2d63dfb798f0be7453ed55ca3f9c2 +chrome-platform ea45f3f46734a47bdbcfb31f41748484219d2ea6 +chrome-platform-firmware 32b0901e141f6d4cf49d820b53eb09b88b1f72f7 +hsi 9852d85ec9d492ebef56dc5f229416c925758edc +leds-lj e8501858035b1f95468da525e7357c8c33811b88 +ipmi 7868b3a94045a6c45b7dfb03945c195106bc77df +driver-core acfeb6defcb9310b1ff44db1e633798ba766337d +usb 237d4e0f41130a5ff0e1c7dc1cb41ee2fe21cd2a +thunderbolt 40aeea50444793ed106997a49c7083b656bccfa7 +usb-serial 8b524944f92ccad925b574f645e9c2709cf60d1e +tty b5a23a60e8ab5711f4952912424347bf3864ce8d +char-misc 5a6c35258d10a4966f45ee48ae24a7d4dad303ce +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 42f7652d3eb527d03665b09edac47f85fb600924 +fastrpc 9852d85ec9d492ebef56dc5f229416c925758edc +fpga dbbd975cc6df04c375f01e19b13ec52e4d2408ba +icc b1fd28da86aae5d622ea95711cee8ede39f70369 +iio 20fd1383cd616d61b2a79967da1221dc6cfb8430 +phy-next 32f4a76b8e7cedec9f9aedbfc43626536bba8350 +soundwire dd690b31de0ed46adc5856698880560b900386ba +extcon 9852d85ec9d492ebef56dc5f229416c925758edc +gnss 8e929cb546ee42c9a61d24fae60605e9e3192354 +vfio fe4bf8d0b6716a423b16495d55b35d3fe515905d +w1 9852d85ec9d492ebef56dc5f229416c925758edc +spmi 9852d85ec9d492ebef56dc5f229416c925758edc +staging 114eae3c9fde35220cca623840817a740a2eb7b3 +counter-next 522ae89b78580c62765e160aed3479297baa75be +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 49a9b01803e4711b10b5d26c731d705bbe3dad3d +dmaengine 8974f34de2ef173470a596a4dee22f4922583d1b +cgroup d6821c9e43915f8b654bf36919db5cc98447c75a +scsi 93fec6ecce50b08b5a9eb4c65bee6c411b4baba3 +scsi-mkp 019880c08d059f214327fd0dc92e9be3707286f2 +vhost 6a39bb15b3d1c355ab198d41f9590379d734f0bb +rpmsg f9cbf229fa3a40aec5cb773107fa3016a1c3d245 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl bef29ca3a6458582ac13320d47bf2646e5734dc8 +gpio-intel 12b0e305f50988b0c75f052f86d51b5353108ca5 +pinctrl 1aa06a2eb27647545a1dcaf0612b5192e2eda653 +pinctrl-intel c6235c426d2ac78ab843a55cb1556b0f43175d9e +pinctrl-renesas f407af78c8d3b6035f81152b15ad67063f42514e +pinctrl-samsung 6d2dbd4cec8939ad2b813b8052eb12406db528d7 +pwm b2eaa1170e45dc18eb09dcc9abafbe9a7502e960 +ktest 2351e8c65404aabc433300b6bf90c7a37e8bbc4d +kselftest a44c26d7fa74a5f4d2795a5c55a2d6ec1ebf1e38 +kunit 9852d85ec9d492ebef56dc5f229416c925758edc +kunit-next 62adcae479fe5bc04fa3b6c3f93bd340441f8b25 +livepatching 9c66f50477e24983f7a1538a14f20d8838af3503 +rtc e0779a0dcf41a6452ac0a169cd96863feb5787c7 +nvdimm f3dd9ae7f03aefa5bb12a4606f3d6cca87863622 +at24 339cb28b9ee6679aea359620b0508170d815a1b1 +ntb c620f56c70eb1b3dbabf7c21a02df83a61ff36fb +seccomp 8cf8dfceebdaf282da8a836b2bb578808a12698c +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 9852d85ec9d492ebef56dc5f229416c925758edc +nvmem 9852d85ec9d492ebef56dc5f229416c925758edc +xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66 +hyperv 94e86b174d103d941b4afc4f016af8af9e5352fa +auxdisplay 0b028ff7e70ecbe5240ad92e36a664af5cf7f382 +kgdb 24b2455fe8fce17258fab4bb945d8e6929baeb77 +hmm 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b +cfi 9852d85ec9d492ebef56dc5f229416c925758edc +mhi bd23e836423ea3968d539d4f0d5722a3a824b99e +memblock 98b7beba1ee6fb4ee755812e6c06cfc9084e7430 +cxl a83383e2ae7c499ff7b318945d9b2fe4e3006c2c +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi c5d91b16f525ea8c98b3fd8efc5105106d17fe9a +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab 9008fe8fad8255edfdbecea32d7eb0485d939d0d +random d18c13697b4dcbf6a8f06c3d8e564c4f5ad1477c +landlock adc218676eef25575469234709c2d87185ca223a +rust b7ed2b6f4e8d7f64649795e76ee9db67300de8eb +sysctl 9c738dae9534fbdf77c250132cba04e0822983b3 +execve 45bf05a51842c4c274f94514195c2e99cc1c200c +bitmap 5771af94fa61b523e92010dbb9c8603aef1695b8 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp f06e108a3dc53c0f5234d18de0bd224753db5019 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 9852d85ec9d492ebef56dc5f229416c925758edc +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd d53764723ecd639a0cc0c5ad24146847fc09f78d +turbostat fe66a63cae839ebdb51d36cf89e6bf1de036060f +pwrseq bd4c8bafcf50b6bd415c8bf04e98ebfba78071f9 +capabilities-next de2433c608c2c2633b8a452dd4925d876f3d5add +ipe d881f0eb6f2327af765529bb073da03d1c07f4fe +kcsan b86f7c9fad06b960f3ac5594cb3838a7eaeb1892 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 0000000000000..984b3fae59847 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,392 @@ +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 +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +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 +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +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 +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 +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +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.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git 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 +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +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 +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git https://github.com/pdp7/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-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.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 +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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 https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +thead-dt git https://github.com/pdp7/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 +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 +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git 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-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 https://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/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/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +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 git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git 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 +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +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 +header_cleanup git git://evilpiepirate.org/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 0000000000000..ac3627b0f9480 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6905 @@ +$ date -R +Tue, 26 Nov 2024 09:40:35 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9f16d5e6f220 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm +Merging origin/master (9f16d5e6f220 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging fixes/fixes (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 (4a622e4d477b ext4: fix FS_IOC_GETFSMAP handling) +$ 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 (088f294609d8 fs/proc/kcore.c: Clear ret value in read_kcore_iter after successful iov_iter_zero) +$ 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 +Auto-merging fs/iomap/buffered-io.c +Merge made by the 'ort' strategy. + fs/iomap/buffered-io.c | 90 +++++++++++----------- + fs/iomap/iter.c | 11 ++- + fs/namespace.c | 46 +++++------ + fs/netfs/fscache_io.c | 1 - + fs/proc/kcore.c | 1 + + .../selftests/mount_setattr/mount_setattr_test.c | 2 +- + 6 files changed, 74 insertions(+), 77 deletions(-) +Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3) +$ 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 (8e929cb546ee Linux 6.12-rc3) +$ 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 (d22160d9bdb1 Merge branch 'misc-6.12' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (ae54567eaa87 erofs: get rid of kaddr in `struct z_erofs_maprecorder`) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) +$ 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 (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ 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 (4ad62b440f27 bcachefs: BCH_ERR_btree_node_read_error_cached) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/fs_parser.c +Auto-merging include/linux/fs_parser.h +Merge made by the 'ort' strategy. + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + fs/bcachefs/Kconfig | 1 + + fs/bcachefs/acl.c | 11 +- + fs/bcachefs/alloc_background.c | 369 +++++++-------- + fs/bcachefs/alloc_background.h | 2 + + fs/bcachefs/alloc_foreground.c | 154 ++---- + fs/bcachefs/backpointers.c | 440 ++++++++--------- + fs/bcachefs/backpointers.h | 82 ++-- + fs/bcachefs/bbpos.h | 2 +- + fs/bcachefs/bcachefs.h | 44 +- + fs/bcachefs/bcachefs_format.h | 15 +- + fs/bcachefs/btree_cache.c | 43 +- + fs/bcachefs/btree_cache.h | 3 +- + fs/bcachefs/btree_gc.c | 141 ++---- + fs/bcachefs/btree_io.c | 13 +- + fs/bcachefs/btree_iter.c | 519 +++++++++++++-------- + fs/bcachefs/btree_iter.h | 105 ++--- + fs/bcachefs/btree_journal_iter.c | 237 ++++++++-- + fs/bcachefs/btree_journal_iter.h | 22 +- + fs/bcachefs/btree_journal_iter_types.h | 36 ++ + fs/bcachefs/btree_key_cache.c | 13 +- + fs/bcachefs/btree_locking.h | 2 +- + fs/bcachefs/btree_node_scan.c | 10 +- + fs/bcachefs/btree_trans_commit.c | 79 +--- + fs/bcachefs/btree_types.h | 3 + + fs/bcachefs/btree_update.c | 59 ++- + fs/bcachefs/btree_update.h | 28 +- + fs/bcachefs/btree_update_interior.c | 73 +-- + fs/bcachefs/btree_update_interior.h | 2 +- + fs/bcachefs/btree_write_buffer.c | 73 +-- + fs/bcachefs/buckets.c | 51 +- + fs/bcachefs/buckets_types.h | 2 +- + fs/bcachefs/chardev.c | 219 +-------- + fs/bcachefs/checksum.h | 2 +- + fs/bcachefs/compress.c | 96 ++-- + fs/bcachefs/data_update.c | 67 ++- + fs/bcachefs/debug.c | 4 +- + fs/bcachefs/dirent.c | 4 +- + fs/bcachefs/disk_accounting.c | 13 +- + fs/bcachefs/disk_accounting.h | 38 ++ + fs/bcachefs/ec.c | 253 +++++----- + fs/bcachefs/errcode.h | 9 +- + fs/bcachefs/error.c | 28 +- + fs/bcachefs/error.h | 38 +- + fs/bcachefs/extent_update.c | 4 +- + fs/bcachefs/extents.c | 239 +++------- + fs/bcachefs/extents.h | 9 - + fs/bcachefs/extents_format.h | 15 +- + fs/bcachefs/fs-io-buffered.c | 26 +- + fs/bcachefs/fs-io-direct.c | 5 + + fs/bcachefs/fs-io-pagecache.c | 4 +- + fs/bcachefs/fs-io.c | 10 +- + fs/bcachefs/fs-ioctl.c | 7 +- + fs/bcachefs/fs.c | 42 +- + fs/bcachefs/fsck.c | 260 ++++++++++- + fs/bcachefs/fsck.h | 3 + + fs/bcachefs/inode.c | 21 +- + fs/bcachefs/inode.h | 10 +- + fs/bcachefs/io_misc.c | 10 +- + fs/bcachefs/io_read.c | 55 +-- + fs/bcachefs/io_read.h | 28 +- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal.c | 98 +++- + fs/bcachefs/journal.h | 5 +- + fs/bcachefs/journal_io.c | 10 +- + fs/bcachefs/journal_reclaim.c | 6 +- + fs/bcachefs/journal_types.h | 2 + + fs/bcachefs/lru.c | 2 +- + fs/bcachefs/move.c | 125 ++--- + fs/bcachefs/move.h | 5 +- + fs/bcachefs/movinggc.c | 6 +- + fs/bcachefs/opts.c | 26 +- + fs/bcachefs/opts.h | 51 +- + fs/bcachefs/rcu_pending.c | 2 + + fs/bcachefs/rebalance.c | 266 +++++++++-- + fs/bcachefs/rebalance.h | 10 + + fs/bcachefs/rebalance_format.h | 53 +++ + fs/bcachefs/rebalance_types.h | 2 - + fs/bcachefs/recovery.c | 103 ++-- + fs/bcachefs/recovery.h | 2 +- + fs/bcachefs/recovery_passes.c | 92 +++- + fs/bcachefs/recovery_passes.h | 1 + + fs/bcachefs/reflink.c | 478 ++++++++++++++----- + fs/bcachefs/reflink.h | 7 + + fs/bcachefs/reflink_format.h | 5 +- + fs/bcachefs/sb-errors_format.h | 10 +- + fs/bcachefs/snapshot.c | 42 +- + fs/bcachefs/str_hash.h | 6 +- + fs/bcachefs/subvolume.c | 2 +- + fs/bcachefs/subvolume.h | 12 +- + fs/bcachefs/super-io.c | 10 +- + fs/bcachefs/super-io.h | 2 + + fs/bcachefs/super.c | 27 +- + fs/bcachefs/super.h | 10 - + fs/bcachefs/sysfs.c | 46 +- + fs/bcachefs/tests.c | 26 +- + fs/bcachefs/trace.h | 10 +- + fs/bcachefs/xattr.c | 11 +- + fs/bcachefs/xattr.h | 2 +- + fs/fs_parser.c | 3 +- + include/linux/fs_parser.h | 2 + + 101 files changed, 3232 insertions(+), 2508 deletions(-) + create mode 100644 fs/bcachefs/btree_journal_iter_types.h + create mode 100644 fs/bcachefs/rebalance_format.h +Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (5f1be0369841 Merge branch 'for-next-next-v6.12-20241111' into for-next-20241111) +$ 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 (c5cf42030325 ceph: fix cred leak in ceph_mds_check_access()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging fs/ceph/addr.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 751b6502fa89] Merge branch 'master' of git://github.com/ceph/ceph-client.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + fs/ceph/addr.c | 2 +- + fs/ceph/caps.c | 63 ++++++++++++++++------------------------- + fs/ceph/crypto.h | 2 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 4 +-- + fs/ceph/export.c | 12 ++++++-- + fs/ceph/inode.c | 2 +- + fs/ceph/mds_client.c | 27 +++++++----------- + fs/ceph/mds_client.h | 2 -- + fs/ceph/super.c | 12 ++++++-- + fs/ceph/super.h | 3 +- + fs/ceph/xattr.c | 2 +- + include/linux/ceph/ceph_fs.h | 4 +-- + include/linux/ceph/libceph.h | 6 ---- + include/linux/ceph/osd_client.h | 2 -- + include/linux/ceph/pagelist.h | 12 -------- + net/ceph/crypto.c | 12 -------- + net/ceph/crypto.h | 1 - + net/ceph/osd_client.c | 34 ---------------------- + net/ceph/pagelist.c | 38 ------------------------- + net/ceph/pagevec.c | 52 ---------------------------------- + 22 files changed, 65 insertions(+), 230 deletions(-) +Merging cifs/for-next (0d28f8330087 cifs: update internal version number) +$ 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/cached_dir.c | 168 +++++++++++++++++++++++++++++++++++---------- + fs/smb/client/cached_dir.h | 6 +- + fs/smb/client/cifsfs.c | 12 +++- + fs/smb/client/cifsfs.h | 4 +- + fs/smb/client/cifsglob.h | 4 +- + fs/smb/client/cifsproto.h | 1 + + fs/smb/client/connect.c | 59 +++++++++++++--- + fs/smb/client/fs_context.c | 85 ++++++++++++++++++++--- + fs/smb/client/fs_context.h | 1 + + fs/smb/client/inode.c | 4 +- + fs/smb/client/reparse.c | 157 +++++++++++++++++++++++++++++++++++++++--- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/sess.c | 5 +- + fs/smb/client/smb1ops.c | 4 +- + fs/smb/client/smb2file.c | 21 +++--- + fs/smb/client/smb2inode.c | 6 +- + fs/smb/client/smb2pdu.c | 4 +- + fs/smb/client/smb2proto.h | 9 ++- + fs/smb/client/trace.h | 3 + + fs/smb/common/smb2pdu.h | 9 +++ + 20 files changed, 475 insertions(+), 91 deletions(-) +Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-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 (200b977ebbc3 dlm: fix dlm_recover_members refcount on error) +$ 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 (0bc8061ffc73 erofs: handle NONHEAD !delta[1] lclusters gracefully) +$ 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 (8a3f5711ad74 exfat: reduce FAT chain traversal) +$ 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/dir.c | 29 ++------ + fs/exfat/exfat_fs.h | 6 ++ + fs/exfat/file.c | 10 +++ + fs/exfat/inode.c | 2 +- + fs/exfat/namei.c | 194 ++++++++++++++++++++++++---------------------------- + 5 files changed, 113 insertions(+), 128 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 (b5d19c2cd05b Pull umount race fix from Jann Horn.) +$ 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 (3e7c69cdb053 jbd2: Fix comment describing journal_init_common()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (bc8aeb04fd80 f2fs: fix to drop all discards after creating snapshot on lvm device) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/file.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 13 ++- + Documentation/filesystems/f2fs.rst | 44 +++++++++ + fs/f2fs/acl.c | 5 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 114 ++++++++++------------ + fs/f2fs/debug.c | 111 +++++++++++++++++++++- + fs/f2fs/extent_cache.c | 119 +++++++++++++++++------ + fs/f2fs/f2fs.h | 38 ++++++-- + fs/f2fs/file.c | 71 +++++++++++--- + fs/f2fs/gc.c | 19 ++-- + fs/f2fs/gc.h | 1 + + fs/f2fs/inode.c | 23 ++++- + fs/f2fs/node.c | 28 ++++-- + fs/f2fs/recovery.c | 9 +- + fs/f2fs/segment.c | 161 +++++++++++++++++++++++--------- + fs/f2fs/segment.h | 72 ++++++++------ + fs/f2fs/super.c | 101 ++++++++++++++------ + fs/f2fs/sysfs.c | 16 +++- + include/linux/f2fs_fs.h | 7 +- + include/uapi/linux/f2fs.h | 1 + + 20 files changed, 700 insertions(+), 255 deletions(-) +Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3) +$ 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 (d1dfb5f52ffc virtiofs: dax: remove ->writepages() callback) +$ 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 Documentation/admin-guide/sysctl/fs.rst +Auto-merging fs/fuse/dev.c +Auto-merging include/linux/mm.h +Auto-merging mm/page-writeback.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 10 + + fs/fuse/Makefile | 1 + + fs/fuse/cuse.c | 29 +- + fs/fuse/dax.c | 11 - + fs/fuse/dev.c | 66 +++-- + fs/fuse/dir.c | 37 +-- + fs/fuse/file.c | 451 ++++++++++++++++++-------------- + fs/fuse/fuse_i.h | 68 +++-- + fs/fuse/inode.c | 67 ++++- + fs/fuse/ioctl.c | 35 +-- + fs/fuse/readdir.c | 33 +-- + fs/fuse/sysctl.c | 40 +++ + fs/fuse/virtio_fs.c | 77 +++--- + include/linux/mm.h | 1 + + mm/folio-compat.c | 6 + + mm/page-writeback.c | 22 +- + 16 files changed, 579 insertions(+), 375 deletions(-) + create mode 100644 fs/fuse/sysctl.c +Merging gfs2/for-next (ffd1cf0443a2 gfs2: Prevent inode creation race) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/glock.c +Merge made by the 'ort' strategy. + fs/gfs2/glock.c | 107 ++++++++++++++++++++--------------------------------- + fs/gfs2/glock.h | 7 ++++ + fs/gfs2/glops.c | 11 +++++- + fs/gfs2/incore.h | 4 +- + fs/gfs2/inode.c | 1 + + fs/gfs2/inode.h | 2 - + fs/gfs2/lock_dlm.c | 29 +++++++++++++-- + fs/gfs2/rgrp.c | 6 +-- + fs/gfs2/super.c | 89 +++++++++++++++++++++++++++----------------- + 9 files changed, 142 insertions(+), 114 deletions(-) +Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree) +$ 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 (e36e96504139 ksmbd: fix use-after-free in SMB request handling) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/asn1.c | 6 ++-- + fs/smb/server/auth.c | 19 +++++----- + fs/smb/server/connection.c | 7 ++-- + fs/smb/server/crypto_ctx.c | 6 ++-- + fs/smb/server/glob.h | 2 ++ + fs/smb/server/ksmbd_work.c | 10 +++--- + fs/smb/server/mgmt/ksmbd_ida.c | 11 +++--- + fs/smb/server/mgmt/share_config.c | 10 +++--- + fs/smb/server/mgmt/tree_connect.c | 5 +-- + fs/smb/server/mgmt/user_config.c | 8 ++--- + fs/smb/server/mgmt/user_session.c | 10 +++--- + fs/smb/server/misc.c | 11 +++--- + fs/smb/server/ndr.c | 10 +++--- + fs/smb/server/oplock.c | 12 +++---- + fs/smb/server/server.c | 8 +++-- + fs/smb/server/smb2pdu.c | 76 ++++++++++++++++++++++++--------------- + fs/smb/server/smb_common.c | 4 +-- + fs/smb/server/smbacl.c | 23 ++++++------ + fs/smb/server/transport_ipc.c | 6 ++-- + fs/smb/server/transport_rdma.c | 13 ++++--- + fs/smb/server/transport_tcp.c | 18 ++++++---- + fs/smb/server/unicode.c | 4 +-- + fs/smb/server/vfs.c | 12 +++---- + fs/smb/server/vfs_cache.c | 10 +++--- + 24 files changed, 171 insertions(+), 130 deletions(-) +Merging nfs/linux-next (20fde6c34d8e fs/nfs/io: make nfs_start_io_*() killable) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging net/sunrpc/svcsock.c +Merge made by the 'ort' strategy. + fs/nfs/blocklayout/blocklayout.c | 15 ++++++- + fs/nfs/blocklayout/dev.c | 6 +-- + fs/nfs/client.c | 76 ++++++++++++++++--------------- + fs/nfs/direct.c | 21 +++++++-- + fs/nfs/file.c | 14 ++++-- + fs/nfs/fs_context.c | 6 +-- + fs/nfs/internal.h | 9 ++-- + fs/nfs/io.c | 44 +++++++++++++----- + fs/nfs/localio.c | 96 ++++++++++++++++++---------------------- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs.h | 4 +- + fs/nfs/nfs4proc.c | 8 ++-- + fs/nfs/nfs4state.c | 10 ++--- + fs/nfs/nfs4super.c | 1 + + fs/nfs/write.c | 55 ++++++++++++++--------- + include/linux/nfs_xdr.h | 2 +- + include/trace/events/sunrpc.h | 4 +- + net/sunrpc/svcsock.c | 4 ++ + net/sunrpc/xprtsock.c | 18 +++++--- + 19 files changed, 236 insertions(+), 159 deletions(-) +Merging nfs-anna/linux-next (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping) +$ 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 (583772eec7b0 nfsd: allow for up to 32 callback session slots) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Auto-merging fs/lockd/svclock.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/lockd/clntxdr.c | 5 +- + fs/lockd/svc4proc.c | 20 +- + fs/lockd/svclock.c | 2 +- + fs/lockd/svcproc.c | 15 +- + fs/lockd/xdr4.c | 2 - + fs/nfs_common/nfslocalio.c | 8 +- + fs/nfsd/export.c | 57 +++- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 19 +- + fs/nfsd/filecache.h | 2 +- + fs/nfsd/lockd.c | 13 +- + fs/nfsd/nfs4acl.c | 2 - + fs/nfsd/nfs4callback.c | 139 ++++++--- + fs/nfsd/nfs4proc.c | 103 ++++++- + fs/nfsd/nfs4recover.c | 3 +- + fs/nfsd/nfs4state.c | 127 ++++++--- + fs/nfsd/nfs4xdr.c | 73 +++-- + fs/nfsd/nfsfh.c | 41 +-- + fs/nfsd/nfsfh.h | 3 +- + fs/nfsd/state.h | 40 ++- + fs/nfsd/trace.h | 29 +- + fs/nfsd/vfs.c | 26 +- + fs/nfsd/vfs.h | 6 +- + fs/nfsd/xdr4.h | 8 + + include/linux/lockd/lockd.h | 6 +- + include/linux/lockd/xdr.h | 2 - + include/linux/nfslocalio.h | 18 +- + include/linux/sunrpc/xdr.h | 21 ++ + include/linux/sunrpc/xdrgen/_defs.h | 9 + + net/sunrpc/cache.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma.c | 19 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 8 +- + tools/net/sunrpc/extract.sh | 11 + + tools/net/sunrpc/xdrgen/README | 17 ++ + tools/net/sunrpc/xdrgen/generators/__init__.py | 4 + + tools/net/sunrpc/xdrgen/generators/enum.py | 30 +- + tools/net/sunrpc/xdrgen/generators/pointer.py | 26 +- + tools/net/sunrpc/xdrgen/generators/struct.py | 26 +- + tools/net/sunrpc/xdrgen/generators/typedef.py | 28 +- + tools/net/sunrpc/xdrgen/generators/union.py | 52 +++- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 6 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 24 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 3 +- + .../xdrgen/templates/C/enum/declaration/close.j2 | 4 - + .../xdrgen/templates/C/enum/declaration/enum.j2 | 4 + + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 2 +- + .../xdrgen/templates/C/enum/decoder/enum_be.j2 | 14 + + .../xdrgen/templates/C/enum/definition/close.j2 | 1 + + .../xdrgen/templates/C/enum/definition/close_be.j2 | 3 + + .../sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 | 2 +- + .../xdrgen/templates/C/enum/encoder/enum_be.j2 | 14 + + .../sunrpc/xdrgen/templates/C/enum/maxsize/enum.j2 | 2 + + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/pointer/maxsize/pointer.j2 | 3 + + .../xdrgen/templates/C/program/decoder/result.j2 | 4 - + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 9 +- + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/struct/maxsize/struct.j2 | 3 + + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/typedef/maxsize/basic.j2 | 3 + + .../C/typedef/maxsize/fixed_length_opaque.j2 | 2 + + .../xdrgen/templates/C/typedef/maxsize/string.j2 | 2 + + .../C/typedef/maxsize/variable_length_array.j2 | 2 + + .../C/typedef/maxsize/variable_length_opaque.j2 | 2 + + .../templates/C/union/decoder/case_spec_be.j2 | 2 + + .../{variable_length_string.j2 => string.j2} | 0 + .../templates/C/union/encoder/case_spec_be.j2 | 2 + + .../xdrgen/templates/C/union/maxsize/union.j2 | 3 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 311 ++++++++++++++++++--- + tools/net/sunrpc/xdrgen/xdrgen | 4 +- + 78 files changed, 1115 insertions(+), 348 deletions(-) + create mode 100755 tools/net/sunrpc/extract.sh + delete mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/close_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/maxsize/enum.j2 + rename tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/pointer/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/maxsize/pointer.j2 + rename tools/net/sunrpc/xdrgen/templates/C/struct/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/struct/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/struct/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/maxsize/struct.j2 + rename tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec_be.j2 + rename tools/net/sunrpc/xdrgen/templates/C/union/decoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/maxsize/union.j2 +Merging ntfs3/master (bac89bb33d91 fs/ntfs3: Accumulated refactoring changes) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 9 +++-- + fs/ntfs3/bitmap.c | 62 +++++++++----------------------- + fs/ntfs3/file.c | 34 +++++++++++------- + fs/ntfs3/frecord.c | 104 ++++++++--------------------------------------------- + fs/ntfs3/fsntfs.c | 2 +- + fs/ntfs3/ntfs_fs.h | 3 +- + fs/ntfs3/record.c | 16 +++++++-- + fs/ntfs3/run.c | 40 +++++++++++++++------ + 8 files changed, 103 insertions(+), 167 deletions(-) +Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) +$ 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 (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function) +$ 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 (bcdcb115eaed ubifs: Fix uninitialized use of err in ubifs_jnl_write_inode()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging fs/ubifs/super.c +Merge made by the 'ort' strategy. + drivers/mtd/ubi/attach.c | 12 ++++++------ + drivers/mtd/ubi/fastmap-wl.c | 19 ++++++++++++++++--- + drivers/mtd/ubi/nvmem.c | 2 +- + drivers/mtd/ubi/ubi.h | 3 ++- + drivers/mtd/ubi/vmt.c | 2 ++ + drivers/mtd/ubi/wl.c | 32 +++++++++++++++++++++++++++++-- + drivers/mtd/ubi/wl.h | 3 ++- + fs/jffs2/compr_rtime.c | 3 +++ + fs/jffs2/compr_rubin.c | 5 ----- + fs/jffs2/erase.c | 7 +++---- + fs/jffs2/gc.c | 2 +- + fs/jffs2/nodemgmt.c | 17 +++++++++-------- + fs/jffs2/readinode.c | 2 +- + fs/ubifs/ioctl.c | 6 ------ + fs/ubifs/journal.c | 13 +++++++------ + fs/ubifs/lpt_commit.c | 4 ++-- + fs/ubifs/orphan.c | 2 +- + fs/ubifs/super.c | 8 +++++--- + fs/ubifs/tnc.c | 2 -- + fs/ubifs/tnc_commit.c | 2 ++ + fs/ubifs/ubifs.h | 3 --- + fs/ubifs/xattr.c | 45 +++----------------------------------------- + 22 files changed, 96 insertions(+), 98 deletions(-) +Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalone module) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + fs/9p/v9fs.c | 21 +++------------------ + net/9p/Kconfig | 4 ++-- + net/9p/trans_usbg.c | 4 ++-- + net/9p/trans_xen.c | 9 ++++++--- + 4 files changed, 13 insertions(+), 25 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) +$ 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 (a8581099604d xfs: prevent mount and log shutdown race) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ialloc.c | 16 +++++++++------- + fs/xfs/libxfs/xfs_sb.c | 7 ------- + fs/xfs/xfs_attr_list.c | 3 ++- + fs/xfs/xfs_log.c | 11 +++++++++++ + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_qm_syscalls.c | 13 ------------- + 6 files changed, 23 insertions(+), 28 deletions(-) +Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) +$ 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 file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (5c9e141c6f61 Merge branch 'vfs-6.14.netfs' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/ceph/addr.c +Auto-merging fs/smb/client/cifssmb.c +Auto-merging fs/smb/client/smb2ops.c +Auto-merging fs/smb/client/smb2pdu.c +Merge made by the 'ort' strategy. + fs/9p/vfs_addr.c | 8 +- + fs/afs/Makefile | 1 + + fs/afs/callback.c | 4 +- + fs/afs/dir.c | 836 +++++++++++++++++++------------------- + fs/afs/dir_edit.c | 385 ++++++++++-------- + fs/afs/dir_search.c | 227 +++++++++++ + fs/afs/file.c | 258 +++++++----- + fs/afs/fs_operation.c | 113 +++++- + fs/afs/fsclient.c | 62 +-- + fs/afs/inode.c | 140 ++++++- + fs/afs/internal.h | 143 +++++-- + fs/afs/main.c | 2 +- + fs/afs/mntpt.c | 22 +- + fs/afs/rotate.c | 4 +- + fs/afs/rxrpc.c | 37 +- + fs/afs/super.c | 4 +- + fs/afs/validation.c | 31 +- + fs/afs/vlclient.c | 1 + + fs/afs/write.c | 16 +- + fs/afs/xdr_fs.h | 2 +- + fs/afs/yfsclient.c | 49 +-- + fs/cachefiles/io.c | 4 + + fs/cachefiles/xattr.c | 9 +- + fs/ceph/addr.c | 13 +- + fs/ecryptfs/main.c | 399 +++++++++--------- + fs/exportfs/expfs.c | 17 +- + fs/fhandle.c | 75 +++- + fs/netfs/Makefile | 5 +- + fs/netfs/buffered_read.c | 266 +++++------- + fs/netfs/direct_read.c | 80 ++-- + fs/netfs/direct_write.c | 10 +- + fs/netfs/internal.h | 36 +- + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 155 ++++--- + fs/netfs/objects.c | 21 +- + fs/netfs/read_collect.c | 708 ++++++++++++++++++-------------- + fs/netfs/read_pgpriv2.c | 35 +- + fs/netfs/read_retry.c | 211 ++++++---- + fs/netfs/read_single.c | 195 +++++++++ + fs/netfs/rolling_buffer.c | 225 ++++++++++ + fs/netfs/stats.c | 4 +- + fs/netfs/write_collect.c | 278 +++---------- + fs/netfs/write_issue.c | 239 ++++++++++- + fs/netfs/write_retry.c | 233 +++++++++++ + fs/nfs/fscache.c | 6 +- + fs/nfs/fscache.h | 3 +- + fs/smb/client/cifssmb.c | 12 +- + fs/smb/client/file.c | 3 +- + fs/smb/client/smb2ops.c | 2 +- + fs/smb/client/smb2pdu.c | 14 +- + include/linux/exportfs.h | 13 + + include/linux/folio_queue.h | 12 +- + include/linux/netfs.h | 55 ++- + include/linux/rolling_buffer.h | 61 +++ + include/trace/events/afs.h | 210 +++++++++- + include/trace/events/cachefiles.h | 13 +- + include/trace/events/netfs.h | 96 ++--- + include/uapi/linux/fcntl.h | 1 + + kernel/gen_kheaders.sh | 1 + + lib/kunit_iov_iter.c | 4 +- + rust/helpers/helpers.c | 1 + + rust/helpers/pid_namespace.c | 26 ++ + rust/kernel/lib.rs | 1 + + rust/kernel/pid_namespace.rs | 68 ++++ + rust/kernel/task.rs | 135 +++++- + 65 files changed, 4160 insertions(+), 2146 deletions(-) + create mode 100644 fs/afs/dir_search.c + create mode 100644 fs/netfs/read_single.c + create mode 100644 fs/netfs/rolling_buffer.c + create mode 100644 fs/netfs/write_retry.c + create mode 100644 include/linux/rolling_buffer.h + create mode 100644 rust/helpers/pid_namespace.c + create mode 100644 rust/kernel/pid_namespace.rs +Merging vfs/for-next (1751606ac8dc Merge branches 'work.ufs', 'work.fd', 'work.statx2' and 'work.xattr2' 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 +Merge made by the 'ort' strategy. +Merging mm-hotfixes/mm-hotfixes-unstable (e44738abfeef fs/proc/vmcore.c: fix warning when CONFIG_MMU=n) +$ 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 mm/readahead.c +Merge made by the 'ort' strategy. + fs/proc/vmcore.c | 56 ++++++++++++++++++++++++++++---------------------------- + mm/readahead.c | 2 ++ + 2 files changed, 30 insertions(+), 28 deletions(-) +Merging fs-current (00328354d016 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/iomap/buffered-io.c | 90 +++++++++++----------- + fs/iomap/iter.c | 11 ++- + fs/namespace.c | 46 +++++------ + fs/netfs/fscache_io.c | 1 - + fs/proc/kcore.c | 1 + + .../selftests/mount_setattr/mount_setattr_test.c | 2 +- + 6 files changed, 74 insertions(+), 77 deletions(-) +Merging kbuild-current/fixes (59b723cd2adb Linux 6.12-rc6) +$ 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 (91544a63920f ARC: bpf: Correct conditional check in 'check_jmp_32') +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/Kconfig | 4 ++-- + arch/arc/boot/dts/axc001.dtsi | 2 +- + arch/arc/boot/dts/axc003.dtsi | 2 +- + arch/arc/boot/dts/axc003_idu.dtsi | 2 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 12 ++++++------ + arch/arc/boot/dts/hsdk.dts | 2 +- + arch/arc/include/asm/arcregs.h | 2 +- + arch/arc/include/asm/cmpxchg.h | 2 +- + arch/arc/include/asm/mmu-arcv2.h | 2 +- + arch/arc/net/bpf_jit_arcv2.c | 2 +- + include/soc/arc/{aux.h => arc_aux.h} | 0 + include/soc/arc/mcip.h | 2 +- + include/soc/arc/timers.h | 2 +- + 13 files changed, 18 insertions(+), 18 deletions(-) + rename include/soc/arc/{aux.h => arc_aux.h} (100%) +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 (dfdf714fed55 perf/arm-cmn: Ensure port and device id bits are set properly) +$ 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 +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 - + drivers/perf/arm-cmn.c | 4 ++-- + drivers/perf/arm_smmuv3_pmu.c | 19 +++++++++++-------- + 3 files changed, 13 insertions(+), 11 deletions(-) +Merging arm-soc-fixes/arm/fixes (d62c9c5c4cbc Merge tag 'sunxi-fixes-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux 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. +Merging davinci-current/davinci/for-current (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-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 (d99913e1b80b riscv: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (a373830f96db KVM: PPC: Book3S HV: Mask off LPCR_MER for a vCPU before running it to avoid spurious interrupts) +$ 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 (3f020399e4f1 Merge tag 'sched-core-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (9bb88c659673 selftests: net: test extacks in netlink dumps) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/ethernet/broadcom/tg3.c | 3 + + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 17 +-- + drivers/net/phy/phy.c | 24 ++-- + drivers/net/usb/lan78xx.c | 42 +++---- + net/core/rtnetlink.c | 14 ++- + net/netlink/af_netlink.c | 21 ++-- + .../selftests/drivers/net/hw/lib/py/linkconfig.py | 2 +- + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/netlink-dumps.c | 129 +++++++++++++++++++++ + 9 files changed, 201 insertions(+), 54 deletions(-) +Merging bpf/master (ef3ba8c258ee bpftool: fix potential NULL pointer dereferencing in prog_dump()) +$ 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/bpf_lsm.c | 2 - + kernel/bpf/devmap.c | 6 +- + net/vmw_vsock/af_vsock.c | 70 ++++++++++++-------- + net/xdp/xsk_buff_pool.c | 5 +- + net/xdp/xskmap.c | 2 +- + tools/bpf/bpftool/prog.c | 17 +++-- + .../selftests/bpf/prog_tests/sockmap_basic.c | 77 ++++++++++++++++++++++ + 7 files changed, 138 insertions(+), 41 deletions(-) +Merging ipsec/master (c05c5e5aa163 xfrm: replay: Fix the update of replay_esn->oseq_hi for GSO) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_replay.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging netfilter/main (8ffade77b633 gve: Flow steering trigger reset only for timeout error) +$ 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 (35f56c554eb1 netfilter: ipset: add missing range check in bitmap_ip_uadt) +$ 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 (c05c62850a8f Merge tag 'wireless-2024-10-29' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ 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 (c05c62850a8f Merge tag 'wireless-2024-10-29' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ 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 wpan/master (eb09fbeb4870 mac802154: check local interfaces before deleting sdata list) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Merge made by the 'ort' strategy. + drivers/net/ieee802154/ca8210.c | 6 +++++- + net/mac802154/iface.c | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging rdma-fixes/for-rc (6abe2a908081 Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan") +$ 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 (a3dd4d63eeb4 ALSA: usb-audio: Fix out of bounds reads when finding clock sources) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging sound/core/pcm_native.c +Merge made by the 'ort' strategy. + Documentation/sound/hd-audio/notes.rst | 2 +- + sound/ac97/bus.c | 5 ++-- + sound/core/pcm_native.c | 6 ++-- + sound/core/rawmidi.c | 4 ++- + sound/pci/hda/patch_realtek.c | 53 +++++++++++++++++++-------------- + sound/usb/clock.c | 24 ++++++++++++++- + sound/usb/quirks.c | 27 +++++++++++++---- + tools/testing/selftests/alsa/.gitignore | 2 ++ + 8 files changed, 87 insertions(+), 36 deletions(-) +Merging sound-asoc-fixes/for-linus (cbc86dd0a4fe ASoC: amd: yc: Add quirk for microphone on Lenovo Thinkpad T14s Gen 6 21M1CTO1WW) +$ 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. + Documentation/sound/soc/dapm.rst | 3 +++ + sound/soc/amd/Kconfig | 1 + + sound/soc/amd/yc/acp6x-mach.c | 14 ++++++++++++++ + sound/soc/apple/mca.c | 2 +- + sound/soc/fsl/imx-audmix.c | 3 +++ + 5 files changed, 22 insertions(+), 1 deletion(-) +Merging regmap-fixes/for-linus (8cf0b93919e1 Linux 6.12-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (831e9a7556ac Merge remote-tracking branch 'regulator/for-6.12' into regulator-linus) +$ 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. + .../bindings/regulator/qcom-labibb-regulator.yaml | 7 +- + drivers/regulator/core.c | 3 +- + drivers/regulator/qcom-rpmh-regulator.c | 83 ++++++++++------------ + 3 files changed, 44 insertions(+), 49 deletions(-) +Merging spi-fixes/for-linus (df01c32d29f6 Merge remote-tracking branch 'spi/for-6.12' 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 +Merge made by the 'ort' strategy. + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-rockchip-sfc.c | 2 +- + drivers/spi/spi.c | 13 ++++++++++--- + 4 files changed, 13 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (59b723cd2adb Linux 6.12-rc6) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (42f7652d3eb5 Linux 6.12-rc4) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (742afcc22d8e Merge tag 'usb-serial-6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (2d5404caa8c7 Linux 6.12-rc7) +$ 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 (59b723cd2adb Linux 6.12-rc6) +$ 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 (807babf69027 staging: vchiq_arm: Use devm_kzalloc() for drv_mgmt allocation) +$ 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 (f5a0ea554ca9 iio: adc: ti-ads1298: Add NULL check in ads1298_init) +$ 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/adxl380.c | 2 +- + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/adc/ad4000.c | 2 + + drivers/iio/adc/ad4695.c | 98 +++++++++++++++------- + drivers/iio/adc/ad7124.c | 3 + + drivers/iio/adc/ad7780.c | 2 +- + drivers/iio/adc/ad7923.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 13 +-- + drivers/iio/adc/ti-ads1298.c | 2 + + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 4 + + drivers/iio/gyro/fxas21002c_core.c | 11 ++- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 - + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 22 ++++- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 3 - + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 3 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 1 - + drivers/iio/industrialio-backend.c | 4 +- + drivers/iio/industrialio-gts-helper.c | 4 +- + drivers/iio/inkern.c | 2 +- + drivers/iio/test/iio-test-rescale.c | 4 + + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + 23 files changed, 136 insertions(+), 57 deletions(-) +Merging counter-current/counter-current (1437d9f1c56f counter: ti-ecap-capture: Add check for clk_enable()) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/stm32-timer-cnt.c | 17 ++++++++++++++--- + drivers/counter/ti-ecap-capture.c | 7 ++++++- + 2 files changed, 20 insertions(+), 4 deletions(-) +Merging char-misc.current/char-misc-linus (59b723cd2adb Linux 6.12-rc6) +$ 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 (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (adc218676eef Linux 6.12) +$ 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 (0201710ba630 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 +Auto-merging Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/input/input.c +Auto-merging drivers/input/joystick/iforce/iforce-packets.c +Auto-merging drivers/input/keyboard/applespi.c +Auto-merging drivers/input/keyboard/cros_ec_keyb.c +Auto-merging drivers/input/keyboard/ep93xx_keypad.c +Auto-merging drivers/input/misc/ims-pcu.c +Auto-merging drivers/input/misc/iqs7222.c +Auto-merging drivers/input/misc/wistron_btns.c +Auto-merging drivers/input/mouse/elan_i2c_core.c +Auto-merging drivers/input/mouse/elan_i2c_i2c.c +Auto-merging drivers/input/rmi4/rmi_f34.c +Auto-merging drivers/input/serio/userio.c +Auto-merging drivers/input/touchscreen/ads7846.c +Auto-merging drivers/input/touchscreen/edt-ft5x06.c +Auto-merging drivers/input/touchscreen/ili210x.c +Auto-merging drivers/input/touchscreen/novatek-nvt-ts.c +Auto-merging drivers/input/touchscreen/pixcir_i2c_ts.c +Auto-merging drivers/platform/x86/x86-android-tablets/other.c +Merge made by the 'ort' strategy. + .../bindings/input/mediatek,pmic-keys.yaml | 1 + + .../devicetree/bindings/input/rotary-encoder.yaml | 2 +- + .../bindings/input/touchscreen/novatek,nvt-ts.yaml | 62 ++++ + Documentation/input/input.rst | 2 +- + MAINTAINERS | 1 + + drivers/input/input.c | 15 +- + drivers/input/joystick/db9.c | 30 +- + drivers/input/joystick/gamecon.c | 22 +- + drivers/input/joystick/iforce/iforce-ff.c | 48 ++- + drivers/input/joystick/iforce/iforce-packets.c | 51 ++-- + drivers/input/joystick/iforce/iforce-serio.c | 36 +-- + drivers/input/joystick/iforce/iforce-usb.c | 13 +- + drivers/input/joystick/n64joy.c | 31 +- + drivers/input/joystick/turbografx.c | 22 +- + drivers/input/joystick/xpad.c | 99 +++--- + drivers/input/keyboard/adp5520-keys.c | 2 +- + drivers/input/keyboard/adp5589-keys.c | 39 ++- + drivers/input/keyboard/applespi.c | 72 ++--- + drivers/input/keyboard/atkbd.c | 8 +- + drivers/input/keyboard/cap11xx.c | 12 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/input/keyboard/cypress-sf.c | 2 +- + drivers/input/keyboard/ep93xx_keypad.c | 10 +- + drivers/input/keyboard/hilkbd.c | 4 +- + drivers/input/keyboard/imx_keypad.c | 27 +- + drivers/input/keyboard/ipaq-micro-keys.c | 12 +- + drivers/input/keyboard/iqs62x-keys.c | 2 +- + drivers/input/keyboard/lm8323.c | 49 ++- + drivers/input/keyboard/locomokbd.c | 5 +- + drivers/input/keyboard/lpc32xx-keys.c | 18 +- + drivers/input/keyboard/maple_keyb.c | 9 +- + drivers/input/keyboard/matrix_keypad.c | 19 +- + drivers/input/keyboard/mpr121_touchkey.c | 45 +-- + drivers/input/keyboard/mtk-pmic-keys.c | 17 +- + drivers/input/keyboard/omap-keypad.c | 18 +- + drivers/input/keyboard/omap4-keypad.c | 6 +- + drivers/input/keyboard/pmic8xxx-keypad.c | 8 +- + drivers/input/keyboard/pxa27x_keypad.c | 16 +- + drivers/input/keyboard/samsung-keypad.c | 2 +- + drivers/input/keyboard/sh_keysc.c | 2 +- + drivers/input/keyboard/spear-keyboard.c | 9 +- + drivers/input/keyboard/st-keyscan.c | 19 +- + drivers/input/keyboard/stmpe-keypad.c | 2 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 8 +- + drivers/input/keyboard/sunkbd.c | 5 +- + drivers/input/misc/88pm80x_onkey.c | 2 +- + drivers/input/misc/ad714x.c | 12 +- + drivers/input/misc/ati_remote2.c | 57 ++-- + drivers/input/misc/cm109.c | 165 +++++----- + drivers/input/misc/cma3000_d0x.c | 16 +- + drivers/input/misc/cs40l50-vibra.c | 6 +- + drivers/input/misc/da7280.c | 26 +- + drivers/input/misc/da9052_onkey.c | 4 +- + drivers/input/misc/da9055_onkey.c | 4 +- + drivers/input/misc/drv260x.c | 50 ++-- + drivers/input/misc/drv2665.c | 46 ++- + drivers/input/misc/drv2667.c | 46 ++- + drivers/input/misc/ibm-panel.c | 5 +- + drivers/input/misc/ideapad_slidebar.c | 26 +- + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/misc/iqs269a.c | 55 ++-- + drivers/input/misc/iqs626a.c | 22 +- + drivers/input/misc/iqs7222.c | 30 +- + drivers/input/misc/kxtj9.c | 16 +- + drivers/input/misc/m68kspkr.c | 2 +- + drivers/input/misc/max8997_haptic.c | 17 +- + drivers/input/misc/mc13783-pwrbutton.c | 2 +- + drivers/input/misc/palmas-pwrbutton.c | 2 +- + drivers/input/misc/pcap_keys.c | 2 +- + drivers/input/misc/pcf50633-input.c | 2 +- + drivers/input/misc/pcspkr.c | 2 +- + drivers/input/misc/pm8941-pwrkey.c | 2 +- + drivers/input/misc/powermate.c | 11 +- + drivers/input/misc/pwm-beeper.c | 12 +- + drivers/input/misc/regulator-haptic.c | 24 +- + drivers/input/misc/rotary_encoder.c | 23 +- + drivers/input/misc/soc_button_array.c | 4 +- + drivers/input/misc/sparcspkr.c | 59 ++-- + drivers/input/misc/tps65219-pwrbutton.c | 2 +- + drivers/input/misc/twl4030-vibra.c | 11 +- + drivers/input/misc/twl6040-vibra.c | 8 +- + drivers/input/misc/wistron_btns.c | 4 +- + drivers/input/misc/wm831x-on.c | 2 +- + drivers/input/misc/yealink.c | 4 +- + drivers/input/mouse/alps.c | 4 +- + drivers/input/mouse/amimouse.c | 2 +- + drivers/input/mouse/byd.c | 5 +- + drivers/input/mouse/elan_i2c_core.c | 228 +++++++------- + drivers/input/mouse/elan_i2c_i2c.c | 14 +- + drivers/input/mouse/psmouse-smbus.c | 28 +- + drivers/input/mouse/synaptics.c | 6 +- + drivers/input/mouse/synaptics.h | 2 +- + drivers/input/rmi4/rmi_f03.c | 4 +- + drivers/input/rmi4/rmi_f34.c | 37 +-- + drivers/input/serio/altera_ps2.c | 2 +- + drivers/input/serio/ams_delta_serio.c | 2 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/arc_ps2.c | 2 +- + drivers/input/serio/ct82c710.c | 2 +- + drivers/input/serio/gscps2.c | 116 ++++---- + drivers/input/serio/hyperv-keyboard.c | 38 ++- + drivers/input/serio/i8042-acpipnpio.h | 2 +- + drivers/input/serio/i8042-sparcio.h | 16 +- + drivers/input/serio/i8042.c | 331 ++++++++++----------- + drivers/input/serio/ioc3kbd.c | 2 +- + drivers/input/serio/libps2.c | 28 +- + drivers/input/serio/maceps2.c | 2 +- + drivers/input/serio/olpc_apsp.c | 2 +- + drivers/input/serio/ps2-gpio.c | 6 +- + drivers/input/serio/ps2mult.c | 25 +- + drivers/input/serio/q40kbd.c | 12 +- + drivers/input/serio/rpckbd.c | 2 +- + drivers/input/serio/sa1111ps2.c | 8 +- + drivers/input/serio/serio.c | 165 ++++------ + drivers/input/serio/serio_raw.c | 135 ++++----- + drivers/input/serio/serport.c | 27 +- + drivers/input/serio/sun4i-ps2.c | 10 +- + drivers/input/serio/userio.c | 175 ++++++----- + drivers/input/serio/xilinx_ps2.c | 17 +- + drivers/input/tablet/pegasus_notetaker.c | 88 +++--- + drivers/input/touchscreen/88pm860x-ts.c | 20 +- + drivers/input/touchscreen/Kconfig | 2 + + drivers/input/touchscreen/ads7846.c | 14 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- + drivers/input/touchscreen/bcm_iproc_tsc.c | 2 +- + drivers/input/touchscreen/da9052_tsi.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 2 +- + drivers/input/touchscreen/elo.c | 8 +- + drivers/input/touchscreen/ili210x.c | 2 +- + drivers/input/touchscreen/imagis.c | 2 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 2 +- + drivers/input/touchscreen/mc13783_ts.c | 2 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 67 ++++- + drivers/input/touchscreen/pcap_ts.c | 2 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 2 +- + drivers/input/touchscreen/raspberrypi-ts.c | 4 +- + drivers/input/touchscreen/rohm_bu21023.c | 4 +- + drivers/input/touchscreen/stmpe-ts.c | 6 +- + drivers/input/touchscreen/sun4i-ts.c | 4 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 4 +- + drivers/input/touchscreen/ts4800-ts.c | 5 +- + drivers/input/touchscreen/wm831x-ts.c | 2 +- + drivers/input/touchscreen/wm97xx-core.c | 6 +- + drivers/platform/x86/x86-android-tablets/other.c | 2 +- + include/linux/input.h | 5 + + include/linux/serio.h | 3 + + 146 files changed, 1530 insertions(+), 1862 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml +Merging crypto-current/master (4223414efeae crypto: marvell/cesa - fix uninit value for struct mv_cesa_op_ctx) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) +$ 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 (dc1308bee1ed selftests/watchdog-test: Fix system accidentally reset after watchdog-test) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (59b723cd2adb Linux 6.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (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 (9852d85ec9d4 Linux 6.12-rc1) +$ 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 (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) +$ 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 (ecf2b43018da media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format) +$ 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 (2cf596636607 reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC) +$ 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 (819837584309 Linux 6.12-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-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 (5b47f5a72574 Documentation: kvm: reorganize introduction) +$ 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 (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) +$ 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 (998b5a78a9ce hwmon: (aquacomputer_d5next) Fix length of speed_input array) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/aquacomputer_d5next.c | 2 +- + drivers/hwmon/tmp108.c | 5 ----- + drivers/hwmon/tps23861.c | 2 +- + 3 files changed, 2 insertions(+), 7 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) +$ 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 (3a2b97b3210b cxl/test: Improve init-order fidelity relative to real-world systems) +$ 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/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (43fb83c17ba2 Merge tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ 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 (a03c246d4ec8 clk: samsung: Fix out-of-bound access of of_match_node()) +$ 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 (9852d85ec9d4 Linux 6.12-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 (bc7acc0bd0f9 of: property: fw_devlink: Do not use interrupt-parent directly) +$ 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/property.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dt-krzk-fixes/fixes (9852d85ec9d4 Linux 6.12-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 (54c814c8b23b scsi: ufs: core: Start the RTC update work later) +$ 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 (adc218676eef Linux 6.12) +$ 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 (adc218676eef Linux 6.12) +$ 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 (1635e407a4a6 Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K") +$ 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 (9852d85ec9d4 Linux 6.12-rc1) +$ 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 (8e929cb546ee Linux 6.12-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 (895384881ec9 hv: vmbus: Constify struct kobj_type and struct attribute_group) +$ 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 (57f7c7dc78cd drivers: perf: Fix wrong put_cpu() placement) +$ 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 (8e929cb546ee Linux 6.12-rc3) +$ 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 (384f2024e1a1 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) +$ 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 (1613e604df0c Linux 6.10-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 (de2f378f2b77 Merge tag 'nfsd-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/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 (f57c08492866 gpio: mpsse: Remove usage of the deprecated ida_simple_xx() API) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpio-altera.c | 5 +++++ + drivers/gpio/gpio-exar.c | 10 ++++++---- + drivers/gpio/gpio-mpsse.c | 4 ++-- + drivers/gpio/gpio-zevio.c | 6 ++++++ + 4 files changed, 19 insertions(+), 6 deletions(-) +Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (adc218676eef Linux 6.12) +$ 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 (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-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 (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID) +$ 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 (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging perf-current/perf-tools (6d78089da980 perf tests: Fix hwmon parsing with PMU name test) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Auto-merging tools/build/Makefile.feature +Auto-merging tools/build/feature/Makefile +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 11 +- + tools/build/feature/Makefile | 24 +- + tools/build/feature/test-all.c | 16 +- + tools/build/feature/test-dwarf.c | 11 - + tools/build/feature/test-dwarf_getcfi.c | 9 - + tools/build/feature/test-dwarf_getlocations.c | 13 - + tools/build/feature/test-libdw-dwarf-unwind.c | 14 - + tools/build/feature/test-libdw.c | 56 + + tools/build/feature/test-libtraceevent.c | 2 +- + tools/lib/api/io.h | 1 + + tools/lib/perf/Documentation/Makefile | 2 +- + tools/lib/perf/evsel.c | 48 + + tools/lib/perf/include/internal/evsel.h | 63 +- + tools/lib/subcmd/run-command.c | 33 + + tools/lib/subcmd/subcmd-util.h | 2 +- + tools/perf/.gitignore | 6 +- + tools/perf/Documentation/itrace.txt | 2 +- + tools/perf/Documentation/perf-arm-spe.txt | 2 +- + tools/perf/Documentation/perf-check.txt | 6 +- + tools/perf/Documentation/perf-config.txt | 13 + + tools/perf/Documentation/perf-list.txt | 17 +- + tools/perf/Documentation/perf-report.txt | 8 + + tools/perf/Documentation/perf-sched.txt | 8 + + tools/perf/Documentation/perf-script-python.txt | 2 +- + tools/perf/Documentation/perf-test.txt | 17 + + tools/perf/Makefile.config | 70 +- + tools/perf/Makefile.perf | 9 +- + tools/perf/arch/arc/annotate/instructions.c | 2 + + tools/perf/arch/arm/Makefile | 3 - + tools/perf/arch/arm/annotate/instructions.c | 2 + + tools/perf/arch/arm/util/Build | 2 - + tools/perf/arch/arm/util/dwarf-regs.c | 61 - + tools/perf/arch/arm64/Makefile | 4 - + tools/perf/arch/arm64/annotate/instructions.c | 2 + + tools/perf/arch/arm64/util/Build | 1 - + tools/perf/arch/arm64/util/arm-spe.c | 118 +- + tools/perf/arch/arm64/util/dwarf-regs.c | 92 -- + tools/perf/arch/arm64/util/header.c | 73 +- + tools/perf/arch/arm64/util/pmu.c | 25 +- + tools/perf/arch/csky/Makefile | 4 - + tools/perf/arch/csky/annotate/instructions.c | 7 +- + tools/perf/arch/csky/util/Build | 1 - + tools/perf/arch/loongarch/Makefile | 4 - + tools/perf/arch/loongarch/annotate/instructions.c | 2 + + tools/perf/arch/loongarch/util/Build | 1 - + tools/perf/arch/loongarch/util/dwarf-regs.c | 44 - + tools/perf/arch/loongarch/util/header.c | 4 +- + tools/perf/arch/mips/Makefile | 4 - + tools/perf/arch/mips/annotate/instructions.c | 2 + + tools/perf/arch/mips/util/Build | 1 - + tools/perf/arch/mips/util/dwarf-regs.c | 38 - + tools/perf/arch/powerpc/Makefile | 5 - + tools/perf/arch/powerpc/annotate/instructions.c | 6 +- + tools/perf/arch/powerpc/util/Build | 3 +- + tools/perf/arch/powerpc/util/dwarf-regs.c | 153 -- + tools/perf/arch/powerpc/util/header.c | 36 +- + tools/perf/arch/riscv/Makefile | 27 +- + tools/perf/arch/riscv/entry/syscalls/mksyscalltbl | 47 + + tools/perf/arch/riscv/include/dwarf-regs-table.h | 42 + + tools/perf/arch/riscv/util/Build | 1 - + tools/perf/arch/riscv/util/dwarf-regs.c | 72 - + tools/perf/arch/riscv/util/header.c | 4 +- + tools/perf/arch/riscv64/annotate/instructions.c | 2 + + tools/perf/arch/s390/Makefile | 4 - + tools/perf/arch/s390/annotate/instructions.c | 2 + + tools/perf/arch/s390/util/Build | 1 - + tools/perf/arch/s390/util/dwarf-regs.c | 43 - + tools/perf/arch/s390/util/header.c | 6 +- + tools/perf/arch/sh/Build | 1 - + tools/perf/arch/sh/Makefile | 4 - + tools/perf/arch/sh/util/Build | 1 - + tools/perf/arch/sh/util/dwarf-regs.c | 41 - + tools/perf/arch/sparc/Build | 1 - + tools/perf/arch/sparc/Makefile | 4 - + tools/perf/arch/sparc/annotate/instructions.c | 2 + + tools/perf/arch/sparc/util/Build | 1 - + tools/perf/arch/sparc/util/dwarf-regs.c | 39 - + tools/perf/arch/x86/Makefile | 4 - + tools/perf/arch/x86/annotate/instructions.c | 5 +- + tools/perf/arch/x86/tests/intel-cqm.c | 128 -- + tools/perf/arch/x86/tests/intel-pt-test.c | 4 +- + tools/perf/arch/x86/util/Build | 4 - + tools/perf/arch/x86/util/auxtrace.c | 3 +- + tools/perf/arch/x86/util/dwarf-regs.c | 153 -- + tools/perf/arch/x86/util/env.c | 19 - + tools/perf/arch/x86/util/env.h | 7 - + tools/perf/arch/x86/util/evlist.c | 147 +- + tools/perf/arch/x86/util/evsel.c | 38 +- + tools/perf/arch/x86/util/header.c | 5 +- + tools/perf/arch/x86/util/intel-pt.c | 3 +- + tools/perf/arch/x86/util/iostat.c | 2 +- + tools/perf/arch/x86/util/pmu.c | 2 +- + tools/perf/arch/x86/util/topdown.c | 43 +- + tools/perf/arch/x86/util/topdown.h | 2 + + tools/perf/arch/x86/util/tsc.c | 18 +- + tools/perf/arch/xtensa/Build | 1 - + tools/perf/arch/xtensa/Makefile | 4 - + tools/perf/arch/xtensa/util/Build | 1 - + tools/perf/arch/xtensa/util/dwarf-regs.c | 21 - + tools/perf/bench/numa.c | 53 + + tools/perf/bench/sched-pipe.c | 43 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-check.c | 6 +- + tools/perf/builtin-diff.c | 6 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 5 +- + tools/perf/builtin-kwork.c | 2 +- + tools/perf/builtin-list.c | 17 +- + tools/perf/builtin-probe.c | 14 +- + tools/perf/builtin-record.c | 4 +- + tools/perf/builtin-report.c | 12 +- + tools/perf/builtin-sched.c | 116 +- + tools/perf/builtin-script.c | 9 +- + tools/perf/builtin-stat.c | 398 +++-- + tools/perf/builtin-timechart.c | 3 +- + tools/perf/builtin-trace.c | 27 +- + tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 +- + tools/perf/dlfilters/dlfilter-test-api-v2.c | 2 +- + tools/perf/perf.c | 2 - + .../arch/arm64/freescale/imx91/sys/ddrc.json | 9 + + .../arch/arm64/freescale/imx91/sys/metrics.json | 26 + + .../arch/arm64/freescale/imx95/sys/metrics.json | 8 + + .../arch/arm64/hisilicon/hip08/metrics.json | 74 +- + tools/perf/pmu-events/arch/common/common/tool.json | 74 + + .../arch/powerpc/compat/generic-events.json | 117 ++ + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 1 + + .../pmu-events/arch/x86/amdzen5/data-fabric.json | 1634 ++++++++++++++++++++ + .../pmu-events/arch/x86/amdzen5/load-store.json | 78 +- + .../pmu-events/arch/x86/amdzen5/recommended.json | 112 ++ + tools/perf/pmu-events/empty-pmu-events.c | 249 +-- + tools/perf/pmu-events/jevents.py | 57 +- + tools/perf/pmu-events/pmu-events.h | 2 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 11 + + tools/perf/scripts/python/arm-cs-trace-disasm.py | 143 +- + tools/perf/tests/Build | 4 +- + tools/perf/tests/attr.c | 218 --- + tools/perf/tests/builtin-test.c | 442 ++++-- + tools/perf/tests/demangle-java-test.c | 3 +- + tools/perf/tests/event-times.c | 5 +- + tools/perf/tests/evsel-tp-sched.c | 42 +- + tools/perf/tests/expr.c | 5 +- + tools/perf/tests/hwmon_pmu.c | 342 ++++ + tools/perf/tests/make | 6 +- + tools/perf/tests/openat-syscall-tp-fields.c | 19 +- + tools/perf/tests/parse-events.c | 32 +- + tools/perf/tests/pmu.c | 3 +- + tools/perf/tests/shell/annotate.sh | 10 +- + tools/perf/tests/shell/attr.sh | 22 + + tools/perf/tests/{ => shell}/attr/README | 2 + + tools/perf/tests/{ => shell}/attr/base-record | 0 + tools/perf/tests/{ => shell}/attr/base-record-spe | 0 + tools/perf/tests/{ => shell}/attr/base-stat | 0 + .../perf/tests/{ => shell}/attr/system-wide-dummy | 0 + tools/perf/tests/{ => shell}/attr/test-record-C0 | 2 + + .../perf/tests/{ => shell}/attr/test-record-basic | 0 + .../tests/{ => shell}/attr/test-record-branch-any | 0 + .../{ => shell}/attr/test-record-branch-filter-any | 0 + .../attr/test-record-branch-filter-any_call | 0 + .../attr/test-record-branch-filter-any_ret | 0 + .../{ => shell}/attr/test-record-branch-filter-hv | 0 + .../attr/test-record-branch-filter-ind_call | 0 + .../{ => shell}/attr/test-record-branch-filter-k | 0 + .../{ => shell}/attr/test-record-branch-filter-u | 0 + .../perf/tests/{ => shell}/attr/test-record-count | 0 + tools/perf/tests/{ => shell}/attr/test-record-data | 0 + .../tests/{ => shell}/attr/test-record-dummy-C0 | 4 +- + tools/perf/tests/{ => shell}/attr/test-record-freq | 0 + .../{ => shell}/attr/test-record-graph-default | 0 + .../attr/test-record-graph-default-aarch64 | 0 + .../tests/{ => shell}/attr/test-record-graph-dwarf | 0 + .../tests/{ => shell}/attr/test-record-graph-fp | 0 + .../{ => shell}/attr/test-record-graph-fp-aarch64 | 0 + .../{ => shell}/attr/test-record-group-sampling | 3 +- + .../tests/shell/attr/test-record-group-sampling1 | 50 + + .../tests/shell/attr/test-record-group-sampling2 | 61 + + .../perf/tests/{ => shell}/attr/test-record-group1 | 0 + .../perf/tests/{ => shell}/attr/test-record-group2 | 1 + + tools/perf/tests/shell/attr/test-record-group3 | 31 + + .../{ => shell}/attr/test-record-no-buffering | 0 + .../tests/{ => shell}/attr/test-record-no-inherit | 0 + .../tests/{ => shell}/attr/test-record-no-samples | 0 + .../perf/tests/{ => shell}/attr/test-record-period | 0 + .../tests/{ => shell}/attr/test-record-pfm-period | 0 + tools/perf/tests/{ => shell}/attr/test-record-raw | 0 + .../tests/{ => shell}/attr/test-record-spe-period | 0 + .../{ => shell}/attr/test-record-spe-period-term | 0 + .../attr/test-record-spe-physical-address | 0 + .../attr/test-record-user-regs-no-sve-aarch64 | 0 + .../attr/test-record-user-regs-old-sve-aarch64 | 0 + .../attr/test-record-user-regs-sve-aarch64 | 0 + tools/perf/tests/{ => shell}/attr/test-stat-C0 | 0 + tools/perf/tests/{ => shell}/attr/test-stat-basic | 0 + .../perf/tests/{ => shell}/attr/test-stat-default | 94 +- + .../tests/{ => shell}/attr/test-stat-detailed-1 | 110 +- + .../tests/{ => shell}/attr/test-stat-detailed-2 | 134 +- + .../tests/{ => shell}/attr/test-stat-detailed-3 | 142 +- + tools/perf/tests/{ => shell}/attr/test-stat-group1 | 0 + .../tests/{ => shell}/attr/test-stat-no-inherit | 0 + tools/perf/tests/shell/coresight/asm_pure_loop.sh | 2 +- + .../tests/shell/coresight/memcpy_thread_16k_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_2.sh | 2 +- + .../tests/shell/coresight/unroll_loop_thread_10.sh | 2 +- + tools/perf/tests/shell/ftrace.sh | 4 +- + tools/perf/tests/{ => shell/lib}/attr.py | 18 + + tools/perf/tests/shell/lib/coresight.sh | 2 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 5 +- + tools/perf/tests/shell/list.sh | 5 +- + tools/perf/tests/shell/lock_contention.sh | 2 +- + .../perf/tests/shell/perftool-testsuite_report.sh | 2 +- + tools/perf/tests/shell/pipe_test.sh | 1 + + tools/perf/tests/shell/probe_vfs_getname.sh | 2 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 4 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/record.sh | 75 +- + tools/perf/tests/shell/record_lbr.sh | 2 +- + tools/perf/tests/shell/record_offcpu.sh | 2 +- + tools/perf/tests/shell/stat.sh | 65 +- + tools/perf/tests/shell/stat_all_metricgroups.sh | 36 +- + tools/perf/tests/shell/stat_all_metrics.sh | 87 +- + tools/perf/tests/shell/stat_all_pmu.sh | 54 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 4 +- + tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 13 - + tools/perf/tests/shell/test_arm_coresight.sh | 4 +- + .../perf/tests/shell/test_arm_coresight_disasm.sh | 65 + + tools/perf/tests/shell/test_arm_spe.sh | 4 +- + tools/perf/tests/shell/test_arm_spe_fork.sh | 2 +- + tools/perf/tests/shell/test_data_symbol.sh | 2 +- + tools/perf/tests/shell/test_intel_pt.sh | 4 +- + tools/perf/tests/shell/test_stat_intel_tpebs.sh | 13 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 +- + tools/perf/tests/shell/trace_exit_race.sh | 51 + + tools/perf/tests/task-exit.c | 9 +- + tools/perf/tests/tests-scripts.c | 7 +- + tools/perf/tests/tests.h | 11 + + tools/perf/tests/tool_pmu.c | 111 ++ + tools/perf/util/Build | 17 +- + tools/perf/util/annotate-data.h | 8 +- + tools/perf/util/annotate.c | 12 +- + tools/perf/util/annotate.h | 6 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 18 +- + tools/perf/util/arm-spe.c | 321 +++- + tools/perf/util/arm-spe.h | 38 +- + tools/perf/util/auxtrace.h | 3 +- + tools/perf/util/bpf-filter.c | 2 +- + tools/perf/util/bpf-prologue.h | 37 - + tools/perf/util/bpf_counter.c | 35 +- + tools/perf/util/bpf_skel/bperf_follower.bpf.c | 98 +- + tools/perf/util/bpf_skel/bperf_u.h | 5 + + tools/perf/util/color.c | 28 - + tools/perf/util/color.h | 11 +- + tools/perf/util/config.c | 22 + + tools/perf/util/config.h | 1 + + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 7 +- + tools/perf/util/cs-etm.c | 25 +- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/data-convert-json.c | 2 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debuginfo.h | 6 +- + tools/perf/util/disasm.c | 298 ++-- + tools/perf/util/disasm.h | 8 +- + tools/perf/util/dwarf-aux.c | 6 - + tools/perf/util/dwarf-aux.h | 54 - + .../util/dwarf-regs.c => util/dwarf-regs-csky.c} | 19 +- + tools/perf/util/dwarf-regs-powerpc.c | 61 + + tools/perf/util/dwarf-regs-x86.c | 50 + + tools/perf/util/dwarf-regs.c | 38 +- + tools/perf/util/env.c | 27 +- + tools/perf/util/env.h | 4 + + tools/perf/util/event.h | 1 + + tools/perf/util/evlist.c | 83 +- + tools/perf/util/evlist.h | 15 +- + tools/perf/util/evsel.c | 920 ++++++----- + tools/perf/util/evsel.h | 52 +- + tools/perf/util/evsel_fprintf.c | 2 +- + tools/perf/util/expr.c | 97 +- + tools/perf/util/genelf.c | 4 +- + tools/perf/util/genelf.h | 2 +- + tools/perf/util/hashmap.h | 20 +- + tools/perf/util/header.c | 84 +- + tools/perf/util/header.h | 23 +- + tools/perf/util/hist.c | 3 + + tools/perf/util/hist.h | 3 + + tools/perf/util/hwmon_pmu.c | 832 ++++++++++ + tools/perf/util/hwmon_pmu.h | 151 ++ + tools/perf/util/include/dwarf-regs.h | 126 +- + tools/perf/util/intel-bts.c | 4 +- + tools/perf/util/intel-pt.c | 4 +- + tools/perf/util/machine.c | 2 +- + tools/perf/util/mem-events.c | 8 +- + tools/perf/util/metricgroup.c | 39 +- + tools/perf/util/parse-events.c | 125 +- + tools/perf/util/parse-events.h | 13 +- + tools/perf/util/parse-events.l | 11 - + tools/perf/util/parse-events.y | 18 +- + tools/perf/util/pfm.c | 4 +- + tools/perf/util/pmu.c | 137 +- + tools/perf/util/pmu.h | 18 +- + tools/perf/util/pmus.c | 18 +- + tools/perf/util/pmus.h | 3 + + tools/perf/util/print-events.c | 36 +- + tools/perf/util/print-events.h | 1 - + tools/perf/util/probe-event.c | 182 ++- + tools/perf/util/probe-event.h | 3 - + tools/perf/util/probe-file.c | 19 - + tools/perf/util/probe-file.h | 1 - + tools/perf/util/probe-finder.c | 42 +- + tools/perf/util/probe-finder.h | 13 +- + tools/perf/util/python.c | 2 +- + tools/perf/util/s390-cpumsf.c | 2 +- + tools/perf/util/s390-sample-raw.c | 8 +- + .../perf/util/scripting-engines/trace-event-perl.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 11 +- + tools/perf/util/session.c | 30 +- + tools/perf/util/sort.c | 115 +- + tools/perf/util/sort.h | 3 + + tools/perf/util/stat-display.c | 196 ++- + tools/perf/util/stat-shadow.c | 166 +- + tools/perf/util/stat.c | 2 +- + tools/perf/util/stat.h | 16 +- + tools/perf/util/string.c | 100 ++ + tools/perf/util/string2.h | 2 + + tools/perf/util/symbol.c | 2 +- + tools/perf/util/syscalltbl.c | 4 + + tools/perf/util/target.h | 1 + + tools/perf/util/threads.c | 4 +- + tools/perf/util/tool_pmu.c | 505 ++++++ + tools/perf/util/tool_pmu.h | 56 + + tools/perf/util/trace-event-parse.c | 8 +- + tools/perf/util/trace-event-read.c | 2 +- + tools/perf/util/trace-event-scripting.c | 2 +- + tools/perf/util/trace-event.c | 2 +- + tools/perf/util/trace-event.h | 5 +- + tools/perf/util/tsc.c | 2 +- + tools/perf/util/tsc.h | 2 +- + tools/perf/util/util.c | 95 +- + tools/perf/util/util.h | 18 +- + 338 files changed, 9514 insertions(+), 4154 deletions(-) + delete mode 100644 tools/build/feature/test-dwarf.c + delete mode 100644 tools/build/feature/test-dwarf_getcfi.c + delete mode 100644 tools/build/feature/test-dwarf_getlocations.c + delete mode 100644 tools/build/feature/test-libdw-dwarf-unwind.c + create mode 100644 tools/build/feature/test-libdw.c + delete mode 100644 tools/perf/arch/arm/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/csky/Makefile + delete mode 100644 tools/perf/arch/loongarch/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/mips/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c + create mode 100755 tools/perf/arch/riscv/entry/syscalls/mksyscalltbl + create mode 100644 tools/perf/arch/riscv/include/dwarf-regs-table.h + delete mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/s390/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/sh/Build + delete mode 100644 tools/perf/arch/sh/Makefile + delete mode 100644 tools/perf/arch/sh/util/Build + delete mode 100644 tools/perf/arch/sh/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/sparc/Build + delete mode 100644 tools/perf/arch/sparc/util/Build + delete mode 100644 tools/perf/arch/sparc/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/x86/tests/intel-cqm.c + delete mode 100644 tools/perf/arch/x86/util/dwarf-regs.c + delete mode 100644 tools/perf/arch/x86/util/env.c + delete mode 100644 tools/perf/arch/x86/util/env.h + delete mode 100644 tools/perf/arch/xtensa/Build + delete mode 100644 tools/perf/arch/xtensa/Makefile + delete mode 100644 tools/perf/arch/xtensa/util/Build + delete mode 100644 tools/perf/arch/xtensa/util/dwarf-regs.c + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx91/sys/ddrc.json + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx91/sys/metrics.json + create mode 100644 tools/perf/pmu-events/arch/common/common/tool.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/compat/generic-events.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/data-fabric.json + delete mode 100644 tools/perf/tests/attr.c + create mode 100644 tools/perf/tests/hwmon_pmu.c + create mode 100755 tools/perf/tests/shell/attr.sh + rename tools/perf/tests/{ => shell}/attr/README (95%) + rename tools/perf/tests/{ => shell}/attr/base-record (100%) + rename tools/perf/tests/{ => shell}/attr/base-record-spe (100%) + rename tools/perf/tests/{ => shell}/attr/base-stat (100%) + rename tools/perf/tests/{ => shell}/attr/system-wide-dummy (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-C0 (95%) + rename tools/perf/tests/{ => shell}/attr/test-record-basic (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-any (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-any (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-any_call (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-any_ret (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-hv (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-ind_call (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-k (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-branch-filter-u (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-count (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-data (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-dummy-C0 (96%) + rename tools/perf/tests/{ => shell}/attr/test-record-freq (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-graph-default (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-graph-default-aarch64 (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-graph-dwarf (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-graph-fp (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-graph-fp-aarch64 (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-group-sampling (88%) + create mode 100644 tools/perf/tests/shell/attr/test-record-group-sampling1 + create mode 100644 tools/perf/tests/shell/attr/test-record-group-sampling2 + rename tools/perf/tests/{ => shell}/attr/test-record-group1 (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-group2 (95%) + create mode 100644 tools/perf/tests/shell/attr/test-record-group3 + rename tools/perf/tests/{ => shell}/attr/test-record-no-buffering (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-no-inherit (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-no-samples (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-period (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-pfm-period (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-raw (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-spe-period (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-spe-period-term (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-spe-physical-address (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-user-regs-no-sve-aarch64 (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-user-regs-old-sve-aarch64 (100%) + rename tools/perf/tests/{ => shell}/attr/test-record-user-regs-sve-aarch64 (100%) + rename tools/perf/tests/{ => shell}/attr/test-stat-C0 (100%) + rename tools/perf/tests/{ => shell}/attr/test-stat-basic (100%) + rename tools/perf/tests/{ => shell}/attr/test-stat-default (81%) + rename tools/perf/tests/{ => shell}/attr/test-stat-detailed-1 (85%) + rename tools/perf/tests/{ => shell}/attr/test-stat-detailed-2 (88%) + rename tools/perf/tests/{ => shell}/attr/test-stat-detailed-3 (89%) + rename tools/perf/tests/{ => shell}/attr/test-stat-group1 (100%) + rename tools/perf/tests/{ => shell}/attr/test-stat-no-inherit (100%) + rename tools/perf/tests/{ => shell/lib}/attr.py (94%) + create mode 100755 tools/perf/tests/shell/test_arm_coresight_disasm.sh + create mode 100755 tools/perf/tests/shell/trace_exit_race.sh + create mode 100644 tools/perf/tests/tool_pmu.c + delete mode 100644 tools/perf/util/bpf-prologue.h + rename tools/perf/{arch/csky/util/dwarf-regs.c => util/dwarf-regs-csky.c} (74%) + create mode 100644 tools/perf/util/dwarf-regs-powerpc.c + create mode 100644 tools/perf/util/dwarf-regs-x86.c + create mode 100644 tools/perf/util/hwmon_pmu.c + create mode 100644 tools/perf/util/hwmon_pmu.h + create mode 100644 tools/perf/util/tool_pmu.c + create mode 100644 tools/perf/util/tool_pmu.h +Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint) +$ 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 zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (7c626ce4bae1 Linux 6.11-rc3) +$ 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 (9852d85ec9d4 Linux 6.12-rc1) +$ 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 (2313ab74c300 cfi: tweak llvm version for HAVE_CFI_ICALL_NORMALIZE_INTEGERS) +$ 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 (9852d85ec9d4 Linux 6.12-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 (d2fab3fc27cb mailbox: qcom-cpucp: Mark the irq with IRQF_NO_SUSPEND flag) +$ 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 (523930e4528f MAINTAINERS: transfer i2c-aspeed maintainership from Brendan to Ryan) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (714398d8742d Merge tag 'qcom-clk-fixes-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/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 pwrseq-fixes/pwrseq/for-current (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (fae4078c289a fgraph: Allocate ret_stack_list with proper size) +$ 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 (09663753bb7c tracing/ring-buffer: Clear all memory mapped CPU ring buffers on first recording) +$ 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 (2a13ca2e8abb tracing/hwlat: Fix a race during cpuhp processing) +$ 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 (819837584309 Linux 6.12-rc5) +$ 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 (6e464fa43516 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. + Documentation/arch/x86/boot.rst | 17 +++++++++++++---- + arch/x86/include/asm/tlb.h | 4 ++++ + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 25 ++++++++++++++++++++----- + arch/x86/mm/tlb.c | 3 ++- + 5 files changed, 40 insertions(+), 11 deletions(-) +Merging slab-fixes/slab/for-next-fixes (9c9201afebea mm/slab: fix warning caused by duplicate kmem_cache creation in kmem_buckets_create) +$ 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-misc-fixes/for-linux-next-fixes (78ac1c355881 dma-buf: fix dma_fence_array_signaled v4) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/dma-buf/dma-fence-array.c | 28 ++++++++- + drivers/dma-buf/dma-fence-unwrap.c | 126 ++++++++++++++++++------------------- + 2 files changed, 88 insertions(+), 66 deletions(-) +Merging mm-stable/mm-stable (2532e6c74a67 cma: enforce non-zero pageblock_order during cma_init_reserved_mem()) +$ 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 (2c259a91d8d2 gdb: lx-symbols: do not error out on monolithic build) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/gpu/drm/drm_framebuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging fs/exec.c +Auto-merging fs/nilfs2/mdt.c +Auto-merging fs/nilfs2/page.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/proc/kcore.c +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/auditsc.c +CONFLICT (content): Merge conflict in kernel/auditsc.c +Auto-merging kernel/events/core.c +Auto-merging kernel/resource.c +Auto-merging kernel/watchdog.c +Auto-merging lib/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging mm/util.c +Auto-merging scripts/checkpatch.pl +Auto-merging security/selinux/selinuxfs.c +Resolved 'kernel/auditsc.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9736d908439] Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/kernel.rst | 9 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/min_heap.rst | 300 ++++++++++++++++ + MAINTAINERS | 9 + + arch/alpha/include/asm/spinlock_types.h | 2 +- + arch/arm/include/asm/spinlock_types.h | 2 +- + arch/arm64/include/asm/spinlock_types.h | 2 +- + arch/hexagon/include/asm/spinlock_types.h | 2 +- + arch/powerpc/include/asm/simple_spinlock_types.h | 2 +- + arch/powerpc/include/asm/spinlock_types.h | 2 +- + arch/s390/include/asm/spinlock_types.h | 2 +- + arch/sh/include/asm/spinlock_types.h | 2 +- + arch/xtensa/include/asm/spinlock_types.h | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/md/bcache/Kconfig | 1 + + drivers/md/bcache/alloc.c | 11 +- + drivers/md/bcache/bset.c | 14 +- + drivers/md/bcache/extents.c | 10 +- + drivers/md/bcache/movinggc.c | 10 +- + drivers/md/dm-vdo/Kconfig | 1 + + drivers/md/dm-vdo/repair.c | 2 +- + drivers/md/dm-vdo/slab-depot.c | 10 +- + fs/bcachefs/Kconfig | 1 + + fs/bcachefs/clock.c | 25 +- + fs/bcachefs/ec.c | 19 +- + fs/exec.c | 10 - + fs/nilfs2/alloc.c | 150 ++++---- + fs/nilfs2/alloc.h | 4 +- + fs/nilfs2/cpfile.c | 383 +++++++++++---------- + fs/nilfs2/dat.c | 98 +++--- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/ifile.c | 10 +- + fs/nilfs2/ifile.h | 4 +- + fs/nilfs2/inode.c | 35 +- + fs/nilfs2/mdt.c | 40 ++- + fs/nilfs2/page.c | 4 +- + fs/nilfs2/page.h | 4 +- + fs/nilfs2/recovery.c | 17 +- + fs/nilfs2/segbuf.c | 17 +- + fs/nilfs2/sufile.c | 160 ++++----- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.h | 2 + + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/dlm/dlmapi.h | 2 - + fs/ocfs2/dlm/dlmdebug.c | 53 --- + fs/ocfs2/file.c | 4 + + fs/ocfs2/quota.h | 1 - + fs/proc/array.c | 2 +- + fs/proc/kcore.c | 10 +- + include/acpi/platform/aclinux.h | 2 +- + include/linux/compiler-clang.h | 2 +- + include/linux/compiler-gcc.h | 2 +- + include/linux/min_heap.h | 357 +++++++++++++++---- + include/linux/notifier.h | 2 - + include/linux/percpu-defs.h | 21 +- + include/linux/pm_wakeup.h | 2 +- + include/linux/rwlock.h | 2 +- + include/linux/rwlock_api_smp.h | 2 +- + include/linux/scatterlist.h | 2 +- + include/linux/sched.h | 28 +- + include/linux/spinlock_api_smp.h | 2 +- + include/linux/spinlock_types_up.h | 2 +- + include/linux/spinlock_up.h | 2 +- + include/linux/util_macros.h | 56 ++- + init/Kconfig | 1 + + ipc/msg.c | 2 +- + ipc/namespace.c | 4 +- + kernel/auditsc.c | 6 +- + kernel/crash_core.c | 6 +- + kernel/events/core.c | 15 +- + kernel/events/hw_breakpoint.c | 4 +- + kernel/hung_task.c | 18 + + kernel/kthread.c | 2 +- + kernel/notifier.c | 8 - + kernel/reboot.c | 15 +- + kernel/resource.c | 66 ++-- + kernel/watchdog.c | 3 +- + lib/Kconfig | 6 + + lib/Kconfig.debug | 59 +++- + lib/Makefile | 6 +- + lib/crc16_kunit.c | 155 +++++++++ + lib/list-test.c | 4 + + lib/list_sort.c | 3 - + lib/min_heap.c | 70 ++++ + lib/scatterlist.c | 4 +- + lib/test_min_heap.c | 16 +- + lib/util_macros_kunit.c | 240 +++++++++++++ + mm/util.c | 62 ++-- + samples/hw_breakpoint/data_breakpoint.c | 4 +- + scripts/checkpatch.pl | 37 +- + scripts/decode_stacktrace.sh | 7 +- + scripts/gdb/linux/modules.py | 3 + + scripts/gdb/linux/symbols.py | 3 + + scripts/spelling.txt | 33 ++ + security/lsm_audit.c | 4 +- + security/selinux/selinuxfs.c | 2 +- + tools/bpf/bpftool/pids.c | 2 + + tools/include/linux/compiler-gcc.h | 2 +- + tools/lib/list_sort.c | 2 - + .../perf/check-header_ignore_hunks/lib/list_sort.c | 11 +- + tools/testing/shared/linux.c | 14 +- + 102 files changed, 1952 insertions(+), 896 deletions(-) + create mode 100644 Documentation/core-api/min_heap.rst + create mode 100644 lib/crc16_kunit.c + create mode 100644 lib/min_heap.c + create mode 100644 lib/util_macros_kunit.c +Merging mm/mm-everything (3f8828bf146a foo) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging fs/hugetlbfs/inode.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging kernel/fork.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/mm/process_addrs.rst | 824 ++++++++++++++++++++++++++++++++ + fs/hugetlbfs/inode.c | 2 +- + include/linux/mm.h | 12 +- + include/linux/mm_types.h | 7 +- + include/linux/mmap_lock.h | 117 +++-- + kernel/fork.c | 5 +- + mm/compaction.c | 2 +- + mm/hugetlb.c | 5 +- + mm/hugetlb_cgroup.c | 19 + + mm/init-mm.c | 2 +- + mm/memory-failure.c | 7 + + mm/memory.c | 8 +- + mm/page_alloc.c | 44 +- + tools/testing/vma/vma.c | 4 +- + tools/testing/vma/vma_internal.h | 4 +- + 16 files changed, 1005 insertions(+), 65 deletions(-) +Merging kbuild/for-next (3596c721c434 kbuild: switch from lz4c to lz4 for compression) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/powerpc/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging drivers/of/Kconfig +Auto-merging include/net/net_debug.h +Auto-merging mm/internal.h +Auto-merging scripts/Makefile.vmlinux +Auto-merging scripts/link-vmlinux.sh +Auto-merging tools/objtool/check.c +CONFLICT (content): Merge conflict in tools/objtool/check.c +Resolved 'arch/powerpc/Makefile' using previous resolution. +Resolved 'tools/objtool/check.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 87101a8cdaff] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/autofdo.rst | 168 +++++++++++++++++++++++ + Documentation/dev-tools/coccinelle.rst | 20 +-- + Documentation/dev-tools/index.rst | 2 + + Documentation/dev-tools/propeller.rst | 162 ++++++++++++++++++++++ + Documentation/kbuild/kbuild.rst | 8 +- + Documentation/kbuild/kconfig-language.rst | 4 +- + Documentation/kbuild/makefiles.rst | 14 ++ + Documentation/kbuild/modules.rst | 29 +++- + MAINTAINERS | 14 ++ + Makefile | 221 ++++++++++++++++++------------ + arch/Kconfig | 39 ++++++ + arch/arm/Makefile | 4 +- + arch/arm64/Makefile | 2 +- + arch/mips/kernel/head.S | 2 - + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/powerpc/Makefile | 4 +- + arch/riscv/Makefile | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 5 + + arch/x86/Kconfig | 2 + + arch/x86/kernel/vmlinux.lds.S | 4 + + drivers/accessibility/speakup/Makefile | 4 +- + drivers/of/Kconfig | 6 + + drivers/usb/dwc2/Kconfig | 2 +- + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/isp1760/Kconfig | 2 +- + drivers/usb/mtu3/Kconfig | 2 +- + drivers/usb/musb/Kconfig | 2 +- + include/asm-generic/vmlinux.lds.h | 53 +++++-- + include/linux/mmdebug.h | 6 +- + include/linux/once.h | 4 +- + include/linux/once_lite.h | 2 +- + include/linux/rcupdate.h | 2 +- + include/net/net_debug.h | 2 +- + mm/internal.h | 2 +- + rust/Makefile | 4 +- + scripts/Kbuild.include | 2 +- + scripts/Makefile.autofdo | 24 ++++ + scripts/Makefile.build | 59 +------- + scripts/Makefile.clean | 2 +- + scripts/Makefile.compiler | 2 +- + scripts/Makefile.host | 8 +- + scripts/Makefile.lib | 62 ++++++++- + scripts/Makefile.modfinal | 31 ++--- + scripts/Makefile.modinst | 8 +- + scripts/Makefile.modpost | 24 ++-- + scripts/Makefile.propeller | 39 ++++++ + scripts/Makefile.vmlinux | 48 ++++++- + scripts/coccicheck | 6 +- + scripts/depmod.sh | 4 +- + scripts/kconfig/conf.c | 5 +- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/nconf.c | 2 +- + scripts/kconfig/nconf.gui.c | 9 ++ + scripts/kconfig/parser.y | 28 +--- + scripts/kconfig/qconf.cc | 208 +++++++++------------------- + scripts/kconfig/qconf.h | 19 ++- + scripts/kconfig/streamline_config.pl | 18 ++- + scripts/kconfig/symbol.c | 26 +++- + scripts/link-vmlinux.sh | 4 + + scripts/nsdeps | 10 +- + scripts/package/builddeb | 20 +-- + scripts/package/install-extmod-build | 7 + + tools/objtool/check.c | 2 + + tools/objtool/elf.c | 15 +- + 64 files changed, 1027 insertions(+), 468 deletions(-) + create mode 100644 Documentation/dev-tools/autofdo.rst + create mode 100644 Documentation/dev-tools/propeller.rst + create mode 100644 scripts/Makefile.autofdo + create mode 100644 scripts/Makefile.propeller +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 (6d78089da980 perf tests: Fix hwmon parsing with PMU name test) +$ 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/for-next (22293c33738c dma-mapping: save base/size instead of pointer to shared DMA pool) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (6139f7913689 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. + arch/arm/kernel/entry-armv.S | 8 +++++ + arch/arm/mm/ioremap.c | 35 ++++++++++++++++++--- + arch/arm/vfp/vfpmodule.c | 74 +++++++++++++++++++++++++++++++------------- + drivers/amba/bus.c | 6 ++++ + include/linux/amba/bus.h | 5 +++ + 5 files changed, 102 insertions(+), 26 deletions(-) +Merging arm64/for-next/core (83ef4a378e56 Merge branch 'for-next/pkey-signal' 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 (845fd2cbedaf perf: Switch back to struct platform_driver::remove()) +$ 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 (daa20223dee9 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 139 +++++++++++++++++++++++++++++++++ + 1 file changed, 139 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (171aa289a6fe Merge branch 'v6.13/arm-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 (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (2eff056a229e ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts | 622 ++ + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 18 +- + .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 181 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 45 +- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 557 +- + .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 1035 +++- + .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 41 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 27 + + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 111 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 12 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts | 6086 ++++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 23 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 8 +- + .../arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts | 6 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-vegman.dtsi | 2 +- + arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 93 +- + arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 109 +- + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 249 +- + 20 files changed, 8571 insertions(+), 658 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts +Merging at91/at91-next (44339d0de195 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging broadcom/next (f4733d5e7751 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/broadcom/Makefile | 1 + + .../arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts | 20 ++ + .../dts/broadcom/bcm53340-ubnt-unifi-switch8.dts | 1 - + .../boot/dts/broadcom/bcm6846-genexis-xg6846b.dts | 244 +++++++++++++++++++++ + arch/arm/boot/dts/broadcom/bcm6846.dtsi | 120 ++++++++++ + arch/arm/boot/dts/broadcom/bcm953012hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm953012k.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958522er.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958525er.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958525xmc.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958622hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958623hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958625hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958625k.dts | 1 - + arch/arm/boot/dts/broadcom/bcm988312hr.dts | 1 - + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 37 ++++ + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 42 ++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 188 ++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 + + .../dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts | 196 +++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 +- + .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 - + .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 1 - + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 - + 27 files changed, 868 insertions(+), 20 deletions(-) + create mode 100644 arch/arm/boot/dts/broadcom/bcm6846-genexis-xg6846b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts +Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-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 (1f1d847a6575 arm64: defconfig: Update defconfig with now user-visible CONFIG_FSL_IFC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (6451378c2735 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 (3102ce10f311 Merge branch 'v6.12-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mvebu/for-next (5f55ff35bfaa Merge branch 'mvebu/dt64' 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 (1aedd4a93c6c Merge branch 'omap-for-v6.13/drivers' into tmp/omap-next-20241104.135423) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (30eb6f0b08b1 Merge branches 'arm32-for-6.13', 'arm64-defconfig-for-6.13', 'arm64-fixes-for-6.12', 'arm64-for-6.13', 'clk-fixes-for-6.12', 'clk-for-6.13', 'drivers-fixes-for-6.12' and 'drivers-for-6.13' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/qcom-soc.yaml | 3 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 29 + + .../bindings/interconnect/qcom,sar2130p-rpmh.yaml | 117 + + arch/arm64/boot/dts/qcom/Makefile | 4 + + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 59 + + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 305 ++ + arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts | 558 ++++ + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 3123 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 1343 +++++++++ + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 8 + + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 293 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 204 +- + arch/arm64/configs/defconfig | 2 + + .../dt-bindings/interconnect/qcom,sar2130p-rpmh.h | 137 + + 14 files changed, 6173 insertions(+), 12 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sar2130p-rpmh.yaml + create mode 100644 arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5424.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts + create mode 100644 arch/arm64/boot/dts/qcom/sar2130p.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts + create mode 100644 include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h +Merging renesas/next (96a483856323 Merge branch 'renesas-fixes-for-v6.12' 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 (cf3e10cc0e88 misc: lan966x_pci: Fix dtc warn 'Missing interrupt-parent') +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (41286036c994 Merge branch 'v6.12-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 (59a22cf03f67 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (7aaa234c5ac6 Merge tag 'scmi-updates-6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging sophgo/for-next (b5cf65cc0fd0 riscv: dts: sophgo: Add emmc support for Huashan Pi) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +Merging spacemit/for-next (819837584309 Linux 6.12-rc5) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Already up to date. +Merging stm32/stm32-next (b0191a5cbc22 arm64: dts: st: add DMA support on SPI instances of stm32mp25) +$ 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 (f13fea5381e2 Merge branches 'sunxi/dt-for-6.13' and 'sunxi/clk-for-6.13' 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. + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging tee/next (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (2a4425682b6f Merge branch for-6.13/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging thead-dt/thead-dt-for-next (7e756671a664 riscv: dts: thead: Add TH1520 ethernet nodes) +$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (6eaad8fca267 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 (0e355cb69e19 Merge branch 'zynq/soc' 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. +Merging clk/clk-next (21a5352dc702 Merge branches 'clk-marvell', 'clk-adi', 'clk-qcom' and 'clk-devm' 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 (81a206d736c1 clk: imx: imx8-acm: Fix return value check in clk_imx_acm_attach_pm_domains()) +$ 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 (3b42450ce177 clk: renesas: vbattb: Add VBATTB clock driver) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging csky/linux-next (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 (7eb5d00d948b LoongArch: dts: Add I2S support to Loongson-2K2000) +$ 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 tools/objtool/check.c +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 6 ++ + arch/loongarch/Makefile | 10 +- + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 17 ++- + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 22 +++- + arch/loongarch/include/asm/thread_info.h | 8 +- + arch/loongarch/kernel/time.c | 6 +- + arch/loongarch/mm/tlb.c | 2 +- + arch/loongarch/net/bpf_jit.c | 2 +- + arch/loongarch/vdso/Makefile | 2 +- + tools/objtool/arch/loongarch/special.c | 156 ++++++++++++++++++++++++++- + tools/objtool/check.c | 77 +++++++++++-- + tools/objtool/include/objtool/check.h | 1 + + 12 files changed, 288 insertions(+), 21 deletions(-) +Merging m68k/for-next (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (63a24cf8cc33 m68k: coldfire/device.c: only build FEC when HW macros are defined) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 8 ++++---- + arch/m68k/include/asm/mcfgpio.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (eb01f8f3c446 microblaze: mb: Use str_yes_no() helper in show_cpuinfo()) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (4fbd66d8254c MIPS: Loongson64: DTS: Really fix PCIe port nodes for ls7a) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 73 +++++- + arch/mips/boot/dts/mobileye/eyeq5-clocks.dtsi | 270 --------------------- + arch/mips/boot/dts/mobileye/eyeq5.dtsi | 30 ++- + .../boot/dts/mobileye/eyeq6h-fixed-clocks.dtsi | 52 ---- + arch/mips/boot/dts/mobileye/eyeq6h.dtsi | 73 +++++- + arch/mips/boot/dts/realtek/rtl930x.dtsi | 13 + + 6 files changed, 166 insertions(+), 345 deletions(-) + delete mode 100644 arch/mips/boot/dts/mobileye/eyeq5-clocks.dtsi + delete mode 100644 arch/mips/boot/dts/mobileye/eyeq6h-fixed-clocks.dtsi +Merging openrisc/for-next (1037d186edfc openrisc: Implement fixmap to fix earlycon) +$ 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 (a5f05a138a8c parisc/ftrace: Fix function graph tracing disablement) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging arch/parisc/kernel/ftrace.c +Merge made by the 'ort' strategy. + arch/parisc/kernel/ftrace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging powerpc/next (3c592ce7991c EDAC/powerpc: Remove PPC_MAPLE drivers) +$ 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 (0eb512779d64 riscv: Fix default misaligned access trap) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/sys_hwprobe.c +Auto-merging arch/riscv/kernel/traps_misaligned.c +Auto-merging include/uapi/linux/elf.h +Auto-merging include/uapi/linux/prctl.h +Merge made by the 'ort' strategy. + Documentation/arch/riscv/hwprobe.rst | 19 ++ + Documentation/arch/riscv/uabi.rst | 16 + + .../devicetree/bindings/riscv/extensions.yaml | 30 ++ + .../locking/queued-spinlocks/arch-support.txt | 2 +- + arch/riscv/Kconfig | 138 ++++++++- + arch/riscv/Makefile | 6 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/include/asm/Kbuild | 4 +- + arch/riscv/include/asm/cmpxchg.h | 284 +++++++++++++----- + arch/riscv/include/asm/cpufeature-macros.h | 66 ++++ + arch/riscv/include/asm/cpufeature.h | 73 +---- + arch/riscv/include/asm/csr.h | 16 + + arch/riscv/include/asm/entry-common.h | 1 + + arch/riscv/include/asm/hwcap.h | 7 + + arch/riscv/include/asm/hwprobe.h | 2 +- + arch/riscv/include/asm/mmu.h | 7 + + arch/riscv/include/asm/mmu_context.h | 13 + + arch/riscv/include/asm/processor.h | 9 + + arch/riscv/include/asm/spinlock.h | 47 +++ + arch/riscv/include/asm/switch_to.h | 19 ++ + arch/riscv/include/asm/uaccess.h | 43 ++- + arch/riscv/include/asm/vector.h | 2 + + arch/riscv/include/uapi/asm/hwprobe.h | 6 + + arch/riscv/include/uapi/asm/kvm.h | 2 + + arch/riscv/kernel/Makefile | 3 +- + arch/riscv/kernel/copy-unaligned.h | 5 + + arch/riscv/kernel/cpufeature.c | 16 +- + arch/riscv/kernel/fpu.S | 4 +- + arch/riscv/kernel/process.c | 154 ++++++++++ + arch/riscv/kernel/ptrace.c | 42 +++ + arch/riscv/kernel/setup.c | 37 +++ + arch/riscv/kernel/smpboot.c | 2 - + arch/riscv/kernel/suspend.c | 4 +- + arch/riscv/kernel/sys_hwprobe.c | 44 +++ + arch/riscv/kernel/traps_misaligned.c | 139 ++++++++- + arch/riscv/kernel/unaligned_access_speed.c | 160 +++++++++- + arch/riscv/kernel/vdso/Makefile | 9 +- + arch/riscv/kernel/vec-copy-unaligned.S | 58 ++++ + arch/riscv/kernel/vector.c | 2 +- + arch/riscv/kvm/vcpu_onereg.c | 4 + + drivers/cpuidle/cpuidle-riscv-sbi.c | 11 +- + include/asm-generic/qspinlock.h | 2 + + include/asm-generic/spinlock.h | 87 +----- + include/asm-generic/spinlock_types.h | 12 +- + include/asm-generic/ticket_spinlock.h | 105 +++++++ + include/uapi/linux/elf.h | 1 + + include/uapi/linux/prctl.h | 5 +- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 8 + + tools/testing/selftests/riscv/Makefile | 2 +- + tools/testing/selftests/riscv/abi/.gitignore | 1 + + tools/testing/selftests/riscv/abi/Makefile | 10 + + .../testing/selftests/riscv/abi/pointer_masking.c | 332 +++++++++++++++++++++ + 52 files changed, 1790 insertions(+), 282 deletions(-) + create mode 100644 arch/riscv/include/asm/cpufeature-macros.h + create mode 100644 arch/riscv/include/asm/spinlock.h + create mode 100644 arch/riscv/kernel/vec-copy-unaligned.S + create mode 100644 include/asm-generic/ticket_spinlock.h + create mode 100644 tools/testing/selftests/riscv/abi/.gitignore + create mode 100644 tools/testing/selftests/riscv/abi/Makefile + create mode 100644 tools/testing/selftests/riscv/abi/pointer_masking.c +Merging riscv-dt/riscv-dt-for-next (c8b72c301dbe riscv: dts: starfive: add DeepComputing FML13V01 board device tree) +$ 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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (ff123eb77416 s390/mm: Allow large pages for KASAN shadow mapping) +$ 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 +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 1 + + arch/s390/boot/vmem.c | 12 +++++- + arch/s390/include/asm/debug.h | 8 ++-- + arch/s390/include/asm/thread_info.h | 21 +++++----- + arch/s390/include/asm/tlbflush.h | 5 --- + arch/s390/kernel/debug.c | 83 ++++++++++++++++++++++--------------- + arch/s390/kernel/entry.S | 4 ++ + arch/s390/kernel/kprobes.c | 6 +++ + arch/s390/kernel/perf_cpum_sf.c | 38 ++++++----------- + arch/s390/kernel/stacktrace.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 32 +++++++++----- + 11 files changed, 123 insertions(+), 89 deletions(-) +Merging sh/for-next (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (b6370b338e71 sparc/vdso: Add helper function for 64-bit right shift on 32-bit target) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Merge made by the 'ort' strategy. + Documentation/kbuild/llvm.rst | 3 +++ + arch/sparc/Makefile | 4 ++-- + arch/sparc/include/asm/hvtramp.h | 2 +- + arch/sparc/kernel/smp_64.c | 4 +--- + arch/sparc/vdso/Makefile | 2 +- + arch/sparc/vdso/vclock_gettime.c | 28 ++++++++++++++++++++++++---- + scripts/Makefile.clang | 1 + + 7 files changed, 33 insertions(+), 11 deletions(-) +Merging uml/next (bed2cc482600 hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/um/configs/i386_defconfig +Auto-merging arch/um/include/asm/page.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/kernel/dtb.c +Auto-merging arch/um/kernel/um_arch.c +Merge made by the 'ort' strategy. + arch/um/Kconfig | 24 +- + arch/um/Makefile | 7 +- + arch/um/Makefile-skas | 14 +- + arch/um/configs/i386_defconfig | 1 - + arch/um/drivers/chan_user.c | 2 + + arch/um/drivers/hostaudio_kern.c | 2 + + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/ubd_kern.c | 5 +- + arch/um/drivers/vector_kern.c | 3 +- + arch/um/drivers/vhost_user.h | 4 +- + arch/um/drivers/virtio_uml.c | 51 +++- + arch/um/include/asm/Kbuild | 1 - + arch/um/include/asm/current.h | 23 ++ + arch/um/include/asm/page.h | 40 +-- + arch/um/include/asm/pgalloc.h | 11 +- + arch/um/include/asm/pgtable-2level.h | 2 +- + .../asm/{pgtable-3level.h => pgtable-4level.h} | 59 ++-- + arch/um/include/asm/pgtable.h | 83 ++--- + arch/um/include/asm/processor-generic.h | 7 +- + arch/um/include/asm/thread_info.h | 18 -- + arch/um/include/asm/tlbflush.h | 4 +- + arch/um/include/shared/as-layout.h | 10 +- + arch/um/include/shared/common-offsets.h | 15 - + arch/um/include/shared/kern_util.h | 1 - + arch/um/include/shared/mem_user.h | 5 +- + arch/um/include/shared/os.h | 15 +- + arch/um/include/shared/registers.h | 6 - + arch/um/include/shared/skas/stub-data.h | 12 +- + arch/um/include/shared/timetravel.h | 5 +- + arch/um/include/shared/user.h | 2 +- + arch/um/kernel/dtb.c | 1 + + arch/um/kernel/dyn.lds.S | 5 +- + arch/um/kernel/initrd.c | 1 + + arch/um/kernel/irq.c | 112 ------- + arch/um/kernel/mem.c | 20 +- + arch/um/kernel/physmem.c | 39 +-- + arch/um/kernel/process.c | 24 +- + arch/um/kernel/skas/.gitignore | 2 + + arch/um/kernel/skas/Makefile | 38 ++- + arch/um/kernel/skas/mmu.c | 28 +- + arch/um/kernel/skas/process.c | 4 +- + arch/um/kernel/skas/stub.c | 10 - + arch/um/kernel/skas/stub_exe.c | 95 ++++++ + arch/um/kernel/skas/stub_exe_embed.S | 11 + + arch/um/kernel/sysrq.c | 8 +- + arch/um/kernel/time.c | 20 ++ + arch/um/kernel/tlb.c | 70 ++--- + arch/um/kernel/trap.c | 16 - + arch/um/kernel/um_arch.c | 75 ++--- + arch/um/kernel/uml.lds.S | 2 - + arch/um/os-Linux/Makefile | 2 + + arch/um/os-Linux/file.c | 6 - + arch/um/os-Linux/main.c | 23 +- + arch/um/os-Linux/mem.c | 14 +- + arch/um/os-Linux/process.c | 88 +----- + arch/um/os-Linux/registers.c | 11 +- + arch/um/os-Linux/sigio.c | 1 + + arch/um/os-Linux/signal.c | 55 +--- + arch/um/os-Linux/skas/mem.c | 21 -- + arch/um/os-Linux/skas/process.c | 225 +++++++++----- + arch/um/os-Linux/umid.c | 2 + + arch/um/os-Linux/util.c | 4 +- + arch/x86/um/Kconfig | 12 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/asm/elf.h | 2 + + arch/x86/um/asm/ptrace.h | 10 + + arch/x86/um/os-Linux/Makefile | 2 +- + arch/x86/um/os-Linux/registers.c | 147 +++------ + arch/x86/um/os-Linux/task_size.c | 151 --------- + arch/x86/um/ptrace.c | 267 ++++++++++++++++ + arch/x86/um/ptrace_32.c | 84 ++---- + arch/x86/um/ptrace_64.c | 43 +-- + arch/x86/um/shared/sysdep/ptrace.h | 8 +- + arch/x86/um/shared/sysdep/ptrace_32.h | 4 - + arch/x86/um/shared/sysdep/ptrace_64.h | 4 - + arch/x86/um/shared/sysdep/ptrace_user.h | 6 - + arch/x86/um/shared/sysdep/stub_32.h | 18 +- + arch/x86/um/shared/sysdep/stub_64.h | 27 +- + arch/x86/um/signal.c | 336 +++++++-------------- + arch/x86/um/user-offsets.c | 8 - + arch/x86/um/vdso/Makefile | 5 +- + arch/x86/um/vdso/checkundef.sh | 11 - + fs/hostfs/hostfs_kern.c | 5 +- + 83 files changed, 1226 insertions(+), 1393 deletions(-) + create mode 100644 arch/um/include/asm/current.h + rename arch/um/include/asm/{pgtable-3level.h => pgtable-4level.h} (60%) + create mode 100644 arch/um/kernel/skas/.gitignore + create mode 100644 arch/um/kernel/skas/stub_exe.c + create mode 100644 arch/um/kernel/skas/stub_exe_embed.S + delete mode 100644 arch/x86/um/os-Linux/task_size.c + create mode 100644 arch/x86/um/ptrace.c + delete mode 100644 arch/x86/um/vdso/checkundef.sh +Merging xtensa/xtensa-for-next (43a611dc43e4 xtensa: annotate dtb_start variable as static __initdata) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/setup.c +Merge made by the 'ort' strategy. + arch/xtensa/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fs-next (fd6359d103b4 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 +Auto-merging fs/bcachefs/Kconfig +Auto-merging fs/bcachefs/ec.c +Auto-merging include/linux/mm.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 13 +- + Documentation/admin-guide/sysctl/fs.rst | 10 + + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + Documentation/filesystems/f2fs.rst | 44 ++ + MAINTAINERS | 2 + + drivers/mtd/ubi/attach.c | 12 +- + drivers/mtd/ubi/fastmap-wl.c | 19 +- + drivers/mtd/ubi/nvmem.c | 2 +- + drivers/mtd/ubi/ubi.h | 3 +- + drivers/mtd/ubi/vmt.c | 2 + + drivers/mtd/ubi/wl.c | 32 +- + drivers/mtd/ubi/wl.h | 3 +- + fs/9p/v9fs.c | 21 +- + fs/9p/vfs_addr.c | 8 +- + fs/afs/Makefile | 1 + + fs/afs/callback.c | 4 +- + fs/afs/dir.c | 836 +++++++++++---------- + fs/afs/dir_edit.c | 385 ++++++---- + fs/afs/dir_search.c | 227 ++++++ + fs/afs/file.c | 258 ++++--- + fs/afs/fs_operation.c | 113 ++- + fs/afs/fsclient.c | 62 +- + fs/afs/inode.c | 140 +++- + fs/afs/internal.h | 143 +++- + fs/afs/main.c | 2 +- + fs/afs/mntpt.c | 22 +- + fs/afs/rotate.c | 4 +- + fs/afs/rxrpc.c | 37 +- + fs/afs/super.c | 4 +- + fs/afs/validation.c | 31 +- + fs/afs/vlclient.c | 1 + + fs/afs/write.c | 16 +- + fs/afs/xdr_fs.h | 2 +- + fs/afs/yfsclient.c | 49 +- + fs/bcachefs/Kconfig | 1 + + fs/bcachefs/acl.c | 11 +- + fs/bcachefs/alloc_background.c | 369 ++++----- + fs/bcachefs/alloc_background.h | 2 + + fs/bcachefs/alloc_foreground.c | 154 +--- + fs/bcachefs/backpointers.c | 440 +++++------ + fs/bcachefs/backpointers.h | 82 +- + fs/bcachefs/bbpos.h | 2 +- + fs/bcachefs/bcachefs.h | 44 +- + fs/bcachefs/bcachefs_format.h | 15 +- + fs/bcachefs/btree_cache.c | 43 +- + fs/bcachefs/btree_cache.h | 3 +- + fs/bcachefs/btree_gc.c | 141 +--- + fs/bcachefs/btree_io.c | 13 +- + fs/bcachefs/btree_iter.c | 519 ++++++++----- + fs/bcachefs/btree_iter.h | 105 +-- + fs/bcachefs/btree_journal_iter.c | 237 +++++- + fs/bcachefs/btree_journal_iter.h | 22 +- + fs/bcachefs/btree_journal_iter_types.h | 36 + + fs/bcachefs/btree_key_cache.c | 13 +- + fs/bcachefs/btree_locking.h | 2 +- + fs/bcachefs/btree_node_scan.c | 10 +- + fs/bcachefs/btree_trans_commit.c | 79 +- + fs/bcachefs/btree_types.h | 3 + + fs/bcachefs/btree_update.c | 59 +- + fs/bcachefs/btree_update.h | 28 +- + fs/bcachefs/btree_update_interior.c | 73 +- + fs/bcachefs/btree_update_interior.h | 2 +- + fs/bcachefs/btree_write_buffer.c | 73 +- + fs/bcachefs/buckets.c | 51 +- + fs/bcachefs/buckets_types.h | 2 +- + fs/bcachefs/chardev.c | 219 +----- + fs/bcachefs/checksum.h | 2 +- + fs/bcachefs/compress.c | 96 ++- + fs/bcachefs/data_update.c | 67 +- + fs/bcachefs/debug.c | 4 +- + fs/bcachefs/dirent.c | 4 +- + fs/bcachefs/disk_accounting.c | 13 +- + fs/bcachefs/disk_accounting.h | 38 + + fs/bcachefs/ec.c | 253 ++++--- + fs/bcachefs/errcode.h | 9 +- + fs/bcachefs/error.c | 28 +- + fs/bcachefs/error.h | 38 +- + fs/bcachefs/extent_update.c | 4 +- + fs/bcachefs/extents.c | 239 ++---- + fs/bcachefs/extents.h | 9 - + fs/bcachefs/extents_format.h | 15 +- + fs/bcachefs/fs-io-buffered.c | 26 +- + fs/bcachefs/fs-io-direct.c | 5 + + fs/bcachefs/fs-io-pagecache.c | 4 +- + fs/bcachefs/fs-io.c | 10 +- + fs/bcachefs/fs-ioctl.c | 7 +- + fs/bcachefs/fs.c | 42 +- + fs/bcachefs/fsck.c | 260 ++++++- + fs/bcachefs/fsck.h | 3 + + fs/bcachefs/inode.c | 21 +- + fs/bcachefs/inode.h | 10 +- + fs/bcachefs/io_misc.c | 10 +- + fs/bcachefs/io_read.c | 55 +- + fs/bcachefs/io_read.h | 28 +- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal.c | 98 ++- + fs/bcachefs/journal.h | 5 +- + fs/bcachefs/journal_io.c | 10 +- + fs/bcachefs/journal_reclaim.c | 6 +- + fs/bcachefs/journal_types.h | 2 + + fs/bcachefs/lru.c | 2 +- + fs/bcachefs/move.c | 125 +-- + fs/bcachefs/move.h | 5 +- + fs/bcachefs/movinggc.c | 6 +- + fs/bcachefs/opts.c | 26 +- + fs/bcachefs/opts.h | 51 +- + fs/bcachefs/rcu_pending.c | 2 + + fs/bcachefs/rebalance.c | 266 ++++++- + fs/bcachefs/rebalance.h | 10 + + fs/bcachefs/rebalance_format.h | 53 ++ + fs/bcachefs/rebalance_types.h | 2 - + fs/bcachefs/recovery.c | 103 ++- + fs/bcachefs/recovery.h | 2 +- + fs/bcachefs/recovery_passes.c | 92 ++- + fs/bcachefs/recovery_passes.h | 1 + + fs/bcachefs/reflink.c | 478 +++++++++--- + fs/bcachefs/reflink.h | 7 + + fs/bcachefs/reflink_format.h | 5 +- + fs/bcachefs/sb-errors_format.h | 10 +- + fs/bcachefs/snapshot.c | 42 +- + fs/bcachefs/str_hash.h | 6 +- + fs/bcachefs/subvolume.c | 2 +- + fs/bcachefs/subvolume.h | 12 +- + fs/bcachefs/super-io.c | 10 +- + fs/bcachefs/super-io.h | 2 + + fs/bcachefs/super.c | 27 +- + fs/bcachefs/super.h | 10 - + fs/bcachefs/sysfs.c | 46 +- + fs/bcachefs/tests.c | 26 +- + fs/bcachefs/trace.h | 10 +- + fs/bcachefs/xattr.c | 11 +- + fs/bcachefs/xattr.h | 2 +- + fs/cachefiles/io.c | 4 + + fs/cachefiles/xattr.c | 9 +- + fs/ceph/addr.c | 15 +- + fs/ceph/caps.c | 63 +- + fs/ceph/crypto.h | 2 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 4 +- + fs/ceph/export.c | 12 +- + fs/ceph/inode.c | 2 +- + fs/ceph/mds_client.c | 27 +- + fs/ceph/mds_client.h | 2 - + fs/ceph/super.c | 12 +- + fs/ceph/super.h | 3 +- + fs/ceph/xattr.c | 2 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/ecryptfs/main.c | 399 +++++----- + fs/exfat/dir.c | 29 +- + fs/exfat/exfat_fs.h | 6 + + fs/exfat/file.c | 10 + + fs/exfat/inode.c | 2 +- + fs/exfat/namei.c | 194 +++-- + fs/exportfs/expfs.c | 17 +- + fs/f2fs/acl.c | 5 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 114 ++- + fs/f2fs/debug.c | 111 ++- + fs/f2fs/extent_cache.c | 119 ++- + fs/f2fs/f2fs.h | 38 +- + fs/f2fs/file.c | 71 +- + fs/f2fs/gc.c | 19 +- + fs/f2fs/gc.h | 1 + + fs/f2fs/inode.c | 23 +- + fs/f2fs/node.c | 28 +- + fs/f2fs/recovery.c | 9 +- + fs/f2fs/segment.c | 161 ++-- + fs/f2fs/segment.h | 72 +- + fs/f2fs/super.c | 101 ++- + fs/f2fs/sysfs.c | 16 +- + fs/fhandle.c | 75 +- + fs/fs_parser.c | 3 +- + fs/fuse/Makefile | 1 + + fs/fuse/cuse.c | 29 +- + fs/fuse/dax.c | 11 - + fs/fuse/dev.c | 66 +- + fs/fuse/dir.c | 37 +- + fs/fuse/file.c | 451 ++++++----- + fs/fuse/fuse_i.h | 68 +- + fs/fuse/inode.c | 67 +- + fs/fuse/ioctl.c | 35 +- + fs/fuse/readdir.c | 33 +- + fs/fuse/sysctl.c | 40 + + fs/fuse/virtio_fs.c | 77 +- + fs/gfs2/glock.c | 107 +-- + fs/gfs2/glock.h | 7 + + fs/gfs2/glops.c | 11 +- + fs/gfs2/incore.h | 4 +- + fs/gfs2/inode.c | 1 + + fs/gfs2/inode.h | 2 - + fs/gfs2/lock_dlm.c | 29 +- + fs/gfs2/rgrp.c | 6 +- + fs/gfs2/super.c | 89 ++- + fs/jffs2/compr_rtime.c | 3 + + fs/jffs2/compr_rubin.c | 5 - + fs/jffs2/erase.c | 7 +- + fs/jffs2/gc.c | 2 +- + fs/jffs2/nodemgmt.c | 17 +- + fs/jffs2/readinode.c | 2 +- + fs/lockd/clntxdr.c | 5 +- + fs/lockd/svc4proc.c | 20 +- + fs/lockd/svclock.c | 2 +- + fs/lockd/svcproc.c | 15 +- + fs/lockd/xdr4.c | 2 - + fs/netfs/Makefile | 5 +- + fs/netfs/buffered_read.c | 266 +++---- + fs/netfs/direct_read.c | 80 +- + fs/netfs/direct_write.c | 10 +- + fs/netfs/internal.h | 36 +- + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 155 ++-- + fs/netfs/objects.c | 21 +- + fs/netfs/read_collect.c | 708 +++++++++-------- + fs/netfs/read_pgpriv2.c | 35 +- + fs/netfs/read_retry.c | 211 +++--- + fs/netfs/read_single.c | 195 +++++ + fs/netfs/rolling_buffer.c | 225 ++++++ + fs/netfs/stats.c | 4 +- + fs/netfs/write_collect.c | 278 ++----- + fs/netfs/write_issue.c | 239 +++++- + fs/netfs/write_retry.c | 233 ++++++ + fs/nfs/blocklayout/blocklayout.c | 15 +- + fs/nfs/blocklayout/dev.c | 6 +- + fs/nfs/client.c | 76 +- + fs/nfs/direct.c | 21 +- + fs/nfs/file.c | 14 +- + fs/nfs/fs_context.c | 6 +- + fs/nfs/fscache.c | 6 +- + fs/nfs/fscache.h | 3 +- + fs/nfs/internal.h | 9 +- + fs/nfs/io.c | 44 +- + fs/nfs/localio.c | 96 ++- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs.h | 4 +- + fs/nfs/nfs4proc.c | 8 +- + fs/nfs/nfs4state.c | 10 +- + fs/nfs/nfs4super.c | 1 + + fs/nfs/write.c | 55 +- + fs/nfs_common/nfslocalio.c | 8 +- + fs/nfsd/export.c | 57 +- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 19 +- + fs/nfsd/filecache.h | 2 +- + fs/nfsd/lockd.c | 13 +- + fs/nfsd/nfs4acl.c | 2 - + fs/nfsd/nfs4callback.c | 139 +++- + fs/nfsd/nfs4proc.c | 103 ++- + fs/nfsd/nfs4recover.c | 3 +- + fs/nfsd/nfs4state.c | 127 ++-- + fs/nfsd/nfs4xdr.c | 73 +- + fs/nfsd/nfsfh.c | 41 +- + fs/nfsd/nfsfh.h | 3 +- + fs/nfsd/state.h | 40 +- + fs/nfsd/trace.h | 29 +- + fs/nfsd/vfs.c | 26 +- + fs/nfsd/vfs.h | 6 +- + fs/nfsd/xdr4.h | 8 + + fs/ntfs3/attrib.c | 9 +- + fs/ntfs3/bitmap.c | 62 +- + fs/ntfs3/file.c | 34 +- + fs/ntfs3/frecord.c | 104 +-- + fs/ntfs3/fsntfs.c | 2 +- + fs/ntfs3/ntfs_fs.h | 3 +- + fs/ntfs3/record.c | 16 +- + fs/ntfs3/run.c | 40 +- + fs/smb/client/cached_dir.c | 168 ++++- + fs/smb/client/cached_dir.h | 6 +- + fs/smb/client/cifsfs.c | 12 +- + fs/smb/client/cifsfs.h | 4 +- + fs/smb/client/cifsglob.h | 4 +- + fs/smb/client/cifsproto.h | 1 + + fs/smb/client/cifssmb.c | 12 +- + fs/smb/client/connect.c | 59 +- + fs/smb/client/file.c | 3 +- + fs/smb/client/fs_context.c | 85 ++- + fs/smb/client/fs_context.h | 1 + + fs/smb/client/inode.c | 4 +- + fs/smb/client/reparse.c | 157 +++- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/sess.c | 5 +- + fs/smb/client/smb1ops.c | 4 +- + fs/smb/client/smb2file.c | 21 +- + fs/smb/client/smb2inode.c | 6 +- + fs/smb/client/smb2ops.c | 2 +- + fs/smb/client/smb2pdu.c | 18 +- + fs/smb/client/smb2proto.h | 9 +- + fs/smb/client/trace.h | 3 + + fs/smb/common/smb2pdu.h | 9 + + fs/smb/server/asn1.c | 6 +- + fs/smb/server/auth.c | 19 +- + fs/smb/server/connection.c | 7 +- + fs/smb/server/crypto_ctx.c | 6 +- + fs/smb/server/glob.h | 2 + + fs/smb/server/ksmbd_work.c | 10 +- + fs/smb/server/mgmt/ksmbd_ida.c | 11 +- + fs/smb/server/mgmt/share_config.c | 10 +- + fs/smb/server/mgmt/tree_connect.c | 5 +- + fs/smb/server/mgmt/user_config.c | 8 +- + fs/smb/server/mgmt/user_session.c | 10 +- + fs/smb/server/misc.c | 11 +- + fs/smb/server/ndr.c | 10 +- + fs/smb/server/oplock.c | 12 +- + fs/smb/server/server.c | 8 +- + fs/smb/server/smb2pdu.c | 76 +- + fs/smb/server/smb_common.c | 4 +- + fs/smb/server/smbacl.c | 23 +- + fs/smb/server/transport_ipc.c | 6 +- + fs/smb/server/transport_rdma.c | 13 +- + fs/smb/server/transport_tcp.c | 18 +- + fs/smb/server/unicode.c | 4 +- + fs/smb/server/vfs.c | 12 +- + fs/smb/server/vfs_cache.c | 10 +- + fs/ubifs/ioctl.c | 6 - + fs/ubifs/journal.c | 13 +- + fs/ubifs/lpt_commit.c | 4 +- + fs/ubifs/orphan.c | 2 +- + fs/ubifs/super.c | 8 +- + fs/ubifs/tnc.c | 2 - + fs/ubifs/tnc_commit.c | 2 + + fs/ubifs/ubifs.h | 3 - + fs/ubifs/xattr.c | 45 +- + fs/xfs/libxfs/xfs_ialloc.c | 16 +- + fs/xfs/libxfs/xfs_sb.c | 7 - + fs/xfs/xfs_attr_list.c | 3 +- + fs/xfs/xfs_log.c | 11 + + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_qm_syscalls.c | 13 - + include/linux/ceph/ceph_fs.h | 4 +- + include/linux/ceph/libceph.h | 6 - + include/linux/ceph/osd_client.h | 2 - + include/linux/ceph/pagelist.h | 12 - + include/linux/exportfs.h | 13 + + include/linux/f2fs_fs.h | 7 +- + include/linux/folio_queue.h | 12 +- + include/linux/fs_parser.h | 2 + + include/linux/lockd/lockd.h | 6 +- + include/linux/lockd/xdr.h | 2 - + include/linux/mm.h | 1 + + include/linux/netfs.h | 55 +- + include/linux/nfs_xdr.h | 2 +- + include/linux/nfslocalio.h | 18 +- + include/linux/rolling_buffer.h | 61 ++ + include/linux/sunrpc/xdr.h | 21 + + include/linux/sunrpc/xdrgen/_defs.h | 9 + + include/trace/events/afs.h | 210 +++++- + include/trace/events/cachefiles.h | 13 +- + include/trace/events/netfs.h | 96 +-- + include/trace/events/sunrpc.h | 4 +- + include/uapi/linux/f2fs.h | 1 + + include/uapi/linux/fcntl.h | 1 + + kernel/gen_kheaders.sh | 1 + + lib/kunit_iov_iter.c | 4 +- + mm/folio-compat.c | 6 + + mm/page-writeback.c | 22 +- + net/9p/Kconfig | 4 +- + net/9p/trans_usbg.c | 4 +- + net/9p/trans_xen.c | 9 +- + net/ceph/crypto.c | 12 - + net/ceph/crypto.h | 1 - + net/ceph/osd_client.c | 34 - + net/ceph/pagelist.c | 38 - + net/ceph/pagevec.c | 52 -- + net/sunrpc/cache.c | 4 +- + net/sunrpc/svcsock.c | 4 + + net/sunrpc/xprtrdma/svc_rdma.c | 19 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 8 +- + net/sunrpc/xprtsock.c | 18 +- + rust/helpers/helpers.c | 1 + + rust/helpers/pid_namespace.c | 26 + + rust/kernel/lib.rs | 1 + + rust/kernel/pid_namespace.rs | 68 ++ + rust/kernel/task.rs | 135 +++- + tools/net/sunrpc/extract.sh | 11 + + tools/net/sunrpc/xdrgen/README | 17 + + tools/net/sunrpc/xdrgen/generators/__init__.py | 4 + + tools/net/sunrpc/xdrgen/generators/enum.py | 30 +- + tools/net/sunrpc/xdrgen/generators/pointer.py | 26 +- + tools/net/sunrpc/xdrgen/generators/struct.py | 26 +- + tools/net/sunrpc/xdrgen/generators/typedef.py | 28 +- + tools/net/sunrpc/xdrgen/generators/union.py | 52 +- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 6 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 24 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 3 +- + .../xdrgen/templates/C/enum/declaration/close.j2 | 4 - + .../xdrgen/templates/C/enum/declaration/enum.j2 | 4 + + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 2 +- + .../xdrgen/templates/C/enum/decoder/enum_be.j2 | 14 + + .../xdrgen/templates/C/enum/definition/close.j2 | 1 + + .../xdrgen/templates/C/enum/definition/close_be.j2 | 3 + + .../sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 | 2 +- + .../xdrgen/templates/C/enum/encoder/enum_be.j2 | 14 + + .../sunrpc/xdrgen/templates/C/enum/maxsize/enum.j2 | 2 + + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/pointer/maxsize/pointer.j2 | 3 + + .../xdrgen/templates/C/program/decoder/result.j2 | 4 - + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 9 +- + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/struct/maxsize/struct.j2 | 3 + + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../{variable_length_string.j2 => string.j2} | 0 + .../xdrgen/templates/C/typedef/maxsize/basic.j2 | 3 + + .../C/typedef/maxsize/fixed_length_opaque.j2 | 2 + + .../xdrgen/templates/C/typedef/maxsize/string.j2 | 2 + + .../C/typedef/maxsize/variable_length_array.j2 | 2 + + .../C/typedef/maxsize/variable_length_opaque.j2 | 2 + + .../templates/C/union/decoder/case_spec_be.j2 | 2 + + .../{variable_length_string.j2 => string.j2} | 0 + .../templates/C/union/encoder/case_spec_be.j2 | 2 + + .../xdrgen/templates/C/union/maxsize/union.j2 | 3 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 311 +++++++- + tools/net/sunrpc/xdrgen/xdrgen | 4 +- + 419 files changed, 11226 insertions(+), 6806 deletions(-) + create mode 100644 fs/afs/dir_search.c + create mode 100644 fs/bcachefs/btree_journal_iter_types.h + create mode 100644 fs/bcachefs/rebalance_format.h + create mode 100644 fs/fuse/sysctl.c + create mode 100644 fs/netfs/read_single.c + create mode 100644 fs/netfs/rolling_buffer.c + create mode 100644 fs/netfs/write_retry.c + create mode 100644 include/linux/rolling_buffer.h + create mode 100644 rust/helpers/pid_namespace.c + create mode 100644 rust/kernel/pid_namespace.rs + create mode 100755 tools/net/sunrpc/extract.sh + delete mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/close_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/maxsize/enum.j2 + rename tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/pointer/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/maxsize/pointer.j2 + rename tools/net/sunrpc/xdrgen/templates/C/struct/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/struct/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/struct/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/maxsize/struct.j2 + rename tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/definition/{variable_length_string.j2 => string.j2} (100%) + rename tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec_be.j2 + rename tools/net/sunrpc/xdrgen/templates/C/union/decoder/{variable_length_string.j2 => string.j2} (100%) + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec_be.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/maxsize/union.j2 +Merging printk/for-next (4022ef25504d Merge branch 'for-6.13-force-console' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (10099266dec8 Merge branch 'pci/typos') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging arch/s390/pci/pci_bus.c +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merging drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c +CONFLICT (content): Merge conflict in drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/thermal/Makefile +Auto-merging include/linux/pci.h +Auto-merging tools/testing/selftests/Makefile +Resolved 'drivers/pci/probe.c' using previous resolution. +Resolved 'drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master efa7de8815c2] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 11 + + Documentation/PCI/endpoint/pci-endpoint.rst | 29 ++ + Documentation/PCI/index.rst | 1 + + Documentation/PCI/pciebus-howto.rst | 14 +- + Documentation/PCI/tph.rst | 132 +++++ + Documentation/admin-guide/kernel-parameters.txt | 4 + + .../bindings/pci/mediatek-pcie-gen3.yaml | 5 +- + .../bindings/pci/microchip,pcie-host.yaml | 11 +- + .../bindings/pci/plda,xpressrich3-axi-common.yaml | 14 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 4 + + .../devicetree/bindings/pci/qcom,pcie-sm8450.yaml | 4 - + .../devicetree/bindings/pci/qcom,pcie-sm8550.yaml | 4 +- + .../bindings/pci/qcom,pcie-x1e80100.yaml | 9 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 50 ++ + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 1 - + .../bindings/pci/starfive,jh7110-pcie.yaml | 7 + + Documentation/driver-api/driver-model/devres.rst | 1 - + Documentation/driver-api/pci/pci.rst | 3 + + MAINTAINERS | 19 +- + arch/s390/pci/pci_bus.c | 2 +- + arch/x86/pci/acpi.c | 119 +++++ + arch/x86/pci/fixup.c | 2 +- + drivers/ata/acard-ahci.c | 6 +- + drivers/ata/ahci.c | 6 +- + drivers/crypto/intel/qat/qat_420xx/adf_drv.c | 11 +- + drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 11 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 14 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 13 +- + drivers/fpga/dfl-pci.c | 16 +- + drivers/gpio/gpio-merrifield.c | 15 +- + drivers/hwtracing/intel_th/pci.c | 9 +- + drivers/net/ethernet/cavium/common/cavium_ptp.c | 7 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 13 +- + drivers/pci/Kconfig | 11 +- + drivers/pci/Makefile | 3 +- + drivers/pci/bus.c | 134 +++-- + drivers/pci/controller/cadence/pci-j721e.c | 39 +- + drivers/pci/controller/cadence/pcie-cadence.c | 4 +- + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 57 ++- + drivers/pci/controller/dwc/pci-keystone.c | 14 +- + drivers/pci/controller/dwc/pcie-bt1.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 38 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 4 +- + drivers/pci/controller/dwc/pcie-histb.c | 2 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 2 +- + drivers/pci/controller/dwc/pcie-kirin.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 8 +- + drivers/pci/controller/dwc/pcie-qcom.c | 19 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 +- + drivers/pci/controller/pci-aardvark.c | 2 +- + drivers/pci/controller/pci-host-generic.c | 2 +- + drivers/pci/controller/pci-mvebu.c | 2 +- + drivers/pci/controller/pci-tegra.c | 4 +- + drivers/pci/controller/pci-thunder-pem.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 2 +- + drivers/pci/controller/pcie-altera-msi.c | 2 +- + drivers/pci/controller/pcie-altera.c | 6 +- + drivers/pci/controller/pcie-brcmstb.c | 2 +- + drivers/pci/controller/pcie-hisi-error.c | 2 +- + drivers/pci/controller/pcie-iproc-platform.c | 2 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 77 ++- + drivers/pci/controller/pcie-mediatek.c | 2 +- + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 4 +- + drivers/pci/controller/pcie-rockchip-ep.c | 440 +++++++++++++---- + drivers/pci/controller/pcie-rockchip-host.c | 6 +- + drivers/pci/controller/pcie-rockchip.c | 21 +- + drivers/pci/controller/pcie-rockchip.h | 24 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- + drivers/pci/controller/plda/pcie-microchip-host.c | 126 ++--- + drivers/pci/controller/plda/pcie-starfive.c | 12 +- + drivers/pci/controller/vmd.c | 17 +- + drivers/pci/devres.c | 67 +-- + drivers/pci/doe.c | 14 +- + drivers/pci/ecam.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 6 + + drivers/pci/endpoint/functions/pci-epf-test.c | 380 +++++++------- + drivers/pci/endpoint/pci-epc-core.c | 193 ++++++-- + drivers/pci/endpoint/pci-epc-mem.c | 9 +- + drivers/pci/hotplug/Kconfig | 10 + + drivers/pci/hotplug/Makefile | 1 + + drivers/pci/hotplug/acpiphp_ampere_altra.c | 2 +- + drivers/pci/hotplug/cpci_hotplug.h | 1 - + drivers/pci/hotplug/cpqphp_pci.c | 47 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 1 - + drivers/pci/hotplug/octep_hp.c | 427 ++++++++++++++++ + drivers/pci/hotplug/pci_hotplug_core.c | 8 +- + drivers/pci/hotplug/pciehp_ctrl.c | 5 + + drivers/pci/hotplug/pciehp_hpc.c | 2 +- + drivers/pci/iov.c | 6 +- + drivers/pci/of.c | 27 + + drivers/pci/of_property.c | 2 +- + drivers/pci/pci-sysfs.c | 26 + + drivers/pci/pci.c | 98 ++-- + drivers/pci/pci.h | 79 ++- + drivers/pci/pcie/Makefile | 2 +- + drivers/pci/pcie/aer.c | 15 +- + drivers/pci/pcie/aspm.c | 100 ++-- + drivers/pci/pcie/bwctrl.c | 366 ++++++++++++++ + drivers/pci/pcie/portdrv.c | 9 +- + drivers/pci/pcie/portdrv.h | 6 +- + drivers/pci/probe.c | 77 ++- + drivers/pci/pwrctl/Makefile | 6 - + drivers/pci/pwrctl/core.c | 157 ------ + drivers/pci/{pwrctl => pwrctrl}/Kconfig | 0 + drivers/pci/pwrctrl/Makefile | 6 + + drivers/pci/pwrctrl/core.c | 148 ++++++ + .../pci-pwrctrl-pwrseq.c} | 50 +- + drivers/pci/quirks.c | 70 +-- + drivers/pci/remove.c | 32 +- + drivers/pci/setup-bus.c | 41 +- + drivers/pci/setup-res.c | 7 +- + drivers/pci/slot.c | 24 +- + drivers/pci/tph.c | 547 +++++++++++++++++++++ + drivers/thermal/Kconfig | 9 + + drivers/thermal/Makefile | 2 + + drivers/thermal/pcie_cooling.c | 80 +++ + drivers/tty/serial/rp2.c | 12 +- + include/linux/ioport.h | 32 ++ + include/linux/pci-bwctrl.h | 28 ++ + include/linux/pci-epc.h | 38 ++ + include/linux/{pci-pwrctl.h => pci-pwrctrl.h} | 22 +- + include/linux/pci-tph.h | 44 ++ + include/linux/pci.h | 66 +-- + include/uapi/linux/pci_regs.h | 38 +- + sound/pci/korg1212/korg1212.c | 6 +- + tools/pci/pcitest.c | 10 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/pcie_bwctrl/Makefile | 2 + + .../pcie_bwctrl/set_pcie_cooling_state.sh | 122 +++++ + .../selftests/pcie_bwctrl/set_pcie_speed.sh | 67 +++ + 134 files changed, 4181 insertions(+), 1172 deletions(-) + create mode 100644 Documentation/PCI/tph.rst + create mode 100644 drivers/pci/hotplug/octep_hp.c + create mode 100644 drivers/pci/pcie/bwctrl.c + delete mode 100644 drivers/pci/pwrctl/Makefile + delete mode 100644 drivers/pci/pwrctl/core.c + rename drivers/pci/{pwrctl => pwrctrl}/Kconfig (100%) + create mode 100644 drivers/pci/pwrctrl/Makefile + create mode 100644 drivers/pci/pwrctrl/core.c + rename drivers/pci/{pwrctl/pci-pwrctl-pwrseq.c => pwrctrl/pci-pwrctrl-pwrseq.c} (65%) + create mode 100644 drivers/pci/tph.c + create mode 100644 drivers/thermal/pcie_cooling.c + create mode 100644 include/linux/pci-bwctrl.h + rename include/linux/{pci-pwrctl.h => pci-pwrctrl.h} (69%) + create mode 100644 include/linux/pci-tph.h + create mode 100644 tools/testing/selftests/pcie_bwctrl/Makefile + create mode 100755 tools/testing/selftests/pcie_bwctrl/set_pcie_cooling_state.sh + create mode 100755 tools/testing/selftests/pcie_bwctrl/set_pcie_speed.sh +Merging pstore/for-next/pstore (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (3be025406a0e Merge branch 'for-6.13/goodix' 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 (f81ffa69edb9 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + + .../bindings/i2c/snps,designware-i2c.yaml | 18 ++ + .../devicetree/bindings/i2c/st,nomadik-i2c.yaml | 13 +- + drivers/i2c/busses/i2c-designware-common.c | 5 + + drivers/i2c/busses/i2c-designware-core.h | 6 + + drivers/i2c/busses/i2c-designware-master.c | 23 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 1 + + drivers/i2c/busses/i2c-nomadik.c | 89 ++++--- + drivers/i2c/busses/i2c-qup.c | 4 +- + drivers/i2c/busses/i2c-xiic.c | 289 +++++++++++++++++---- + 10 files changed, 349 insertions(+), 100 deletions(-) +Merging i2c-host/i2c/i2c-host (68e7aa7ae92f MAINTAINERS: transfer i2c-aspeed maintainership from Brendan to Ryan) +$ 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 (6cf7b65f7029 i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 100 +++++++++++++++++------- + drivers/i3c/master/dw-i3c-master.c | 34 +++++++++ + drivers/i3c/master/dw-i3c-master.h | 1 + + drivers/i3c/master/mipi-i3c-hci/core.c | 19 ++--- + drivers/i3c/master/mipi-i3c-hci/dma.c | 10 +-- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + drivers/i3c/master/mipi-i3c-hci/pio.c | 2 +- + drivers/i3c/master/svc-i3c-master.c | 136 ++++++++++++++++++++++++--------- + include/linux/i3c/master.h | 10 ++- + 9 files changed, 225 insertions(+), 89 deletions(-) +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of 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 (3996187f80a0 hwmon: (pmbus/isl68137) add support for voltage divider on Vout) +$ 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 (83a474c11e8c docs: Add debugging guide for the media subsystem) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/index.rst | 5 + + Documentation/core-api/gfp_mask-from-fs-io.rst | 20 +- + Documentation/doc-guide/kernel-doc.rst | 1 + + Documentation/driver-api/pwrseq.rst | 8 +- + Documentation/filesystems/autofs.rst | 2 +- + Documentation/filesystems/dlmfs.rst | 2 +- + Documentation/filesystems/fsverity.rst | 2 +- + Documentation/filesystems/path-lookup.rst | 2 +- + Documentation/filesystems/path-lookup.txt | 2 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 2 +- + Documentation/kernel-hacking/hacking.rst | 2 +- + .../driver_development_debugging_guide.rst | 223 ++++++++++++++++ + Documentation/process/debugging/index.rst | 78 ++++++ + .../debugging/media_specific_debugging_guide.rst | 180 +++++++++++++ + .../debugging/userspace_debugging_guide.rst | 280 +++++++++++++++++++++ + Documentation/process/index.rst | 8 +- + Documentation/process/license-rules.rst | 18 +- + 17 files changed, 804 insertions(+), 31 deletions(-) + create mode 100644 Documentation/process/debugging/driver_development_debugging_guide.rst + create mode 100644 Documentation/process/debugging/index.rst + create mode 100644 Documentation/process/debugging/media_specific_debugging_guide.rst + create mode 100644 Documentation/process/debugging/userspace_debugging_guide.rst +Merging v4l-dvb/next (72ad4ff63804 docs: media: update location of the media patches) +$ 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 (7a3dfa39143c Merge branches 'acpi-misc' and 'acpi-x86' 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. + .../bindings/opp/operating-points-v2-ti-cpu.yaml | 20 ++++++++++++- + drivers/acpi/arm64/init.c | 2 +- + drivers/acpi/bus.c | 5 ++-- + drivers/acpi/processor_idle.c | 12 ++++---- + drivers/acpi/riscv/init.c | 2 +- + drivers/acpi/x86/utils.c | 34 ++++++++++++++++------ + drivers/opp/opp.h | 2 -- + include/linux/acpi.h | 12 +------- + 8 files changed, 56 insertions(+), 33 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (b5e2058a7a60 cpufreq: fix using cpufreq-dt as module) +$ 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. + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 -- + drivers/cpufreq/scmi-cpufreq.c | 45 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 46 insertions(+), 3 deletions(-) +Merging cpupower/cpupower (47d7650b9cb1 cpupower: add checks for xgettext and msgfmt) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) +$ 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 (5812b95b7ff4 pmdomain: Merge branch fixes into next) +$ 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 (d78653dcd8bf opp: core: implement dev_pm_opp_get_bw) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging drivers/opp/core.c +Auto-merging include/linux/pm_opp.h +Merge made by the 'ort' strategy. + drivers/opp/core.c | 25 +++++++++++++++++++++++++ + include/linux/pm_opp.h | 7 +++++++ + 2 files changed, 32 insertions(+) +Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) +$ 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 (68b3bca2df00 RDMA/bnxt_re: Correct the sequence of device suspend) +$ 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 (fcc79e1714e8 Merge tag 'net-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (fc39fb56917b Merge tag 'jfs-6.13' of github.com:kleikamp/linux-shaggy) +$ 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 (a35672819f8d xfrm: Fix acquire state insertion.) +$ 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 (8ab3138a9b2d net/mlx5: Introduce data placement ordering bits) +$ 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 (38f83a57aa8e Merge branch 'virtio-net-support-af_xdp-zero-copy-tx') +$ 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 (544070db6c8b Merge branch 'mlx5-esw-qos-refactor-and-shampo-cleanup') +$ 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 (4ae007fdffc9 Bluetooth: MGMT: Fix possible deadlocks) +$ 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. + net/bluetooth/mgmt.c | 38 +++++++++++++++++++++++++++----------- + 1 file changed, 27 insertions(+), 11 deletions(-) +Merging wireless-next/for-next (a71c69f51d11 Merge branch 'net-dsa-microchip-add-lan9646-switch-support') +$ 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 (cdad73716057 wifi: ath12k: convert tasklet to BH workqueue for CE interrupts) +$ 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 wpan-next/master (aad4b41a3419 Documentation: ieee802154: fix grammar) +$ 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. + Documentation/networking/ieee802154.rst | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) +Merging wpan-staging/staging (aad4b41a3419 Documentation: ieee802154: fix grammar) +$ 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 (944477516bda Merge tag 'nand/for-6.13' 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 (af264e598905 mtd: spinand: Constify struct nand_ecc_engine_ops) +$ 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 (98d1fb94ce75 mtd: spi-nor: core: replace dummy buswidth from addr to data) +$ 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 (4223414efeae crypto: marvell/cesa - fix uninit value for struct mv_cesa_op_ctx) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (a163b8950778 Merge tag 'drm-xe-next-fixes-2024-11-15' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +Merging drm-exynos/for-linux-next (086ed1d51544 Merge tag 'exynos-drm-next-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (818956c76517 drm/rockchip: avoid 64-bit division) +$ 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/rockchip/dw_hdmi_qp-rockchip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging amdgpu/drm-next (979bfe291b5b Revert "drm/radeon: Delay Connector detecting when HPD singals is unstable") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 29 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 37 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 41 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +++- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 9 ++ + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 + + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 9 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 39 +++++-- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 ++ + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 7 +- + drivers/gpu/drm/amd/display/Kconfig | 15 +-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 ++ + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 15 +-- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 6 ++ + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 23 +++- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +-- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 8 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h | 1 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 24 ++++- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 7 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 6 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 13 ++- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 97 +++++++++++------ + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 2 + + .../include/asic_reg/nbio/nbio_7_11_0_sh_mask.h | 13 +++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 118 ++++++++++++++++++++- + .../drm/amd/pm/powerplay/smumgr/vega12_smumgr.c | 24 ++--- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 12 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 + + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 37 +++++-- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 12 ++- + drivers/gpu/drm/radeon/radeon_connectors.c | 10 -- + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- + 67 files changed, 628 insertions(+), 168 deletions(-) +Merging drm-intel/for-linux-next (376a33c4a0d8 drm/i915/hdcp: Fix when the first read and write are retried) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_hdcp.c | 32 +++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) +Merging drm-msm/msm-next (86313a9cd152 drm/msm/dpu: rework documentation comments) +$ 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 (86313a9cd152 drm/msm/dpu: rework documentation comments) +$ 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-xe/drm-xe-next (4fe70f664a10 drm/xe: Update xe2_graphics name string) +$ 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/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_bo_evict.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +Auto-merging drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +Auto-merging drivers/gpu/drm/xe/xe_guc_capture.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +CONFLICT (modify/delete): include/drm/intel/xe_pciids.h deleted in HEAD and modified in drm-xe/drm-xe-next. Version drm-xe/drm-xe-next of include/drm/intel/xe_pciids.h left in tree. +Resolved 'drivers/gpu/drm/xe/xe_exec_queue.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_ct.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/drm/intel/xe_pciids.h +rm 'include/drm/intel/xe_pciids.h' +$ git commit --no-edit -v -a +[master ddc445d8da73] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_devcoredump.rst | 14 + + drivers/gpu/drm/xe/Makefile | 4 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 20 ++ + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 38 +++ + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 14 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 12 +- + drivers/gpu/drm/xe/xe_assert.h | 8 +- + drivers/gpu/drm/xe/xe_bo.c | 58 ++-- + drivers/gpu/drm/xe/xe_bo.h | 32 ++- + drivers/gpu/drm/xe/xe_bo_evict.c | 14 +- + drivers/gpu/drm/xe/xe_bo_types.h | 5 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 67 +++-- + drivers/gpu/drm/xe/xe_devcoredump.h | 6 +- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 2 - + drivers/gpu/drm/xe/xe_device.c | 4 +- + drivers/gpu/drm/xe/xe_device_types.h | 49 ++-- + drivers/gpu/drm/xe/xe_drm_client.c | 80 ++++-- + drivers/gpu/drm/xe/xe_exec_queue.c | 7 + + drivers/gpu/drm/xe/xe_ggtt.c | 35 +-- + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 10 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 47 +++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 78 +++++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 27 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 63 +++++ + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 2 + + drivers/gpu/drm/xe/xe_gt_stats.h | 8 +- + drivers/gpu/drm/xe/xe_gt_stats_types.h | 15 ++ + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 13 +- + drivers/gpu/drm/xe/xe_gt_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc.c | 320 ++++++++++++++++++++++- + drivers/gpu/drm/xe/xe_guc_ads.c | 11 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 33 +-- + drivers/gpu/drm/xe/xe_guc_capture.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 28 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 1 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 2 + + drivers/gpu/drm/xe/xe_guc_submit.c | 148 ++++++----- + drivers/gpu/drm/xe/xe_guc_types.h | 10 + + drivers/gpu/drm/xe/xe_heci_gsc.c | 8 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 10 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 4 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 - + drivers/gpu/drm/xe/xe_irq.c | 8 +- + drivers/gpu/drm/xe/xe_lrc.c | 29 ++ + drivers/gpu/drm/xe/xe_lrc.h | 4 + + drivers/gpu/drm/xe/xe_macros.h | 12 +- + drivers/gpu/drm/xe/xe_memirq.c | 3 + + drivers/gpu/drm/xe/xe_module.c | 2 +- + drivers/gpu/drm/xe/xe_pci.c | 2 +- + drivers/gpu/drm/xe/xe_pm.c | 3 - + drivers/gpu/drm/xe/xe_pt.c | 3 + + drivers/gpu/drm/xe/xe_query.c | 1 + + drivers/gpu/drm/xe/xe_sriov.c | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 2 +- + drivers/gpu/drm/xe/xe_sriov_types.h | 17 ++ + drivers/gpu/drm/xe/xe_sriov_vf.c | 263 +++++++++++++++++++ + drivers/gpu/drm/xe/xe_sriov_vf.h | 14 + + drivers/gpu/drm/xe/xe_sync.c | 6 +- + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_trace_lrc.c | 9 + + drivers/gpu/drm/xe/xe_trace_lrc.h | 52 ++++ + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 51 +--- + drivers/gpu/drm/xe/xe_vm.c | 15 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + + 69 files changed, 1494 insertions(+), 345 deletions(-) + create mode 100644 Documentation/gpu/xe/xe_devcoredump.rst + create mode 100644 drivers/gpu/drm/xe/xe_gt_stats_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.h +$ git am -3 ../patches/0001-fix-up-for-drm-xe-ptl-Add-another-PTL-PCI-ID.patch +Applying: fix up for "drm/xe/ptl: Add another PTL PCI ID" +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/intel/pciids.h +$ git add -A . +$ git commit -v -a --amend +[master d98700a6477a] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel + Date: Tue Nov 26 12:23:32 2024 +1100 +Merging etnaviv/etnaviv/next (2c7ac7dd1b6c drm/etnaviv: etnaviv_cmdbuf.c: Drop the unneeded include of drm_mm.h) +$ 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 (8d7493133bfd fbdev: omapfb: Remove some deadcode) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 27 --------------------------- + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 3 --- + drivers/video/fbdev/sh7760fb.c | 3 +-- + 3 files changed, 1 insertion(+), 32 deletions(-) +Merging regmap/for-next (d1f4390dd28b regmap: provide regmap_assign_bits()) +$ 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 (5ebe792a5139 ALSA: hda/realtek: Fix Internal Speaker and Mic boost of Infinix Y4 Max) +$ 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 (4752e8cde834 tools/firewire: Fix several incorrect format specifiers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Merge made by the 'ort' strategy. + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core.h | 2 +- + drivers/firewire/ohci.c | 11 +++++------ + tools/firewire/decode-fcp.c | 2 +- + tools/firewire/nosy-dump.c | 6 +++--- + 5 files changed, 11 insertions(+), 12 deletions(-) +Merging sound-asoc/for-next (cbc86dd0a4fe ASoC: amd: yc: Add quirk for microphone on Lenovo Thinkpad T14s Gen 6 21M1CTO1WW) +$ 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 (2466b3120142 tests/module/gen_test_kallsyms.sh: use 0 value for variables) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging Makefile +Auto-merging kernel/module/main.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging scripts/module.lds.S +Merge made by the 'ort' strategy. + Makefile | 6 +- + kernel/module/internal.h | 7 +- + kernel/module/main.c | 707 ++++++++++++++++++-------- + lib/Kconfig.debug | 105 ++++ + lib/Makefile | 1 + + lib/tests/Makefile | 1 + + lib/tests/module/.gitignore | 4 + + lib/tests/module/Makefile | 15 + + lib/tests/module/gen_test_kallsyms.sh | 129 +++++ + scripts/export_report.pl | 186 ------- + scripts/module.lds.S | 9 +- + tools/testing/selftests/module/Makefile | 12 + + tools/testing/selftests/module/config | 3 + + tools/testing/selftests/module/find_symbol.sh | 81 +++ + 14 files changed, 854 insertions(+), 412 deletions(-) + create mode 100644 lib/tests/Makefile + create mode 100644 lib/tests/module/.gitignore + create mode 100644 lib/tests/module/Makefile + create mode 100755 lib/tests/module/gen_test_kallsyms.sh + delete mode 100755 scripts/export_report.pl + create mode 100644 tools/testing/selftests/module/Makefile + create mode 100644 tools/testing/selftests/module/config + create mode 100755 tools/testing/selftests/module/find_symbol.sh +Merging input/next (04337738629e Input: mpr121 - use devm_regulator_get_enable_read_voltage()) +$ 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 (7eb75c9e3b24 Merge branch 'for-6.13/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/bfq-cgroup.c | 1 + + block/bfq-iosched.c | 6 +- + block/blk-merge.c | 35 ++-------- + block/blk-mq.c | 14 ++-- + block/blk-settings.c | 141 ++++++++++++++++++++++++++++++++++++- + block/blk-sysfs.c | 6 +- + block/genhd.c | 9 +-- + drivers/block/loop.c | 30 ++++---- + drivers/block/ublk_drv.c | 2 +- + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 20 +++++- + drivers/md/raid10.c | 20 +++++- + drivers/nvme/host/core.c | 22 ++++-- + drivers/nvme/host/ioctl.c | 12 +++- + drivers/nvme/host/multipath.c | 21 ++++-- + drivers/nvme/host/nvme.h | 10 ++- + drivers/nvme/host/pci.c | 147 ++++++++++++++++++++++++++++++++++----- + drivers/nvme/host/pr.c | 126 ++++++++++++++++++++------------- + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/target/admin-cmd.c | 7 +- + include/linux/blkdev.h | 20 +++--- + include/linux/io_uring_types.h | 1 + + include/linux/nvme.h | 14 ++++ + include/uapi/linux/io_uring.h | 14 ---- + io_uring/io_uring.c | 57 ++++++++++----- + io_uring/io_uring.h | 9 ++- + io_uring/memmap.c | 2 +- + io_uring/nop.c | 6 +- + io_uring/register.c | 3 +- + rust/kernel/block/mq/gen_disk.rs | 2 +- + 30 files changed, 559 insertions(+), 203 deletions(-) +Merging device-mapper/for-next (a573e404cbf2 dm-verity: remove the unused "data_start" variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-thin.c +Auto-merging drivers/md/dm-vdo/slab-depot.c +Merge made by the 'ort' strategy. + drivers/md/dm-bio-prison-v1.c | 35 -------------- + drivers/md/dm-bio-prison-v1.h | 24 ---------- + drivers/md/dm-bufio.c | 25 ++++++++-- + drivers/md/dm-cache-background-tracker.c | 6 --- + drivers/md/dm-cache-background-tracker.h | 1 - + drivers/md/dm-cache-metadata.c | 33 ------------- + drivers/md/dm-cache-metadata.h | 3 -- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/dm-table.c | 5 -- + drivers/md/dm-thin.c | 1 + + drivers/md/dm-vdo/block-map.c | 2 - + drivers/md/dm-vdo/data-vio.c | 36 ++------------ + drivers/md/dm-vdo/data-vio.h | 5 -- + drivers/md/dm-vdo/dedupe.c | 9 ++-- + drivers/md/dm-vdo/encodings.c | 2 +- + drivers/md/dm-vdo/indexer/index-layout.c | 26 ---------- + drivers/md/dm-vdo/indexer/indexer.h | 4 -- + drivers/md/dm-vdo/int-map.c | 28 +++++------ + drivers/md/dm-vdo/io-submitter.c | 2 +- + drivers/md/dm-vdo/murmurhash3.c | 7 +-- + drivers/md/dm-vdo/packer.c | 3 +- + drivers/md/dm-vdo/physical-zone.c | 2 +- + drivers/md/dm-vdo/recovery-journal.c | 2 +- + drivers/md/dm-vdo/slab-depot.c | 9 ++-- + drivers/md/dm-vdo/vdo.c | 4 +- + drivers/md/dm-vdo/vio.c | 1 + + drivers/md/dm-verity-target.c | 6 +-- + drivers/md/dm-verity.h | 1 - + drivers/md/dm-zoned-metadata.c | 50 ------------------- + drivers/md/dm-zoned.h | 2 - + drivers/md/dm.c | 61 +++++++++++++++++++++--- + drivers/md/dm.h | 2 - + drivers/md/persistent-data/dm-space-map-common.c | 2 +- + 33 files changed, 115 insertions(+), 288 deletions(-) +Merging libata/for-next (e8a2389ea808 dt-bindings: ata: ahci-platform: add missing iommus property) +$ 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 (c0baf6ead75d mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (8ece9d248b85 dt-bindings: mfd: bd71828: Use charger resistor in mOhm instead of MOhm) +$ 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 (3adec6f907b6 MAINTAINERS: Use Daniel Thompson's korg address for Backlight work) +$ 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 (05d9044177c3 dt-bindings: power: reset: Convert mode-.* properties to array) +$ 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 +Auto-merging Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/power/supply/charger-manager.c +Auto-merging drivers/power/supply/rk817_charger.c +Merge made by the 'ort' strategy. + .../bindings/power/reset/nvmem-reboot-mode.yaml | 4 + + .../devicetree/bindings/power/reset/qcom,pon.yaml | 7 + + .../bindings/power/reset/reboot-mode.yaml | 4 +- + .../bindings/power/reset/syscon-reboot-mode.yaml | 4 + + .../bindings/power/reset/syscon-reboot.yaml | 11 +- + .../power/supply/qcom,pmi8998-charger.yaml | 1 - + .../bindings/power/supply/sc27xx-fg.yaml | 5 + + .../bindings/power/supply/ti,twl6030-charger.yaml | 48 ++ + drivers/acpi/battery.c | 3 +- + drivers/power/reset/at91-poweroff.c | 2 +- + drivers/power/reset/at91-reset.c | 2 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 2 +- + drivers/power/reset/keystone-reset.c | 2 - + drivers/power/reset/ltc2952-poweroff.c | 2 +- + drivers/power/reset/qnap-poweroff.c | 2 +- + drivers/power/reset/syscon-reboot.c | 3 +- + drivers/power/supply/88pm860x_battery.c | 4 +- + drivers/power/supply/Kconfig | 10 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500_bmdata.c | 4 +- + drivers/power/supply/ab8500_btemp.c | 4 +- + drivers/power/supply/ab8500_chargalg.c | 2 +- + drivers/power/supply/ab8500_charger.c | 2 +- + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/acer_a500_battery.c | 9 +- + drivers/power/supply/act8945a_charger.c | 2 +- + drivers/power/supply/adp5061.c | 2 +- + drivers/power/supply/axp20x_battery.c | 33 +- + drivers/power/supply/axp20x_usb_power.c | 33 +- + drivers/power/supply/bq27xxx_battery.c | 40 +- + drivers/power/supply/charger-manager.c | 4 +- + drivers/power/supply/cpcap-battery.c | 2 +- + drivers/power/supply/cpcap-charger.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 4 +- + drivers/power/supply/da9030_battery.c | 6 +- + drivers/power/supply/da9052-battery.c | 2 +- + drivers/power/supply/da9150-charger.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 4 +- + drivers/power/supply/ipaq_micro_battery.c | 2 +- + drivers/power/supply/isp1704_charger.c | 2 +- + drivers/power/supply/lenovo_yoga_c630_battery.c | 14 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max77650-charger.c | 2 +- + drivers/power/supply/max77693_charger.c | 2 +- + drivers/power/supply/max77976_charger.c | 3 +- + drivers/power/supply/max8925_power.c | 4 +- + drivers/power/supply/pcf50633-charger.c | 2 +- + drivers/power/supply/pmu_battery.c | 1 + + drivers/power/supply/power_supply.h | 22 +- + drivers/power/supply/power_supply_core.c | 87 +-- + drivers/power/supply/power_supply_hwmon.c | 1 + + drivers/power/supply/power_supply_sysfs.c | 12 +- + drivers/power/supply/qcom_battmgr.c | 2 +- + drivers/power/supply/qcom_pmi8998_charger.c | 2 +- + drivers/power/supply/qcom_smbb.c | 8 +- + drivers/power/supply/rk817_charger.c | 112 ++-- + drivers/power/supply/rt9471.c | 52 +- + drivers/power/supply/samsung-sdi-battery.c | 10 +- + drivers/power/supply/sc2731_charger.c | 2 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 12 +- + drivers/power/supply/tps65090-charger.c | 2 +- + drivers/power/supply/tps65217_charger.c | 2 +- + drivers/power/supply/twl4030_charger.c | 2 +- + drivers/power/supply/twl6030_charger.c | 581 +++++++++++++++++++++ + drivers/power/supply/wm831x_power.c | 2 +- + drivers/power/supply/wm8350_power.c | 2 +- + drivers/power/supply/wm97xx_battery.c | 2 +- + include/linux/power_supply.h | 35 +- + 69 files changed, 970 insertions(+), 292 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/ti,twl6030-charger.yaml + create mode 100644 drivers/power/supply/twl6030_charger.c +Merging regulator/for-next (831e9a7556ac Merge remote-tracking branch 'regulator/for-6.12' into regulator-linus) +$ 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 (0554c22185fb Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (1432b850e9f3 apparmor: lift new_profile declaration to remove C23 extension warning) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/include/secid.h +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/secid.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/apparmor.rst | 7 ++- + security/apparmor/apparmorfs.c | 1 + + security/apparmor/capability.c | 19 +++--- + security/apparmor/domain.c | 66 +++++++++----------- + security/apparmor/include/label.h | 28 --------- + security/apparmor/include/lib.h | 1 - + security/apparmor/include/match.h | 8 ++- + security/apparmor/include/perms.h | 3 - + security/apparmor/include/policy.h | 1 - + security/apparmor/include/secid.h | 1 - + security/apparmor/label.c | 33 ---------- + security/apparmor/lib.c | 84 ------------------------- + security/apparmor/match.c | 99 +++++++++++++++++++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 9 +-- + security/apparmor/policy_unpack.c | 5 +- + security/apparmor/policy_unpack_test.c | 6 ++ + security/apparmor/secid.c | 14 ----- + 18 files changed, 141 insertions(+), 246 deletions(-) +Merging integrity/next-integrity (08ae3e5f5fc8 integrity: Use static_assert() to check struct sizes) +$ 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 (d7b6918e22c7 selinux: Deprecate /sys/fs/selinux/user) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (2749749afa07 smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (adc218676eef Linux 6.12) +$ 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 (5578b4347bb5 tpm: atmel: Drop PPC64 specific MMIO setup) +$ 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 (4962ee045d8f watchdog: rti: of: honor timeout-sec property) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging MAINTAINERS +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/watchdog/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 2 +- + .../bindings/watchdog/airoha,en7581-wdt.yaml | 47 ++++ + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 14 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 3 + + Documentation/watchdog/watchdog-parameters.rst | 10 - + MAINTAINERS | 2 +- + drivers/watchdog/Kconfig | 17 +- + drivers/watchdog/Makefile | 2 +- + drivers/watchdog/acquirewdt.c | 2 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/airoha_wdt.c | 216 ++++++++++++++++ + drivers/watchdog/apple_wdt.c | 8 +- + drivers/watchdog/armada_37xx_wdt.c | 10 +- + drivers/watchdog/at91rm9200_wdt.c | 2 +- + drivers/watchdog/at91sam9_wdt.c | 2 +- + drivers/watchdog/ath79_wdt.c | 2 +- + drivers/watchdog/bcm2835_wdt.c | 2 +- + drivers/watchdog/bcm_kona_wdt.c | 2 +- + drivers/watchdog/cpu5wdt.c | 284 --------------------- + drivers/watchdog/cpwd.c | 2 +- + drivers/watchdog/da9055_wdt.c | 7 +- + drivers/watchdog/da9063_wdt.c | 19 +- + drivers/watchdog/dw_wdt.c | 2 +- + drivers/watchdog/gef_wdt.c | 2 +- + drivers/watchdog/geodewdt.c | 2 +- + drivers/watchdog/gxp-wdt.c | 4 +- + drivers/watchdog/iTCO_wdt.c | 25 +- + drivers/watchdog/ib700wdt.c | 2 +- + drivers/watchdog/ie6xx_wdt.c | 2 +- + drivers/watchdog/it87_wdt.c | 43 +++- + drivers/watchdog/lpc18xx_wdt.c | 2 +- + drivers/watchdog/mtk_wdt.c | 12 + + drivers/watchdog/mtx-1_wdt.c | 2 +- + drivers/watchdog/nic7018_wdt.c | 2 +- + drivers/watchdog/nv_tco.c | 2 +- + drivers/watchdog/octeon-wdt-main.c | 4 +- + drivers/watchdog/omap_wdt.c | 2 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd.c | 2 +- + drivers/watchdog/rc32434_wdt.c | 2 +- + drivers/watchdog/rdc321x_wdt.c | 2 +- + drivers/watchdog/renesas_wdt.c | 2 +- + drivers/watchdog/riowd.c | 2 +- + drivers/watchdog/rti_wdt.c | 9 +- + drivers/watchdog/rza_wdt.c | 7 +- + drivers/watchdog/rzg2l_wdt.c | 20 +- + drivers/watchdog/rzn1_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 45 +++- + drivers/watchdog/sa1100_wdt.c | 4 +- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/shwdt.c | 2 +- + drivers/watchdog/sl28cpld_wdt.c | 4 +- + drivers/watchdog/smsc37b787_wdt.c | 2 +- + drivers/watchdog/st_lpc_wdt.c | 2 +- + drivers/watchdog/starfive-wdt.c | 4 +- + drivers/watchdog/stm32_iwdg.c | 95 ++++++- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 2 +- + drivers/watchdog/txx9wdt.c | 2 +- + drivers/watchdog/watchdog_core.c | 26 +- + drivers/watchdog/xilinx_wwdt.c | 75 +++++- + drivers/watchdog/ziirave_wdt.c | 2 +- + include/linux/mfd/da9063/core.h | 1 + + 63 files changed, 661 insertions(+), 424 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml + create mode 100644 drivers/watchdog/airoha_wdt.c + delete mode 100644 drivers/watchdog/cpu5wdt.c +Merging iommu/next (42f0cbb2a253 Merge branches 'intel/vt-d', 'amd/amd-vi' and 'iommufd/arm-smmuv3-nested' 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 (89282beaf75d audit: Use str_yes_no() helper function) +$ 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 (28b513b5a683 Merge branch 'dt/linus' into dt/next) +$ 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 (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (7f9e19f207be mailbox: pcc: Check before sending MCTP PCC response ACK) +$ 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 MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a0b3a563b407] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 13 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 13 +- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + .../bindings/mailbox/thead,th1520-mbox.yaml | 89 +++ + MAINTAINERS | 2 + + drivers/mailbox/Kconfig | 13 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/arm_mhuv2.c | 8 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 2 +- + drivers/mailbox/bcm-pdc-mailbox.c | 2 +- + drivers/mailbox/imx-mailbox.c | 6 +- + drivers/mailbox/mailbox-mpfs.c | 87 ++- + drivers/mailbox/mailbox-test.c | 4 +- + drivers/mailbox/mailbox-th1520.c | 597 +++++++++++++++++++++ + drivers/mailbox/mtk-cmdq-mailbox.c | 14 +- + drivers/mailbox/pcc.c | 61 ++- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 +- + drivers/mailbox/qcom-ipcc.c | 2 +- + drivers/mailbox/stm32-ipcc.c | 2 +- + drivers/mailbox/sun6i-msgbox.c | 4 +- + drivers/mailbox/tegra-hsp.c | 2 +- + drivers/mailbox/ti-msgmgr.c | 2 +- + drivers/mailbox/zynqmp-ipi-mailbox.c | 6 +- + include/acpi/pcc.h | 7 + + 24 files changed, 877 insertions(+), 65 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/thead,th1520-mbox.yaml + create mode 100644 drivers/mailbox/mailbox-th1520.c +Merging spi/for-next (df01c32d29f6 Merge remote-tracking branch 'spi/for-6.12' 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 (d319ed2d7105 Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/kernel/alternative.c +Auto-merging include/linux/mm_types.h +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_pai_crypto.c | 2 +- + arch/s390/kernel/perf_pai_ext.c | 2 +- + arch/x86/events/amd/core.c | 3 +-- + arch/x86/events/amd/ibs.c | 5 ++--- + arch/x86/events/core.c | 3 +-- + arch/x86/events/intel/ds.c | 9 +++------ + arch/x86/kernel/alternative.c | 10 +++++++--- + arch/x86/mm/tlb.c | 20 ++++++++++---------- + include/linux/mm_types.h | 1 + + include/linux/perf_event.h | 26 +++++++++++++++++++++----- + kernel/events/core.c | 35 ++++++++++++++++++----------------- + kernel/trace/bpf_trace.c | 11 ++++++----- + 13 files changed, 73 insertions(+), 56 deletions(-) +Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (21c093a1626a 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 +Merge made by the 'ort' strategy. +Merging ftrace/for-next (af24728406c3 Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging MAINTAINERS +Auto-merging rust/Makefile +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers/helpers.c +CONFLICT (content): Merge conflict in rust/helpers/helpers.c +Auto-merging rust/kernel/lib.rs +Auto-merging scripts/Makefile.build +Resolved 'rust/helpers/helpers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b250acb83aae] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/arm/include/asm/jump_label.h | 14 ++-- + arch/arm64/include/asm/jump_label.h | 20 ++++-- + arch/loongarch/include/asm/jump_label.h | 16 +++-- + arch/riscv/include/asm/jump_label.h | 50 ++++++++------- + arch/x86/include/asm/jump_label.h | 35 ++++------ + include/linux/tracepoint.h | 28 +++++++- + include/trace/define_trace.h | 12 ++++ + include/trace/events/rust_sample.h | 31 +++++++++ + rust/Makefile | 6 ++ + rust/bindings/bindings_helper.h | 3 + + rust/helpers/helpers.c | 1 + + rust/helpers/jump_label.c | 14 ++++ + rust/kernel/.gitignore | 3 + + rust/kernel/generated_arch_static_branch_asm.rs.S | 7 ++ + rust/kernel/jump_label.rs | 74 ++++++++++++++++++++++ + rust/kernel/lib.rs | 37 +++++++++++ + rust/kernel/tracepoint.rs | 49 ++++++++++++++ + samples/rust/Makefile | 3 + + samples/rust/rust_print_events.c | 8 +++ + samples/rust/{rust_print.rs => rust_print_main.rs} | 18 ++++++ + scripts/Makefile.build | 9 ++- + 22 files changed, 375 insertions(+), 64 deletions(-) + create mode 100644 include/trace/events/rust_sample.h + create mode 100644 rust/helpers/jump_label.c + create mode 100644 rust/kernel/.gitignore + create mode 100644 rust/kernel/generated_arch_static_branch_asm.rs.S + create mode 100644 rust/kernel/jump_label.rs + create mode 100644 rust/kernel/tracepoint.rs + create mode 100644 samples/rust/rust_print_events.c + rename samples/rust/{rust_print.rs => rust_print_main.rs} (85%) +Merging rcu/next (d8dfba2c606a Merge branches 'rcu/fixes', 'rcu/nocb', 'rcu/torture', 'rcu/stall' and 'rcu/srcu' into rcu/dev) +$ 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 (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' 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. + .../Documentation/herd-representation.txt | 49 ++++--- + tools/memory-model/README | 2 +- + tools/memory-model/linux-kernel.bell | 33 +++-- + tools/memory-model/linux-kernel.cat | 10 ++ + tools/memory-model/linux-kernel.cfg | 1 + + tools/memory-model/linux-kernel.def | 157 ++++++++++++--------- + 6 files changed, 155 insertions(+), 97 deletions(-) +Merging kvm/next (1508bae37044 Merge tag 'kvmarm-fixes-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Merge made by the 'ort' strategy. + arch/arm64/kvm/nested.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 62 +++++++++++++++++++++--------- + arch/arm64/kvm/vgic/vgic-debug.c | 5 ++- + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + arch/arm64/kvm/vgic/vgic-its.c | 77 ++++++++++++++++++++++++++------------ + arch/arm64/kvm/vgic/vgic-mmio-v2.c | 12 +++--- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 13 +++++-- + arch/arm64/kvm/vgic/vgic-mmio.c | 38 +++++++++---------- + arch/arm64/kvm/vgic/vgic-v2.c | 2 +- + arch/arm64/kvm/vgic/vgic-v3.c | 2 +- + arch/arm64/kvm/vgic/vgic-v4.c | 4 +- + arch/arm64/kvm/vgic/vgic.c | 43 +++++++++++++-------- + arch/arm64/kvm/vgic/vgic.h | 27 +------------ + include/kvm/arm_vgic.h | 1 - + 14 files changed, 172 insertions(+), 118 deletions(-) +Merging kvm-arm/next (60ad25e14ab5 KVM: arm64: Pass on SVE mapping failures) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (7a1f3143377a KVM: s390: selftests: Add regression tests for PFCR subfunctions) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (590d2f9347f7 KVM: PPC: Book3S HV: Fix kmv -> kvm typo) +$ 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 (c74bfe4ffe8c KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging Documentation/devicetree/bindings/riscv/extensions.yaml +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/csr.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/csr.h +Auto-merging arch/riscv/include/asm/hwcap.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/uapi/asm/kvm.h +CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/kvm.h +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging arch/riscv/kvm/vcpu_onereg.c +Auto-merging tools/testing/selftests/kvm/riscv/get-reg-list.c +Resolved 'arch/riscv/include/asm/csr.h' using previous resolution. +Resolved 'arch/riscv/include/asm/hwcap.h' using previous resolution. +Resolved 'arch/riscv/include/uapi/asm/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f9e862629fa4] Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/riscv/extensions.yaml | 28 ++++++++++++++++++++++ + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/csr.h | 1 + + arch/riscv/include/asm/hwcap.h | 2 ++ + arch/riscv/include/asm/pgtable.h | 13 +++++++++- + arch/riscv/include/uapi/asm/kvm.h | 2 ++ + arch/riscv/kernel/cpufeature.c | 12 ++++++++++ + arch/riscv/kvm/vcpu.c | 4 ++++ + arch/riscv/kvm/vcpu_onereg.c | 15 ++++++++++++ + tools/testing/selftests/kvm/riscv/get-reg-list.c | 8 +++++++ + 10 files changed, 85 insertions(+), 1 deletion(-) +Merging kvm-x86/next (c55f6b8a2441 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. +Merging xen-tip/linux-next (afc545da381b xen: Fix the issue of resource not being properly released in xenbus_dev_probe()) +$ 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 (85f0d8e39aff workqueue: Reduce expensive locks for unbound workqueue) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging sched-ext/for-next (fc39fb56917b Merge tag 'jfs-6.13' of github.com:kleikamp/linux-shaggy) +$ 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 +Already up to date. +Merging drivers-x86/for-next (43fb83c17ba2 Merge tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ 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 (ea45f3f46734 platform/chrome: Switch back to struct platform_driver::remove()) +$ 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 (32b0901e141f firmware: google: Unregister driver_info on failure) +$ 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 (9852d85ec9d4 Linux 6.12-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 (e8501858035b leds: ss4200: Fix the wrong format specifier for 'blinking') +$ 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 (7868b3a94045 char:ipmi: Fix the wrong format specifier) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 3 +++ + drivers/char/ipmi/ipmi_si_pci.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (acfeb6defcb9 Fix a potential abuse of seq_printf() format string in drivers) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/core.c +Auto-merging drivers/gpio/gpio-aspeed.c +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/gpio-xgs-iproc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/pci/pci-sysfs.c +CONFLICT (modify/delete): drivers/platform/x86/amd/hsmp.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/platform/x86/amd/hsmp.c left in tree. +Auto-merging drivers/platform/x86/intel/pmt/class.c +Auto-merging kernel/cpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/platform/x86/amd/hsmp.c +rm 'drivers/platform/x86/amd/hsmp.c' +$ git commit --no-edit -v -a +[master 9d42b36215f5] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/auxiliary_bus.rst | 1 - + arch/alpha/kernel/pci-sysfs.c | 6 +- + drivers/base/auxiliary.c | 31 +-------- + drivers/base/cacheinfo.c | 15 ++--- + drivers/base/class.c | 4 +- + drivers/base/core.c | 63 ++++++++---------- + drivers/base/firmware_loader/main.c | 7 +- + drivers/base/node.c | 12 ++-- + drivers/base/power/sysfs.c | 17 ++--- + drivers/base/topology.c | 40 ++++++------ + drivers/base/trace.h | 6 +- + drivers/cdx/cdx.c | 2 +- + drivers/cxl/port.c | 2 +- + drivers/gpio/gpio-aspeed-sgpio.c | 2 +- + drivers/gpio/gpio-aspeed.c | 2 +- + drivers/gpio/gpio-ep93xx.c | 2 +- + drivers/gpio/gpio-hlwd.c | 2 +- + drivers/gpio/gpio-mlxbf2.c | 2 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pl061.c | 2 +- + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-tegra186.c | 2 +- + drivers/gpio/gpio-tqmx86.c | 2 +- + drivers/gpio/gpio-visconti.c | 2 +- + drivers/gpio/gpio-xgs-iproc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- + drivers/gpu/drm/display/drm_dp_aux_bus.c | 2 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-mvebu-pic.c | 2 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + drivers/misc/ocxl/sysfs.c | 2 +- + drivers/mtd/spi-nor/sysfs.c | 2 +- + drivers/nvmem/core.c | 16 ++++- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-sysfs.c | 42 ++++++------ + drivers/pci/vpd.c | 2 +- + drivers/perf/arm-ni.c | 1 - + drivers/phy/tegra/xusb.c | 2 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- + drivers/pinctrl/pinctrl-stmfx.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- + drivers/platform/x86/intel/pmt/class.c | 2 +- + drivers/platform/x86/intel/sdsi.c | 2 +- + drivers/s390/char/con3215.c | 1 - + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/uio/uio_hv_generic.c | 2 +- + drivers/usb/core/sysfs.c | 2 +- + fs/sysfs/file.c | 30 ++++++--- + fs/sysfs/group.c | 5 +- + fs/sysfs/sysfs.h | 2 +- + include/linux/auxiliary_bus.h | 4 -- + include/linux/list.h | 8 --- + include/linux/sysfs.h | 99 +++++++++++++++++------------ + kernel/cpu.c | 3 - + lib/devres.c | 6 +- + 60 files changed, 241 insertions(+), 252 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-sysfs-treewide-constify-attribute-callbac.patch +Applying: fix up for "sysfs: treewide: constify attribute callback of bin_is_visible()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/amd/hsmp/plat.c +$ git add -A . +$ git commit -v -a --amend +[master bdf2887f7bcd] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Tue Nov 26 13:10:43 2024 +1100 +$ git am -3 ../patches/0001-another-fix-for-sysfs-treewide-constify-attribute-ca.patch +Applying: another fix for "sysfs: treewide: constify attribute callback of bin_is_visible()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/amd/hsmp/acpi.c +$ git add -A . +$ git commit -v -a --amend +[master 96f63465895e] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Tue Nov 26 13:10:43 2024 +1100 +Merging usb/usb-next (237d4e0f4113 usb: typec: tcpm: Add support for sink-bc12-completion-time-ms DT property) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml +Auto-merging Documentation/devicetree/bindings/usb/generic-ehci.yaml +Auto-merging Documentation/devicetree/bindings/usb/generic-ohci.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/thunderbolt/usb4.c +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/gadget/udc/pxa27x_udc.c +Auto-merging drivers/usb/musb/sunxi.c +Auto-merging drivers/usb/serial/io_edgeport.c +Auto-merging drivers/usb/typec/tcpm/wcove.c +Auto-merging drivers/usb/typec/ucsi/ucsi_ccg.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 64 +++ + Documentation/ABI/testing/sysfs-class-typec | 27 ++ + .../bindings/connector/usb-connector.yaml | 46 +- + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 42 +- + .../bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml | 2 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 1 + + .../devicetree/bindings/usb/cypress,cypd4226.yaml | 5 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 6 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/generic-ohci.yaml | 1 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 9 +- + .../devicetree/bindings/usb/maxim,max33359.yaml | 1 + + .../bindings/usb/microchip,mpfs-musb.yaml | 7 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 4 + + .../devicetree/bindings/usb/rockchip,dwc3.yaml | 6 +- + .../devicetree/bindings/usb/ti,tusb1046.yaml | 49 ++ + .../devicetree/bindings/usb/ti,tusb73x0-pci.yaml | 55 +++ + MAINTAINERS | 7 + + drivers/phy/realtek/phy-rtk-usb2.c | 2 + + drivers/phy/realtek/phy-rtk-usb3.c | 2 + + drivers/thunderbolt/debugfs.c | 502 +++++++++++++++------ + drivers/thunderbolt/nhi.c | 12 +- + drivers/thunderbolt/sb_regs.h | 32 +- + drivers/thunderbolt/tb.h | 16 +- + drivers/thunderbolt/usb4.c | 18 +- + drivers/usb/atm/ueagle-atm.c | 6 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/c67x00/c67x00-drv.c | 2 +- + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/cdns3-pci-wrap.c | 4 +- + drivers/usb/cdns3/cdns3-plat.c | 2 +- + drivers/usb/cdns3/cdns3-starfive.c | 2 +- + drivers/usb/cdns3/cdns3-ti.c | 2 +- + drivers/usb/cdns3/cdnsp-pci.c | 26 +- + drivers/usb/chipidea/ci.h | 2 + + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +- + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- + drivers/usb/chipidea/ci_hdrc_npcm.c | 2 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 2 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 2 +- + drivers/usb/chipidea/core.c | 6 +- + drivers/usb/chipidea/udc.c | 178 +++++++- + drivers/usb/chipidea/udc.h | 2 + + drivers/usb/chipidea/usbmisc_imx.c | 4 + + drivers/usb/common/common.c | 3 + + drivers/usb/common/usb-conn-gpio.c | 2 +- + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devio.c | 5 +- + drivers/usb/core/driver.c | 24 +- + drivers/usb/core/endpoint.c | 11 +- + drivers/usb/core/ledtrig-usbport.c | 3 +- + drivers/usb/core/port.c | 11 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/core.c | 16 +- + drivers/usb/dwc3/core.h | 14 +- + drivers/usb/dwc3/dwc3-am62.c | 2 +- + drivers/usb/dwc3/dwc3-exynos.c | 2 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 2 +- + drivers/usb/dwc3/dwc3-keystone.c | 2 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- + drivers/usb/dwc3/dwc3-octeon.c | 2 +- + drivers/usb/dwc3/dwc3-of-simple.c | 2 +- + drivers/usb/dwc3/dwc3-omap.c | 4 +- + drivers/usb/dwc3/dwc3-qcom.c | 4 +- + drivers/usb/dwc3/dwc3-rtk.c | 2 +- + drivers/usb/dwc3/dwc3-st.c | 2 +- + drivers/usb/dwc3/dwc3-xilinx.c | 2 +- + drivers/usb/dwc3/ep0.c | 4 +- + drivers/usb/dwc3/gadget.c | 152 ++++--- + drivers/usb/dwc3/host.c | 2 +- + drivers/usb/fotg210/fotg210-core.c | 2 +- + drivers/usb/gadget/composite.c | 30 +- + drivers/usb/gadget/config.c | 4 +- + drivers/usb/gadget/configfs.c | 2 +- + drivers/usb/gadget/function/Makefile | 4 + + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_mass_storage.c | 8 +- + drivers/usb/gadget/function/f_midi.c | 8 +- + drivers/usb/gadget/function/f_midi2.c | 4 +- + drivers/usb/gadget/function/f_uvc.c | 4 +- + drivers/usb/gadget/function/uvc.h | 13 + + drivers/usb/gadget/function/uvc_configfs.c | 348 +++++++++++++- + drivers/usb/gadget/function/uvc_configfs.h | 16 + + drivers/usb/gadget/function/uvc_queue.c | 26 +- + drivers/usb/gadget/function/uvc_queue.h | 2 + + drivers/usb/gadget/function/uvc_trace.c | 11 + + drivers/usb/gadget/function/uvc_trace.h | 60 +++ + drivers/usb/gadget/function/uvc_v4l2.c | 66 ++- + drivers/usb/gadget/function/uvc_video.c | 274 ++++++----- + drivers/usb/gadget/legacy/hid.c | 2 +- + drivers/usb/gadget/legacy/raw_gadget.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 2 +- + drivers/usb/gadget/udc/aspeed_udc.c | 4 +- + drivers/usb/gadget/udc/at91_udc.c | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 2 +- + drivers/usb/gadget/udc/cdns2/cdns2-pci.c | 3 +- + drivers/usb/gadget/udc/dummy_hcd.c | 6 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 8 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/fusb300_udc.c | 4 +- + drivers/usb/gadget/udc/gr_udc.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/udc/m66592-udc.c | 2 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 6 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/gadget/udc/renesas_usbf.c | 4 +- + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 2 +- + drivers/usb/gadget/udc/snps_udc_core.c | 2 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 2 +- + drivers/usb/gadget/udc/tegra-xudc.c | 2 +- + drivers/usb/gadget/udc/udc-xilinx.c | 2 +- + drivers/usb/gadget/usbstring.c | 2 +- + drivers/usb/host/bcma-hcd.c | 1 - + drivers/usb/host/ehci-atmel.c | 2 +- + drivers/usb/host/ehci-brcm.c | 2 +- + drivers/usb/host/ehci-exynos.c | 2 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mv.c | 2 +- + drivers/usb/host/ehci-npcm7xx.c | 2 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ehci-platform.c | 2 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci-sh.c | 2 +- + drivers/usb/host/ehci-spear.c | 9 +- + drivers/usb/host/ehci-st.c | 2 +- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/fhci-sched.c | 4 +- + drivers/usb/host/fsl-mph-dr-of.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/octeon-hcd.c | 6 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-da8xx.c | 2 +- + drivers/usb/host/ohci-exynos.c | 2 +- + drivers/usb/host/ohci-nxp.c | 2 +- + drivers/usb/host/ohci-omap.c | 4 +- + drivers/usb/host/ohci-platform.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/usb/host/ohci-s3c2410.c | 2 +- + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/ohci-st.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 8 +- + drivers/usb/host/r8a66597-hcd.c | 6 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/uhci-grlib.c | 2 +- + drivers/usb/host/uhci-platform.c | 2 +- + drivers/usb/host/xhci-dbgcap.c | 13 +- + drivers/usb/host/xhci-debugfs.c | 10 +- + drivers/usb/host/xhci-histb.c | 2 +- + drivers/usb/host/xhci-hub.c | 6 +- + drivers/usb/host/xhci-mem.c | 239 +++++----- + drivers/usb/host/xhci-mtk.c | 2 +- + drivers/usb/host/xhci-pci.c | 45 +- + drivers/usb/host/xhci-plat.c | 2 +- + drivers/usb/host/xhci-rcar.c | 2 +- + drivers/usb/host/xhci-ring.c | 302 ++++++++----- + drivers/usb/host/xhci-tegra.c | 2 +- + drivers/usb/host/xhci-trace.h | 79 +++- + drivers/usb/host/xhci.c | 121 +++-- + drivers/usb/host/xhci.h | 51 ++- + drivers/usb/isp1760/isp1760-if.c | 2 +- + drivers/usb/misc/chaoskey.c | 35 +- + drivers/usb/misc/iowarrior.c | 50 +- + drivers/usb/misc/onboard_usb_dev.c | 2 +- + drivers/usb/misc/qcom_eud.c | 2 +- + drivers/usb/misc/usb-ljca.c | 20 +- + drivers/usb/misc/usb3503.c | 2 +- + drivers/usb/misc/usbtest.c | 3 +- + drivers/usb/misc/yurex.c | 5 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 4 +- + drivers/usb/musb/da8xx.c | 2 +- + drivers/usb/musb/jz4740.c | 2 +- + drivers/usb/musb/mediatek.c | 2 +- + drivers/usb/musb/mpfs.c | 2 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_dsps.c | 2 +- + drivers/usb/musb/musb_gadget.c | 13 +- + drivers/usb/musb/musb_gadget_ep0.c | 2 +- + drivers/usb/musb/musb_host.c | 5 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/musb/sunxi.c | 2 +- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/musb/ux500.c | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-am335x.c | 2 +- + drivers/usb/phy/phy-fsl-usb.c | 2 +- + drivers/usb/phy/phy-generic.c | 2 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 2 +- + drivers/usb/phy/phy-isp1301.c | 2 +- + drivers/usb/phy/phy-keystone.c | 2 +- + drivers/usb/phy/phy-mv-usb.c | 2 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/phy/phy-tahvo.c | 2 +- + drivers/usb/phy/phy-tegra-usb.c | 2 +- + drivers/usb/phy/phy-twl6030-usb.c | 2 +- + drivers/usb/phy/phy.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 4 +- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 +- + drivers/usb/serial/bus.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 2 + + drivers/usb/serial/io_edgeport.c | 2 +- + drivers/usb/serial/pl2303.c | 38 +- + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 4 +- + drivers/usb/storage/ene_ub6250.c | 8 +- + drivers/usb/storage/realtek_cr.c | 4 +- + drivers/usb/storage/sddr09.c | 4 +- + drivers/usb/storage/sddr55.c | 8 +- + drivers/usb/storage/transport.c | 2 +- + drivers/usb/typec/altmodes/displayport.c | 2 +- + drivers/usb/typec/class.c | 205 ++++++++- + drivers/usb/typec/class.h | 3 + + drivers/usb/typec/mux/Kconfig | 9 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/gpio-sbu-mux.c | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 2 +- + drivers/usb/typec/mux/tusb1046.c | 196 ++++++++ + drivers/usb/typec/stusb160x.c | 7 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 2 +- + drivers/usb/typec/tcpm/tcpci_mt6360.c | 2 +- + drivers/usb/typec/tcpm/tcpci_mt6370.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 96 +++- + drivers/usb/typec/tcpm/wcove.c | 2 +- + drivers/usb/typec/ucsi/debugfs.c | 1 + + drivers/usb/typec/ucsi/psy.c | 28 +- + drivers/usb/typec/ucsi/trace.h | 28 +- + drivers/usb/typec/ucsi/ucsi.c | 153 ++++--- + drivers/usb/typec/ucsi/ucsi.h | 245 ++++++---- + drivers/usb/typec/ucsi/ucsi_acpi.c | 65 +-- + drivers/usb/typec/ucsi/ucsi_ccg.c | 5 + + drivers/usb/typec/ucsi/ucsi_glink.c | 21 +- + drivers/usb/usbip/vhci_hcd.c | 2 +- + drivers/usb/usbip/vudc_main.c | 2 +- + include/linux/pci_ids.h | 4 + + include/linux/usb.h | 7 +- + include/linux/usb/chipidea.h | 1 + + include/linux/usb/storage.h | 2 +- + include/linux/usb/typec.h | 22 + + include/uapi/linux/usb/video.h | 58 +++ + 257 files changed, 3507 insertions(+), 1354 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ti,tusb1046.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,tusb73x0-pci.yaml + create mode 100644 drivers/usb/gadget/function/uvc_trace.c + create mode 100644 drivers/usb/gadget/function/uvc_trace.h + create mode 100644 drivers/usb/typec/mux/tusb1046.c +Merging thunderbolt/next (40aeea504447 thunderbolt: Replace deprecated PCI functions) +$ 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 (8b524944f92c USB: serial: ftdi_sio: Fix atomicity violation in get_serial_info()) +$ 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 (b5a23a60e8ab serial: amba-pl011: fix build regression) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/8250/Kconfig +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/cpm_uart.c +Auto-merging drivers/tty/serial/ucc_uart.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/rs485.yaml | 19 ++- + .../devicetree/bindings/serial/samsung_uart.yaml | 14 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 13 +- + .../devicetree/bindings/serial/sprd-uart.yaml | 1 + + drivers/mailbox/omap-mailbox.c | 1 + + drivers/misc/eeprom/eeprom_93cx6.c | 15 ++- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 4 +- + drivers/tty/serial/8250/8250_dw.c | 7 +- + drivers/tty/serial/8250/8250_em.c | 2 +- + drivers/tty/serial/8250/8250_exar.c | 142 +++++++-------------- + drivers/tty/serial/8250/8250_fintek.c | 16 ++- + drivers/tty/serial/8250/8250_fsl.c | 2 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 +- + drivers/tty/serial/8250/8250_ioc3.c | 2 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 2 +- + drivers/tty/serial/8250/8250_mtk.c | 6 +- + drivers/tty/serial/8250/8250_of.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 10 +- + drivers/tty/serial/8250/8250_platform.c | 2 +- + drivers/tty/serial/8250/8250_pxa.c | 2 +- + drivers/tty/serial/8250/8250_tegra.c | 2 +- + drivers/tty/serial/8250/8250_uniphier.c | 2 +- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/altera_jtaguart.c | 6 +- + drivers/tty/serial/altera_uart.c | 6 +- + drivers/tty/serial/amba-pl011.c | 9 +- + drivers/tty/serial/ar933x_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 16 +-- + drivers/tty/serial/bcm63xx_uart.c | 2 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/cpm_uart.c | 2 +- + drivers/tty/serial/digicolor-usart.c | 2 +- + drivers/tty/serial/esp32_acm.c | 2 +- + drivers/tty/serial/esp32_uart.c | 2 +- + drivers/tty/serial/fsl_linflexuart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 23 +++- + drivers/tty/serial/imx.c | 137 +++++++++++++++++--- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/ma35d1_serial.c | 2 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/milbeaut_usio.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 2 +- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pic32_uart.c | 2 +- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/sa1100.c | 2 +- + drivers/tty/serial/samsung_tty.c | 15 ++- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sccnxp.c | 2 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sh-sci.c | 30 ++++- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/sprd_serial.c | 43 ++++++- + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 2 +- + drivers/tty/serial/sunhv.c | 2 +- + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/serial/tegra-tcu.c | 2 +- + drivers/tty/serial/timbuart.c | 2 +- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/tty_io.c | 2 +- + include/linux/eeprom_93cx6.h | 11 ++ + include/linux/kfifo.h | 1 - + include/linux/platform_data/sa11x0-serial.h | 1 - + samples/kfifo/dma-example.c | 1 + + 81 files changed, 413 insertions(+), 245 deletions(-) +Merging char-misc/char-misc-next (5a6c35258d10 mei: vsc: Fix typo "maintstepping" -> "mainstepping") +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/firmware/arm_scmi/driver.c +Auto-merging drivers/firmware/arm_scpi.c +Auto-merging drivers/firmware/microchip/mpfs-auto-update.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/iio/adc/stm32-dfsdm-adc.c +Auto-merging drivers/iio/adc/ti-ads1298.c +Auto-merging drivers/iio/gyro/fxas21002c_core.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_core.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Auto-merging drivers/nvmem/core.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/types.rs +Auto-merging scripts/tags.sh +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 32 + + Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 | 46 - + Documentation/devicetree/bindings/iio/adc/adc.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 3 + + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 120 ++ + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 199 +- + .../devicetree/bindings/iio/adc/adi,ad7625.yaml | 176 ++ + .../devicetree/bindings/iio/adc/adi,ad7779.yaml | 110 ++ + .../bindings/iio/adc/amlogic,meson-saradc.yaml | 1 + + .../devicetree/bindings/iio/adc/gehc,pmc-adc.yaml | 86 + + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 39 + + .../devicetree/bindings/iio/dac/adi,ad8460.yaml | 164 ++ + .../devicetree/bindings/iio/dac/adi,axi-dac.yaml | 69 +- + .../devicetree/bindings/iio/imu/bosch,bmi270.yaml | 79 + + .../devicetree/bindings/iio/imu/bosch,smi240.yaml | 51 + + .../bindings/iio/imu/invensense,icm42600.yaml | 2 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 7 +- + .../devicetree/bindings/iio/light/ti,opt3001.yaml | 4 +- + .../devicetree/bindings/iio/light/veml6030.yaml | 64 - + .../bindings/iio/light/vishay,veml6030.yaml | 107 + + .../bindings/iio/light/vishay,veml6075.yaml | 21 +- + .../iio/magnetometer/allegromicro,als31300.yaml | 46 + + .../devicetree/bindings/iio/pressure/bmp085.yaml | 22 +- + .../bindings/iio/temperature/ti,tmp006.yaml | 6 + + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + + .../bindings/interconnect/qcom,qcs615-rpmh.yaml | 73 + + .../bindings/interconnect/qcom,qcs8300-rpmh.yaml | 72 + + .../{fuse => nvmem}/renesas,rcar-efuse.yaml | 33 +- + .../bindings/{fuse => nvmem}/renesas,rcar-otp.yaml | 17 +- + .../devicetree/bindings/nvmem/sc27xx-efuse.txt | 52 - + .../bindings/nvmem/sprd,sc2731-efuse.yaml | 68 + + .../bindings/nvmem/sprd,ums312-efuse.yaml | 61 + + .../devicetree/bindings/nvmem/sprd-efuse.txt | 39 - + .../bindings/nvmem/zii,rave-sp-eeprom.txt | 40 - + .../bindings/nvmem/zii,rave-sp-eeprom.yaml | 54 + + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 1 + + .../bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 6 +- + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/iio/ad7380.rst | 16 + + Documentation/iio/ad7606.rst | 144 ++ + Documentation/iio/ad7625.rst | 91 + + Documentation/iio/bno055.rst | 2 +- + Documentation/iio/index.rst | 2 + + MAINTAINERS | 62 +- + drivers/android/binder.c | 64 +- + drivers/bus/mhi/host/boot.c | 4 +- + drivers/bus/mhi/host/internal.h | 2 +- + drivers/bus/mhi/host/pci_generic.c | 6 +- + drivers/bus/mhi/host/trace.h | 25 +- + drivers/char/powernv-op-panel.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/char/xillybus/xillybus_of.c | 2 +- + drivers/comedi/comedi_fops.c | 12 + + drivers/counter/ftm-quaddec.c | 1 + + drivers/counter/intel-qep.c | 10 +- + drivers/firmware/arm_scmi/driver.c | 2 +- + drivers/firmware/arm_scpi.c | 2 +- + drivers/firmware/google/coreboot_table.c | 2 +- + drivers/firmware/imx/imx-dsp.c | 2 +- + drivers/firmware/memmap.c | 2 +- + drivers/firmware/microchip/mpfs-auto-update.c | 2 +- + drivers/firmware/mtk-adsp-ipc.c | 9 +- + drivers/firmware/qemu_fw_cfg.c | 2 +- + drivers/firmware/raspberrypi.c | 2 +- + drivers/firmware/stratix10-rsu.c | 2 +- + drivers/firmware/stratix10-svc.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 2 +- + drivers/fpga/altera-fpga2sdram.c | 2 +- + drivers/fpga/altera-freeze-bridge.c | 2 +- + drivers/fpga/altera-hps2fpga.c | 2 +- + drivers/fpga/dfl-afu-main.c | 8 +- + drivers/fpga/dfl-fme-br.c | 8 +- + drivers/fpga/dfl-fme-main.c | 8 +- + drivers/fpga/dfl-fme-region.c | 8 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 2 +- + drivers/fpga/of-fpga-region.c | 2 +- + drivers/fpga/socfpga-a10.c | 2 +- + drivers/fpga/stratix10-soc.c | 2 +- + drivers/fpga/xilinx-pr-decoupler.c | 2 +- + drivers/fpga/zynq-fpga.c | 2 +- + drivers/greybus/interface.c | 2 +- + drivers/iio/accel/adxl355_core.c | 2 +- + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/adxl372.c | 2 +- + drivers/iio/accel/adxl380.c | 9 +- + drivers/iio/accel/bma180.c | 3 +- + drivers/iio/accel/bma220_spi.c | 1 + + drivers/iio/accel/bma400_core.c | 4 +- + drivers/iio/accel/bmc150-accel-core.c | 2 +- + drivers/iio/accel/bmc150-accel.h | 3 +- + drivers/iio/accel/fxls8962af-core.c | 8 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 9 +- + drivers/iio/accel/kionix-kx022a.c | 3 +- + drivers/iio/accel/kxcjk-1013.c | 442 ++--- + drivers/iio/accel/kxsd9.c | 3 +- + drivers/iio/accel/mma7455_core.c | 3 +- + drivers/iio/accel/mma8452.c | 5 +- + drivers/iio/accel/mma9551.c | 27 +- + drivers/iio/accel/mma9553.c | 46 +- + drivers/iio/accel/msa311.c | 3 +- + drivers/iio/accel/mxc4005.c | 3 +- + drivers/iio/accel/sca3000.c | 6 +- + drivers/iio/accel/stk8312.c | 3 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 43 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ab8500-gpadc.c | 2 +- + drivers/iio/adc/ad4000.c | 4 +- + drivers/iio/adc/ad7091r-base.c | 3 +- + drivers/iio/adc/ad7091r-base.h | 2 +- + drivers/iio/adc/ad7173.c | 38 +- + drivers/iio/adc/ad7192.c | 3 + + drivers/iio/adc/ad7266.c | 2 +- + drivers/iio/adc/ad7280a.c | 14 +- + drivers/iio/adc/ad7291.c | 2 +- + drivers/iio/adc/ad7380.c | 178 +- + drivers/iio/adc/ad7606.c | 1056 ++++++++-- + drivers/iio/adc/ad7606.h | 134 +- + drivers/iio/adc/ad7606_par.c | 133 +- + drivers/iio/adc/ad7606_spi.c | 195 +- + drivers/iio/adc/ad7625.c | 684 +++++++ + drivers/iio/adc/ad7779.c | 914 +++++++++ + drivers/iio/adc/ad7791.c | 4 +- + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/ad7887.c | 4 +- + drivers/iio/adc/ad7944.c | 4 +- + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/ad_sigma_delta.c | 4 +- + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/axp20x_adc.c | 62 +- + drivers/iio/adc/axp288_adc.c | 2 +- + drivers/iio/adc/bcm_iproc_adc.c | 8 +- + drivers/iio/adc/da9150-gpadc.c | 26 +- + drivers/iio/adc/dln2-adc.c | 2 +- + drivers/iio/adc/ep93xx_adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 2 +- + drivers/iio/adc/gehc-pmc-adc.c | 228 +++ + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/imx8qxp-adc.c | 2 +- + drivers/iio/adc/imx93_adc.c | 2 +- + drivers/iio/adc/intel_mrfld_adc.c | 2 +- + drivers/iio/adc/lp8788_adc.c | 18 +- + drivers/iio/adc/ltc2497-core.c | 15 +- + drivers/iio/adc/max1363.c | 5 +- + drivers/iio/adc/max34408.c | 2 +- + drivers/iio/adc/meson_saradc.c | 2 +- + drivers/iio/adc/mp2629_adc.c | 4 +- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/mxs-lradc-adc.c | 6 +- + drivers/iio/adc/npcm_adc.c | 2 +- + drivers/iio/adc/pac1921.c | 48 +- + drivers/iio/adc/pac1934.c | 2 +- + drivers/iio/adc/palmas_gpadc.c | 4 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 10 +- + drivers/iio/adc/qcom-spmi-adc5.c | 4 +- + drivers/iio/adc/qcom-spmi-vadc.c | 7 +- + drivers/iio/adc/rcar-gyroadc.c | 2 +- + drivers/iio/adc/rn5t618-adc.c | 2 +- + drivers/iio/adc/stm32-adc-core.c | 2 +- + drivers/iio/adc/stm32-adc.c | 2 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 2 +- + drivers/iio/adc/stm32-dfsdm-core.c | 2 +- + drivers/iio/adc/sun20i-gpadc-iio.c | 7 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 9 +- + drivers/iio/adc/ti-ads1015.c | 5 +- + drivers/iio/adc/ti-ads1119.c | 2 +- + drivers/iio/adc/ti-ads1298.c | 2 +- + drivers/iio/adc/ti_am335x_adc.c | 10 +- + drivers/iio/adc/twl4030-madc.c | 4 +- + drivers/iio/adc/twl6030-gpadc.c | 2 +- + drivers/iio/adc/vf610_adc.c | 2 +- + drivers/iio/adc/xilinx-ams.c | 2 +- + drivers/iio/adc/xilinx-xadc-events.c | 4 +- + drivers/iio/adc/xilinx-xadc.h | 2 +- + drivers/iio/addac/ad74115.c | 18 +- + drivers/iio/addac/ad74413r.c | 102 +- + drivers/iio/cdc/ad7150.c | 2 +- + drivers/iio/chemical/Kconfig | 2 + + drivers/iio/chemical/bme680.h | 11 +- + drivers/iio/chemical/bme680_core.c | 364 +++- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 2 +- + drivers/iio/dac/Kconfig | 32 + + drivers/iio/dac/Makefile | 3 + + drivers/iio/dac/ad3552r-common.c | 249 +++ + drivers/iio/dac/ad3552r-hs.c | 529 +++++ + drivers/iio/dac/ad3552r-hs.h | 19 + + drivers/iio/dac/ad3552r.c | 553 +----- + drivers/iio/dac/ad3552r.h | 228 +++ + drivers/iio/dac/ad5380.c | 85 +- + drivers/iio/dac/ad5421.c | 2 +- + drivers/iio/dac/ad5446.c | 77 +- + drivers/iio/dac/ad5504.c | 61 +- + drivers/iio/dac/ad5624r.h | 1 - + drivers/iio/dac/ad5624r_spi.c | 69 +- + drivers/iio/dac/ad5755.c | 11 +- + drivers/iio/dac/ad5761.c | 109 +- + drivers/iio/dac/ad5770r.c | 44 +- + drivers/iio/dac/ad5791.c | 205 +- + drivers/iio/dac/ad8460.c | 951 +++++++++ + drivers/iio/dac/adi-axi-dac.c | 449 ++++- + drivers/iio/dac/dpot-dac.c | 2 +- + drivers/iio/dac/lpc18xx_dac.c | 6 +- + drivers/iio/dac/m62332.c | 2 +- + drivers/iio/dac/max517.c | 2 +- + drivers/iio/dac/stm32-dac-core.c | 2 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/vf610_dac.c | 2 +- + drivers/iio/dummy/iio_simple_dummy.h | 2 +- + drivers/iio/dummy/iio_simple_dummy_events.c | 32 +- + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/frequency/adf4371.c | 63 +- + drivers/iio/gyro/Kconfig | 2 +- + drivers/iio/gyro/bmg160_core.c | 19 +- + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/fxas21002c_core.c | 3 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 8 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 4 +- + drivers/iio/humidity/hts221_buffer.c | 3 +- + drivers/iio/imu/Kconfig | 15 + + drivers/iio/imu/Makefile | 3 + + drivers/iio/imu/bmi160/bmi160_core.c | 11 +- + drivers/iio/imu/bmi270/Kconfig | 33 + + drivers/iio/imu/bmi270/Makefile | 7 + + drivers/iio/imu/bmi270/bmi270.h | 38 + + drivers/iio/imu/bmi270/bmi270_core.c | 734 +++++++ + drivers/iio/imu/bmi270/bmi270_i2c.c | 66 + + drivers/iio/imu/bmi270/bmi270_spi.c | 92 + + drivers/iio/imu/bmi323/bmi323.h | 1 - + drivers/iio/imu/bmi323/bmi323_core.c | 18 +- + drivers/iio/imu/fxos8700_core.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 10 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 17 + + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 17 + + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 11 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 38 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 10 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 4 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 10 + + drivers/iio/imu/kmx61.c | 27 +- + drivers/iio/imu/smi240.c | 621 ++++++ + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 22 +- + drivers/iio/industrialio-acpi.c | 48 +- + drivers/iio/industrialio-backend.c | 78 + + drivers/iio/industrialio-core.c | 3 +- + drivers/iio/inkern.c | 7 +- + drivers/iio/light/Kconfig | 18 +- + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adux1020.c | 12 +- + drivers/iio/light/al3010.c | 11 +- + drivers/iio/light/apds9300.c | 20 +- + drivers/iio/light/apds9306.c | 7 +- + drivers/iio/light/apds9960.c | 10 +- + drivers/iio/light/bh1745.c | 50 +- + drivers/iio/light/cm32181.c | 3 +- + drivers/iio/light/cm3605.c | 2 +- + drivers/iio/light/cm36651.c | 2 +- + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/light/gp2ap020a00f.c | 2 +- + drivers/iio/light/hid-sensor-als.c | 8 +- + drivers/iio/light/hid-sensor-prox.c | 199 +- + drivers/iio/light/iqs621-als.c | 2 +- + drivers/iio/light/isl29018.c | 38 +- + drivers/iio/light/lm3533-als.c | 8 +- + drivers/iio/light/ltr390.c | 362 +++- + drivers/iio/light/ltr501.c | 35 +- + drivers/iio/light/ltrf216a.c | 1 + + drivers/iio/light/max44009.c | 2 +- + drivers/iio/light/opt3001.c | 191 +- + drivers/iio/light/rpr0521.c | 14 +- + drivers/iio/light/st_uvis25_core.c | 3 +- + drivers/iio/light/stk3310.c | 5 +- + drivers/iio/light/tcs3472.c | 2 +- + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/light/tsl2591.c | 2 +- + drivers/iio/light/tsl2772.c | 6 +- + drivers/iio/light/us5182d.c | 2 +- + drivers/iio/light/vcnl4000.c | 5 +- + drivers/iio/light/veml3235.c | 495 +++++ + drivers/iio/light/veml6030.c | 537 +++-- + drivers/iio/light/veml6070.c | 203 +- + drivers/iio/light/vl6180.c | 253 ++- + drivers/iio/magnetometer/Kconfig | 13 + + drivers/iio/magnetometer/Makefile | 1 + + drivers/iio/magnetometer/ak8974.c | 2 +- + drivers/iio/magnetometer/als31300.c | 494 +++++ + drivers/iio/magnetometer/bmc150_magn.c | 15 - + drivers/iio/magnetometer/bmc150_magn_i2c.c | 9 - + drivers/iio/magnetometer/bmc150_magn_spi.c | 9 - + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 6 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 8 +- + drivers/iio/orientation/hid-sensor-rotation.c | 8 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 8 +- + drivers/iio/position/iqs624-pos.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 713 +++++-- + drivers/iio/pressure/bmp280-i2c.c | 4 +- + drivers/iio/pressure/bmp280-spi.c | 4 +- + drivers/iio/pressure/bmp280.h | 56 +- + drivers/iio/pressure/hid-sensor-press.c | 8 +- + drivers/iio/pressure/rohm-bm1390.c | 3 - + drivers/iio/proximity/aw96103.c | 2 +- + drivers/iio/proximity/cros_ec_mkbp_proximity.c | 4 +- + drivers/iio/proximity/hx9023s.c | 4 +- + drivers/iio/proximity/irsd200.c | 5 +- + drivers/iio/proximity/srf04.c | 2 +- + drivers/iio/proximity/sx9324.c | 20 + + drivers/iio/proximity/sx9360.c | 1 - + drivers/iio/proximity/sx9500.c | 6 +- + drivers/iio/proximity/sx_common.c | 23 +- + drivers/iio/proximity/sx_common.h | 6 +- + drivers/iio/proximity/vcnl3020.c | 2 +- + drivers/iio/proximity/vl53l0x-i2c.c | 174 +- + drivers/iio/temperature/Kconfig | 2 + + drivers/iio/temperature/hid-sensor-temperature.c | 4 +- + drivers/iio/temperature/mcp9600.c | 2 +- + drivers/iio/temperature/tmp006.c | 134 +- + drivers/iio/temperature/tmp007.c | 2 +- + drivers/iio/trigger/iio-trig-interrupt.c | 2 +- + drivers/iio/trigger/stm32-timer-trigger.c | 2 +- + drivers/interconnect/core.c | 4 +- + drivers/interconnect/imx/imx8mm.c | 2 +- + drivers/interconnect/imx/imx8mn.c | 2 +- + drivers/interconnect/imx/imx8mp.c | 2 +- + drivers/interconnect/imx/imx8mq.c | 2 +- + drivers/interconnect/mediatek/mt8183.c | 2 +- + drivers/interconnect/mediatek/mt8195.c | 2 +- + drivers/interconnect/qcom/Kconfig | 29 + + drivers/interconnect/qcom/Makefile | 6 + + drivers/interconnect/qcom/icc-rpmh.c | 5 +- + drivers/interconnect/qcom/icc-rpmh.h | 2 +- + drivers/interconnect/qcom/msm8909.c | 2 +- + drivers/interconnect/qcom/msm8916.c | 2 +- + drivers/interconnect/qcom/msm8937.c | 10 +- + drivers/interconnect/qcom/msm8939.c | 2 +- + drivers/interconnect/qcom/msm8953.c | 2 +- + drivers/interconnect/qcom/msm8974.c | 2 +- + drivers/interconnect/qcom/msm8976.c | 2 +- + drivers/interconnect/qcom/msm8996.c | 2 +- + drivers/interconnect/qcom/osm-l3.c | 2 +- + drivers/interconnect/qcom/qcm2290.c | 2 +- + drivers/interconnect/qcom/qcs404.c | 2 +- + drivers/interconnect/qcom/qcs615.c | 1563 +++++++++++++++ + drivers/interconnect/qcom/qcs615.h | 128 ++ + drivers/interconnect/qcom/qcs8300.c | 2088 ++++++++++++++++++++ + drivers/interconnect/qcom/qcs8300.h | 177 ++ + drivers/interconnect/qcom/qdu1000.c | 2 +- + drivers/interconnect/qcom/sa8775p.c | 2 +- + drivers/interconnect/qcom/sar2130p.c | 1930 ++++++++++++++++++ + drivers/interconnect/qcom/sc7180.c | 2 +- + drivers/interconnect/qcom/sc7280.c | 6 +- + drivers/interconnect/qcom/sc8180x.c | 2 +- + drivers/interconnect/qcom/sc8280xp.c | 2 +- + drivers/interconnect/qcom/sdm660.c | 2 +- + drivers/interconnect/qcom/sdm670.c | 2 +- + drivers/interconnect/qcom/sdm845.c | 2 +- + drivers/interconnect/qcom/sdx55.c | 2 +- + drivers/interconnect/qcom/sdx65.c | 2 +- + drivers/interconnect/qcom/sdx75.c | 2 +- + drivers/interconnect/qcom/sm6115.c | 2 +- + drivers/interconnect/qcom/sm6350.c | 2 +- + drivers/interconnect/qcom/sm7150.c | 2 +- + drivers/interconnect/qcom/sm8150.c | 2 +- + drivers/interconnect/qcom/sm8250.c | 2 +- + drivers/interconnect/qcom/sm8350.c | 2 +- + drivers/interconnect/qcom/sm8450.c | 2 +- + drivers/interconnect/qcom/sm8550.c | 2 +- + drivers/interconnect/qcom/sm8650.c | 2 +- + drivers/interconnect/qcom/smd-rpm.c | 2 +- + drivers/interconnect/qcom/x1e80100.c | 2 +- + drivers/interconnect/samsung/exynos.c | 2 +- + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 1 - + drivers/misc/apds990x.c | 12 +- + drivers/misc/atmel-ssc.c | 4 +- + drivers/misc/cardreader/alcor_pci.c | 2 - + drivers/misc/cardreader/rtsx_usb.c | 6 +- + drivers/misc/eeprom/Kconfig | 4 +- + drivers/misc/eeprom/eeprom_93xx46.c | 2 +- + drivers/misc/isl29020.c | 2 +- + drivers/misc/keba/Kconfig | 13 + + drivers/misc/keba/Makefile | 1 + + drivers/misc/keba/cp500.c | 558 +++++- + drivers/misc/keba/lan9252.c | 359 ++++ + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/platform-vsc.c | 2 - + drivers/misc/mei/vsc-fw-loader.c | 26 +- + drivers/misc/mei/vsc-tp.c | 2 - + drivers/misc/rpmb-core.c | 9 +- + drivers/misc/ti-st/Kconfig | 19 - + drivers/misc/ti-st/Makefile | 7 - + drivers/misc/ti-st/st_core.c | 918 --------- + drivers/misc/ti-st/st_kim.c | 839 -------- + drivers/misc/ti-st/st_ll.c | 156 -- + drivers/nvmem/Kconfig | 11 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 2 +- + drivers/nvmem/core.c | 6 +- + drivers/nvmem/imx-iim.c | 10 +- + drivers/nvmem/lpc18xx_otp.c | 2 +- + drivers/nvmem/microchip-otpc.c | 2 +- + drivers/nvmem/rcar-efuse.c | 142 ++ + drivers/peci/controller/peci-npcm.c | 2 +- + drivers/platform/goldfish/goldfish_pipe.c | 3 +- + drivers/spmi/spmi-pmic-arb.c | 3 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 6 +- + drivers/uio/uio_dmem_genirq.c | 5 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + include/dt-bindings/iio/adc/gehc,pmc-adc.h | 10 + + .../dt-bindings/interconnect/qcom,qcs615-rpmh.h | 136 ++ + .../dt-bindings/interconnect/qcom,qcs8300-rpmh.h | 189 ++ + include/linux/alcor_pci.h | 1 + + include/linux/hid-sensor-ids.h | 2 + + include/linux/iio/backend.h | 17 + + include/linux/iio/driver.h | 5 +- + include/linux/iio/events.h | 31 +- + include/linux/iio/iio-opaque.h | 2 +- + include/linux/iio/iio.h | 36 +- + include/linux/misc/keba.h | 47 + + include/linux/rtsx_common.h | 1 - + include/linux/rtsx_usb.h | 4 + + include/linux/types.h | 3 +- + include/uapi/linux/iio/types.h | 1 + + include/uapi/linux/types.h | 1 + + rust/bindings/bindings_helper.h | 1 + + rust/kernel/device.rs | 319 ++- + rust/kernel/lib.rs | 24 + + rust/kernel/miscdevice.rs | 256 +++ + rust/kernel/prelude.rs | 2 + + rust/kernel/types.rs | 16 + + rust/macros/module.rs | 28 +- + scripts/tags.sh | 40 +- + tools/iio/iio_event_monitor.c | 3 + + .../selftests/filesystems/binderfs/binderfs_test.c | 1 - + 438 files changed, 22580 insertions(+), 5412 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7625.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7779.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/gehc,pmc-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad8460.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bmi270.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,smi240.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/veml6030.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/allegromicro,als31300.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs615-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs8300-rpmh.yaml + rename Documentation/devicetree/bindings/{fuse => nvmem}/renesas,rcar-efuse.yaml (54%) + rename Documentation/devicetree/bindings/{fuse => nvmem}/renesas,rcar-otp.yaml (60%) + delete mode 100644 Documentation/devicetree/bindings/nvmem/sc27xx-efuse.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/sprd,ums312-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/sprd-efuse.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.yaml + create mode 100644 Documentation/iio/ad7606.rst + create mode 100644 Documentation/iio/ad7625.rst + create mode 100644 drivers/iio/adc/ad7625.c + create mode 100644 drivers/iio/adc/ad7779.c + create mode 100644 drivers/iio/adc/gehc-pmc-adc.c + create mode 100644 drivers/iio/dac/ad3552r-common.c + create mode 100644 drivers/iio/dac/ad3552r-hs.c + create mode 100644 drivers/iio/dac/ad3552r-hs.h + create mode 100644 drivers/iio/dac/ad3552r.h + create mode 100644 drivers/iio/dac/ad8460.c + create mode 100644 drivers/iio/imu/bmi270/Kconfig + create mode 100644 drivers/iio/imu/bmi270/Makefile + create mode 100644 drivers/iio/imu/bmi270/bmi270.h + create mode 100644 drivers/iio/imu/bmi270/bmi270_core.c + create mode 100644 drivers/iio/imu/bmi270/bmi270_i2c.c + create mode 100644 drivers/iio/imu/bmi270/bmi270_spi.c + create mode 100644 drivers/iio/imu/smi240.c + create mode 100644 drivers/iio/light/veml3235.c + create mode 100644 drivers/iio/magnetometer/als31300.c + create mode 100644 drivers/interconnect/qcom/qcs615.c + create mode 100644 drivers/interconnect/qcom/qcs615.h + create mode 100644 drivers/interconnect/qcom/qcs8300.c + create mode 100644 drivers/interconnect/qcom/qcs8300.h + create mode 100644 drivers/interconnect/qcom/sar2130p.c + create mode 100644 drivers/misc/keba/lan9252.c + delete mode 100644 drivers/misc/ti-st/Kconfig + delete mode 100644 drivers/misc/ti-st/Makefile + delete mode 100644 drivers/misc/ti-st/st_core.c + delete mode 100644 drivers/misc/ti-st/st_kim.c + delete mode 100644 drivers/misc/ti-st/st_ll.c + create mode 100644 drivers/nvmem/rcar-efuse.c + create mode 100644 include/dt-bindings/iio/adc/gehc,pmc-adc.h + create mode 100644 include/dt-bindings/interconnect/qcom,qcs615-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h + create mode 100644 rust/kernel/miscdevice.rs +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 (42f7652d3eb5 Linux 6.12-rc4) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (9852d85ec9d4 Linux 6.12-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 (dbbd975cc6df fpga: Switch back to struct platform_driver::remove()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (b1fd28da86aa Merge branch 'icc-sar2130p' 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 (20fd1383cd61 iio: Move __private marking before struct element priv in struct iio_dev) +$ 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 (32f4a76b8e7c phy: qcom: qmp: Fix lecacy-legacy typo) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml +Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/phy/cadence/phy-cadence-sierra.c +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-combo.c +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-usb.c +Auto-merging drivers/phy/realtek/phy-rtk-usb2.c +Auto-merging drivers/phy/realtek/phy-rtk-usb3.c +Auto-merging drivers/phy/tegra/xusb.c +Auto-merging drivers/phy/ti/phy-j721e-wiz.c +Resolved 'Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5625a68c0af6] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/phy/bcm-ns-usb2-phy.yaml | 19 +- + .../devicetree/bindings/phy/fsl,mxs-usbphy.yaml | 1 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 10 + + .../bindings/phy/microchip,sparx5-serdes.yaml | 17 +- + .../devicetree/bindings/phy/nxp,ptn3222.yaml | 55 ++ + .../bindings/phy/phy-cadence-sierra.yaml | 2 +- + .../bindings/phy/phy-rockchip-inno-hdmi.txt | 43 -- + .../bindings/phy/phy-rockchip-usbdp.yaml | 1 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 1 + + .../bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml | 7 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 3 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 49 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../bindings/phy/rockchip,inno-usb2phy.yaml | 45 +- + .../bindings/phy/rockchip,rk3228-hdmi-phy.yaml | 97 +++ + .../bindings/phy/st,stm32mp25-combophy.yaml | 119 ++++ + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 13 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 4 + + MAINTAINERS | 6 + + drivers/phy/Kconfig | 11 + + drivers/phy/Makefile | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 8 +- + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 54 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 435 ++++++------ + drivers/phy/broadcom/phy-brcm-usb.c | 2 +- + drivers/phy/cadence/cdns-dphy.c | 2 +- + drivers/phy/cadence/phy-cadence-sierra.c | 2 +- + drivers/phy/cadence/phy-cadence-torrent.c | 4 +- + drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 6 +- + drivers/phy/freescale/phy-fsl-lynx-28g.c | 6 +- + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 598 +++++++++-------- + drivers/phy/intel/phy-intel-lgm-combo.c | 2 +- + drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 16 + + drivers/phy/microchip/sparx5_serdes.c | 195 +++++- + drivers/phy/microchip/sparx5_serdes.h | 44 +- + drivers/phy/microchip/sparx5_serdes_regs.h | 746 ++++++++++++++------- + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 2 +- + drivers/phy/phy-airoha-pcie-regs.h | 6 +- + drivers/phy/phy-airoha-pcie.c | 8 +- + drivers/phy/phy-lgm-usb.c | 2 +- + drivers/phy/phy-nxp-ptn3222.c | 123 ++++ + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 10 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 74 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 2 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 214 ++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_30.h | 25 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_30.h | 19 + + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 65 ++ + drivers/phy/realtek/phy-rtk-usb2.c | 2 +- + drivers/phy/realtek/phy-rtk-usb3.c | 2 +- + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 8 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 8 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 200 ++++-- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 17 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 2 +- + drivers/phy/rockchip/phy-rockchip-usbdp.c | 41 ++ + drivers/phy/st/Kconfig | 11 + + drivers/phy/st/Makefile | 1 + + drivers/phy/st/phy-stm32-combophy.c | 598 +++++++++++++++++ + drivers/phy/st/phy-stm32-usbphyc.c | 2 +- + drivers/phy/tegra/xusb.c | 2 +- + drivers/phy/ti/phy-am654-serdes.c | 2 +- + drivers/phy/ti/phy-da8xx-usb.c | 4 +- + drivers/phy/ti/phy-dm816x-usb.c | 2 +- + drivers/phy/ti/phy-gmii-sel.c | 3 +- + drivers/phy/ti/phy-j721e-wiz.c | 2 +- + drivers/phy/ti/phy-omap-usb2.c | 2 +- + drivers/phy/ti/phy-ti-pipe3.c | 2 +- + drivers/phy/ti/phy-twl4030-usb.c | 2 +- + drivers/phy/xilinx/phy-zynqmp.c | 2 +- + include/linux/phy/phy-sun4i-usb.h | 2 +- + 81 files changed, 3056 insertions(+), 1069 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/nxp,ptn3222.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-inno-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3228-hdmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/st,stm32mp25-combophy.yaml + create mode 100644 drivers/phy/phy-nxp-ptn3222.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_30.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_30.h + create mode 100644 drivers/phy/st/phy-stm32-combophy.c +Merging soundwire/next (dd690b31de0e soundwire: Minor formatting fixups in sdw.h header) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/soundwire/amd_init.c +Auto-merging include/linux/soundwire/sdw.h +CONFLICT (content): Merge conflict in include/linux/soundwire/sdw.h +Auto-merging include/linux/soundwire/sdw_amd.h +Auto-merging sound/soc/amd/ps/pci-ps.c +Auto-merging sound/soc/sof/amd/acp.c +Resolved 'include/linux/soundwire/sdw.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b3a3b43f2ef3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 4 + + drivers/soundwire/amd_init.c | 1 + + drivers/soundwire/amd_manager.c | 99 ++++++---- + drivers/soundwire/amd_manager.h | 16 +- + drivers/soundwire/bus.c | 2 +- + drivers/soundwire/cadence_master.c | 30 +++ + drivers/soundwire/cadence_master.h | 1 + + drivers/soundwire/intel_auxdevice.c | 12 +- + drivers/soundwire/intel_bus_common.c | 6 + + drivers/soundwire/mipi_disco.c | 144 +++++++++++--- + drivers/soundwire/qcom.c | 2 +- + drivers/soundwire/sysfs_slave.c | 2 +- + include/linux/soundwire/sdw.h | 245 +++++++++++------------- + include/linux/soundwire/sdw_amd.h | 6 + + sound/soc/amd/ps/acp63.h | 2 + + sound/soc/amd/ps/pci-ps.c | 2 + + sound/soc/sof/amd/acp.c | 1 + + 18 files changed, 368 insertions(+), 208 deletions(-) +Merging extcon/extcon-next (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (fe4bf8d0b671 vfio/pci: Properly hide first-in-list PCIe extended capability) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging drivers/virtio/virtio_pci_common.h +Auto-merging drivers/virtio/virtio_pci_modern.c +Auto-merging include/linux/virtio.h +Auto-merging virt/kvm/vfio.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-migration | 25 + + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 266 ++++- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 19 + + drivers/vfio/pci/mlx5/cmd.c | 6 +- + drivers/vfio/pci/mlx5/main.c | 35 +- + drivers/vfio/pci/nvgrace-gpu/main.c | 2 + + drivers/vfio/pci/qat/main.c | 2 +- + drivers/vfio/pci/vfio_pci_config.c | 16 +- + drivers/vfio/pci/virtio/Kconfig | 40 +- + drivers/vfio/pci/virtio/Makefile | 3 +- + drivers/vfio/pci/virtio/common.h | 127 ++ + drivers/vfio/pci/virtio/legacy_io.c | 418 +++++++ + drivers/vfio/pci/virtio/main.c | 478 ++------ + drivers/vfio/pci/virtio/migrate.c | 1337 ++++++++++++++++++++++ + drivers/virtio/virtio_pci_common.h | 19 +- + drivers/virtio/virtio_pci_modern.c | 457 +++++++- + include/linux/virtio.h | 1 + + include/linux/virtio_pci_admin.h | 11 + + include/uapi/linux/virtio_pci.h | 131 +++ + virt/kvm/vfio.c | 2 +- + 20 files changed, 2920 insertions(+), 475 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-hisi-migration + create mode 100644 drivers/vfio/pci/virtio/common.h + create mode 100644 drivers/vfio/pci/virtio/legacy_io.c + create mode 100644 drivers/vfio/pci/virtio/migrate.c +Merging w1/for-next (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (114eae3c9fde Staging: gpib: gpib_os.c - Remove unnecessary OOM message) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/staging/media/meson/vdec/vdec.c +CONFLICT (modify/delete): drivers/staging/media/omap4iss/iss.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap4iss/iss.c left in tree. +Auto-merging drivers/staging/media/rkvdec/rkvdec.c +Auto-merging drivers/staging/media/tegra-video/vi.c +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/omap4iss/iss.c +rm 'drivers/staging/media/omap4iss/iss.c' +$ git commit --no-edit -v -a +[master 841e9a72b192] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 33 +- + drivers/staging/Kconfig | 16 +- + drivers/staging/Makefile | 8 +- + drivers/staging/axis-fifo/axis-fifo.c | 2 +- + drivers/staging/fbtft/fbtft.h | 2 +- + .../fieldbus/Documentation/ABI/fieldbus-dev-cdev | 31 - + .../Documentation/ABI/sysfs-class-fieldbus-dev | 62 - + .../bindings/fieldbus/arcx,anybus-controller.txt | 71 - + .../fieldbus/Documentation/fieldbus_dev.txt | 66 - + drivers/staging/fieldbus/Kconfig | 19 - + drivers/staging/fieldbus/Makefile | 7 - + drivers/staging/fieldbus/TODO | 5 - + drivers/staging/fieldbus/anybuss/Kconfig | 41 - + drivers/staging/fieldbus/anybuss/Makefile | 10 - + drivers/staging/fieldbus/anybuss/anybuss-client.h | 95 - + .../staging/fieldbus/anybuss/anybuss-controller.h | 47 - + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 379 -- + drivers/staging/fieldbus/anybuss/hms-profinet.c | 224 - + drivers/staging/fieldbus/anybuss/host.c | 1452 ------ + drivers/staging/fieldbus/dev_core.c | 344 -- + drivers/staging/fieldbus/fieldbus_dev.h | 114 - + drivers/staging/gdm724x/Kconfig | 16 - + drivers/staging/gdm724x/Makefile | 8 - + drivers/staging/gdm724x/TODO | 16 - + drivers/staging/gdm724x/gdm_endian.c | 37 - + drivers/staging/gdm724x/gdm_endian.h | 30 - + drivers/staging/gdm724x/gdm_lte.c | 937 ---- + drivers/staging/gdm724x/gdm_lte.h | 71 - + drivers/staging/gdm724x/gdm_mux.c | 668 --- + drivers/staging/gdm724x/gdm_mux.h | 85 - + drivers/staging/gdm724x/gdm_tty.c | 316 -- + drivers/staging/gdm724x/gdm_tty.h | 60 - + drivers/staging/gdm724x/gdm_usb.c | 1012 ----- + drivers/staging/gdm724x/gdm_usb.h | 99 - + drivers/staging/gdm724x/hci.h | 45 - + drivers/staging/gdm724x/hci_packet.h | 82 - + drivers/staging/gdm724x/netlink_k.c | 128 - + drivers/staging/gdm724x/netlink_k.h | 16 - + drivers/staging/gpib/Kconfig | 251 ++ + drivers/staging/gpib/Makefile | 20 + + drivers/staging/gpib/TODO | 21 + + drivers/staging/gpib/agilent_82350b/Makefile | 2 + + .../staging/gpib/agilent_82350b/agilent_82350b.c | 932 ++++ + .../staging/gpib/agilent_82350b/agilent_82350b.h | 209 + + drivers/staging/gpib/agilent_82357a/Makefile | 4 + + .../staging/gpib/agilent_82357a/agilent_82357a.c | 1712 +++++++ + .../staging/gpib/agilent_82357a/agilent_82357a.h | 182 + + drivers/staging/gpib/cb7210/Makefile | 4 + + drivers/staging/gpib/cb7210/cb7210.c | 1556 +++++++ + drivers/staging/gpib/cb7210/cb7210.h | 251 ++ + drivers/staging/gpib/cec/Makefile | 3 + + drivers/staging/gpib/cec/cec.h | 53 + + drivers/staging/gpib/cec/cec_gpib.c | 385 ++ + drivers/staging/gpib/common/Makefile | 6 + + drivers/staging/gpib/common/gpib_os.c | 2328 ++++++++++ + drivers/staging/gpib/common/iblib.c | 740 +++ + drivers/staging/gpib/common/ibsys.h | 31 + + drivers/staging/gpib/eastwood/Makefile | 3 + + drivers/staging/gpib/eastwood/fluke_gpib.c | 1179 +++++ + drivers/staging/gpib/eastwood/fluke_gpib.h | 143 + + drivers/staging/gpib/fmh_gpib/Makefile | 2 + + drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 1725 +++++++ + drivers/staging/gpib/fmh_gpib/fmh_gpib.h | 177 + + drivers/staging/gpib/gpio/Makefile | 4 + + drivers/staging/gpib/gpio/gpib_bitbang.c | 1476 ++++++ + drivers/staging/gpib/hp_82335/Makefile | 4 + + drivers/staging/gpib/hp_82335/hp82335.c | 360 ++ + drivers/staging/gpib/hp_82335/hp82335.h | 85 + + drivers/staging/gpib/hp_82341/Makefile | 2 + + drivers/staging/gpib/hp_82341/hp_82341.c | 895 ++++ + drivers/staging/gpib/hp_82341/hp_82341.h | 207 + + drivers/staging/gpib/include/amcc5920.h | 49 + + drivers/staging/gpib/include/amccs5933.h | 59 + + drivers/staging/gpib/include/gpibP.h | 50 + + drivers/staging/gpib/include/gpib_pci_ids.h | 23 + + drivers/staging/gpib/include/gpib_proto.h | 56 + + drivers/staging/gpib/include/gpib_state_machines.h | 23 + + drivers/staging/gpib/include/gpib_types.h | 353 ++ + drivers/staging/gpib/include/nec7210.h | 138 + + drivers/staging/gpib/include/nec7210_registers.h | 217 + + drivers/staging/gpib/include/plx9050.h | 72 + + drivers/staging/gpib/include/quancom_pci.h | 22 + + drivers/staging/gpib/include/tms9914.h | 274 ++ + drivers/staging/gpib/include/tnt4882_registers.h | 192 + + drivers/staging/gpib/ines/Makefile | 4 + + drivers/staging/gpib/ines/ines.h | 215 + + drivers/staging/gpib/ines/ines_gpib.c | 1464 ++++++ + drivers/staging/gpib/lpvo_usb_gpib/Makefile | 3 + + drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 2136 +++++++++ + drivers/staging/gpib/nec7210/Makefile | 4 + + drivers/staging/gpib/nec7210/board.h | 19 + + drivers/staging/gpib/nec7210/nec7210.c | 1134 +++++ + drivers/staging/gpib/ni_usb/Makefile | 4 + + drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 2640 +++++++++++ + drivers/staging/gpib/ni_usb/ni_usb_gpib.h | 216 + + drivers/staging/gpib/pc2/Makefile | 5 + + drivers/staging/gpib/pc2/pc2_gpib.c | 656 +++ + drivers/staging/gpib/tms9914/Makefile | 6 + + drivers/staging/gpib/tms9914/tms9914.c | 910 ++++ + drivers/staging/gpib/tnt4882/Makefile | 7 + + drivers/staging/gpib/tnt4882/mite.c | 219 + + drivers/staging/gpib/tnt4882/mite.h | 243 + + drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 1874 ++++++++ + drivers/staging/gpib/uapi/gpib_ioctl.h | 169 + + drivers/staging/gpib/uapi/gpib_user.h | 363 ++ + drivers/staging/greybus/arche-apb-ctrl.c | 2 +- + drivers/staging/greybus/arche-platform.c | 2 +- + drivers/staging/greybus/gpio.c | 33 +- + drivers/staging/greybus/uart.c | 2 + + drivers/staging/iio/TODO | 5 - + .../media/deprecated/atmel/atmel-sama5d2-isc.c | 2 +- + .../media/deprecated/atmel/atmel-sama7g5-isc.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/imx/imx-media-dev.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- + drivers/staging/media/meson/vdec/vdec.c | 2 +- + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/starfive/camss/stf-camss.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 2 +- + drivers/staging/media/tegra-video/csi.c | 2 +- + drivers/staging/media/tegra-video/vi.c | 2 +- + drivers/staging/media/tegra-video/vip.c | 2 +- + drivers/staging/most/TODO | 7 - + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/most/i2c/i2c.c | 4 +- + drivers/staging/nvec/nvec.c | 2 +- + drivers/staging/nvec/nvec_kbd.c | 2 +- + drivers/staging/nvec/nvec_power.c | 2 +- + drivers/staging/nvec/nvec_ps2.c | 2 +- + drivers/staging/octeon/ethernet-tx.c | 6 +- + drivers/staging/octeon/ethernet.c | 2 +- + drivers/staging/olpc_dcon/Kconfig | 17 - + drivers/staging/olpc_dcon/Makefile | 5 - + drivers/staging/olpc_dcon/TODO | 15 - + drivers/staging/olpc_dcon/olpc_dcon.c | 807 ---- + drivers/staging/olpc_dcon/olpc_dcon.h | 112 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 201 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 204 - + drivers/staging/rtl8712/Kconfig | 21 - + drivers/staging/rtl8712/Makefile | 35 - + drivers/staging/rtl8712/TODO | 12 - + drivers/staging/rtl8712/basic_types.h | 28 - + drivers/staging/rtl8712/drv_types.h | 175 - + drivers/staging/rtl8712/ethernet.h | 21 - + drivers/staging/rtl8712/hal_init.c | 401 -- + drivers/staging/rtl8712/ieee80211.c | 415 -- + drivers/staging/rtl8712/ieee80211.h | 165 - + drivers/staging/rtl8712/mlme_linux.c | 160 - + drivers/staging/rtl8712/mlme_osdep.h | 31 - + drivers/staging/rtl8712/mp_custom_oid.h | 287 -- + drivers/staging/rtl8712/os_intfs.c | 482 -- + drivers/staging/rtl8712/osdep_intf.h | 32 - + drivers/staging/rtl8712/osdep_service.h | 60 - + drivers/staging/rtl8712/recv_linux.c | 139 - + drivers/staging/rtl8712/recv_osdep.h | 39 - + drivers/staging/rtl8712/rtl8712_bitdef.h | 26 - + drivers/staging/rtl8712/rtl8712_cmd.c | 409 -- + drivers/staging/rtl8712/rtl8712_cmd.h | 231 - + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 95 - + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 19 - + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 41 - + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 32 - + .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 65 - + .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 24 - + drivers/staging/rtl8712/rtl8712_efuse.c | 563 --- + drivers/staging/rtl8712/rtl8712_efuse.h | 44 - + drivers/staging/rtl8712/rtl8712_event.h | 86 - + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 131 - + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 61 - + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 68 - + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 29 - + drivers/staging/rtl8712/rtl8712_hal.h | 142 - + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 44 - + drivers/staging/rtl8712/rtl8712_io.c | 99 - + drivers/staging/rtl8712/rtl8712_led.c | 1830 -------- + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 31 - + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 20 - + drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 39 - + drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 26 - + drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 36 - + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 43 - + drivers/staging/rtl8712/rtl8712_recv.c | 1075 ----- + drivers/staging/rtl8712/rtl8712_recv.h | 145 - + drivers/staging/rtl8712/rtl8712_regdef.h | 32 - + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 34 - + drivers/staging/rtl8712/rtl8712_spec.h | 121 - + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 163 - + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 42 - + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 49 - + drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 26 - + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 49 - + drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 36 - + drivers/staging/rtl8712/rtl8712_xmit.c | 732 --- + drivers/staging/rtl8712/rtl8712_xmit.h | 108 - + drivers/staging/rtl8712/rtl871x_cmd.c | 750 ---- + drivers/staging/rtl8712/rtl871x_cmd.h | 750 ---- + drivers/staging/rtl8712/rtl871x_debug.h | 130 - + drivers/staging/rtl8712/rtl871x_eeprom.c | 220 - + drivers/staging/rtl8712/rtl871x_eeprom.h | 88 - + drivers/staging/rtl8712/rtl871x_event.h | 109 - + drivers/staging/rtl8712/rtl871x_ht.h | 33 - + drivers/staging/rtl8712/rtl871x_io.c | 147 - + drivers/staging/rtl8712/rtl871x_io.h | 236 - + drivers/staging/rtl8712/rtl871x_ioctl.h | 94 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2275 ---------- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 519 --- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 109 - + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 354 -- + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 45 - + drivers/staging/rtl8712/rtl871x_led.h | 118 - + drivers/staging/rtl8712/rtl871x_mlme.c | 1710 ------- + drivers/staging/rtl8712/rtl871x_mlme.h | 205 - + drivers/staging/rtl8712/rtl871x_mp.c | 724 --- + drivers/staging/rtl8712/rtl871x_mp.h | 275 -- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 883 ---- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 328 -- + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 1034 ----- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 234 - + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 113 - + drivers/staging/rtl8712/rtl871x_recv.c | 671 --- + drivers/staging/rtl8712/rtl871x_recv.h | 208 - + drivers/staging/rtl8712/rtl871x_rf.h | 55 - + drivers/staging/rtl8712/rtl871x_security.c | 1386 ------ + drivers/staging/rtl8712/rtl871x_security.h | 218 - + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 263 -- + drivers/staging/rtl8712/rtl871x_wlan_sme.h | 35 - + drivers/staging/rtl8712/rtl871x_xmit.c | 1056 ----- + drivers/staging/rtl8712/rtl871x_xmit.h | 287 -- + drivers/staging/rtl8712/sta_info.h | 132 - + drivers/staging/rtl8712/usb_halinit.c | 307 -- + drivers/staging/rtl8712/usb_intf.c | 638 --- + drivers/staging/rtl8712/usb_ops.c | 195 - + drivers/staging/rtl8712/usb_ops.h | 38 - + drivers/staging/rtl8712/usb_ops_linux.c | 508 --- + drivers/staging/rtl8712/usb_osintf.h | 35 - + drivers/staging/rtl8712/wifi.h | 196 - + drivers/staging/rtl8712/wlan_bssdef.h | 223 - + drivers/staging/rtl8712/xmit_linux.c | 181 - + drivers/staging/rtl8712/xmit_osdep.h | 52 - + drivers/staging/rtl8723bs/TODO | 3 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 94 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 7 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 68 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 42 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 137 +- + drivers/staging/rtl8723bs/hal/odm.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 550 +-- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 15 - + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 59 +- + drivers/staging/rtl8723bs/include/drv_types.h | 10 - + drivers/staging/rtl8723bs/include/hal_com.h | 4 - + drivers/staging/rtl8723bs/include/hal_intf.h | 95 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 5 - + drivers/staging/rtl8723bs/include/osdep_intf.h | 3 - + drivers/staging/rtl8723bs/include/osdep_service.h | 5 - + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 5 + + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 2 + + drivers/staging/rtl8723bs/include/rtw_efuse.h | 4 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 5 - + drivers/staging/rtl8723bs/include/rtw_mp.h | 4 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 17 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 31 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 17 +- + drivers/staging/rts5208/Kconfig | 9 - + drivers/staging/rts5208/Makefile | 5 - + drivers/staging/rts5208/TODO | 7 - + drivers/staging/rts5208/general.c | 25 - + drivers/staging/rts5208/general.h | 19 - + drivers/staging/rts5208/ms.c | 4311 ------------------ + drivers/staging/rts5208/ms.h | 214 - + drivers/staging/rts5208/rtsx.c | 987 ---- + drivers/staging/rts5208/rtsx.h | 164 - + drivers/staging/rts5208/rtsx_card.c | 1151 ----- + drivers/staging/rts5208/rtsx_card.h | 1087 ----- + drivers/staging/rts5208/rtsx_chip.c | 2161 --------- + drivers/staging/rts5208/rtsx_chip.h | 987 ---- + drivers/staging/rts5208/rtsx_scsi.c | 3279 -------------- + drivers/staging/rts5208/rtsx_scsi.h | 131 - + drivers/staging/rts5208/rtsx_sys.h | 36 - + drivers/staging/rts5208/rtsx_transport.c | 768 ---- + drivers/staging/rts5208/rtsx_transport.h | 57 - + drivers/staging/rts5208/sd.c | 4717 -------------------- + drivers/staging/rts5208/sd.h | 289 -- + drivers/staging/rts5208/spi.c | 906 ---- + drivers/staging/rts5208/spi.h | 52 - + drivers/staging/rts5208/xd.c | 2145 --------- + drivers/staging/rts5208/xd.h | 176 - + drivers/staging/sm750fb/TODO | 5 - + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 3 +- + .../include/linux/raspberrypi/vchiq.h | 7 +- + drivers/staging/vc04_services/interface/TESTING | 4 +- + drivers/staging/vc04_services/interface/TODO | 13 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 518 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 3 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 696 ++- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 55 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 3 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 42 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../interface/vchiq_arm/vchiq_pagelist.h | 21 - + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 7 +- + drivers/staging/vme_user/vme_bridge.h | 56 +- + drivers/staging/vt6655/Kconfig | 6 - + drivers/staging/vt6655/Makefile | 15 - + drivers/staging/vt6655/TODO | 20 - + drivers/staging/vt6655/baseband.c | 2257 ---------- + drivers/staging/vt6655/baseband.h | 72 - + drivers/staging/vt6655/card.c | 836 ---- + drivers/staging/vt6655/card.h | 62 - + drivers/staging/vt6655/channel.c | 135 - + drivers/staging/vt6655/channel.h | 17 - + drivers/staging/vt6655/desc.h | 249 -- + drivers/staging/vt6655/device.h | 292 -- + drivers/staging/vt6655/device_cfg.h | 44 - + drivers/staging/vt6655/device_main.c | 1868 -------- + drivers/staging/vt6655/dpc.c | 145 - + drivers/staging/vt6655/dpc.h | 21 - + drivers/staging/vt6655/key.c | 143 - + drivers/staging/vt6655/key.h | 51 - + drivers/staging/vt6655/mac.c | 851 ---- + drivers/staging/vt6655/mac.h | 580 --- + drivers/staging/vt6655/power.c | 144 - + drivers/staging/vt6655/power.h | 29 - + drivers/staging/vt6655/rf.c | 535 --- + drivers/staging/vt6655/rf.h | 71 - + drivers/staging/vt6655/rxtx.c | 1462 ------ + drivers/staging/vt6655/rxtx.h | 184 - + drivers/staging/vt6655/srom.c | 139 - + drivers/staging/vt6655/srom.h | 85 - + drivers/staging/vt6655/test | 9 - + drivers/staging/vt6656/Kconfig | 7 - + drivers/staging/vt6656/Makefile | 15 - + drivers/staging/vt6656/TODO | 17 - + drivers/staging/vt6656/baseband.c | 455 -- + drivers/staging/vt6656/baseband.h | 75 - + drivers/staging/vt6656/card.c | 456 -- + drivers/staging/vt6656/card.h | 44 - + drivers/staging/vt6656/channel.c | 77 - + drivers/staging/vt6656/channel.h | 21 - + drivers/staging/vt6656/desc.h | 91 - + drivers/staging/vt6656/device.h | 386 -- + drivers/staging/vt6656/key.c | 142 - + drivers/staging/vt6656/key.h | 40 - + drivers/staging/vt6656/mac.c | 183 - + drivers/staging/vt6656/mac.h | 373 -- + drivers/staging/vt6656/main_usb.c | 1121 ----- + drivers/staging/vt6656/power.c | 112 - + drivers/staging/vt6656/power.h | 23 - + drivers/staging/vt6656/rf.c | 443 -- + drivers/staging/vt6656/rf.h | 46 - + drivers/staging/vt6656/rxtx.c | 730 --- + drivers/staging/vt6656/rxtx.h | 178 - + drivers/staging/vt6656/usbpipe.c | 506 --- + drivers/staging/vt6656/usbpipe.h | 67 - + drivers/staging/vt6656/wcmd.c | 185 - + drivers/staging/vt6656/wcmd.h | 48 - + 363 files changed, 29652 insertions(+), 77267 deletions(-) + delete mode 100644 drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev + delete mode 100644 drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev + delete mode 100644 drivers/staging/fieldbus/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt + delete mode 100644 drivers/staging/fieldbus/Documentation/fieldbus_dev.txt + delete mode 100644 drivers/staging/fieldbus/Kconfig + delete mode 100644 drivers/staging/fieldbus/Makefile + delete mode 100644 drivers/staging/fieldbus/TODO + delete mode 100644 drivers/staging/fieldbus/anybuss/Kconfig + delete mode 100644 drivers/staging/fieldbus/anybuss/Makefile + delete mode 100644 drivers/staging/fieldbus/anybuss/anybuss-client.h + delete mode 100644 drivers/staging/fieldbus/anybuss/anybuss-controller.h + delete mode 100644 drivers/staging/fieldbus/anybuss/arcx-anybus.c + delete mode 100644 drivers/staging/fieldbus/anybuss/hms-profinet.c + delete mode 100644 drivers/staging/fieldbus/anybuss/host.c + delete mode 100644 drivers/staging/fieldbus/dev_core.c + delete mode 100644 drivers/staging/fieldbus/fieldbus_dev.h + delete mode 100644 drivers/staging/gdm724x/Kconfig + delete mode 100644 drivers/staging/gdm724x/Makefile + delete mode 100644 drivers/staging/gdm724x/TODO + delete mode 100644 drivers/staging/gdm724x/gdm_endian.c + delete mode 100644 drivers/staging/gdm724x/gdm_endian.h + delete mode 100644 drivers/staging/gdm724x/gdm_lte.c + delete mode 100644 drivers/staging/gdm724x/gdm_lte.h + delete mode 100644 drivers/staging/gdm724x/gdm_mux.c + delete mode 100644 drivers/staging/gdm724x/gdm_mux.h + delete mode 100644 drivers/staging/gdm724x/gdm_tty.c + delete mode 100644 drivers/staging/gdm724x/gdm_tty.h + delete mode 100644 drivers/staging/gdm724x/gdm_usb.c + delete mode 100644 drivers/staging/gdm724x/gdm_usb.h + delete mode 100644 drivers/staging/gdm724x/hci.h + delete mode 100644 drivers/staging/gdm724x/hci_packet.h + delete mode 100644 drivers/staging/gdm724x/netlink_k.c + delete mode 100644 drivers/staging/gdm724x/netlink_k.h + create mode 100644 drivers/staging/gpib/Kconfig + create mode 100644 drivers/staging/gpib/Makefile + create mode 100644 drivers/staging/gpib/TODO + create mode 100644 drivers/staging/gpib/agilent_82350b/Makefile + create mode 100644 drivers/staging/gpib/agilent_82350b/agilent_82350b.c + create mode 100644 drivers/staging/gpib/agilent_82350b/agilent_82350b.h + create mode 100644 drivers/staging/gpib/agilent_82357a/Makefile + create mode 100644 drivers/staging/gpib/agilent_82357a/agilent_82357a.c + create mode 100644 drivers/staging/gpib/agilent_82357a/agilent_82357a.h + create mode 100644 drivers/staging/gpib/cb7210/Makefile + create mode 100644 drivers/staging/gpib/cb7210/cb7210.c + create mode 100644 drivers/staging/gpib/cb7210/cb7210.h + create mode 100644 drivers/staging/gpib/cec/Makefile + create mode 100644 drivers/staging/gpib/cec/cec.h + create mode 100644 drivers/staging/gpib/cec/cec_gpib.c + create mode 100644 drivers/staging/gpib/common/Makefile + create mode 100644 drivers/staging/gpib/common/gpib_os.c + create mode 100644 drivers/staging/gpib/common/iblib.c + create mode 100644 drivers/staging/gpib/common/ibsys.h + create mode 100644 drivers/staging/gpib/eastwood/Makefile + create mode 100644 drivers/staging/gpib/eastwood/fluke_gpib.c + create mode 100644 drivers/staging/gpib/eastwood/fluke_gpib.h + create mode 100644 drivers/staging/gpib/fmh_gpib/Makefile + create mode 100644 drivers/staging/gpib/fmh_gpib/fmh_gpib.c + create mode 100644 drivers/staging/gpib/fmh_gpib/fmh_gpib.h + create mode 100644 drivers/staging/gpib/gpio/Makefile + create mode 100644 drivers/staging/gpib/gpio/gpib_bitbang.c + create mode 100644 drivers/staging/gpib/hp_82335/Makefile + create mode 100644 drivers/staging/gpib/hp_82335/hp82335.c + create mode 100644 drivers/staging/gpib/hp_82335/hp82335.h + create mode 100644 drivers/staging/gpib/hp_82341/Makefile + create mode 100644 drivers/staging/gpib/hp_82341/hp_82341.c + create mode 100644 drivers/staging/gpib/hp_82341/hp_82341.h + create mode 100644 drivers/staging/gpib/include/amcc5920.h + create mode 100644 drivers/staging/gpib/include/amccs5933.h + create mode 100644 drivers/staging/gpib/include/gpibP.h + create mode 100644 drivers/staging/gpib/include/gpib_pci_ids.h + create mode 100644 drivers/staging/gpib/include/gpib_proto.h + create mode 100644 drivers/staging/gpib/include/gpib_state_machines.h + create mode 100644 drivers/staging/gpib/include/gpib_types.h + create mode 100644 drivers/staging/gpib/include/nec7210.h + create mode 100644 drivers/staging/gpib/include/nec7210_registers.h + create mode 100644 drivers/staging/gpib/include/plx9050.h + create mode 100644 drivers/staging/gpib/include/quancom_pci.h + create mode 100644 drivers/staging/gpib/include/tms9914.h + create mode 100644 drivers/staging/gpib/include/tnt4882_registers.h + create mode 100644 drivers/staging/gpib/ines/Makefile + create mode 100644 drivers/staging/gpib/ines/ines.h + create mode 100644 drivers/staging/gpib/ines/ines_gpib.c + create mode 100644 drivers/staging/gpib/lpvo_usb_gpib/Makefile + create mode 100644 drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c + create mode 100644 drivers/staging/gpib/nec7210/Makefile + create mode 100644 drivers/staging/gpib/nec7210/board.h + create mode 100644 drivers/staging/gpib/nec7210/nec7210.c + create mode 100644 drivers/staging/gpib/ni_usb/Makefile + create mode 100644 drivers/staging/gpib/ni_usb/ni_usb_gpib.c + create mode 100644 drivers/staging/gpib/ni_usb/ni_usb_gpib.h + create mode 100644 drivers/staging/gpib/pc2/Makefile + create mode 100644 drivers/staging/gpib/pc2/pc2_gpib.c + create mode 100644 drivers/staging/gpib/tms9914/Makefile + create mode 100644 drivers/staging/gpib/tms9914/tms9914.c + create mode 100644 drivers/staging/gpib/tnt4882/Makefile + create mode 100644 drivers/staging/gpib/tnt4882/mite.c + create mode 100644 drivers/staging/gpib/tnt4882/mite.h + create mode 100644 drivers/staging/gpib/tnt4882/tnt4882_gpib.c + create mode 100644 drivers/staging/gpib/uapi/gpib_ioctl.h + create mode 100644 drivers/staging/gpib/uapi/gpib_user.h + delete mode 100644 drivers/staging/iio/TODO + delete mode 100644 drivers/staging/olpc_dcon/Kconfig + delete mode 100644 drivers/staging/olpc_dcon/Makefile + delete mode 100644 drivers/staging/olpc_dcon/TODO + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c + delete mode 100644 drivers/staging/rtl8712/Kconfig + delete mode 100644 drivers/staging/rtl8712/Makefile + delete mode 100644 drivers/staging/rtl8712/TODO + delete mode 100644 drivers/staging/rtl8712/basic_types.h + delete mode 100644 drivers/staging/rtl8712/drv_types.h + delete mode 100644 drivers/staging/rtl8712/ethernet.h + delete mode 100644 drivers/staging/rtl8712/hal_init.c + delete mode 100644 drivers/staging/rtl8712/ieee80211.c + delete mode 100644 drivers/staging/rtl8712/ieee80211.h + delete mode 100644 drivers/staging/rtl8712/mlme_linux.c + delete mode 100644 drivers/staging/rtl8712/mlme_osdep.h + delete mode 100644 drivers/staging/rtl8712/mp_custom_oid.h + delete mode 100644 drivers/staging/rtl8712/os_intfs.c + delete mode 100644 drivers/staging/rtl8712/osdep_intf.h + delete mode 100644 drivers/staging/rtl8712/osdep_service.h + delete mode 100644 drivers/staging/rtl8712/recv_linux.c + delete mode 100644 drivers/staging/rtl8712/recv_osdep.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_cmd.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_cmd.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_efuse.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_efuse.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_event.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_gp_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_gp_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_hal.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_io.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_led.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_powersave_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_recv.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_recv.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_security_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_spec.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_wmac_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl8712_xmit.c + delete mode 100644 drivers/staging/rtl8712/rtl8712_xmit.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_cmd.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_cmd.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_debug.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_event.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_ht.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_io.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_io.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_linux.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_led.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_mlme.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_mlme.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_mp.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_mp.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_recv.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_recv.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_rf.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_security.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_security.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_sta_mgt.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_wlan_sme.h + delete mode 100644 drivers/staging/rtl8712/rtl871x_xmit.c + delete mode 100644 drivers/staging/rtl8712/rtl871x_xmit.h + delete mode 100644 drivers/staging/rtl8712/sta_info.h + delete mode 100644 drivers/staging/rtl8712/usb_halinit.c + delete mode 100644 drivers/staging/rtl8712/usb_intf.c + delete mode 100644 drivers/staging/rtl8712/usb_ops.c + delete mode 100644 drivers/staging/rtl8712/usb_ops.h + delete mode 100644 drivers/staging/rtl8712/usb_ops_linux.c + delete mode 100644 drivers/staging/rtl8712/usb_osintf.h + delete mode 100644 drivers/staging/rtl8712/wifi.h + delete mode 100644 drivers/staging/rtl8712/wlan_bssdef.h + delete mode 100644 drivers/staging/rtl8712/xmit_linux.c + delete mode 100644 drivers/staging/rtl8712/xmit_osdep.h + delete mode 100644 drivers/staging/rts5208/Kconfig + delete mode 100644 drivers/staging/rts5208/Makefile + delete mode 100644 drivers/staging/rts5208/TODO + delete mode 100644 drivers/staging/rts5208/general.c + delete mode 100644 drivers/staging/rts5208/general.h + delete mode 100644 drivers/staging/rts5208/ms.c + delete mode 100644 drivers/staging/rts5208/ms.h + delete mode 100644 drivers/staging/rts5208/rtsx.c + delete mode 100644 drivers/staging/rts5208/rtsx.h + delete mode 100644 drivers/staging/rts5208/rtsx_card.c + delete mode 100644 drivers/staging/rts5208/rtsx_card.h + delete mode 100644 drivers/staging/rts5208/rtsx_chip.c + delete mode 100644 drivers/staging/rts5208/rtsx_chip.h + delete mode 100644 drivers/staging/rts5208/rtsx_scsi.c + delete mode 100644 drivers/staging/rts5208/rtsx_scsi.h + delete mode 100644 drivers/staging/rts5208/rtsx_sys.h + delete mode 100644 drivers/staging/rts5208/rtsx_transport.c + delete mode 100644 drivers/staging/rts5208/rtsx_transport.h + delete mode 100644 drivers/staging/rts5208/sd.c + delete mode 100644 drivers/staging/rts5208/sd.h + delete mode 100644 drivers/staging/rts5208/spi.c + delete mode 100644 drivers/staging/rts5208/spi.h + delete mode 100644 drivers/staging/rts5208/xd.c + delete mode 100644 drivers/staging/rts5208/xd.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h + delete mode 100644 drivers/staging/vt6655/Kconfig + delete mode 100644 drivers/staging/vt6655/Makefile + delete mode 100644 drivers/staging/vt6655/TODO + delete mode 100644 drivers/staging/vt6655/baseband.c + delete mode 100644 drivers/staging/vt6655/baseband.h + delete mode 100644 drivers/staging/vt6655/card.c + delete mode 100644 drivers/staging/vt6655/card.h + delete mode 100644 drivers/staging/vt6655/channel.c + delete mode 100644 drivers/staging/vt6655/channel.h + delete mode 100644 drivers/staging/vt6655/desc.h + delete mode 100644 drivers/staging/vt6655/device.h + delete mode 100644 drivers/staging/vt6655/device_cfg.h + delete mode 100644 drivers/staging/vt6655/device_main.c + delete mode 100644 drivers/staging/vt6655/dpc.c + delete mode 100644 drivers/staging/vt6655/dpc.h + delete mode 100644 drivers/staging/vt6655/key.c + delete mode 100644 drivers/staging/vt6655/key.h + delete mode 100644 drivers/staging/vt6655/mac.c + delete mode 100644 drivers/staging/vt6655/mac.h + delete mode 100644 drivers/staging/vt6655/power.c + delete mode 100644 drivers/staging/vt6655/power.h + delete mode 100644 drivers/staging/vt6655/rf.c + delete mode 100644 drivers/staging/vt6655/rf.h + delete mode 100644 drivers/staging/vt6655/rxtx.c + delete mode 100644 drivers/staging/vt6655/rxtx.h + delete mode 100644 drivers/staging/vt6655/srom.c + delete mode 100644 drivers/staging/vt6655/srom.h + delete mode 100644 drivers/staging/vt6655/test + delete mode 100644 drivers/staging/vt6656/Kconfig + delete mode 100644 drivers/staging/vt6656/Makefile + delete mode 100644 drivers/staging/vt6656/TODO + delete mode 100644 drivers/staging/vt6656/baseband.c + delete mode 100644 drivers/staging/vt6656/baseband.h + delete mode 100644 drivers/staging/vt6656/card.c + delete mode 100644 drivers/staging/vt6656/card.h + delete mode 100644 drivers/staging/vt6656/channel.c + delete mode 100644 drivers/staging/vt6656/channel.h + delete mode 100644 drivers/staging/vt6656/desc.h + delete mode 100644 drivers/staging/vt6656/device.h + delete mode 100644 drivers/staging/vt6656/key.c + delete mode 100644 drivers/staging/vt6656/key.h + delete mode 100644 drivers/staging/vt6656/mac.c + delete mode 100644 drivers/staging/vt6656/mac.h + delete mode 100644 drivers/staging/vt6656/main_usb.c + delete mode 100644 drivers/staging/vt6656/power.c + delete mode 100644 drivers/staging/vt6656/power.h + delete mode 100644 drivers/staging/vt6656/rf.c + delete mode 100644 drivers/staging/vt6656/rf.h + delete mode 100644 drivers/staging/vt6656/rxtx.c + delete mode 100644 drivers/staging/vt6656/rxtx.h + delete mode 100644 drivers/staging/vt6656/usbpipe.c + delete mode 100644 drivers/staging/vt6656/usbpipe.h + delete mode 100644 drivers/staging/vt6656/wcmd.c + delete mode 100644 drivers/staging/vt6656/wcmd.h +Merging counter-next/counter-next (522ae89b7858 counter: intel-qep: Replace deprecated PCI functions) +$ 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 (49a9b01803e4 mux: constify mux class) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmaengine/next (8974f34de2ef dmaengine: loongson2-apb: Rename the prefix ls2x to loongson2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging drivers/dma/ep93xx_dma.c +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 29 +++-- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 15 ++- + .../bindings/dma/stm32/st,stm32-dma3.yaml | 6 + + Documentation/driver-api/driver-model/devres.rst | 1 - + MAINTAINERS | 4 +- + arch/loongarch/configs/loongson3_defconfig | 2 +- + drivers/dma/Kconfig | 28 ++--- + drivers/dma/Makefile | 2 +- + drivers/dma/acpi-dma.c | 43 ++------ + drivers/dma/altera-msgdma.c | 2 +- + drivers/dma/amd/qdma/qdma.c | 2 +- + drivers/dma/apple-admac.c | 2 +- + drivers/dma/at_hdmac.c | 2 +- + drivers/dma/at_xdmac.c | 2 +- + drivers/dma/bcm-sba-raid.c | 2 +- + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/bestcomm/bestcomm.c | 2 +- + drivers/dma/dma-jz4780.c | 2 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw/platform.c | 2 +- + drivers/dma/ep93xx_dma.c | 3 +- + drivers/dma/fsl-edma-main.c | 2 +- + drivers/dma/fsl-qdma.c | 2 +- + drivers/dma/fsl_raid.c | 2 +- + drivers/dma/fsldma.c | 2 +- + drivers/dma/idma64.c | 2 +- + drivers/dma/idxd/registers.h | 4 + + drivers/dma/img-mdc-dma.c | 2 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/k3dma.c | 2 +- + .../dma/{ls2x-apb-dma.c => loongson2-apb-dma.c} | 6 +- + drivers/dma/mcf-edma-main.c | 2 +- + drivers/dma/mediatek/mtk-cqdma.c | 2 +- + drivers/dma/mediatek/mtk-hsdma.c | 2 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 2 +- + drivers/dma/milbeaut-hdmac.c | 2 +- + drivers/dma/milbeaut-xdmac.c | 2 +- + drivers/dma/mmp_pdma.c | 2 +- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/moxart-dma.c | 2 +- + drivers/dma/mpc512x_dma.c | 2 +- + drivers/dma/mv_xor_v2.c | 4 +- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/owl-dma.c | 2 +- + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/dma/pxa_dma.c | 2 +- + drivers/dma/qcom/bam_dma.c | 2 +- + drivers/dma/qcom/hidma.c | 2 +- + drivers/dma/qcom/qcom_adm.c | 2 +- + drivers/dma/sa11x0-dma.c | 2 +- + drivers/dma/sf-pdma/sf-pdma.c | 4 +- + drivers/dma/sh/Kconfig | 8 +- + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sh/rz-dmac.c | 4 +- + drivers/dma/sh/shdma-base.c | 2 +- + drivers/dma/sh/shdmac.c | 2 +- + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/sprd-dma.c | 2 +- + drivers/dma/st_fdma.c | 2 +- + drivers/dma/stm32/stm32-dma3.c | 121 +++++++++++++++++---- + drivers/dma/sun4i-dma.c | 2 +- + drivers/dma/sun6i-dma.c | 2 +- + drivers/dma/tegra186-gpc-dma.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 2 +- + drivers/dma/tegra210-adma.c | 2 +- + drivers/dma/ti/cppi41.c | 2 +- + drivers/dma/ti/edma.c | 2 +- + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/timb_dma.c | 2 +- + drivers/dma/txx9dmac.c | 4 +- + drivers/dma/uniphier-mdmac.c | 2 +- + drivers/dma/uniphier-xdmac.c | 2 +- + drivers/dma/xgene-dma.c | 2 +- + drivers/dma/xilinx/xdma.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 2 +- + drivers/dma/xilinx/xilinx_dpdma.c | 2 +- + drivers/dma/xilinx/zynqmp_dma.c | 4 +- + include/linux/acpi_dma.h | 9 +- + include/linux/pci_ids.h | 3 - + 81 files changed, 252 insertions(+), 173 deletions(-) + rename drivers/dma/{ls2x-apb-dma.c => loongson2-apb-dma.c} (99%) +Merging cgroup/for-next (d6821c9e4391 Merge branch 'for-6.13' 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 (93fec6ecce50 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 MAINTAINERS +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_nvmet.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/st.c +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/ufs/core/ufs-mcq.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-exynos.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,ufs.yaml | 2 + + MAINTAINERS | 2 + + drivers/message/fusion/mptlan.h | 3 - + drivers/message/fusion/mptsas.c | 4 +- + drivers/scsi/a3000.c | 6 +- + drivers/scsi/a4000t.c | 6 +- + drivers/scsi/aacraid/aacraid.h | 1 - + drivers/scsi/aacraid/commsup.c | 121 ----- + drivers/scsi/aic7xxx/aic7770.c | 15 - + drivers/scsi/aic7xxx/aic7xxx.h | 2 - + drivers/scsi/atari_scsi.c | 2 +- + drivers/scsi/bfa/bfa.h | 10 - + drivers/scsi/bfa/bfa_core.c | 35 -- + drivers/scsi/bfa/bfa_defs_fcs.h | 22 - + drivers/scsi/bfa/bfa_fcpim.c | 9 - + drivers/scsi/bfa/bfa_fcpim.h | 1 - + drivers/scsi/bfa/bfa_fcs.h | 12 - + drivers/scsi/bfa/bfa_fcs_lport.c | 142 ----- + drivers/scsi/bfa/bfa_fcs_rport.c | 36 -- + drivers/scsi/bfa/bfa_ioc.c | 21 - + drivers/scsi/bfa/bfa_ioc.h | 2 - + drivers/scsi/bfa/bfa_modules.h | 1 - + drivers/scsi/bfa/bfa_svc.c | 72 --- + drivers/scsi/bfa/bfa_svc.h | 5 - + drivers/scsi/bfa/bfad.c | 23 +- + drivers/scsi/bfa/bfad_drv.h | 1 - + drivers/scsi/bfa/bfi.h | 2 +- + drivers/scsi/bvme6000_scsi.c | 2 +- + drivers/scsi/esas2r/esas2r.h | 4 - + drivers/scsi/esas2r/esas2r_vda.c | 17 - + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 31 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 191 +++++-- + drivers/scsi/jazz_esp.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_crtn.h | 5 +- + drivers/scsi/lpfc/lpfc_ct.c | 39 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 4 +- + drivers/scsi/lpfc/lpfc_disc.h | 62 +-- + drivers/scsi/lpfc/lpfc_els.c | 463 +++++++---------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 311 +++++------ + drivers/scsi/lpfc/lpfc_init.c | 61 +-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 329 +++++------- + drivers/scsi/lpfc/lpfc_nvme.c | 60 ++- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 125 ++--- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 6 +- + drivers/scsi/mac_esp.c | 2 +- + drivers/scsi/mac_scsi.c | 2 +- + drivers/scsi/mvme16x_scsi.c | 2 +- + drivers/scsi/pm8001/pm8001_defs.h | 7 +- + drivers/scsi/pm8001/pm8001_init.c | 8 +- + drivers/scsi/pm8001/pm8001_sas.c | 17 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 + + drivers/scsi/pm8001/pm80xx_hwi.c | 3 +- + drivers/scsi/qedf/qedf_main.c | 6 +- + drivers/scsi/qedi/qedi_main.c | 1 + + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/sg.c | 9 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/st.c | 36 +- + drivers/scsi/sun3_scsi.c | 10 +- + drivers/scsi/sun3x_esp.c | 2 +- + drivers/scsi/sun_esp.c | 2 +- + drivers/target/target_core_pscsi.c | 2 +- + drivers/ufs/core/ufs-mcq.c | 30 +- + drivers/ufs/core/ufshcd.c | 571 +++++++++++---------- + drivers/ufs/host/tc-dwc-g210-pci.c | 8 +- + drivers/ufs/host/ufs-exynos.c | 136 ++--- + drivers/ufs/host/ufs-exynos.h | 2 +- + drivers/ufs/host/ufs-mediatek.c | 10 + + drivers/ufs/host/ufs-qcom.c | 26 +- + drivers/ufs/host/ufs-renesas.c | 9 +- + drivers/ufs/host/ufshcd-pci.c | 8 +- + include/ufs/ufshcd.h | 21 +- + 80 files changed, 1411 insertions(+), 1856 deletions(-) +Merging scsi-mkp/for-next (019880c08d05 Merge patch series "scsi: ufs: Bug fixes for ufs core and platform drivers") +$ 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_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_nvmet.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-exynos.c +Merge made by the 'ort' strategy. + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/scsi/bfa/bfa_fcbuild.c | 482 ------------------------------ + drivers/scsi/bfa/bfa_fcbuild.h | 72 ----- + drivers/scsi/lpfc/lpfc_nvme.c | 2 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 5 +- + drivers/scsi/qla1280.h | 12 +- + drivers/target/target_core_user.c | 4 +- + drivers/ufs/core/ufs_bsg.c | 2 +- + drivers/ufs/core/ufshcd-priv.h | 1 + + drivers/ufs/core/ufshcd.c | 37 +++ + drivers/ufs/host/cdns-pltfrm.c | 6 +- + drivers/ufs/host/tc-dwc-g210-pltfrm.c | 7 +- + drivers/ufs/host/ti-j721e-ufs.c | 2 +- + drivers/ufs/host/ufs-exynos.c | 5 +- + drivers/ufs/host/ufs-hisi.c | 6 +- + drivers/ufs/host/ufs-mediatek.c | 7 +- + drivers/ufs/host/ufs-qcom.c | 9 +- + drivers/ufs/host/ufs-renesas.c | 6 +- + drivers/ufs/host/ufs-sprd.c | 7 +- + drivers/ufs/host/ufshcd-pltfrm.c | 16 + + drivers/ufs/host/ufshcd-pltfrm.h | 1 + + 24 files changed, 93 insertions(+), 604 deletions(-) +Merging vhost/linux-next (6a39bb15b3d1 virtio_vdpa: remove redundant check on desc) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/virtio/virtio_ring.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c +Auto-merging fs/fuse/virtio_fs.c +Resolved 'drivers/virtio/virtio_ring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 13197a9887ad] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + drivers/nvdimm/virtio_pmem.c | 24 +++++ + drivers/vdpa/mlx5/core/mr.c | 4 +- + drivers/virtio/virtio_ring.c | 223 +++++++++++++++++++++++-------------------- + drivers/virtio/virtio_vdpa.c | 3 +- + fs/fuse/virtio_fs.c | 13 +-- + 5 files changed, 152 insertions(+), 115 deletions(-) +Merging rpmsg/for-next (f9cbf229fa3a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/rpmsg/qcom_glink_native.c +Merge made by the 'ort' strategy. + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 3 + + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 48 ++++++--- + Documentation/locking/hwspinlock.rst | 46 +-------- + drivers/hwspinlock/hwspinlock_core.c | 77 -------------- + drivers/remoteproc/Kconfig | 12 ++- + drivers/remoteproc/da8xx_remoteproc.c | 31 ++---- + drivers/remoteproc/imx_dsp_rproc.c | 2 +- + drivers/remoteproc/imx_rproc.c | 2 +- + drivers/remoteproc/keystone_remoteproc.c | 2 +- + drivers/remoteproc/meson_mx_ao_arc.c | 2 +- + drivers/remoteproc/mtk_scp.c | 2 +- + drivers/remoteproc/pru_rproc.c | 2 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 30 +++--- + drivers/remoteproc/qcom_q6v5_mss.c | 56 ++++------ + drivers/remoteproc/qcom_q6v5_pas.c | 51 ++++----- + drivers/remoteproc/qcom_q6v5_wcss.c | 114 +++++++++------------ + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/qcom_wcnss_iris.c | 5 +- + drivers/remoteproc/rcar_rproc.c | 2 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/remoteproc/st_remoteproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 10 +- + drivers/remoteproc/ti_k3_m4_remoteproc.c | 6 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 83 ++++++--------- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 3 +- + include/linux/hwspinlock.h | 12 --- + 28 files changed, 215 insertions(+), 396 deletions(-) +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (bef29ca3a645 gpio: tegra186: Allow to enable driver on Tegra234) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) +$ 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 (1aa06a2eb276 Merge fixup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/pinctrl/pinctrl-stmfx.c +Auto-merging drivers/pinctrl/pinctrl-sx150x.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rzg2l.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 475cbdafa7df] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/airoha,en7581-chip-scu.yaml | 42 + + .../bindings/mfd/airoha,en7581-gpio-sysctl.yaml | 90 + + .../bindings/pinctrl/airoha,en7581-pinctrl.yaml | 400 +++ + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 2 +- + .../bindings/pinctrl/canaan,k230-pinctrl.yaml | 127 + + .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 33 - + ...,imx6ul-pinctrl.yaml => fsl,imx35-pinctrl.yaml} | 88 +- + .../bindings/pinctrl/fsl,imx50-pinctrl.txt | 32 - + .../bindings/pinctrl/fsl,imx51-pinctrl.txt | 32 - + .../bindings/pinctrl/fsl,imx53-pinctrl.txt | 32 - + .../bindings/pinctrl/fsl,imx6dl-pinctrl.txt | 38 - + .../bindings/pinctrl/fsl,imx6q-pinctrl.txt | 38 - + .../bindings/pinctrl/fsl,imx6sl-pinctrl.txt | 39 - + .../bindings/pinctrl/fsl,imx6sll-pinctrl.txt | 40 - + .../bindings/pinctrl/fsl,imx6sx-pinctrl.txt | 36 - + .../bindings/pinctrl/microchip,mcp23s08.yaml | 161 ++ + .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 27 +- + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 148 - + .../bindings/pinctrl/pinctrl-single.yaml | 4 + + .../bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 114 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 2 + + .../bindings/pinctrl/qcom,qcs615-tlmm.yaml | 124 + + .../bindings/pinctrl/qcom,qcs8300-tlmm.yaml | 118 + + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 8 +- + .../bindings/pinctrl/qcom,sar2130p-tlmm.yaml | 138 + + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 6 +- + .../bindings/pinctrl/qcom,sm8750-tlmm.yaml | 138 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 4 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 23 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 3 + + .../bindings/pinctrl/semtech,sx1501q.yaml | 43 + + .../bindings/pinctrl/sophgo,cv1800-pinctrl.yaml | 2 +- + .../bindings/pinctrl/spacemit,k1-pinctrl.yaml | 124 + + .../bindings/pinctrl/thead,th1520-pinctrl.yaml | 176 ++ + .../bindings/pinctrl/xlnx,versal-pinctrl.yaml | 278 ++ + .../devicetree/bindings/pwm/airoha,en7581-pwm.yaml | 34 + + MAINTAINERS | 9 + + arch/arm/mach-imx/Kconfig | 16 - + drivers/pinctrl/Kconfig | 26 + + drivers/pinctrl/Makefile | 3 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 4 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +- + drivers/pinctrl/core.c | 3 + + drivers/pinctrl/core.h | 1 + + drivers/pinctrl/freescale/Kconfig | 93 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 6 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 228 +- + drivers/pinctrl/freescale/pinctrl-imx27.c | 350 +-- + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 38 + + drivers/pinctrl/intel/pinctrl-intel.c | 12 + + drivers/pinctrl/mediatek/Kconfig | 17 +- + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-airoha.c | 2971 ++++++++++++++++++++ + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nxp/pinctrl-s32g2.c | 52 + + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-amd.h | 4 +- + drivers/pinctrl/pinctrl-artpec6.c | 2 +- + drivers/pinctrl/pinctrl-aw9523.c | 64 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 142 +- + drivers/pinctrl/pinctrl-k210.c | 17 +- + drivers/pinctrl/pinctrl-k230.c | 641 +++++ + drivers/pinctrl/pinctrl-ocelot.c | 203 ++ + drivers/pinctrl/pinctrl-rockchip.c | 6 +- + drivers/pinctrl/pinctrl-single.c | 3 +- + drivers/pinctrl/pinctrl-stmfx.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/pinctrl-th1520.c | 918 ++++++ + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/pinctrl-zynqmp.c | 98 +- + drivers/pinctrl/pinmux.c | 173 +- + drivers/pinctrl/qcom/Kconfig.msm | 39 + + drivers/pinctrl/qcom/Makefile | 5 + + drivers/pinctrl/qcom/pinctrl-apq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq5018.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq5332.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq5424.c | 792 ++++++ + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 2 +- + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 2 +- + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8226.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8909.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8916.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8960.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8994.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcs404.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcs615.c | 1107 ++++++++ + drivers/pinctrl/qcom/pinctrl-qcs8300.c | 1246 ++++++++ + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sar2130p.c | 1505 ++++++++++ + drivers/pinctrl/qcom/pinctrl-sc7180.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm660.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx75.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm4250-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm4450.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6115.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6125.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6375.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm7150.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8250.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8550.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8650-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8650.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8750.c | 1729 ++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 3 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 2 +- + drivers/pinctrl/renesas/Kconfig | 1 + + drivers/pinctrl/renesas/pinctrl-rza1.c | 7 + + drivers/pinctrl/renesas/pinctrl-rza2.c | 3 + + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 68 +- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 431 +++ + drivers/pinctrl/samsung/pinctrl-exynos.h | 10 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 6 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 3 + + drivers/pinctrl/sophgo/Kconfig | 2 +- + drivers/pinctrl/spacemit/Kconfig | 17 + + drivers/pinctrl/spacemit/Makefile | 3 + + drivers/pinctrl/spacemit/pinctrl-k1.c | 1051 +++++++ + drivers/pinctrl/spacemit/pinctrl-k1.h | 40 + + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 1 + + 161 files changed, 15902 insertions(+), 1171 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/airoha,en7581-chip-scu.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/airoha,en7581-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/canaan,k230-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt + rename Documentation/devicetree/bindings/pinctrl/{fsl,imx6ul-pinctrl.yaml => fsl,imx35-pinctrl.yaml} (50%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx50-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx51-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx53-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sll-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,mcp23s08.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mcp23s08.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq5424-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcs615-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcs8300-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sar2130p-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8750-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/spacemit,k1-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,versal-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/airoha,en7581-pwm.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-airoha.c + create mode 100644 drivers/pinctrl/pinctrl-k230.c + create mode 100644 drivers/pinctrl/pinctrl-th1520.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq5424.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-qcs615.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-qcs8300.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sar2130p.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8750.c + create mode 100644 drivers/pinctrl/spacemit/Kconfig + create mode 100644 drivers/pinctrl/spacemit/Makefile + create mode 100644 drivers/pinctrl/spacemit/pinctrl-k1.c + create mode 100644 drivers/pinctrl/spacemit/pinctrl-k1.h +Merging pinctrl-intel/for-next (c6235c426d2a pinctrl: elkhartlake: Add support for DSW community) +$ 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 (f407af78c8d3 pinctrl: renesas: rzg2l: Use gpiochip_populate_parent_fwspec_twocell helper) +$ 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 (6d2dbd4cec89 pinctrl: samsung: Add Exynos9810 SoC specific data) +$ 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 (b2eaa1170e45 pwm: Assume a disabled PWM to emit a constant inactive output) +$ 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 (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) +$ 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 (a44c26d7fa74 selftests/resctrl: Replace magic constants used as array size) +$ 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 (9852d85ec9d4 Linux 6.12-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 (62adcae479fe kunit: qemu_configs: loongarch: Enable shutdown) +$ 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 (9c66f50477e2 Merge branch 'for-6.13/selftests-kprobe' 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 (e0779a0dcf41 rtc: ab-eoz9: don't fail temperature reads on undervoltage notification) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/include/asm/mvme147hw.h +Auto-merging arch/m68k/mvme147/config.c +CONFLICT (content): Merge conflict in arch/m68k/mvme147/config.c +Auto-merging drivers/rtc/rtc-pm8xxx.c +Resolved 'arch/m68k/mvme147/config.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8591417960f0] Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 4 +- + .../devicetree/bindings/rtc/amlogic,a4-rtc.yaml | 63 ++ + ...ochip,mfps-rtc.yaml => microchip,mpfs-rtc.yaml} | 10 +- + .../devicetree/bindings/rtc/renesas,rz-rtca3.yaml | 84 ++ + MAINTAINERS | 17 + + arch/m68k/configs/multi_defconfig | 1 + + arch/m68k/configs/mvme147_defconfig | 1 + + arch/m68k/configs/mvme16x_defconfig | 1 + + arch/m68k/include/asm/mvme147hw.h | 19 +- + arch/m68k/include/asm/mvme16xhw.h | 18 +- + arch/m68k/mvme147/config.c | 55 +- + arch/m68k/mvme16x/Makefile | 2 +- + arch/m68k/mvme16x/config.c | 57 +- + arch/m68k/mvme16x/rtc.c | 165 ---- + arch/sparc/kernel/time_32.c | 1 + + arch/sparc/kernel/time_64.c | 1 + + drivers/rtc/Kconfig | 33 + + drivers/rtc/Makefile | 5 +- + drivers/rtc/interface.c | 7 +- + drivers/rtc/rtc-88pm80x.c | 2 +- + drivers/rtc/rtc-88pm860x.c | 2 +- + drivers/rtc/rtc-88pm886.c | 97 +++ + drivers/rtc/rtc-ab-eoz9.c | 11 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-abx80x.c | 2 +- + drivers/rtc/rtc-ac100.c | 2 +- + drivers/rtc/rtc-amlogic-a4.c | 465 +++++++++++ + drivers/rtc/rtc-asm9260.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 2 +- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 3 +- + drivers/rtc/rtc-cadence.c | 2 +- + drivers/rtc/rtc-cmos.c | 39 +- + drivers/rtc/rtc-cros-ec.c | 2 +- + drivers/rtc/rtc-ds1685.c | 2 +- + drivers/rtc/rtc-ftrtc010.c | 2 +- + drivers/rtc/rtc-hid-sensor-time.c | 2 +- + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-isl12022.c | 271 ++++++- + drivers/rtc/rtc-loongson.c | 2 +- + drivers/rtc/rtc-lpc24xx.c | 2 +- + drivers/rtc/rtc-m48t59.c | 26 +- + drivers/rtc/rtc-max77686.c | 2 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mc146818-lib.c | 6 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mpfs.c | 2 +- + drivers/rtc/rtc-mt6397.c | 29 +- + drivers/rtc/rtc-mt7622.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-nxp-bbnsm.c | 20 +- + drivers/rtc/rtc-omap.c | 2 +- + drivers/rtc/rtc-palmas.c | 2 +- + drivers/rtc/rtc-pcf50633.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 214 ++--- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-pxa.c | 2 +- + drivers/rtc/rtc-rc5t583.c | 2 +- + drivers/rtc/rtc-renesas-rtca3.c | 900 +++++++++++++++++++++ + drivers/rtc/rtc-rtd119x.c | 2 +- + drivers/rtc/rtc-rv3028.c | 6 +- + drivers/rtc/rtc-rzn1.c | 92 +-- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-sa1100.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-spear.c | 2 +- + drivers/rtc/rtc-st-lpc.c | 5 +- + drivers/rtc/rtc-stm32.c | 2 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + drivers/rtc/rtc-sunplus.c | 2 +- + drivers/rtc/rtc-tegra.c | 2 +- + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-twl.c | 2 +- + drivers/rtc/rtc-vt8500.c | 2 +- + drivers/rtc/rtc-wm8350.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + include/linux/mfd/88pm886.h | 9 + + include/linux/rtc/m48t59.h | 3 + + 81 files changed, 2226 insertions(+), 604 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml + rename Documentation/devicetree/bindings/rtc/{microchip,mfps-rtc.yaml => microchip,mpfs-rtc.yaml} (87%) + create mode 100644 Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml + delete mode 100644 arch/m68k/mvme16x/rtc.c + create mode 100644 drivers/rtc/rtc-88pm886.c + create mode 100644 drivers/rtc/rtc-amlogic-a4.c + create mode 100644 drivers/rtc/rtc-renesas-rtca3.c +Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations) +$ 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 +Merge made by the 'ort' strategy. + drivers/dax/pmem/Makefile | 7 ------- + drivers/dax/pmem/pmem.c | 10 ---------- + drivers/nvdimm/dax_devs.c | 4 ++-- + drivers/nvdimm/nd.h | 7 +++++++ + drivers/nvdimm/nd_virtio.c | 2 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/nvdimm/pmem.c | 2 +- + include/linux/dax.h | 6 ------ + 8 files changed, 12 insertions(+), 28 deletions(-) + delete mode 100644 drivers/dax/pmem/Makefile + delete mode 100644 drivers/dax/pmem/pmem.c +Merging at24/at24/for-next (339cb28b9ee6 eeprom: at24: add ST M24256E Additional Write lockable page support) +$ 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 (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/ntb/hw/intel/ntb_hw_gen3.c | 3 +++ + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (8cf8dfceebda seccomp: Stub for !HAVE_ARCH_SECCOMP_FILTER) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (9852d85ec9d4 Linux 6.12-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 (9852d85ec9d4 Linux 6.12-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 +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 (94e86b174d10 tools/hv: Add memory allocation check in hv_fcopy_start) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (0b028ff7e70e auxdisplay: Remove unused functions) +$ 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 (24b2455fe8fc kdb: fix ctrl+e/a/f/b/d/p/n broken in keyboard mode) +$ 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 (8cf0b93919e1 Linux 6.12-rc2) +$ 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 (9852d85ec9d4 Linux 6.12-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 (bd23e836423e bus: mhi: host: pci_generic: Use pcim_iomap_region() to request and map MHI BAR) +$ 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 (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + mm/mm_init.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging cxl/next (a83383e2ae7c Merge branch 'cxl/for-6.13/dcd-prep' into cxl-for-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging include/linux/zstd.h +Auto-merging lib/zstd/common/mem.h +Auto-merging lib/zstd/compress/zstd_compress.c +Auto-merging lib/zstd/zstd_compress_module.c +Auto-merging lib/zstd/zstd_decompress_module.c +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (c5d91b16f525 efi: Fix memory leak in efivar_ssdt_load) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (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 (9008fe8fad82 slab: Fix too strict alignment check in create_cache()) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/slab.h +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 10 ++ + Documentation/mm/slub.rst | 9 + + include/linux/slab.h | 60 +++++-- + lib/slub_kunit.c | 42 +++++ + mm/kasan/generic.c | 7 +- + mm/slab.h | 11 ++ + mm/slab_common.c | 103 ++--------- + mm/slub.c | 220 +++++++++++++++++++++--- + 8 files changed, 325 insertions(+), 137 deletions(-) +Merging random/master (d18c13697b4d prandom: Include in ) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (b7ed2b6f4e8d rust: alloc: Fix `ArrayLayout` allocations) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging rust/Makefile +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers/helpers.c +Auto-merging rust/helpers/spinlock.c +Auto-merging rust/helpers/task.c +Auto-merging rust/kernel/lib.rs +CONFLICT (content): Merge conflict in rust/kernel/lib.rs +Auto-merging rust/kernel/net/phy.rs +Auto-merging rust/kernel/prelude.rs +Auto-merging rust/kernel/sync.rs +Auto-merging rust/kernel/sync/lock.rs +Auto-merging rust/kernel/task.rs +CONFLICT (content): Merge conflict in rust/kernel/task.rs +Auto-merging rust/kernel/types.rs +CONFLICT (content): Merge conflict in rust/kernel/types.rs +Auto-merging rust/macros/module.rs +CONFLICT (content): Merge conflict in rust/macros/module.rs +Auto-merging samples/rust/rust_print_main.rs +Auto-merging scripts/Makefile.build +CONFLICT (content): Merge conflict in scripts/Makefile.build +Resolved 'rust/kernel/lib.rs' using previous resolution. +Resolved 'rust/kernel/task.rs' using previous resolution. +Resolved 'rust/kernel/types.rs' using previous resolution. +Resolved 'rust/macros/module.rs' using previous resolution. +Resolved 'scripts/Makefile.build' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 64c24c1acc46] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .clippy.toml | 9 + + .gitignore | 1 + + Documentation/rust/coding-guidelines.rst | 146 ++++ + Documentation/rust/quick-start.rst | 17 + + MAINTAINERS | 8 + + Makefile | 16 +- + drivers/block/rnull.rs | 4 +- + drivers/gpu/drm/drm_panic_qr.rs | 23 +- + mm/kasan/kasan_test_rust.rs | 3 +- + rust/Makefile | 95 ++- + rust/bindgen_parameters | 5 + + rust/bindings/bindings_helper.h | 1 + + rust/bindings/lib.rs | 6 + + rust/exports.c | 7 +- + rust/ffi.rs | 13 + + rust/helpers/build_bug.c | 1 - + rust/helpers/err.c | 1 - + rust/helpers/helpers.c | 1 + + rust/helpers/kunit.c | 1 - + rust/helpers/mutex.c | 1 - + rust/helpers/refcount.c | 1 - + rust/helpers/signal.c | 1 - + rust/helpers/slab.c | 6 + + rust/helpers/spinlock.c | 6 +- + rust/helpers/task.c | 1 - + rust/helpers/vmalloc.c | 9 + + rust/helpers/wait.c | 1 - + rust/helpers/workqueue.c | 1 - + rust/kernel/alloc.rs | 150 +++- + rust/kernel/alloc/allocator.rs | 214 +++-- + rust/kernel/alloc/allocator_test.rs | 95 +++ + rust/kernel/alloc/box_ext.rs | 89 -- + rust/kernel/alloc/kbox.rs | 456 ++++++++++ + rust/kernel/alloc/kvec.rs | 913 +++++++++++++++++++++ + rust/kernel/alloc/layout.rs | 91 ++ + rust/kernel/alloc/vec_ext.rs | 185 ----- + rust/kernel/block/mq/operations.rs | 18 +- + rust/kernel/block/mq/raw_writer.rs | 2 +- + rust/kernel/block/mq/request.rs | 67 +- + rust/kernel/block/mq/tag_set.rs | 2 +- + rust/kernel/error.rs | 79 +- + rust/kernel/init.rs | 127 +-- + rust/kernel/init/__internal.rs | 13 +- + rust/kernel/init/macros.rs | 18 +- + rust/kernel/ioctl.rs | 2 +- + rust/kernel/lib.rs | 10 +- + rust/kernel/list.rs | 1 + + rust/kernel/list/arc.rs | 3 - + rust/kernel/list/arc_field.rs | 2 +- + rust/kernel/net/phy.rs | 16 +- + rust/kernel/page.rs | 10 + + rust/kernel/prelude.rs | 5 +- + rust/kernel/print.rs | 5 +- + rust/kernel/rbtree.rs | 58 +- + rust/kernel/std_vendor.rs | 38 +- + rust/kernel/str.rs | 46 +- + rust/kernel/sync.rs | 1 + + rust/kernel/sync/arc.rs | 31 +- + rust/kernel/sync/arc/std_vendor.rs | 2 + + rust/kernel/sync/condvar.rs | 7 +- + rust/kernel/sync/lock.rs | 27 +- + rust/kernel/sync/lock/global.rs | 301 +++++++ + rust/kernel/sync/lock/mutex.rs | 15 +- + rust/kernel/sync/lock/spinlock.rs | 15 +- + rust/kernel/sync/locked_by.rs | 2 +- + rust/kernel/task.rs | 2 +- + rust/kernel/time.rs | 4 +- + rust/kernel/transmute.rs | 71 ++ + rust/kernel/types.rs | 196 ++--- + rust/kernel/uaccess.rs | 25 +- + rust/kernel/workqueue.rs | 29 +- + rust/macros/lib.rs | 142 +++- + rust/macros/module.rs | 8 +- + rust/macros/paste.rs | 15 +- + rust/uapi/lib.rs | 6 + + samples/rust/rust_minimal.rs | 4 +- + samples/rust/rust_print_main.rs | 1 + + scripts/Makefile.build | 4 +- + scripts/generate_rust_analyzer.py | 11 +- + scripts/rust_is_available.sh | 15 + + .../rust_is_available_bindgen_libclang_concat.h | 3 + + scripts/rust_is_available_test.py | 34 +- + 82 files changed, 3175 insertions(+), 896 deletions(-) + create mode 100644 .clippy.toml + create mode 100644 rust/ffi.rs + create mode 100644 rust/helpers/vmalloc.c + create mode 100644 rust/kernel/alloc/allocator_test.rs + delete mode 100644 rust/kernel/alloc/box_ext.rs + create mode 100644 rust/kernel/alloc/kbox.rs + create mode 100644 rust/kernel/alloc/kvec.rs + create mode 100644 rust/kernel/alloc/layout.rs + delete mode 100644 rust/kernel/alloc/vec_ext.rs + create mode 100644 rust/kernel/sync/lock/global.rs + create mode 100644 rust/kernel/transmute.rs + create mode 100644 scripts/rust_is_available_bindgen_libclang_concat.h +Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache()) +$ 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 (45bf05a51842 exec: remove legacy custom binfmt modules autoloading) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging MAINTAINERS +Auto-merging fs/exec.c +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + fs/binfmt_misc.c | 2 +- + fs/exec.c | 22 ++-------- + include/linux/coredump.h | 4 +- + tools/testing/selftests/exec/execveat.c | 77 +++++++++++++++++++++++++++++++-- + 5 files changed, 83 insertions(+), 25 deletions(-) +Merging bitmap/bitmap-for-next (5771af94fa61 linux/bits.h: simplify GENMASK_INPUT_CHECK()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + include/linux/bits.h | 5 ++--- + include/linux/compiler.h | 22 ++++++++++++++++++++++ + 2 files changed, 24 insertions(+), 3 deletions(-) +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 (f06e108a3dc5 Compiler Attributes: disable __counted_by for clang < 19.1.3) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler_types.h +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/misc/lkdtm/bugs.c | 2 +- + include/linux/compiler.h | 11 +++++++++-- + include/linux/compiler_attributes.h | 13 ------------- + include/linux/compiler_types.h | 19 +++++++++++++++++++ + init/Kconfig | 9 +++++++++ + lib/overflow_kunit.c | 2 +- + lib/string_helpers.c | 2 +- + 8 files changed, 41 insertions(+), 19 deletions(-) +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (d53764723ecd iommu: Rename ops->domain_alloc_user() to domain_alloc_paging_flags()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Merge made by the 'ort' strategy. + drivers/iommu/amd/iommu.c | 9 ++++----- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++----- + drivers/iommu/intel/iommu.c | 15 ++++----------- + drivers/iommu/intel/iommu.h | 6 ++++-- + drivers/iommu/intel/nested.c | 11 +++++++++-- + drivers/iommu/iommu.c | 4 ++-- + drivers/iommu/iommufd/hw_pagetable.c | 16 ++++++++-------- + drivers/iommu/iommufd/selftest.c | 15 ++++++--------- + include/linux/iommu.h | 27 ++++++++++++++++----------- + 9 files changed, 57 insertions(+), 55 deletions(-) +Merging turbostat/next (fe66a63cae83 tools/power turbostat: Add RAPL psys as a built-in counter) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 27 +++ + tools/power/x86/turbostat/turbostat.c | 433 ++++++++++++++++++++++++---------- + 2 files changed, 329 insertions(+), 131 deletions(-) +Merging pwrseq/pwrseq/for-next (bd4c8bafcf50 power: sequencing: qcom-wcn: improve support 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 (de2433c608c2 capabilities: remove cap_mmap_file()) +$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Merge made by the 'ort' strategy. + security/commoncap.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging ipe/next (d881f0eb6f23 scripts: ipe: polgen: remove redundant close and error exit path) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Merge made by the 'ort' strategy. +Merging kcsan/next (b86f7c9fad06 kcsan: Remove redundant call of kallsyms_lookup_name()) +$ 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 header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 0000000000000..94c94d6ac0789 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20241126