diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-01 14:02:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-01 14:02:18 +1100 |
| commit | e5071887cd2296a7704dbcd10c1cedf0f11cdbd5 (patch) | |
| tree | 32300756da71810e58fce961c896f14aa40e9d1a | |
| parent | fef30f9a66752e6c6f73a9604fab4ce5481017f6 (diff) | |
Add linux-next specific files for 20220401next-20220401
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 | 3165 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3862 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d37a3e6863c0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,347 @@ +Name SHA1 +---- ---- +origin 354b8bf222ee15bf9aac3d870ba8e0880dd9bc8d +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 754e0b0e35608ed5206d6a67a791563c631cec07 +arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +arm-current 8b2360c7157b462c4870d447d1e65d30ef31f9aa +arm64-fixes 316e46f65a5497839857db08b6fbf60f568b165a +arm-soc-fixes 6a2f0b2d3b74e3e4002dc4143887637cd216e531 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes 6d8df1f9e8aed0cf370753a2b60a79e8ffec9ae9 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes f82da161ea75dc4db21b2499e4b1facd36dab275 +s390-fixes f443e374ae131c168a065ea1748feac6b2e76613 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 2975dbdc3989cd66a4cb5a7c5510de2de8ee4d14 +bpf 0a210af6d0a0595fef566e7eeb072f10f37774be +ipsec 4db4075f92af2b28f415fc979ab626e6b37d67b6 +netfilter dea2d93a8ba437460c5f21bdfa4ada57fa1d2179 +ipvs 277f2bb14361790a70e4b3c649e794b75a91a597 +wireless 24b488061b97a6c6ff82c433e6843eaf54f41f3c +rdma-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +sound-current bc55cfd5718c7c23e5524582e9fa70b4d10f2433 +sound-asoc-fixes b0793cb5c40ed6fb3da33dc2e64d17b2f76b0033 +regmap-fixes d04ad245d67a3991dfea5e108e4c452c2ab39bac +regulator-fixes 78beedbc6af3eb0cc581af6b9e2b6416deb938f4 +spi-fixes d583fe25614fa95293df55f23a95764d8501dcf8 +pci-current 1c6cec4ab487eda9063355cf7dfe125966032bb7 +driver-core.current 787af64d05cd528aac9ad16752d11bb1c6061bb9 +tty.current 1930a6e739c4b4a654a69164dbe39e554d228915 +usb.current d888c83fcec75194a8a48ccd283953bdba7b2550 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff +staging.current 787af64d05cd528aac9ad16752d11bb1c6061bb9 +iio-fixes 123d838c4e7deedebe29cc63c1098db1a810f1f8 +counter-fixes 4a14311a3b935b62b33e665a97ecaaf2f078228a +char-misc.current 787af64d05cd528aac9ad16752d11bb1c6061bb9 +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes f443e374ae131c168a065ea1748feac6b2e76613 +input-current 5710faba8a2a15349c9001bd4b2cd958e56c90fa +crypto-current aa8e73eed7d3084c18dd16d195748661c7e881b5 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 6fec1ab67f8d60704cc7de64abcfd389ab131542 +modules-fixes dc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c +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 0b030dfe5b7c764ac733b3c543a57fea97bcc720 +scsi-fixes 733ab7e1b5d1041204c4ca7373f6e6f9d08e3283 +drm-fixes f443e374ae131c168a065ea1748feac6b2e76613 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 +mmc-fixes 6f2e03c11ef6f1169d1b370f30c6bf764fc3e21b +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes b6cae15b5710c8097aad26a2e5e752c323ee5348 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 0966d385830de3470b7131db8e86c0c5bc9c52dc +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +gpio-brgl-fixes 24f71ae5447e661813228677d343208d624fc141 +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 999397926ab3f78c7d1235cc4ca6e3c89d2769bf +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 bc29832b74e070cbb2f63b94c10750378b91d77d +asm-generic aec499c75cf8e0b599be4d559e6922b613085f8f +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 8caec335e08bb5737081eadc62e80c340aa14838 +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 cf683abd3913d5e6e51169de75d65ea193452fbd +clk-imx b09c68dc57c9d44071d83bb935b733f53ea2b2b4 +clk-renesas 73421f2a48e6bd1d1024a09aedbc9c662cb88e77 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 096e0fe4084eb9c2c12c272688d1703921811cd7 +m68k 0d52a01a266ba21840c7cb02e1de39c503759dda +m68knommu e6e1e7b19fa132d23d09c465942aab4c110d3da9 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips bf64f7fe151b9568443c9b0cf643b3542d36870c +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd 67eab0c077034751aa71ada65af47788df54ba23 +powerpc af41d2866f7d75bbb38d487f6ec7770425d70e45 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v 2e7451fb57632454aaccc8ca1aac167751df9fca +s390 faf79934e65aff90284725518a5ec3c2241c65ae +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 82017457957a550d7d00dde419435dd74a890887 +xtensa 1c4664faa38923330d478f046dc743a00c1e2dec +pidfd 6009ff9e80205e358f7e8261c4806f3533be476b +fscrypt cdaa1b1941f667814300799ddb74f3079517cd5a +fscache ab487a4cdfca3d1ef12795a49eafe1144967e617 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 89a925d7560844e14e068b1f318b1d09e010da85 +ceph f639d9867eea647005dc824e0e24f39ffc50d4e4 +cifs d6f5e358452479fa8a773b5c6ccc9e4ec5a20880 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a1108dcd9373a98f7018aa4310076260b8ecfc0b +exfat 1413276f228f9009c758330d2b88b302be427b59 +ext3 f06e95c3a4ca43f9acccca33dc2117e8b924eda0 +ext4 c7cded845fc192cc35a1ca37c0cd957ee35abdf8 +f2fs 5191290407668028179f2544a11ae9b57f0bcf07 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 +gfs2 27ca8273fda398638ca994a207323a85b6d81190 +jfs a53046291020ec41e09181396c1e829287b48d47 +ksmbd edf5f0548fbb77e20b898460dc25281b0f4d974d +nfs 7c9d845f0612e5bcd23456a2ec43be8ac43458f1 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd 0b5e0caf0b90c2fb68db1e8b17f5811fb20c4557 +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs 705757274599e2e064dd3054aabc74e8af31a095 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs 919edbadebe17a67193533f531c2920c03e40fa4 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 124f75f864f38327e3e7e182e6b6da5105e2bade +printk c5f75d490fc2dd706898c005a05a933b39e880d3 +pci 148a650476955705482dd57e7ffcf105d8b65440 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid 3cc519d82627102c10c9095617641f00a084842e +i2c 5db36559df9b9c4f8a5dd86eeaa733ff973e3a33 +i3c 6cbf8b38dfe3aabe330f2c356949bc4d6a1f034f +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging c1ebdafde1ee7f7416c04f8bb72e74e48f13defe +jc_docs 022bb490c79799229ef467d9ccc3e5966001b0ae +v4l-dvb 71e6d0608e4d1b79069990c7dacb3600ced28a3b +v4l-dvb-next ba2c670ae84bad705ec023bfa7a48f7f8eab5e16 +pm bd19672308663b45ebecd8010fa1c51515719dc4 +cpufreq-arm b7f2b0d3511a6bbf9387f08f370f9125663e18d8 +cpupower 8382dce5e4835c045f33b8958a5f559d212cdd11 +devfreq 9eb1950bb6f4bc0880210be05e674ad35aa43d5c +opp f48a0c475c2aec8f2274703e1dc7be503f40f7cc +thermal 1379d28e840ff2f7f8a4095ec6cb3e7034e966bc +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 87e0eacb176f9500c2063d140c0a1d7fa51ab8a5 +net-next 2975dbdc3989cd66a4cb5a7c5510de2de8ee4d14 +bpf-next 2975dbdc3989cd66a4cb5a7c5510de2de8ee4d14 +ipsec-next b58b1f563ab78955d37e9e43e02790a85c66ac05 +mlx5-next 45fee8edb4b333af79efad7a99de51718ebda94b +netfilter-next c84d86a0295c24487db5b7db1a61d9c0eddfbb66 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth 300cf0bfb43e3fd3ff23c72ef48714c9d3421166 +wireless-next e89600ebeeb14d18c0b062837a84196f72542830 +mtd 6cadd424abb63120f8346a4509dc43bddc9401d3 +nand fecbd4a317c95d73c849648c406bcf1b6a0ec1cf +spi-nor 151c6b49d679872d6fc0b50e0ad96303091694a2 +crypto 0e03b8fd29363f2df44e2a7a176d486de550757a +drm 2a81dba4b577099717cea86d429f053e85e74d96 +drm-misc 67bae5f28c895f8737a1974c3f31cf12b9170b14 +amdgpu 749831acb1f6bf5837aeeec93b96da1d91534775 +drm-intel 00f4150d27d2c01eaeffe1091fc311a7c0872c69 +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 05241de1f69eb7f56b0a5e0bec96a7752fad1b2f +imx-drm 83b2cbda9347fb10cd8f2e81400fafc7bd662083 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 894d02fbfa672f85643053575d4607e4499b0f76 +regmap c53d92b4b351c66e83768108e8e330e9299ddb65 +sound bc55cfd5718c7c23e5524582e9fa70b4d10f2433 +sound-asoc b0793cb5c40ed6fb3da33dc2e64d17b2f76b0033 +modules 719fce7539cd3e186598e2aed36325fe892150cf +input a949087c2285c8de4f0f204cab2d4eece9d929a2 +block 20658b141b8fc13b0dff08f04f34deb4492653ac +device-mapper f65a4bb1d7e21730790f71be5e005fe5c139b951 +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 6b49f3409a090c8e9d1f46ff2705c479b45a54d4 +mailbox 1b0d0f7c12d57763fe27200d0569c863f11d2b8a +spi ebcbbd0316bfc1257792052e48642c72410fd8fc +tip ba5a91cc154f61f6af263973ff33a858f11a0635 +clockevents 49c14f94ccfed1acf55a7dd592c00c58d38e5812 +edac d52ba330befa549b85576121c98318dae679d1fc +irqchip 49cdcea1b0772c29abb9468d82809933c718110e +ftrace c87857e214862a125208a4b1a510839d0c5a1bd4 +rcu 3a9ac384153de5abe642942a42bdfa6cfeed78ba +kvm 81d50efcff6cf4310aaf6a19806416ffeccf1cdb +kvm-arm 21ea457842759a236eefed2cfaa8cc7e5dc967a0 +kvms390 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +xen-tip de2ae403b4c0e79a3410e63bc448542fbb9f9bfc +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 b49f72e7f96d4ed147447428f2ae5b4cea598ca7 +chrome-platform a9e896f70fbe2aa1df588e31f0a7d8b604e9deb7 +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds e26557a0aa68acfb705b51947b7c756401a1ab71 +ipmi ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +driver-core 787af64d05cd528aac9ad16752d11bb1c6061bb9 +usb d888c83fcec75194a8a48ccd283953bdba7b2550 +thunderbolt 144c4a77a3e1e520daba85eafd28999af22e1aa5 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 4ac56b1f1ef8139dbfc5dab918aa235e8344ec4e +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 1930a6e739c4b4a654a69164dbe39e554d228915 +char-misc 787af64d05cd528aac9ad16752d11bb1c6061bb9 +coresight 286f950545e0d9c8aa802cbfc9676860bbc49179 +fpga 21f0a239ecab4b6765269af78904512358beb802 +icc 52c85167e41341c2cbc2570f4bb6bc6cd8f8bc6e +iio 37fd83916da2e4cae03d350015c82a67b1b334c4 +phy-next c6455af548991ed22c89528f998fd965c052fb2e +soundwire 266fa94673d325f489f74d0a9a12024a7f1ee49c +extcon 4e63832f5daf6d76e8c6fe5c84b493572717535c +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +vfio f621eb13facb7681a79f4fec8ec6553ae160da76 +staging 787af64d05cd528aac9ad16752d11bb1c6061bb9 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine b95044b38425f563404234d96bbb20cc6360c7e1 +cgroup 1be9b7206b7dbff54b223eee7ef3bc91b80433aa +scsi ee03d7a9c533a237e19a5a22d53505eec69f4bcb +scsi-mkp a6b758b0420bda28995ea6939ca0808fcec68be4 +vhost 1c80cf031e0204fde471558ee40183695773ce13 +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 915593a7a663b2ad08b895a5f3ba8b19d89d4ebf +nvdimm ada8d8d337ee970860c9844126e634df8076aa11 +at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +ntb 5cf4bc46c2f20651f2d44fe395fc93409b7b0ff4 +seccomp 8a3d3ea66f0d06eff26cd64e3712410daec1f4ae +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 0eb1fb16396ce3b0d8d493a4416a5c5f06091c84 +nvmem bdf79b27260ba474ce076e451911b0f552285a7b +xarray 3ed4bb77156da0bc732847c8c9df92454c1fbeea +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 1754abb3e7583c570666fa1e1ee5b317e88c89a0 +landlock 7325fd5614aa686c496e4f98633be9808aee44f4 +rust f102e7bc3b29f4f6e1a5b7d3332c6ddf1446a349 +sysctl fc12aa67daba87a5ac43a9d3ae80be2e666e2ef9 +folio ae86f150c9079b42d262135ba11e874b5815b20b +execve dd664099002db909912a23215f8775c97f7f4f10 +kspp f4fe9fc39c7131fe482bc44d68cb0eff96105935 +kspp-gustavo 452d059ea2b6252f6743de3e9e81950d05ed8b18 +akpm-current 1042bbddcb239c4567f94e5bb508e2dd8d221697 +akpm adefb3650cfb7023851eae27411ca14b5f234be1 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..5c3c3591bbd0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3165 @@ +$ date -R +Fri, 01 Apr 2022 08:48:04 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 74164d284b29 Merge tag 'pwm/for-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm +Merging origin/master (354b8bf222ee Merge tag 'linux-watchdog-5.18-rc1' of git://www.linux-watchdog.org/linux-watchdog) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 74164d284b29..354b8bf222ee +Fast-forward (no commit created; -m option ignored) + Documentation/bpf/bpf_devel_QA.rst | 2 +- + Documentation/dev-tools/kunit/architecture.rst | 13 +- + .../devicetree/bindings/net/qcom,ethqos.txt | 4 +- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 5 + + Documentation/kbuild/kbuild.rst | 11 + + Documentation/kbuild/llvm.rst | 31 +- + Documentation/kbuild/makefiles.rst | 2 + + Documentation/locking/locktypes.rst | 3 - + Documentation/maintainer/index.rst | 1 + + Documentation/maintainer/messy-diffstat.rst | 96 ++++ + Documentation/networking/index.rst | 3 +- + Documentation/process/maintainer-handbooks.rst | 1 + + .../maintainer-netdev.rst} | 114 ++-- + 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 +- + Documentation/sphinx/requirements.txt | 2 + + MAINTAINERS | 1 + + Makefile | 46 +- + arch/Kconfig | 8 +- + arch/alpha/kernel/syscalls/Makefile | 3 +- + arch/arm/crypto/Kconfig | 2 + + arch/arm/mm/dma-mapping.c | 2 + + arch/arm/mm/mm.h | 4 + + 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/Kconfig | 12 +- + arch/parisc/Makefile | 4 +- + arch/parisc/include/asm/pdc.h | 3 + + arch/parisc/include/asm/pdcpat.h | 3 +- + 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 | 44 +- + arch/parisc/kernel/head.S | 11 +- + arch/parisc/kernel/irq.c | 25 +- + arch/parisc/kernel/pacache.S | 2 +- + arch/parisc/kernel/patch.c | 25 +- + arch/parisc/kernel/process.c | 27 +- + arch/parisc/kernel/processor.c | 6 +- + arch/parisc/kernel/smp.c | 108 +++- + arch/parisc/kernel/syscalls/Makefile | 3 +- + arch/parisc/kernel/time.c | 6 +- + arch/parisc/kernel/topology.c | 77 +-- + 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/Kconfig | 1 + + arch/x86/crypto/chacha-avx512vl-x86_64.S | 4 +- + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 38 +- + arch/x86/crypto/sm3-avx-asm_64.S | 2 +- + arch/x86/entry/syscalls/Makefile | 3 +- + arch/x86/include/asm/unwind.h | 23 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/kprobes/common.h | 1 + + arch/x86/kernel/kprobes/core.c | 107 ---- + arch/x86/kernel/kprobes/opt.c | 25 +- + arch/x86/kernel/rethook.c | 127 +++++ + arch/x86/kernel/unwind_orc.c | 10 +- + arch/xtensa/kernel/syscalls/Makefile | 3 +- + certs/Makefile | 37 +- + certs/system_certificates.S | 3 - + drivers/acpi/acpi_ipmi.c | 39 +- + drivers/acpi/apei/apei-base.c | 2 +- + drivers/acpi/cppc_acpi.c | 32 +- + drivers/acpi/tables.c | 4 +- + drivers/auxdisplay/lcd2s.c | 55 +- + drivers/crypto/stm32/stm32-crc32.c | 4 +- + 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/can/m_can/m_can.c | 5 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- + drivers/net/can/usb/ems_usb.c | 1 - + drivers/net/can/usb/gs_usb.c | 2 + + drivers/net/can/usb/mcba_usb.c | 27 +- + drivers/net/can/usb/usb_8dev.c | 30 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 4 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 15 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +- + drivers/net/ethernet/intel/ice/ice.h | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 5 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 3 + + drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + + drivers/net/ethernet/sfc/efx_channels.c | 11 +- + drivers/net/virtio_net.c | 389 +++++++++++++- + drivers/net/vxlan/vxlan_vnifilter.c | 6 + + drivers/net/wireguard/queueing.c | 3 +- + drivers/net/wireguard/socket.c | 5 +- + 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 +- + drivers/ptp/ptp_ocp.c | 15 +- + 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 +- + 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 ++++----- + fs/unicode/Makefile | 2 +- + include/linux/balloon_compaction.h | 22 - + include/linux/cma.h | 4 - + include/linux/kprobes.h | 51 +- + include/linux/vdpa.h | 9 +- + include/trace/events/rxrpc.h | 8 +- + include/uapi/linux/vhost.h | 7 + + include/uapi/linux/virtio_config.h | 6 + + include/uapi/linux/virtio_crypto.h | 82 ++- + init/Kconfig | 8 +- + kernel/Makefile | 1 + + kernel/bpf/btf.c | 2 +- + kernel/kprobes.c | 124 ++++- + kernel/trace/fprobe.c | 8 +- + kernel/trace/trace_kprobe.c | 4 +- + lib/test_kmod.c | 1 + + mm/balloon_compaction.c | 6 +- + mm/page_alloc.c | 3 + + net/ax25/af_ax25.c | 13 +- + net/can/isotp.c | 2 +- + net/openvswitch/actions.c | 4 +- + net/openvswitch/flow_netlink.c | 4 +- + net/rxrpc/ar-internal.h | 15 +- + net/rxrpc/call_event.c | 2 +- + net/rxrpc/call_object.c | 40 +- + net/rxrpc/server_key.c | 7 +- + net/xdp/xsk_buff_pool.c | 8 +- + scripts/Makefile.build | 3 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.lib | 16 +- + scripts/basic/fixdep.c | 46 +- + scripts/get_abi.pl | 4 +- + scripts/get_feat.pl | 11 + + scripts/kallsyms.c | 2 +- + scripts/kconfig/confdata.c | 27 +- + scripts/kernel-doc | 4 +- + security/Kconfig | 2 +- + tools/bpf/bpftool/Makefile | 4 +- + tools/bpf/bpftool/feature.c | 5 +- + tools/bpf/bpftool/gen.c | 2 +- + tools/build/Makefile | 2 +- + tools/counter/Makefile | 2 +- + tools/gpio/Makefile | 2 +- + tools/hv/Makefile | 2 +- + tools/iio/Makefile | 2 +- + tools/include/uapi/linux/bpf.h | 8 +- + 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 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 3 - + .../selftests/bpf/progs/test_stacktrace_build_id.c | 12 +- + tools/testing/selftests/bpf/test_lpm_map.c | 3 +- + tools/testing/selftests/lib.mk | 8 +- + tools/testing/selftests/wireguard/qemu/init.c | 26 +- + tools/tracing/rtla/Makefile | 2 +- + tools/usb/Makefile | 2 +- + tools/virtio/Makefile | 3 +- + tools/virtio/linux/dma-mapping.h | 4 +- + usr/Makefile | 4 +- + usr/include/Makefile | 7 +- + 206 files changed, 3370 insertions(+), 1377 deletions(-) + create mode 100644 Documentation/maintainer/messy-diffstat.rst + rename Documentation/{networking/netdev-FAQ.rst => process/maintainer-netdev.rst} (75%) + create mode 100644 arch/x86/kernel/rethook.c + 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 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 (8b2360c7157b ARM: 9187/1: JIVE: fix return value of __setup handler) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Auto-merging arch/arm/mach-s3c/mach-jive.c +Merge made by the 'ort' strategy. + arch/arm/mach-s3c/mach-jive.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (f82da161ea75 powerpc: restore removed #endif) +$ 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 (2975dbdc3989 Merge tag 'net-5.18-rc1' of 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/netdev/net.git net/master +Already up to date. +Merging bpf/master (0a210af6d0a0 bpf: selftests: Test fentry tracing a struct_ops program) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + include/linux/bpf_verifier.h | 4 +++- + kernel/trace/bpf_trace.c | 4 ++-- + kernel/trace/rethook.c | 2 +- + tools/bpf/bpftool/gen.c | 22 ++++++++++++++------- + .../selftests/bpf/prog_tests/dummy_st_ops.c | 23 ++++++++++++++++++++++ + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 4 ++-- + .../selftests/bpf/progs/trace_dummy_st_ops.c | 21 ++++++++++++++++++++ + 7 files changed, 67 insertions(+), 13 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/trace_dummy_st_ops.c +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 (bc55cfd5718c ALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock) +$ 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. + include/sound/pcm.h | 1 + + sound/core/pcm.c | 1 + + sound/core/pcm_lib.c | 9 ++--- + sound/core/pcm_native.c | 39 ++++++++++++++++---- + 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_hdmi.c | 8 ++++- + sound/pci/hda/patch_realtek.c | 14 ++++++-- + sound/soc/codecs/mt6358.c | 4 +++ + sound/soc/fsl/fsl-asoc-card.c | 12 +++---- + sound/soc/rockchip/rockchip_i2s_tdm.c | 10 +++--- + sound/soc/sof/intel/Kconfig | 1 + + 14 files changed, 159 insertions(+), 68 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/wm_adsp.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 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. +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 (1c6cec4ab487 x86/PCI: Log host bridge window clipping for E820 regions) +$ 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 | 25 +++++++++++++++++-------- + arch/x86/pci/acpi.c | 5 +++++ + drivers/pci/controller/pci-hyperv.c | 8 -------- + 4 files changed, 27 insertions(+), 16 deletions(-) +Merging driver-core.current/driver-core-linus (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 (1930a6e739c4 Merge tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ 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 (d888c83fcec7 fs: fix fd table size alignment properly) +$ 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 ce20e3d9966d] 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 (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 (5710faba8a2a Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging Documentation/devicetree/bindings/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 crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - 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 +Already up to date. +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 (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod()) +$ 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 (0b030dfe5b7c dt-bindings: extcon: maxim,max77843: fix ports type) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/extcon/maxim,max77843.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (b6cae15b5710 Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/hv_common.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'ort' strategy. + drivers/hv/hv_common.c | 11 +++++++ + drivers/hv/ring_buffer.c | 11 ++++++- + drivers/hv/vmbus_drv.c | 65 ++++++++++++++++++++++++++++++------- + drivers/pci/controller/pci-hyperv.c | 9 +++++ + include/asm-generic/mshyperv.h | 1 + + 5 files changed, 85 insertions(+), 12 deletions(-) +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 (24f71ae5447e gpio: ts5500: Fix Links to Technologic Systems web resources) +$ 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 +++++++----- + drivers/gpio/gpio-ts5500.c | 4 ++-- + include/linux/gpio/driver.h | 13 ++++++++----- + 3 files changed, 17 insertions(+), 12 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 655ff5056397] 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 (999397926ab3 nfsd: Clean up nfsd_file_put()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Auto-merging fs/nfsd/filecache.c +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 25 +++++++++++++++---------- + fs/nfsd/nfs2acl.c | 24 ++++++++++++------------ + 2 files changed, 27 insertions(+), 22 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 +CONFLICT (content): Merge conflict in Makefile +Auto-merging Makefile +Auto-merging arch/x86/entry/syscalls/Makefile +Auto-merging tools/scripts/Makefile.include +Auto-merging usr/include/Makefile +Merge made by the 'ort' strategy. + scripts/kconfig/confdata.c | 15 +++++---------- + scripts/kconfig/merge_config.sh | 19 +++++++++++-------- + scripts/kconfig/streamline_config.pl | 2 +- + scripts/kconfig/tests/choice/alldef_expected_config | 6 +++--- + scripts/kconfig/tests/choice/allmod_expected_config | 4 ++-- + scripts/kconfig/tests/choice/allno_expected_config | 6 +++--- + scripts/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 +- + .../kconfig/tests/no_write_if_dep_unmet/__init__.py | 7 +++---- + .../tests/no_write_if_dep_unmet/expected_config | 2 +- + 12 files changed, 36 insertions(+), 39 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 (bc29832b74e0 dma-mapping: move pgprot_decrypted out of dma_pgprot) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + Documentation/PCI/pci.rst | 14 ++--- + include/linux/pci-dma-compat.h | 129 ----------------------------------------- + include/linux/pci.h | 3 +- + kernel/dma/direct.c | 10 +++- + kernel/dma/mapping.c | 2 - + 5 files changed, 16 insertions(+), 142 deletions(-) + delete mode 100644 include/linux/pci-dma-compat.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 (8caec335e08b 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/mach-s3c/mach-jive.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 24cb3116ee7c] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/Makefile | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +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 +Auto-merging include/dt-bindings/clock/at91.h +Merge made by the 'ort' strategy. +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 8118c3941d68] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/configs/defconfig | 10 ++++++++++ + 1 file changed, 10 insertions(+) +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 ++++++++++++++++++++++++ + 4 files changed, 44 insertions(+), 2 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 (cf683abd3913 Merge branches 'clk-sifive' and 'clk-visconti' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (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 (096e0fe4084e h8300: remove memory.c) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Merge made by the 'ort' strategy. + 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 +Already up to date. +Merging mips/mips-next (bf64f7fe151b MIPS: rb532: move GPIOD definition into C-files) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/include/asm/mach-rc32434/rb.h | 9 ------- + arch/mips/lantiq/falcon/sysctrl.c | 2 ++ + arch/mips/lantiq/xway/gptu.c | 2 ++ + arch/mips/lantiq/xway/sysctrl.c | 46 +++++++++++++++++++++------------ + arch/mips/rb532/gpio.c | 10 +++++++ + arch/mips/sgi-ip22/ip22-gio.c | 2 ++ + 6 files changed, 46 insertions(+), 25 deletions(-) +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 (67eab0c07703 parisc: Don't enforce DMA completion order in cache flushes) +$ 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/include/asm/cache.h | 1 + + arch/parisc/include/asm/cacheflush.h | 5 +++-- + arch/parisc/kernel/cache.c | 17 ++++++++++++++++- + arch/parisc/kernel/pacache.S | 3 --- + 4 files changed, 20 insertions(+), 6 deletions(-) +Merging powerpc/next (af41d2866f7d powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/setup.h | 2 ++ + arch/powerpc/kernel/exceptions-64s.S | 4 ++++ + arch/powerpc/kernel/setup_64.c | 28 +++++++++++++++++++++++ + arch/powerpc/kvm/Kconfig | 9 ++++++++ + arch/powerpc/kvm/book3s_64_entry.S | 10 +++++++-- + arch/powerpc/kvm/book3s_hv.c | 41 +++++++++++++++++++++++++++------- + arch/powerpc/kvm/book3s_pr.c | 26 +++++++++++++-------- + arch/powerpc/kvm/book3s_pr_papr.c | 20 +++++++++++++++++ + arch/powerpc/kvm/powerpc.c | 17 ++++++++++++++ + arch/powerpc/platforms/pseries/setup.c | 13 ++++++++++- + 10 files changed, 150 insertions(+), 20 deletions(-) +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 (2e7451fb5763 RISC-V: Enable profiling by default) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/devicetree/bindings/cpu/idle-states.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/arm/msm/qcom,idle-state.txt | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 2 +- + .../bindings/{arm => cpu}/idle-states.yaml | 228 +++++++- + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + MAINTAINERS | 14 + + arch/riscv/Kconfig | 8 + + arch/riscv/Kconfig.socs | 3 + + arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 + + arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 + + arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 + + arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 + + arch/riscv/configs/defconfig | 3 + + arch/riscv/configs/rv32_defconfig | 3 + + arch/riscv/include/asm/asm.h | 26 + + arch/riscv/include/asm/cpuidle.h | 24 + + arch/riscv/include/asm/current.h | 2 + + arch/riscv/include/asm/module.lds.h | 6 +- + arch/riscv/include/asm/suspend.h | 36 ++ + arch/riscv/include/asm/thread_info.h | 10 +- + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 3 + + arch/riscv/kernel/cpu.c | 2 +- + arch/riscv/kernel/cpu_ops_sbi.c | 2 +- + arch/riscv/kernel/head.S | 27 +- + arch/riscv/kernel/module.c | 4 +- + arch/riscv/kernel/perf_callchain.c | 2 +- + arch/riscv/kernel/process.c | 3 +- + arch/riscv/kernel/stacktrace.c | 6 +- + arch/riscv/kernel/suspend.c | 87 +++ + arch/riscv/kernel/suspend_entry.S | 124 ++++ + drivers/cpuidle/Kconfig | 9 + + drivers/cpuidle/Kconfig.arm | 1 + + drivers/cpuidle/Kconfig.riscv | 15 + + drivers/cpuidle/Makefile | 5 + + drivers/cpuidle/cpuidle-psci-domain.c | 138 +---- + drivers/cpuidle/cpuidle-psci.h | 15 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 627 +++++++++++++++++++++ + drivers/cpuidle/dt_idle_genpd.c | 178 ++++++ + drivers/cpuidle/dt_idle_genpd.h | 50 ++ + 39 files changed, 1489 insertions(+), 192 deletions(-) + rename Documentation/devicetree/bindings/{arm => cpu}/idle-states.yaml (74%) + create mode 100644 arch/riscv/include/asm/cpuidle.h + create mode 100644 arch/riscv/include/asm/suspend.h + create mode 100644 arch/riscv/kernel/suspend.c + create mode 100644 arch/riscv/kernel/suspend_entry.S + create mode 100644 drivers/cpuidle/Kconfig.riscv + create mode 100644 drivers/cpuidle/cpuidle-riscv-sbi.c + create mode 100644 drivers/cpuidle/dt_idle_genpd.c + create mode 100644 drivers/cpuidle/dt_idle_genpd.h +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 fs/nfs/fscache.c +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 fa600b221a3b] 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 0cf893b887a6] 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 (d6f5e3584524 cifs: fix NULL ptr dereference in smb2_ioctl_query_info()) +$ 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 a5d0f6d07709] 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 | 246 ++++++++++-------- + fs/cifs/smb2pdu.c | 73 +++--- + fs/cifs/smb2pdu.h | 560 +--------------------------------------- + fs/cifs/smb2proto.h | 2 +- + fs/ksmbd/oplock.c | 4 +- + fs/ksmbd/smb2pdu.c | 108 ++++---- + fs/ksmbd/smb2pdu.h | 533 +------------------------------------- + fs/smbfs_common/smb2pdu.h | 639 +++++++++++++++++++++++++++++++++++++++++++++- + 18 files changed, 924 insertions(+), 1377 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 (27ca8273fda3 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 +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 9 ++++---- + fs/gfs2/file.c | 68 ++++++++++++++++++++++++++---------------------------- + 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, 104 insertions(+), 76 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 +Already up to date. +Merging ksmbd/ksmbd-for-next (edf5f0548fbb 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/ksmbd/smb2pdu.c +Merge made by the 'ort' strategy. + Documentation/filesystems/cifs/ksmbd.rst | 4 ++-- + MAINTAINERS | 2 +- + fs/ksmbd/server.c | 2 +- + fs/ksmbd/smb2pdu.c | 23 +++++++++++------------ + fs/ksmbd/transport_tcp.c | 4 ++-- + 5 files changed, 17 insertions(+), 18 deletions(-) +Merging nfs/linux-next (7c9d845f0612 NFSv4/pNFS: Fix another issue with a list iterator pointing to the head) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (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 (919edbadebe1 xfs: drop async cache flushes from CIL commits.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_bio_io.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_bio_io.c +Auto-merging fs/xfs/xfs_icache.c +Auto-merging fs/xfs/xfs_log.c +Resolved 'fs/xfs/xfs_bio_io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 42ad9b66169b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git +$ git diff -M --stat --summary HEAD^.. + fs/xfs/libxfs/xfs_alloc.c | 28 ++++++-- + fs/xfs/libxfs/xfs_alloc.h | 1 - + fs/xfs/xfs_bio_io.c | 33 ---------- + fs/xfs/xfs_fsops.c | 60 ++++++++--------- + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode_item.c | 162 +++++++++++++++++++++++++++++++++++++--------- + fs/xfs/xfs_inode_item.h | 1 + + fs/xfs/xfs_linux.h | 2 - + fs/xfs/xfs_log.c | 109 ++++++++++++++++--------------- + fs/xfs/xfs_log_cil.c | 46 +++++-------- + fs/xfs/xfs_log_priv.h | 14 +++- + fs/xfs/xfs_log_recover.c | 56 ++++++---------- + fs/xfs/xfs_mount.c | 3 +- + fs/xfs/xfs_mount.h | 15 +++++ + fs/xfs/xfs_super.c | 3 +- + fs/xfs/xfs_trans.c | 48 +++++++++----- + fs/xfs/xfs_trans_ail.c | 8 +-- + 18 files changed, 347 insertions(+), 246 deletions(-) +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 9255454ad03c] 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 (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ 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 +Auto-merging fs/ioctl.c +Merge made by the 'ort' strategy. + fs/ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 4d35a4389c6c] 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 (148a65047695 Merge tag 'pci-v5.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ 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 +Already up to date. +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 (022bb490c797 docs: Add a document on how to fix a messy diffstat) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/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 (bd1967230866 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/admin-guide/pm/amd-pstate.rst +Auto-merging Documentation/firmware-guide/acpi/enumeration.rst +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +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 (2975dbdc3989 Merge tag 'net-5.18-rc1' of 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/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (2975dbdc3989 Merge tag 'net-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/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 (300cf0bfb43e Bluetooth: fix dangling sco_conn and use-after-free in sco_sock_timeout) +$ 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 +- + net/bluetooth/sco.c | 21 ++++++++++------- + 3 files changed, 65 insertions(+), 10 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 (67bae5f28c89 drm: of: Properly try all possible cases for bridge/panel detection) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_of.c +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 | 32 +++++ + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-fence-unwrap.c | 261 ++++++++++++++++++++++++++++++++++ + drivers/dma-buf/sync_file.c | 141 +++++++++--------- + drivers/gpu/drm/drm_of.c | 99 ++++++------- + include/linux/dma-fence-array.h | 19 +++ + include/linux/dma-fence-chain.h | 2 + + include/linux/dma-fence-unwrap.h | 95 +++++++++++++ + 10 files changed, 540 insertions(+), 117 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 (83b2cbda9347 drm/imx: make static read-only array channel_offsets const) +$ 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-dc.c | 5 +++-- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 3 files changed, 7 insertions(+), 11 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 (bc55cfd5718c ALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock) +$ 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 +Already up to date. +Merging block/for-next (20658b141b8f Merge branch 'for-5.18/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging block/blk-cgroup.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging fs/io_uring.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + block/blk-cgroup.c | 32 ++- + block/blk-ioc.c | 3 +- + block/blk-mq.c | 25 ++- + block/blk-wbt.h | 3 - + block/genhd.c | 2 +- + drivers/block/drbd/drbd_req.c | 3 +- + drivers/block/loop.c | 1 + + drivers/block/n64cart.c | 2 +- + drivers/block/nbd.c | 24 +-- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/nvme/host/core.c | 38 ++-- + drivers/nvme/host/multipath.c | 32 ++- + drivers/nvme/host/nvme.h | 23 ++ + drivers/nvme/host/pci.c | 7 +- + drivers/nvme/target/admin-cmd.c | 2 +- + drivers/nvme/target/configfs.c | 2 +- + drivers/nvme/target/core.c | 26 ++- + drivers/nvme/target/fc.c | 8 +- + drivers/nvme/target/fcloop.c | 16 +- + drivers/nvme/target/io-cmd-file.c | 6 +- + drivers/nvme/target/loop.c | 4 +- + drivers/nvme/target/nvmet.h | 1 + + drivers/nvme/target/passthru.c | 2 +- + drivers/nvme/target/rdma.c | 12 +- + drivers/nvme/target/tcp.c | 10 +- + fs/io_uring.c | 408 +++++++++++++++++++++--------------- + include/linux/blk-cgroup.h | 5 +- + include/linux/nvme.h | 1 + + include/linux/sbitmap.h | 2 +- + include/uapi/linux/io_uring.h | 2 - + include/uapi/linux/loop.h | 4 +- + lib/sbitmap.c | 2 +- + 34 files changed, 440 insertions(+), 273 deletions(-) +Merging device-mapper/for-next (f65a4bb1d7e2 dm: conditionally enable BIOSET_PERCPU_CACHE for dm_io bioset) +$ 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 +Merge made by the 'ort' strategy. + block/bio.c | 88 +++++++++++++++++++++++------------------------ + block/blk.h | 7 ---- + block/fops.c | 11 ++++-- + drivers/md/dm-table.c | 11 ++++-- + drivers/md/dm.c | 8 ++--- + drivers/md/dm.h | 4 +-- + include/linux/bio.h | 8 +++-- + include/linux/blk_types.h | 3 +- + 8 files changed, 73 insertions(+), 67 deletions(-) +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 +Already up to date. +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 (6b49f3409a09 dt-bindings: kbuild: Make DT_SCHEMA_LINT a recursive variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging 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 +Resolved 'drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7a02bb045f62] 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 (81d50efcff6c x86, kvm: fix compilation for !CONFIG_PARAVIRT_SPINLOCKS or !CONFIG_SMP) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/kvm.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/kvm_emulate.h +Auto-merging arch/x86/kvm/vmx/pmu_intel.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging tools/testing/selftests/kvm/Makefile +Resolved 'arch/x86/kernel/kvm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 780247205934] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 210 +++- + Documentation/virt/kvm/index.rst | 26 +- + Documentation/virt/kvm/locking.rst | 43 +- + Documentation/virt/kvm/s390/index.rst | 12 + + Documentation/virt/kvm/{ => s390}/s390-diag.rst | 0 + Documentation/virt/kvm/{ => s390}/s390-pv-boot.rst | 0 + Documentation/virt/kvm/{ => s390}/s390-pv.rst | 0 + Documentation/virt/kvm/vcpu-requests.rst | 10 + + .../virt/kvm/{ => x86}/amd-memory-encryption.rst | 0 + Documentation/virt/kvm/{ => x86}/cpuid.rst | 0 + Documentation/virt/kvm/x86/errata.rst | 39 + + Documentation/virt/kvm/{ => x86}/halt-polling.rst | 0 + Documentation/virt/kvm/{ => x86}/hypercalls.rst | 0 + Documentation/virt/kvm/x86/index.rst | 19 + + Documentation/virt/kvm/{ => x86}/mmu.rst | 0 + Documentation/virt/kvm/{ => x86}/msr.rst | 0 + Documentation/virt/kvm/{ => x86}/nested-vmx.rst | 0 + .../virt/kvm/{ => x86}/running-nested-guests.rst | 0 + Documentation/virt/kvm/{ => x86}/timekeeping.rst | 0 + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 80 +- + arch/x86/include/asm/svm.h | 14 +- + arch/x86/include/uapi/asm/kvm.h | 11 +- + arch/x86/kernel/asm-offsets_64.c | 4 +- + arch/x86/kernel/kvm.c | 77 +- + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/emulate.c | 8 +- + arch/x86/kvm/hyperv.c | 22 +- + arch/x86/kvm/i8254.c | 6 +- + arch/x86/kvm/i8259.c | 1 - + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/kvm_emulate.h | 3 + + arch/x86/kvm/lapic.c | 4 + + arch/x86/kvm/mmu.h | 32 +- + arch/x86/kvm/mmu/mmu.c | 45 +- + arch/x86/kvm/mmu/paging_tmpl.h | 8 +- + arch/x86/kvm/mmu/tdp_mmu.c | 72 +- + arch/x86/kvm/mmu/tdp_mmu.h | 12 +- + arch/x86/kvm/pmu.c | 18 +- + arch/x86/kvm/svm/avic.c | 24 +- + arch/x86/kvm/svm/nested.c | 297 +++-- + arch/x86/kvm/svm/pmu.c | 9 +- + arch/x86/kvm/svm/svm.c | 239 ++-- + arch/x86/kvm/svm/svm.h | 68 +- + arch/x86/kvm/svm/svm_onhyperv.c | 1 - + arch/x86/kvm/trace.h | 22 +- + arch/x86/kvm/vmx/pmu_intel.c | 14 +- + arch/x86/kvm/vmx/vmx.c | 28 +- + arch/x86/kvm/x86.c | 372 +++--- + arch/x86/kvm/xen.c | 1253 ++++++++++++++++---- + arch/x86/kvm/xen.h | 62 +- + include/linux/kvm_host.h | 63 +- + include/linux/kvm_types.h | 11 +- + include/uapi/linux/kvm.h | 48 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + .../selftests/kvm/x86_64/fix_hypercall_test.c | 170 +++ + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 119 ++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 366 +++++- + virt/kvm/kvm_main.c | 22 +- + virt/kvm/pfncache.c | 72 +- + 63 files changed, 3123 insertions(+), 932 deletions(-) + create mode 100644 Documentation/virt/kvm/s390/index.rst + rename Documentation/virt/kvm/{ => s390}/s390-diag.rst (100%) + rename Documentation/virt/kvm/{ => s390}/s390-pv-boot.rst (100%) + rename Documentation/virt/kvm/{ => s390}/s390-pv.rst (100%) + rename Documentation/virt/kvm/{ => x86}/amd-memory-encryption.rst (100%) + rename Documentation/virt/kvm/{ => x86}/cpuid.rst (100%) + create mode 100644 Documentation/virt/kvm/x86/errata.rst + rename Documentation/virt/kvm/{ => x86}/halt-polling.rst (100%) + rename Documentation/virt/kvm/{ => x86}/hypercalls.rst (100%) + create mode 100644 Documentation/virt/kvm/x86/index.rst + rename Documentation/virt/kvm/{ => x86}/mmu.rst (100%) + rename Documentation/virt/kvm/{ => x86}/msr.rst (100%) + rename Documentation/virt/kvm/{ => x86}/nested-vmx.rst (100%) + rename Documentation/virt/kvm/{ => x86}/running-nested-guests.rst (100%) + rename Documentation/virt/kvm/{ => x86}/timekeeping.rst (100%) + create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +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 +Already up to date. +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 (a9e896f70fbe platform/chrome: cros_ec_debugfs: detach log reader wq from devm) +$ 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 +Auto-merging drivers/platform/chrome/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 5 + + drivers/platform/chrome/Makefile | 3 +- + drivers/platform/chrome/cros_ec_debugfs.c | 12 +-- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 3 +- + drivers/platform/chrome/cros_ec_sensorhub_trace.h | 123 ++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_trace.h | 95 ----------------- + drivers/platform/chrome/cros_ec_typec.c | 97 +++++++++-------- + 7 files changed, 186 insertions(+), 152 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_sensorhub_trace.h +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 (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 (d888c83fcec7 fs: fix fd table size alignment properly) +$ 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 (1930a6e739c4 Merge tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ 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 (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 7e964563ef59] 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 (787af64d05cd mm: page_alloc: validate buddy before check its migratetype.) +$ 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 +Already up to date. +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 (a6b758b0420b scsi: bnx2i: Fix spelling mistake "mis-match" -> "mismatch") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/sr.c +Merge made by the 'ort' strategy. + drivers/scsi/aha152x.c | 235 +++++++-------- + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 - + drivers/scsi/aic7xxx/aic79xx_pci.c | 6 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 - + drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 6 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/isci/host.c | 6 +- + drivers/scsi/libiscsi.c | 1 - + drivers/scsi/lpfc/lpfc.h | 7 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 120 ++++++-- + drivers/scsi/lpfc/lpfc_init.c | 88 ++++-- + drivers/scsi/lpfc/lpfc_nvme.c | 27 +- + drivers/scsi/lpfc/lpfc_scsi.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 75 +++-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- + drivers/scsi/pmcraid.c | 491 ------------------------------- + drivers/scsi/pmcraid.h | 33 --- + drivers/scsi/scsi_logging.c | 2 +- + drivers/scsi/scsi_scan.c | 5 + + drivers/scsi/scsi_sysfs.c | 4 - + drivers/scsi/sr.c | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 15 - + drivers/scsi/ufs/ufshcd.h | 2 - + drivers/scsi/virtio_scsi.c | 8 +- + drivers/scsi/zorro7xx.c | 2 + + drivers/target/target_core_user.c | 3 +- + 31 files changed, 393 insertions(+), 782 deletions(-) +Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/vdpa/mlx5/net/mlx5_vnet.c | 62 ++++++++++++++++++++++++++------------- + drivers/virtio/virtio.c | 5 ++-- + include/linux/virtio_config.h | 6 ---- + 3 files changed, 43 insertions(+), 30 deletions(-) +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 +Merge made by the 'ort' strategy. +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 +Already up to date. +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/x86/kernel/ptrace.c +Auto-merging fs/io_uring.c +Auto-merging include/linux/posix-timers.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/signal.c +Auto-merging kernel/time/posix-cpu-timers.c +Auto-merging mm/memcontrol.c +Merge made by the 'ort' strategy. + include/linux/ipc_namespace.h | 37 ++++++++- + ipc/ipc_sysctl.c | 189 +++++++++++++++++++++++++++--------------- + ipc/mq_sysctl.c | 121 +++++++++++++++------------ + ipc/mqueue.c | 10 +-- + ipc/namespace.c | 10 +++ + 5 files changed, 235 insertions(+), 132 deletions(-) +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 +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (915593a7a663 rtc: check if __rtc_read_time was successful) +$ 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/interface.c | 7 +- + drivers/rtc/rtc-ds1307.c | 2 +- + drivers/rtc/rtc-ds1685.c | 16 +- + drivers/rtc/rtc-efi.c | 10 +- + drivers/rtc/rtc-gamecube.c | 1 + + drivers/rtc/rtc-hym8563.c | 34 +- + drivers/rtc/rtc-m41t80.c | 6 +- + drivers/rtc/rtc-mc146818-lib.c | 22 +- + 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/mc146818rtc.h | 2 + + include/linux/rtc.h | 2 - + include/linux/rtc/ds1685.h | 1 - + include/uapi/linux/rtc.h | 3 +- + 41 files changed, 1205 insertions(+), 243 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 +Already up to date. +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 (8a3d3ea66f0d selftests/seccomp: Add SKIP for failed unshare()) +$ 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 +Auto-merging tools/testing/selftests/kselftest_harness.h +Auto-merging tools/testing/selftests/seccomp/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/kselftest_harness.h | 59 +++++++++++++------- + tools/testing/selftests/seccomp/Makefile | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 78 ++++++++++++++++++++++++--- + 3 files changed, 113 insertions(+), 25 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 dac56fe244c8] 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 (3ed4bb77156d XArray: Update the LRU list in xas_split()) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + include/linux/xarray.h | 1 + + lib/test_xarray.c | 22 ++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 4 files changed, 36 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 +Already up to date. +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 +Already up to date. +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 44dd3672a5d7] 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 (1754abb3e758 random: mix build-time latent entropy into pool at init) +$ 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 | 22 +++++++++++++++++----- + drivers/virt/vmgenid.c | 1 + + 4 files changed, 26 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 73260bb3724b] 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 (84053cc7ef2f ftrace: move sysctl_ftrace_enabled to ftrace.c) +$ 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 kernel/sysctl.c +Merge made by the 'ort' strategy. + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/ftrace.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 | 63 +++++++++- + kernel/sched/sched.h | 7 ++ + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 265 +------------------------------------------ + kernel/trace/ftrace.c | 22 +++- + mm/oom_kill.c | 38 ++++++- + mm/page-writeback.c | 103 +++++++++++++++-- + 27 files changed, 515 insertions(+), 397 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 73260bb3724b Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +Merging next-20220329 version of sysctl +$ git merge -m next-20220329/sysctl fc12aa67daba87a5ac43a9d3ae80be2e666e2ef9 +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 -v -a +[master 92f9f73bbecd] next-20220329/sysctl +$ 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 (ae86f150c907 btrfs: Remove a use of PAGE_SIZE in btrfs_invalidate_folio()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging fs/btrfs/inode.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/ext4/inode.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 6 +-- + Documentation/filesystems/locking.rst | 6 --- + Documentation/filesystems/vfs.rst | 11 ---- + fs/btrfs/inode.c | 2 +- + fs/btrfs/reflink.c | 4 +- + fs/buffer.c | 3 +- + fs/ceph/file.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/cifs/inode.c | 2 +- + fs/crypto/crypto.c | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/readpage.c | 2 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 6 +-- + fs/f2fs/file.c | 2 +- + fs/f2fs/node.c | 4 +- + fs/fuse/fuse_i.h | 2 +- + fs/iomap/buffered-io.c | 9 ++-- + fs/nfs/file.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/verity/verify.c | 4 +- + include/linux/fs.h | 31 +----------- + include/linux/fsverity.h | 2 +- + include/linux/net.h | 19 +++++++ + include/linux/pagemap.h | 2 - + mm/filemap.c | 12 +++-- + mm/readahead.c | 91 +--------------------------------- + 28 files changed, 60 insertions(+), 176 deletions(-) +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 (f4fe9fc39c71 Merge branch 'for-next/hardening' 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 +Merge made by the 'ort' strategy. + arch/x86/include/asm/highmem.h | 1 + + include/linux/highmem-internal.h | 10 +++++ + include/uapi/linux/stddef.h | 4 ++ + mm/usercopy.c | 97 +++++++++++----------------------------- + security/Kconfig | 13 +----- + 5 files changed, 43 insertions(+), 82 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 (1042bbddcb23 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging fs/buffer.c +Auto-merging ipc/mqueue.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/page_alloc.c +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 62c5cc5e0b06] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 5 + + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/sysctl/vm.rst | 9 ++ + Documentation/vm/balance.rst | 2 +- + Documentation/vm/page_owner.rst | 1 - + arch/Kconfig | 6 + + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/assembler.h | 12 ++ + arch/arm64/include/asm/scs.h | 13 +- + arch/arm64/kernel/entry.S | 28 +++- + arch/arm64/kernel/irq.c | 5 +- + arch/arm64/kernel/sdei.c | 5 +- + arch/arm64/kernel/stacktrace.c | 85 ++++++++++++ + arch/ia64/kernel/kprobes.c | 64 ++++----- + arch/ia64/kernel/palinfo.c | 2 +- + arch/ia64/kernel/ptrace.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/mm/tlb.c | 4 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + fs/buffer.c | 56 +++++++- + fs/fat/inode.c | 6 +- + fs/namei.c | 8 +- + fs/nilfs2/btnode.c | 23 +++- + fs/nilfs2/btnode.h | 1 + + fs/nilfs2/btree.c | 27 ++-- + fs/nilfs2/dat.c | 4 +- + fs/nilfs2/gcinode.c | 7 +- + fs/nilfs2/inode.c | 159 +++++++++++++++++++++-- + fs/nilfs2/mdt.c | 43 +++++-- + fs/nilfs2/mdt.h | 6 +- + fs/nilfs2/nilfs.h | 16 +-- + fs/nilfs2/page.c | 16 +-- + fs/nilfs2/page.h | 1 - + fs/nilfs2/segment.c | 9 +- + fs/nilfs2/super.c | 5 +- + fs/ocfs2/dlm/dlmdebug.c | 12 +- + fs/ocfs2/dlm/dlmunlock.c | 21 ++- + fs/ocfs2/namei.c | 49 +++---- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/quota_global.c | 23 ++-- + fs/ocfs2/quota_local.c | 12 +- + fs/ocfs2/refcounttree.c | 15 ++- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/pipe.c | 2 +- + fs/proc/base.c | 22 ++++ + fs/proc/fd.c | 23 +++- + fs/proc/generic.c | 3 + + fs/proc/page.c | 40 +++--- + fs/proc/proc_net.c | 3 + + include/linux/gfp.h | 16 +-- + include/linux/list.h | 6 +- + include/linux/memcontrol.h | 5 + + include/linux/memory_hotplug.h | 2 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 34 +++-- + include/linux/mm_types.h | 16 ++- + include/linux/pipe_fs_i.h | 2 +- + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 ++ + include/linux/shmem_fs.h | 2 +- + include/linux/stacktrace.h | 15 +++ + include/trace/events/mmflags.h | 1 - + init/main.c | 25 ++-- + ipc/mqueue.c | 14 ++ + kernel/hung_task.c | 46 ++++++- + kernel/pid_namespace.c | 2 +- + kernel/stacktrace.c | 21 +++ + kernel/watchdog.c | 4 +- + lib/Kconfig.debug | 27 +--- + lib/lz4/lz4_decompress.c | 8 +- + lib/string.c | 25 +--- + lib/test_meminit.c | 12 +- + lib/test_printf.c | 8 +- + lib/test_string.c | 33 +++++ + mm/compaction.c | 12 +- + mm/damon/vaddr-test.h | 8 +- + mm/gup.c | 10 +- + mm/hugetlb.c | 17 ++- + mm/internal.h | 8 +- + mm/kasan/common.c | 9 +- + mm/kfence/core.c | 11 +- + mm/kfence/kfence.h | 3 + + mm/khugepaged.c | 8 ++ + mm/kmemleak.c | 9 +- + mm/ksm.c | 8 ++ + mm/madvise.c | 9 +- + mm/memcontrol.c | 18 ++- + mm/memory-failure.c | 4 +- + mm/memory.c | 12 +- + mm/memory_hotplug.c | 93 +++++++------- + mm/memremap.c | 20 +++ + mm/migrate.c | 109 +++++++--------- + mm/mlock.c | 46 +++++-- + mm/mmap.c | 4 +- + mm/mmu_gather.c | 16 ++- + mm/mremap.c | 10 +- + mm/page_alloc.c | 89 +++++-------- + mm/page_io.c | 54 -------- + mm/rmap.c | 18 +-- + mm/secretmem.c | 17 +++ + mm/shmem.c | 9 +- + mm/swap.c | 8 +- + mm/userfaultfd.c | 15 ++- + mm/vmscan.c | 8 +- + mm/vmstat.c | 2 - + mm/workingset.c | 2 +- + mm/z3fold.c | 64 +++------ + scripts/get_maintainer.pl | 1 + + tools/include/linux/gfp.h | 3 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/migration.c | 193 ++++++++++++++++++++++++++++ + tools/vm/page_owner_sort.c | 6 +- + 117 files changed, 1465 insertions(+), 718 deletions(-) + create mode 100644 tools/testing/selftests/vm/migration.c +$ 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/3)
Rebasing (2/3)
Rebasing (3/3)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f3f78b12b660...adefb3650cfb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (adefb3650cfb kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + mm/oom_kill.c | 58 ++++---- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/soft-dirty.c | 238 ++++++++++++++++++++++++++++++++ + 5 files changed, 272 insertions(+), 30 deletions(-) + create mode 100644 tools/testing/selftests/vm/soft-dirty.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..82349d1e46d6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220401 |