diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-03-29 13:51:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-03-29 13:51:59 +1100 |
| commit | c2528a0cdebd8ba7ef30e0655f8ea89f34c3a633 (patch) | |
| tree | 67cc5b780034d4514ec2a0e60ccfca4809c808cc | |
| parent | 630420c40f9cff45c768a270197fd41ff2e5ac60 (diff) | |
Add linux-next specific files for 20220329next-20220329
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 347 | ||||
| -rw-r--r-- | Next/Trees | 349 | ||||
| -rw-r--r-- | Next/merge.log | 4726 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5423 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1a5957c3b4e3 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,347 @@ +Name SHA1 +---- ---- +origin 7203062171db6669f746d14148c4af76af619e74 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 754e0b0e35608ed5206d6a67a791563c631cec07 +arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +arm-current 7b83299e5b9385943a857d59e15cba270df20d7e +arm64-fixes 316e46f65a5497839857db08b6fbf60f568b165a +arm-soc-fixes 6a2f0b2d3b74e3e4002dc4143887637cd216e531 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes 6d8df1f9e8aed0cf370753a2b60a79e8ffec9ae9 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes 48015b632f770c401f3816f144499a39f2884677 +s390-fixes f443e374ae131c168a065ea1748feac6b2e76613 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net dcf500065fabe27676dfe7b4ba521a4f1e0fc8ac +bpf d9142e1cf3bbdaf21337767114ecab26fe702d47 +ipsec 4db4075f92af2b28f415fc979ab626e6b37d67b6 +netfilter dea2d93a8ba437460c5f21bdfa4ada57fa1d2179 +ipvs 277f2bb14361790a70e4b3c649e794b75a91a597 +wireless 24b488061b97a6c6ff82c433e6843eaf54f41f3c +rdma-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +sound-current 5e2baa04e4cd94c2465b248b7d861fcff8c22fae +sound-asoc-fixes b0793cb5c40ed6fb3da33dc2e64d17b2f76b0033 +regmap-fixes d04ad245d67a3991dfea5e108e4c452c2ab39bac +regulator-fixes 78beedbc6af3eb0cc581af6b9e2b6416deb938f4 +spi-fixes d583fe25614fa95293df55f23a95764d8501dcf8 +pci-current 5949965ec9340cfc0e65f7d8a576b660b26e2535 +driver-core.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +tty.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb.current ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff +staging.current 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 +iio-fixes 123d838c4e7deedebe29cc63c1098db1a810f1f8 +counter-fixes 4a14311a3b935b62b33e665a97ecaaf2f078228a +char-misc.current 01b44ef2bf6bc83df8a4703029fd611fbfc31c60 +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes f443e374ae131c168a065ea1748feac6b2e76613 +input-current 5600f6986628dde8881734090588474f54a540a8 +crypto-current 7ed7aa4de9421229be6d331ed52d5cd09c99f409 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 6fec1ab67f8d60704cc7de64abcfd389ab131542 +modules-fixes a8e8f851e8299703a005cf23dfb9ec854a2611e5 +dmaengine-fixes cfb92440ee71adcc2105b0890bb01ac3cddb8507 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 42da5a4ba17070e9d99abf375a5bd70e85d2a6b8 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 5d8965704fe5662e2e4a7e4424a2cbe53e182670 +at91-fixes 26077968f8389a68fdb38af3f2c2289ddc95e8ca +omap-fixes 8840f5460a23759403f1f2860429dcbcc2f04a65 +kvm-fixes fe83f5eae432ccc8e90082d6ed506d5233547473 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes c1ebdafde1ee7f7416c04f8bb72e74e48f13defe +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 95385bb74f406dc022e0ea5463ae3115d7b6bf5c +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 21d90aaee8d5c2a097ef41f1430d97661233ecc6 +samsung-krzk-fixes 442b0c08db7e35980bed6af091877f4dda72ffca +pinctrl-samsung-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree-fixes f6eafa4022dd61e029205bea4d4147d26e69fef2 +scsi-fixes 733ab7e1b5d1041204c4ca7373f6e6f9d08e3283 +drm-fixes f443e374ae131c168a065ea1748feac6b2e76613 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 +mmc-fixes 6f2e03c11ef6f1169d1b370f30c6bf764fc3e21b +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes ffc58bc4af9365d4eea72526bb3cf6a83615c673 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 0966d385830de3470b7131db8e86c0c5bc9c52dc +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +gpio-brgl-fixes 6556641ded026db374c63493c6d4c74861bd23b2 +gpio-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +pinctrl-intel-fixes 6f66db29e2415cbe8759c48584f9cae19b3c2651 +erofs-fixes 24331050a3e6afcd4451409831dd9ae8085a42f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 92a68053c3468705e2c7c752c9a3f256304a35a6 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 5f7b839d47dbc74cf4a07beeab5191f93678673e +irqchip-fixes 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current a04b1bf574e1f4875ea91f5c62ca051666443200 +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes d14eb80e27795b7b20060f7b151cdfe39722a813 +kbuild 63a62caad508377b1badacab445bf504e42082f2 +perf ab0809af0bee88b689ba289ec8c40aa2be3a17ec +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 8ddde07a3d285a0f3cec14924446608320fdc013 +asm-generic aec499c75cf8e0b599be4d559e6922b613085f8f +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm b717496e1158dec1d0d7fc5bdbdbe5e2bf187a0e +arm64 641d804157294d9b19bdfe6a2cdbd5d25939a048 +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 6a2f0b2d3b74e3e4002dc4143887637cd216e531 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 305cab6f76450b682269dfa0be8055ee4c2b573f +aspeed d9540eeaa3d15d8295895fc39e7fb90937623923 +at91 a845fa592554e6c92d2f81de6e7074f0a50d7828 +drivers-memory 560f9d092a9d860a31a82671cfe7eab8e40cd58e +imx-mxs 45550ada88f0253bef38041f2c1d80f6e69bb0ed +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6ceb6a96db4e1309ff072cc5dea95e49ec9fe691 +mvebu 8885ae5142a487ef283aff2ec46e55c0528c75f8 +omap f9ecc209330a4837393f7b87f6f95970542b90c6 +qcom b8277c8275a11b19ab7bff1eb95f6b1ed7495eae +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas dff7b84b4d2a5df4fb98714257adbb539807d7b9 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip 73b0466cfade6e5a5be674ccaec9453447e89e7b +samsung-krzk b2d5c4016a34d769e8ec00db7c53b9a7d8312e07 +scmi 0bf3cf81c78bacba96e87cfc0d5322a24eeb35b8 +stm32 74fa56279651956f7ce6a75a85156585f91e7e5e +sunxi f25c47c6762920840785b5038611bca7c023a745 +tee 3e53bb2bd87bb6cb8887a1bf4d0c026dc8fe39bb +tegra 6d746e1eb2f6f7e872c78604c899039f1a41dacd +ti 183a6f5c6e1ea03c5a0bf0d9d304e6a73b806e04 +xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3 +clk 3fb2cf242e745966d5cbaea86fc4e46189c59c56 +clk-imx b09c68dc57c9d44071d83bb935b733f53ea2b2b4 +clk-renesas 73421f2a48e6bd1d1024a09aedbc9c662cb88e77 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 0d52a01a266ba21840c7cb02e1de39c503759dda +m68knommu e6e1e7b19fa132d23d09c465942aab4c110d3da9 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips f8f9f21c7848e63133c16c899f3d84aa54eb79fe +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd c33b0499bdfd810be4ab082988be07790460f8f6 +powerpc fe2640bd7a62f1f7c3f55fbda31084085075bc30 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v bbde015227e89f1da21bd3b84523d62c4a445c06 +s390 faf79934e65aff90284725518a5ec3c2241c65ae +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 82017457957a550d7d00dde419435dd74a890887 +xtensa 1c4664faa38923330d478f046dc743a00c1e2dec +pidfd 6009ff9e80205e358f7e8261c4806f3533be476b +fscrypt cdaa1b1941f667814300799ddb74f3079517cd5a +fscache ab487a4cdfca3d1ef12795a49eafe1144967e617 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 89a925d7560844e14e068b1f318b1d09e010da85 +ceph f639d9867eea647005dc824e0e24f39ffc50d4e4 +cifs 6a96c82ac4c55944dcf16985d63fa853de41784e +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a1108dcd9373a98f7018aa4310076260b8ecfc0b +exfat 1413276f228f9009c758330d2b88b302be427b59 +ext3 f06e95c3a4ca43f9acccca33dc2117e8b924eda0 +ext4 c7cded845fc192cc35a1ca37c0cd957ee35abdf8 +f2fs 5191290407668028179f2544a11ae9b57f0bcf07 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 +gfs2 e75765151025f94fd337e1273a9777e017524c65 +jfs a53046291020ec41e09181396c1e829287b48d47 +ksmbd 5d4c2759d83bad3041bf16d0b0e2ff6df11200bb +nfs d02d81efc7564b4d5446a02e0214a164cf00b1f3 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd 0b5e0caf0b90c2fb68db1e8b17f5811fb20c4557 +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs 705757274599e2e064dd3054aabc74e8af31a095 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs 01728b44ef1b714756607be0210fbcf60c78efce +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 2d86293c70750e4331e9616aded33ab6b47c299d +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 124f75f864f38327e3e7e182e6b6da5105e2bade +printk c5f75d490fc2dd706898c005a05a933b39e880d3 +pci 611f841830aa5723ea67682628bd214cbc18df41 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid 3cc519d82627102c10c9095617641f00a084842e +i2c 5db36559df9b9c4f8a5dd86eeaa733ff973e3a33 +i3c 6cbf8b38dfe3aabe330f2c356949bc4d6a1f034f +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging c1ebdafde1ee7f7416c04f8bb72e74e48f13defe +jc_docs 9df072c73b9891e44f7f59f3b7c8f852b4485e80 +v4l-dvb 71e6d0608e4d1b79069990c7dacb3600ced28a3b +v4l-dvb-next ba2c670ae84bad705ec023bfa7a48f7f8eab5e16 +pm d7c37bca37f841711ee192e341fae44f54e6f6be +cpufreq-arm b7f2b0d3511a6bbf9387f08f370f9125663e18d8 +cpupower 8382dce5e4835c045f33b8958a5f559d212cdd11 +devfreq 9eb1950bb6f4bc0880210be05e674ad35aa43d5c +opp f48a0c475c2aec8f2274703e1dc7be503f40f7cc +thermal 1379d28e840ff2f7f8a4095ec6cb3e7034e966bc +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 87e0eacb176f9500c2063d140c0a1d7fa51ab8a5 +net-next 169e77764adc041b1dacba84ea90516a895d43b2 +bpf-next 169e77764adc041b1dacba84ea90516a895d43b2 +ipsec-next b58b1f563ab78955d37e9e43e02790a85c66ac05 +mlx5-next 45fee8edb4b333af79efad7a99de51718ebda94b +netfilter-next c84d86a0295c24487db5b7db1a61d9c0eddfbb66 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth 864cc8a234cd611b8c381ce752e10ee33e71aafd +wireless-next e89600ebeeb14d18c0b062837a84196f72542830 +mtd 6cadd424abb63120f8346a4509dc43bddc9401d3 +nand fecbd4a317c95d73c849648c406bcf1b6a0ec1cf +spi-nor 151c6b49d679872d6fc0b50e0ad96303091694a2 +crypto 0e03b8fd29363f2df44e2a7a176d486de550757a +drm 2a81dba4b577099717cea86d429f053e85e74d96 +drm-misc 519f490db07e1a539490612f376487f61e48e39c +amdgpu 749831acb1f6bf5837aeeec93b96da1d91534775 +drm-intel 00f4150d27d2c01eaeffe1091fc311a7c0872c69 +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 05241de1f69eb7f56b0a5e0bec96a7752fad1b2f +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 894d02fbfa672f85643053575d4607e4499b0f76 +regmap c53d92b4b351c66e83768108e8e330e9299ddb65 +sound 5e2baa04e4cd94c2465b248b7d861fcff8c22fae +sound-asoc b0793cb5c40ed6fb3da33dc2e64d17b2f76b0033 +modules 719fce7539cd3e186598e2aed36325fe892150cf +input a949087c2285c8de4f0f204cab2d4eece9d929a2 +block 3b255fe79c9eaa84a48e35e8cd6406788ba90d9c +device-mapper 4d7bca13dd9a5033174b0735056c5658cb893e76 +libata d268afa1ff6f582dede1819fbed7ded7442a406c +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc dc3d879c6ffa25e90875237265898e49b2cabb7e +mfd d99460ed5cdcc28feba6b992630b04650e410902 +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery c22fca40522e2be8af168f3087d87d85e404ea72 +regulator 78beedbc6af3eb0cc581af6b9e2b6416deb938f4 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 4a48b4c428dc92b5e0b19de83e7eb8d530dddd48 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux cdbec3ede0b8cb318c36f5cc945b9360329cbd25 +smack a5cd1ab7ab679d252a6d2f483eee7d45ebf2040c +tomoyo 47f62eaa117d7d7a8a23f9144580c0bfd47ee4ac +tpmdd fb5abce6b2bb5cb3d628aaa63fa821da8c4600f9 +watchdog 826270373f17fd8ebd10753ca0a5fd2ceb1dc38e +iommu e17c6debd4b2d2d474074f83946f8c6522587566 +audit 272ceeaea355214b301530e262a0df8600bfca95 +devicetree d635d9bdb52ca40736d156b45138827245d46ca0 +mailbox 1b0d0f7c12d57763fe27200d0569c863f11d2b8a +spi ebcbbd0316bfc1257792052e48642c72410fd8fc +tip ba5a91cc154f61f6af263973ff33a858f11a0635 +clockevents 49c14f94ccfed1acf55a7dd592c00c58d38e5812 +edac d52ba330befa549b85576121c98318dae679d1fc +irqchip 49cdcea1b0772c29abb9468d82809933c718110e +ftrace c87857e214862a125208a4b1a510839d0c5a1bd4 +rcu 3a9ac384153de5abe642942a42bdfa6cfeed78ba +kvm c9b8fecddb5bb4b67e351bbaeaa648a6f7456912 +kvm-arm 21ea457842759a236eefed2cfaa8cc7e5dc967a0 +kvms390 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +xen-tip de2ae403b4c0e79a3410e63bc448542fbb9f9bfc +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 b49f72e7f96d4ed147447428f2ae5b4cea598ca7 +chrome-platform b579f139e47037cf98808ccf7511a6deb02f3b18 +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds e26557a0aa68acfb705b51947b7c756401a1ab71 +ipmi ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +driver-core 88d99e870143199ba5bf42701dca06ce1d1388f0 +usb ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +thunderbolt 144c4a77a3e1e520daba85eafd28999af22e1aa5 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 4ac56b1f1ef8139dbfc5dab918aa235e8344ec4e +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty b31c41339f4f8a833cb9dc509f87aab6a159ffe4 +char-misc 37fd83916da2e4cae03d350015c82a67b1b334c4 +coresight 286f950545e0d9c8aa802cbfc9676860bbc49179 +fpga 21f0a239ecab4b6765269af78904512358beb802 +icc 52c85167e41341c2cbc2570f4bb6bc6cd8f8bc6e +iio 37fd83916da2e4cae03d350015c82a67b1b334c4 +phy-next c6455af548991ed22c89528f998fd965c052fb2e +soundwire 266fa94673d325f489f74d0a9a12024a7f1ee49c +extcon 4e63832f5daf6d76e8c6fe5c84b493572717535c +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +vfio f621eb13facb7681a79f4fec8ec6553ae160da76 +staging 41197a5f11a4b2d11ac19bc62552022153032811 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine b95044b38425f563404234d96bbb20cc6360c7e1 +cgroup 1be9b7206b7dbff54b223eee7ef3bc91b80433aa +scsi ee03d7a9c533a237e19a5a22d53505eec69f4bcb +scsi-mkp 66daf3e6b9936328cb28eaaa29dddfe96343cc85 +vhost ad6dc1daaf29f97f23cc810d60ee01c0e83f4c6b +rpmsg 9ea79a3861c93b19ef78db70044d23bf36b8271e +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 87ba5badc541a79bab2fa3243ee0008c0880c64a +gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 4a6d01495a167762de1691eb51e0413954db20eb +pinctrl-intel d25478e1d8f9bf9344cf61a9c02fae88d9930f55 +pinctrl-renesas babe298e9caaa3d723f9721647eeac22309941d8 +pinctrl-samsung 3652dc070bad335d6feb31402bb4ab1ad58d5cb6 +pwm ed14d36498c8d15be098df4af9ca324f96e9de74 +userns 9def41809e95d345875f37d2245b4b17c62fedf1 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f6d344cd5fa6a15e1ec2da350470b35a3f55f74c +livepatching 0e1b951d6de0528a81d119634ad23f8f9fb6d423 +rtc 81c2f059ab90b221931e78503c80dcd8fbadac53 +nvdimm ada8d8d337ee970860c9844126e634df8076aa11 +at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +ntb 5cf4bc46c2f20651f2d44fe395fc93409b7b0ff4 +seccomp 1d27adee48cf8c97b63eb3cc83e937870fbb32ad +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 0eb1fb16396ce3b0d8d493a4416a5c5f06091c84 +nvmem bdf79b27260ba474ce076e451911b0f552285a7b +xarray 22f56b8e890d4e2835951b437bb6eeebfd1cb18b +hyperv eeda29db98f429a3b6473117e6ce1c213ab614f2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +kunit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cfi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +kunit-next 5debe5bfa02c4c8922bd2d0f82c9c3a70bec8944 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi c65b6a9d117369e4d2a63eb18a6dce7615a8bf7d +memblock 58ffc34896db2e5e49e6ae6bf8042f85504d84e8 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 05e815539f3f161585c13a9ab023341bade2c52f +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab c0a21b0f69288971f4ad0d42faf6c08f26c24802 +random 0396e46dc46523cba8401a0df84f67cc0b6067ab +landlock 7325fd5614aa686c496e4f98633be9808aee44f4 +rust f102e7bc3b29f4f6e1a5b7d3332c6ddf1446a349 +sysctl fc12aa67daba87a5ac43a9d3ae80be2e666e2ef9 +folio 1a58fcb00cca0188325b81d34bc0e208cb9189ad +execve dd664099002db909912a23215f8775c97f7f4f10 +kspp 723908690e471a8c74b9ac239470ee2d048f5154 +kspp-gustavo 452d059ea2b6252f6743de3e9e81950d05ed8b18 +akpm-current ec31e5d6e6853f24e55d0ec994ab9cf4c5c370ee +akpm 690633ee3a88d4ca0e13aa22ebb44d04760bbb0b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e58ea6a035fa --- /dev/null +++ b/Next/Trees @@ -0,0 +1,349 @@ +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 +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +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/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +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/helgaas/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-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +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-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-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/acme/linux.git#perf/urgent +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#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 +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 +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.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 +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +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/fscrypt/fscrypt.git#fsverity +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#for-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/mszeredi/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 +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/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 +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_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +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 +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +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/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#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/jmorris/linux-security.git#next-testing +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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-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-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-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 +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +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/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#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 +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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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 +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +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#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/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +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 +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ebe09d7a0569 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4726 @@ +$ date -R +Tue, 29 Mar 2022 08:24:32 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 50d602d81f35 Merge tag 'mailbox-v5.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration +Merging origin/master (7203062171db Merge tag 'tty-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 50d602d81f35..7203062171db +Fast-forward (no commit created; -m option ignored) + .mailmap | 1 + + .../ABI/stable/sysfs-driver-firmware-zynqmp | 141 ++ + .../ABI/testing/debugfs-driver-habanalabs | 20 +- + Documentation/ABI/testing/sysfs-bus-iio | 31 + + .../ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 + + .../ABI/testing/sysfs-bus-iio-dac-ltc2688 | 86 + + .../ABI/testing/sysfs-bus-iio-frequency-admv1014 | 23 + + Documentation/ABI/testing/sysfs-bus-iio-sx9324 | 28 + + Documentation/ABI/testing/sysfs-bus-peci | 16 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 16 +- + Documentation/core-api/dma-attributes.rst | 8 - + .../clock/marvell,armada-3700-uart-clock.yaml | 59 + + .../bindings/clock/mediatek,mt7621-sysc.yaml | 12 + + .../devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 39 + + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 79 + + .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 77 + + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 2 - + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/microchip,mcp3201.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 2 +- + .../bindings/iio/adc/ti,palmas-gpadc.yaml | 6 +- + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 8 + + .../bindings/iio/afe/temperature-sense-rtd.yaml | 101 + + .../bindings/iio/afe/temperature-transducer.yaml | 114 + + .../bindings/iio/amplifiers/adi,ada4250.yaml | 50 + + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 146 ++ + .../bindings/iio/frequency/adi,admv1014.yaml | 134 ++ + .../bindings/iio/frequency/adi,admv4420.yaml | 55 + + .../bindings/iio/proximity/semtech,sx9324.yaml | 161 ++ + .../bindings/iio/proximity/semtech,sx9360.yaml | 89 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 3 + + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 33 +- + .../devicetree/bindings/mfd/delta,tn48m-cpld.yaml | 90 + + .../devicetree/bindings/misc/qcom,fastrpc.txt | 10 + + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 1 + + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 25 +- + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 38 + + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 3 - + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 84 + + .../devicetree/bindings/peci/peci-aspeed.yaml | 72 + + .../devicetree/bindings/peci/peci-controller.yaml | 33 + + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 4 +- + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 42 + + .../devicetree/bindings/phy/cdns,dphy.txt | 20 - + .../devicetree/bindings/phy/cdns,dphy.yaml | 56 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 + + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 109 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 4 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 85 - + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 109 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 3 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 3 +- + .../bindings/phy/samsung,dp-video-phy.yaml | 41 + + .../bindings/phy/samsung,exynos5250-sata-phy.yaml | 64 + + .../bindings/phy/samsung,mipi-video-phy.yaml | 113 + + .../devicetree/bindings/phy/samsung,usb2-phy.yaml | 102 + + .../bindings/phy/samsung,usb3-drd-phy.yaml | 126 ++ + .../devicetree/bindings/phy/samsung-phy.txt | 210 -- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 16 + + .../bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 2 +- + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 72 + + .../bindings/pinctrl/fsl,imx93-pinctrl.yaml | 85 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 1 + + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 2 +- + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 4 +- + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 160 ++ + .../bindings/pinctrl/pinctrl-mt8186.yaml | 297 +++ + .../bindings/pinctrl/pinctrl-mt8195.yaml | 65 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 2 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 1 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 1 + + .../bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml | 151 ++ + .../bindings/pinctrl/qcom,tlmm-common.yaml | 1 - + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 11 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 16 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 374 ++++ + .../bindings/reserved-memory/google,open-dice.yaml | 46 + + .../bindings/reset/delta,tn48m-reset.yaml | 35 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 10 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/mvebu-uart.txt | 9 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 5 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 4 + + .../bindings/serial/sunplus,sp7021-uart.yaml | 56 + + .../devicetree/bindings/soundwire/qcom,sdw.txt | 14 +- + .../bindings/staging}/net/wireless/silabs,wfx.yaml | 82 +- + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/nvmem.rst | 28 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/peci-cputemp.rst | 90 + + Documentation/hwmon/peci-dimmtemp.rst | 57 + + Documentation/index.rst | 1 + + Documentation/peci/index.rst | 16 + + Documentation/peci/peci.rst | 51 + + Documentation/process/stable-kernel-rules.rst | 32 +- + MAINTAINERS | 212 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 11 + + arch/arm/boot/dts/aspeed-g5.dtsi | 11 + + arch/arm/boot/dts/aspeed-g6.dtsi | 11 + + arch/arm64/Kconfig | 6 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 14 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 3 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 3 + + arch/arm64/include/asm/Kbuild | 1 + + arch/csky/include/asm/Kbuild | 1 + + arch/ia64/include/uapi/asm/termbits.h | 209 -- + arch/mips/boot/dts/ralink/Makefile | 4 + + .../mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 44 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 122 ++ + .../mips/boot/dts/ralink}/mt7621.dtsi | 59 +- + arch/mips/ralink/Kconfig | 5 + + arch/powerpc/include/asm/livepatch.h | 1 + + arch/riscv/include/asm/Kbuild | 1 + + arch/um/include/asm/Kbuild | 1 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/uapi/asm/termbits.h | 221 -- + drivers/Kconfig | 3 + + drivers/Makefile | 1 + + drivers/accessibility/speakup/speakup_audptr.c | 24 +- + drivers/accessibility/speakup/synth.c | 2 +- + drivers/android/binder_alloc.c | 8 +- + drivers/ata/ahci.h | 2 - + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/base/component.c | 300 +-- + drivers/base/dd.c | 88 +- + drivers/base/devres.c | 4 +- + drivers/base/devtmpfs.c | 2 - + drivers/base/firmware_loader/Kconfig | 5 + + drivers/base/platform.c | 6 +- + drivers/base/soc.c | 14 +- + drivers/bus/Makefile | 2 +- + drivers/bus/mhi/Kconfig | 27 +- + drivers/bus/mhi/Makefile | 8 +- + drivers/bus/mhi/common.h | 304 +++ + drivers/bus/mhi/core/internal.h | 722 ------- + drivers/bus/mhi/host/Kconfig | 31 + + drivers/bus/mhi/{core => host}/Makefile | 4 +- + drivers/bus/mhi/{core => host}/boot.c | 17 +- + drivers/bus/mhi/{core => host}/debugfs.c | 40 +- + drivers/bus/mhi/{core => host}/init.c | 131 +- + drivers/bus/mhi/host/internal.h | 382 ++++ + drivers/bus/mhi/{core => host}/main.c | 66 +- + drivers/bus/mhi/{ => host}/pci_generic.c | 1 + + drivers/bus/mhi/{core => host}/pm.c | 36 +- + drivers/char/bsr.c | 2 +- + drivers/char/hpet.c | 28 +- + drivers/char/virtio_console.c | 8 +- + drivers/char/xilinx_hwicap/fifo_icap.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +- + drivers/clk/ralink/clk-mt7621.c | 92 +- + drivers/comedi/drivers/das16.c | 4 +- + drivers/comedi/drivers/ni_routes.c | 6 +- + drivers/comedi/drivers/pcm3724.c | 1 - + drivers/counter/Kconfig | 2 +- + drivers/counter/counter-chrdev.c | 4 + + drivers/counter/counter-core.c | 12 +- + drivers/counter/interrupt-cnt.c | 7 +- + drivers/dio/dio.c | 140 +- + drivers/firmware/google/Kconfig | 2 +- + drivers/firmware/stratix10-svc.c | 11 +- + drivers/firmware/sysfb_simplefb.c | 23 +- + drivers/firmware/xilinx/zynqmp.c | 120 ++ + drivers/fpga/dfl-pci.c | 15 +- + drivers/fsi/fsi-core.c | 11 +- + drivers/fsi/fsi-master-aspeed.c | 19 +- + drivers/fsi/fsi-occ.c | 87 +- + drivers/fsi/fsi-sbefifo.c | 53 +- + drivers/fsi/fsi-scom.c | 45 +- + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tn48m.c | 100 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 7 +- + drivers/gpu/drm/armada/armada_drv.c | 17 +- + drivers/gpu/drm/drm_of.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 7 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 7 +- + drivers/gpu/drm/mcde/mcde_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- + drivers/gpu/drm/meson/meson_drv.c | 10 +- + drivers/gpu/drm/msm/msm_drv.c | 15 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 +- + drivers/gpu/drm/sprd/sprd_drm.c | 7 +- + drivers/gpu/drm/sti/sti_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 11 +- + drivers/gpu/drm/vc4/vc4_drv.c | 7 +- + drivers/greybus/svc.c | 16 +- + drivers/hwmon/Kconfig | 2 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/peci/Kconfig | 31 + + drivers/hwmon/peci/Makefile | 7 + + drivers/hwmon/peci/common.h | 58 + + drivers/hwmon/peci/cputemp.c | 592 ++++++ + drivers/hwmon/peci/dimmtemp.c | 630 ++++++ + drivers/hwtracing/coresight/coresight-core.c | 3 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 4 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 12 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 38 +- + drivers/hwtracing/coresight/coresight-platform.c | 8 +- + drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- + drivers/hwtracing/coresight/coresight-trbe.c | 125 +- + drivers/hwtracing/coresight/coresight-trbe.h | 8 - + drivers/iio/accel/Kconfig | 62 +- + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adis16201.c | 1 + + drivers/iio/accel/adis16209.c | 1 + + drivers/iio/accel/adxl313_core.c | 6 +- + drivers/iio/accel/adxl313_i2c.c | 1 + + drivers/iio/accel/adxl313_spi.c | 1 + + drivers/iio/accel/adxl345.h | 7 +- + drivers/iio/accel/adxl345_core.c | 56 +- + drivers/iio/accel/adxl345_i2c.c | 35 +- + drivers/iio/accel/adxl345_spi.c | 35 +- + drivers/iio/accel/adxl355_core.c | 11 +- + drivers/iio/accel/adxl355_i2c.c | 1 + + drivers/iio/accel/adxl355_spi.c | 1 + + drivers/iio/accel/adxl367.c | 1588 ++++++++++++++ + drivers/iio/accel/adxl367.h | 23 + + drivers/iio/accel/adxl367_i2c.c | 90 + + drivers/iio/accel/adxl367_spi.c | 164 ++ + drivers/iio/accel/adxl372.c | 4 +- + drivers/iio/accel/adxl372_i2c.c | 1 + + drivers/iio/accel/adxl372_spi.c | 1 + + drivers/iio/accel/bma180.c | 9 +- + drivers/iio/accel/bma400_core.c | 6 +- + drivers/iio/accel/bma400_i2c.c | 1 + + drivers/iio/accel/bma400_spi.c | 1 + + drivers/iio/accel/bmc150-accel-core.c | 8 +- + drivers/iio/accel/bmc150-accel-i2c.c | 1 + + drivers/iio/accel/bmc150-accel-spi.c | 1 + + drivers/iio/accel/bmi088-accel-core.c | 8 +- + drivers/iio/accel/bmi088-accel-spi.c | 1 + + drivers/iio/accel/da280.c | 6 +- + drivers/iio/accel/da311.c | 6 +- + drivers/iio/accel/dmard06.c | 10 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/dmard10.c | 7 +- + drivers/iio/accel/fxls8962af-core.c | 8 +- + drivers/iio/accel/fxls8962af-i2c.c | 1 + + drivers/iio/accel/fxls8962af-spi.c | 1 + + drivers/iio/accel/kxsd9-i2c.c | 1 + + drivers/iio/accel/kxsd9-spi.c | 1 + + drivers/iio/accel/kxsd9.c | 6 +- + drivers/iio/accel/mc3230.c | 6 +- + drivers/iio/accel/mma7455_core.c | 6 +- + drivers/iio/accel/mma7455_i2c.c | 1 + + drivers/iio/accel/mma7455_spi.c | 1 + + drivers/iio/accel/mma7660.c | 11 +- + drivers/iio/accel/mma8452.c | 54 +- + drivers/iio/accel/mma9551.c | 12 +- + drivers/iio/accel/mma9551_core.c | 36 +- + drivers/iio/accel/mma9553.c | 12 +- + drivers/iio/accel/ssp_accel_sensor.c | 1 + + drivers/iio/accel/st_accel.h | 2 + + drivers/iio/accel/st_accel_buffer.c | 5 - + drivers/iio/accel/st_accel_core.c | 88 +- + drivers/iio/accel/st_accel_i2c.c | 6 + + drivers/iio/accel/st_accel_spi.c | 1 + + drivers/iio/accel/stk8312.c | 11 +- + drivers/iio/accel/stk8ba50.c | 11 +- + drivers/iio/adc/Kconfig | 11 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ab8500-gpadc.c | 14 +- + drivers/iio/adc/ad7091r-base.c | 4 +- + drivers/iio/adc/ad7091r5.c | 1 + + drivers/iio/adc/ad7124.c | 1 + + drivers/iio/adc/ad7192.c | 5 +- + drivers/iio/adc/ad7280a.c | 1111 ++++++++++ + drivers/iio/adc/ad7606.c | 4 +- + drivers/iio/adc/ad7606_par.c | 1 + + drivers/iio/adc/ad7606_spi.c | 1 + + drivers/iio/adc/ad7780.c | 1 + + drivers/iio/adc/ad7791.c | 1 + + drivers/iio/adc/ad7793.c | 1 + + drivers/iio/adc/ad_sigma_delta.c | 20 +- + drivers/iio/adc/aspeed_adc.c | 4 +- + drivers/iio/adc/at91_adc.c | 7 +- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 9 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 2 +- + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/adc/mt6577_auxadc.c | 16 +- + drivers/iio/adc/palmas_gpadc.c | 10 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 15 +- + drivers/iio/adc/qcom-spmi-vadc.c | 24 +- + drivers/iio/adc/qcom-vadc-common.c | 92 +- + drivers/iio/adc/rcar-gyroadc.c | 6 +- + drivers/iio/adc/rn5t618-adc.c | 7 +- + drivers/iio/adc/rockchip_saradc.c | 9 +- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc-core.c | 17 +- + drivers/iio/adc/stm32-adc.c | 12 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 11 +- + drivers/iio/adc/stm32-dfsdm-core.c | 19 +- + drivers/iio/adc/ti-adc084s021.c | 2 +- + drivers/iio/adc/ti-tsc2046.c | 269 ++- + drivers/iio/adc/twl4030-madc.c | 9 +- + drivers/iio/adc/twl6030-gpadc.c | 10 +- + drivers/iio/adc/vf610_adc.c | 7 +- + drivers/iio/adc/xilinx-ams.c | 26 +- + drivers/iio/afe/iio-rescale.c | 288 ++- + drivers/iio/amplifiers/Kconfig | 11 + + drivers/iio/amplifiers/Makefile | 1 + + drivers/iio/amplifiers/ada4250.c | 403 ++++ + drivers/iio/amplifiers/hmc425a.c | 6 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 32 +- + drivers/iio/chemical/atlas-sensor.c | 17 +- + drivers/iio/chemical/bme680_core.c | 4 +- + drivers/iio/chemical/bme680_i2c.c | 1 + + drivers/iio/chemical/bme680_spi.c | 3 +- + drivers/iio/chemical/scd4x.c | 2 +- + drivers/iio/chemical/sps30.c | 2 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 28 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 40 +- + drivers/iio/common/ssp_sensors/ssp_iio.c | 7 +- + drivers/iio/common/st_sensors/Kconfig | 2 - + drivers/iio/common/st_sensors/st_sensors_buffer.c | 7 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 28 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 9 +- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5592r-base.c | 5 +- + drivers/iio/dac/ad5592r.c | 1 + + drivers/iio/dac/ad5593r.c | 1 + + drivers/iio/dac/ad5686-spi.c | 1 + + drivers/iio/dac/ad5686.c | 4 +- + drivers/iio/dac/ad5696-i2c.c | 1 + + drivers/iio/dac/ltc2688.c | 1071 ++++++++++ + drivers/iio/dac/m62332.c | 11 +- + drivers/iio/dac/stm32-dac-core.c | 16 +- + drivers/iio/dac/stm32-dac.c | 9 +- + drivers/iio/dac/vf610_dac.c | 7 +- + drivers/iio/frequency/Kconfig | 20 + + drivers/iio/frequency/Makefile | 2 + + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/frequency/adf4350.c | 103 +- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/frequency/admv1014.c | 823 ++++++++ + drivers/iio/frequency/admv4420.c | 398 ++++ + drivers/iio/gyro/Kconfig | 37 +- + drivers/iio/gyro/adis16136.c | 1 + + drivers/iio/gyro/adis16260.c | 1 + + drivers/iio/gyro/ssp_gyro_sensor.c | 1 + + drivers/iio/gyro/st_gyro_buffer.c | 4 - + drivers/iio/gyro/st_gyro_core.c | 5 +- + drivers/iio/gyro/st_gyro_i2c.c | 1 + + drivers/iio/gyro/st_gyro_spi.c | 1 + + drivers/iio/humidity/dht11.c | 3 +- + drivers/iio/humidity/hdc100x.c | 7 + + drivers/iio/humidity/htu21.c | 1 + + drivers/iio/imu/adis.c | 67 +- + drivers/iio/imu/adis16400.c | 1 + + drivers/iio/imu/adis16460.c | 1 + + drivers/iio/imu/adis16475.c | 1 + + drivers/iio/imu/adis16480.c | 1 + + drivers/iio/imu/adis_buffer.c | 10 +- + drivers/iio/imu/adis_trigger.c | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 15 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 +- + drivers/iio/imu/kmx61.c | 10 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 +- + drivers/iio/imu/st_lsm9ds0/Kconfig | 28 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 1 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 1 + + drivers/iio/industrialio-buffer.c | 4 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/iio/industrialio-event.c | 1 + + drivers/iio/inkern.c | 40 +- + drivers/iio/light/apds9300.c | 10 +- + drivers/iio/light/bh1780.c | 12 +- + drivers/iio/light/cm3232.c | 9 +- + drivers/iio/light/isl29018.c | 10 +- + drivers/iio/light/isl29125.c | 7 +- + drivers/iio/light/jsa1212.c | 11 +- + drivers/iio/light/lm3533-als.c | 6 +- + drivers/iio/light/ltr501.c | 20 +- + drivers/iio/light/pa12203001.c | 4 +- + drivers/iio/light/rpr0521.c | 7 +- + drivers/iio/light/st_uvis25_core.c | 4 +- + drivers/iio/light/st_uvis25_i2c.c | 1 + + drivers/iio/light/st_uvis25_spi.c | 1 + + drivers/iio/light/stk3310.c | 11 +- + drivers/iio/light/tcs3414.c | 7 +- + drivers/iio/light/tcs3472.c | 7 +- + drivers/iio/light/tsl2563.c | 10 +- + drivers/iio/light/tsl2772.c | 2 +- + drivers/iio/light/tsl4531.c | 10 +- + drivers/iio/light/us5182d.c | 6 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/magnetometer/Kconfig | 35 +- + drivers/iio/magnetometer/ak8975.c | 12 +- + drivers/iio/magnetometer/bmc150_magn.c | 8 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 1 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 1 + + drivers/iio/magnetometer/hmc5843_core.c | 8 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 1 + + drivers/iio/magnetometer/hmc5843_spi.c | 1 + + drivers/iio/magnetometer/mag3110.c | 10 +- + drivers/iio/magnetometer/mmc35240.c | 9 +- + drivers/iio/magnetometer/rm3100-core.c | 8 +- + drivers/iio/magnetometer/rm3100-i2c.c | 1 + + drivers/iio/magnetometer/rm3100-spi.c | 1 + + drivers/iio/magnetometer/st_magn_buffer.c | 4 - + drivers/iio/magnetometer/st_magn_core.c | 5 +- + drivers/iio/magnetometer/st_magn_i2c.c | 1 + + drivers/iio/magnetometer/st_magn_spi.c | 1 + + drivers/iio/potentiometer/Kconfig | 6 +- + drivers/iio/potentiometer/ds1803.c | 169 +- + drivers/iio/pressure/Kconfig | 35 +- + drivers/iio/pressure/dps310.c | 7 + + drivers/iio/pressure/mpl115.c | 2 +- + drivers/iio/pressure/mpl115_i2c.c | 1 + + drivers/iio/pressure/mpl115_spi.c | 1 + + drivers/iio/pressure/mpl3115.c | 10 +- + drivers/iio/pressure/ms5611_core.c | 4 +- + drivers/iio/pressure/ms5611_i2c.c | 1 + + drivers/iio/pressure/ms5611_spi.c | 1 + + drivers/iio/pressure/ms5637.c | 1 + + drivers/iio/pressure/st_pressure_buffer.c | 5 - + drivers/iio/pressure/st_pressure_core.c | 5 +- + drivers/iio/pressure/st_pressure_i2c.c | 1 + + drivers/iio/pressure/st_pressure_spi.c | 1 + + drivers/iio/pressure/zpa2326.c | 12 +- + drivers/iio/pressure/zpa2326_i2c.c | 1 + + drivers/iio/pressure/zpa2326_spi.c | 1 + + drivers/iio/proximity/Kconfig | 34 + + drivers/iio/proximity/Makefile | 3 + + drivers/iio/proximity/as3935.c | 26 +- + drivers/iio/proximity/ping.c | 4 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 7 +- + drivers/iio/proximity/rfd77402.c | 9 +- + drivers/iio/proximity/srf04.c | 12 +- + drivers/iio/proximity/srf08.c | 6 +- + drivers/iio/proximity/sx9310.c | 741 +------ + drivers/iio/proximity/sx9324.c | 1068 ++++++++++ + drivers/iio/proximity/sx9360.c | 893 ++++++++ + drivers/iio/proximity/sx9500.c | 8 +- + drivers/iio/proximity/sx_common.c | 572 +++++ + drivers/iio/proximity/sx_common.h | 157 ++ + drivers/iio/proximity/vl53l0x-i2c.c | 2 +- + drivers/iio/temperature/max31856.c | 4 +- + drivers/iio/temperature/max31865.c | 4 +- + drivers/iio/temperature/maxim_thermocouple.c | 5 +- + drivers/iio/temperature/mlx90614.c | 12 +- + drivers/iio/temperature/mlx90632.c | 2 +- + drivers/iio/temperature/tmp006.c | 6 +- + drivers/iio/temperature/tmp007.c | 6 +- + drivers/iio/temperature/tsys01.c | 1 + + drivers/iio/temperature/tsys02d.c | 1 + + drivers/iio/test/Kconfig | 10 + + drivers/iio/test/Makefile | 1 + + drivers/iio/test/iio-test-rescale.c | 710 +++++++ + drivers/iio/trigger/Kconfig | 2 +- + drivers/iio/trigger/stm32-timer-trigger.c | 23 +- + drivers/interconnect/imx/imx.c | 9 + + drivers/interconnect/qcom/msm8939.c | 10 +- + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/mtk_iommu.h | 10 - + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/md/bcache/stats.c | 3 +- + drivers/md/bcache/sysfs.c | 15 +- + drivers/md/bcache/sysfs.h | 2 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/bcm-vk/bcm_vk_dev.c | 1 - + drivers/misc/cardreader/alcor_pci.c | 9 +- + drivers/misc/cardreader/rtl8411.c | 2 +- + drivers/misc/cardreader/rts5209.c | 2 +- + drivers/misc/cardreader/rts5227.c | 47 + + drivers/misc/cardreader/rts5228.c | 25 +- + drivers/misc/cardreader/rts5229.c | 2 +- + drivers/misc/cardreader/rts5249.c | 31 +- + drivers/misc/cardreader/rts5261.c | 35 +- + drivers/misc/cardreader/rtsx_pcr.c | 228 +- + drivers/misc/cardreader/rtsx_pcr.h | 3 + + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/fastrpc.c | 556 ++++- + drivers/misc/habanalabs/common/Makefile | 2 +- + drivers/misc/habanalabs/common/command_buffer.c | 4 +- + .../misc/habanalabs/common/command_submission.c | 265 ++- + drivers/misc/habanalabs/common/debugfs.c | 40 +- + drivers/misc/habanalabs/common/device.c | 53 +- + drivers/misc/habanalabs/common/firmware_if.c | 152 +- + drivers/misc/habanalabs/common/habanalabs.h | 209 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 3 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 13 +- + drivers/misc/habanalabs/common/hwmgr.c | 117 -- + drivers/misc/habanalabs/common/irq.c | 127 +- + drivers/misc/habanalabs/common/memory.c | 360 +++- + drivers/misc/habanalabs/common/mmu/mmu.c | 55 + + drivers/misc/habanalabs/common/mmu/mmu_v1.c | 47 +- + drivers/misc/habanalabs/common/pci/pci.c | 9 +- + drivers/misc/habanalabs/common/sysfs.c | 176 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 462 ++--- + drivers/misc/habanalabs/gaudi/gaudiP.h | 8 +- + drivers/misc/habanalabs/goya/goya.c | 45 +- + drivers/misc/habanalabs/goya/goyaP.h | 6 +- + drivers/misc/habanalabs/goya/goya_hwmgr.c | 67 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 2 + + .../misc/habanalabs/include/common/hl_boot_if.h | 5 + + .../habanalabs/include/gaudi/gaudi_async_events.h | 10 + + drivers/misc/kgdbts.c | 4 +- + drivers/misc/lkdtm/fortify.c | 6 +- + drivers/misc/mei/client.c | 1 + + drivers/misc/mei/hw-me-regs.h | 2 + + drivers/misc/mei/hw-me.c | 43 +- + drivers/misc/mei/init.c | 5 + + drivers/misc/mei/interrupt.c | 35 +- + drivers/misc/mei/pci-me.c | 11 +- + drivers/misc/ocxl/link.c | 2 +- + drivers/misc/open-dice.c | 208 ++ + drivers/misc/sgi-gru/grukservices.c | 2 +- + drivers/misc/sgi-gru/grutables.h | 6 - + drivers/misc/vmw_vmci/vmci_guest.c | 366 +++- + drivers/mmc/core/quirks.h | 5 + + drivers/mmc/core/sdio_uart.c | 17 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 20 +- + drivers/mtd/mtdcore.c | 13 +- + drivers/mux/core.c | 239 ++- + drivers/nvmem/Kconfig | 24 + + drivers/nvmem/Makefile | 4 + + drivers/nvmem/brcm_nvram.c | 90 + + drivers/nvmem/core.c | 47 +- + drivers/nvmem/layerscape-sfp.c | 89 + + drivers/nvmem/meson-mx-efuse.c | 3 +- + drivers/nvmem/qfprom.c | 4 +- + drivers/nvmem/sunplus-ocotp.c | 228 ++ + drivers/nvmem/sunxi_sid.c | 6 + + drivers/of/platform.c | 1 + + drivers/parport/Kconfig | 4 +- + drivers/pci/controller/pci-aardvark.c | 4 +- + drivers/peci/Kconfig | 36 + + drivers/peci/Makefile | 10 + + drivers/peci/controller/Kconfig | 18 + + drivers/peci/controller/Makefile | 3 + + drivers/peci/controller/peci-aspeed.c | 599 ++++++ + drivers/peci/core.c | 236 +++ + drivers/peci/cpu.c | 343 +++ + drivers/peci/device.c | 252 +++ + drivers/peci/internal.h | 136 ++ + drivers/peci/request.c | 482 +++++ + drivers/peci/sysfs.c | 82 + + drivers/phy/allwinner/phy-sun4i-usb.c | 41 +- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 46 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 36 + + drivers/phy/broadcom/phy-brcm-usb-init.h | 1 + + drivers/phy/broadcom/phy-brcm-usb.c | 11 +- + drivers/phy/cadence/Kconfig | 8 + + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/cdns-dphy-rx.c | 255 +++ + drivers/phy/cadence/phy-cadence-salvo.c | 7 +- + drivers/phy/cadence/phy-cadence-sierra.c | 82 +- + drivers/phy/freescale/Kconfig | 5 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 +- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 1350 ++++++++++-- + drivers/phy/phy-core-mipi-dphy.c | 4 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 9 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 28 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 3 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 5 + + drivers/phy/rockchip/Kconfig | 8 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 581 ++++++ + drivers/phy/ti/phy-tusb1210.c | 443 +++- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/bcm/Kconfig | 14 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 563 +++++ + drivers/pinctrl/berlin/berlin.c | 2 + + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx93.c | 272 +++ + drivers/pinctrl/intel/pinctrl-alderlake.c | 317 ++- + drivers/pinctrl/intel/pinctrl-baytrail.c | 55 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 291 ++- + drivers/pinctrl/mediatek/Kconfig | 7 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 40 +- + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 44 +- + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt6797.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 39 +- + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 17 +- + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 40 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 29 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt8186.c | 1267 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 40 +- + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 40 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 88 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 33 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt8186.h | 2186 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 301 +-- + drivers/pinctrl/mediatek/pinctrl-paris.h | 3 +- + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson-s4.c | 1232 +++++++++++ + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/nuvoton/Kconfig | 20 + + drivers/pinctrl/nuvoton/Makefile | 1 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 168 +- + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 1151 +++++++++++ + drivers/pinctrl/pinconf-generic.c | 6 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 16 +- + drivers/pinctrl/pinctrl-ingenic.c | 46 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 112 +- + drivers/pinctrl/pinctrl-ocelot.c | 109 +- + drivers/pinctrl/pinctrl-rockchip.c | 2 + + drivers/pinctrl/pinctrl-starfive.c | 2 +- + drivers/pinctrl/pinctrl-zynq.c | 7 +- + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 5 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 13 +- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 12 + + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 4 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 1953 +++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm6125.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 106 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 + + drivers/pinctrl/renesas/Kconfig | 11 +- + drivers/pinctrl/renesas/Makefile | 1 + + drivers/pinctrl/renesas/core.c | 219 +- + drivers/pinctrl/renesas/pfc-emev2.c | 71 +- + drivers/pinctrl/renesas/pfc-r8a73a4.c | 97 +- + drivers/pinctrl/renesas/pfc-r8a7740.c | 282 +-- + drivers/pinctrl/renesas/pfc-r8a77470.c | 240 +-- + drivers/pinctrl/renesas/pfc-r8a7778.c | 69 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 118 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 530 ++--- + drivers/pinctrl/renesas/pfc-r8a7791.c | 322 ++- + drivers/pinctrl/renesas/pfc-r8a7792.c | 446 ++-- + drivers/pinctrl/renesas/pfc-r8a7794.c | 214 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 119 +- + drivers/pinctrl/renesas/pfc-r8a77951.c | 313 +-- + drivers/pinctrl/renesas/pfc-r8a7796.c | 315 +-- + drivers/pinctrl/renesas/pfc-r8a77965.c | 333 +-- + drivers/pinctrl/renesas/pfc-r8a77970.c | 165 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 193 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 333 ++- + drivers/pinctrl/renesas/pfc-r8a77995.c | 200 +- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 105 +- + drivers/pinctrl/renesas/pfc-r8a779f0.c | 2126 +++++++++++++++++++ + drivers/pinctrl/renesas/pfc-sh7203.c | 1 - + drivers/pinctrl/renesas/pfc-sh7264.c | 1 - + drivers/pinctrl/renesas/pfc-sh7269.c | 1 - + drivers/pinctrl/renesas/pfc-sh73a0.c | 269 +-- + drivers/pinctrl/renesas/pfc-sh7720.c | 1 - + drivers/pinctrl/renesas/pfc-sh7722.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/renesas/pinctrl.c | 26 +- + drivers/pinctrl/renesas/sh_pfc.h | 176 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 71 + + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/sunplus/Kconfig | 22 + + drivers/pinctrl/sunplus/Makefile | 6 + + drivers/pinctrl/sunplus/sppctl.c | 1118 ++++++++++ + drivers/pinctrl/sunplus/sppctl.h | 170 ++ + drivers/pinctrl/sunplus/sppctl_sp7021.c | 583 ++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 9 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 26 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 64 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 62 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 62 +- + drivers/platform/goldfish/goldfish_pipe.c | 8 +- + drivers/power/supply/ab8500_charger.c | 8 +- + drivers/power/supply/ab8500_fg.c | 3 +- + drivers/pps/clients/pps-gpio.c | 2 +- + drivers/pps/generators/pps_gen_parport.c | 42 +- + drivers/reset/Kconfig | 13 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-tn48m.c | 128 ++ + drivers/soundwire/bus.c | 8 +- + drivers/soundwire/intel.c | 4 +- + drivers/soundwire/intel_init.c | 7 +- + drivers/soundwire/qcom.c | 208 +- + drivers/soundwire/stream.c | 952 +++++---- + drivers/staging/Kconfig | 6 - + drivers/staging/Makefile | 3 - + drivers/staging/android/Kconfig | 19 - + drivers/staging/android/Makefile | 4 - + drivers/staging/android/TODO | 8 - + drivers/staging/android/ashmem.c | 970 --------- + drivers/staging/android/ashmem.h | 24 - + drivers/staging/android/uapi/ashmem.h | 43 - + drivers/staging/fbtft/fbtft-core.c | 9 +- + drivers/staging/fbtft/fbtft.h | 2 +- + drivers/staging/gdm724x/gdm_lte.c | 1 - + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/greybus/pwm.c | 64 +- + drivers/staging/greybus/sdio.c | 1 - + drivers/staging/gs_fpgaboot/Kconfig | 8 - + drivers/staging/gs_fpgaboot/Makefile | 3 - + drivers/staging/gs_fpgaboot/README | 70 - + drivers/staging/gs_fpgaboot/TODO | 7 - + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 394 ---- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 41 - + drivers/staging/gs_fpgaboot/io.c | 105 - + drivers/staging/gs_fpgaboot/io.h | 73 - + drivers/staging/iio/accel/adis16203.c | 1 + + drivers/staging/iio/accel/adis16240.c | 1 + + drivers/staging/iio/adc/Kconfig | 11 - + drivers/staging/iio/adc/Makefile | 1 - + drivers/staging/iio/adc/ad7280a.c | 1044 ---------- + drivers/staging/iio/adc/ad7280a.h | 37 - + drivers/staging/ks7010/ks7010_sdio.c | 4 +- + drivers/staging/most/net/net.c | 2 +- + drivers/staging/most/video/video.c | 2 +- + drivers/staging/mt7621-dts/Kconfig | 11 - + drivers/staging/mt7621-dts/Makefile | 5 - + drivers/staging/mt7621-dts/TODO | 5 - + drivers/staging/mt7621-dts/gbpc2.dts | 22 - + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/pi433/TODO | 4 +- + drivers/staging/pi433/pi433_if.c | 176 +- + drivers/staging/pi433/pi433_if.h | 2 - + drivers/staging/pi433/rf69.c | 169 +- + drivers/staging/pi433/rf69.h | 3 +- + drivers/staging/pi433/rf69_enum.h | 20 - + drivers/staging/pi433/rf69_registers.h | 2 + + drivers/staging/qlge/qlge_main.c | 11 +- + drivers/staging/r8188eu/Makefile | 2 +- + drivers/staging/r8188eu/core/rtw_ap.c | 240 +-- + drivers/staging/r8188eu/core/rtw_br_ext.c | 82 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/r8188eu/core/rtw_fw.c | 314 +++ + drivers/staging/r8188eu/core/rtw_ieee80211.c | 41 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 10 - + drivers/staging/r8188eu/core/rtw_iol.c | 14 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 106 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 439 +--- + drivers/staging/r8188eu/core/rtw_p2p.c | 73 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 47 +- + drivers/staging/r8188eu/core/rtw_recv.c | 146 +- + drivers/staging/r8188eu/core/rtw_rf.c | 62 +- + drivers/staging/r8188eu/core/rtw_security.c | 193 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 14 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 129 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 99 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 185 +- + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 4 +- + drivers/staging/r8188eu/hal/hal_com.c | 36 +- + drivers/staging/r8188eu/hal/hal_intf.c | 3 - + drivers/staging/r8188eu/hal/odm.c | 118 +- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 44 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 7 +- + drivers/staging/r8188eu/hal/odm_debug.c | 6 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 46 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 52 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 403 +--- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 150 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 24 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 82 +- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 26 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 22 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 432 +--- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 60 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 6 +- + drivers/staging/r8188eu/include/HalVerDef.h | 23 - + drivers/staging/r8188eu/include/drv_types.h | 46 +- + drivers/staging/r8188eu/include/hal_com.h | 3 - + drivers/staging/r8188eu/include/hal_intf.h | 48 +- + drivers/staging/r8188eu/include/ieee80211.h | 271 +-- + drivers/staging/r8188eu/include/odm.h | 50 +- + drivers/staging/r8188eu/include/odm_HWConfig.h | 39 +- + drivers/staging/r8188eu/include/osdep_service.h | 50 +- + drivers/staging/r8188eu/include/recv_osdep.h | 5 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 97 +- + drivers/staging/r8188eu/include/rtl8188e_recv.h | 8 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 4 +- + drivers/staging/r8188eu/include/rtw_br_ext.h | 5 - + drivers/staging/r8188eu/include/rtw_cmd.h | 16 +- + drivers/staging/r8188eu/include/rtw_debug.h | 8 - + drivers/staging/r8188eu/include/rtw_fw.h | 12 + + drivers/staging/r8188eu/include/rtw_mlme.h | 11 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 6 +- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 2 +- + drivers/staging/r8188eu/include/rtw_recv.h | 61 +- + drivers/staging/r8188eu/include/rtw_security.h | 112 - + drivers/staging/r8188eu/include/sta_info.h | 48 +- + drivers/staging/r8188eu/include/usb_ops.h | 8 +- + drivers/staging/r8188eu/include/wifi.h | 70 +- + drivers/staging/r8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/r8188eu/include/xmit_osdep.h | 2 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 558 +---- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 4 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 91 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 2 - + drivers/staging/r8188eu/os_dep/recv_linux.c | 35 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 125 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 24 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 8 +- + drivers/staging/rtl8192e/rtllib_debug.h | 54 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 9 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 45 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_recv.h | 8 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 + + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 11 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +- + drivers/staging/rts5208/ms.c | 9 +- + drivers/staging/rts5208/rtsx.c | 8 - + drivers/staging/sm750fb/ddk750_dvi.c | 68 +- + drivers/staging/sm750fb/ddk750_dvi.h | 64 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visorinput/visorinput.c | 3 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +- + drivers/staging/vc04_services/interface/TODO | 56 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 37 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 137 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 7 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 7 - + drivers/staging/vt6655/baseband.c | 80 - + drivers/staging/vt6655/card.c | 56 +- + drivers/staging/vt6655/channel.c | 85 +- + drivers/staging/vt6655/rf.c | 404 +--- + drivers/staging/vt6655/rxtx.c | 2 - + drivers/staging/vt6656/baseband.c | 40 +- + drivers/staging/vt6656/card.c | 18 - + drivers/staging/vt6656/channel.c | 96 +- + drivers/staging/vt6656/device.h | 11 +- + drivers/staging/vt6656/mac.c | 14 +- + drivers/staging/vt6656/mac.h | 22 +- + drivers/staging/vt6656/rf.c | 413 +--- + drivers/staging/vt6656/rxtx.c | 8 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/vt6656/wcmd.c | 13 +- + drivers/staging/wfx/Kconfig | 5 + + drivers/staging/wfx/Makefile | 4 +- + drivers/staging/wfx/bh.c | 68 +- + drivers/staging/wfx/bh.h | 1 + + drivers/staging/wfx/bus.h | 8 +- + drivers/staging/wfx/bus_sdio.c | 105 +- + drivers/staging/wfx/bus_spi.c | 126 +- + drivers/staging/wfx/data_rx.c | 10 +- + drivers/staging/wfx/data_rx.h | 5 +- + drivers/staging/wfx/data_tx.c | 152 +- + drivers/staging/wfx/data_tx.h | 20 +- + drivers/staging/wfx/debug.c | 80 +- + drivers/staging/wfx/debug.h | 6 +- + drivers/staging/wfx/fwio.c | 116 +- + drivers/staging/wfx/hif_api_cmd.h | 152 +- + drivers/staging/wfx/hif_api_general.h | 64 +- + drivers/staging/wfx/hif_api_mib.h | 68 +- + drivers/staging/wfx/hif_rx.c | 171 +- + drivers/staging/wfx/hif_tx.c | 201 +- + drivers/staging/wfx/hif_tx.h | 67 +- + drivers/staging/wfx/hif_tx_mib.c | 201 +- + drivers/staging/wfx/hif_tx_mib.h | 67 +- + drivers/staging/wfx/hwio.c | 168 +- + drivers/staging/wfx/hwio.h | 35 +- + drivers/staging/wfx/key.c | 84 +- + drivers/staging/wfx/key.h | 5 +- + drivers/staging/wfx/main.c | 267 ++- + drivers/staging/wfx/main.h | 12 +- + drivers/staging/wfx/queue.c | 60 +- + drivers/staging/wfx/queue.h | 13 +- + drivers/staging/wfx/scan.c | 27 +- + drivers/staging/wfx/sta.c | 201 +- + drivers/staging/wfx/sta.h | 21 +- + drivers/staging/wfx/traces.h | 33 +- + drivers/staging/wfx/wfx.h | 102 +- + drivers/thunderbolt/nvm.c | 6 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/goldfish.c | 2 +- + drivers/tty/hvc/hvc_dcc.c | 2 +- + drivers/tty/hvc/hvc_iucv.c | 4 +- + drivers/tty/mxser.c | 125 +- + drivers/tty/serdev/core.c | 7 +- + drivers/tty/serial/21285.c | 2 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 8 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 52 +- + drivers/tty/serial/8250/8250_dma.c | 11 +- + drivers/tty/serial/8250/8250_early.c | 2 +- + drivers/tty/serial/8250/8250_exar.c | 37 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 28 +- + drivers/tty/serial/8250/8250_mid.c | 43 +- + drivers/tty/serial/8250/8250_mtk.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 16 +- + drivers/tty/serial/8250/8250_port.c | 45 +- + drivers/tty/serial/8250/8250_tegra.c | 2 +- + drivers/tty/serial/8250/Kconfig | 16 +- + drivers/tty/serial/Kconfig | 32 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_jtaguart.c | 4 +- + drivers/tty/serial/altera_uart.c | 2 +- + drivers/tty/serial/amba-pl010.c | 176 +- + drivers/tty/serial/amba-pl011.c | 6 +- + drivers/tty/serial/apbuart.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 2 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 27 +- + drivers/tty/serial/bcm63xx_uart.c | 2 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/digicolor-usart.c | 2 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/earlycon-arm-semihost.c | 2 +- + drivers/tty/serial/earlycon-riscv-sbi.c | 2 +- + drivers/tty/serial/fsl_linflexuart.c | 50 +- + drivers/tty/serial/fsl_lpuart.c | 24 +- + drivers/tty/serial/imx.c | 22 +- + drivers/tty/serial/imx_earlycon.c | 2 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/jsm/jsm_cls.c | 20 +- + drivers/tty/serial/jsm/jsm_neo.c | 19 +- + drivers/tty/serial/jsm/jsm_tty.c | 3 +- + drivers/tty/serial/kgdboc.c | 6 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 12 +- + drivers/tty/serial/max3100.c | 1 - + drivers/tty/serial/mcf.c | 7 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/milbeaut_usio.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 22 +- + drivers/tty/serial/mps2-uart.c | 4 +- + drivers/tty/serial/mvebu-uart.c | 600 +++++- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/omap-serial.c | 20 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 2 +- + drivers/tty/serial/pic32_uart.c | 2 +- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/pxa.c | 18 +- + 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 | 296 +-- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 263 ++- + drivers/tty/serial/sccnxp.c | 2 +- + drivers/tty/serial/serial-tegra.c | 22 +- + drivers/tty/serial/serial_core.c | 40 +- + drivers/tty/serial/serial_mctrl_gpio.c | 38 + + drivers/tty/serial/serial_mctrl_gpio.h | 18 + + drivers/tty/serial/serial_txx9.c | 369 ++-- + drivers/tty/serial/sh-sci.c | 4 +- + drivers/tty/serial/sifive.c | 4 +- + drivers/tty/serial/sprd_serial.c | 4 +- + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/sunplus-uart.c | 775 +++++++ + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/sunzilog.c | 4 +- + drivers/tty/serial/uartlite.c | 4 +- + drivers/tty/serial/vr41xx_siu.c | 17 +- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/tty_port.c | 18 +- + drivers/tty/vt/vt_ioctl.c | 10 +- + drivers/usb/host/xhci-mvebu.c | 42 - + drivers/usb/host/xhci-mvebu.h | 6 - + drivers/usb/host/xhci-plat.c | 20 +- + drivers/usb/host/xhci-plat.h | 1 - + drivers/usb/serial/ark3116.c | 17 +- + drivers/usb/serial/f81232.c | 16 +- + drivers/usb/serial/f81534.c | 16 +- + drivers/usb/serial/mos7720.c | 20 +- + drivers/usb/serial/quatech2.c | 16 +- + drivers/usb/serial/ssu100.c | 16 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 8 +- + drivers/virt/acrn/hsm.c | 20 +- + drivers/virt/acrn/irqfd.c | 1 - + drivers/virt/acrn/mm.c | 24 + + drivers/virt/fsl_hypervisor.c | 4 +- + drivers/w1/masters/ds2490.c | 8 +- + drivers/w1/slaves/w1_therm.c | 78 +- + fs/debugfs/inode.c | 10 + + fs/kernfs/dir.c | 9 + + fs/kernfs/file.c | 2 +- + fs/kernfs/kernfs-internal.h | 19 +- + fs/sysfs/mount.c | 2 +- + fs/ubifs/sysfs.c | 3 +- + include/dt-bindings/gpio/meson-s4-gpio.h | 99 + + include/dt-bindings/pinctrl/mt8186-pinfunc.h | 1174 +++++++++++ + include/dt-bindings/pinctrl/sppctl-sp7021.h | 179 ++ + include/dt-bindings/pinctrl/sppctl.h | 31 + + include/dt-bindings/reset/delta,tn48m-reset.h | 20 + + include/dt-bindings/reset/mt7621-reset.h | 37 + + include/linux/component.h | 24 +- + include/linux/coresight.h | 5 - + include/linux/dma-mapping.h | 8 - + include/linux/firmware.h | 2 +- + include/linux/firmware/intel/stratix10-smc.h | 21 +- + .../linux/firmware/intel/stratix10-svc-client.h | 4 + + include/linux/firmware/xlnx-zynqmp.h | 25 + + include/linux/iio/adc/qcom-vadc-common.h | 15 +- + include/linux/iio/afe/rescale.h | 36 + + include/linux/iio/iio.h | 2 +- + include/linux/iio/imu/adis.h | 60 +- + include/linux/interconnect.h | 36 +- + include/linux/kernfs.h | 18 +- + include/linux/math.h | 12 + + include/linux/math64.h | 13 + + include/linux/mux/consumer.h | 18 + + include/linux/nvmem-provider.h | 8 - + include/linux/peci-cpu.h | 40 + + include/linux/peci.h | 112 + + include/linux/rtsx_pci.h | 5 +- + include/linux/serial.h | 2 + + include/linux/serial_core.h | 6 +- + include/linux/tty_port.h | 3 + + include/linux/vmw_vmci_defs.h | 84 +- + include/trace/events/fsi.h | 86 + + include/trace/events/fsi_master_aspeed.h | 12 + + include/uapi/linux/counter.h | 2 + + include/uapi/linux/fsi.h | 14 + + include/uapi/linux/iio/types.h | 1 + + include/uapi/linux/serial_core.h | 6 + + include/uapi/linux/tty.h | 6 +- + include/uapi/misc/fastrpc.h | 81 +- + include/uapi/misc/habanalabs.h | 146 +- + kernel/cgroup/cgroup.c | 4 +- + kernel/configs/android-recommended.config | 2 +- + kernel/dma/swiotlb.c | 12 +- + mm/slab.c | 1 + + samples/kobject/kobject-example.c | 4 +- + samples/kobject/kset-example.c | 4 +- + samples/landlock/sandboxer.c | 1 + + scripts/get_abi.pl | 3 +- + scripts/spdxcheck.py | 2 +- + security/landlock/syscalls.c | 2 +- + sound/pci/hda/patch_realtek.c | 11 +- + sound/soc/codecs/wcd938x.c | 18 +- + tools/iio/iio_event_monitor.c | 1 + + 1078 files changed, 52538 insertions(+), 22321 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1014 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-sx9324 + create mode 100644 Documentation/ABI/testing/sysfs-bus-peci + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/afe/temperature-sense-rtd.yaml + create mode 100644 Documentation/devicetree/bindings/iio/afe/temperature-transducer.yaml + create mode 100644 Documentation/devicetree/bindings/iio/amplifiers/adi,ada4250.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2688.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv4420.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9324.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9360.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/delta,tn48m-cpld.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml + create mode 100644 Documentation/devicetree/bindings/peci/peci-aspeed.yaml + create mode 100644 Documentation/devicetree/bindings/peci/peci-controller.yaml + create mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,dp-video-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos5250-sata-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,mipi-video-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/samsung-phy.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx93-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8186.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/sunplus,sp7021-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/google,open-dice.yaml + create mode 100644 Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml + create mode 100644 Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml + rename {drivers/staging/wfx/Documentation/devicetree/bindings => Documentation/devicetree/bindings/staging}/net/wireless/silabs,wfx.yaml (59%) + create mode 100644 Documentation/hwmon/peci-cputemp.rst + create mode 100644 Documentation/hwmon/peci-dimmtemp.rst + create mode 100644 Documentation/peci/index.rst + create mode 100644 Documentation/peci/peci.rst + delete mode 100644 arch/ia64/include/uapi/asm/termbits.h + rename drivers/staging/mt7621-dts/gbpc1.dts => arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts (74%) + create mode 100644 arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts + rename {drivers/staging/mt7621-dts => arch/mips/boot/dts/ralink}/mt7621.dtsi (93%) + delete mode 100644 arch/xtensa/include/uapi/asm/termbits.h + create mode 100644 drivers/bus/mhi/common.h + delete mode 100644 drivers/bus/mhi/core/internal.h + create mode 100644 drivers/bus/mhi/host/Kconfig + rename drivers/bus/mhi/{core => host}/Makefile (54%) + rename drivers/bus/mhi/{core => host}/boot.c (96%) + rename drivers/bus/mhi/{core => host}/debugfs.c (90%) + rename drivers/bus/mhi/{core => host}/init.c (92%) + create mode 100644 drivers/bus/mhi/host/internal.h + rename drivers/bus/mhi/{core => host}/main.c (97%) + rename drivers/bus/mhi/{ => host}/pci_generic.c (99%) + rename drivers/bus/mhi/{core => host}/pm.c (97%) + create mode 100644 drivers/gpio/gpio-tn48m.c + create mode 100644 drivers/hwmon/peci/Kconfig + create mode 100644 drivers/hwmon/peci/Makefile + create mode 100644 drivers/hwmon/peci/common.h + create mode 100644 drivers/hwmon/peci/cputemp.c + create mode 100644 drivers/hwmon/peci/dimmtemp.c + create mode 100644 drivers/iio/accel/adxl367.c + create mode 100644 drivers/iio/accel/adxl367.h + create mode 100644 drivers/iio/accel/adxl367_i2c.c + create mode 100644 drivers/iio/accel/adxl367_spi.c + create mode 100644 drivers/iio/adc/ad7280a.c + create mode 100644 drivers/iio/amplifiers/ada4250.c + create mode 100644 drivers/iio/dac/ltc2688.c + create mode 100644 drivers/iio/frequency/admv1014.c + create mode 100644 drivers/iio/frequency/admv4420.c + create mode 100644 drivers/iio/proximity/sx9324.c + create mode 100644 drivers/iio/proximity/sx9360.c + create mode 100644 drivers/iio/proximity/sx_common.c + create mode 100644 drivers/iio/proximity/sx_common.h + create mode 100644 drivers/iio/test/iio-test-rescale.c + delete mode 100644 drivers/misc/habanalabs/common/hwmgr.c + create mode 100644 drivers/misc/open-dice.c + create mode 100644 drivers/nvmem/layerscape-sfp.c + create mode 100644 drivers/nvmem/sunplus-ocotp.c + create mode 100644 drivers/peci/Kconfig + create mode 100644 drivers/peci/Makefile + create mode 100644 drivers/peci/controller/Kconfig + create mode 100644 drivers/peci/controller/Makefile + create mode 100644 drivers/peci/controller/peci-aspeed.c + create mode 100644 drivers/peci/core.c + create mode 100644 drivers/peci/cpu.c + create mode 100644 drivers/peci/device.c + create mode 100644 drivers/peci/internal.h + create mode 100644 drivers/peci/request.c + create mode 100644 drivers/peci/sysfs.c + create mode 100644 drivers/phy/cadence/cdns-dphy-rx.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm4908.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx93.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8186.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8186.h + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-s4.c + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-wpcm450.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8280xp.c + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779f0.c + create mode 100644 drivers/pinctrl/sunplus/Kconfig + create mode 100644 drivers/pinctrl/sunplus/Makefile + create mode 100644 drivers/pinctrl/sunplus/sppctl.c + create mode 100644 drivers/pinctrl/sunplus/sppctl.h + create mode 100644 drivers/pinctrl/sunplus/sppctl_sp7021.c + create mode 100644 drivers/reset/reset-tn48m.c + delete mode 100644 drivers/staging/android/Kconfig + delete mode 100644 drivers/staging/android/Makefile + delete mode 100644 drivers/staging/android/TODO + delete mode 100644 drivers/staging/android/ashmem.c + delete mode 100644 drivers/staging/android/ashmem.h + delete mode 100644 drivers/staging/android/uapi/ashmem.h + delete mode 100644 drivers/staging/gs_fpgaboot/Kconfig + delete mode 100644 drivers/staging/gs_fpgaboot/Makefile + delete mode 100644 drivers/staging/gs_fpgaboot/README + delete mode 100644 drivers/staging/gs_fpgaboot/TODO + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h + delete mode 100644 drivers/staging/gs_fpgaboot/io.c + delete mode 100644 drivers/staging/gs_fpgaboot/io.h + delete mode 100644 drivers/staging/iio/adc/ad7280a.c + delete mode 100644 drivers/staging/iio/adc/ad7280a.h + delete mode 100644 drivers/staging/mt7621-dts/Kconfig + delete mode 100644 drivers/staging/mt7621-dts/Makefile + delete mode 100644 drivers/staging/mt7621-dts/TODO + delete mode 100644 drivers/staging/mt7621-dts/gbpc2.dts + create mode 100644 drivers/staging/r8188eu/core/rtw_fw.c + delete mode 100644 drivers/staging/r8188eu/hal/odm_debug.c + create mode 100644 drivers/staging/r8188eu/include/rtw_fw.h + create mode 100644 drivers/tty/serial/sunplus-uart.c + create mode 100644 include/dt-bindings/gpio/meson-s4-gpio.h + create mode 100644 include/dt-bindings/pinctrl/mt8186-pinfunc.h + create mode 100644 include/dt-bindings/pinctrl/sppctl-sp7021.h + create mode 100644 include/dt-bindings/pinctrl/sppctl.h + create mode 100644 include/dt-bindings/reset/delta,tn48m-reset.h + create mode 100644 include/dt-bindings/reset/mt7621-reset.h + create mode 100644 include/linux/iio/afe/rescale.h + create mode 100644 include/linux/peci-cpu.h + create mode 100644 include/linux/peci.h +Merging fixes/fixes (d06c942efea4 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 kbuild-current/fixes (754e0b0e3560 Linux 5.17-rc4) +$ 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (7b83299e5b93 ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (316e46f65a54 arm64: errata: avoid duplicate field initializer) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (6a2f0b2d3b74 dt: amd-seattle: add a description of the CPUs and caches) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/amd/Makefile | 4 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 13 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 1 + + arch/arm64/boot/dts/amd/amd-overdrive.dts | 66 ------- + arch/arm64/boot/dts/amd/amd-seattle-cpus.dtsi | 224 +++++++++++++++++++++++ + arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 70 +++++-- + arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi | 22 +-- + arch/arm64/boot/dts/amd/husky.dts | 84 --------- + 8 files changed, 287 insertions(+), 197 deletions(-) + delete mode 100644 arch/arm64/boot/dts/amd/amd-overdrive.dts + create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-cpus.dtsi + delete mode 100644 arch/arm64/boot/dts/amd/husky.dts +Merging drivers-memory-fixes/fixes (e783362eb54c Linux 5.17-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 tee-fixes/fixes (6d8df1f9e8ae Merge tag 'optee-fix2-for-v5.17' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Auto-merging drivers/tee/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-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 (48015b632f77 powerpc: Fix STACKTRACE=n build) +$ 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 (f443e374ae13 Linux 5.17) +$ 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 sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (dcf500065fab net: bnxt_ptp: fix compilation error) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + drivers/net/dsa/realtek/Kconfig | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 2 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 44 +++++- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 23 ++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 173 +++++++++++++++++---- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 4 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +- + drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + + .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 + + .../ethernet/microchip/sparx5/sparx5_mactable.c | 19 +-- + .../net/ethernet/microchip/sparx5/sparx5_main.h | 7 +- + .../net/ethernet/microchip/sparx5/sparx5_pgid.c | 20 +-- + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 18 +-- + .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 7 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 7 + + drivers/net/phy/broadcom.c | 21 +++ + drivers/net/usb/ax88179_178a.c | 51 ++++++ + include/linux/netfilter_netdev.h | 2 +- + net/llc/af_llc.c | 59 ++++--- + net/netfilter/core.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 17 +- + net/netfilter/nf_tables_api.c | 44 +++--- + net/sched/act_ct.c | 15 +- + net/smc/smc_sysctl.c | 5 + + net/vmw_vsock/virtio_transport.c | 11 +- + net/x25/af_x25.c | 11 +- + tools/testing/selftests/net/config | 1 + + .../testing/selftests/net/test_vxlan_under_vrf.sh | 8 +- + tools/testing/selftests/net/tls.c | 6 + + 35 files changed, 449 insertions(+), 181 deletions(-) +Merging bpf/master (d9142e1cf3bb selftests: net: Add tls config dependency for tls selftests) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (4db4075f92af esp6: fix check on ipv6_skip_exthdr's return value) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (dea2d93a8ba4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (277f2bb14361 ibmvnic: schedule failover only if vioctl fails) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/main (24b488061b97 MAINTAINERS: update Lorenzo's email address) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rdma-fixes/for-rc (7e57714cd0ad Linux 5.17-rc6) +$ 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 (5e2baa04e4cd ALSA: hda/cs8409: Add new Dolphin HW variants) +$ 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/pci/hda/patch_realtek.c +Merge made by the 'ort' strategy. + sound/isa/cs423x/cs4236.c | 8 +++-- + sound/pci/hda/patch_cs8409-tables.c | 68 +++++++++++++++++++++++++++---------- + sound/pci/hda/patch_cs8409.c | 47 ++++++++++++++----------- + sound/pci/hda/patch_cs8409.h | 5 +++ + sound/pci/hda/patch_realtek.c | 10 +++++- + 5 files changed, 97 insertions(+), 41 deletions(-) +Merging sound-asoc-fixes/for-linus (b0793cb5c40e Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging include/sound/pcm.h +Auto-merging include/uapi/sound/asound.h +Auto-merging sound/soc/amd/acp/acp-mach-common.c +Auto-merging sound/soc/amd/acp/acp-sof-mach.c +Auto-merging sound/soc/amd/vangogh/acp5x-mach.c +Auto-merging sound/soc/amd/vangogh/acp5x.h +Auto-merging sound/soc/codecs/cs35l41.c +Auto-merging sound/soc/codecs/lpass-rx-macro.c +Auto-merging sound/soc/codecs/lpass-va-macro.c +Auto-merging sound/soc/codecs/rt5682s.c +Auto-merging sound/soc/codecs/tlv320adc3xxx.c +Auto-merging sound/soc/codecs/wcd934x.c +Auto-merging sound/soc/codecs/wcd938x.c +Auto-merging sound/soc/codecs/wm_adsp.c +Auto-merging sound/soc/intel/common/soc-acpi-intel-byt-match.c +Auto-merging sound/soc/qcom/lpass-platform.c +Auto-merging sound/soc/sof/intel/hda-loader.c +Merge made by the 'ort' strategy. + sound/soc/codecs/mt6358.c | 4 ++++ + sound/soc/codecs/wm_adsp.c | 10 +++++----- + sound/soc/fsl/fsl-asoc-card.c | 12 ++++-------- + sound/soc/rockchip/rockchip_i2s_tdm.c | 10 +++++----- + sound/soc/sof/intel/Kconfig | 1 + + 5 files changed, 19 insertions(+), 18 deletions(-) +Merging regmap-fixes/for-linus (d04ad245d67a regmap-irq: Update interrupt clear register for proper reset) +$ 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 (78beedbc6af3 Merge remote-tracking branch 'regulator/for-5.17' 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. + drivers/regulator/rt4831-regulator.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging spi-fixes/for-linus (d583fe25614f Merge remote-tracking branch 'spi/for-5.16' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spi-uniphier.c +Merge made by the 'ort' strategy. +Merging pci-current/for-linus (5949965ec934 x86/PCI: Preserve host bridge windows completely covered by E820) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + arch/x86/include/asm/e820/api.h | 5 +++++ + arch/x86/kernel/resource.c | 38 +++++++++++++++++++++++++++++++------- + arch/x86/pci/acpi.c | 5 +++++ + 3 files changed, 41 insertions(+), 7 deletions(-) +Merging driver-core.current/driver-core-linus (7e57714cd0ad Linux 5.17-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 (7e57714cd0ad Linux 5.17-rc6) +$ 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 (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB) +$ 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-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (7e57714cd0ad Linux 5.17-rc6) +$ 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 usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c5f756cb0867] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (9a8406ba1a9a phy: dphy: Correct clk_pre parameter) +$ 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 (09688c0166e7 Linux 5.17-rc8) +$ 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 (123d838c4e7d iio: adc: xilinx-ams: Fix single channel switching sequence) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/adc/xilinx-ams.c +Merge made by the 'ort' strategy. +Merging counter-fixes/fixes-togreg (4a14311a3b93 counter: Stop using dev_get_drvdata() to get the counter device) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Merge made by the 'ort' strategy. +Merging char-misc.current/char-misc-linus (01b44ef2bf6b counter: Stop using dev_get_drvdata() to get the counter device) +$ 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 (e783362eb54c Linux 5.17-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 (f443e374ae13 Linux 5.17) +$ 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 (5600f6986628 Input: aiptek - properly check endpoint type) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (7ed7aa4de942 crypto: x86/poly1305 - Fixup SLS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + arch/arm/crypto/Kconfig | 2 ++ + arch/x86/crypto/chacha-avx512vl-x86_64.S | 4 +-- + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 38 +++++++++++++-------------- + drivers/crypto/stm32/stm32-crc32.c | 4 ++- + 4 files changed, 26 insertions(+), 22 deletions(-) +Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) +$ 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 (6fec1ab67f8d selftests/ftrace: Do not trace do_softirq because of PREEMPT_RT) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (a8e8f851e829 module: fix building with sysfs disabled) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (cfb92440ee71 Linux 5.17-rc5) +$ 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 (a38fd8748464 Linux 5.12-rc2) +$ 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 (42da5a4ba170 mtd: rawnand: omap2: Actually prevent invalid configuration and build error) +$ 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 (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ 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 (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/platform/rockchip/rga/rga.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) +$ 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 (5d8965704fe5 MIPS: ralink: mt7621: use bitwise NOT instead of logical) +$ 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 (26077968f838 dt-bindings: ARM: at91: update maintainers entry) +$ 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 (8840f5460a23 ARM: dts: Use 32KiHz oscillator on devkit8000) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (fe83f5eae432 kvm/emulate: Fix SETcc emulation function offsets with SLS) +$ 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 (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ 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 (c1ebdafde1ee hwmon: (xdpe12284) Fix build warning seen if CONFIG_SENSORS_XDPE122_REGULATOR is disabled) +$ 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/pmbus/xdpe12284.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ 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 (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ 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 btrfs-fixes/next-fixes (95385bb74f40 Merge branch 'misc-5.18' 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 +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file.c | 13 +++++++++-- + fs/btrfs/inode.c | 23 ++++++++++++++++++- + fs/btrfs/ioctl.c | 20 +++++++++++----- + fs/btrfs/volumes.c | 65 ++++++++++++++++++++++------------------------------ + fs/btrfs/zoned.c | 13 ++++------- + 6 files changed, 81 insertions(+), 55 deletions(-) +Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer) +$ 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 dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (21d90aaee8d5 surface: surface3_power: Fix battery readings on batteries without a serial number) +$ 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 (442b0c08db7e soc: samsung: Fix typo in CONFIG_EXYNOS_USI description) +$ 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 (e783362eb54c Linux 5.17-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 (f6eafa4022dd dt-bindings: phy: ti,tcan104x-can: Document mux-states property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (733ab7e1b5d1 scsi: fnic: Finish scsi_cmnd before dropping the spinlock) +$ 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 (f443e374ae13 Linux 5.17) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (09688c0166e7 Linux 5.17-rc8) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (6f2e03c11ef6 mmc: block: Check for errors after write on SPI) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 34 +++++++++++++++++++++++++++++++++- + drivers/mmc/host/mmci_stm32_sdmmc.c | 6 +++--- + drivers/mmc/host/sdhci-xenon.c | 10 ---------- + 3 files changed, 36 insertions(+), 14 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1) +$ 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 (ffc58bc4af93 Drivers: hv: utils: Make use of the helper macro LIST_HEAD()) +$ 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 soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (0966d385830d riscv: Fix auipc+jalr relocation range checks) +$ 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 pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB) +$ 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 (6556641ded02 gpio: ts4900: Fix comment formatting and grammar) +$ 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 +Auto-merging drivers/gpio/gpio-ts4900.c +Merge made by the 'ort' strategy. + drivers/gpio/gpio-ts4900.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-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 (6f66db29e241 pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (24331050a3e6 erofs: fix small compressed files inlining) +$ 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 integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (92a68053c346 Documentation: KUnit: Fix usage bug) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Auto-merging fs/ubifs/file.c +CONFLICT (content): Merge conflict in fs/ubifs/file.c +Resolved 'fs/ubifs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3b29da28eff9] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/ubi/build.c | 9 +- + drivers/mtd/ubi/fastmap.c | 28 ++++-- + drivers/mtd/ubi/vmt.c | 8 +- + fs/ubifs/dir.c | 235 ++++++++++++++++++++++++++++------------------ + fs/ubifs/file.c | 14 +-- + fs/ubifs/io.c | 34 ++++++- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 52 ++++++++-- + fs/ubifs/ubifs.h | 2 +- + 9 files changed, 246 insertions(+), 138 deletions(-) +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ 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 cel-fixes/for-rc (5f7b839d47db SUNRPC: Return true/false (not 1/0) from bool functions) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Merge made by the 'ort' strategy. + fs/nfsd/nfs2acl.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (1d4df649cbb4 irqchip/sifive-plic: Add missing thead,c900-plic match string) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (a04b1bf574e1 Merge tag 'for-5.18/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) +$ 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 (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (d14eb80e2779 drm/panel: ili9341: fix optional regulator handling) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9341.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging kbuild/for-next (63a62caad508 Merge branch 'kbuild' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging arch/x86/entry/syscalls/Makefile +Auto-merging init/Kconfig +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging tools/bpf/bpftool/Makefile +Auto-merging tools/lib/bpf/Makefile +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/power/x86/intel-speed-select/Makefile +Auto-merging tools/scripts/Makefile.include +Auto-merging usr/include/Makefile +Merge made by the 'ort' strategy. + Documentation/kbuild/kbuild.rst | 11 ++++++ + Documentation/kbuild/llvm.rst | 31 ++++++++++++--- + Documentation/kbuild/makefiles.rst | 2 + + Makefile | 46 +++++++++++++--------- + arch/alpha/kernel/syscalls/Makefile | 3 +- + arch/arm/tools/Makefile | 3 +- + arch/ia64/kernel/syscalls/Makefile | 3 +- + arch/m68k/kernel/syscalls/Makefile | 3 +- + arch/microblaze/boot/Makefile | 2 +- + arch/microblaze/boot/dts/Makefile | 2 +- + arch/microblaze/kernel/syscalls/Makefile | 3 +- + arch/mips/kernel/syscalls/Makefile | 3 +- + arch/parisc/kernel/syscalls/Makefile | 3 +- + arch/powerpc/kernel/syscalls/Makefile | 3 +- + arch/s390/kernel/syscalls/Makefile | 3 +- + arch/sh/kernel/syscalls/Makefile | 3 +- + arch/sparc/kernel/syscalls/Makefile | 3 +- + arch/x86/entry/syscalls/Makefile | 3 +- + arch/xtensa/kernel/syscalls/Makefile | 3 +- + certs/Makefile | 37 ++++++----------- + certs/system_certificates.S | 3 -- + fs/unicode/Makefile | 2 +- + init/Kconfig | 8 ++-- + scripts/Makefile.build | 3 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.lib | 16 +++----- + scripts/basic/fixdep.c | 46 +++++++++------------- + scripts/kallsyms.c | 2 +- + scripts/kconfig/confdata.c | 42 ++++++++++---------- + scripts/kconfig/merge_config.sh | 19 +++++---- + scripts/kconfig/streamline_config.pl | 2 +- + .../kconfig/tests/choice/alldef_expected_config | 6 +-- + .../kconfig/tests/choice/allmod_expected_config | 4 +- + scripts/kconfig/tests/choice/allno_expected_config | 6 +-- + .../kconfig/tests/choice/allyes_expected_config | 8 ++-- + scripts/kconfig/tests/choice/oldask1_config | 2 +- + scripts/kconfig/tests/inter_choice/expected_config | 2 +- + scripts/kconfig/tests/new_choice_with_dep/config | 2 +- + .../tests/no_write_if_dep_unmet/__init__.py | 7 ++-- + .../tests/no_write_if_dep_unmet/expected_config | 2 +- + tools/bpf/bpftool/Makefile | 4 +- + tools/build/Makefile | 2 +- + tools/counter/Makefile | 2 +- + tools/gpio/Makefile | 2 +- + tools/hv/Makefile | 2 +- + tools/iio/Makefile | 2 +- + tools/lib/api/Makefile | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/perf/Makefile | 2 +- + tools/lib/subcmd/Makefile | 2 +- + tools/objtool/Makefile | 2 +- + tools/pci/Makefile | 2 +- + tools/perf/Makefile.perf | 4 +- + tools/power/x86/intel-speed-select/Makefile | 2 +- + tools/scripts/Makefile.include | 22 +++++++---- + tools/scripts/utilities.mak | 2 +- + tools/spi/Makefile | 6 +-- + tools/testing/selftests/lib.mk | 8 +++- + tools/tracing/rtla/Makefile | 2 +- + tools/usb/Makefile | 2 +- + usr/Makefile | 4 +- + usr/include/Makefile | 7 +++- + 62 files changed, 225 insertions(+), 214 deletions(-) +Merging perf/perf/core (ab0809af0bee perf evsel: Improve AMD IBS (Instruction-Based Sampling) error handling messages) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ 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 (8ddde07a3d28 dma-mapping: benchmark: extract a common header file for map_benchmark definition) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/xtensa/Kconfig +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/alpha/include/asm/floppy.h | 7 ++- + arch/alpha/kernel/pci_iommu.c | 12 ++-- + arch/arm/Kconfig | 2 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/xtensa/Kconfig | 2 +- + drivers/char/agp/intel-gtt.c | 26 ++++----- + drivers/iommu/dma-iommu.c | 14 ++--- + drivers/rapidio/devices/tsi721.c | 8 +-- + include/linux/map_benchmark.h | 31 ++++++++++ + kernel/dma/Kconfig | 7 +-- + kernel/dma/Makefile | 2 +- + kernel/dma/debug.c | 4 +- + kernel/dma/direct.c | 18 +++--- + kernel/dma/map_benchmark.c | 25 +------- + kernel/dma/swiotlb.c | 76 ++++++++----------------- + samples/v4l/v4l2-pci-skeleton.c | 2 +- + tools/testing/selftests/dma/dma_map_benchmark.c | 25 +------- + 18 files changed, 105 insertions(+), 160 deletions(-) + create mode 100644 include/linux/map_benchmark.h +Merging asm-generic/master (aec499c75cf8 nds32: Remove the architecture) +$ 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 (6880fa6c5660 Linux 5.15-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 (b717496e1158 Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/switch_to.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/irqchip/irq-nvic.c +Auto-merging lib/Kconfig +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f8b39f7e0be] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging arm64/for-next/core (641d80415729 Merge branch 'for-next/spectre-bhb' 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 (602c873eb52e perf: Replace acpi_bus_get_device()) +$ 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 (6a2f0b2d3b74 dt: amd-seattle: add a description of the CPUs and caches) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (305cab6f7645 Merge branch 'v5.18/drivers' 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. +Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 19 +++++++++++++++++++ + 4 files changed, 50 insertions(+) +Merging at91/at91-next (a845fa592554 Merge branch 'clk-at91' 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 +Auto-merging drivers/soc/microchip/mpfs-sys-controller.c +Merge made by the 'ort' strategy. + drivers/clk/at91/at91rm9200.c | 3 +- + drivers/clk/at91/at91sam9260.c | 3 +- + drivers/clk/at91/at91sam9g45.c | 3 +- + drivers/clk/at91/at91sam9n12.c | 3 +- + drivers/clk/at91/at91sam9rl.c | 3 +- + drivers/clk/at91/at91sam9x5.c | 3 +- + drivers/clk/at91/clk-master.c | 117 ++------------------------------------- + drivers/clk/at91/dt-compat.c | 3 +- + drivers/clk/at91/pmc.h | 2 +- + drivers/clk/at91/sam9x60.c | 3 +- + drivers/clk/at91/sama5d2.c | 7 ++- + drivers/clk/at91/sama5d3.c | 3 +- + drivers/clk/at91/sama5d4.c | 3 +- + drivers/clk/at91/sama7g5.c | 16 ++++-- + include/dt-bindings/clock/at91.h | 1 + + 15 files changed, 33 insertions(+), 140 deletions(-) +Merging drivers-memory/for-next (560f9d092a9d Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (45550ada88f0 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 keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6ceb6a96db4e Merge branch 'v5.17-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging mvebu/for-next (8885ae5142a4 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 +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Merge made by the 'ort' strategy. +Merging omap/for-next (f9ecc209330a Merge branch 'omap-for-v5.18/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging qcom/for-next (b8277c8275a1 Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'clk-for-5.18', 'defconfig-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1664a5ff9116] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/qcom,a7pll.yaml | 2 +- + .../devicetree/bindings/clock/qcom,camcc.txt | 18 - + .../bindings/clock/qcom,dispcc-sm6125.yaml | 87 ++ + .../bindings/clock/qcom,dispcc-sm6350.yaml | 86 ++ + .../bindings/clock/qcom,gcc-apq8064.yaml | 29 +- + .../bindings/clock/qcom,gcc-ipq8064.yaml | 76 ++ + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 70 ++ + .../devicetree/bindings/clock/qcom,gcc.yaml | 59 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 1 + + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 87 ++ + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sdm845-camcc.yaml | 65 ++ + arch/arm64/configs/defconfig | 10 + + drivers/clk/qcom/Kconfig | 59 +- + drivers/clk/qcom/Makefile | 6 +- + drivers/clk/qcom/camcc-sc7180.c | 221 +++-- + drivers/clk/qcom/camcc-sdm845.c | 323 +++---- + drivers/clk/qcom/clk-rcg.c | 24 + + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 14 +- + drivers/clk/qcom/clk-rpmh.c | 18 + + drivers/clk/qcom/clk-smd-rpm.c | 53 +- + drivers/clk/qcom/dispcc-qcm2290.c | 555 ++++++++++++ + drivers/clk/qcom/dispcc-sm6125.c | 709 +++++++++++++++ + drivers/clk/qcom/dispcc-sm6350.c | 797 +++++++++++++++++ + drivers/clk/qcom/gcc-ipq806x.c | 649 ++++++++++---- + drivers/clk/qcom/gcc-ipq8074.c | 21 +- + drivers/clk/qcom/gcc-msm8996.c | 971 +++++++++++++-------- + drivers/clk/qcom/gcc-sm8150.c | 74 +- + drivers/clk/qcom/gpucc-sdm660.c | 21 +- + drivers/clk/qcom/gpucc-sm6350.c | 521 +++++++++++ + drivers/clk/qcom/mmcc-msm8974.c | 206 ++++- + drivers/clk/qcom/videocc-sc7180.c | 8 +- + include/dt-bindings/clock/qcom,dispcc-qcm2290.h | 34 + + include/dt-bindings/clock/qcom,dispcc-sm6125.h | 41 + + include/dt-bindings/clock/qcom,dispcc-sm6350.h | 48 + + include/dt-bindings/clock/qcom,gcc-ipq806x.h | 5 +- + include/dt-bindings/clock/qcom,gcc-sm8150.h | 5 + + include/dt-bindings/clock/qcom,gpucc-sm6350.h | 37 + + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/reset/qcom,gcc-ipq806x.h | 5 + + include/linux/soc/qcom/smd-rpm.h | 1 + + 43 files changed, 5037 insertions(+), 985 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,camcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc-sm6125.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc-sm6350.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml + create mode 100644 drivers/clk/qcom/dispcc-qcm2290.c + create mode 100644 drivers/clk/qcom/dispcc-sm6125.c + create mode 100644 drivers/clk/qcom/dispcc-sm6350.c + create mode 100644 drivers/clk/qcom/gpucc-sm6350.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-qcm2290.h + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm6125.h + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm6350.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sm6350.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (dff7b84b4d2a Merge branch 'renesas-arm-dt-for-v5.18' 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 (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merge made by the 'ort' strategy. + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 ++ + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/reset-uniphier-glue.c | 75 ++++++++++------------ + 3 files changed, 42 insertions(+), 42 deletions(-) +Merging rockchip/for-next (73b0466cfade Merge branch 'v5.18-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk356x.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk356x.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 28 ++++++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3568.c | 20 ++++++++++------- + drivers/clk/rockchip/clk.c | 3 +++ + 6 files changed, 59 insertions(+), 10 deletions(-) +Merging samsung-krzk/for-next (b2d5c4016a34 Merge branch 'for-v5.18/dt-cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/exynos4210-universal_c210.dts +Auto-merging arch/arm/boot/dts/exynos4412-p4note.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-arndale.dts +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos5250-snow-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-spring.dts +Auto-merging arch/arm/boot/dts/exynos5260-xyref5260.dts +Auto-merging arch/arm/boot/dts/exynos5410-odroidxu.dts +Auto-merging arch/arm/boot/dts/exynos5410-smdk5410.dts +Auto-merging arch/arm/boot/dts/exynos5420-arndale-octa.dts +Auto-merging arch/arm/boot/dts/exynos5420-peach-pit.dts +Auto-merging arch/arm/boot/dts/exynos5420-smdk5420.dts +Auto-merging arch/arm/boot/dts/exynos5422-odroid-core.dtsi +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +Auto-merging arch/arm64/boot/dts/exynos/exynos7-espresso.dts +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (0bf3cf81c78b Merge tag 'scmi-updates-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Auto-merging drivers/firmware/arm_scmi/driver.c +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (74fa56279651 ARM: dts: stm32: Switch DWMAC RMII clock to MCO2 on DHCOM) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 49 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 ++++++++++--- + 2 files changed, 67 insertions(+), 4 deletions(-) +Merging sunxi/sunxi/for-next (f25c47c67629 Merge branch 'sunxi/dt-for-5.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (3e53bb2bd87b Merge branch 'tee_shm_vmalloc_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Merge made by the 'ort' strategy. + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_shm.c | 35 +++++++++++++++++++++++++---------- + 2 files changed, 26 insertions(+), 11 deletions(-) +Merging tegra/for-next (6d746e1eb2f6 Merge branch for-5.18/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 3 ++ + drivers/memory/tegra/mc.h | 7 ++- + drivers/memory/tegra/tegra186-emc.c | 3 ++ + drivers/memory/tegra/tegra234.c | 101 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 115 insertions(+), 1 deletion(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (183a6f5c6e1e Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-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 (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (3fb2cf242e74 Merge branch 'clk-range' 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 +Auto-merging Documentation/devicetree/bindings/gpio/sifive,gpio.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 1 + + .../devicetree/bindings/clock/apple,nco.yaml | 62 ++ + .../bindings/clock/bitmain,bm1880-clk.yaml | 12 - + .../bindings/clock/cirrus,cs2000-cp.yaml | 91 ++ + .../devicetree/bindings/clock/cs2000-cp.txt | 22 - + .../devicetree/bindings/clock/idt,versaclock5.yaml | 7 - + .../devicetree/bindings/clock/imx1-clock.yaml | 9 - + .../devicetree/bindings/clock/imx21-clock.yaml | 9 - + .../devicetree/bindings/clock/imx23-clock.yaml | 9 - + .../devicetree/bindings/clock/imx25-clock.yaml | 8 - + .../devicetree/bindings/clock/imx27-clock.yaml | 9 - + .../devicetree/bindings/clock/imx28-clock.yaml | 9 - + .../devicetree/bindings/clock/imx31-clock.yaml | 8 - + .../devicetree/bindings/clock/imx35-clock.yaml | 8 - + .../bindings/clock/imx7ulp-pcc-clock.yaml | 11 - + .../bindings/clock/imx7ulp-scg-clock.yaml | 11 - + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 11 - + .../devicetree/bindings/clock/imx93-clock.yaml | 62 ++ + .../devicetree/bindings/clock/imxrt1050-clock.yaml | 59 ++ + .../bindings/clock/nvidia,tegra124-car.yaml | 7 - + .../bindings/clock/nvidia,tegra20-car.yaml | 7 - + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 +- + .../devicetree/bindings/clock/renesas,9series.yaml | 97 ++ + .../bindings/clock/renesas,cpg-div6-clock.yaml | 12 + + .../bindings/clock/renesas,rzg2l-cpg.yaml | 14 +- + .../bindings/clock/starfive,jh7100-audclk.yaml | 57 ++ + .../devicetree/bindings/gpio/sifive,gpio.yaml | 2 +- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 2 +- + .../devicetree/bindings/serial/sifive-serial.yaml | 2 +- + MAINTAINERS | 13 +- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 22 +- + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 26 +- + drivers/clk/.kunitconfig | 4 + + drivers/clk/Kconfig | 39 +- + drivers/clk/Makefile | 6 +- + drivers/clk/actions/owl-s500.c | 16 +- + drivers/clk/actions/owl-s700.c | 17 +- + drivers/clk/actions/owl-s900.c | 26 +- + drivers/clk/at91/sckc.c | 2 +- + drivers/clk/axis/clk-artpec6.c | 2 +- + drivers/clk/bcm/clk-bcm2835.c | 2 - + drivers/clk/bcm/clk-iproc.h | 2 +- + drivers/clk/bcm/clk-kona-setup.c | 2 +- + drivers/clk/bcm/clk-raspberrypi.c | 127 ++- + drivers/clk/clk-apple-nco.c | 334 +++++++ + drivers/clk/clk-clps711x.c | 2 + + drivers/clk/clk-cs2000-cp.c | 240 +++-- + drivers/clk/clk-fixed-factor.c | 22 + + drivers/clk/clk-fractional-divider.c | 2 +- + drivers/clk/clk-gate_test.c | 464 +++++++++ + drivers/clk/clk-mux.c | 10 +- + drivers/clk/clk-oxnas.c | 6 +- + drivers/clk/clk-renesas-pcie.c | 322 +++++++ + drivers/clk/clk-si5341.c | 26 +- + drivers/clk/clk-stm32mp1.c | 46 +- + drivers/clk/clk.c | 137 ++- + drivers/clk/clk_test.c | 1008 ++++++++++++++++++++ + drivers/clk/hisilicon/clk-hi3559a.c | 4 +- + drivers/clk/hisilicon/clk.c | 2 +- + drivers/clk/imx/Kconfig | 14 + + drivers/clk/imx/Makefile | 8 +- + drivers/clk/imx/clk-composite-93.c | 93 ++ + drivers/clk/imx/clk-fracn-gppll.c | 323 +++++++ + drivers/clk/imx/clk-imx7d.c | 1 - + drivers/clk/imx/clk-imx8dxl-rsrc.c | 66 ++ + drivers/clk/imx/clk-imx8mm.c | 49 +- + drivers/clk/imx/clk-imx8mn.c | 50 +- + drivers/clk/imx/clk-imx8mp.c | 49 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +- + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/clk/imx/clk-imx93.c | 341 +++++++ + drivers/clk/imx/clk-imxrt1050.c | 168 ++++ + drivers/clk/imx/clk-pll14xx.c | 287 ++++-- + drivers/clk/imx/clk-scu.h | 1 + + drivers/clk/imx/clk-sscg-pll.c | 1 - + drivers/clk/imx/clk.h | 30 + + drivers/clk/loongson1/clk-loongson1c.c | 1 + + drivers/clk/mediatek/clk-apmixed.c | 2 +- + drivers/clk/mediatek/clk-cpumux.c | 69 +- + drivers/clk/mediatek/clk-cpumux.h | 13 +- + drivers/clk/mediatek/clk-gate.c | 148 ++- + drivers/clk/mediatek/clk-gate.h | 59 +- + drivers/clk/mediatek/clk-mt2701.c | 5 +- + drivers/clk/mediatek/clk-mt2712.c | 3 +- + drivers/clk/mediatek/clk-mt6765.c | 3 +- + drivers/clk/mediatek/clk-mt6779.c | 3 +- + drivers/clk/mediatek/clk-mt6797.c | 3 +- + drivers/clk/mediatek/clk-mt7622.c | 5 +- + drivers/clk/mediatek/clk-mt7629.c | 5 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 4 +- + drivers/clk/mediatek/clk-mt8135.c | 3 +- + drivers/clk/mediatek/clk-mt8167.c | 3 +- + drivers/clk/mediatek/clk-mt8173.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 3 +- + drivers/clk/mediatek/clk-mt8192.c | 39 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 30 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 25 +- + drivers/clk/mediatek/clk-mt8195-cam.c | 1 + + drivers/clk/mediatek/clk-mt8195-ccu.c | 1 + + drivers/clk/mediatek/clk-mt8195-img.c | 1 + + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 1 + + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 1 + + drivers/clk/mediatek/clk-mt8195-ipe.c | 1 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 1 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 1 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 1 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 69 +- + drivers/clk/mediatek/clk-mt8195-vdec.c | 1 + + drivers/clk/mediatek/clk-mt8195-vdo0.c | 20 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 20 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 1 + + drivers/clk/mediatek/clk-mt8195-vpp0.c | 1 + + drivers/clk/mediatek/clk-mt8195-vpp1.c | 1 + + drivers/clk/mediatek/clk-mt8195-wpe.c | 1 + + drivers/clk/mediatek/clk-mt8516.c | 3 +- + drivers/clk/mediatek/clk-mtk.c | 304 ++++-- + drivers/clk/mediatek/clk-mtk.h | 105 +- + drivers/clk/mediatek/clk-mux.c | 89 +- + drivers/clk/mediatek/clk-mux.h | 17 +- + drivers/clk/mediatek/clk-pll.c | 100 +- + drivers/clk/mediatek/clk-pll.h | 57 ++ + drivers/clk/mediatek/reset.c | 3 +- + drivers/clk/meson/meson8b.c | 2 +- + drivers/clk/microchip/Kconfig | 10 + + drivers/clk/microchip/Makefile | 1 + + drivers/clk/microchip/clk-mpfs.c | 381 ++++++++ + drivers/clk/mmp/clk-of-mmp2.c | 4 +- + drivers/clk/mmp/pwr-island.c | 2 +- + drivers/clk/mvebu/armada-37xx-periph.c | 3 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 5 +- + drivers/clk/pistachio/clk-pistachio.c | 2 +- + drivers/clk/qcom/gcc-msm8994.c | 1 + + drivers/clk/qcom/gcc-sm6125.c | 2 +- + drivers/clk/qcom/kpss-xcc.c | 2 +- + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 20 +- + drivers/clk/renesas/r9a07g044-cpg.c | 426 +++++---- + drivers/clk/renesas/rzg2l-cpg.c | 6 + + drivers/clk/renesas/rzg2l-cpg.h | 1 + + drivers/clk/sifive/Makefile | 2 +- + drivers/clk/sifive/fu540-prci.c | 89 -- + drivers/clk/sifive/fu540-prci.h | 91 +- + drivers/clk/sifive/fu740-prci.c | 134 --- + drivers/clk/sifive/fu740-prci.h | 130 ++- + drivers/clk/sifive/sifive-prci.c | 5 - + drivers/clk/socfpga/clk-gate-s10.c | 2 +- + drivers/clk/socfpga/clk-periph-s10.c | 2 +- + drivers/clk/socfpga/clk-pll-s10.c | 2 +- + drivers/clk/socfpga/clk-s10.c | 2 +- + drivers/clk/starfive/Kconfig | 8 + + drivers/clk/starfive/Makefile | 1 + + drivers/clk/starfive/clk-starfive-jh7100-audio.c | 170 ++++ + drivers/clk/starfive/clk-starfive-jh7100.c | 176 ++-- + drivers/clk/starfive/clk-starfive-jh7100.h | 112 +++ + drivers/clk/tegra/clk-tegra124-emc.c | 1 + + drivers/clk/ti/Makefile | 9 +- + drivers/clk/ti/apll.c | 13 +- + drivers/clk/ti/autoidle.c | 2 +- + drivers/clk/ti/clk-33xx-compat.c | 218 ----- + drivers/clk/ti/clk-33xx.c | 5 +- + drivers/clk/ti/clk-43xx-compat.c | 225 ----- + drivers/clk/ti/clk-43xx.c | 5 +- + drivers/clk/ti/clk-7xx-compat.c | 820 ---------------- + drivers/clk/ti/clk-7xx.c | 5 +- + drivers/clk/ti/clk-dra7-atl.c | 6 +- + drivers/clk/ti/clk.c | 86 +- + drivers/clk/ti/clkctrl.c | 59 +- + drivers/clk/ti/clock.h | 4 +- + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/ti/composite.c | 6 +- + drivers/clk/ti/divider.c | 6 +- + drivers/clk/ti/dpll.c | 8 +- + drivers/clk/ti/fapll.c | 11 +- + drivers/clk/ti/fixed-factor.c | 2 +- + drivers/clk/ti/gate.c | 4 +- + drivers/clk/ti/interface.c | 4 +- + drivers/clk/ti/mux.c | 4 +- + drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + + drivers/clk/visconti/clkc-tmpv770x.c | 2 +- + drivers/clk/visconti/clkc.c | 2 +- + drivers/clk/visconti/clkc.h | 3 + + drivers/clk/zynq/clkc.c | 13 +- + drivers/clk/zynqmp/clk-gate-zynqmp.c | 12 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 8 +- + drivers/clk/zynqmp/divider.c | 12 +- + drivers/clk/zynqmp/pll.c | 32 +- + include/dt-bindings/clock/am3.h | 93 -- + include/dt-bindings/clock/am4.h | 98 -- + include/dt-bindings/clock/cirrus,cs2000-cp.h | 14 + + include/dt-bindings/clock/dra7.h | 168 ---- + include/dt-bindings/clock/imx93-clock.h | 201 ++++ + include/dt-bindings/clock/imxrt1050-clock.h | 72 ++ + include/dt-bindings/clock/sifive-fu540-prci.h | 8 +- + include/dt-bindings/clock/sifive-fu740-prci.h | 18 +- + include/dt-bindings/clock/starfive-jh7100-audio.h | 41 + + include/linux/clk-provider.h | 15 +- + include/linux/clk.h | 11 + + 201 files changed, 7202 insertions(+), 3199 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/apple,nco.yaml + create mode 100644 Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/cs2000-cp.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx93-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/renesas,9series.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7100-audclk.yaml + create mode 100644 drivers/clk/.kunitconfig + create mode 100644 drivers/clk/clk-apple-nco.c + create mode 100644 drivers/clk/clk-gate_test.c + create mode 100644 drivers/clk/clk-renesas-pcie.c + create mode 100644 drivers/clk/clk_test.c + create mode 100644 drivers/clk/imx/clk-composite-93.c + create mode 100644 drivers/clk/imx/clk-fracn-gppll.c + create mode 100644 drivers/clk/imx/clk-imx8dxl-rsrc.c + create mode 100644 drivers/clk/imx/clk-imx93.c + create mode 100644 drivers/clk/imx/clk-imxrt1050.c + create mode 100644 drivers/clk/mediatek/clk-pll.h + create mode 100644 drivers/clk/microchip/Kconfig + create mode 100644 drivers/clk/microchip/clk-mpfs.c + delete mode 100644 drivers/clk/sifive/fu540-prci.c + delete mode 100644 drivers/clk/sifive/fu740-prci.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7100-audio.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h + delete mode 100644 drivers/clk/ti/clk-33xx-compat.c + delete mode 100644 drivers/clk/ti/clk-43xx-compat.c + delete mode 100644 drivers/clk/ti/clk-7xx-compat.c + create mode 100644 include/dt-bindings/clock/cirrus,cs2000-cp.h + create mode 100644 include/dt-bindings/clock/imx93-clock.h + create mode 100644 include/dt-bindings/clock/imxrt1050-clock.h + create mode 100644 include/dt-bindings/clock/starfive-jh7100-audio.h +Merging clk-imx/for-next (b09c68dc57c9 clk: imx: pll14xx: Support dynamic rates) +$ 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 (73421f2a48e6 clk: renesas: r8a779f0: Add PFC clock) +$ 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 clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (a0793fdad9a1 csky: fix typo of fpu config macro) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging arch/h8300/Kconfig.cpu +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/mm/init.c +CONFLICT (modify/delete): arch/h8300/mm/memory.c deleted in h8300/h8300-next and modified in HEAD. Version HEAD of arch/h8300/mm/memory.c left in tree. +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/tty/serial/sh-sci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/h8300/mm/memory.c +rm 'arch/h8300/mm/memory.c' +$ git commit --no-edit -v -a +[master b2e7986ee8cd] Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/memory.c | 52 ------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 17 files changed, 124 insertions(+), 115 deletions(-) + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ 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 (e6e1e7b19fa1 m68k: coldfire/device.c: only build for MCF_EDMA when h/w 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 +Already up to date. +Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/include/asm/pci.h | 4 ---- + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/pci/pci-common.c | 49 --------------------------------------- + arch/microblaze/pci/xilinx_pci.c | 2 +- + 4 files changed, 2 insertions(+), 55 deletions(-) +Merging mips/mips-next (f8f9f21c7848 MIPS: Fix build error for loongson64 and sgi-ip27) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) +$ 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 (c33b0499bdfd parisc: Find a new timesync master if current CPU is removed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 12 +--- + arch/parisc/Makefile | 4 +- + arch/parisc/include/asm/processor.h | 1 + + arch/parisc/include/asm/smp.h | 9 +-- + arch/parisc/include/asm/special_insns.h | 17 +++-- + arch/parisc/include/asm/topology.h | 23 +------ + arch/parisc/kernel/Makefile | 2 +- + arch/parisc/kernel/cache.c | 26 ++------ + arch/parisc/kernel/firmware.c | 7 +- + arch/parisc/kernel/head.S | 11 +++- + arch/parisc/kernel/irq.c | 25 +------ + arch/parisc/kernel/pacache.S | 4 ++ + arch/parisc/kernel/process.c | 27 +++++++- + arch/parisc/kernel/processor.c | 6 +- + arch/parisc/kernel/smp.c | 112 ++++++++++++++++++++++++++++---- + arch/parisc/kernel/time.c | 6 +- + arch/parisc/kernel/topology.c | 77 +++++----------------- + drivers/parisc/dino.c | 41 +++++++++--- + drivers/parisc/gsc.c | 31 +++++++++ + drivers/parisc/gsc.h | 1 + + drivers/parisc/lasi.c | 7 +- + drivers/parisc/wax.c | 7 +- + 22 files changed, 267 insertions(+), 189 deletions(-) +Merging powerpc/next (fe2640bd7a62 powerpc/pseries: Fix use after free in remove_phb_dynamic()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging risc-v/for-next (bbde015227e8 RISC-V: add support for restartable sequences) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (faf79934e65a s390/alternatives: avoid using jgnop mnemonic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 1 + + arch/s390/include/asm/alternative-asm.h | 12 ++++-- + arch/s390/include/asm/alternative.h | 15 ++++++-- + arch/s390/include/asm/ap.h | 60 ++++++++++++++--------------- + arch/s390/include/asm/ctl_reg.h | 16 +++++--- + arch/s390/include/asm/processor.h | 17 ++++++--- + arch/s390/include/asm/spinlock.h | 2 +- + arch/s390/include/asm/syscall_wrapper.h | 2 +- + arch/s390/include/asm/unwind.h | 13 +++++++ + arch/s390/kernel/entry.S | 10 ++--- + arch/s390/kernel/ipl.c | 4 +- + arch/s390/kernel/kprobes.c | 8 ++-- + arch/s390/kernel/machine_kexec.c | 2 +- + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/setup.c | 19 ++++----- + arch/s390/kernel/smp.c | 57 +++++++++++++-------------- + arch/s390/kernel/traps.c | 6 +-- + arch/s390/kernel/unwind_bc.c | 12 ++---- + arch/s390/lib/spinlock.c | 4 +- + arch/s390/lib/test_unwind.c | 58 +++++++++++++++++++--------- + arch/s390/pci/pci.c | 5 ++- + arch/s390/pci/pci_bus.h | 7 ++-- + arch/s390/pci/pci_clp.c | 9 ++++- + arch/s390/pci/pci_event.c | 7 +++- + drivers/s390/char/sclp.c | 4 +- + drivers/s390/char/sclp_con.c | 3 +- + drivers/s390/char/sclp_vt220.c | 6 +-- + drivers/s390/char/tape_34xx.c | 4 +- + drivers/s390/cio/device_fsm.c | 12 ++---- + drivers/s390/cio/eadm_sch.c | 12 ++---- + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/pkey_api.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 24 +++--------- + drivers/s390/crypto/zcrypt_api.c | 68 ++++++++++++++++++++++++++++++++- + drivers/s390/crypto/zcrypt_card.c | 2 +- + drivers/s390/crypto/zcrypt_ep11misc.c | 2 +- + 36 files changed, 296 insertions(+), 192 deletions(-) +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Auto-merging Documentation/virt/uml/user_mode_linux_howto_v2.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../virt/uml/user_mode_linux_howto_v2.rst | 20 ++++ + MAINTAINERS | 5 +- + arch/um/Makefile | 4 + + arch/um/drivers/mconsole_kern.c | 3 +- + arch/um/drivers/port_user.c | 18 +++- + arch/um/drivers/ubd_kern.c | 8 +- + arch/um/drivers/vector_kern.c | 105 ++++++++++----------- + arch/um/drivers/vector_kern.h | 3 +- + arch/um/drivers/vector_user.c | 2 +- + arch/um/drivers/vector_user.h | 2 +- + arch/um/include/asm/xor.h | 4 +- + arch/um/include/shared/os.h | 1 + + arch/um/kernel/dtb.c | 2 +- + arch/um/os-Linux/file.c | 9 ++ + arch/um/os-Linux/helper.c | 5 + + arch/um/os-Linux/time.c | 6 -- + arch/x86/um/shared/sysdep/syscalls_64.h | 5 +- + arch/x86/um/syscalls_64.c | 1 - + lib/logic_iomem.c | 8 +- + 19 files changed, 131 insertions(+), 80 deletions(-) +Merging xtensa/xtensa-for-next (1c4664faa389 xtensa: define update_mmu_tlb function) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (6009ff9e8020 Merge branch 'fs.mount_setattr.fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging fscrypt/master (cdaa1b1941f6 fscrypt: update documentation for direct I/O support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (ab487a4cdfca afs: Maintain netfs_i_context::remote_i_size) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging fs/9p/vfs_addr.c +CONFLICT (content): Merge conflict in fs/9p/vfs_addr.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/afs/file.c +CONFLICT (content): Merge conflict in fs/afs/file.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/super.c +Auto-merging fs/afs/write.c +Auto-merging fs/cachefiles/io.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/cache.h +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/super.h +Auto-merging include/linux/fscache.h +Auto-merging include/trace/events/cachefiles.h +Resolved 'fs/9p/vfs_addr.c' using previous resolution. +Resolved 'fs/afs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 102921cb24e6] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/netfs_library.rst | 140 ++-- + fs/9p/cache.c | 10 +- + fs/9p/v9fs.c | 4 +- + fs/9p/v9fs.h | 13 +- + fs/9p/vfs_addr.c | 62 +- + fs/9p/vfs_inode.c | 13 +- + fs/afs/dynroot.c | 1 + + fs/afs/file.c | 41 +- + fs/afs/inode.c | 32 +- + fs/afs/internal.h | 23 +- + fs/afs/super.c | 4 +- + fs/afs/write.c | 10 +- + fs/cachefiles/io.c | 10 +- + fs/ceph/addr.c | 116 ++- + fs/ceph/cache.c | 28 +- + fs/ceph/cache.h | 15 +- + fs/ceph/inode.c | 6 +- + fs/ceph/super.h | 17 +- + fs/cifs/cifsglob.h | 10 +- + fs/cifs/fscache.c | 19 +- + fs/cifs/fscache.h | 2 +- + fs/fscache/internal.h | 11 - + fs/netfs/Makefile | 8 +- + fs/netfs/buffered_read.c | 428 ++++++++++ + fs/netfs/internal.h | 50 +- + fs/netfs/io.c | 657 +++++++++++++++ + fs/netfs/main.c | 20 + + fs/netfs/objects.c | 160 ++++ + fs/netfs/read_helper.c | 1205 --------------------------- + fs/netfs/stats.c | 1 - + fs/nfs/fscache.c | 8 - + include/linux/fscache.h | 14 + + include/linux/netfs.h | 162 +++- + include/trace/events/cachefiles.h | 6 +- + include/trace/events/netfs.h | 190 +++-- + 35 files changed, 1868 insertions(+), 1628 deletions(-) + create mode 100644 fs/netfs/buffered_read.c + create mode 100644 fs/netfs/io.c + create mode 100644 fs/netfs/main.c + create mode 100644 fs/netfs/objects.c + delete mode 100644 fs/netfs/read_helper.c +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ 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 (89a925d75608 Merge branch 'for-next-current-v5.16-20220314' into for-next-20220314) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/zoned.c +CONFLICT (content): Merge conflict in fs/btrfs/zoned.c +Resolved 'fs/btrfs/zoned.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3b2243fd20d3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. +Merging ceph/master (f639d9867eea ceph: fix memory leak in ceph_readdir when note_last_dentry returns error) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (6a96c82ac4c5 smb3: cleanup and clarify status of tree connections) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/cifs/file.c +Auto-merging fs/ksmbd/smb2pdu.h +CONFLICT (content): Merge conflict in fs/ksmbd/smb2pdu.h +Resolved 'fs/ksmbd/smb2pdu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4e9b91c90aae] Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git +$ git diff -M --stat --summary HEAD^.. + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifsglob.h | 24 ++- + fs/cifs/cifspdu.h | 14 +- + fs/cifs/cifssmb.c | 11 +- + fs/cifs/connect.c | 46 ++-- + fs/cifs/file.c | 8 +- + fs/cifs/misc.c | 2 +- + fs/cifs/smb2glob.h | 11 - + fs/cifs/smb2misc.c | 14 +- + fs/cifs/smb2ops.c | 116 ++++++---- + fs/cifs/smb2pdu.c | 73 +++---- + fs/cifs/smb2pdu.h | 448 +-------------------------------------- + fs/cifs/smb2proto.h | 2 +- + fs/ksmbd/smb2pdu.c | 100 ++++----- + fs/ksmbd/smb2pdu.h | 460 +--------------------------------------- + fs/smbfs_common/smb2pdu.h | 526 ++++++++++++++++++++++++++++++++++++++++++++-- + 17 files changed, 735 insertions(+), 1126 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ 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 (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (a1108dcd9373 erofs: rename ctime to mtime) +$ 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 (1413276f228f exfat: do not clear VolumeDirty in writeback) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/super.c +Merge made by the 'ort' strategy. + fs/exfat/exfat_fs.h | 3 ++- + fs/exfat/file.c | 2 -- + fs/exfat/namei.c | 55 +++++++++++++++++++++++++++++++++++------------------ + fs/exfat/super.c | 17 +++++++++-------- + 4 files changed, 47 insertions(+), 30 deletions(-) +Merging ext3/for_next (f06e95c3a4ca Merge fsnotify cleanup from Bang Li.) +$ 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 (c7cded845fc1 ext4: truncate during setxattr leads to kernel panic) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 32 +++++++++++++++++++++++++------- + fs/ext4/inode.c | 7 ++++++- + fs/ext4/super.c | 1 + + fs/ext4/xattr.c | 34 ++++++++++++++++++++++++++++++++-- + 5 files changed, 65 insertions(+), 11 deletions(-) +Merging f2fs/dev (519129040766 Merge tag 'for-5.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (0c4bcfdecb1a fuse: fix pipe buffer lifetime for direct_io) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (e75765151025 gfs2: Make sure FITRIM minlen is rounded up to fs block size) +$ 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/super.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging mm/filemap.c +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 9 +++--- + fs/gfs2/file.c | 89 ++++++++++++++++++++++++++++++------------------------ + fs/gfs2/glock.c | 14 +++++++-- + fs/gfs2/inode.c | 51 +++++++++++++++++-------------- + fs/gfs2/lock_dlm.c | 15 ++++++++- + fs/gfs2/rgrp.c | 19 +++++++----- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 2 +- + 8 files changed, 120 insertions(+), 81 deletions(-) +Merging jfs/jfs-next (a53046291020 jfs: prevent NULL deref in diFree) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Auto-merging fs/jfs/inode.c +Merge made by the 'ort' strategy. + fs/jfs/inode.c | 3 ++- + fs/jfs/jfs_dmap.c | 7 +++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging ksmbd/ksmbd-for-next (5d4c2759d83b ksmbd: replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging MAINTAINERS +Auto-merging fs/internal.h +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/ksmbd/vfs.c +Merge made by the 'ort' strategy. + Documentation/filesystems/cifs/ksmbd.rst | 4 +- + MAINTAINERS | 2 +- + fs/internal.h | 2 - + fs/ksmbd/misc.c | 40 +++-- + fs/ksmbd/misc.h | 3 +- + fs/ksmbd/oplock.c | 30 ---- + fs/ksmbd/oplock.h | 2 - + fs/ksmbd/server.c | 2 +- + fs/ksmbd/smb2pdu.c | 147 ++++------------- + fs/ksmbd/transport_tcp.c | 4 +- + fs/ksmbd/vfs.c | 262 ++++++++++++++----------------- + fs/ksmbd/vfs.h | 7 +- + fs/ksmbd/vfs_cache.c | 7 +- + fs/ksmbd/vfs_cache.h | 1 - + fs/namei.c | 41 ++++- + include/linux/namei.h | 7 + + 16 files changed, 231 insertions(+), 330 deletions(-) +Merging nfs/linux-next (d02d81efc756 NFS: Don't loop forever in nfs_do_recoalesce()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/file.c +CONFLICT (content): Merge conflict in fs/nfs/file.c +Auto-merging fs/nfs/fscache.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/write.c +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging include/linux/sunrpc/xprt.h +Auto-merging include/trace/events/sunrpc.h +Auto-merging net/sunrpc/auth_gss/auth_gss.c +Auto-merging net/sunrpc/xprt.c +Resolved 'fs/nfs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a1bdeafac917] Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git +$ git diff -M --stat --summary HEAD^.. + fs/nfs/Kconfig | 4 + + fs/nfs/callback_proc.c | 2 +- + fs/nfs/callback_xdr.c | 4 - + fs/nfs/client.c | 3 +- + fs/nfs/delegation.c | 2 +- + fs/nfs/dir.c | 626 +++++++++++++++++++------------- + fs/nfs/direct.c | 48 ++- + fs/nfs/file.c | 26 +- + fs/nfs/filelayout/filelayout.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 53 ++- + fs/nfs/fs_context.c | 8 + + fs/nfs/fscache.c | 53 +-- + fs/nfs/fscache.h | 45 +-- + fs/nfs/inode.c | 86 ++--- + fs/nfs/internal.h | 25 +- + fs/nfs/nfs2xdr.c | 3 +- + fs/nfs/nfs3xdr.c | 30 +- + fs/nfs/nfs42proc.c | 34 +- + fs/nfs/nfs42xattr.c | 7 +- + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/nfs4file.c | 8 +- + fs/nfs/nfs4proc.c | 62 +++- + fs/nfs/nfs4state.c | 59 ++- + fs/nfs/nfs4xdr.c | 7 +- + fs/nfs/nfstrace.h | 221 ++++++++++- + fs/nfs/pagelist.c | 11 +- + fs/nfs/pnfs.c | 39 +- + fs/nfs/pnfs_nfs.c | 8 +- + fs/nfs/proc.c | 1 + + fs/nfs/read.c | 29 +- + fs/nfs/write.c | 43 ++- + include/linux/nfs_fs.h | 45 +-- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 5 +- + include/linux/sunrpc/auth.h | 1 + + include/linux/sunrpc/sched.h | 2 +- + include/linux/sunrpc/xprt.h | 3 + + include/linux/sunrpc/xprtsock.h | 3 +- + include/trace/events/sunrpc.h | 1 - + include/uapi/linux/nfs4.h | 1 + + include/uapi/linux/nfs_fs.h | 2 +- + net/sunrpc/auth.c | 8 +- + net/sunrpc/auth_gss/auth_gss.c | 26 +- + net/sunrpc/auth_gss/auth_gss_internal.h | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + net/sunrpc/auth_unix.c | 16 +- + net/sunrpc/backchannel_rqst.c | 8 +- + net/sunrpc/clnt.c | 13 +- + net/sunrpc/rpcb_clnt.c | 4 +- + net/sunrpc/sched.c | 56 ++- + net/sunrpc/socklib.c | 3 +- + net/sunrpc/sysfs.c | 76 ++-- + net/sunrpc/xprt.c | 23 +- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + net/sunrpc/xprtrdma/transport.c | 10 +- + net/sunrpc/xprtrdma/verbs.c | 4 +- + net/sunrpc/xprtsock.c | 207 ++++++----- + 59 files changed, 1295 insertions(+), 795 deletions(-) +Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr()) +$ 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/for-next (0b5e0caf0b90 fs/lock: only call lm_breaker_owns_lease if there is conflict.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 ++ + fs/locks.c | 20 +++++++++++++------- + include/linux/fs.h | 1 + + 3 files changed, 16 insertions(+), 7 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ 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 (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'ort' strategy. + fs/jffs2/build.c | 4 +++- + fs/jffs2/fs.c | 2 +- + fs/jffs2/jffs2_fs_i.h | 4 ++-- + fs/jffs2/scan.c | 6 ++++-- + fs/ubifs/dir.c | 3 +++ + 5 files changed, 13 insertions(+), 6 deletions(-) +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (01728b44ef1b xfs: xfs_is_shutdown vs xlog_is_shutdown cage fight) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 301baac80c83] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (2d86293c7075 xfs: return errors in xfs_fs_sync_fs) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (124f75f864f3 clean overflow checks in count_mounts() a bit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging arch/um/include/asm/Kbuild +Auto-merging arch/x86/um/Kconfig +CONFLICT (content): Merge conflict in arch/x86/um/Kconfig +Auto-merging fs/internal.h +Auto-merging fs/kernfs/file.c +Auto-merging fs/namespace.c +Auto-merging fs/read_write.c +Resolved 'arch/x86/um/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5005dde63216] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/user.h | 6 ------ + arch/arm/include/asm/user.h | 4 ---- + arch/h8300/include/asm/user.h | 4 ---- + arch/ia64/include/asm/user.h | 6 ------ + arch/m68k/include/asm/user.h | 4 ---- + arch/powerpc/include/asm/user.h | 5 ----- + arch/s390/include/asm/user.h | 4 ---- + arch/sh/include/asm/user.h | 6 ------ + arch/um/include/asm/Kbuild | 1 - + arch/x86/include/asm/user_32.h | 4 ---- + arch/x86/include/asm/user_64.h | 4 ---- + arch/x86/lib/csum-partial_64.c | 26 -------------------------- + arch/x86/um/Kconfig | 1 + + fs/internal.h | 2 +- + fs/kernfs/file.c | 7 +------ + fs/namespace.c | 23 ++++++++++++----------- + fs/read_write.c | 1 - + fs/seq_file.c | 4 ++-- + include/linux/seq_file.h | 1 + + 19 files changed, 18 insertions(+), 95 deletions(-) +Merging printk/for-next (c5f75d490fc2 Merge branch 'for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Auto-merging lib/vsprintf.c +Merge made by the 'ort' strategy. +Merging pci/next (611f841830aa Merge branch 'remotes/lorenzo/pci/xgene') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ 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 (3cc519d82627 Merge branch 'for-5.17/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/Makefile +Auto-merging drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (5db36559df9b Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup) +$ 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 | 151 ++++++++++++++++++++++++++++++++++++++++++--- + include/linux/i3c/master.h | 1 - + 2 files changed, 142 insertions(+), 10 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ 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 (c1ebdafde1ee hwmon: (xdpe12284) Fix build warning seen if CONFIG_SENSORS_XDPE122_REGULATOR is disabled) +$ 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 (9df072c73b98 Documentation: kunit: Fix cross-referencing warnings) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging scripts/get_abi.pl +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/architecture.rst | 13 ++----------- + Documentation/locking/locktypes.rst | 3 --- + Documentation/sphinx/kernel_abi.py | 6 +++++- + Documentation/sphinx/kernel_feat.py | 20 ++++++++++++++++++-- + Documentation/sphinx/kernel_include.py | 3 +++ + Documentation/sphinx/kerneldoc.py | 2 +- + Documentation/sphinx/kfigure.py | 8 +++++--- + scripts/get_abi.pl | 4 ++-- + scripts/get_feat.pl | 11 +++++++++++ + scripts/kernel-doc | 4 ++-- + 10 files changed, 49 insertions(+), 25 deletions(-) +Merging v4l-dvb/master (71e6d0608e4d media: platform: Remove unnecessary print function dev_err()) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (ba2c670ae84b media: nxp: Restrict VIDEO_IMX_MIPI_CSIS to ARCH_MXC or COMPILE_TEST) +$ 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 (d7c37bca37f8 Merge branch 'pm-docs' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/dvfs/performance-domain.yaml +Auto-merging Documentation/devicetree/bindings/opp/opp-v2-base.yaml +Auto-merging Documentation/firmware-guide/acpi/enumeration.rst +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eb6518f8bd20] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/cpufreq/cpufreq-qcom-hw.txt | 172 ----- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 201 ++++++ + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 166 +++++ + .../bindings/dvfs/performance-domain.yaml | 14 +- + .../devicetree/bindings/opp/opp-v2-base.yaml | 23 + + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 257 +++++++ + .../devicetree/bindings/opp/opp-v2-qcom-level.yaml | 60 ++ + .../devicetree/bindings/opp/qcom-nvmem-cpufreq.txt | 796 --------------------- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 19 - + .../devicetree/bindings/power/avs/qcom,cpr.txt | 130 ---- + .../devicetree/bindings/power/avs/qcom,cpr.yaml | 160 +++++ + Documentation/power/energy-model.rst | 10 + + MAINTAINERS | 6 +- + arch/arm/boot/dts/imx7s.dtsi | 16 + + drivers/acpi/apei/apei-base.c | 2 +- + drivers/base/property.c | 32 +- + drivers/cpufreq/cppc_cpufreq.c | 43 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 3 + + drivers/cpufreq/qcom-cpufreq-hw.c | 20 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/opp/core.c | 25 + + drivers/opp/debugfs.c | 8 + + drivers/opp/of.c | 108 ++- + drivers/opp/opp.h | 1 + + include/linux/energy_model.h | 2 + + include/linux/pm_opp.h | 12 +- + include/linux/property.h | 6 +- + 28 files changed, 1124 insertions(+), 1172 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt + create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml + create mode 100644 Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml + delete mode 100644 Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt + delete mode 100644 Documentation/devicetree/bindings/opp/qcom-opp.txt + delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt + create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml +Merging cpufreq-arm/cpufreq/arm/linux-next (b7f2b0d3511a dt-bindings: cpufreq: cpufreq-qcom-hw: Convert to YAML bindings) +$ 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 +Already up to date. +Merging cpupower/cpupower (8382dce5e483 cpupower: Add "perf" option to print AMD P-State information) +$ 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 (9eb1950bb6f4 PM / devfreq: rk3399_dmc: Avoid static (reused) profile) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 212 ------------ + .../memory-controllers/rockchip,rk3399-dmc.yaml | 384 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 299 +++++++--------- + 3 files changed, 518 insertions(+), 377 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml +Merging opp/opp/linux-next (f48a0c475c2a Documentation: EM: Describe new registration method using DT) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (1379d28e840f thermal: rcar_thermal: Use platform_get_irq_optional() to get the interrupt) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 1 + + drivers/thermal/rcar_thermal.c | 17 ++++++++++++----- + 2 files changed, 13 insertions(+), 5 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (87e0eacb176f RDMA/nldev: Prevent underflow in nldev_stat_set_counter_dynamic_doit()) +$ 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/master (169e77764adc Merge tag 'net-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (169e77764adc Merge tag 'net-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (b58b1f563ab7 xfrm: rework default policy structure) +$ 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 (45fee8edb4b3 net/mlx5: Add clarification on sync reset failure) +$ 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/master (c84d86a0295c Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (864cc8a234cd Bluetooth: mt7921s: Fix the incorrect pointer check) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btbcm.c | 52 ++++++++++++++++++++++++++++++++++++++++++- + drivers/bluetooth/btmtksdio.c | 2 +- + 2 files changed, 52 insertions(+), 2 deletions(-) +Merging wireless-next/main (e89600ebeeb1 af_vsock: SOCK_SEQPACKET broken buffer test) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Already up to date. +Merging mtd/mtd/next (6cadd424abb6 Merge tag 'nand/for-5.18' 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 (fecbd4a317c9 mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init) +$ 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 (151c6b49d679 mtd: spi-nor: Skip erase logic when SPI_NOR_NO_ERASE is set) +$ 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 (0e03b8fd2936 crypto: xilinx - Turn SHA into a tristate and allow COMPILE_TEST) +$ 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 (2a81dba4b577 fbdev: Fix cfb_imageblit() for arbitrary image widths) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (519f490db07e dma-buf/sync-file: fix warning about fence containers) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Merge made by the 'ort' strategy. + Documentation/driver-api/dma-buf.rst | 6 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-fence-array.c | 27 ++++ + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-fence-unwrap.c | 261 ++++++++++++++++++++++++++++++++++ + drivers/dma-buf/sync_file.c | 141 +++++++++--------- + include/linux/dma-fence-array.h | 19 +++ + include/linux/dma-fence-chain.h | 2 + + include/linux/dma-fence-unwrap.h | 95 +++++++++++++ + 9 files changed, 485 insertions(+), 68 deletions(-) + create mode 100644 drivers/dma-buf/st-dma-fence-unwrap.c + create mode 100644 include/linux/dma-fence-unwrap.h +Merging amdgpu/drm-next (749831acb1f6 drm/amdgpu/jpeg: Add jpeg ras error query support) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 23 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1057 ++------------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 979 ++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 74 ++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 7 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 71 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 6 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 49 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 19 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 23 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 + + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 26 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 8 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 356 +------ + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 26 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 232 +---- + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 26 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 231 +---- + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 18 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 863 ++++++++++++++++ + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 44 + + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 13 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 38 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 5 +- + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 13 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 24 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 6 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 73 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 17 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 147 +++ + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + 88 files changed, 2858 insertions(+), 2127 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h +Merging drm-intel/for-linux-next (00f4150d27d2 drm/i915: Fix renamed struct field) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (05241de1f69e dt-bindings: display/msm: another fix for the dpu-qcm2290 example) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Merge made by the 'ort' strategy. + .../bindings/display/msm/dpu-qcm2290.yaml | 4 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 79 ++++++++++++++++++---- + drivers/gpu/drm/msm/msm_gem.c | 1 + + 3 files changed, 68 insertions(+), 16 deletions(-) +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) +$ 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 (894d02fbfa67 video: fbdev: udlfb: properly check endpoint type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/udlfb.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/udlfb.c | 14 ++++++++++++-- + drivers/video/of_display_timing.c | 2 +- + 2 files changed, 13 insertions(+), 3 deletions(-) +Merging regmap/for-next (c53d92b4b351 Merge remote-tracking branch 'regmap/for-5.18' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. +Merging sound/for-next (5e2baa04e4cd ALSA: hda/cs8409: Add new Dolphin HW variants) +$ 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 sound-asoc/for-next (b0793cb5c40e Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (719fce7539cd Merge tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (a949087c2285 Input: adi - remove redundant variable z) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/Makefile +Auto-merging drivers/hid/hid-google-hammer.c +Auto-merging drivers/input/touchscreen/Kconfig +Merge made by the 'ort' strategy. + .../bindings/input/mediatek,mt6779-keypad.yaml | 77 +++++ + .../devicetree/bindings/input/mtk-pmic-keys.txt | 5 +- + .../input/touchscreen/imagis,ist3038c.yaml | 74 +++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 6 + + drivers/hid/Kconfig | 11 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-google-hammer.c | 51 ++- + drivers/hid/hid-vivaldi-common.c | 140 ++++++++ + drivers/hid/hid-vivaldi-common.h | 16 + + drivers/hid/hid-vivaldi.c | 121 +------ + drivers/input/Kconfig | 7 + + drivers/input/Makefile | 1 + + drivers/input/input.c | 64 +++- + drivers/input/joystick/adi.c | 4 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/keyboard/Kconfig | 14 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 27 +- + drivers/input/keyboard/cros_ec_keyb.c | 43 +-- + drivers/input/keyboard/mt6779-keypad.c | 221 +++++++++++++ + drivers/input/keyboard/mtk-pmic-keys.c | 55 ++- + drivers/input/misc/da9063_onkey.c | 13 +- + drivers/input/mouse/synaptics.c | 1 + + drivers/input/serio/ps2-gpio.c | 195 +++++++---- + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/goodix.c | 61 ++-- + drivers/input/touchscreen/goodix.h | 1 + + drivers/input/touchscreen/imagis.c | 367 +++++++++++++++++++++ + drivers/input/touchscreen/iqs5xx.c | 16 +- + drivers/input/touchscreen/stmfts.c | 8 +- + drivers/input/touchscreen/tsc200x-core.c | 7 +- + drivers/input/vivaldi-fmap.c | 39 +++ + include/linux/input.h | 2 + + include/linux/input/vivaldi-fmap.h | 27 ++ + 36 files changed, 1364 insertions(+), 327 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml + create mode 100644 drivers/hid/hid-vivaldi-common.c + create mode 100644 drivers/hid/hid-vivaldi-common.h + create mode 100644 drivers/input/keyboard/mt6779-keypad.c + create mode 100644 drivers/input/touchscreen/imagis.c + create mode 100644 drivers/input/vivaldi-fmap.c + create mode 100644 include/linux/input/vivaldi-fmap.h +Merging block/for-next (3b255fe79c9e Merge branch 'for-5.18/drivers' 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/blk-cgroup.c | 32 +++++++--- + block/blk-ioc.c | 3 +- + block/genhd.c | 2 +- + drivers/block/n64cart.c | 2 +- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + fs/io_uring.c | 120 ++++++++++++++++++++++++++++++------ + include/linux/blk-cgroup.h | 5 +- + include/linux/sbitmap.h | 2 +- + include/uapi/linux/io_uring.h | 2 - + lib/sbitmap.c | 2 +- + 11 files changed, 134 insertions(+), 40 deletions(-) +Merging device-mapper/for-next (4d7bca13dd9a dm: consolidate spinlocks in dm_io struct) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (d268afa1ff6f ata: pata_pxa: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (dc3d879c6ffa dt-bindings: mmc: renesas,sdhi: Document RZ/G2UL SoC) +$ 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 (d99460ed5cdc dt-bindings: mfd: syscon: Add microchip,lan966x-cpu-syscon compatible) +$ 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 (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ 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 (c22fca40522e power: ab8500_chargalg: Use CLOCK_MONOTONIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (78beedbc6af3 Merge remote-tracking branch 'regulator/for-5.17' 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-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ 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 MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 34 ++++++------ + security/apparmor/procattr.c | 2 +- + 15 files changed, 234 insertions(+), 141 deletions(-) +Merging integrity/next-integrity (4a48b4c428dc MAINTAINERS: add missing security/integrity/platform_certs) +$ 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 keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (cdbec3ede0b8 selinux: shorten the policy capability enum names) +$ 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 (a5cd1ab7ab67 Fix incorrect type in assignment of ipv6 port for audit) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (47f62eaa117d workqueue: Warn flushing of kernel-global workqueues) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 15 +++------------ + kernel/workqueue.c | 36 +++++++++++++++++++++++++++++------- + 2 files changed, 32 insertions(+), 19 deletions(-) +Merging tpmdd/next (fb5abce6b2bb tpm: use try_get_ops() in tpm-space.c) +$ 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 (826270373f17 Watchdog: sp5100_tco: Enable Family 17h+ CPUs) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 5 + + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/aspeed_wdt.c | 7 + + drivers/watchdog/imx2_wdt.c | 27 +- + drivers/watchdog/ixp4xx_wdt.c | 14 + + drivers/watchdog/orion_wdt.c | 13 +- + drivers/watchdog/renesas_wdt.c | 1 + + drivers/watchdog/rti_wdt.c | 1 + + drivers/watchdog/sp5100_tco.c | 334 ++++++++++++++------- + drivers/watchdog/sp5100_tco.h | 7 + + drivers/watchdog/watchdog_dev.c | 244 +++++++-------- + 11 files changed, 409 insertions(+), 246 deletions(-) +Merging iommu/next (e17c6debd4b2 Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (272ceeaea355 audit: log AUDIT_TIME_* records only from rules) +$ 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 (d635d9bdb52c dt-bindings: net: snps,dwmac: modify available values of PBL) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/net/snps,dwmac.yaml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (ebcbbd0316bf Merge remote-tracking branch 'spi/for-5.18' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging drivers/spi/spi-uniphier.c +Merge made by the 'ort' strategy. +Merging tip/master (ba5a91cc154f Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + arch/x86/configs/i386_defconfig | 50 +++++++++++++++++++++++++++------------ + arch/x86/configs/x86_64_defconfig | 37 ++++++++++++++++++++++------- + arch/x86/kernel/fpu/xstate.c | 2 +- + tools/testing/selftests/x86/amx.c | 16 +++++++++++-- + 4 files changed, 78 insertions(+), 27 deletions(-) +Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (d52ba330befa Merge branch 'edac-misc' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/altera_edac.c +Auto-merging drivers/edac/edac_mc.c +Merge made by the 'ort' strategy. +Merging irqchip/irq/irqchip-next (49cdcea1b077 irqchip/gic-v3: Fix GICR_CTLR.RWP polling) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +CONFLICT (content): Merge conflict in drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +Recorded preimage for 'drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c'. +[master fdce847a2159] Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +$ git diff -M --stat --summary HEAD^.. + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-gic-v3-its.c | 28 +++++++++++++++++++--------- + drivers/irqchip/irq-gic-v3.c | 8 ++++---- + drivers/irqchip/irq-qcom-mpm.c | 2 +- + 4 files changed, 25 insertions(+), 14 deletions(-) +Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging include/linux/trace_events.h +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_events_hist.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (3a9ac384153d Merge branch 'clocksource.2022.02.01b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 31 ++ + include/linux/srcutree.h | 28 +- + kernel/rcu/srcutree.c | 583 +++++++++++++++++------- + 3 files changed, 474 insertions(+), 168 deletions(-) +Merging kvm/next (c9b8fecddb5b KVM: use kvcalloc for array allocations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (21ea45784275 KVM: arm64: fix typos in comments) +$ 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 (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging xen-tip/linux-next (de2ae403b4c0 xen: fix is_xen_pmu()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/char/tpm/xen-tpmfront.c +Auto-merging drivers/usb/host/xen-hcd.c +Merge made by the 'ort' strategy. + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/pmu.c | 10 +- + arch/x86/xen/pmu.h | 3 +- + arch/x86/xen/setup.c | 2 +- + arch/x86/xen/smp_hvm.c | 6 ++ + arch/x86/xen/smp_pv.c | 2 +- + arch/x86/xen/time.c | 24 ++++- + drivers/block/xen-blkfront.c | 8 +- + drivers/char/tpm/xen-tpmfront.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 2 +- + drivers/input/misc/xen-kbdfront.c | 4 +- + drivers/net/xen-netfront.c | 13 ++- + drivers/pci/xen-pcifront.c | 2 +- + drivers/scsi/xen-scsifront.c | 4 +- + drivers/usb/host/xen-hcd.c | 4 +- + drivers/xen/balloon.c | 3 +- + drivers/xen/gntalloc.c | 2 +- + drivers/xen/gntdev-dmabuf.c | 2 +- + drivers/xen/grant-table.c | 151 ++++------------------------ + drivers/xen/manage.c | 4 +- + drivers/xen/pvcalls-front.c | 6 +- + drivers/xen/sys-hypervisor.c | 5 +- + drivers/xen/xen-front-pgdir-shbuf.c | 3 +- + include/xen/grant_table.h | 13 +-- + net/9p/trans_xen.c | 8 +- + sound/xen/xen_snd_front_evtchnl.c | 2 +- + 26 files changed, 94 insertions(+), 193 deletions(-) +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ 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 drivers-x86/for-next (b49f72e7f96d platform/x86: think-lmi: Certificate authentication support) +$ 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 (b579f139e470 platform/chrome: cros_ec_typec: Update mux flags during partner removal) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 ++ + drivers/platform/chrome/cros_ec_typec.c | 97 ++++++++++++++++----------------- + 2 files changed, 53 insertions(+), 49 deletions(-) +Merging hsi/for-next (e783362eb54c Linux 5.17-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/for-next (e26557a0aa68 leds: pca955x: Allow zero LEDs to be specified) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (88d99e870143 Documentation: update stable review cycle documentation) +$ 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 +Already up to date. +Merging usb/usb-next (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (144c4a77a3e1 thunderbolt: Rename EEPROM handling bits to match USB4 spec) +$ 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-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (4ac56b1f1ef8 USB: serial: usb_wwan: remove redundant assignment to variable i) +$ 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 usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'ort' strategy. +Merging tty/tty-next (b31c41339f4f vt_ioctl: fix potential spectre v1 in VT_DISALLOCATE) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (37fd83916da2 firmware: google: Properly state IOMEM dependency) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (286f950545e0 coresight: Drop unused 'none' enum value for each component) +$ 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 fpga/for-next (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (52c85167e413 Merge branch 'icc-msm8939' 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 (37fd83916da2 firmware: google: Properly state IOMEM dependency) +$ 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 (c6455af54899 phy: qcom-qmp: add sc8280xp UFS PHY) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (266fa94673d3 soundwire: qcom: use __maybe_unused for swrm_runtime_resume()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (4e63832f5daf extcon: sm5502: Add support for SM5703) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/extcon/Kconfig +Auto-merging drivers/power/supply/axp288_charger.c +Auto-merging drivers/power/supply/max8997_charger.c +CONFLICT (content): Merge conflict in drivers/power/supply/max8997_charger.c +Auto-merging drivers/usb/dwc3/drd.c +Resolved 'drivers/power/supply/max8997_charger.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5ba8becd6ff1] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-axp288.c | 4 +- + drivers/extcon/extcon-intel-int3496.c | 54 ++++++++++++++++++---- + drivers/extcon/extcon-sm5502.c | 2 + + drivers/extcon/extcon-usb-gpio.c | 15 ------ + drivers/extcon/extcon-usbc-cros-ec.c | 2 +- + drivers/extcon/extcon.c | 8 +++- + drivers/power/supply/axp288_charger.c | 17 ++++--- + drivers/power/supply/charger-manager.c | 7 +-- + drivers/power/supply/max8997_charger.c | 10 ++-- + drivers/usb/dwc3/drd.c | 9 +--- + drivers/usb/phy/phy-omap-otg.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + include/linux/extcon.h | 2 +- + 15 files changed, 86 insertions(+), 59 deletions(-) +Merging gnss/gnss-next (26291c54e111 Linux 5.17-rc2) +$ 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 (f621eb13facb vfio-pci: Provide reviewers and acceptance criteria for variant drivers) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (41197a5f11a4 staging: r8188eu: remove unnecessary memset in r8188eu) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (b95044b38425 dmaengine: hisi_dma: fix MSI allocate fail when reload hisi_dma) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 122 ++++++++++++++ + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 56 ------- + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 4 +- + drivers/dma/altera-msgdma.c | 4 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h | 2 +- + drivers/dma/hisi_dma.c | 2 +- + drivers/dma/idxd/device.c | 9 +- + drivers/dma/idxd/init.c | 2 - + drivers/dma/imx-sdma.c | 22 ++- + drivers/dma/ioat/init.c | 2 - + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/dma/ptdma/ptdma-dmaengine.c | 24 ++- + drivers/dma/qcom/hidma.c | 4 +- + drivers/dma/sh/Kconfig | 6 +- + drivers/dma/sh/shdma-base.c | 4 +- + drivers/dma/stm32-dma.c | 1 + + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/cppi41.c | 6 +- + drivers/dma/ti/edma.c | 10 +- + drivers/dma/ti/k3-psil-am62.c | 186 +++++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 1 + + drivers/dma/ti/omap-dma.c | 2 +- + 26 files changed, 383 insertions(+), 103 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/mediatek,uart-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/mtk-uart-apdma.txt + create mode 100644 drivers/dma/ti/k3-psil-am62.c +Merging cgroup/for-next (1be9b7206b7d Merge branch 'for-5.18' 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 +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. +Merging scsi/for-next (ee03d7a9c533 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/fnic/fnic_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/qedi/qedi_fw.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (66daf3e6b993 scsi: scsi_ioctl: Drop needless assignment in sg_io()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (ad6dc1daaf29 vdpa/mlx5: Avoid processing works if workqueue was destroyed) +$ 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/net/virtio_net.c +Merge made by the 'ort' strategy. + drivers/crypto/virtio/Kconfig | 3 + + drivers/crypto/virtio/Makefile | 3 +- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 585 +++++++++++++++++++++ + drivers/crypto/virtio/virtio_crypto_common.h | 7 +- + drivers/crypto/virtio/virtio_crypto_core.c | 6 +- + drivers/crypto/virtio/virtio_crypto_mgr.c | 17 +- + ...crypto_algs.c => virtio_crypto_skcipher_algs.c} | 4 +- + drivers/net/virtio_net.c | 389 +++++++++++++- + drivers/vdpa/ifcvf/ifcvf_base.c | 124 ++--- + drivers/vdpa/ifcvf/ifcvf_base.h | 24 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 317 +++++++++-- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 84 ++- + drivers/vdpa/vdpa.c | 6 +- + drivers/vhost/iotlb.c | 6 +- + drivers/vhost/vdpa.c | 45 +- + drivers/vhost/vhost.c | 3 +- + drivers/virtio/Kconfig | 7 +- + drivers/virtio/virtio.c | 5 +- + drivers/virtio/virtio_pci_common.c | 48 +- + drivers/virtio/virtio_pci_common.h | 7 +- + drivers/virtio/virtio_pci_legacy.c | 5 +- + drivers/virtio/virtio_pci_modern.c | 18 +- + drivers/virtio/virtio_pci_modern_dev.c | 9 +- + drivers/virtio/virtio_ring.c | 53 +- + include/linux/balloon_compaction.h | 22 - + include/linux/vdpa.h | 9 +- + include/uapi/linux/vhost.h | 7 + + include/uapi/linux/virtio_config.h | 6 + + include/uapi/linux/virtio_crypto.h | 82 ++- + mm/balloon_compaction.c | 6 +- + tools/virtio/Makefile | 3 +- + tools/virtio/linux/dma-mapping.h | 4 +- + 32 files changed, 1628 insertions(+), 286 deletions(-) + create mode 100644 drivers/crypto/virtio/virtio_crypto_akcipher_algs.c + rename drivers/crypto/virtio/{virtio_crypto_algs.c => virtio_crypto_skcipher_algs.c} (99%) +Merging rpmsg/for-next (9ea79a3861c9 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-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/remoteproc/qcom_q6v5_mss.c +Merge made by the 'ort' strategy. + .../bindings/hwlock/ti,omap-hwspinlock.yaml | 33 +-- + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 1 + + .../bindings/remoteproc/qcom,hexagon-v56.txt | 140 ---------- + .../bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml | 161 ++++++++++++ + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 219 ++++++++++++++++ + .../bindings/remoteproc/qcom,sdm845-adsp-pil.yaml | 160 ++++++++++++ + Documentation/staging/remoteproc.rst | 3 +- + drivers/hwspinlock/sprd_hwspinlock.c | 3 +- + drivers/hwspinlock/stm32_hwspinlock.c | 4 +- + drivers/remoteproc/mtk_common.h | 3 + + drivers/remoteproc/mtk_scp.c | 90 ++++--- + drivers/remoteproc/qcom_q6v5.c | 21 +- + drivers/remoteproc/qcom_q6v5.h | 3 + + drivers/remoteproc/qcom_q6v5_adsp.c | 228 ++++++++++++++-- + drivers/remoteproc/qcom_q6v5_mss.c | 19 +- + drivers/remoteproc/qcom_wcnss.c | 1 + + drivers/remoteproc/remoteproc_cdev.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 9 +- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + drivers/remoteproc/remoteproc_internal.h | 1 - + drivers/remoteproc/remoteproc_sysfs.c | 21 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 208 +++++++++++---- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 287 ++++++++++++++++++--- + drivers/remoteproc/wkup_m3_rproc.c | 1 + + drivers/rpmsg/Kconfig | 8 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/qcom_glink_native.c | 4 +- + drivers/rpmsg/qcom_smd.c | 13 +- + drivers/rpmsg/rpmsg_char.c | 238 +++++++---------- + drivers/rpmsg/rpmsg_char.h | 46 ++++ + drivers/rpmsg/rpmsg_core.c | 15 +- + drivers/rpmsg/rpmsg_ctrl.c | 243 +++++++++++++++++ + drivers/rpmsg/rpmsg_internal.h | 10 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + include/linux/remoteproc.h | 5 +- + include/uapi/linux/rpmsg.h | 10 + + 36 files changed, 1736 insertions(+), 479 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdm845-adsp-pil.yaml + create mode 100644 drivers/rpmsg/rpmsg_char.h + create mode 100644 drivers/rpmsg/rpmsg_ctrl.c +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ 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 (87ba5badc541 gpio: ts4900: Use SPDX header) +$ 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 (a1ce76e89907 gpio: tps68470: Allow building as module) +$ 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 gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (4a6d01495a16 pinctrl: mediatek: common-v1: fix semicolon.cocci warnings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (d25478e1d8f9 pinctrl: icelake: Add Ice Lake-N PCH pin controller support) +$ 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 (babe298e9caa pinctrl: renesas: r8a779f0: Add Ethernet pins, groups, and functions) +$ 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 (3652dc070bad pinctrl: samsung: improve wake irq info on console) +$ 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/for-next (ed14d36498c8 pwm: rcar: Simplify multiplication/shift logic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +Auto-merging Documentation/devicetree/bindings/pwm/pwm-sifive.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/google,cros-ec.yaml | 4 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 53 ++++---- + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml | 1 - + .../bindings/pwm/google,cros-ec-pwm.yaml | 5 +- + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/imx-tpm-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 1 - + .../devicetree/bindings/pwm/intel,lgm-pwm.yaml | 3 + + .../devicetree/bindings/pwm/iqs620a-pwm.yaml | 4 +- + Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 1 + + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 74 +++++------ + .../devicetree/bindings/pwm/pwm-samsung.yaml | 1 - + .../devicetree/bindings/pwm/pwm-sifive.yaml | 4 +- + .../devicetree/bindings/pwm/pwm-tiecap.yaml | 1 - + .../devicetree/bindings/pwm/pwm-tiehrpwm.yaml | 1 - + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 26 ++-- + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 - + .../bindings/pwm/toshiba,pwm-visconti.yaml | 4 +- + .../devicetree/bindings/timer/ingenic,tcu.yaml | 1 + + drivers/pwm/pwm-atmel.c | 2 +- + drivers/pwm/pwm-bcm-kona.c | 90 ++++++++----- + drivers/pwm/pwm-brcmstb.c | 52 ++++---- + drivers/pwm/pwm-img.c | 141 ++++++++++----------- + drivers/pwm/pwm-imx1.c | 33 ++++- + drivers/pwm/pwm-jz4740.c | 5 + + drivers/pwm/pwm-lpc18xx-sct.c | 49 +++---- + drivers/pwm/pwm-mediatek.c | 34 ++--- + drivers/pwm/pwm-meson.c | 25 ++-- + drivers/pwm/pwm-pca9685.c | 4 +- + drivers/pwm/pwm-pxa.c | 33 ++++- + drivers/pwm/pwm-raspberrypi-poe.c | 1 - + drivers/pwm/pwm-rcar.c | 2 +- + drivers/pwm/pwm-stmpe.c | 18 ++- + drivers/pwm/pwm-sun4i.c | 70 +++++----- + drivers/pwm/pwm-tegra.c | 59 +++++---- + drivers/pwm/pwm-tiehrpwm.c | 40 +++++- + drivers/pwm/pwm-vt8500.c | 38 +++--- + 38 files changed, 492 insertions(+), 401 deletions(-) +Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/csky/kernel/signal.c +Auto-merging arch/hexagon/kernel/process.c +Auto-merging arch/microblaze/kernel/signal.c +Auto-merging arch/mips/kernel/signal.c +CONFLICT (modify/delete): arch/nds32/include/asm/syscall.h deleted in HEAD and modified in userns/for-next. Version userns/for-next of arch/nds32/include/asm/syscall.h left in tree. +CONFLICT (modify/delete): arch/nds32/kernel/ptrace.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of arch/nds32/kernel/ptrace.c left in tree. +CONFLICT (modify/delete): arch/nds32/kernel/signal.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of arch/nds32/kernel/signal.c left in tree. +Auto-merging arch/nios2/kernel/signal.c +Auto-merging arch/parisc/kernel/signal.c +Auto-merging arch/powerpc/kernel/ptrace/ptrace.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/s390/kernel/signal.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging block/blk-cgroup.c +CONFLICT (content): Merge conflict in block/blk-cgroup.c +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/io-wq.c +Auto-merging fs/io_uring.c +Auto-merging fs/proc/base.c +Auto-merging include/linux/entry-common.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/entry/common.c +Auto-merging kernel/exit.c +Auto-merging kernel/signal.c +Auto-merging mm/memcontrol.c +Auto-merging security/selinux/hooks.c +Resolved 'block/blk-cgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/nds32/include/asm/syscall.h arch/nds32/kernel/ptrace.c arch/nds32/kernel/signal.c +rm 'arch/nds32/include/asm/syscall.h' +rm 'arch/nds32/kernel/ptrace.c' +rm 'arch/nds32/kernel/signal.c' +$ git commit --no-edit -v -a +[master fe777b7e1b00] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + arch/Kconfig | 5 +- + arch/alpha/kernel/ptrace.c | 5 +- + arch/alpha/kernel/signal.c | 4 +- + arch/arc/kernel/ptrace.c | 5 +- + arch/arc/kernel/signal.c | 4 +- + arch/arm/kernel/ptrace.c | 12 +- + arch/arm/kernel/signal.c | 4 +- + arch/arm64/kernel/ptrace.c | 14 +-- + arch/arm64/kernel/signal.c | 4 +- + arch/csky/kernel/ptrace.c | 5 +- + arch/csky/kernel/signal.c | 4 +- + arch/h8300/kernel/ptrace.c | 5 +- + arch/h8300/kernel/signal.c | 4 +- + arch/hexagon/kernel/process.c | 4 +- + arch/hexagon/kernel/signal.c | 1 - + arch/hexagon/kernel/traps.c | 6 +- + arch/ia64/kernel/process.c | 4 +- + arch/ia64/kernel/ptrace.c | 6 +- + arch/ia64/kernel/signal.c | 1 - + arch/m68k/kernel/ptrace.c | 5 +- + arch/m68k/kernel/signal.c | 4 +- + arch/microblaze/kernel/ptrace.c | 5 +- + arch/microblaze/kernel/signal.c | 4 +- + arch/mips/kernel/ptrace.c | 5 +- + arch/mips/kernel/signal.c | 4 +- + arch/nios2/kernel/ptrace.c | 5 +- + arch/nios2/kernel/signal.c | 4 +- + arch/openrisc/kernel/ptrace.c | 5 +- + arch/openrisc/kernel/signal.c | 4 +- + arch/parisc/kernel/ptrace.c | 7 +- + arch/parisc/kernel/signal.c | 4 +- + arch/powerpc/kernel/ptrace/ptrace.c | 8 +- + arch/powerpc/kernel/signal.c | 4 +- + arch/riscv/kernel/ptrace.c | 5 +- + arch/riscv/kernel/signal.c | 4 +- + arch/s390/include/asm/entry-common.h | 1 - + arch/s390/kernel/ptrace.c | 1 - + arch/s390/kernel/signal.c | 5 +- + arch/sh/kernel/ptrace_32.c | 5 +- + arch/sh/kernel/signal_32.c | 4 +- + arch/sparc/kernel/ptrace_32.c | 5 +- + arch/sparc/kernel/ptrace_64.c | 5 +- + arch/sparc/kernel/signal32.c | 1 - + arch/sparc/kernel/signal_32.c | 4 +- + arch/sparc/kernel/signal_64.c | 4 +- + arch/um/kernel/process.c | 4 +- + arch/um/kernel/ptrace.c | 5 +- + arch/x86/kernel/ptrace.c | 1 - + arch/x86/kernel/signal.c | 5 +- + arch/x86/mm/tlb.c | 1 + + arch/xtensa/kernel/ptrace.c | 5 +- + arch/xtensa/kernel/signal.c | 4 +- + block/blk-cgroup.c | 2 +- + fs/coredump.c | 1 - + fs/exec.c | 1 - + fs/io-wq.c | 6 +- + fs/io_uring.c | 11 +- + fs/proc/array.c | 1 - + fs/proc/base.c | 1 - + include/asm-generic/syscall.h | 2 +- + include/linux/entry-common.h | 47 +------- + include/linux/entry-kvm.h | 2 +- + include/linux/ipc_namespace.h | 37 +++++- + include/linux/posix-timers.h | 1 - + include/linux/ptrace.h | 81 ++++++++++++- + include/linux/resume_user_mode.h | 64 ++++++++++ + include/linux/sched/signal.h | 17 +++ + include/linux/task_work.h | 5 + + include/linux/tracehook.h | 226 ----------------------------------- + include/uapi/linux/ptrace.h | 2 +- + ipc/ipc_sysctl.c | 189 ++++++++++++++++++----------- + ipc/mq_sysctl.c | 121 ++++++++++--------- + ipc/mqueue.c | 10 +- + ipc/namespace.c | 10 ++ + kernel/entry/common.c | 19 +-- + kernel/entry/kvm.c | 9 +- + kernel/exit.c | 3 +- + kernel/livepatch/transition.c | 1 - + kernel/ptrace.c | 47 +++++--- + kernel/seccomp.c | 1 - + kernel/signal.c | 62 +++++----- + kernel/task_work.c | 4 +- + kernel/time/posix-cpu-timers.c | 1 + + mm/memcontrol.c | 2 +- + security/apparmor/domain.c | 1 - + security/selinux/hooks.c | 1 - + 87 files changed, 602 insertions(+), 621 deletions(-) + create mode 100644 include/linux/resume_user_mode.h + delete mode 100644 include/linux/tracehook.h +$ git am -3 ../patches/0001-fixup-for-moving-of-linux-task_work.h.patch +Applying: fixup for moving of linux/task_work.h +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/sched/fair.c +$ git add -A . +$ git commit -v -a --amend +[master 3d3dc0c90d09] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git + Date: Tue Mar 29 10:42:02 2022 +1100 +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ 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 (f6d344cd5fa6 selftests: Fix build when $(O) points to a relative path) +$ 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 livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' 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 +Auto-merging kernel/livepatch/transition.c +Merge made by the 'ort' strategy. + kernel/livepatch/transition.c | 11 +++++++++-- + samples/livepatch/livepatch-shadow-fix1.c | 2 +- + samples/livepatch/livepatch-shadow-fix2.c | 2 +- + tools/testing/selftests/livepatch/functions.sh | 22 +++++++++++++++++++--- + tools/testing/selftests/livepatch/test-ftrace.sh | 3 ++- + 5 files changed, 32 insertions(+), 8 deletions(-) +Merging rtc/rtc-next (81c2f059ab90 rtc: optee: add RTC driver for OP-TEE RTC PTA) +$ 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 drivers/rtc/Kconfig +Merge made by the 'ort' strategy. + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 84 ++++- + .../devicetree/bindings/rtc/atmel,at91sam9-rtc.txt | 25 -- + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 69 ++++ + MAINTAINERS | 6 + + drivers/clk/sunxi-ng/Kconfig | 5 + + drivers/clk/sunxi-ng/Makefile | 2 + + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 395 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun6i-rtc.h | 15 + + drivers/clk/sunxi-ng/ccu_common.h | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 7 + + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 12 +- + drivers/rtc/rtc-ds1307.c | 2 +- + drivers/rtc/rtc-ds1685.c | 16 +- + drivers/rtc/rtc-efi.c | 10 +- + drivers/rtc/rtc-hym8563.c | 34 +- + drivers/rtc/rtc-m41t80.c | 6 +- + drivers/rtc/rtc-mc146818-lib.c | 6 +- + drivers/rtc/rtc-mpc5121.c | 17 +- + drivers/rtc/rtc-opal.c | 2 +- + drivers/rtc/rtc-optee.c | 362 +++++++++++++++++++ + drivers/rtc/rtc-pcf2123.c | 3 +- + drivers/rtc/rtc-pcf2127.c | 19 +- + drivers/rtc/rtc-pcf85063.c | 3 +- + drivers/rtc/rtc-pcf8523.c | 15 +- + drivers/rtc/rtc-pcf8563.c | 16 +- + drivers/rtc/rtc-pl031.c | 6 +- + drivers/rtc/rtc-pm8xxx.c | 33 +- + drivers/rtc/rtc-spear.c | 25 +- + drivers/rtc/rtc-sun6i.c | 184 ++++++---- + drivers/rtc/rtc-wm8350.c | 11 +- + drivers/rtc/rtc-xgene.c | 2 - + include/dt-bindings/clock/sun6i-rtc.h | 10 + + include/linux/clk/sunxi-ng.h | 2 + + include/linux/rtc.h | 2 - + include/linux/rtc/ds1685.h | 1 - + include/uapi/linux/rtc.h | 3 +- + 38 files changed, 1182 insertions(+), 240 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml + create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-rtc.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-rtc.h + create mode 100644 drivers/rtc/rtc-optee.c + create mode 100644 include/dt-bindings/clock/sun6i-rtc.h +Merging nvdimm/libnvdimm-for-next (ada8d8d337ee nvdimm/blk: Fix title level) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/platforms/pseries/papr_scm.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/papr_scm.c +CONFLICT (modify/delete): drivers/nvdimm/blk.c deleted in nvdimm/libnvdimm-for-next and modified in HEAD. Version HEAD of drivers/nvdimm/blk.c left in tree. +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/nvdimm/nd-core.h +Resolved 'arch/powerpc/platforms/pseries/papr_scm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/nvdimm/blk.c +rm 'drivers/nvdimm/blk.c' +$ git commit --no-edit -v -a +[master 3cb19cb45772] Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-nvdimm | 35 ++ + Documentation/driver-api/nvdimm/nvdimm.rst | 406 +++++------------------ + MAINTAINERS | 11 - + arch/powerpc/include/asm/device.h | 5 + + arch/powerpc/platforms/pseries/papr_scm.c | 229 +++++++++++++ + drivers/acpi/nfit/core.c | 387 +--------------------- + drivers/acpi/nfit/nfit.h | 6 - + drivers/nvdimm/Kconfig | 25 +- + drivers/nvdimm/Makefile | 4 +- + drivers/nvdimm/blk.c | 333 ------------------- + drivers/nvdimm/bus.c | 2 - + drivers/nvdimm/dimm_devs.c | 204 +----------- + drivers/nvdimm/label.c | 346 +------------------- + drivers/nvdimm/label.h | 5 +- + drivers/nvdimm/namespace_devs.c | 506 ++--------------------------- + drivers/nvdimm/nd-core.h | 27 +- + drivers/nvdimm/nd.h | 13 - + drivers/nvdimm/nd_perf.c | 329 +++++++++++++++++++ + drivers/nvdimm/region.c | 31 +- + drivers/nvdimm/region_devs.c | 157 ++------- + include/linux/libnvdimm.h | 24 -- + include/linux/nd.h | 78 +++-- + include/uapi/linux/ndctl.h | 2 - + tools/testing/nvdimm/Kbuild | 4 - + tools/testing/nvdimm/config_check.c | 1 - + tools/testing/nvdimm/test/ndtest.c | 67 +--- + tools/testing/nvdimm/test/nfit.c | 23 -- + 27 files changed, 832 insertions(+), 2428 deletions(-) + delete mode 100644 drivers/nvdimm/blk.c + create mode 100644 drivers/nvdimm/nd_perf.c +Merging at24/at24/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5cf4bc46c2f2 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging seccomp/for-next/seccomp (1d27adee48cf selftests/seccomp: Don't call read() on TTY from background pgrp) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Merge made by the 'ort' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (0eb1fb16396c slimbus: qcom-ngd-ctrl: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) +Merging nvmem/for-next (bdf79b27260b dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/mtd/mtdcore.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3d5d605b37f8] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging xarray/main (22f56b8e890d XArray: Include bitmap.h from xarray.h) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Merge made by the 'ort' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + include/linux/xarray.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (eeda29db98f4 x86/hyperv: Output host build info as normal Windows version number) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/lcd2s.c | 55 ++++++++++++++-------------------------------- + 1 file changed, 17 insertions(+), 38 deletions(-) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ 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 +Merge made by the 'ort' strategy. + kernel/debug/kdb/kdb_support.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (e783362eb54c Linux 5.17-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 cfi/cfi/next (e783362eb54c Linux 5.17-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 kunit-next/kunit (5debe5bfa02c list: test: Add a test for list_entry_is_head()) +$ 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 trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (c65b6a9d1173 bus: mhi: ep: Add uevent support for module autoloading) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging drivers/bus/mhi/Kconfig +CONFLICT (content): Merge conflict in drivers/bus/mhi/Kconfig +Auto-merging drivers/bus/mhi/Makefile +CONFLICT (content): Merge conflict in drivers/bus/mhi/Makefile +Auto-merging drivers/bus/mhi/common.h +CONFLICT (add/add): Merge conflict in drivers/bus/mhi/common.h +Auto-merging include/linux/mod_devicetable.h +Resolved 'drivers/bus/mhi/Kconfig' using previous resolution. +Resolved 'drivers/bus/mhi/Makefile' using previous resolution. +Resolved 'drivers/bus/mhi/common.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4ba63167f456] Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git +$ git diff -M --stat --summary HEAD^.. + drivers/bus/mhi/Kconfig | 1 + + drivers/bus/mhi/Makefile | 3 + + drivers/bus/mhi/common.h | 22 + + drivers/bus/mhi/ep/Kconfig | 10 + + drivers/bus/mhi/ep/Makefile | 2 + + drivers/bus/mhi/ep/internal.h | 224 ++++++ + drivers/bus/mhi/ep/main.c | 1623 +++++++++++++++++++++++++++++++++++++++ + drivers/bus/mhi/ep/mmio.c | 273 +++++++ + drivers/bus/mhi/ep/ring.c | 207 +++++ + drivers/bus/mhi/ep/sm.c | 148 ++++ + include/linux/mhi_ep.h | 282 +++++++ + include/linux/mod_devicetable.h | 2 + + scripts/mod/file2alias.c | 10 + + 13 files changed, 2807 insertions(+) + create mode 100644 drivers/bus/mhi/ep/Kconfig + create mode 100644 drivers/bus/mhi/ep/Makefile + create mode 100644 drivers/bus/mhi/ep/internal.h + create mode 100644 drivers/bus/mhi/ep/main.c + create mode 100644 drivers/bus/mhi/ep/mmio.c + create mode 100644 drivers/bus/mhi/ep/ring.c + create mode 100644 drivers/bus/mhi/ep/sm.c + create mode 100644 include/linux/mhi_ep.h +Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (05e815539f3f cxl/core/port: Fix NULL but dereferenced coccicheck error) +$ 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 folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (e783362eb54c Linux 5.17-rc1) +$ 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 (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ 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/for-next (c0a21b0f6928 Merge branch 'slab/for-5.18/cleanups' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging include/linux/slab.h +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. +Merging random/master (0396e46dc465 virt: vmgenid: recognize new CID added by Hyper-V) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ + drivers/char/Kconfig | 3 ++- + drivers/char/random.c | 17 ++++++++++++----- + drivers/virt/vmgenid.c | 1 + + 4 files changed, 21 insertions(+), 6 deletions(-) +Merging landlock/next (7325fd5614aa Merge Landlock fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/open.c +Auto-merging include/linux/syscalls.h +Auto-merging kernel/sysctl.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 50 +++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/open.c | 133 ++++++++ + fs/proc/proc_sysctl.c | 2 +- + include/linux/syscalls.h | 1 + + include/linux/sysctl.h | 3 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/trusted-for.h | 18 + + kernel/printk/sysctl.c | 9 - + kernel/sysctl.c | 9 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/interpreter/.gitignore | 2 + + tools/testing/selftests/interpreter/Makefile | 21 ++ + tools/testing/selftests/interpreter/config | 1 + + .../selftests/interpreter/trust_policy_test.c | 362 +++++++++++++++++++++ + 32 files changed, 625 insertions(+), 12 deletions(-) + create mode 100644 include/uapi/linux/trusted-for.h + create mode 100644 tools/testing/selftests/interpreter/.gitignore + create mode 100644 tools/testing/selftests/interpreter/Makefile + create mode 100644 tools/testing/selftests/interpreter/config + create mode 100644 tools/testing/selftests/interpreter/trust_policy_test.c +Merging rust/rust-next (f102e7bc3b29 init/Kconfig: Specify the interpreter for rust-is-available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/index.rst +Auto-merging Documentation/kbuild/kbuild.rst +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging include/linux/kallsyms.h +Auto-merging include/uapi/linux/android/binder.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging kernel/livepatch/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging samples/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kallsyms.c +Auto-merging scripts/kconfig/confdata.c +Auto-merging tools/lib/perf/include/perf/event.h +Resolved 'Makefile' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 21614d7e5edc] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 34 + + Documentation/rust/coding-guidelines.rst | 214 ++ + Documentation/rust/general-information.rst | 77 + + Documentation/rust/index.rst | 20 + + Documentation/rust/logo.svg | 357 +++ + Documentation/rust/quick-start.rst | 230 ++ + MAINTAINERS | 15 + + Makefile | 175 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 143 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 376 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2008 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 231 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 561 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2862 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3353 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 531 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 37 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 554 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 560 +++++ + rust/kernel/file.rs | 873 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 237 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 260 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 414 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 592 +++++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 166 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 157 ++ + rust/kernel/sync/mutex.rs | 114 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/rwsem.rs | 149 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/spinlock.rs | 192 ++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 569 +++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 130 + + samples/rust/Makefile | 15 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 + + scripts/generate_rust_target.rs | 227 ++ + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 168 files changed, 35297 insertions(+), 64 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/logo.svg + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging sysctl/sysctl-next (fc12aa67daba kernel/do_mount_initrd: move real_root_dev sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging include/linux/sched/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sched/sysctl.h +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/panic.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging mm/oom_kill.c +Auto-merging mm/page-writeback.c +Resolved 'include/linux/sched/sysctl.h' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a9ad197091d9] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/initrd.h | 2 - + include/linux/lockdep.h | 4 - + include/linux/oom.h | 4 - + include/linux/panic.h | 6 - + include/linux/reboot.h | 4 - + include/linux/sched/sysctl.h | 41 ------- + include/linux/writeback.h | 15 --- + init/do_mounts_initrd.c | 22 +++- + kernel/acct.c | 22 +++- + kernel/delayacct.c | 22 +++- + kernel/locking/lockdep.c | 35 +++++- + kernel/panic.c | 26 ++++- + kernel/rcu/rcu.h | 2 + + kernel/reboot.c | 34 +++++- + kernel/sched/core.c | 69 ++++++++--- + kernel/sched/deadline.c | 42 +++++-- + kernel/sched/fair.c | 32 +++++- + kernel/sched/rt.c | 56 ++++++++- + kernel/sched/sched.h | 7 ++ + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 268 ------------------------------------------- + mm/oom_kill.c | 38 +++++- + mm/page-writeback.c | 103 +++++++++++++++-- + 25 files changed, 482 insertions(+), 401 deletions(-) +Merging folio/for-next (1a58fcb00cca Merge branch 'fs-folio' into for-next-2022-03) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/swap.h +Auto-merging mm/filemap.c +Auto-merging mm/readahead.c +Auto-merging mm/rmap.c +Auto-merging mm/truncate.c +Merge made by the 'ort' strategy. +Merging execve/for-next/execve (dd664099002d binfmt_elf: Don't write past end of notes for regset gap) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging kspp/for-next/kspp (723908690e47 Merge branches 'for-next/hardening', 'for-next/array-bounds', 'for-next/memcpy', 'for-next/overflow' and 'for-next/pending-fixes' into for-next/kspp) +$ 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 arch/arm64/Kconfig +Auto-merging include/linux/cma.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging lib/Makefile +Auto-merging lib/test_kasan.c +Merge made by the 'ort' strategy. + arch/arm/mm/dma-mapping.c | 2 ++ + arch/arm/mm/mm.h | 4 ++++ + arch/x86/boot/boot.h | 36 ++++++++++++++++++++++++------------ + arch/x86/boot/main.c | 2 +- + include/linux/cma.h | 4 ---- + lib/test_kasan.c | 5 +++++ + 6 files changed, 36 insertions(+), 17 deletions(-) +Merging kspp-gustavo/for-next/kspp (452d059ea2b6 drm/amd/display: Fix Wstringop-overflow warnings in dc_link_dp.c) +$ 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 +Auto-merging drivers/virt/acrn/mm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++-- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/virt/acrn/acrn_drv.h | 10 ++++++---- + drivers/virt/acrn/mm.c | 9 ++++----- + fs/afs/security.c | 3 +-- + include/scsi/libfcoe.h | 3 ++- + include/uapi/linux/wireless.h | 2 +- + 8 files changed, 19 insertions(+), 18 deletions(-) +Merging akpm-current/current (ec31e5d6e685 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/buffer.c +Auto-merging fs/namei.c +Auto-merging include/linux/cpuhotplug.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/panic.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/memcontrol.c +Auto-merging tools/perf/builtin-kmem.c +CONFLICT (modify/delete): tools/testing/radix-tree/linux/gfp.h deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of tools/testing/radix-tree/linux/gfp.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/radix-tree/linux/gfp.h +rm 'tools/testing/radix-tree/linux/gfp.h' +$ git commit -v -a +[master ef12442d86ec] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/balance.rst | 2 +- + Documentation/vm/page_owner.rst | 20 ++++++-- + drivers/iommu/tegra-smmu.c | 4 +- + fs/buffer.c | 56 ++++++++++++++++++++- + fs/namei.c | 8 +-- + fs/ocfs2/namei.c | 17 +++++-- + fs/proc/fd.c | 23 ++++++++- + fs/proc/page.c | 40 ++++++++------- + fs/proc/task_mmu.c | 2 - + include/linux/cpuhotplug.h | 4 -- + include/linux/gfp.h | 12 ++--- + include/linux/memcontrol.h | 5 ++ + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 +++ + include/linux/rmap.h | 8 +-- + include/linux/sched.h | 8 +++ + include/trace/events/mmflags.h | 1 - + init/main.c | 25 ++++++---- + ipc/mqueue.c | 14 ++++++ + kernel/hung_task.c | 44 ++++++++++++++++ + kernel/kthread.c | 14 +++--- + kernel/panic.c | 2 +- + lib/Kconfig.debug | 12 ++--- + lib/glob.c | 2 +- + lib/lz4/lz4_decompress.c | 8 ++- + lib/refcount.c | 2 +- + lib/test_printf.c | 8 +-- + mm/hugetlb.c | 34 ++++++++----- + mm/internal.h | 2 +- + mm/memcontrol.c | 39 +++++++++------ + mm/mempolicy.c | 13 ++--- + mm/memremap.c | 20 ++++++++ + mm/page_alloc.c | 27 ++++------ + mm/rmap.c | 14 +++--- + mm/userfaultfd.c | 15 +++--- + mm/vmalloc.c | 2 + + mm/workingset.c | 2 +- + tools/perf/builtin-kmem.c | 1 - + tools/vm/page_owner_sort.c | 108 +++++++++++++++++++++++++++------------- + 39 files changed, 437 insertions(+), 192 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-tools-Move-gfp.h-and-slab.h-from-radix-tr.patch +Applying: fix up for "tools: Move gfp.h and slab.h from radix-tree to lib" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/include/linux/gfp.h +$ git add -A . +$ git commit -v -a --amend +[master 690bf9b7f68d] Merge branch 'akpm-current/current' + Date: Tue Mar 29 12:28:47 2022 +1100 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9af1ea298cd0...690633ee3a88 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (690633ee3a88 kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + fs/dax.c | 82 ++++--------------------------------- + include/linux/mm.h | 3 -- + include/linux/rmap.h | 3 ++ + mm/internal.h | 26 ++++++++---- + mm/memory.c | 23 ++--------- + mm/oom_kill.c | 58 +++++++++++++------------- + mm/page_vma_mapped.c | 5 ++- + mm/rmap.c | 68 ++++++++++++++++++++++++------ + tools/testing/selftests/vm/Makefile | 2 +- + 9 files changed, 119 insertions(+), 151 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..fe3944e5708d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220329 |