diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-03-26 19:28:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-03-26 19:28:53 +1100 |
| commit | 931294922e65a23e1aad6398b9ae02df74044679 (patch) | |
| tree | dcaba4f6c82a99bdcc95286fd60bd6d7a0c7b881 | |
| parent | 8576ad623376e05491f4ecebafc6dc71fa1e3f6d (diff) | |
| download | linux-next-next-20210326.tar.gz | |
Add linux-next specific files for 20210326next-20210326
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 336 | ||||
| -rw-r--r-- | Next/Trees | 338 | ||||
| -rw-r--r-- | Next/merge.log | 9817 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 10492 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..99b5c98211ac --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,336 @@ +Name SHA1 +---- ---- +origin 002322402dafd846c424ffa9240a937f49b48c42 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current bcbcf50f521843445c9ea320a0569874f88c4b7a +arc-current 83520d62cc5a94d2ff0e2d37c8204fca13dd2637 +arm-current 30e3b4f256b4e366a61658c294f6a21b8626dda7 +arm64-fixes 20109a859a9b514eb10c22b8a14b5704ffe93897 +arm-soc-fixes 67335b8d28cd2ee279d6ab3c72856b76411ba48a +drivers-memory-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +m68k-current a65a802aadba072ca7514fc0c301fd7fdc6fc6cb +powerpc-fixes 274cb1ca2e7ce02cab56f5f4c61a74aeb566f931 +s390-fixes 5b43bd184530af6b868d8273b0a743a138d37ee8 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 002322402dafd846c424ffa9240a937f49b48c42 +bpf 002322402dafd846c424ffa9240a937f49b48c42 +ipsec b1e3a5607034aa0a481c6f69a6893049406665fb +netfilter 6ab4c3117aec4e08007d9e971fa4133e1de1082d +ipvs b58f33d49e426dc66e98ed73afb5d97b15a25f2d +wireless-drivers bd83a2fc05ed323d7ae38443a6d2e253ef1c4237 +mac80211 6f235a69e59484e382dc31952025b0308efedc17 +rdma-fixes 3408be145a5d6418ff955fe5badde652be90e700 +sound-current e54f30befa7990b897189b44a56c1138c6bfdbb5 +sound-asoc-fixes 983b899a1f62afc654c19d13837d475b8045dd2f +regmap-fixes f29fd6d5a08d1df80883e67e88caace134df09fe +regulator-fixes 1676953644ed50ca8646f24c884cfbd2691a815a +spi-fixes b4ee593e233114de4c0a4465c7ad6a180f7fa95b +pci-current cf673bd0cc973b25961d41355990beaed710068f +driver-core.current f0acf637d60ffcef3ccb6e279f743e587b3c7359 +tty.current 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +usb.current 0bd860493f81eb2a46173f6f5e44cc38331c8dbd +usb-gadget-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +usb-serial-fixes 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +usb-chipidea-fixes 67a788c7c3e7b850a1dc196d7ae35562dc53a87f +phy da848f9a0e139bd0ad21afbdd425214d9f3d3b91 +staging.current e78836ae76d20f38eed8c8c67f21db97529949da +char-misc.current 01faae5193d6190b7b3aa93dae43f514e866d652 +soundwire-fixes fde5d7f27108a444aa288ab9dfaa0a0c25e80b6d +thunderbolt-fixes 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +input-current 69d5ff3e9e51e23d5d81bf48480aa5671be67a71 +crypto-current 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes 60c988bc154108bd522a21289e389143006a1ff0 +kselftest-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 868833fbffbe51c487df4f95d4de9194264a4b30 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 2fb164f0ce95e504e2688b4f984893c29ebd19ab +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 0e37b4fa67f55ff4282caebd042a4bfa7348f2a4 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 3f6c515d723480bc8afd456b0a52438fe79128a8 +at91-fixes 2c69c8a1736eace8de491d480e6e577a27c2087c +omap-fixes a3efe3f6d0eb64363f74af4b0e8ba6d19415cef2 +kvm-fixes 9ce3746d64132a561bceab6421715e7c04e85074 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +nvdimm-fixes 7018c897c2f243d4b5f1b94bc6b4831a7eab80fb +btrfs-fixes 3b7ec4d1b5cbc9ac08b540b403d7c363b3a65a61 +vfs-fixes 595a48eb7b48e601bbbbff9f4a6cc4569d0d9496 +dma-mapping-fixes d17405d52bacd14fe7fdbb10c0434934ea496914 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes d1635448f1105e549b4041aab930dbc6945fc635 +samsung-krzk-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +pinctrl-samsung-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree-fixes 8242ff9ea9f0dc0fde5f61faca538d1bf00f5f82 +scsi-fixes 36fa766faa0c822c860e636fe82b1affcd022974 +drm-fixes d27ce83fa4baa5cb908a42e9878564cad6ea0eb3 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 8840e3bd981f128846b01c12d3966d115e8617c9 +mmc-fixes f06391c45e83f9a731045deb23df7cc3814fd795 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes 37df9f3fedb6aeaff5564145e8162aab912c9284 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes a5406a7ff56e63376c210b06072aa0ef23473366 +pidfd-fixes 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047 +spdx 88fe49249c99de14e543c632a46248d85411ab9e +gpio-brgl-fixes 6cb59afe9e5b45a035bd6b97da6593743feefc72 +gpio-intel-fixes b41ba2ec54a70908067034f139aa23d0dd2985ce +pinctrl-intel-fixes 39c1f1bd8adf29840ef52225ce95f390e3d7b2cf +erofs-fixes 9f377622a484de0818c49ee01e0ab4eedf6acd81 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 7fd53f41f771d250eb08db08650940f017e37c26 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +drm-misc-fixes 50891bead80bc79871528c2962d65c781c02330b +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 884a7fa1b090ccab785f9fa2a9168238d473d801 +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping 84fcfbdadbfdd86c9a43a52703203e05fe7efd92 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm 0ae6d1f52670c2cfc4002377395f1ad4461d1654 +arm64 c2202f76bb6454bd762e95e08adc6036d3812403 +arm-perf 9b86b1b41e0f48b5b25918e07aeceb00e13d1ce2 +arm-soc a57e29abb79dc8eca18261fc84f07013c90a6378 +actions 006828d706fda3c729ccc32e3e6ecda6dd05b299 +amlogic cf4b8849e4c20a77a5433441a08d02e75d2a35d2 +aspeed 697dabd5d3700e23d8cbd86e4cb8a49744766b48 +at91 b95bbae19954b1cfaa2fb92f91b02f956ab3b197 +drivers-memory 1ca59ca0afde17b75adc519858ccc30375cfad1d +imx-mxs 58b195fac435730b1324c27d3ea4b12335b2a490 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek e6468af3b590a8d3970cf17fce3f58ab8f465f22 +mvebu 8e03d45cb7de0258f357fbfb2c0e6c5fd9c1d364 +omap 159a17f5b3a906b6b09a0ce1c2915c6f86fb4ae9 +qcom c465fc2707c69409a4d277ac497521164622762d +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 32b5d4bd9e510c3aa9cc6ff8484f563260ea7104 +reset d4e4dffec50bb7ea20f9a72a273582efe23769cb +rockchip 3b6c3c12b77ca10e62910915c4067305591e5449 +samsung-krzk 151d4e8e6ccf4186d44ab8cea9aff209633b7a8f +scmi 17d69bed53b4c841e9cac7c218afe63ee7872ca5 +stm32 adc0496104b64b4e6a75627f8a03cd4dfd3e8bbc +sunxi 582cfdb9d206cd513048d79b272a22d48982ef1e +tegra 9e2409c6eacd7c453e25b1031bba200946280a65 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 7dd847523ed527cc8e90ca670675ea63d6239f64 +clk 9575aeae2cd1eb221b54d47835325ed1c14475ea +clk-imx d60fe8fa6c01c07467d1533b013635eb55cfb824 +clk-renesas dbb397ccc6bbb061da7346d2c5a0d080d5d58a7f +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky 74cdb26644775597974a3c6d56c7212f60a9fcb1 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k f2e7e4bf38fd95aa8c0fdb8b2ad4104a9fc96d64 +m68knommu 06c5fa9b2168fcf185ca6807982bb97b72c0cfdb +microblaze bbcee72c2f7ad889be7513d5e700165c3cb30e60 +mips 509d36a941a3466b78d4377913623d210b162458 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 8f722f67452f4b28cd8d7acf1658daa5796437c2 +parisc-hd 711d090f0e021c2fdffc247c43350ebc9be51953 +powerpc fbda7904302499dd7ffc073a3c84eb7c9275db0a +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v 06c7c914de26c5a4f1418fd54e4dfd0be4215de6 +s390 dc3b3e044f0a6f8da6096e9c3bb43018a1adbd7f +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ddad5187fc2a12cb84c9d1ac8ecb816708a2986b +xtensa d0deab8fca0e7210ad72de98057bc7167fd6743e +pidfd 8fac44cbbaa2c7501c1819aa358abdc3874089b6 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 42587ccf2ed511378e8f0ab52903d492981ba6a6 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c7f98650557ad6d64b6f32902b0f6d72cac951de +ceph 558b4510f622a3d96cf9d95050a04e7793d343c7 +cifs 4c7b707d72f5549d32ef84dd5ecf66a0d94b69b1 +cifsd 91208e87d5268eb9cd612cb2d37e7094f8157c15 +configfs 14fbbc8297728e880070f7b077b3301a8c698ef9 +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs f3382f3159d7a1b7228f844940fe8534f9beab98 +exfat f9b23f1f6ca05790a50ee965223a5cfafec24980 +ext3 4a140c918e21f38c5f69bc25c356ddf3456539aa +ext4 64395d950bc476106b39341e42ebfd4d2eb71d2c +f2fs ca269bfadb10bca5a432ef05040bd68bb2239c1e +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +jfs b462cecfa32315cd5acbbaa0968a7deabb4e29af +nfs 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel 29a4e914914ab8fc803dac056e4958a4229f7ca0 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs 42119dbe571eb419dae99b81dd20fa42f47464e1 +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs 8723d5ba8bdae1c41be7a6fc8469dc9aa551e7d0 +zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 +iomap 5808fecc572391867fcd929662b29c12e6d08d81 +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks b8da9b10e26cee58eba7b0fd72717127edfb316b +vfs f85ebc25fa88c8648e860a725e730a86ee095691 +printk de9a2d6a2625113cf2164450de4bd6a3b848ed88 +pci 55bddc9ae5fb2b0c4083b449ab2ba8b9f3d862bd +pstore 7db688e99c0f770ae73e0f1f3fb67f9b64266445 +hid 30541b02f591f7bd5a2d9715d76e7c85adf38641 +i2c 2acaad748aa806fc24936d4c7edeebe64e9280af +i3c e43d5c7c3c3459b428431754672052503c5db9c8 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 644b9af5c605762feffac96bd7ea2499e0197656 +jc_docs 8d295fbad687a61eaa0cf14958c284a3ddbf2173 +v4l-dvb 97b34809ec240d82c82af97626c2071a4062e0e6 +v4l-dvb-next 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 972d86381b186fde03c69fb4cc0ca70f5255baa7 +cpufreq-arm c3135d28a1e099bcc12c2c2a2a154275f49ce86b +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq cc0a62bc97314dcee8abd4fc2759e665686717ad +opp a8bb0e872bfb962de4653ce8f8723c0e1f712ce3 +thermal 6e3e14c9385c3cfb35f9da4f495acdd21f9bc25b +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 9d232469bcd772dbedb9e75a165c681b920524ee +swiotlb 2cbc2776efe4faed0e17c48ae076aa03a0fcc61f +rdma 783cf673b05ebf290317f583ee7eb6967ed9c964 +net-next 6c996e19949b34d7edebed4f6b0511145c036404 +bpf-next a46410d5e4975d701d526397156fa0815747dc2f +ipsec-next f076835a8bf2aa6ea48f718e4506587c815ab99f +mlx5-next 26bf30902c10473ba38f220d3401a61c56d8db3b +netfilter-next 0ce7cf4127f14078ca598ba9700d813178a59409 +ipvs-next d4a96be65423296e42091b0b79973b8d446e7798 +wireless-drivers-next 13ce240a932fe9c809ec6e79ffc5a4d4ecf534ee +bluetooth 0f90d320b4f191ad15604495e06a1636027c96ad +mac80211-next 4b837ad53be2ab100dfaa99dc73a9443a8a2392d +gfs2 b67e76f22acf0f4959ea0bea4114a9bfcb242d23 +mtd 3ba6d1ff041f07cfbbe1fdf0f25094590d7e543e +nand 55fbb9ba4f06cb6aff32daca1e1910173c13ec51 +spi-nor 79321e752aff36569fb2b5b121f6e1dca9fc5f74 +crypto befb1ddaece17e346550b6f2bb494ba58d67af43 +drm 06debd6e1b28029e6e77c41e59a162868f377897 +drm-misc ce517f18944e3f8d08484cfdee425277fc2c4df6 +amdgpu d41c3b15e910e65140f5b64d9903270a798d5895 +drm-intel 93fe86281259cffe99e84aa945d71497cb7a727f +drm-tegra 09f5220aa69977acda86a8a3d050b919df7505f1 +drm-msm 627dc55c273dab308303a5217bd3e767d7083ddb +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap 5af7bd5b148ab83ad41d4eba0b62c958ab45052b +sound e839fbed26e8b8713803b8ac73da92fd2b0c7594 +sound-asoc 3cac585bcd41c577486545aa89603ab5d19db45f +modules 1e80d9cb579ed7edd121753eeccce82ff82521b4 +input bfcf3d48dd02e95808a4693f2a49163f40fa5e74 +block e69563db16fc008a93df71f67a6d96f9c0a2dc9d +device-mapper 625e61dbd65dd8a9b9094b8f9972283dd5d9c02b +pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4 +mmc b7b2feb44c61ed9d9017a941dde32b0b655edea3 +mfd 105cbb01200ce9694d1179396465ea2873de03a5 +backlight 225be60f3853572f682b7ad3d0c1d4008edb6c6b +battery 3aeaf509380990271f8b0e7babfa978a3f43f67c +regulator 1baf2b66e886337c99a1cea7b20b9cc74d9e1556 +security 215042ece9807690490b454af09a7edd35dfdd93 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 92063f3ca73aab794bd5408d3361fd5b5ea33079 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 1fb057dcde11b355fc9acde95cee3b2caa5dafb0 +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +tpmdd 8b12a62a4e3ed4ae99c715034f557eb391d6b196 +watchdog 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +iommu 7851dfc68810c7e78c6c25993279ba0a7db2167c +audit d4ceb1d6e732b11d7226ff6d51adf2418bb1f60f +devicetree 592485bcb56750333f13dc671c4ad69319c80bfa +mailbox 6b50df2b8c208a04d44b8df5b7baaf668ceb8fc3 +spi 811ba6ea42f6662dc8b253827a1ea4b774800e0e +tip 4f469efcd03fe6ab88749f53252044c3f4491efb +clockevents 323397ef4d0005a01fee2834f88ff17e86500618 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip 5fbecd2389f48e1415799c63130d0cdce1cf3f60 +ftrace 9a6944fee68e25084130386c608c5ac8db487581 +rcu 1a0dfc099c1e61e22045705265a1323ac294bea6 +kvm 4a98623d5d90175c0f99d185171e60807391e487 +kvm-arm 40acb795bffdebbaeca16b71a3e3d5b1df1a3cee +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 c3171e94cc1cdcc3229565244112e869f052b8d9 +xen-tip af44a387e743ab7aa39d3fb5e29c0a973cf91bdc +percpu df1c002198a80b89b8b18ccf219456d95483d4a1 +workqueues a7347aa8e0610b0858803a5afaa5bc6b8e78820b +drivers-x86 36974daf53888e5eac986517b5ffac5bdd47b74d +chrome-platform a38fd8748464831584a19438cbb3082b5a2dab15 +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds 34a6ae672645a89f760960a11ce80125cc4d361f +ipmi c053c4eb5a0f010fcd301cf764b59cb783b4979b +driver-core a7d30f3f41cf40aad1c4557fa180fe320d5b7c74 +usb 049d3db625a652e23488db88b6104de4d5b62f16 +usb-gadget a38fd8748464831584a19438cbb3082b5a2dab15 +usb-serial 764de1059b97ca1fe8fe023bb10e736772945c87 +usb-chipidea-next c8ad0f64b7e025ea56953d70b5376de4c1e72717 +tty 22fce66c19caab5a86b085d147a0e77aaf0ca638 +char-misc 95e04eb04c68b8a9f71ff09abea1ed617a67a0a2 +extcon cf947ad92675c3e56f19d0c9e36c4dcc7d504c29 +phy-next 0d811cda22abeeeb8d3412ac17b687764f4b4c9f +soundwire e6cb15b500658ef5e39c1e9170d7e521904752b7 +thunderbolt 2e7a5b3e22368b65583d1b717e267de0a5906c32 +vfio 4d83de6da265cd84e74c19d876055fa5f261cde4 +staging d010995736cb581de55e99268d66937085b45ea0 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 57bfc3abd8e5842c3cab87b9cc7c255edff317b4 +dmaengine 84b0aa2e0d91d7974c6cfcb3a1ce230e7366293e +cgroup 00bfa16052cd66855de9bee66d7a5468f4fdc850 +scsi 213ce3262edab73eca91dfc147cb8f1a3fa655a2 +scsi-mkp c2255ece2be2454dff0b549e2ceb234bfe798181 +vhost 723c7003c1ab435f7e8320790b2a52c466ab6a48 +rpmsg 2c2564b9d64df9386849c343a712fe3c8e9b9e93 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl deecc4d162c82e404b69dbdc902c74d87794536e +gpio-intel 12484a4ecc927fb1e3c5536bb29fc464cf99a503 +pinctrl b9fd814e2c5d51e62ce099b8a23f68b1f6968255 +pinctrl-intel 5b613df3f499e305f3aecd58090a71ec0d92930d +pinctrl-renesas 61232cd6efca6e4d2705993850d014343ba604c4 +pinctrl-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +pwm 9666cec380d60808eb86d3be4caf84faeebe3081 +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest a38fd8748464831584a19438cbb3082b5a2dab15 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 81840f21d4164e0db5162ccc736c65b369883cc9 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 8d69f62fddf6c1a8c7745120c4d6aab9322b001a +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp 15a2fd51384a2ae7e2fa677f3e01dd971b1e05f7 +kspp 414eece95b98b209cef0f49cfcac108fd00b8ced +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 5350a8500263f607b0624397d487ddc0820f3a35 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv 6dc2a774cb4fdb524b7eb0b8db74198a1b4815ea +auxdisplay 701454bce906241ba7f50e2773881560d6404d29 +kgdb 2bbd9b0f2b4ec0afa80b52b1a68bd3bc80618275 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga 9a8d3cda8daf54b1f8e67ccb360876379b7e7895 +kunit a38fd8748464831584a19438cbb3082b5a2dab15 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi a38fd8748464831584a19438cbb3082b5a2dab15 +kunit-next 2f9f21cdcd71d0c523676f551ea5c4f78d8e6f61 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 9e40641f62cd812b21f2c73b5cfb3346eb466dea +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup 4c23541929b7ab080f87d91c2f7ed5b1d3f41364 +rust 98898dfbdf722e64b6c092d16d217b8e88a01347 +akpm-current f466a65c17d801af66217d112d1dacdfea8fdd18 +akpm 70a8df67d31fa991041d6b33b90b0f8f32de1c84 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b02567d6e7bb --- /dev/null +++ b/Next/Trees @@ -0,0 +1,338 @@ +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 +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-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.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/jeyu/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 +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.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/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git 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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/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 +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-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 +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-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.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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 +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#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 +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +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 +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/jeyu/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 +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#auto-latest +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 +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-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 +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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-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/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +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 +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.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 +iomem-mmap-vs-gup git git://anongit.freedesktop.org/drm/drm#topic/iomem-mmap-vs-gup +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +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..3d49f27d1c85 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9817 @@ +$ date -R +Fri, 26 Mar 2021 08:40:30 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 87% (5564/6340)
Updating files: 88% (5580/6340)
Updating files: 89% (5643/6340)
Updating files: 90% (5706/6340)
Updating files: 91% (5770/6340)
Updating files: 92% (5833/6340)
Updating files: 93% (5897/6340)
Updating files: 94% (5960/6340)
Updating files: 95% (6023/6340)
Updating files: 96% (6087/6340)
Updating files: 97% (6150/6340)
Updating files: 98% (6214/6340)
Updating files: 99% (6277/6340)
Updating files: 100% (6340/6340)
Updating files: 100% (6340/6340), done. +HEAD is now at 4ee998b0ef8b Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux +Merging origin/master (002322402daf Merge branch 'akpm' (patches from Andrew)) +$ git merge origin/master +Updating 4ee998b0ef8b..002322402daf +Fast-forward + .mailmap | 3 + + Documentation/arm64/acpi_object_usage.rst | 10 +- + Documentation/arm64/silicon-errata.rst | 3 + + .../device_drivers/ethernet/amazon/ena.rst | 2 +- + Documentation/networking/devlink/devlink-dpipe.rst | 2 +- + Documentation/networking/devlink/devlink-port.rst | 4 +- + Documentation/networking/xfrm_device.rst | 2 +- + MAINTAINERS | 15 +- + arch/arm64/Kconfig | 10 + + arch/arm64/include/asm/checksum.h | 2 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/processor.h | 2 + + arch/arm64/include/asm/thread_info.h | 2 + + arch/arm64/kernel/cpu_errata.c | 8 + + arch/arm64/kernel/cpufeature.c | 5 +- + arch/arm64/kernel/cpuinfo.c | 2 +- + arch/arm64/kernel/crash_dump.c | 2 + + arch/arm64/kernel/process.c | 2 + + arch/arm64/kernel/stacktrace.c | 9 +- + arch/arm64/mm/mmu.c | 21 +- + arch/ia64/kernel/err_inject.c | 22 +-- + arch/ia64/kernel/mca.c | 2 +- + arch/x86/net/bpf_jit_comp.c | 31 ++- + drivers/infiniband/hw/cxgb4/cm.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 +- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/qp.c | 18 +- + drivers/isdn/capi/kcapi.c | 4 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- + drivers/mfd/intel_quark_i2c_gpio.c | 6 +- + drivers/net/arcnet/com20020-pci.c | 34 ++-- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/c_can/c_can.c | 24 +-- + drivers/net/can/c_can/c_can_pci.c | 3 +- + drivers/net/can/c_can/c_can_platform.c | 6 +- + drivers/net/can/dev/netlink.c | 1 + + drivers/net/can/flexcan.c | 8 +- + drivers/net/can/kvaser_pciefd.c | 4 + + drivers/net/can/m_can/m_can.c | 5 +- + drivers/net/can/usb/Kconfig | 1 + + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +- + drivers/net/dsa/b53/b53_common.c | 14 +- + drivers/net/dsa/bcm_sf2.c | 11 +- + drivers/net/dsa/mt7530.c | 52 +++-- + drivers/net/ethernet/broadcom/Kconfig | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 1 + + drivers/net/ethernet/intel/e1000e/82571.c | 2 + + drivers/net/ethernet/intel/e1000e/hw.h | 6 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 13 ++ + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 -- + drivers/net/ethernet/intel/ice/ice_base.c | 24 ++- + drivers/net/ethernet/intel/ice/ice_txrx.c | 17 -- + drivers/net/ethernet/intel/ice/ice_xsk.c | 10 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 6 +- + drivers/net/ethernet/intel/igb/igb.h | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 33 ++-- + drivers/net/ethernet/intel/igb/igb_ptp.c | 31 ++- + drivers/net/ethernet/intel/igc/igc.h | 2 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 7 +- + drivers/net/ethernet/intel/igc/igc_main.c | 9 + + drivers/net/ethernet/intel/igc/igc_ptp.c | 72 ++++--- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +- + drivers/net/ethernet/marvell/Kconfig | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 2 - + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 18 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 57 ++++-- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 4 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 5 + + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 4 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 81 +++++--- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 57 ++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 1 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 1 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 10 +- + .../mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h | 2 +- + .../ethernet/mellanox/mlx5/core/sf/vhca_event.c | 23 ++- + .../ethernet/mellanox/mlx5/core/sf/vhca_event.h | 7 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 1 + + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 4 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 24 ++- + .../net/ethernet/netronome/nfp/flower/offload.c | 18 ++ + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 15 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 13 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 3 + + drivers/net/ethernet/realtek/r8169_main.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 37 ++-- + drivers/net/ipa/ipa_cmd.c | 50 +++-- + drivers/net/ipa/ipa_qmi.c | 2 + + drivers/net/phy/broadcom.c | 9 + + drivers/net/phy/phylink.c | 2 +- + drivers/net/usb/cdc-phonet.c | 2 + + drivers/net/usb/r8152.c | 5 +- + drivers/net/veth.c | 3 +- + drivers/net/wan/hdlc_x25.c | 42 +++- + drivers/ptp/ptp_qoriq.c | 13 +- + fs/squashfs/export.c | 8 +- + fs/squashfs/id.c | 6 +- + fs/squashfs/squashfs_fs.h | 1 + + fs/squashfs/xattr_id.c | 6 +- + include/linux/bpf.h | 33 +++- + include/linux/hugetlb_cgroup.h | 15 +- + include/linux/if_macvlan.h | 3 +- + include/linux/memblock.h | 4 +- + include/linux/mlx5/qp.h | 7 + + include/linux/mm.h | 18 +- + include/linux/mmu_notifier.h | 10 +- + include/linux/netdevice.h | 2 + + include/linux/netfilter/x_tables.h | 7 +- + include/linux/skbuff.h | 1 + + include/linux/usermode_driver.h | 1 + + include/net/dst.h | 11 ++ + include/net/inet_connection_sock.h | 2 +- + include/net/netfilter/nf_tables.h | 3 + + include/net/nexthop.h | 24 +++ + include/net/red.h | 12 +- + include/net/rtnetlink.h | 2 + + include/net/sock.h | 2 +- + include/uapi/linux/bpf.h | 16 +- + include/uapi/linux/psample.h | 5 +- + kernel/bpf/bpf_inode_storage.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 2 +- + kernel/bpf/core.c | 4 +- + kernel/bpf/preload/bpf_preload_kern.c | 19 +- + kernel/bpf/syscall.c | 5 + + kernel/bpf/trampoline.c | 218 ++++++++++++++++----- + kernel/bpf/verifier.c | 37 ++-- + kernel/gcov/clang.c | 69 +++++++ + kernel/trace/ftrace.c | 43 +++- + kernel/usermode_driver.c | 21 +- + lib/math/div64.c | 1 + + mm/highmem.c | 4 +- + mm/hugetlb.c | 41 +++- + mm/hugetlb_cgroup.c | 10 +- + mm/kfence/core.c | 9 + + mm/kmemleak.c | 3 +- + mm/mmu_notifier.c | 23 +++ + mm/z3fold.c | 16 +- + net/bridge/br_switchdev.c | 2 + + net/can/isotp.c | 18 +- + net/core/dev.c | 33 +++- + net/core/drop_monitor.c | 23 +++ + net/core/dst.c | 59 ++++-- + net/core/filter.c | 12 +- + net/core/flow_dissector.c | 2 +- + net/core/sock.c | 44 +++-- + net/dccp/ipv6.c | 5 + + net/dsa/dsa2.c | 11 +- + net/ipv4/inet_connection_sock.c | 7 +- + net/ipv4/ipconfig.c | 14 +- + net/ipv4/netfilter/arp_tables.c | 16 +- + net/ipv4/netfilter/ip_tables.c | 16 +- + net/ipv4/route.c | 45 +---- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv6/ip6_fib.c | 2 +- + net/ipv6/ip6_input.c | 10 - + net/ipv6/netfilter/ip6_tables.c | 16 +- + net/ipv6/route.c | 36 +--- + net/ipv6/tcp_ipv6.c | 5 + + net/mac80211/aead_api.c | 5 +- + net/mac80211/aes_gmac.c | 5 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/ibss.c | 2 + + net/mac80211/main.c | 13 +- + net/mac80211/mlme.c | 2 +- + net/mac80211/rc80211_minstrel_ht.c | 2 - + net/mac80211/util.c | 2 +- + net/mptcp/options.c | 24 ++- + net/mptcp/protocol.c | 4 +- + net/mptcp/subflow.c | 5 + + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netfilter/nf_conntrack_proto_gre.c | 3 - + net/netfilter/nf_flow_table_core.c | 2 +- + net/netfilter/nf_tables_api.c | 22 ++- + net/netfilter/x_tables.c | 49 +++-- + net/openvswitch/conntrack.c | 8 +- + net/openvswitch/conntrack.h | 6 +- + net/openvswitch/flow.c | 4 +- + net/qrtr/qrtr.c | 5 + + net/sched/act_ct.c | 6 +- + net/sched/cls_api.c | 1 + + net/sched/cls_flower.c | 2 +- + net/sched/sch_choke.c | 7 +- + net/sched/sch_gred.c | 2 +- + net/sched/sch_htb.c | 19 +- + net/sched/sch_red.c | 7 +- + net/sched/sch_sfq.c | 2 +- + net/sctp/output.c | 7 - + net/sctp/outqueue.c | 7 + + net/tipc/node.c | 11 +- + net/vmw_vsock/af_vsock.c | 1 + + net/wireless/nl80211.c | 12 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/libbpf.c | 3 +- + tools/lib/bpf/netlink.c | 2 +- + tools/testing/selftests/arm64/fp/sve-test.S | 22 ++- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 4 + + .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 82 ++++++++ + .../bpf/progs/btf_dump_test_case_syntax.c | 8 + + tools/testing/selftests/bpf/progs/fexit_sleep.c | 31 +++ + tools/testing/selftests/bpf/progs/test_check_mtu.c | 92 +++++++++ + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 6 +- + .../selftests/bpf/verifier/bounds_deduction.c | 27 ++- + tools/testing/selftests/bpf/verifier/map_ptr.c | 4 + + tools/testing/selftests/bpf/verifier/unpriv.c | 15 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 23 ++- + .../selftests/net/forwarding/vxlan_bridge_1d.sh | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 30 ++- + .../selftests/net/reuseaddr_ports_exhausted.c | 32 +-- + tools/testing/selftests/vm/Makefile | 4 +- + 230 files changed, 2144 insertions(+), 855 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/fexit_sleep.c + create mode 100644 tools/testing/selftests/bpf/progs/fexit_sleep.c +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (bcbcf50f5218 kbuild: fix ld-version.sh to not be affected by locale) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (83520d62cc5a ARC: treewide: avoid the pointer addition with NULL pointer) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/haps_hs.dts | 2 +- + arch/arc/kernel/signal.c | 4 ++-- + arch/arc/kernel/unwind.c | 27 ++++++++++++++------------- + 3 files changed, 17 insertions(+), 16 deletions(-) +Merging arm-current/fixes (30e3b4f256b4 ARM: footbridge: fix PCI interrupt mapping) +$ git merge arm-current/fixes +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 8 +++++++- + arch/arm/mach-footbridge/cats-pci.c | 4 ++-- + arch/arm/mach-footbridge/ebsa285-pci.c | 4 ++-- + arch/arm/mach-footbridge/netwinder-pci.c | 2 +- + arch/arm/mach-footbridge/personal-pci.c | 5 ++--- + arch/arm/mm/mmu.c | 3 +-- + arch/arm/mm/pmsa-v7.c | 4 +++- + arch/arm/mm/pmsa-v8.c | 4 +++- + 8 files changed, 21 insertions(+), 13 deletions(-) +Merging arm64-fixes/for-next/fixes (20109a859a9b arm64: kernel: disable CNP on Carmel) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (67335b8d28cd Merge tag 'imx-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 33 +++++----- + arch/arm/boot/dts/am33xx.dtsi | 3 + + arch/arm/boot/dts/at91-sam9x60ek.dts | 8 --- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 22 +++++-- + arch/arm/boot/dts/imx6ull-myir-mys-6ulx-eval.dts | 1 + + arch/arm/boot/dts/sam9x60.dtsi | 9 +++ + arch/arm/mach-imx/avic.c | 16 ++++- + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/mach-imx1.c | 11 ---- + arch/arm/mach-imx/mach-imx25.c | 12 ---- + arch/arm/mach-imx/mach-imx27.c | 12 ---- + arch/arm/mach-imx/mach-imx31.c | 1 - + arch/arm/mach-imx/mach-imx35.c | 1 - + arch/arm/mach-imx/mm-imx3.c | 24 ------- + arch/arm/mach-omap2/sr_device.c | 75 +++++++++++++++++----- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 + + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 2 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 2 +- + drivers/bus/omap_l3_noc.c | 4 +- + drivers/bus/ti-sysc.c | 4 +- + drivers/soc/ti/omap_prm.c | 8 ++- + 24 files changed, 136 insertions(+), 120 deletions(-) +Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W=1 compiler warnings) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (274cb1ca2e7c powerpc/pseries/mobility: handle premature return from H_JOIN) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/pseries/mobility.c | 48 ++++++++++++++++++++++++++++--- + 1 file changed, 44 insertions(+), 4 deletions(-) +Merging s390-fixes/fixes (5b43bd184530 s390/vdso: fix initializing and updating of vdso_data) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/vdso/data.h | 2 +- + arch/s390/kernel/time.c | 10 ++++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (002322402daf Merge branch 'akpm' (patches from Andrew)) +$ git merge net/master +Already up to date. +Merging bpf/master (002322402daf Merge branch 'akpm' (patches from Andrew)) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (b1e3a5607034 xfrm: Fix NULL pointer dereference on policy lookup) +$ git merge ipsec/master +Auto-merging net/ipv6/ip6_vti.c +CONFLICT (content): Merge conflict in net/ipv6/ip6_vti.c +Auto-merging net/ipv4/ip_vti.c +CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c +Resolved 'net/ipv4/ip_vti.c' using previous resolution. +Resolved 'net/ipv6/ip6_vti.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7cddb9c0921a] Merge remote-tracking branch 'ipsec/master' +$ git diff -M --stat --summary HEAD^.. + include/net/netns/xfrm.h | 4 +++- + include/net/xfrm.h | 4 ++-- + net/ipv4/ah4.c | 2 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/esp4_offload.c | 6 ++++-- + net/ipv4/ip_vti.c | 6 ++++-- + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/esp6_offload.c | 6 ++++-- + net/ipv6/ip6_vti.c | 6 ++++-- + net/xfrm/xfrm_interface.c | 3 +++ + net/xfrm/xfrm_output.c | 23 ++++++++++++++++++----- + net/xfrm/xfrm_state.c | 11 ++++++----- + 13 files changed, 52 insertions(+), 25 deletions(-) +Merging netfilter/master (6ab4c3117aec net: bridge: don't notify switchdev for local FDB addresses) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (b58f33d49e42 netfilter: ctnetlink: fix dump of the expect mask attribute) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (bd83a2fc05ed brcmfmac: p2p: Fix recently introduced deadlock issue) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 7 ++++--- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 4 ++-- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging mac80211/master (6f235a69e594 ch_ktls: fix enum-conversion warning) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (3408be145a5d RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (e54f30befa79 ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (983b899a1f62 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/max98373-i2c.c | 1 + + sound/soc/codecs/max98373-sdw.c | 1 + + sound/soc/codecs/max98373.c | 2 ++ + sound/soc/codecs/wm8960.c | 8 +++++++- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 ++++++------ + sound/soc/sof/core.c | 8 +++++++- + sound/soc/sof/intel/apl.c | 3 ++- + sound/soc/sof/intel/cnl.c | 19 ++----------------- + sound/soc/sof/intel/hda-dsp.c | 21 +++++++++++++++++---- + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/icl.c | 3 ++- + sound/soc/sof/intel/pci-tgl.c | 2 +- + sound/soc/sof/intel/tgl.c | 18 +++++++++++++++++- + 13 files changed, 66 insertions(+), 33 deletions(-) +Merging regmap-fixes/for-linus (f29fd6d5a08d Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 1 + + 1 file changed, 1 insertion(+) +Merging regulator-fixes/for-linus (1676953644ed Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/bd9571mwv-regulator.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (b4ee593e2331 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 1 + + drivers/spi/spi-ath79.c | 3 +-- + drivers/spi/spi-bcm63xx-hsspi.c | 7 ++++++- + drivers/spi/spi-bcm63xx.c | 6 +++++- + drivers/spi/spi-stm32.c | 3 ++- + drivers/spi/spi-ti-qspi.c | 20 ++++++++++++++------ + 6 files changed, 29 insertions(+), 11 deletions(-) +Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 vulnerability) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/pci/switch/switchtec.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging driver-core.current/driver-core-linus (f0acf637d60f driver core: clear deferred probe reason on probe retry) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging tty.current/tty-linus (1e28eed17697 Linux 5.12-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (0bd860493f81 USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 120 +++++++++++++++++++------------- + drivers/usb/core/quirks.c | 4 ++ + drivers/usb/dwc3/dwc3-pci.c | 2 + + drivers/usb/dwc3/dwc3-qcom.c | 3 + + drivers/usb/dwc3/gadget.c | 3 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 10 +-- + 6 files changed, 86 insertions(+), 56 deletions(-) +Merging usb-gadget-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (1e28eed17697 Linux 5.12-rc3) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (67a788c7c3e7 usb: cdnsp: Fixes issue with dequeuing requests after disabling endpoint) +$ git merge usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdnsp-gadget.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and premphasis swing table) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/ingenic/phy-ingenic-usb.c | 4 ++-- + drivers/phy/marvell/Kconfig | 4 ++-- + drivers/phy/qualcomm/phy-qcom-qmp.c | 23 +++++++++++++++++++++-- + drivers/phy/ralink/phy-mt7621-pci.c | 6 +++--- + drivers/phy/ti/phy-j721e-wiz.c | 1 + + 5 files changed, 29 insertions(+), 9 deletions(-) +Merging staging.current/staging-linus (e78836ae76d2 staging: rtl8192e: Change state information from u16 to u8) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging char-misc.current/char-misc-linus (01faae5193d6 drivers: video: fbcon: fix NULL dereference in fbcon_cursor()) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/extcon/extcon.c | 1 + + drivers/misc/mei/client.c | 17 +++++++---------- + drivers/video/fbdev/core/fbcon.c | 3 +++ + include/linux/extcon.h | 23 +++++++++++++++++++++++ + 5 files changed, 36 insertions(+), 11 deletions(-) +Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device found flag correctly) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 3 ++- + drivers/soundwire/cadence_master.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging thunderbolt-fixes/fixes (0d02ec6b3136 Linux 5.12-rc4) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (69d5ff3e9e51 Input: nspire-keypad - enable interrupts only when opened) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/n64joy.c | 4 +-- + drivers/input/keyboard/nspire-keypad.c | 56 +++++++++++++++++++--------------- + drivers/input/serio/i8042-x86ia64io.h | 1 + + drivers/input/touchscreen/s6sy761.c | 4 +-- + 4 files changed, 36 insertions(+), 29 deletions(-) +Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (60c988bc1541 vfio/type1: Empty batch for pfnmap pages) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/vfio_iommu_type1.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (868833fbffbe dmaengine: xilinx: dpdma: Fix race condition in done IRQ) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/xilinx/xilinx_dpdma.c | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY break condition and timeout) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/mtk_nand.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (0e37b4fa67f5 media: coda: fix macroblocks count control usage) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/coda/coda-common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (3f6c515d7234 MIPS: vmlinux.lds.S: Fix appended dtb not properly aligned) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (a3efe3f6d0eb ARM: OMAP2+: Fix warning for omap_init_time_of()) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap4.dtsi | 5 +++++ + arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 ------- + arch/arm/boot/dts/omap5.dtsi | 5 +++++ + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/omap-secure.c | 39 ++++++++++++++++++++++++++++++++++ + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/pmic-cpcap.c | 4 ++-- + 7 files changed, 53 insertions(+), 11 deletions(-) +Merging kvm-fixes/master (9ce3746d6413 documentation/kvm: additional explanations on KVM_SET_BOOT_CPU_ID) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (a38fd8748464 Linux 5.12-rc2) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (3b7ec4d1b5cb Merge branch 'misc-5.12' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (595a48eb7b48 hostfs: fix memory handling in follow_link()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/hostfs/hostfs_kern.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (d1635448f110 platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (8242ff9ea9f0 dt-bindings: display: mediatek,dpi: Convert to use graph schema) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/mediatek/mediatek,dpi.yaml | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) +Merging scsi-fixes/fixes (36fa766faa0c scsi: target: pscsi: Clean up after failure in pscsi_map_sg()) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Merge made by the 'recursive' strategy. + drivers/scsi/ibmvscsi/ibmvfc.c | 67 ++++++++++++++++++++++++++++++------- + drivers/scsi/mpt3sas/mpt3sas_base.c | 8 +++-- + drivers/scsi/qedi/qedi_main.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 13 +++---- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 --- + drivers/target/target_core_pscsi.c | 9 ++++- + 6 files changed, 74 insertions(+), 28 deletions(-) +Merging drm-fixes/drm-fixes (d27ce83fa4ba Merge tag 'du-fixes-20210316' of git://linuxtv.org/pinchartl/media into drm-fixes) +$ git merge drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 31 ++++++------------------------- + 1 file changed, 6 insertions(+), 25 deletions(-) +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (8840e3bd981f drm/i915: Fix the GT fence revocation runtime PM logic) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 7 ++ + .../gpu/drm/i915/display/intel_dp_link_training.c | 75 +++++++++++++++++----- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 10 +-- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 13 +++- + drivers/gpu/drm/i915/intel_runtime_pm.c | 29 +++++++-- + drivers/gpu/drm/i915/intel_runtime_pm.h | 5 ++ + 9 files changed, 113 insertions(+), 37 deletions(-) +Merging mmc-fixes/fixes (f06391c45e83 mmc: cqhci: Fix random crash when remove mmc module/card) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (37df9f3fedb6 video: hyperv_fb: Fix a double free in hvfb_probe) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/video/fbdev/hyperv_fb.c | 3 --- + 1 file changed, 3 deletions(-) +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (a5406a7ff56e riscv: Correct SPARSEMEM configuration) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (1e28eed17697 Linux 5.12-rc3) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + include/linux/firmware/intel/stratix10-svc-client.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spdx/spdx-linus (88fe49249c99 Merge tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (6cb59afe9e5b gpiolib: Assign fwnode to parent's if no primary one provided) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (39c1f1bd8adf pinctrl: intel: check REVID register value for device presence) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavior change) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (7fd53f41f771 kunit: tool: Disable PAGE_POISONING under --alltests) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) +$ git merge memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (0d02ec6b3136 Linux 5.12-rc4) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (50891bead80b drm/etnaviv: User FOLL_LONGTERM in userptr) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (884a7fa1b090 kbuild: replace sed with $(subst ) or $(patsubst )) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/devicetree/bindings/Makefile | 2 +- + Documentation/dontdiff | 1 + + Documentation/kbuild/Kconfig.recursion-issue-02 | 2 +- + Makefile | 43 +++++++++---- + lib/Kconfig.debug | 10 ++++ + scripts/Kbuild.include | 80 ------------------------- + scripts/Makefile.asm-generic | 4 +- + scripts/Makefile.build | 15 ++--- + scripts/Makefile.clean | 2 +- + scripts/Makefile.compiler | 75 +++++++++++++++++++++++ + scripts/Makefile.dtbinst | 2 +- + scripts/Makefile.headersinst | 2 +- + scripts/Makefile.lib | 16 ++--- + scripts/Makefile.modinst | 2 +- + scripts/Makefile.modpost | 4 +- + scripts/Makefile.modsign | 2 +- + scripts/link-vmlinux.sh | 12 ++++ + 18 files changed, 156 insertions(+), 119 deletions(-) + create mode 100644 scripts/Makefile.compiler +Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (84fcfbdadbfd dma-mapping: remove a pointless empty line in dma_alloc_coherent) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + Documentation/core-api/dma-api.rst | 88 ++++++++++++++++++++++ + drivers/iommu/dma-iommu.c | 103 ++++++++++++++++++-------- + drivers/media/usb/uvc/uvc_video.c | 94 ++++++++++++++++------- + drivers/media/usb/uvc/uvcvideo.h | 5 +- + include/linux/dma-map-ops.h | 19 +++++ + include/linux/dma-mapping.h | 35 ++++++++- + kernel/dma/mapping.c | 148 ++++++++++++++++++++++++++++++++++--- + 7 files changed, 423 insertions(+), 69 deletions(-) +Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge asm-generic/master +Already up to date! +Merge made by the 'recursive' strategy. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (0ae6d1f52670 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing arch/arm/tools/syscalltbl.sh +Removing arch/arm/tools/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 4 +- + arch/arm/include/asm/kexec.h | 3 - + arch/arm/include/asm/memory.h | 15 -- + arch/arm/include/uapi/asm/Kbuild | 1 - + arch/arm/include/uapi/asm/unistd.h | 1 - + arch/arm/kernel/entry-common.S | 8 +- + arch/arm/kernel/hw_breakpoint.c | 2 +- + arch/arm/kernel/machine_kexec.c | 8 - + arch/arm/kernel/suspend.c | 19 ++- + arch/arm/mm/cache-v7.S | 58 +++---- + arch/arm/mm/proc-v7.S | 39 +++-- + arch/arm/probes/kprobes/test-arm.c | 294 ++++++++++++++++++------------------ + arch/arm/probes/kprobes/test-core.h | 1 + + arch/arm/tools/Makefile | 26 ++-- + arch/arm/tools/syscallhdr.sh | 31 ---- + arch/arm/tools/syscalltbl.sh | 22 --- + 16 files changed, 229 insertions(+), 303 deletions(-) + delete mode 100644 arch/arm/tools/syscallhdr.sh + delete mode 100644 arch/arm/tools/syscalltbl.sh +Merging arm64/for-next/core (c2202f76bb64 Merge branches 'for-next/misc', 'for-next/kselftest', 'for-next/xntable', 'for-next/vdso' and 'for-next/fiq' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 2 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/arch_gicv3.h | 2 +- + arch/arm64/include/asm/arch_timer.h | 21 -- + arch/arm64/include/asm/assembler.h | 8 +- + arch/arm64/include/asm/barrier.h | 19 ++ + arch/arm64/include/asm/daifflags.h | 10 +- + arch/arm64/include/asm/irq.h | 4 + + arch/arm64/include/asm/irqflags.h | 16 +- + arch/arm64/include/asm/pgalloc.h | 19 +- + arch/arm64/include/asm/pgtable-hwdef.h | 15 ++ + arch/arm64/include/asm/vdso/gettimeofday.h | 6 +- + arch/arm64/kernel/entry.S | 114 +++++----- + arch/arm64/kernel/irq.c | 35 ++- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/smp.c | 1 + + arch/arm64/kernel/vdso.c | 22 +- + arch/arm64/mm/kasan_init.c | 4 +- + arch/arm64/mm/mmu.c | 41 +++- + include/linux/irq.h | 2 + + tools/testing/selftests/arm64/Makefile | 2 +- + tools/testing/selftests/arm64/bti/.gitignore | 2 + + tools/testing/selftests/arm64/bti/Makefile | 61 ++++++ + tools/testing/selftests/arm64/bti/assembler.h | 80 +++++++ + tools/testing/selftests/arm64/bti/btitest.h | 23 ++ + tools/testing/selftests/arm64/bti/compiler.h | 21 ++ + tools/testing/selftests/arm64/bti/gen/.gitignore | 2 + + tools/testing/selftests/arm64/bti/signal.c | 37 ++++ + tools/testing/selftests/arm64/bti/signal.h | 21 ++ + tools/testing/selftests/arm64/bti/start.S | 14 ++ + tools/testing/selftests/arm64/bti/syscall.S | 23 ++ + tools/testing/selftests/arm64/bti/system.c | 22 ++ + tools/testing/selftests/arm64/bti/system.h | 28 +++ + tools/testing/selftests/arm64/bti/test.c | 234 +++++++++++++++++++++ + tools/testing/selftests/arm64/bti/teststubs.S | 39 ++++ + tools/testing/selftests/arm64/bti/trampoline.S | 29 +++ + tools/testing/selftests/arm64/mte/Makefile | 15 +- + .../selftests/arm64/mte/check_ksm_options.c | 5 +- + tools/testing/selftests/arm64/mte/check_user_mem.c | 3 +- + .../testing/selftests/arm64/mte/mte_common_util.c | 39 ++-- + 40 files changed, 900 insertions(+), 144 deletions(-) + create mode 100644 tools/testing/selftests/arm64/bti/.gitignore + create mode 100644 tools/testing/selftests/arm64/bti/Makefile + create mode 100644 tools/testing/selftests/arm64/bti/assembler.h + create mode 100644 tools/testing/selftests/arm64/bti/btitest.h + create mode 100644 tools/testing/selftests/arm64/bti/compiler.h + create mode 100644 tools/testing/selftests/arm64/bti/gen/.gitignore + create mode 100644 tools/testing/selftests/arm64/bti/signal.c + create mode 100644 tools/testing/selftests/arm64/bti/signal.h + create mode 100644 tools/testing/selftests/arm64/bti/start.S + create mode 100644 tools/testing/selftests/arm64/bti/syscall.S + create mode 100644 tools/testing/selftests/arm64/bti/system.c + create mode 100644 tools/testing/selftests/arm64/bti/system.h + create mode 100644 tools/testing/selftests/arm64/bti/test.c + create mode 100644 tools/testing/selftests/arm64/bti/teststubs.S + create mode 100644 tools/testing/selftests/arm64/bti/trampoline.S +Merging arm-perf/for-next/perf (9b86b1b41e0f docs: perf: Add new description on HiSilicon uncore PMU v2) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/admin-guide/perf/hisi-pmu.rst | 49 +++ + drivers/perf/arm-cci.c | 12 +- + drivers/perf/arm-ccn.c | 31 +- + drivers/perf/arm-cmn.c | 22 +- + drivers/perf/arm_dmc620_pmu.c | 2 +- + drivers/perf/arm_dsu_pmu.c | 5 +- + drivers/perf/arm_smmuv3_pmu.c | 36 +- + drivers/perf/arm_spe_pmu.c | 3 +- + drivers/perf/fsl_imx8_ddr_perf.c | 7 +- + drivers/perf/hisilicon/Makefile | 3 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 348 +++++++++++------ + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 301 ++++++++++----- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 355 ++++++++++++----- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 500 ++++++++++++++++++++++++ + drivers/perf/hisilicon/hisi_uncore_pmu.c | 79 +++- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 20 +- + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 530 ++++++++++++++++++++++++++ + drivers/perf/qcom_l2_pmu.c | 2 +- + drivers/perf/qcom_l3_pmu.c | 4 +- + drivers/perf/thunderx2_pmu.c | 4 +- + drivers/perf/xgene_pmu.c | 4 +- + include/linux/cpuhotplug.h | 2 + + 22 files changed, 1927 insertions(+), 392 deletions(-) + create mode 100644 drivers/perf/hisilicon/hisi_uncore_pa_pmu.c + create mode 100644 drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c +Merging arm-soc/for-next (a57e29abb79d soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 36 ++++ + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 4 +- + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 55 +++--- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 159 ++++++++------- + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 32 +++ + .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 29 +++ + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 4 +- + arch/arm/boot/dts/r8a7742.dtsi | 4 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 4 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a77470.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 11 +- + arch/arm/boot/dts/r8a7790-stout.dts | 4 +- + arch/arm/boot/dts/r8a7790.dtsi | 4 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 11 +- + arch/arm/boot/dts/r8a7791-porter.dts | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 2 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 11 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 +- + arch/arm/boot/dts/r8a7794-silk.dts | 8 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/configs/shmobile_defconfig | 1 - + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 3 + + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 3 + + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 3 + + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 6 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 3 + + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 37 +--- + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 37 +--- + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 37 +--- + .../arm64/boot/dts/renesas/r8a77960-salvator-x.dts | 46 ----- + .../boot/dts/renesas/r8a77960-salvator-xs.dts | 46 ----- + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 46 ----- + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 11 ++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 26 ++- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 45 ----- + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 45 ----- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 9 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 + + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 15 ++ + .../boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi | 15 ++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 11 ++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 220 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 48 ++++- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +- + drivers/soc/renesas/rmobile-sysc.c | 4 +- + drivers/tee/optee/call.c | 4 + + drivers/tee/optee/optee_trace.h | 67 +++++++ + 60 files changed, 728 insertions(+), 509 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi + create mode 100644 drivers/tee/optee/optee_trace.h +Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) +$ git merge actions/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (cf4b8849e4c2 Merge branch 'v5.13/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++ + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 120 +++++++++++++++++++++ + 5 files changed, 134 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts +Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (b95bbae19954 Merge branch 'at91-fixes' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (1ca59ca0afde memory: tegra20: Add debug statistics) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/omap-gpmc.c | 7 +- + drivers/memory/tegra/mc.c | 9 + + drivers/memory/tegra/mc.h | 4 +- + drivers/memory/tegra/tegra124-emc.c | 4 +- + drivers/memory/tegra/tegra20.c | 326 ++++++++++++++++++++++++++++++++++++ + include/soc/tegra/mc.h | 7 + + 6 files changed, 351 insertions(+), 6 deletions(-) +Merging imx-mxs/for-next (58b195fac435 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 15 + + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 6 +- + .../devicetree/bindings/mailbox/fsl,mu.yaml | 5 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 16 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 + + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-plybas.dts | 6 +- + arch/arm/boot/dts/imx6q-b450v3.dts | 5 + + arch/arm/boot/dts/imx6q-b650v3.dts | 5 + + arch/arm/boot/dts/imx6q-b850v3.dts | 5 + + arch/arm/boot/dts/imx6q-ba16.dtsi | 21 + + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 7 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 +- + arch/arm/boot/dts/imx7d-mba7.dts | 2 - + arch/arm/boot/dts/ls1021a.dtsi | 3 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-imx/pm-imx5.c | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 24 + + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 64 +++ + arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 68 +++ + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 184 +++++++ + arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi | 18 + + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 202 +++++++ + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 311 +++++++++++ + .../dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts | 97 ++++ + .../dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts | 97 ++++ + .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 232 ++++++++ + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 314 ++++++++++- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 56 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 39 ++ + .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 611 +++++++++++++++++++++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 70 ++- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 24 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 144 +++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 21 + + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 51 ++ + arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi | 61 ++ + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 176 ++++++ + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 20 +- + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi | 37 ++ + arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi | 25 + + arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi | 61 ++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 423 +------------- + arch/arm64/configs/defconfig | 9 + + drivers/firmware/imx/scu-pd.c | 28 +- + drivers/soc/imx/soc-imx.c | 12 + + 75 files changed, 3252 insertions(+), 547 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-mek.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (e6468af3b590 Merge branch 'v5.11-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (8e03d45cb7de Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (159a17f5b3a9 Merge branch 'omap-for-v5.13/dt-v2' into for-next) +$ git merge omap/for-next +Removing arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_54xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-pocketbeagle.dts | 140 ++-- + arch/arm/boot/dts/am33xx-l4.dtsi | 28 +- + arch/arm/boot/dts/dra7-l4.dtsi | 75 ++- + arch/arm/boot/dts/dra7.dtsi | 220 +++++-- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 59 +- + arch/arm/boot/dts/omap3-echo.dts | 476 ++++++++++---- + arch/arm/boot/dts/omap4-l4.dtsi | 43 +- + arch/arm/boot/dts/omap4.dtsi | 169 +++-- + arch/arm/boot/dts/omap4460.dtsi | 13 +- + arch/arm/boot/dts/omap5-l4.dtsi | 67 +- + arch/arm/boot/dts/omap5.dtsi | 204 +++--- + arch/arm/configs/omap2plus_defconfig | 151 ++++- + arch/arm/mach-omap2/Kconfig | 3 - + arch/arm/mach-omap2/Makefile | 11 +- + arch/arm/mach-omap2/common.h | 9 - + arch/arm/mach-omap2/io.c | 12 +- + arch/arm/mach-omap2/omap_hwmod.c | 9 +- + arch/arm/mach-omap2/omap_hwmod.h | 14 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 877 ------------------------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 467 ------------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 719 -------------------- + arch/arm/mach-omap2/pdata-quirks.c | 31 +- + arch/arm/mach-omap2/pm-debug.c | 4 +- + arch/arm/mach-omap2/powerdomain.c | 12 +- + arch/arm/mach-omap2/sr_device.c | 7 + + drivers/bus/ti-sysc.c | 87 ++- + drivers/clk/ti/clk-54xx.c | 2 + + drivers/pci/controller/dwc/pci-dra7xx.c | 13 +- + drivers/soc/ti/omap_prm.c | 16 +- + include/dt-bindings/clock/omap5.h | 2 + + 30 files changed, 1285 insertions(+), 2655 deletions(-) + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_44xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_54xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Merging qcom/for-next (c465fc2707c6 Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13' and 'drivers-for-5.13' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 18 + + .../devicetree/bindings/firmware/qcom,scm.txt | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 + + arch/arm64/boot/dts/qcom/Makefile | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8350.dtsi | 25 + + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 25 + + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 25 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 18 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 154 +++++ + .../boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 15 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 240 +++++++ + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 + + .../qcom/sc7180-trogdor-lazor-limozeen-nots.dts | 26 + + .../dts/qcom/sc7180-trogdor-lazor-limozeen.dts | 42 ++ + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 5 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 10 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 39 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 26 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 44 ++ + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 288 ++++++++ + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 35 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 162 ++--- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 51 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 47 ++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 608 +++++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 139 +++- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 4 - + arch/arm64/boot/dts/qcom/sm8250.dtsi | 548 ++++++++-------- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 319 +++++++++ + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 116 ++++ + arch/arm64/boot/dts/qcom/sm8350.dtsi | 726 ++++++++++++++++++++- + arch/arm64/configs/defconfig | 2 + + drivers/bus/qcom-ebi2.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 19 + + drivers/soc/qcom/qcom-geni-se.c | 3 + + drivers/soc/qcom/qcom_aoss.c | 1 + + drivers/soc/qcom/qmi_encdec.c | 8 +- + drivers/soc/qcom/rpmh-rsc.c | 65 +- + drivers/soc/qcom/rpmhpd.c | 56 ++ + drivers/soc/qcom/smem.c | 2 +- + include/dt-bindings/power/qcom-rpmpd.h | 26 + + 59 files changed, 3695 insertions(+), 502 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/pm8350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8350b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8350c.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735a.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-hdk.dts +Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) +$ git merge raspberrypi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (32b5d4bd9e51 Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7791-koelsch.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 314 ++++++++++++++++++++- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 47 +-- + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 39 ++- + 4 files changed, 358 insertions(+), 50 deletions(-) +Merging reset/reset/next (d4e4dffec50b reset: oxnas: replace file name with short description) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging rockchip/for-next (3b6c3c12b77c Merge branch 'v5.13-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 1 + + .../bindings/clock/rockchip,rk3568-cru.yaml | 60 + + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rv1108.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 24 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 21 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 133 ++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 40 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 51 - + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 13 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + drivers/clk/rockchip/Kconfig | 29 +- + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 53 +- + drivers/clk/rockchip/clk-px30.c | 7 +- + drivers/clk/rockchip/clk-rk3036.c | 7 +- + drivers/clk/rockchip/clk-rk3128.c | 7 +- + drivers/clk/rockchip/clk-rk3188.c | 14 +- + drivers/clk/rockchip/clk-rk3228.c | 7 +- + drivers/clk/rockchip/clk-rk3288.c | 7 +- + drivers/clk/rockchip/clk-rk3308.c | 7 +- + drivers/clk/rockchip/clk-rk3328.c | 7 +- + drivers/clk/rockchip/clk-rk3368.c | 14 +- + drivers/clk/rockchip/clk-rk3399.c | 15 +- + drivers/clk/rockchip/clk-rk3568.c | 1725 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rv1108.c | 7 +- + drivers/clk/rockchip/clk.h | 54 +- + include/dt-bindings/clock/rk3568-cru.h | 926 +++++++++++ + 32 files changed, 3078 insertions(+), 169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3568-cru.yaml + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts + create mode 100644 drivers/clk/rockchip/clk-rk3568.c + create mode 100644 include/dt-bindings/clock/rk3568-cru.h +Merging samsung-krzk/for-next (151d4e8e6ccf Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 24 +++++------ + arch/arm/boot/dts/exynos3250-monk.dts | 4 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 4 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 6 +-- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 ++- + arch/arm/boot/dts/exynos4412-odroidx.dts | 3 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 48 +++++++++++----------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 ++++++------- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +-- + 15 files changed, 74 insertions(+), 70 deletions(-) +Merging scmi/for-linux-next (17d69bed53b4 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 5 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 4 + + arch/arm64/boot/dts/arm/juno-r2.dts | 4 + + drivers/clk/clk-scmi.c | 27 +- + drivers/cpufreq/scmi-cpufreq.c | 107 ++-- + drivers/firmware/arm_scmi/base.c | 142 ++--- + drivers/firmware/arm_scmi/bus.c | 100 +++- + drivers/firmware/arm_scmi/clock.c | 129 ++--- + drivers/firmware/arm_scmi/common.h | 133 ++++- + drivers/firmware/arm_scmi/driver.c | 798 ++++++++++++++++++++++++++--- + drivers/firmware/arm_scmi/notify.c | 328 +++++++++--- + drivers/firmware/arm_scmi/notify.h | 40 +- + drivers/firmware/arm_scmi/perf.c | 262 +++++----- + drivers/firmware/arm_scmi/power.c | 134 ++--- + drivers/firmware/arm_scmi/reset.c | 146 +++--- + drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 +- + drivers/firmware/arm_scmi/sensors.c | 232 +++++---- + drivers/firmware/arm_scmi/system.c | 63 ++- + drivers/firmware/arm_scmi/voltage.c | 126 ++--- + drivers/hwmon/scmi-hwmon.c | 24 +- + drivers/iio/common/Kconfig | 1 + + drivers/iio/common/Makefile | 1 + + drivers/iio/common/scmi_sensors/Kconfig | 18 + + drivers/iio/common/scmi_sensors/Makefile | 5 + + drivers/iio/common/scmi_sensors/scmi_iio.c | 674 ++++++++++++++++++++++++ + drivers/regulator/scmi-regulator.c | 42 +- + drivers/reset/reset-scmi.c | 33 +- + include/linux/scmi_protocol.h | 200 ++++---- + 29 files changed, 2846 insertions(+), 964 deletions(-) + create mode 100644 drivers/iio/common/scmi_sensors/Kconfig + create mode 100644 drivers/iio/common/scmi_sensors/Makefile + create mode 100644 drivers/iio/common/scmi_sensors/scmi_iio.c +Merging stm32/stm32-next (adc0496104b6 ARM: dts: stm32: Add Engicam i.Core STM32MP1 EDIMM2.2 Starter Kit) +$ git merge stm32/stm32-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 17 ++ + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 21 ++- + .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 47 +++++ + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 47 +++++ + arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi | 196 +++++++++++++++++++++ + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 154 ++++++++++++++++ + .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 55 ++++++ + .../boot/dts/stm32mp157a-microgea-stm32mp1.dtsi | 148 ++++++++++++++++ + 9 files changed, 686 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1.dtsi +Merging sunxi/sunxi/for-next (582cfdb9d206 Merge branch 'sunxi/clk-for-5.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/sun4i-a10-topwise-a721.dts | 242 +++++++++++++++++++++ + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 2 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 5 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 25 +++ + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 2 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 40 ++-- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 16 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 24 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 33 ++- + drivers/clk/sunxi/clk-sun6i-ar100.c | 2 +- + drivers/clk/sunxi/clk-sun9i-core.c | 8 +- + drivers/clk/sunxi/clk-usb.c | 2 +- + 46 files changed, 412 insertions(+), 99 deletions(-) + create mode 100644 arch/arm/boot/dts/sun4i-a10-topwise-a721.dts +Merging tegra/for-next (9e2409c6eacd Merge branch for-5.13/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 1 + + arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 5 + + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 14 +- + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 2 + + arch/arm/boot/dts/tegra20-paz00.dts | 14 +- + arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 1 + + arch/arm/boot/dts/tegra20-ventana.dts | 78 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 1 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 14 +- + .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 1 + + arch/arm/boot/dts/tegra30-beaver.dts | 1 + + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 - + arch/arm/boot/dts/tegra30-cardhu.dtsi | 84 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 1 + + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 3 + + arch/arm/boot/dts/tegra30-ouya.dts | 16 +- + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 3 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 + + .../arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 + + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 1 - + drivers/clk/tegra/clk-pll.c | 12 - + drivers/clk/tegra/clk-tegra210.c | 53 +- + drivers/phy/tegra/xusb-tegra186.c | 558 +++++- + drivers/phy/tegra/xusb-tegra210.c | 1889 +++++++++++++++----- + drivers/phy/tegra/xusb.c | 92 +- + drivers/phy/tegra/xusb.h | 22 +- + drivers/soc/tegra/pmc.c | 94 + + drivers/usb/host/xhci-tegra.c | 613 +++++-- + include/linux/clk/tegra.h | 4 +- + include/linux/phy/tegra/xusb.h | 10 +- + 33 files changed, 2996 insertions(+), 653 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (7dd847523ed5 arm64: dts: ti: k3-am642-evm/sk: Add IPC sub-mailbox nodes) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 9 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/ti/Makefile | 8 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 675 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 103 ++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 105 ++++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 468 ++++++++++++++ + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 334 ++++++++++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 65 ++ + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 655 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 395 ++++++++++++ + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 9 + + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 61 ++ + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 4 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 60 ++ + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 17 + + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 36 ++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 279 ++++++++- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 4 +- + include/dt-bindings/pinctrl/k3.h | 5 +- + 20 files changed, 3287 insertions(+), 7 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts +Merging clk/clk-next (9575aeae2cd1 Merge branch 'clk-cleanup' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/sama7g5.c | 6 +++--- + drivers/clk/clk.c | 18 +++--------------- + 2 files changed, 6 insertions(+), 18 deletions(-) +Merging clk-imx/for-next (d60fe8fa6c01 clk: imx: Fix reparenting of UARTs not associated with stdout) +$ git merge clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx25.c | 12 +----------- + drivers/clk/imx/clk-imx27.c | 13 +------------ + drivers/clk/imx/clk-imx35.c | 10 +--------- + drivers/clk/imx/clk-imx5.c | 30 +++--------------------------- + drivers/clk/imx/clk-imx6q.c | 16 +--------------- + drivers/clk/imx/clk-imx6sl.c | 16 +--------------- + drivers/clk/imx/clk-imx6sll.c | 24 +----------------------- + drivers/clk/imx/clk-imx6sx.c | 16 +--------------- + drivers/clk/imx/clk-imx7d.c | 22 +--------------------- + drivers/clk/imx/clk-imx7ulp.c | 31 ++----------------------------- + drivers/clk/imx/clk-imx8mm.c | 18 ++---------------- + drivers/clk/imx/clk-imx8mn.c | 18 ++---------------- + drivers/clk/imx/clk-imx8mp.c | 17 +---------------- + drivers/clk/imx/clk-imx8mq.c | 18 ++---------------- + drivers/clk/imx/clk.c | 41 ++++++++++++++++++++++++++++++++--------- + drivers/clk/imx/clk.h | 4 ++-- + 16 files changed, 54 insertions(+), 252 deletions(-) +Merging clk-renesas/renesas-clk (dbb397ccc6bb clk: renesas: Couple of spelling fixes) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/r8a7795-cpg-mssr.c | 6 ++++++ + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 11 +++++++++++ + drivers/clk/renesas/r9a06g032-clocks.c | 4 ++-- + 5 files changed, 21 insertions(+), 2 deletions(-) +Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (74cdb2664477 csky: Fixup typos) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/include/asm/asid.h | 2 +- + arch/csky/include/asm/barrier.h | 2 +- + arch/csky/include/asm/vdso.h | 2 +- + arch/csky/kernel/entry.S | 1 - + 4 files changed, 3 insertions(+), 4 deletions(-) +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Merge made by the 'recursive' 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 +++++---- + 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 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging m68k/for-next (f2e7e4bf38fd m68k: syscalls: switch to generic syscallhdr.sh) +$ git merge m68k/for-next +Removing arch/m68k/kernel/syscalls/syscalltbl.sh +Removing arch/m68k/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/m68k/kernel/syscalls/Makefile | 14 ++++--------- + arch/m68k/kernel/syscalls/syscallhdr.sh | 36 --------------------------------- + arch/m68k/kernel/syscalls/syscalltbl.sh | 32 ----------------------------- + arch/m68k/kernel/syscalltable.S | 3 +-- + 4 files changed, 5 insertions(+), 80 deletions(-) + delete mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh +Merging m68knommu/for-next (06c5fa9b2168 m68k: fix flatmem memory model setup) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/page_mm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (bbcee72c2f7a microblaze: Fix a typo) +$ git merge microblaze/next +Removing arch/microblaze/kernel/syscalls/syscalltbl.sh +Removing arch/microblaze/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/syscall_table.S | 3 +-- + arch/microblaze/kernel/syscalls/Makefile | 14 +++-------- + arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 --------------------------- + arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ------------------------ + arch/microblaze/lib/uaccess_old.S | 2 +- + arch/microblaze/mm/init.c | 2 +- + 6 files changed, 7 insertions(+), 82 deletions(-) + delete mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh +Merging mips/mips-next (509d36a941a3 MIPS: loongson64: fix bug when PAGE_SIZE > 16KB) +$ git merge mips/mips-next +Removing arch/mips/loongson64/platform.c +Removing arch/mips/kvm/trap_emul.c +Removing arch/mips/kvm/dyntrans.c +Removing arch/mips/kvm/commpage.h +Removing arch/mips/kvm/commpage.c +Removing arch/mips/kernel/syscalls/syscalltbl.sh +Removing arch/mips/kernel/syscalls/syscallhdr.sh +Removing arch/mips/configs/malta_kvm_guest_defconfig +Merge made by the 'recursive' strategy. + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 1 - + .../interrupt-controller/loongson,liointc.yaml | 36 +- + arch/mips/Kconfig | 25 +- + arch/mips/bcm63xx/clk.c | 2 +- + arch/mips/bmips/dma.c | 2 +- + .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 2 +- + arch/mips/boot/dts/brcm/bcm3368.dtsi | 3 + + .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 2 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 5 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 5 + + .../boot/dts/brcm/bcm6358-neufbox4-sercomm.dts | 2 +- + arch/mips/boot/dts/brcm/bcm6358.dtsi | 4 + + .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 2 +- + arch/mips/boot/dts/brcm/bcm6362.dtsi | 5 + + arch/mips/boot/dts/brcm/bcm6368.dtsi | 4 + + arch/mips/boot/dts/brcm/bcm93384wvg.dts | 2 +- + arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts | 2 +- + arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97420c.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm9ejtagprb.dts | 2 +- + arch/mips/boot/dts/ingenic/gcw0.dts | 1 - + arch/mips/boot/dts/loongson/Makefile | 1 + + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 243 +++ + .../boot/dts/loongson/loongson64_2core_2k1000.dts | 10 + + arch/mips/cavium-octeon/oct_ilm.c | 2 +- + arch/mips/configs/bigsur_defconfig | 4 - + arch/mips/configs/loongson2k_defconfig | 353 ++++ + arch/mips/configs/loongson3_defconfig | 8 +- + arch/mips/configs/malta_kvm_defconfig | 3 - + arch/mips/configs/malta_kvm_guest_defconfig | 436 ----- + arch/mips/configs/maltaup_xpa_defconfig | 3 - + arch/mips/configs/rbtx49xx_defconfig | 3 - + arch/mips/configs/sb1250_swarm_defconfig | 20 +- + arch/mips/configs/workpad_defconfig | 9 +- + arch/mips/include/asm/Kbuild | 7 +- + arch/mips/include/asm/asmmacro.h | 3 +- + arch/mips/include/asm/kvm_host.h | 238 --- + arch/mips/include/asm/mach-generic/spaces.h | 12 - + arch/mips/include/asm/mach-loongson64/boot_param.h | 27 - + .../include/asm/mach-loongson64/builtin_dtbs.h | 1 + + arch/mips/include/asm/mach-loongson64/loongson.h | 27 +- + arch/mips/include/asm/octeon/cvmx-address.h | 2 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 + + arch/mips/include/asm/processor.h | 5 - + arch/mips/include/asm/uaccess.h | 9 - + arch/mips/kernel/cevt-r4k.c | 4 - + arch/mips/kernel/scall32-o32.S | 4 +- + arch/mips/kernel/scall64-n32.S | 3 +- + arch/mips/kernel/scall64-n64.S | 3 +- + arch/mips/kernel/scall64-o32.S | 4 +- + arch/mips/kernel/smp-bmips.c | 27 +- + arch/mips/kernel/spinlock_test.c | 8 +- + arch/mips/kernel/syscalls/Makefile | 41 +- + arch/mips/kernel/syscalls/syscallhdr.sh | 36 - + arch/mips/kernel/syscalls/syscalltbl.sh | 36 - + arch/mips/kvm/Kconfig | 34 - + arch/mips/kvm/Makefile | 7 +- + arch/mips/kvm/commpage.c | 32 - + arch/mips/kvm/commpage.h | 24 - + arch/mips/kvm/dyntrans.c | 143 -- + arch/mips/kvm/emulate.c | 1688 +------------------- + arch/mips/kvm/entry.c | 33 - + arch/mips/kvm/interrupt.c | 123 +- + arch/mips/kvm/interrupt.h | 20 - + arch/mips/kvm/mips.c | 68 +- + arch/mips/kvm/mmu.c | 405 ----- + arch/mips/kvm/tlb.c | 174 -- + arch/mips/kvm/trap_emul.c | 1306 --------------- + arch/mips/kvm/vz.c | 5 +- + arch/mips/loongson64/Makefile | 2 +- + arch/mips/loongson64/env.c | 33 +- + arch/mips/loongson64/init.c | 23 +- + arch/mips/loongson64/numa.c | 17 +- + arch/mips/loongson64/platform.c | 42 - + arch/mips/loongson64/time.c | 24 + + arch/mips/mm/tlbex.c | 9 +- + arch/mips/mti-malta/Platform | 6 +- + arch/mips/mti-malta/malta-time.c | 5 - + arch/mips/pci/pci-ar2315.c | 1 + + arch/mips/pci/pci-mt7620.c | 5 +- + arch/mips/pci/pci-xtalk-bridge.c | 2 +- + arch/mips/ralink/clk.c | 14 + + arch/mips/sgi-ip27/ip27-timer.c | 4 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 92 +- + drivers/irqchip/irq-loongson-liointc.c | 60 +- + 92 files changed, 1012 insertions(+), 5118 deletions(-) + create mode 100644 arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi + create mode 100644 arch/mips/boot/dts/loongson/loongson64_2core_2k1000.dts + create mode 100644 arch/mips/configs/loongson2k_defconfig + delete mode 100644 arch/mips/configs/malta_kvm_guest_defconfig + delete mode 100644 arch/mips/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/mips/kvm/commpage.c + delete mode 100644 arch/mips/kvm/commpage.h + delete mode 100644 arch/mips/kvm/dyntrans.c + delete mode 100644 arch/mips/kvm/trap_emul.c + delete mode 100644 arch/mips/loongson64/platform.c +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (8f722f67452f openrisc: Use devicetree to determine present cpus) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generic syscallhdr.sh) +$ git merge parisc-hd/for-next +Removing arch/parisc/kernel/syscalls/syscalltbl.sh +Removing arch/parisc/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/kernel/syscall.S | 16 ++++++-------- + arch/parisc/kernel/syscalls/Makefile | 30 ++++++++------------------ + arch/parisc/kernel/syscalls/syscallhdr.sh | 36 ------------------------------- + arch/parisc/kernel/syscalls/syscalltbl.sh | 36 ------------------------------- + 5 files changed, 16 insertions(+), 103 deletions(-) + delete mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh +Merging powerpc/next (fbda79043024 Merge tag 'powerpc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (06c7c914de26 RISC-V: enable XIP) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/riscv/Kconfig | 47 ++++++++- + arch/riscv/Makefile | 8 +- + arch/riscv/boot/Makefile | 13 +++ + arch/riscv/include/asm/pgtable.h | 65 +++++++++++- + arch/riscv/include/asm/string.h | 5 + + arch/riscv/kernel/cpu_ops_sbi.c | 12 ++- + arch/riscv/kernel/head.S | 59 ++++++++++- + arch/riscv/kernel/head.h | 3 + + arch/riscv/kernel/setup.c | 8 +- + arch/riscv/kernel/smp.c | 16 +++ + arch/riscv/kernel/vmlinux-xip.lds.S | 132 ++++++++++++++++++++++++ + arch/riscv/kernel/vmlinux.lds.S | 6 ++ + arch/riscv/mm/init.c | 106 +++++++++++++++++-- + 14 files changed, 461 insertions(+), 21 deletions(-) + create mode 100644 arch/riscv/kernel/vmlinux-xip.lds.S +Merging s390/for-next (dc3b3e044f0a Merge branch 'features' into for-next) +$ git merge s390/for-next +Merge made by the 'recursive' strategy. + arch/s390/Kconfig.debug | 8 ++ + arch/s390/configs/debug_defconfig | 1 + + arch/s390/crypto/crc32be-vx.S | 4 +- + arch/s390/include/asm/pci.h | 5 +- + arch/s390/include/asm/qdio.h | 22 +---- + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/uv.c | 43 +++++++++- + arch/s390/pci/pci.c | 135 ++++++++++++++++++++--------- + arch/s390/pci/pci_bus.c | 33 +++++++ + arch/s390/pci/pci_bus.h | 2 + + arch/s390/pci/pci_event.c | 83 +++++++----------- + drivers/pci/hotplug/s390_pci_hpc.c | 60 +------------ + drivers/s390/char/sclp_con.c | 19 +---- + drivers/s390/char/sclp_tty.c | 9 +- + drivers/s390/cio/Makefile | 4 +- + drivers/s390/cio/cio_debug.h | 3 + + drivers/s390/cio/cio_debugfs.c | 23 +++++ + drivers/s390/cio/cio_inject.c | 171 +++++++++++++++++++++++++++++++++++++ + drivers/s390/cio/cio_inject.h | 18 ++++ + drivers/s390/cio/ioasm.c | 23 ++++- + drivers/s390/cio/qdio.h | 10 --- + drivers/s390/cio/qdio_main.c | 63 ++------------ + drivers/s390/cio/qdio_setup.c | 49 +---------- + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 102 +++++++++++----------- + drivers/s390/scsi/zfcp_qdio.c | 7 +- + 26 files changed, 534 insertions(+), 368 deletions(-) + create mode 100644 drivers/s390/cio/cio_debugfs.c + create mode 100644 drivers/s390/cio/cio_inject.c + create mode 100644 drivers/s390/cio/cio_inject.h +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps.c | 1 - + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 18 files changed, 49 insertions(+), 46 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +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 sparc-next/master +Already up to date. +Merging uml/linux-next (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (d0deab8fca0e xtensa: syscalls: switch to generic syscallhdr.sh) +$ git merge xtensa/xtensa-for-next +Removing arch/xtensa/kernel/syscalls/syscalltbl.sh +Removing arch/xtensa/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 8 +++- + arch/xtensa/Makefile | 9 +---- + arch/xtensa/boot/Makefile | 4 -- + arch/xtensa/boot/boot-elf/Makefile | 11 ++---- + arch/xtensa/boot/boot-redboot/Makefile | 6 +-- + arch/xtensa/kernel/coprocessor.S | 64 ++++++++++++++++--------------- + arch/xtensa/kernel/pci.c | 2 +- + arch/xtensa/kernel/syscall.c | 8 +--- + arch/xtensa/kernel/syscalls/Makefile | 14 ++----- + arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ----------------- + arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ---------------- + 11 files changed, 52 insertions(+), 142 deletions(-) + delete mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh +Merging pidfd/for-next (8fac44cbbaa2 Merge branch 'fs/idmapped_mounts/helpers' into for-next) +$ git merge pidfd/for-next +Merge made by the 'recursive' strategy. + fs/ext4/ialloc.c | 2 +- + fs/inode.c | 4 +- + fs/libfs.c | 1 + + fs/namei.c | 25 +++------ + fs/xattr.c | 14 ++--- + fs/xfs/xfs_inode.c | 10 ++-- + fs/xfs/xfs_symlink.c | 4 +- + include/linux/fs.h | 141 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 8 files changed, 161 insertions(+), 40 deletions(-) +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (42587ccf2ed5 afs: Use the fscache_write_begin() helper) +$ git merge fscache/fscache-next +Auto-merging include/linux/pagemap.h +Auto-merging fs/afs/write.c +CONFLICT (content): Merge conflict in fs/afs/write.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/inode.c +Auto-merging fs/afs/fs_operation.c +Auto-merging fs/afs/file.c +Auto-merging fs/afs/dir.c +Auto-merging fs/Kconfig +Resolved 'fs/afs/write.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c2696d3e321] Merge remote-tracking branch 'fscache/fscache-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/netfs_library.rst | 526 ++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/afs/Kconfig | 1 + + fs/afs/dir.c | 225 +++-- + fs/afs/file.c | 483 +++-------- + fs/afs/fs_operation.c | 4 +- + fs/afs/fsclient.c | 108 +-- + fs/afs/inode.c | 7 +- + fs/afs/internal.h | 59 +- + fs/afs/rxrpc.c | 150 ++-- + fs/afs/write.c | 654 +++++++-------- + fs/afs/yfsclient.c | 82 +- + fs/cachefiles/Makefile | 1 + + fs/cachefiles/interface.c | 5 +- + fs/cachefiles/internal.h | 9 + + fs/cachefiles/rdwr2.c | 403 +++++++++ + fs/fscache/Kconfig | 1 + + fs/fscache/Makefile | 1 + + fs/fscache/internal.h | 4 + + fs/fscache/io.c | 116 +++ + fs/fscache/page.c | 2 +- + fs/fscache/stats.c | 1 + + fs/netfs/Kconfig | 23 + + fs/netfs/Makefile | 5 + + fs/netfs/internal.h | 97 +++ + fs/netfs/read_helper.c | 1180 +++++++++++++++++++++++++++ + fs/netfs/stats.c | 59 ++ + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 50 +- + include/linux/netfs.h | 200 +++++ + include/linux/pagemap.h | 3 + + include/linux/uio.h | 11 + + include/net/af_rxrpc.h | 2 +- + include/trace/events/afs.h | 74 +- + include/trace/events/netfs.h | 201 +++++ + lib/iov_iter.c | 313 ++++++- + mm/filemap.c | 20 + + mm/readahead.c | 70 ++ + net/rxrpc/recvmsg.c | 9 +- + 41 files changed, 4074 insertions(+), 1092 deletions(-) + create mode 100644 Documentation/filesystems/netfs_library.rst + create mode 100644 fs/cachefiles/rdwr2.c + create mode 100644 fs/fscache/io.c + create mode 100644 fs/netfs/Kconfig + create mode 100644 fs/netfs/Makefile + create mode 100644 fs/netfs/internal.h + create mode 100644 fs/netfs/read_helper.c + create mode 100644 fs/netfs/stats.c + create mode 100644 include/linux/netfs.h + create mode 100644 include/trace/events/netfs.h +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (c7f98650557a Merge branch 'for-next-next-v5.12-20210322' into for-next-20210322) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 12 +- + fs/btrfs/backref.c | 33 +- + fs/btrfs/block-group.c | 132 +++++- + fs/btrfs/block-group.h | 2 + + fs/btrfs/btrfs_inode.h | 33 +- + fs/btrfs/check-integrity.c | 14 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.c | 956 ++----------------------------------------- + fs/btrfs/ctree.h | 54 +-- + fs/btrfs/delayed-inode.c | 35 +- + fs/btrfs/delayed-ref.c | 31 +- + fs/btrfs/dev-replace.c | 3 + + fs/btrfs/disk-io.c | 179 ++++++-- + fs/btrfs/extent-tree.c | 21 +- + fs/btrfs/extent_io.c | 435 +++++++++++++++++--- + fs/btrfs/file-item.c | 1 + + fs/btrfs/file.c | 106 +++-- + fs/btrfs/free-space-cache.c | 9 +- + fs/btrfs/inode.c | 143 ++++--- + fs/btrfs/ioctl.c | 33 +- + fs/btrfs/lzo.c | 9 +- + fs/btrfs/ordered-data.c | 19 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/qgroup.c | 59 ++- + fs/btrfs/raid56.c | 70 ++-- + fs/btrfs/reflink.c | 40 +- + fs/btrfs/relocation.c | 438 +++++++++++++++----- + fs/btrfs/scrub.c | 8 - + fs/btrfs/send.c | 43 +- + fs/btrfs/subpage.c | 73 ++++ + fs/btrfs/subpage.h | 17 + + fs/btrfs/super.c | 26 ++ + fs/btrfs/sysfs.c | 69 ++++ + fs/btrfs/transaction.c | 37 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-checker.c | 5 + + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/tree-mod-log.c | 909 ++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/tree-mod-log.h | 53 +++ + fs/btrfs/volumes.c | 108 +++-- + fs/btrfs/volumes.h | 1 + + include/trace/events/btrfs.h | 12 + + 42 files changed, 2684 insertions(+), 1562 deletions(-) + create mode 100644 fs/btrfs/tree-mod-log.c + create mode 100644 fs/btrfs/tree-mod-log.h +Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (4c7b707d72f5 cifs: revalidate mapping when we open files for SMB1 POSIX) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_ioctl.h | 4 ++-- + fs/cifs/cifsglob.h | 4 ++-- + fs/cifs/cifspdu.h | 5 +++++ + fs/cifs/file.c | 1 + + fs/cifs/ioctl.c | 4 ++-- + fs/cifs/smb2glob.h | 1 + + fs/cifs/smb2misc.c | 4 ++-- + fs/cifs/smb2ops.c | 9 +++++---- + fs/cifs/smb2transport.c | 21 ++++++++++++++------- + 9 files changed, 34 insertions(+), 19 deletions(-) +Merging cifsd/cifsd-for-next (91208e87d526 Merge pull request #34 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/cifsd.rst | 152 + + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 12 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/cifsd/Kconfig | 63 + + fs/cifsd/Makefile | 13 + + fs/cifsd/asn1.c | 702 +++ + fs/cifsd/asn1.h | 29 + + fs/cifsd/auth.c | 1348 +++++ + fs/cifsd/auth.h | 90 + + fs/cifsd/buffer_pool.c | 292 ++ + fs/cifsd/buffer_pool.h | 28 + + fs/cifsd/connection.c | 416 ++ + fs/cifsd/connection.h | 212 + + fs/cifsd/crypto_ctx.c | 287 + + fs/cifsd/crypto_ctx.h | 77 + + fs/cifsd/glob.h | 67 + + fs/cifsd/ksmbd_server.h | 285 + + fs/cifsd/ksmbd_work.c | 93 + + fs/cifsd/ksmbd_work.h | 124 + + fs/cifsd/mgmt/ksmbd_ida.c | 69 + + fs/cifsd/mgmt/ksmbd_ida.h | 41 + + fs/cifsd/mgmt/share_config.c | 238 + + fs/cifsd/mgmt/share_config.h | 81 + + fs/cifsd/mgmt/tree_connect.c | 128 + + fs/cifsd/mgmt/tree_connect.h | 56 + + fs/cifsd/mgmt/user_config.c | 69 + + fs/cifsd/mgmt/user_config.h | 66 + + fs/cifsd/mgmt/user_session.c | 344 ++ + fs/cifsd/mgmt/user_session.h | 105 + + fs/cifsd/misc.c | 296 ++ + fs/cifsd/misc.h | 38 + + fs/cifsd/ndr.c | 344 ++ + fs/cifsd/ndr.h | 21 + + fs/cifsd/netmisc.c | 46 + + fs/cifsd/nterr.c | 674 +++ + fs/cifsd/nterr.h | 552 ++ + fs/cifsd/ntlmssp.h | 169 + + fs/cifsd/oplock.c | 1681 ++++++ + fs/cifsd/oplock.h | 138 + + fs/cifsd/server.c | 632 +++ + fs/cifsd/server.h | 62 + + fs/cifsd/smb2misc.c | 458 ++ + fs/cifsd/smb2ops.c | 300 ++ + fs/cifsd/smb2pdu.c | 8452 ++++++++++++++++++++++++++++++ + fs/cifsd/smb2pdu.h | 1649 ++++++ + fs/cifsd/smb_common.c | 667 +++ + fs/cifsd/smb_common.h | 546 ++ + fs/cifsd/smbacl.c | 1324 +++++ + fs/cifsd/smbacl.h | 202 + + fs/cifsd/smberr.h | 235 + + fs/cifsd/smbfsctl.h | 90 + + fs/cifsd/smbstatus.h | 1822 +++++++ + fs/cifsd/time_wrappers.h | 34 + + fs/cifsd/transport_ipc.c | 897 ++++ + fs/cifsd/transport_ipc.h | 62 + + fs/cifsd/transport_rdma.c | 2051 ++++++++ + fs/cifsd/transport_rdma.h | 61 + + fs/cifsd/transport_tcp.c | 625 +++ + fs/cifsd/transport_tcp.h | 13 + + fs/cifsd/unicode.c | 391 ++ + fs/cifsd/unicode.h | 374 ++ + fs/cifsd/uniupr.h | 268 + + fs/cifsd/vfs.c | 1989 +++++++ + fs/cifsd/vfs.h | 314 ++ + fs/cifsd/vfs_cache.c | 851 +++ + fs/cifsd/vfs_cache.h | 213 + + 69 files changed, 34040 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/cifsd.rst + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 fs/cifsd/Kconfig + create mode 100644 fs/cifsd/Makefile + create mode 100644 fs/cifsd/asn1.c + create mode 100644 fs/cifsd/asn1.h + create mode 100644 fs/cifsd/auth.c + create mode 100644 fs/cifsd/auth.h + create mode 100644 fs/cifsd/buffer_pool.c + create mode 100644 fs/cifsd/buffer_pool.h + create mode 100644 fs/cifsd/connection.c + create mode 100644 fs/cifsd/connection.h + create mode 100644 fs/cifsd/crypto_ctx.c + create mode 100644 fs/cifsd/crypto_ctx.h + create mode 100644 fs/cifsd/glob.h + create mode 100644 fs/cifsd/ksmbd_server.h + create mode 100644 fs/cifsd/ksmbd_work.c + create mode 100644 fs/cifsd/ksmbd_work.h + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h + create mode 100644 fs/cifsd/mgmt/share_config.c + create mode 100644 fs/cifsd/mgmt/share_config.h + create mode 100644 fs/cifsd/mgmt/tree_connect.c + create mode 100644 fs/cifsd/mgmt/tree_connect.h + create mode 100644 fs/cifsd/mgmt/user_config.c + create mode 100644 fs/cifsd/mgmt/user_config.h + create mode 100644 fs/cifsd/mgmt/user_session.c + create mode 100644 fs/cifsd/mgmt/user_session.h + create mode 100644 fs/cifsd/misc.c + create mode 100644 fs/cifsd/misc.h + create mode 100644 fs/cifsd/ndr.c + create mode 100644 fs/cifsd/ndr.h + create mode 100644 fs/cifsd/netmisc.c + create mode 100644 fs/cifsd/nterr.c + create mode 100644 fs/cifsd/nterr.h + create mode 100644 fs/cifsd/ntlmssp.h + create mode 100644 fs/cifsd/oplock.c + create mode 100644 fs/cifsd/oplock.h + create mode 100644 fs/cifsd/server.c + create mode 100644 fs/cifsd/server.h + create mode 100644 fs/cifsd/smb2misc.c + create mode 100644 fs/cifsd/smb2ops.c + create mode 100644 fs/cifsd/smb2pdu.c + create mode 100644 fs/cifsd/smb2pdu.h + create mode 100644 fs/cifsd/smb_common.c + create mode 100644 fs/cifsd/smb_common.h + create mode 100644 fs/cifsd/smbacl.c + create mode 100644 fs/cifsd/smbacl.h + create mode 100644 fs/cifsd/smberr.h + create mode 100644 fs/cifsd/smbfsctl.h + create mode 100644 fs/cifsd/smbstatus.h + create mode 100644 fs/cifsd/time_wrappers.h + create mode 100644 fs/cifsd/transport_ipc.c + create mode 100644 fs/cifsd/transport_ipc.h + create mode 100644 fs/cifsd/transport_rdma.c + create mode 100644 fs/cifsd/transport_rdma.h + create mode 100644 fs/cifsd/transport_tcp.c + create mode 100644 fs/cifsd/transport_tcp.h + create mode 100644 fs/cifsd/unicode.c + create mode 100644 fs/cifsd/unicode.h + create mode 100644 fs/cifsd/uniupr.h + create mode 100644 fs/cifsd/vfs.c + create mode 100644 fs/cifsd/vfs.h + create mode 100644 fs/cifsd/vfs_cache.c + create mode 100644 fs/cifsd/vfs_cache.h +Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 3 +-- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging erofs/dev (f3382f3159d7 erofs: complete a missing case for inplace I/O) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/decompressor.c | 5 ++--- + fs/erofs/internal.h | 2 ++ + fs/erofs/super.c | 1 + + fs/erofs/zdata.c | 59 +++++++++++++++++++++++++++++++++++-------------- + 4 files changed, 47 insertions(+), 20 deletions(-) +Merging exfat/dev (f9b23f1f6ca0 exfat: speed up iterate/lookup by fixing start point of traversing cluster chain) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++------- + fs/exfat/dir.c | 26 +++++++++++---- + fs/exfat/exfat_fs.h | 11 +++++-- + fs/exfat/fatent.c | 41 +++++++++++++++++------ + fs/exfat/file.c | 53 ++++++++++++++++++++++++++++++ + fs/exfat/inode.c | 3 +- + fs/exfat/namei.c | 11 +++++-- + fs/exfat/super.c | 1 + + 8 files changed, 206 insertions(+), 35 deletions(-) +Merging ext3/for_next (4a140c918e21 Pull fanotify cleanup from Christian) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + 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/ext2/super.c | 2 +- + fs/notify/fanotify/fanotify.c | 166 +++++++++++++++------ + fs/notify/fanotify/fanotify.h | 46 +++++- + fs/notify/fanotify/fanotify_user.c | 219 +++++++++++++++++++++++----- + fs/notify/fdinfo.c | 3 +- + fs/notify/group.c | 1 - + fs/notify/inotify/inotify_fsnotify.c | 9 +- + fs/notify/inotify/inotify_user.c | 7 +- + fs/notify/mark.c | 4 - + fs/notify/notification.c | 64 ++++---- + fs/quota/quota.c | 50 ++++++- + include/linux/fanotify.h | 36 ++++- + include/linux/fsnotify_backend.h | 29 ++-- + include/linux/sched/user.h | 3 - + include/linux/syscalls.h | 2 + + include/linux/user_namespace.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/dqblk_xfs.h | 5 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 12 +- + kernel/ucount.c | 4 + + 39 files changed, 535 insertions(+), 156 deletions(-) +Merging ext4/dev (64395d950bc4 ext4: initialize ret to suppress smatch warning) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (ca269bfadb10 f2fs: fix to avoid touching checkpointed data in get_victim()) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/checkpoint.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 31 +++++++- + fs/f2fs/Kconfig | 16 ++--- + fs/f2fs/checkpoint.c | 8 ++- + fs/f2fs/compress.c | 1 + + fs/f2fs/data.c | 123 ++++++++++++++++++++++++++------ + fs/f2fs/f2fs.h | 45 +++++++++--- + fs/f2fs/file.c | 42 +++++------ + fs/f2fs/gc.c | 65 ++++++++++++----- + fs/f2fs/inline.c | 3 +- + fs/f2fs/node.c | 8 +++ + fs/f2fs/node.h | 1 + + fs/f2fs/segment.c | 61 ++++++++++++---- + fs/f2fs/segment.h | 16 ++++- + fs/f2fs/super.c | 61 +++++++++++----- + fs/f2fs/sysfs.c | 47 ++++++++++++ + fs/f2fs/verity.c | 75 +++++++++++++------ + include/linux/f2fs_fs.h | 2 +- + 17 files changed, 462 insertions(+), 143 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (0d02ec6b3136 Linux 5.12-rc4) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (0d02ec6b3136 Linux 5.12-rc4) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (29a4e914914a svcrdma: Clean up dto_q critical section in svc_rdma_recvfrom()) +$ git merge cel/for-next +Merge made by the 'recursive' strategy. + fs/nfs_common/nfsacl.c | 71 ++ + fs/nfsd/Kconfig | 6 +- + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs2acl.c | 87 +-- + fs/nfsd/nfs3acl.c | 39 +- + fs/nfsd/nfs3proc.c | 97 +-- + fs/nfsd/nfs3xdr.c | 1043 +++++++++++++++++----------- + fs/nfsd/nfs4proc.c | 36 +- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/nfs4state.c | 82 ++- + fs/nfsd/nfs4xdr.c | 110 +-- + fs/nfsd/nfsctl.c | 28 +- + fs/nfsd/nfsd.h | 7 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsfh.h | 2 +- + fs/nfsd/nfsproc.c | 53 +- + fs/nfsd/nfssvc.c | 39 +- + fs/nfsd/nfsxdr.c | 413 ++++++----- + fs/nfsd/state.h | 4 + + fs/nfsd/trace.h | 24 + + fs/nfsd/vfs.c | 9 +- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr.h | 23 +- + fs/nfsd/xdr3.h | 37 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/nfsacl.h | 3 + + include/linux/sunrpc/svc.h | 25 + + include/linux/sunrpc/svc_rdma.h | 11 +- + include/linux/sunrpc/svc_xprt.h | 2 + + include/linux/sunrpc/xdr.h | 34 + + include/trace/events/sunrpc.h | 1 + + net/sunrpc/svc_xprt.c | 34 +- + net/sunrpc/svcsock.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 172 ++--- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 113 +-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 69 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 15 +- + 38 files changed, 1577 insertions(+), 1164 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Merge made by the 'recursive' strategy. + fs/overlayfs/file.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs()) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. +Merging xfs/for-next (8723d5ba8bda xfs: also reject BULKSTAT_SINGLE in a mount user namespace) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (5808fecc5723 iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b8da9b10e26c fs/locks: print full locks information) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 56 insertions(+), 9 deletions(-) +Merging vfs/for-next (f85ebc25fa88 Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +CONFLICT (content): Merge conflict in fs/cifs/file.c +Auto-merging fs/afs/inode.c +Recorded preimage for 'fs/cifs/file.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/cifs/file.c'. +[master eb17b5cbe22a] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/spufs/coredump.c | 3 +- + arch/powerpc/platforms/cell/spufs/inode.c | 10 +- + drivers/infiniband/hw/qib/qib_fs.c | 68 +---------- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_inode_dotl.c | 14 +-- + fs/afs/inode.c | 6 +- + fs/autofs/autofs_i.h | 1 + + fs/autofs/waitq.c | 72 +++--------- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/buffer.c | 6 +- + fs/ceph/caps.c | 8 +- + fs/ceph/dir.c | 2 + + fs/ceph/export.c | 9 +- + fs/ceph/inode.c | 41 ++++++- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/dir.c | 19 ++-- + fs/cifs/file.c | 2 +- + fs/cifs/inode.c | 57 +++++----- + fs/cifs/readdir.c | 4 +- + fs/coredump.c | 72 +++++++----- + fs/d_path.c | 10 +- + fs/ecryptfs/ecryptfs_kernel.h | 17 +-- + fs/ecryptfs/inode.c | 163 ++++++++++++--------------- + fs/fuse/dir.c | 6 +- + fs/fuse/inode.c | 2 +- + fs/fuse/readdir.c | 2 +- + fs/gfs2/glops.c | 22 ++-- + fs/hostfs/hostfs_kern.c | 1 - + fs/nfs/inode.c | 6 +- + fs/nfsd/nfsproc.c | 2 +- + fs/ocfs2/dlmglue.c | 12 +- + fs/openpromfs/inode.c | 67 ++++++----- + fs/orangefs/orangefs-utils.c | 2 +- + fs/overlayfs/namei.c | 4 +- + fs/vboxsf/dir.c | 4 +- + fs/vboxsf/super.c | 4 +- + fs/vboxsf/utils.c | 68 +++++++---- + fs/vboxsf/vfsmod.h | 4 +- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 14 +-- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 5 + + 43 files changed, 384 insertions(+), 443 deletions(-) +Merging printk/for-next (de9a2d6a2625 Merge branch 'for-5.13-vsprintf-pgp' into for-next) +$ git merge printk/for-next +Auto-merging mm/slub.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 2 +- + MAINTAINERS | 8 +- + arch/powerpc/kernel/nvram_64.c | 8 +- + arch/powerpc/xmon/xmon.c | 6 +- + arch/um/kernel/kmsg_dump.c | 13 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/mtd/mtdoops.c | 17 +- + fs/pstore/platform.c | 5 +- + include/linux/kmsg_dump.h | 47 ++- + kernel/debug/kdb/kdb_main.c | 10 +- + kernel/printk/internal.h | 4 +- + kernel/printk/printk.c | 464 +++++++++++++++--------------- + kernel/printk/printk_safe.c | 27 +- + lib/test_printf.c | 90 +++++- + lib/vsprintf.c | 69 ++++- + mm/slub.c | 13 +- + 16 files changed, 466 insertions(+), 321 deletions(-) +Merging pci/next (55bddc9ae5fb Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 ++-- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 20 ++++--- + drivers/iommu/intel/irq_remapping.c | 3 +- + drivers/pci/ats.c | 2 +- + drivers/pci/controller/Makefile | 7 ++- + drivers/pci/controller/cadence/pci-j721e.c | 24 ++++++++- + drivers/pci/controller/dwc/Kconfig | 3 +- + drivers/pci/controller/dwc/Makefile | 7 ++- + drivers/pci/controller/dwc/pci-keystone.c | 14 +++-- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 4 +- + drivers/pci/controller/mobiveil/Kconfig | 3 +- + drivers/pci/controller/pci-thunder-ecam.c | 2 +- + drivers/pci/controller/pci-thunder-pem.c | 13 ++--- + drivers/pci/controller/pcie-brcmstb.c | 1 + + drivers/pci/controller/pcie-iproc-msi.c | 2 +- + drivers/pci/controller/pcie-microchip-host.c | 12 ++--- + drivers/pci/controller/vmd.c | 63 +++++++++++++++++----- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 16 ++++-- + drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 + + drivers/pci/hotplug/acpi_pcihp.c | 2 +- + drivers/pci/of.c | 22 ++++++-- + drivers/pci/pci.h | 6 +++ + drivers/pci/pcie/aer.c | 6 +-- + drivers/pci/pcie/pme.c | 2 +- + drivers/pci/pcie/rcec.c | 2 +- + drivers/pci/probe.c | 1 + + include/linux/pci_ids.h | 2 - + 29 files changed, 183 insertions(+), 71 deletions(-) +Merging pstore/for-next/pstore (7db688e99c0f pstore/ram: Rate-limit "uncorrectable error in header" message) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (30541b02f591 Merge branch 'for-5.13/thrustmaster' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/hid/Kconfig | 18 +- + drivers/hid/Makefile | 4 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 40 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 - + drivers/hid/hid-alps.c | 1 + + drivers/hid/hid-asus.c | 3 + + drivers/hid/hid-cp2112.c | 22 +- + drivers/hid/hid-ft260.c | 1054 ++++++++++++++++++++++++++ + drivers/hid/hid-google-hammer.c | 2 + + drivers/hid/hid-ids.h | 15 +- + drivers/hid/hid-lg.c | 24 - + drivers/hid/hid-logitech-dj.c | 131 +++- + drivers/hid/hid-plantronics.c | 60 +- + drivers/hid/hid-quirks.c | 5 +- + drivers/hid/hid-thrustmaster.c | 370 +++++++++ + drivers/hid/i2c-hid/i2c-hid-acpi.c | 52 +- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 15 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 6 +- + drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 + + drivers/hid/usbhid/hiddev.c | 6 +- + drivers/hid/wacom_wac.c | 8 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + include/linux/hid.h | 2 + + include/linux/intel-ish-client-if.h | 2 +- + 27 files changed, 1733 insertions(+), 128 deletions(-) + create mode 100644 drivers/hid/hid-ft260.c + create mode 100644 drivers/hid/hid-thrustmaster.c +Merging i2c/i2c/for-next (2acaad748aa8 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-powermac.c | 5 --- + drivers/i2c/busses/i2c-rcar.c | 84 ++++++++++++++++++++++++++++++++++++--- + drivers/i2c/busses/i2c-scmi.c | 2 - + drivers/i2c/busses/i2c-stm32f7.c | 54 ++++++++++++++----------- + drivers/i2c/i2c-core-base.c | 7 ++-- + drivers/i2c/i2c-dev.c | 9 ++++- + 6 files changed, 120 insertions(+), 41 deletions(-) +Merging i3c/i3c/next (e43d5c7c3c34 dt-bindings: i3c: Fix silvaco,i3c-master-v1 compatible string) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 +- + drivers/i3c/master/svc-i3c-master.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/firmware/dmi-id.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (644b9af5c605 hwmon: replace snprintf in show functions with sysfs_emit) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/corsair-psu.rst | 13 +- + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/ir36021.rst | 63 ++ + Documentation/hwmon/nzxt-kraken2.rst | 42 + + Documentation/hwmon/stpddc60.rst | 90 ++ + MAINTAINERS | 14 + + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm9240.c | 982 ++++++++++----------- + drivers/hwmon/applesmc.c | 34 +- + drivers/hwmon/corsair-psu.c | 355 ++++++-- + drivers/hwmon/ds1621.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/ina209.c | 6 +- + drivers/hwmon/ina2xx.c | 11 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/it87.c | 12 +- + drivers/hwmon/lineage-pem.c | 8 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/ltc2945.c | 4 +- + drivers/hwmon/ltc2990.c | 4 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 8 +- + drivers/hwmon/ltc4222.c | 4 +- + drivers/hwmon/ltc4260.c | 4 +- + drivers/hwmon/ltc4261.c | 4 +- + drivers/hwmon/max16065.c | 18 +- + drivers/hwmon/max6697.c | 2 +- + drivers/hwmon/nct6683.c | 11 +- + drivers/hwmon/nzxt-kraken2.c | 234 +++++ + drivers/hwmon/occ/common.c | 69 +- + drivers/hwmon/occ/sysfs.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 19 + + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/inspur-ipsps.c | 28 +- + drivers/hwmon/pmbus/ir36021.c | 79 ++ + drivers/hwmon/pmbus/pmbus.h | 1 + + drivers/hwmon/pmbus/pmbus_core.c | 27 +- + drivers/hwmon/pmbus/stpddc60.c | 248 ++++++ + drivers/hwmon/s3c-hwmon.c | 4 +- + drivers/hwmon/sch5627.c | 24 +- + drivers/hwmon/sch5636.c | 20 +- + drivers/hwmon/smm665.c | 4 +- + drivers/hwmon/stts751.c | 20 +- + drivers/hwmon/vexpress-hwmon.c | 12 +- + drivers/hwmon/xgene-hwmon.c | 14 +- + 49 files changed, 1757 insertions(+), 771 deletions(-) + create mode 100644 Documentation/hwmon/ir36021.rst + create mode 100644 Documentation/hwmon/nzxt-kraken2.rst + create mode 100644 Documentation/hwmon/stpddc60.rst + create mode 100644 drivers/hwmon/nzxt-kraken2.c + create mode 100644 drivers/hwmon/pmbus/ir36021.c + create mode 100644 drivers/hwmon/pmbus/stpddc60.c +Merging jc_docs/docs-next (8d295fbad687 kernel-doc: better handle '::' sequences) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/process/submitting-patches.rst +Removing Documentation/driver-api/driver-model/class.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + CREDITS | 2 +- + Documentation/admin-guide/LSM/LoadPin.rst | 6 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 7 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/reporting-issues.rst | 913 ++++++++------ + Documentation/admin-guide/sysrq.rst | 4 +- + Documentation/arch.rst | 26 + + Documentation/arm/marvell.rst | 159 +-- + Documentation/arm/uefi.rst | 7 + + Documentation/conf.py | 31 +- + Documentation/core-api/rbtree.rst | 2 +- + Documentation/dev-tools/checkpatch.rst | 755 ++++++++++++ + Documentation/dev-tools/index.rst | 1 + + .../devicetree/bindings/submitting-patches.rst | 4 +- + Documentation/driver-api/driver-model/class.rst | 149 --- + Documentation/driver-api/driver-model/device.rst | 23 +- + Documentation/driver-api/driver-model/index.rst | 1 - + Documentation/driver-api/gpio/intro.rst | 2 +- + Documentation/features/arch-support.txt | 1 + + Documentation/features/vm/TLB/arch-support.txt | 2 +- + Documentation/filesystems/api-summary.rst | 6 + + Documentation/filesystems/proc.rst | 4 + + Documentation/filesystems/vfat.rst | 2 +- + Documentation/index.rst | 20 +- + Documentation/input/event-codes.rst | 10 +- + Documentation/input/ff.rst | 6 +- + Documentation/input/gameport-programming.rst | 35 +- + Documentation/input/input-programming.rst | 20 +- + Documentation/input/input.rst | 8 +- + Documentation/input/multi-touch-protocol.rst | 8 +- + Documentation/input/notifier.rst | 3 +- + Documentation/input/uinput.rst | 2 +- + Documentation/livepatch/shadow-vars.rst | 4 +- + Documentation/powerpc/firmware-assisted-dump.rst | 2 +- + Documentation/process/submitting-patches.rst | 91 +- + Documentation/scsi/ChangeLog.megaraid | 2 +- + Documentation/sphinx/rstFlatTable.py | 4 +- + Documentation/translations/ko_KR/howto.rst | 18 +- + .../translations/zh_CN/admin-guide/README.rst | 347 ++++++ + .../translations/zh_CN/admin-guide/bug-bisect.rst | 81 ++ + .../translations/zh_CN/admin-guide/bug-hunting.rst | 340 ++++++ + .../translations/zh_CN/admin-guide/index.rst | 19 +- + .../translations/zh_CN/admin-guide/init.rst | 54 + + .../zh_CN/admin-guide/reporting-issues.rst | 1269 ++++++++++++++++++++ + .../zh_CN/admin-guide/security-bugs.rst | 74 ++ + .../zh_CN/admin-guide/tainted-kernels.rst | 157 +++ + .../translations/zh_CN/admin-guide/unicode.rst | 170 +++ + Documentation/translations/zh_CN/index.rst | 2 + + .../translations/zh_CN/kernel-hacking/hacking.rst | 708 +++++++++++ + .../translations/zh_CN/kernel-hacking/index.rst | 22 + + .../translations/zh_CN/process/1.Intro.rst | 195 +-- + .../translations/zh_CN/process/2.Process.rst | 345 +++--- + .../translations/zh_CN/process/3.Early-stage.rst | 139 ++- + .../translations/zh_CN/process/4.Coding.rst | 279 ++--- + .../translations/zh_CN/process/5.Posting.rst | 243 ++-- + .../translations/zh_CN/process/6.Followthrough.rst | 165 +-- + .../zh_CN/process/7.AdvancedTopics.rst | 141 ++- + .../translations/zh_CN/process/8.Conclusion.rst | 60 +- + Documentation/translations/zh_CN/process/index.rst | 10 +- + .../translations/zh_CN/riscv/boot-image-header.rst | 67 ++ + Documentation/translations/zh_CN/riscv/index.rst | 28 + + .../translations/zh_CN/riscv/patch-acceptance.rst | 31 + + Documentation/translations/zh_CN/riscv/pmu.rst | 233 ++++ + .../translations/zh_CN/sound/hd-audio/controls.rst | 102 ++ + .../translations/zh_CN/sound/hd-audio/index.rst | 14 + + Documentation/translations/zh_CN/sound/index.rst | 22 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/virt/kvm/api.rst | 2 +- + Documentation/watchdog/pcwd-watchdog.rst | 2 +- + MAINTAINERS | 9 + + fs/eventpoll.c | 52 +- + scripts/checkpatch.pl | 133 +- + scripts/kernel-doc | 30 +- + tools/scripts/Makefile.include | 3 +- + 76 files changed, 6320 insertions(+), 1575 deletions(-) + create mode 100644 Documentation/arch.rst + create mode 100644 Documentation/dev-tools/checkpatch.rst + delete mode 100644 Documentation/driver-api/driver-model/class.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/README.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/bug-bisect.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/bug-hunting.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/init.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/reporting-issues.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/security-bugs.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/tainted-kernels.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/unicode.rst + create mode 100644 Documentation/translations/zh_CN/kernel-hacking/hacking.rst + create mode 100644 Documentation/translations/zh_CN/kernel-hacking/index.rst + create mode 100644 Documentation/translations/zh_CN/riscv/boot-image-header.rst + create mode 100644 Documentation/translations/zh_CN/riscv/index.rst + create mode 100644 Documentation/translations/zh_CN/riscv/patch-acceptance.rst + create mode 100644 Documentation/translations/zh_CN/riscv/pmu.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/controls.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/index.rst + create mode 100644 Documentation/translations/zh_CN/sound/index.rst +Merging v4l-dvb/master (97b34809ec24 media: staging: atomisp: reduce kernel stack usage) +$ git merge v4l-dvb/master +Removing include/media/vp8-ctrls.h +Auto-merging include/media/rc-map.h +Removing include/linux/platform_data/media/camera-mx3.h +Removing include/linux/platform_data/media/camera-mx2.h +Auto-merging drivers/media/rc/keymaps/Makefile +Auto-merging drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +Auto-merging drivers/media/platform/coda/coda-common.c +Removing drivers/media/pci/mantis/mantis_core.c +Auto-merging drivers/media/pci/ivtv/ivtv-driver.c +Auto-merging drivers/media/pci/cx25821/cx25821-alsa.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/devicetree/bindings/media/qcom,camss.txt +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1c8ebe804ac3] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 84 + + .../devicetree/bindings/media/qcom,camss.txt | 236 --- + .../bindings/media/qcom,msm8916-camss.yaml | 256 +++ + .../bindings/media/qcom,msm8996-camss.yaml | 387 ++++ + .../bindings/media/qcom,sdm660-camss.yaml | 398 ++++ + .../bindings/media/qcom,sdm845-camss.yaml | 371 ++++ + Documentation/devicetree/bindings/media/rc.yaml | 2 + + Documentation/driver-api/media/camera-sensor.rst | 3 +- + Documentation/driver-api/media/index.rst | 2 + + .../driver-api/media/maintainer-entry-profile.rst | 206 ++ + Documentation/driver-api/media/v4l2-subdev.rst | 2 +- + .../maintainer/maintainer-entry-profile.rst | 1 + + .../media/cec/cec-ioc-adap-g-caps.rst | 4 +- + .../media/cec/cec-ioc-adap-g-conn-info.rst | 6 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 12 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 10 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 4 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 8 +- + .../userspace-api/media/dvb/fe-type-t.rst | 2 +- + .../media/mediactl/media-ioc-device-info.rst | 2 +- + .../media/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media/mediactl/media-ioc-enum-links.rst | 6 +- + .../media/mediactl/media-ioc-g-topology.rst | 12 +- + .../userspace-api/media/mediactl/media-types.rst | 4 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 2 +- + Documentation/userspace-api/media/v4l/buffer.rst | 22 +- + .../media/v4l/colorspaces-details.rst | 31 - + Documentation/userspace-api/media/v4l/control.rst | 13 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 2 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 50 +- + .../userspace-api/media/v4l/dev-subdev.rst | 6 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 10 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 14 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 519 ++++- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 621 ++---- + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 2 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 7 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 13 +- + .../userspace-api/media/v4l/field-order.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 27 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 36 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 10 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 12 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 6 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 3 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 10 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 34 +- + .../userspace-api/media/v4l/subdev-formats.rst | 30 +- + .../media/v4l/v4l2-selection-flags.rst | 14 +- + .../media/v4l/v4l2-selection-targets.rst | 12 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 4 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 4 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 4 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 2 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 4 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 6 +- + .../media/v4l/vidioc-dbg-g-register.rst | 4 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 21 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 6 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 6 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 2 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 10 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 7 +- + .../media/v4l/vidioc-enum-framesizes.rst | 8 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 4 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 8 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 6 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 2 +- + .../media/v4l/vidioc-g-dv-timings.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 64 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 4 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 5 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 11 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 2 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 29 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 10 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 8 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 27 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 14 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 2 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 12 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 2 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 4 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 2 +- + .../media/v4l/vidioc-subdev-querycap.rst | 4 +- + .../media/v4l/vidioc-subscribe-event.rst | 4 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 10 +- + drivers/clk/clk-ast2600.c | 4 +- + drivers/media/Kconfig | 2 +- + drivers/media/cec/core/cec-notifier.c | 33 +- + drivers/media/common/b2c2/flexcop-hw-filter.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 3 +- + drivers/media/common/siano/smscoreapi.c | 42 +- + drivers/media/common/siano/smscoreapi.h | 5 - + drivers/media/common/siano/smsdvb-main.c | 58 +- + drivers/media/common/videobuf2/frame_vector.c | 1 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 2 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 32 +- + drivers/media/dvb-core/dvb_frontend.c | 93 +- + drivers/media/dvb-core/dvbdev.c | 1 + + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 37 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/i2c/adv748x/adv748x.h | 10 +- + drivers/media/i2c/adv7511-v4l2.c | 58 +- + drivers/media/i2c/adv7604.c | 30 +- + drivers/media/i2c/adv7842.c | 27 +- + drivers/media/i2c/imx274.c | 7 +- + drivers/media/i2c/m5mols/m5mols.h | 4 +- + drivers/media/i2c/max2175.c | 3 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/tvp514x_regs.h | 6 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 28 +- + drivers/media/pci/cx23885/cx23885-core.c | 9 + + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 10 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/mantis/mantis_ca.c | 1 - + drivers/media/pci/mantis/mantis_core.c | 200 -- + drivers/media/pci/mantis/mantis_core.h | 2 - + drivers/media/pci/mantis/mantis_dma.c | 20 +- + drivers/media/pci/mantis/mantis_pci.c | 2 +- + drivers/media/pci/ngene/ngene-cards.c | 6 +- + drivers/media/pci/ngene/ngene-core.c | 56 +- + drivers/media/pci/pt1/pt1.c | 6 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 20 +- + drivers/media/pci/saa7164/saa7164-types.h | 4 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/sta2x11/Kconfig | 1 + + drivers/media/pci/sta2x11/sta2x11_vip.h | 2 + + drivers/media/pci/tw686x/tw686x.h | 10 +- + drivers/media/platform/Kconfig | 19 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/aspeed-video.c | 9 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/fsl-viu.c | 6 +- + drivers/media/platform/imx-jpeg/Kconfig | 11 + + drivers/media/platform/imx-jpeg/Makefile | 3 + + drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c | 168 ++ + drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h | 140 ++ + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 2125 ++++++++++++++++++++ + drivers/media/platform/imx-jpeg/mxc-jpeg.h | 180 ++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 14 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 1 - + drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 10 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 14 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 4 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 8 +- + drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 14 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/mtk-vpu/mtk_vpu.h | 18 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/qcom/camss/Makefile | 6 + + drivers/media/platform/qcom/camss/camss-csid-170.c | 599 ++++++ + drivers/media/platform/qcom/camss/camss-csid-4-1.c | 328 +++ + drivers/media/platform/qcom/camss/camss-csid-4-7.c | 404 ++++ + .../media/platform/qcom/camss/camss-csid-gen1.h | 27 + + .../media/platform/qcom/camss/camss-csid-gen2.h | 39 + + drivers/media/platform/qcom/camss/camss-csid.c | 657 +----- + drivers/media/platform/qcom/camss/camss-csid.h | 150 +- + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 22 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 197 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 102 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 2 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 119 +- + drivers/media/platform/qcom/camss/camss-ispif.h | 3 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 786 ++++++++ + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 144 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 277 ++- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 1195 +++++++++++ + drivers/media/platform/qcom/camss/camss-vfe-gen1.c | 742 +++++++ + drivers/media/platform/qcom/camss/camss-vfe-gen1.h | 117 ++ + drivers/media/platform/qcom/camss/camss-vfe.c | 847 +------- + drivers/media/platform/qcom/camss/camss-vfe.h | 128 +- + drivers/media/platform/qcom/camss/camss-video.c | 52 + + drivers/media/platform/qcom/camss/camss.c | 435 +++- + drivers/media/platform/qcom/camss/camss.h | 19 +- + drivers/media/platform/qcom/venus/core.c | 38 +- + drivers/media/platform/qcom/venus/core.h | 3 + + drivers/media/platform/qcom/venus/firmware.c | 8 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 30 +- + drivers/media/platform/qcom/venus/pm_helpers.h | 7 +- + drivers/media/platform/qcom/venus/vdec.c | 10 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 16 +- + drivers/media/platform/qcom/venus/venc.c | 14 + + drivers/media/platform/qcom/venus/venc_ctrls.c | 8 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 19 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 445 ++-- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 13 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 16 + + drivers/media/platform/sti/bdisp/bdisp-filter.h | 4 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + .../platform/sti/c8sectpfe/c8sectpfe-debugfs.h | 3 +- + drivers/media/platform/sti/hva/hva-h264.c | 10 +- + drivers/media/platform/sti/hva/hva.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 1 + + drivers/media/platform/ti-vpe/cal-video.c | 332 ++- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/ti-vpe/cal.h | 21 +- + drivers/media/platform/ti-vpe/vpdma.c | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 2 +- + drivers/media/platform/vsp1/vsp1_drm.h | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 1 + + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-si476x.c | 6 +- + drivers/media/rc/img-ir/img-ir-hw.c | 2 +- + drivers/media/rc/ite-cir.c | 349 +--- + drivers/media/rc/ite-cir.h | 51 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-minix-neo.c | 55 + + drivers/media/rc/keymaps/rc-xbox-360.c | 83 + + drivers/media/spi/cxd2880-spi.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 1 - + drivers/media/test-drivers/vim2m.c | 14 +- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 2 +- + drivers/media/tuners/it913x.h | 2 +- + drivers/media/tuners/m88rs6000t.c | 6 +- + drivers/media/tuners/mt2063.c | 6 +- + drivers/media/tuners/qt1010.h | 8 +- + drivers/media/tuners/tda827x.h | 10 +- + drivers/media/tuners/tuner-i2c.h | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 1 - + drivers/media/usb/dvb-usb-v2/anysee.c | 21 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 34 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 70 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 75 +- + drivers/media/usb/em28xx/em28xx-cards.c | 4 + + drivers/media/usb/em28xx/em28xx.h | 2 +- + drivers/media/usb/gspca/sq905.c | 2 +- + drivers/media/usb/gspca/w996Xcf.c | 3 +- + drivers/media/usb/pwc/pwc-dec23.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 8 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 - + drivers/media/usb/usbtv/usbtv-video.c | 6 +- + drivers/media/usb/zr364xx/zr364xx.c | 13 +- + drivers/media/v4l2-core/v4l2-common.c | 5 + + drivers/media/v4l2-core/v4l2-ctrls.c | 55 +- + drivers/media/v4l2-core/v4l2-dev.c | 5 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 3 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 59 +- + drivers/media/v4l2-core/v4l2-mc.c | 8 +- + drivers/staging/media/atomisp/Kconfig | 3 +- + drivers/staging/media/atomisp/Makefile | 5 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 16 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 38 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 105 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 14 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 3 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 8 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 13 +- + .../staging/media/atomisp/pci/ia_css_firmware.h | 2 + + drivers/staging/media/atomisp/pci/ia_css_mipi.h | 17 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- + .../atomisp/pci/isp/modes/interface/isp_types.h | 41 +- + .../atomisp/pci/runtime/isp_param/src/isp_param.c | 3 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 12 +- + .../media/atomisp/pci/runtime/queue/src/queue.c | 44 +- + .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 41 +- + .../media/atomisp/pci/runtime/spctrl/src/spctrl.c | 7 +- + .../media/atomisp/pci/runtime/timer/src/timer.c | 7 +- + drivers/staging/media/atomisp/pci/sh_css.c | 12 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 2 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 11 - + drivers/staging/media/atomisp/pci/sh_css_params.c | 10 +- + drivers/staging/media/hantro/hantro.h | 3 +- + drivers/staging/media/hantro/hantro_drv.c | 2 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 55 +- + drivers/staging/media/hantro/hantro_hw.h | 4 +- + drivers/staging/media/hantro/hantro_vp8.c | 10 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 55 +- + drivers/staging/media/imx/Kconfig | 9 +- + drivers/staging/media/imx/Makefile | 6 +- + drivers/staging/media/imx/TODO | 9 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 24 +- + drivers/staging/media/imx/imx-media-capture.c | 687 ++++--- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 33 +- + drivers/staging/media/imx/imx-media-dev-common.c | 4 + + drivers/staging/media/imx/imx-media-utils.c | 23 +- + drivers/staging/media/imx/imx-media-vdic.c | 7 +- + drivers/staging/media/imx/imx-media.h | 12 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 6 +- + drivers/staging/media/imx/imx7-media-csi.c | 1014 +++++----- + drivers/staging/media/imx/imx7-mipi-csis.c | 400 ++-- + drivers/staging/media/ipu3/ipu3-css-fw.h | 1 + + drivers/staging/media/ipu3/ipu3-css-pool.h | 4 +- + .../staging/media/meson/vdec/codec_hevc_common.h | 4 +- + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss_regs.h | 16 +- + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 113 +- + drivers/staging/media/tegra-video/csi.h | 2 +- + include/linux/platform_data/media/camera-mx2.h | 31 - + include/linux/platform_data/media/camera-mx3.h | 43 - + include/media/cec.h | 2 +- + include/media/davinci/isif.h | 8 +- + include/media/davinci/vpbe_osd.h | 6 +- + include/media/dvbdev.h | 2 +- + include/media/i2c/adv7343.h | 2 +- + include/media/i2c/mt9t112.h | 2 +- + include/media/i2c/noon010pc30.h | 1 + + include/media/i2c/ov772x.h | 2 +- + include/media/i2c/s5c73m3.h | 1 + + include/media/i2c/s5k4ecgx.h | 6 +- + include/media/i2c/s5k6aa.h | 1 + + include/media/i2c/tvp514x.h | 11 +- + include/media/i2c/tw9910.h | 8 +- + include/media/rc-map.h | 2 + + include/media/v4l2-ctrls.h | 5 +- + include/media/v4l2-h264.h | 6 +- + include/media/v4l2-jpeg.h | 22 + + include/media/v4l2-mc.h | 8 +- + include/media/videobuf2-core.h | 6 +- + include/media/vp8-ctrls.h | 114 -- + include/uapi/linux/cec.h | 3 +- + include/uapi/linux/uvcvideo.h | 10 +- + include/uapi/linux/v4l2-controls.h | 202 +- + include/uapi/linux/v4l2-subdev.h | 12 +- + include/uapi/linux/videodev2.h | 20 +- + 363 files changed, 14459 insertions(+), 6045 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml + delete mode 100644 Documentation/devicetree/bindings/media/qcom,camss.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml + create mode 100644 Documentation/driver-api/media/maintainer-entry-profile.rst + delete mode 100644 drivers/media/pci/mantis/mantis_core.c + create mode 100644 drivers/media/platform/imx-jpeg/Kconfig + create mode 100644 drivers/media/platform/imx-jpeg/Makefile + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg.c + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg.h + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-gen1.h + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-gen2.h + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h + create mode 100644 drivers/media/rc/keymaps/rc-minix-neo.c + create mode 100644 drivers/media/rc/keymaps/rc-xbox-360.c + delete mode 100644 include/linux/platform_data/media/camera-mx2.h + delete mode 100644 include/linux/platform_data/media/camera-mx3.h + delete mode 100644 include/media/vp8-ctrls.h +Merging v4l-dvb-next/master (1e28eed17697 Linux 5.12-rc3) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (972d86381b18 Merge branch 'pm-em' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/firmware-guide/acpi/debug.rst | 36 ++---- + MAINTAINERS | 16 +++ + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpi_processor.c | 33 ++--- + drivers/acpi/acpi_video.c | 4 +- + drivers/acpi/acpica/nsaccess.c | 3 +- + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/apei/hest.c | 2 +- + drivers/acpi/cppc_acpi.c | 11 +- + drivers/acpi/hed.c | 1 - + drivers/acpi/internal.h | 7 +- + drivers/acpi/numa/hmat.c | 2 +- + drivers/acpi/pci_irq.c | 34 ++--- + drivers/acpi/pci_link.c | 164 +++++++++++------------- + drivers/acpi/pmic/intel_pmic_chtcrc.c | 2 +- + drivers/acpi/power.c | 15 +-- + drivers/acpi/processor_driver.c | 6 +- + drivers/acpi/processor_idle.c | 38 +++--- + drivers/acpi/processor_pdc.c | 7 +- + drivers/acpi/processor_perflib.c | 50 ++++---- + drivers/acpi/processor_throttling.c | 102 +++++++-------- + drivers/acpi/resource.c | 2 +- + drivers/acpi/scan.c | 37 +++++- + drivers/acpi/sleep.h | 1 - + drivers/acpi/sysfs.c | 14 +- + drivers/acpi/utils.c | 14 ++ + drivers/acpi/video_detect.c | 1 + + drivers/base/power/domain.c | 36 ------ + drivers/base/power/runtime.c | 45 ++++++- + drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +- + drivers/cpufreq/intel_pstate.c | 101 +++++++-------- + drivers/hwmon/acpi_power_meter.c | 29 +++-- + drivers/idle/intel_idle.c | 4 +- + drivers/iio/light/acpi-als.c | 4 +- + drivers/powercap/intel_rapl_common.c | 1 + + drivers/powercap/intel_rapl_msr.c | 1 + + include/acpi/acpi_bus.h | 1 + + include/acpi/acpi_drivers.h | 12 -- + include/acpi/cppc_acpi.h | 40 ++++++ + include/linux/acpi.h | 5 + + kernel/power/energy_model.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 29 ++--- + tools/power/pm-graph/sleepgraph.py | 2 +- + 44 files changed, 456 insertions(+), 470 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c3135d28a1e0 cpufreq: dt: dev_pm_opp_of_cpumask_add_table() may return -EPROBE_DEFER) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging kernel/sched/core.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/topology.h | 10 +- + arch/arm64/kernel/topology.c | 109 ++++++---------- + drivers/base/arch_topology.c | 89 ++++++++++++- + drivers/cpufreq/Kconfig.arm | 10 ++ + drivers/cpufreq/cppc_cpufreq.c | 259 ++++++++++++++++++++++++++++++++++---- + drivers/cpufreq/cpufreq-dt.c | 9 +- + drivers/cpufreq/s5pv210-cpufreq.c | 14 +-- + include/linux/arch_topology.h | 19 ++- + kernel/sched/core.c | 1 + + 9 files changed, 401 insertions(+), 119 deletions(-) +Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (cc0a62bc9731 PM / devfreq: imx8m-ddrc: Remove imx8m_ddrc_get_dev_status) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 5 +- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 75 +++++++++++----------- + drivers/devfreq/Kconfig | 2 +- + drivers/devfreq/devfreq.c | 14 +++- + drivers/devfreq/governor.h | 5 +- + drivers/devfreq/imx8m-ddrc.c | 14 ---- + drivers/devfreq/rk3399_dmc.c | 20 ++---- + include/linux/devfreq.h | 9 +++ + 8 files changed, 68 insertions(+), 76 deletions(-) +Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/lima/lima_devfreq.c | 47 +++-------- + drivers/gpu/drm/lima/lima_devfreq.h | 3 - + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 37 ++------- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 - + drivers/memory/samsung/exynos5422-dmc.c | 13 +-- + drivers/mmc/host/sdhci-msm.c | 19 ++--- + drivers/opp/core.c | 122 ++++++++++++++++++++++------ + drivers/opp/of.c | 36 ++++++++ + drivers/spi/spi-geni-qcom.c | 16 ++-- + drivers/spi/spi-qcom-qspi.c | 18 ++-- + drivers/tty/serial/qcom_geni_serial.c | 23 ++---- + include/linux/pm_opp.h | 44 ++++++++-- + include/linux/qcom-geni-se.h | 2 - + 13 files changed, 217 insertions(+), 165 deletions(-) +Merging thermal/thermal/linux-next (6e3e14c9385c thermal/core/power_allocator: Using round the division when re-divvying up power) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../bindings/thermal/rcar-gen3-thermal.yaml | 43 ++++++++++++++++---- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 2 +- + drivers/thermal/amlogic_thermal.c | 4 +- + drivers/thermal/cpufreq_cooling.c | 47 ++++++---------------- + drivers/thermal/cpuidle_cooling.c | 33 ++++++++------- + drivers/thermal/devfreq_cooling.c | 25 ++++-------- + drivers/thermal/gov_power_allocator.c | 8 ++-- + drivers/thermal/rcar_gen3_thermal.c | 3 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 2 +- + drivers/thermal/thermal_core.c | 38 +++++++++-------- + drivers/thermal/thermal_of.c | 7 +++- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 1 - + include/linux/thermal.h | 2 +- + include/uapi/linux/thermal.h | 2 +- + 15 files changed, 112 insertions(+), 109 deletions(-) +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (9d232469bcd7 fs: dlm: add shutdown hook) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 86 ++++++++++++++++-------- + fs/dlm/config.h | 1 - + fs/dlm/debug_fs.c | 1 + + fs/dlm/lock.c | 2 - + fs/dlm/lockspace.c | 20 +++--- + fs/dlm/lowcomms.c | 193 ++++++++++++++++++++++++++++++----------------------- + fs/dlm/lowcomms.h | 5 ++ + fs/dlm/midcomms.c | 33 +++++---- + fs/dlm/rcom.c | 2 - + 9 files changed, 201 insertions(+), 142 deletions(-) +Merging swiotlb/linux-next (2cbc2776efe4 swiotlb: remove swiotlb_nr_tbl) +$ git merge swiotlb/linux-next +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'recursive' strategy. + arch/arm/xen/mm.c | 2 +- + arch/powerpc/platforms/pseries/svm.c | 6 +- + arch/x86/xen/pci-swiotlb-xen.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/iommu/dma-iommu.c | 23 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/xen/swiotlb-xen.c | 182 +++++----- + include/linux/swiotlb.h | 68 +++- + include/xen/swiotlb-xen.h | 3 +- + kernel/dma/direct.c | 8 +- + kernel/dma/direct.h | 6 +- + kernel/dma/swiotlb.c | 505 ++++++++++----------------- + 13 files changed, 337 insertions(+), 476 deletions(-) +Merging rdma/for-next (783cf673b05e RDMA/hns: Fix memory corruption when allocating XRCDN) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Merge made by the 'recursive' strategy. + .../bindings/infiniband/hisilicon-hns-roce.txt | 2 +- + drivers/infiniband/core/cma.c | 10 +- + drivers/infiniband/core/device.c | 1 - + drivers/infiniband/core/umem.c | 4 - + drivers/infiniband/core/umem_dmabuf.c | 4 + + drivers/infiniband/core/uverbs_ioctl.c | 32 ++++- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 11 -- + drivers/infiniband/hw/cxgb4/t4.h | 33 ----- + drivers/infiniband/hw/hfi1/chip.c | 4 +- + drivers/infiniband/hw/hfi1/chip.h | 5 - + drivers/infiniband/hw/hfi1/driver.c | 2 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 6 +- + drivers/infiniband/hw/hfi1/hfi.h | 6 - + drivers/infiniband/hw/hfi1/init.c | 3 +- + drivers/infiniband/hw/hfi1/msix.c | 12 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 5 - + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 + + drivers/infiniband/hw/hns/hns_roce_device.h | 25 ++++ + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 150 +++++++++++++------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 + + drivers/infiniband/hw/hns/hns_roce_main.c | 32 ++++- + drivers/infiniband/hw/hns/hns_roce_pd.c | 59 ++++++++ + drivers/infiniband/hw/hns/hns_roce_qp.c | 112 +++++++++------ + drivers/infiniband/hw/hns/hns_roce_srq.c | 3 + + drivers/infiniband/hw/i40iw/i40iw.h | 9 -- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hmc.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 22 --- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 64 +++++++-- + drivers/infiniband/hw/mlx5/main.c | 7 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 106 ++++++++------ + drivers/infiniband/hw/mlx5/mr.c | 157 ++++++++++----------- + drivers/infiniband/hw/mlx5/odp.c | 152 +++----------------- + drivers/infiniband/hw/mlx5/qp.c | 15 +- + drivers/infiniband/hw/qib/qib.h | 26 ---- + drivers/infiniband/hw/qib/qib_common.h | 7 - + drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 4 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 10 -- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 35 ----- + drivers/infiniband/sw/siw/iwarp.h | 13 -- + drivers/infiniband/sw/siw/siw_cm.c | 19 ++- + drivers/infiniband/sw/siw/siw_mem.h | 5 - + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 19 +-- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 10 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 8 +- + include/linux/mlx5/driver.h | 2 +- + include/rdma/ib_verbs.h | 15 -- + include/rdma/iw_cm.h | 1 + + include/rdma/rdma_vt.h | 8 +- + include/rdma/uverbs_ioctl.h | 80 +++++++++-- + include/uapi/rdma/hns-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + 65 files changed, 704 insertions(+), 659 deletions(-) +Merging net-next/master (6c996e19949b net: change netdev_unregister_timeout_secs min value to 1) +$ git merge net-next/master +Removing tools/testing/selftests/drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh +Removing tools/lib/bpf/libbpf_util.h +Removing tools/bpf/Makefile.helpers +Auto-merging net/ipv4/esp4.c +Auto-merging include/linux/mlx5/driver.h +Removing include/linux/atm_suni.h +Removing drivers/staging/fsl-dpaa2/ethsw/ethsw.h +Removing drivers/staging/fsl-dpaa2/ethsw/ethsw.c +Removing drivers/staging/fsl-dpaa2/ethsw/dpsw.h +Removing drivers/staging/fsl-dpaa2/ethsw/TODO +Removing drivers/staging/fsl-dpaa2/ethsw/README +Removing drivers/staging/fsl-dpaa2/ethsw/Makefile +Removing drivers/staging/fsl-dpaa2/Makefile +Removing drivers/staging/fsl-dpaa2/Kconfig +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net-phydev | 12 + + Documentation/admin-guide/sysctl/net.rst | 11 + + Documentation/bpf/btf.rst | 17 +- + Documentation/bpf/index.rst | 9 +- + .../devicetree/bindings/net/actions,owl-emac.yaml | 92 + + .../devicetree/bindings/net/brcm,bcm4908-enet.yaml | 17 +- + .../bindings/net/brcm,bcm6368-mdio-mux.yaml | 76 + + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 4 + + .../device_drivers/ethernet/microsoft/netvsc.rst | 14 +- + .../networking/device_drivers/fddi/defza.rst | 2 +- + .../networking/devlink/devlink-health.rst | 17 +- + Documentation/networking/dsa/configuration.rst | 330 +-- + Documentation/networking/dsa/dsa.rst | 372 ++- + Documentation/networking/nf_flowtable.rst | 170 +- + Documentation/networking/phy.rst | 4 +- + Documentation/networking/switchdev.rst | 200 +- + Documentation/userspace-api/ebpf/index.rst | 17 + + Documentation/userspace-api/ebpf/syscall.rst | 24 + + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 10 +- + arch/s390/net/bpf_jit_comp.c | 64 +- + drivers/atm/fore200e.c | 1 - + drivers/atm/suni.c | 1 - + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 - + drivers/isdn/hardware/mISDN/iohelper.h | 14 +- + drivers/isdn/mISDN/dsp_core.c | 3 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/Kconfig | 1 + + drivers/net/Makefile | 2 +- + drivers/net/bonding/bond_options.c | 9 + + drivers/net/dsa/Kconfig | 17 +- + drivers/net/dsa/b53/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 23 +- + drivers/net/dsa/b53/b53_mmap.c | 55 + + drivers/net/dsa/b53/b53_priv.h | 4 - + drivers/net/dsa/b53/b53_spi.c | 14 + + drivers/net/dsa/bcm_sf2.c | 121 +- + drivers/net/dsa/bcm_sf2.h | 2 + + drivers/net/dsa/bcm_sf2_regs.h | 8 +- + drivers/net/dsa/hirschmann/hellcreek.c | 370 ++- + drivers/net/dsa/hirschmann/hellcreek.h | 7 + + drivers/net/dsa/lantiq_gswip.c | 162 +- + drivers/net/dsa/mt7530.c | 124 +- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 503 +++- + drivers/net/dsa/mv88e6xxx/chip.h | 20 +- + drivers/net/dsa/mv88e6xxx/global1.c | 19 +- + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global2.h | 8 + + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 6 +- + drivers/net/dsa/mv88e6xxx/port.c | 418 ++- + drivers/net/dsa/mv88e6xxx/port.h | 50 + + drivers/net/dsa/mv88e6xxx/serdes.c | 338 ++- + drivers/net/dsa/mv88e6xxx/serdes.h | 98 +- + drivers/net/dsa/ocelot/felix.c | 4 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 9 +- + drivers/net/dsa/sja1105/sja1105_main.c | 16 - + drivers/net/ethernet/3com/3c509.c | 1 + + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/actions/Kconfig | 26 + + drivers/net/ethernet/actions/Makefile | 6 + + drivers/net/ethernet/actions/owl-emac.c | 1625 +++++++++++ + drivers/net/ethernet/actions/owl-emac.h | 280 ++ + drivers/net/ethernet/amazon/ena/ena_com.h | 2 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 25 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 21 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 30 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 146 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 108 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 9 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 20 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 1 - + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 266 +- + drivers/net/ethernet/cadence/macb.h | 14 + + drivers/net/ethernet/cadence/macb_main.c | 48 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 11 +- + drivers/net/ethernet/faraday/ftmac100.c | 13 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 12 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 8 + + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 - + .../freescale/dpaa2/dpaa2-switch-ethtool.c} | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3031 ++++++++++++++++++++ + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 179 ++ + drivers/net/ethernet/freescale/dpaa2/dpkg.h | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpmac.h | 24 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 6 + + drivers/net/ethernet/freescale/dpaa2/dpni.h | 162 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 3 - + .../ethernet/freescale/dpaa2}/dpsw-cmd.h | 145 +- + .../ethsw => net/ethernet/freescale/dpaa2}/dpsw.c | 570 ++-- + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 631 ++++ + drivers/net/ethernet/freescale/enetc/enetc.c | 292 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 34 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 82 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 81 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 8 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 8 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 6 - + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 22 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 27 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 41 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 95 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 26 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 106 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 10 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 5 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 10 - + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 17 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 13 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 60 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 20 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1579 ++++++---- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 58 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 39 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 2 + + drivers/net/ethernet/hisilicon/hns_mdio.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 29 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 1 - + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 1 + + drivers/net/ethernet/intel/e1000/e1000_hw.c | 1 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 18 +- + drivers/net/ethernet/intel/e1000e/phy.c | 2 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 13 +- + drivers/net/ethernet/intel/iavf/Makefile | 2 +- + drivers/net/ethernet/intel/iavf/iavf.h | 12 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 631 ++++ + drivers/net/ethernet/intel/iavf/iavf_fdir.c | 773 +++++ + drivers/net/ethernet/intel/iavf/iavf_fdir.h | 113 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 31 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 196 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 5 +- + drivers/net/ethernet/intel/ice/ice_common.c | 2 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 55 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 4 + + drivers/net/ethernet/intel/ice/ice_fdir.c | 488 +++- + drivers/net/ethernet/intel/ice/ice_fdir.h | 58 + + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 528 +++- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 3 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 78 + + drivers/net/ethernet/intel/ice/ice_flow.c | 725 ++++- + drivers/net/ethernet/intel/ice/ice_flow.h | 160 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 18 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 22 + + drivers/net/ethernet/intel/ice/ice_lib.c | 64 +- + drivers/net/ethernet/intel/ice/ice_main.c | 15 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 10 + + drivers/net/ethernet/intel/ice/ice_sched.c | 2 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 20 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 1 + + drivers/net/ethernet/intel/ice/ice_type.h | 18 + + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 2204 ++++++++++++++ + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h | 55 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 82 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 8 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 12 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 1 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 41 +- + drivers/net/ethernet/intel/igb/igb_main.c | 21 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 1 + + drivers/net/ethernet/intel/igc/igc_defines.h | 5 - + drivers/net/ethernet/intel/igc/igc_i225.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 18 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 40 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 18 +- + drivers/net/ethernet/marvell/mvneta.c | 13 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 60 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 28 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 7 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 17 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 10 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 196 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 79 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 20 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 47 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 37 + + .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 787 +++++ + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 41 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 23 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 511 ++++ + drivers/net/ethernet/mediatek/mtk_ppe.h | 287 ++ + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 217 ++ + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 485 ++++ + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 144 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 3 - + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 38 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 14 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 5 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 10 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 15 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 114 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 286 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 10 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 144 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 18 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 62 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c | 5 - + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 143 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 2 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 1 + + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 19 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 21 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 131 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 11 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 55 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 71 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 130 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 210 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 76 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 25 + + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 83 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 21 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flow.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 23 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_matchall.c | 199 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 1 - + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 15 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 681 ++++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 12 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 21 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 16 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 74 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 213 +- + drivers/net/ethernet/microchip/encx24j600.c | 3 +- + drivers/net/ethernet/mscc/Kconfig | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 102 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 5 + + drivers/net/ethernet/mscc/ocelot_mrp.c | 225 +- + drivers/net/ethernet/mscc/ocelot_net.c | 214 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 4 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 5 + + drivers/net/ethernet/netronome/nfp/nfp_app.h | 1 - + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 79 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 - + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 9 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 + + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 4 + + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 12 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 23 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 16 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 28 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 83 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 23 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 26 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 145 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 741 ++--- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_fp.c | 19 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 1 - + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 10 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 12 - + .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 11 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 56 +- + drivers/net/ethernet/realtek/r8169_main.c | 23 +- + drivers/net/ethernet/renesas/sh_eth.c | 10 +- + drivers/net/ethernet/renesas/sh_eth.h | 114 +- + drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- + drivers/net/ethernet/sfc/tx.c | 15 +- + drivers/net/ethernet/socionext/netsec.c | 16 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 15 + + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 60 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 169 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 + + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 15 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 135 + + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 43 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 16 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 16 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 124 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 11 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 340 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 111 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 35 + + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 23 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 124 +- + drivers/net/ethernet/sun/cassini.c | 1 + + drivers/net/ethernet/sun/sungem.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 14 +- + drivers/net/ethernet/ti/cpsw_new.c | 14 +- + drivers/net/ethernet/ti/cpsw_priv.c | 11 +- + drivers/net/fddi/Kconfig | 16 - + drivers/net/fddi/defxx.c | 96 +- + drivers/net/fddi/defxx.h | 5 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fddi/skfp/h/smt.h | 12 +- + drivers/net/fddi/skfp/smt.c | 4 +- + drivers/net/hyperv/netvsc.c | 20 + + drivers/net/hyperv/netvsc_drv.c | 33 +- + drivers/net/ipa/Kconfig | 2 +- + drivers/net/ipa/gsi.c | 47 +- + drivers/net/ipa/gsi.h | 4 +- + drivers/net/ipa/gsi_reg.h | 69 +- + drivers/net/ipa/ipa_cmd.c | 26 +- + drivers/net/ipa/ipa_data-sc7180.c | 41 +- + drivers/net/ipa/ipa_data-sdm845.c | 34 +- + drivers/net/ipa/ipa_data.h | 56 +- + drivers/net/ipa/ipa_endpoint.c | 56 +- + drivers/net/ipa/ipa_endpoint.h | 1 - + drivers/net/ipa/ipa_interrupt.c | 54 +- + drivers/net/ipa/ipa_main.c | 110 +- + drivers/net/ipa/ipa_mem.c | 6 +- + drivers/net/ipa/ipa_mem.h | 10 +- + drivers/net/ipa/ipa_qmi.c | 4 +- + drivers/net/ipa/ipa_qmi_msg.c | 78 +- + drivers/net/ipa/ipa_qmi_msg.h | 6 +- + drivers/net/ipa/ipa_reg.h | 432 ++- + drivers/net/ipa/ipa_table.c | 42 +- + drivers/net/ipa/ipa_table.h | 5 +- + drivers/net/ipa/ipa_uc.c | 5 +- + drivers/net/ipa/ipa_version.h | 29 +- + drivers/net/mdio/Kconfig | 11 + + drivers/net/mdio/Makefile | 1 + + drivers/net/mdio/mdio-bcm-unimac.c | 16 +- + drivers/net/mdio/mdio-bitbang.c | 4 +- + drivers/net/mdio/mdio-cavium.c | 2 +- + drivers/net/mdio/mdio-gpio.c | 10 +- + drivers/net/mdio/mdio-ipq4019.c | 4 +- + drivers/net/mdio/mdio-ipq8064.c | 4 +- + drivers/net/mdio/mdio-mscc-miim.c | 8 +- + drivers/net/mdio/mdio-mux-bcm-iproc.c | 10 +- + drivers/net/mdio/mdio-mux-bcm6368.c | 184 ++ + drivers/net/mdio/mdio-mux-gpio.c | 8 +- + drivers/net/mdio/mdio-mux-mmioreg.c | 6 +- + drivers/net/mdio/mdio-mux-multiplexer.c | 2 +- + drivers/net/mdio/mdio-mux.c | 6 +- + drivers/net/mdio/mdio-octeon.c | 8 +- + drivers/net/mdio/mdio-thunder.c | 10 +- + drivers/net/mdio/mdio-xgene.c | 6 +- + drivers/net/mdio/of_mdio.c | 10 +- + drivers/net/netdevsim/Makefile | 4 + + drivers/net/netdevsim/dev.c | 17 +- + drivers/net/netdevsim/fib.c | 145 +- + drivers/net/netdevsim/health.c | 11 +- + drivers/net/netdevsim/netdevsim.h | 15 + + drivers/net/netdevsim/psample.c | 264 ++ + drivers/net/pcs/pcs-xpcs.c | 257 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 31 - + drivers/net/phy/marvell-88x2222.c | 519 ++++ + drivers/net/phy/marvell10g.c | 2 + + drivers/net/phy/mscc/mscc_main.c | 217 +- + drivers/net/phy/phy-c45.c | 8 + + drivers/net/phy/phy_device.c | 11 + + drivers/net/phy/phylink.c | 5 +- + drivers/net/plip/plip.c | 2 + + drivers/net/ppp/ppp_generic.c | 22 + + drivers/net/ppp/pppoe.c | 27 +- + drivers/net/tun.c | 15 +- + drivers/net/usb/cdc_ncm.c | 1 - + drivers/net/usb/lan78xx.c | 1 - + drivers/net/veth.c | 28 +- + drivers/net/virtio_net.c | 110 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 53 +- + drivers/net/vxlan.c | 1 + + drivers/net/wan/lapbether.c | 36 +- + drivers/net/xen-netfront.c | 18 +- + drivers/nfc/fdp/fdp.c | 7 +- + drivers/of/of_net.c | 3 + + drivers/ptp/ptp_clockmatrix.c | 4 +- + drivers/ptp/ptp_pch.c | 21 +- + drivers/s390/net/qeth_core_main.c | 18 +- + drivers/s390/net/qeth_l3_main.c | 25 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fsl-dpaa2/Kconfig | 19 - + drivers/staging/fsl-dpaa2/Makefile | 6 - + drivers/staging/fsl-dpaa2/ethsw/Makefile | 10 - + drivers/staging/fsl-dpaa2/ethsw/README | 106 - + drivers/staging/fsl-dpaa2/ethsw/TODO | 13 - + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 594 ---- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 1839 ------------ + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 80 - + include/linux/atm_suni.h | 12 - + include/linux/avf/virtchnl.h | 278 ++ + include/linux/bpf.h | 94 +- + include/linux/bpf_local_storage.h | 3 +- + include/linux/bpf_lsm.h | 22 - + include/linux/bpf_types.h | 8 +- + include/linux/bpf_verifier.h | 3 + + include/linux/btf.h | 1 + + include/linux/dsa/ocelot.h | 5 - + include/linux/etherdevice.h | 4 +- + include/linux/ethtool.h | 9 + + include/linux/filter.h | 31 +- + include/linux/if_bridge.h | 40 + + include/linux/if_rmnet.h | 65 +- + include/linux/marvell_phy.h | 1 + + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/driver.h | 12 +- + include/linux/netdevice.h | 129 +- + include/linux/pcs/pcs-xpcs.h | 5 + + include/linux/phy.h | 1 + + include/linux/phylink.h | 2 + + include/linux/platform_data/hirschmann-hellcreek.h | 1 + + include/linux/ppp_channel.h | 3 + + include/linux/ptp_pch.h | 22 + + include/linux/qed/qed_chain.h | 8 +- + include/linux/sched.h | 5 + + include/linux/skbuff.h | 32 +- + include/linux/skmsg.h | 82 +- + include/linux/stmmac.h | 34 + + include/net/dsa.h | 16 + + include/net/flow_dissector.h | 6 +- + include/net/flow_offload.h | 6 + + include/net/gro.h | 13 + + include/net/ipv6.h | 1 + + include/net/lapb.h | 2 +- + include/net/mptcp.h | 9 +- + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 - + include/net/netfilter/nf_flow_table.h | 61 +- + include/net/netfilter/nf_tables.h | 9 +- + include/net/netns/ipv4.h | 1 - + include/net/nexthop.h | 72 +- + include/net/pkt_sched.h | 9 + + include/net/psample.h | 21 +- + include/net/sch_generic.h | 14 + + include/net/switchdev.h | 1 + + include/net/tc_act/tc_police.h | 52 + + include/net/tcp.h | 41 +- + include/net/udp.h | 4 +- + include/net/xdp_sock.h | 19 - + include/soc/mscc/ocelot.h | 25 +- + include/trace/events/xdp.h | 62 +- + include/uapi/linux/bpf.h | 762 ++++- + include/uapi/linux/btf.h | 5 +- + include/uapi/linux/ethtool.h | 39 +- + include/uapi/linux/if_fddi.h | 2 +- + include/uapi/linux/nexthop.h | 47 +- + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/psample.h | 7 + + include/uapi/linux/rtnetlink.h | 8 + + init/Kconfig | 1 + + kernel/bpf/Makefile | 3 +- + kernel/bpf/arraymap.c | 40 + + kernel/bpf/bpf_inode_storage.c | 2 +- + kernel/bpf/bpf_iter.c | 16 + + kernel/bpf/bpf_local_storage.c | 39 +- + kernel/bpf/bpf_lsm.c | 8 +- + kernel/bpf/bpf_task_storage.c | 100 +- + kernel/bpf/btf.c | 108 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 47 +- + kernel/bpf/hashtab.c | 67 +- + kernel/bpf/helpers.c | 2 + + kernel/bpf/verifier.c | 394 ++- + kernel/fork.c | 5 + + kernel/trace/bpf_trace.c | 6 + + lib/test_rhashtable.c | 9 +- + net/6lowpan/nhc_udp.c | 4 +- + net/8021q/vlan_core.c | 10 +- + net/8021q/vlan_dev.c | 21 + + net/Kconfig | 14 +- + net/ax25/af_ax25.c | 1 + + net/batman-adv/bridge_loop_avoidance.c | 5 +- + net/bpf/test_run.c | 244 +- + net/bridge/br_arp_nd_proxy.c | 4 +- + net/bridge/br_device.c | 49 + + net/bridge/br_fdb.c | 50 + + net/bridge/br_input.c | 1 + + net/bridge/br_mdb.c | 148 +- + net/bridge/br_mrp.c | 7 + + net/bridge/br_multicast_eht.c | 141 +- + net/bridge/br_private.h | 20 + + net/bridge/br_stp.c | 27 + + net/bridge/br_vlan.c | 128 + + net/bridge/br_vlan_tunnel.c | 2 +- + net/ceph/osdmap.c | 2 +- + net/core/Makefile | 6 +- + net/core/bpf_sk_storage.c | 2 +- + net/core/dev.c | 364 ++- + net/core/dev_addr_lists.c | 2 +- + net/core/drop_monitor.c | 2 +- + net/core/filter.c | 275 +- + net/core/flow_dissector.c | 41 +- + net/core/net-procfs.c | 3 - + net/core/net-sysfs.c | 177 +- + net/core/skbuff.c | 15 +- + net/core/skmsg.c | 212 +- + net/core/sock_map.c | 77 +- + net/core/sysctl_net_core.c | 10 + + net/decnet/dn_nsp_in.c | 2 +- + net/decnet/dn_route.c | 49 +- + net/dsa/Kconfig | 17 +- + net/dsa/dsa_priv.h | 23 +- + net/dsa/port.c | 197 +- + net/dsa/slave.c | 47 +- + net/dsa/tag_brcm.c | 107 +- + net/dsa/tag_mtk.c | 14 +- + net/dsa/tag_ocelot.c | 8 - + net/dsa/tag_rtl4_a.c | 2 +- + net/ethernet/eth.c | 13 +- + net/ethtool/ioctl.c | 21 + + net/hsr/hsr_debugfs.c | 2 +- + net/ipv4/Makefile | 2 +- + net/ipv4/esp4.c | 4 +- + net/ipv4/nexthop.c | 1524 +++++++++- + net/ipv4/route.c | 183 +- + net/ipv4/tcp.c | 12 + + net/ipv4/tcp_bpf.c | 4 +- + net/ipv4/tcp_input.c | 10 +- + net/ipv4/tcp_output.c | 20 +- + net/ipv6/exthdrs.c | 5 +- + net/ipv6/route.c | 26 +- + net/ipv6/seg6_local.c | 11 +- + net/l2tp/l2tp_core.c | 2 +- + net/lapb/lapb_iface.c | 4 +- + net/lapb/lapb_timer.c | 19 +- + net/mptcp/options.c | 47 +- + net/mptcp/pm.c | 39 +- + net/mptcp/pm_netlink.c | 139 +- + net/mptcp/protocol.h | 27 +- + net/netfilter/nf_conntrack_proto_dccp.c | 1 + + net/netfilter/nf_flow_table_core.c | 106 +- + net/netfilter/nf_flow_table_ip.c | 461 +-- + net/netfilter/nf_flow_table_offload.c | 223 +- + net/netfilter/nf_tables_api.c | 32 +- + net/netfilter/nft_ct.c | 1 + + net/netfilter/nft_flow_offload.c | 211 +- + net/openvswitch/vport.c | 8 +- + net/openvswitch/vport.h | 2 +- + net/packet/af_packet.c | 2 +- + net/psample/psample.c | 45 +- + net/rds/recv.c | 4 - + net/rose/rose_route.c | 2 + + net/sched/act_police.c | 59 +- + net/sched/act_sample.c | 27 +- + net/sched/cls_api.c | 3 + + net/sched/cls_flower.c | 40 +- + net/sched/sch_cbq.c | 4 +- + net/sched/sch_generic.c | 75 +- + net/sched/sch_taprio.c | 64 +- + net/socket.c | 2 +- + net/tipc/addr.c | 1 + + net/tipc/addr.h | 46 +- + net/tipc/bearer.c | 50 +- + net/tipc/crypto.c | 12 +- + net/tipc/monitor.c | 63 +- + net/tipc/msg.c | 23 +- + net/tipc/name_distr.c | 93 +- + net/tipc/name_table.c | 426 +-- + net/tipc/name_table.h | 63 +- + net/tipc/net.c | 8 +- + net/tipc/netlink_compat.c | 2 +- + net/tipc/node.c | 33 +- + net/tipc/socket.c | 319 +- + net/tipc/subscr.c | 86 +- + net/tipc/subscr.h | 14 +- + net/tls/tls_device.c | 2 +- + net/xdp/xsk.c | 114 +- + net/xdp/xsk_queue.h | 30 +- + net/xdp/xskmap.c | 17 +- + samples/bpf/do_hbm_test.sh | 2 +- + samples/pktgen/README.rst | 18 + + samples/pktgen/functions.sh | 7 +- + samples/pktgen/parameters.sh | 15 +- + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 3 - + .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 3 - + samples/pktgen/pktgen_sample01_simple.sh | 25 +- + samples/pktgen/pktgen_sample02_multiqueue.sh | 29 +- + .../pktgen/pktgen_sample03_burst_single_flow.sh | 15 +- + samples/pktgen/pktgen_sample04_many_flows.sh | 17 +- + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 17 +- + ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 31 +- + scripts/{bpf_helpers_doc.py => bpf_doc.py} | 191 +- + security/selinux/nlmsgtab.c | 5 +- + tools/bpf/Makefile.helpers | 60 - + tools/bpf/bpf_dbg.c | 2 +- + tools/bpf/bpf_exp.y | 14 +- + tools/bpf/bpftool/.gitignore | 1 - + tools/bpf/bpftool/Documentation/Makefile | 11 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 78 +- + tools/bpf/bpftool/bash-completion/bpftool | 17 +- + tools/bpf/bpftool/btf.c | 11 + + tools/bpf/bpftool/btf_dumper.c | 1 + + tools/bpf/bpftool/feature.c | 4 + + tools/bpf/bpftool/gen.c | 72 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/map.c | 2 +- + tools/bpf/bpftool/xlated_dumper.c | 3 + + tools/bpf/runqslower/Makefile | 9 +- + tools/bpf/runqslower/runqslower.bpf.c | 33 +- + tools/include/uapi/linux/bpf.h | 762 ++++- + tools/include/uapi/linux/btf.h | 5 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 3 +- + tools/lib/bpf/bpf_helpers.h | 21 +- + tools/lib/bpf/btf.c | 763 ++--- + tools/lib/bpf/btf.h | 9 + + tools/lib/bpf/btf_dump.c | 12 +- + tools/lib/bpf/libbpf.c | 120 +- + tools/lib/bpf/libbpf.h | 14 + + tools/lib/bpf/libbpf.map | 10 + + tools/lib/bpf/libbpf_internal.h | 40 +- + tools/lib/bpf/libbpf_util.h | 47 - + tools/lib/bpf/linker.c | 1944 +++++++++++++ + tools/lib/bpf/strset.c | 176 ++ + tools/lib/bpf/strset.h | 21 + + tools/lib/bpf/xsk.h | 87 +- + tools/perf/MANIFEST | 2 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 61 +- + tools/testing/selftests/bpf/Makefile.docs | 82 + + tools/testing/selftests/bpf/README.rst | 48 + + tools/testing/selftests/bpf/btf_helpers.c | 4 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 6 +- + .../selftests/bpf/map_tests/array_map_batch_ops.c | 5 - + .../selftests/bpf/prog_tests/attach_probe.c | 40 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 176 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 1 + + tools/testing/selftests/bpf/prog_tests/for_each.c | 130 + + .../selftests/bpf/prog_tests/prog_run_xattr.c | 51 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 83 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 8 +- + .../selftests/bpf/prog_tests/static_linked.c | 40 + + .../selftests/bpf/prog_tests/task_local_storage.c | 92 + + tools/testing/selftests/bpf/progs/bind4_prog.c | 25 + + tools/testing/selftests/bpf/progs/bind6_prog.c | 25 + + .../bpf/progs/btf_dump_test_case_syntax.c | 7 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 5 + + tools/testing/selftests/bpf/progs/fentry_test.c | 2 +- + tools/testing/selftests/bpf/progs/fexit_test.c | 4 +- + .../selftests/bpf/progs/for_each_array_map_elem.c | 61 + + .../selftests/bpf/progs/for_each_hash_map_elem.c | 95 + + tools/testing/selftests/bpf/progs/loop6.c | 99 + + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 1 - + .../selftests/bpf/progs/task_local_storage.c | 64 + + .../bpf/progs/task_local_storage_exit_creds.c | 32 + + .../selftests/bpf/progs/task_ls_recursion.c | 70 + + .../selftests/bpf/progs/test_core_reloc_size.c | 3 + + .../selftests/bpf/progs/test_global_func10.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 62 +- + .../selftests/bpf/progs/test_sockmap_listen.c | 4 +- + .../selftests/bpf/progs/test_static_linked1.c | 30 + + .../selftests/bpf/progs/test_static_linked2.c | 31 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 113 +- + tools/testing/selftests/bpf/test_bpftool_build.sh | 21 - + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_doc_build.sh | 13 + + tools/testing/selftests/bpf/test_progs.h | 11 + + tools/testing/selftests/bpf/test_sockmap.c | 2 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_verifier.c | 4 +- + tools/testing/selftests/bpf/test_xsk.sh | 135 +- + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 1 + + tools/testing/selftests/bpf/vmtest.sh | 26 +- + tools/testing/selftests/bpf/xdpxceiver.c | 384 ++- + tools/testing/selftests/bpf/xdpxceiver.h | 57 +- + tools/testing/selftests/bpf/xsk_prereqs.sh | 30 +- + .../net/mlxsw/devlink_trap_l3_exceptions.sh | 31 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 82 + + .../drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh | 77 - + .../selftests/drivers/net/mlxsw/tc_restrictions.sh | 4 +- + .../selftests/drivers/net/mlxsw/tc_sample.sh | 627 ++++ + .../selftests/drivers/net/netdevsim/nexthop.sh | 620 ++++ + .../selftests/drivers/net/netdevsim/psample.sh | 181 ++ + tools/testing/selftests/net/fib_nexthops.sh | 549 +++- + .../selftests/net/forwarding/dual_vxlan_bridge.sh | 366 +++ + .../selftests/net/forwarding/fib_offload_lib.sh | 2 +- + .../net/forwarding/gre_multipath_nh_res.sh | 361 +++ + tools/testing/selftests/net/forwarding/lib.sh | 5 + + .../net/forwarding/router_mpath_nh_res.sh | 400 +++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 82 +- + tools/testing/selftests/netfilter/nft_flowtable.sh | 82 + + 760 files changed, 45625 insertions(+), 12116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/actions,owl-emac.yaml + create mode 100644 Documentation/devicetree/bindings/net/brcm,bcm6368-mdio-mux.yaml + create mode 100644 Documentation/userspace-api/ebpf/index.rst + create mode 100644 Documentation/userspace-api/ebpf/syscall.rst + create mode 100644 drivers/net/ethernet/actions/Kconfig + create mode 100644 drivers/net/ethernet/actions/Makefile + create mode 100644 drivers/net/ethernet/actions/owl-emac.c + create mode 100644 drivers/net/ethernet/actions/owl-emac.h + rename drivers/{staging/fsl-dpaa2/ethsw/ethsw-ethtool.c => net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c} (99%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw-cmd.h (75%) + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw.c (73%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpsw.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_fdir.c + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_fdir.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_offload.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_regs.h + create mode 100644 drivers/net/mdio/mdio-mux-bcm6368.c + create mode 100644 drivers/net/netdevsim/psample.c + create mode 100644 drivers/net/phy/marvell-88x2222.c + delete mode 100644 drivers/staging/fsl-dpaa2/Kconfig + delete mode 100644 drivers/staging/fsl-dpaa2/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/README + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/TODO + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/dpsw.h + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.c + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.h + delete mode 100644 include/linux/atm_suni.h + create mode 100644 include/linux/ptp_pch.h + rename scripts/{bpf_helpers_doc.py => bpf_doc.py} (82%) + delete mode 100644 tools/bpf/Makefile.helpers + delete mode 100644 tools/lib/bpf/libbpf_util.h + create mode 100644 tools/lib/bpf/linker.c + create mode 100644 tools/lib/bpf/strset.c + create mode 100644 tools/lib/bpf/strset.h + create mode 100644 tools/testing/selftests/bpf/Makefile.docs + create mode 100644 tools/testing/selftests/bpf/prog_tests/for_each.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/static_linked.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_array_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/loop6.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage_exit_creds.c + create mode 100644 tools/testing/selftests/bpf/progs/task_ls_recursion.c + create mode 100644 tools/testing/selftests/bpf/progs/test_static_linked1.c + create mode 100644 tools/testing/selftests/bpf/progs/test_static_linked2.c + create mode 100755 tools/testing/selftests/bpf/test_doc_build.sh + delete mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_sample.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/psample.sh + create mode 100755 tools/testing/selftests/net/forwarding/dual_vxlan_bridge.sh + create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_mpath_nh_res.sh +$ git am -3 ../patches/docs-nf_flowtable-fix-compilation-and-warnings.patch +Applying: docs: nf_flowtable: fix compilation and warnings +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/networking/nf_flowtable.rst +$ git add -A . +$ git commit -v -a --amend +[master 7f9d167fd858] Merge remote-tracking branch 'net-next/master' + Date: Fri Mar 26 12:13:25 2021 +1100 +Merging bpf-next/for-next (a46410d5e497 libbpf: Constify few bpf_program getters) +$ git merge bpf-next/for-next +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 2 +- + kernel/bpf/verifier.c | 14 -------------- + tools/lib/bpf/libbpf.c | 4 ++-- + tools/lib/bpf/libbpf.h | 4 ++-- + 4 files changed, 5 insertions(+), 19 deletions(-) +Merging ipsec-next/master (f076835a8bf2 esp6: remove a duplicative condition) +$ git merge ipsec-next/master +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv4/esp4.c +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 2 +- + net/ipv6/esp6_offload.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mlx5-next/mlx5-next (26bf30902c10 net/mlx5: Use order-0 allocations for EQs) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/fs.c | 2 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 5 ++-- + drivers/infiniband/hw/mlx5/main.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 27 ++++++++++------- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 34 +++++++++++++++------- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 15 ++++++---- + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 5 ---- + include/linux/mlx5/driver.h | 6 +++- + include/linux/mlx5/eswitch.h | 5 ++-- + include/linux/mlx5/mlx5_ifc.h | 21 +++++++++---- + 13 files changed, 79 insertions(+), 51 deletions(-) +Merging netfilter-next/master (0ce7cf4127f1 netfilter: nftables: update table flags from the commit phase) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (d4a96be65423 netfilter: conntrack: Remove unused variable declaration) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (13ce240a932f rtw88: 8822c: support FW crash dump when FW crash) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/snoc.c | 29 +- + drivers/net/wireless/ath/ath11k/ahb.c | 2 +- + drivers/net/wireless/ath/ath11k/ce.c | 58 +- + drivers/net/wireless/ath/ath11k/ce.h | 1 + + drivers/net/wireless/ath/ath11k/core.c | 45 +- + drivers/net/wireless/ath/ath11k/core.h | 6 + + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 476 ++++++------ + drivers/net/wireless/ath/ath11k/dp_tx.c | 6 +- + drivers/net/wireless/ath/ath11k/hal.c | 96 ++- + drivers/net/wireless/ath/ath11k/hal.h | 33 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 13 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 3 + + drivers/net/wireless/ath/ath11k/hal_tx.h | 1 + + drivers/net/wireless/ath/ath11k/hif.h | 10 + + drivers/net/wireless/ath/ath11k/hw.c | 796 +++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/hw.h | 53 ++ + drivers/net/wireless/ath/ath11k/mac.c | 88 ++- + drivers/net/wireless/ath/ath11k/mac.h | 2 + + drivers/net/wireless/ath/ath11k/mhi.c | 116 ++- + drivers/net/wireless/ath/ath11k/pci.c | 194 +++-- + drivers/net/wireless/ath/ath11k/pci.h | 21 +- + drivers/net/wireless/ath/ath11k/qmi.c | 118 +-- + drivers/net/wireless/ath/ath11k/qmi.h | 9 +- + drivers/net/wireless/ath/ath11k/rx_desc.h | 212 +++++- + drivers/net/wireless/ath/ath11k/wmi.c | 64 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 14 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 56 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 6 + + drivers/net/wireless/realtek/rtw88/coex.c | 5 + + drivers/net/wireless/realtek/rtw88/coex.h | 1 + + drivers/net/wireless/realtek/rtw88/debug.c | 41 ++ + drivers/net/wireless/realtek/rtw88/mac.c | 19 + + drivers/net/wireless/realtek/rtw88/mac.h | 4 + + drivers/net/wireless/realtek/rtw88/main.c | 104 ++- + drivers/net/wireless/realtek/rtw88/main.h | 11 + + drivers/net/wireless/realtek/rtw88/reg.h | 1 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 + + 39 files changed, 2217 insertions(+), 511 deletions(-) +Merging bluetooth/master (0f90d320b4f1 Bluetooth: Remove trailing semicolon in macros) +$ git merge bluetooth/master +Removing Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 56 ---------- + .../bindings/net/broadcom-bluetooth.yaml | 118 +++++++++++++++++++++ + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + drivers/bluetooth/btintel.c | 3 +- + drivers/bluetooth/btusb.c | 16 +-- + drivers/bluetooth/hci_bcm.c | 19 ++++ + drivers/bluetooth/hci_qca.c | 17 ++- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/ecdh_helper.h | 2 +- + net/bluetooth/hci_conn.c | 14 ++- + net/bluetooth/hci_event.c | 32 +++++- + net/bluetooth/hci_request.c | 48 +++++---- + net/bluetooth/l2cap_core.c | 16 ++- + net/bluetooth/l2cap_sock.c | 8 ++ + net/bluetooth/mgmt.c | 1 + + net/bluetooth/sco.c | 4 +- + net/bluetooth/smp.c | 111 ++++++++++--------- + 20 files changed, 328 insertions(+), 143 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml +Merging mac80211-next/master (4b837ad53be2 Merge branch 'netfilter-flowtable') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (b67e76f22acf gfs2: don't create empty buffers for NO_CREATE) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/meta_io.c | 10 +++++++--- + fs/gfs2/super.c | 12 ++++++++---- + 2 files changed, 15 insertions(+), 7 deletions(-) +Merging mtd/mtd/next (3ba6d1ff041f mtd: rawnand: stm32_fmc2: Fix fall-through warnings for Clang) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 1 + + drivers/mtd/chips/cfi_cmdset_0002.c | 2 + + drivers/mtd/chips/cfi_cmdset_0020.c | 2 + + drivers/mtd/ftl.c | 14 +----- + drivers/mtd/inftlcore.c | 13 +---- + drivers/mtd/maps/physmap-bt1-rom.c | 2 +- + drivers/mtd/maps/physmap-core.c | 4 +- + drivers/mtd/mtdblock.c | 14 +----- + drivers/mtd/mtdblock_ro.c | 13 +---- + drivers/mtd/mtdchar.c | 25 +++++----- + drivers/mtd/mtdcore.c | 3 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/mtdswap.c | 14 +----- + drivers/mtd/nand/onenand/onenand_samsung.c | 1 + + drivers/mtd/nand/raw/fsmc_nand.c | 1 + + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 + + drivers/mtd/nftlcore.c | 13 +---- + drivers/mtd/parsers/Kconfig | 14 ++++-- + drivers/mtd/parsers/Makefile | 2 + + drivers/mtd/parsers/ofpart_bcm4908.c | 64 +++++++++++++++++++++++++ + drivers/mtd/parsers/ofpart_bcm4908.h | 15 ++++++ + drivers/mtd/parsers/{ofpart.c => ofpart_core.c} | 32 +++++++++++-- + drivers/mtd/parsers/qcomsmempart.c | 9 +++- + drivers/mtd/rfd_ftl.c | 13 +---- + include/linux/mtd/blktrans.h | 11 +++++ + include/linux/mtd/mtd.h | 1 + + 26 files changed, 175 insertions(+), 112 deletions(-) + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.c + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.h + rename drivers/mtd/parsers/{ofpart.c => ofpart_core.c} (87%) +Merging nand/nand/next (55fbb9ba4f06 mtd: rawnand: qcom: Return actual error code instead of -ENODEV) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 3 + + drivers/mtd/nand/ecc-sw-bch.c | 10 +- + drivers/mtd/nand/ecc-sw-hamming.c | 10 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 + + drivers/mtd/nand/raw/fsmc_nand.c | 2 + + drivers/mtd/nand/raw/nand_base.c | 45 +++--- + drivers/mtd/nand/raw/omap2.c | 14 +- + drivers/mtd/nand/raw/qcom_nandc.c | 262 +++++++++++++++++++------------ + drivers/mtd/nand/spi/gigadevice.c | 69 ++++++-- + include/linux/mtd/nand-ecc-sw-bch.h | 2 - + include/linux/mtd/nand-ecc-sw-hamming.h | 2 - + include/linux/mtd/nand.h | 22 +++ + 12 files changed, 293 insertions(+), 154 deletions(-) +Merging spi-nor/spi-nor/next (79321e752aff mtd: spi-nor: core: Update comment about the default flash parameters) +$ git merge spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/mtd/spi-nor/controllers/intel-spi.c | 1 - + drivers/mtd/spi-nor/controllers/intel-spi.h | 2 +- + drivers/mtd/spi-nor/core.c | 32 +++++----- + drivers/mtd/spi-nor/core.h | 6 +- + drivers/mtd/spi-nor/issi.c | 3 +- + drivers/mtd/spi-nor/macronix.c | 3 +- + drivers/mtd/spi-nor/sfdp.c | 72 +++++++++-------------- + drivers/mtd/spi-nor/sfdp.h | 3 +- + drivers/mtd/spi-nor/spansion.c | 12 ++-- + drivers/mtd/spi-nor/winbond.c | 5 +- + include/linux/mfd/lpc_ich.h | 2 +- + include/linux/platform_data/{ => x86}/intel-spi.h | 0 + 13 files changed, 59 insertions(+), 84 deletions(-) + rename include/linux/platform_data/{ => x86}/intel-spi.h (100%) +Merging crypto/master (befb1ddaece1 hwrng: cctrng - delete redundant printing of return value) +$ git merge crypto/master +Auto-merging net/bluetooth/smp.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rng/brcm,bcm2835.yaml | 21 + + arch/arm/crypto/aes-cipher-core.S | 42 +- + arch/arm/crypto/blake2b-neon-glue.c | 4 +- + arch/arm/crypto/blake2s-core.S | 21 + + arch/arm/crypto/chacha-scalar-core.S | 43 +- + arch/powerpc/crypto/sha1-spe-glue.c | 2 +- + crypto/aegis.h | 19 + + crypto/aegis128-core.c | 15 - + crypto/aegis128-neon.c | 10 +- + crypto/api.c | 2 +- + crypto/ecc.c | 11 +- + crypto/ecc.h | 37 +- + crypto/ecc_curve_defs.h | 17 + + crypto/ecdh.c | 72 +- + crypto/ecdh_helper.c | 4 +- + crypto/serpent_generic.c | 39 +- + crypto/testmgr.c | 24 +- + crypto/testmgr.h | 34 +- + drivers/char/hw_random/ba431-rng.c | 16 +- + drivers/char/hw_random/bcm2835-rng.c | 27 +- + drivers/char/hw_random/cctrng.c | 20 +- + drivers/char/hw_random/omap-rng.c | 3 +- + drivers/char/hw_random/pic32-rng.c | 3 +- + drivers/char/hw_random/xiphera-trng.c | 4 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 21 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 1 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 2 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 4 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 3 - + drivers/crypto/atmel-ecc.c | 28 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 1 - + drivers/crypto/ccp/sev-dev.c | 6 + + drivers/crypto/hisilicon/Kconfig | 1 + + drivers/crypto/hisilicon/hpre/hpre.h | 17 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 881 ++++++++++++++++++++- + drivers/crypto/hisilicon/hpre/hpre_main.c | 12 +- + drivers/crypto/hisilicon/qm.c | 4 +- + drivers/crypto/hisilicon/qm.h | 4 +- + drivers/crypto/hisilicon/sec2/sec.h | 9 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 81 +- + drivers/crypto/hisilicon/sec2/sec_crypto.h | 6 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 131 +-- + drivers/crypto/hisilicon/zip/zip.h | 4 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 4 +- + drivers/crypto/keembay/keembay-ocs-aes-core.c | 4 +- + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 4 +- + drivers/crypto/nx/nx-common-powernv.c | 4 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 2 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- + drivers/crypto/qat/qat_common/qat_algs.c | 32 +- + drivers/crypto/qce/cipher.h | 1 - + drivers/crypto/qce/common.c | 25 +- + drivers/crypto/qce/common.h | 3 +- + drivers/crypto/qce/sha.c | 143 ++-- + drivers/crypto/qce/skcipher.c | 69 +- + drivers/crypto/s5p-sss.c | 2 +- + include/crypto/acompress.h | 2 + + include/crypto/aead.h | 2 + + include/crypto/akcipher.h | 2 + + include/crypto/ecc_curve.h | 60 ++ + include/crypto/ecdh.h | 2 - + include/crypto/hash.h | 4 + + include/crypto/kpp.h | 2 + + include/crypto/rng.h | 2 + + include/crypto/skcipher.h | 2 + + net/bluetooth/ecdh_helper.c | 2 - + net/bluetooth/selftest.c | 2 +- + net/bluetooth/smp.c | 6 +- + 68 files changed, 1542 insertions(+), 549 deletions(-) + create mode 100644 include/crypto/ecc_curve.h +Merging drm/drm-next (06debd6e1b28 Merge tag 'drm-intel-next-2021-03-16' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging scripts/checkpatch.pl +Auto-merging lib/vsprintf.c +Auto-merging lib/test_printf.c +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.h +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/dss/dsi.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/lima/lima_devfreq.h +Auto-merging drivers/gpu/drm/lima/lima_devfreq.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Removing drivers/gpu/drm/gma500/blitter.h +Removing drivers/gpu/drm/gma500/blitter.c +Removing drivers/gpu/drm/gma500/accel_2d.c +Removing drivers/gpu/drm/ast/ast_cursor.c +Removing drivers/gpu/drm/arc/arcpgu_sim.c +Removing drivers/gpu/drm/arc/arcpgu_regs.h +Removing drivers/gpu/drm/arc/arcpgu_hdmi.c +Removing drivers/gpu/drm/arc/arcpgu_drv.c +Removing drivers/gpu/drm/arc/arcpgu_crtc.c +Removing drivers/gpu/drm/arc/arcpgu.h +Removing drivers/gpu/drm/arc/Makefile +Removing drivers/gpu/drm/arc/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/mxsfb.txt +Auto-merging Documentation/core-api/printk-formats.rst +Resolved 'drivers/gpu/drm/omapdrm/dss/dsi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ef886fc6806] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/printk-formats.rst | 18 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../devicetree/bindings/display/fsl,lcdif.yaml | 110 + + .../devicetree/bindings/display/mxsfb.txt | 87 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/todo.rst | 74 +- + MAINTAINERS | 4 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-heap.c | 12 + + drivers/dma-buf/heaps/cma_heap.c | 1 + + drivers/dma-buf/heaps/system_heap.c | 1 + + drivers/gpu/drm/Kconfig | 2 - + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +- + drivers/gpu/drm/arc/Kconfig | 10 - + drivers/gpu/drm/arc/Makefile | 3 - + drivers/gpu/drm/arc/arcpgu.h | 37 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 217 -- + drivers/gpu/drm/arc/arcpgu_drv.c | 224 -- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 48 - + drivers/gpu/drm/arc/arcpgu_regs.h | 31 - + drivers/gpu/drm/arc/arcpgu_sim.c | 108 - + .../drm/arm/display/komeda/komeda_format_caps.h | 11 - + .../drm/arm/display/komeda/komeda_framebuffer.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 3 + + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 21 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 30 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 + + drivers/gpu/drm/arm/malidp_mw.c | 7 +- + drivers/gpu/drm/arm/malidp_planes.c | 79 +- + drivers/gpu/drm/armada/armada_overlay.c | 113 +- + drivers/gpu/drm/armada/armada_plane.c | 115 +- + drivers/gpu/drm/armada/armada_plane.h | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx.h | 8 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 15 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 69 +- + drivers/gpu/drm/ast/Makefile | 3 +- + drivers/gpu/drm/ast/ast_cursor.c | 286 -- + drivers/gpu/drm/ast/ast_drv.c | 2 + + drivers/gpu/drm/ast/ast_drv.h | 47 +- + drivers/gpu/drm/ast/ast_mode.c | 388 ++- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 107 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 7 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 135 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +- + drivers/gpu/drm/drm_atomic.c | 47 +- + drivers/gpu/drm/drm_atomic_helper.c | 75 +- + drivers/gpu/drm/drm_crtc.c | 7 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 35 +- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 11 +- + drivers/gpu/drm/drm_gem.c | 2 + + drivers/gpu/drm/drm_gem_atomic_helper.c | 432 +++ + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 63 - + drivers/gpu/drm/drm_gem_vram_helper.c | 42 +- + drivers/gpu/drm/drm_ioc32.c | 15 +- + drivers/gpu/drm/drm_mipi_dbi.c | 5 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 + + drivers/gpu/drm/drm_plane.c | 66 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 50 +- + drivers/gpu/drm/drm_syncobj.c | 12 + + drivers/gpu/drm/drm_vblank.c | 25 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 20 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 24 +- + drivers/gpu/drm/gma500/Kconfig | 11 +- + drivers/gpu/drm/gma500/Makefile | 17 +- + drivers/gpu/drm/gma500/accel_2d.c | 60 - + drivers/gpu/drm/gma500/blitter.c | 43 - + drivers/gpu/drm/gma500/blitter.h | 16 - + drivers/gpu/drm/gma500/cdv_device.c | 2 +- + drivers/gpu/drm/gma500/cdv_device.h | 1 - + drivers/gpu/drm/gma500/cdv_intel_crt.c | 15 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 23 +- + drivers/gpu/drm/gma500/gtt.c | 11 - + drivers/gpu/drm/gma500/intel_gmbus.c | 4 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- + drivers/gpu/drm/gma500/psb_device.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 36 +- + drivers/gpu/drm/gma500/psb_drv.h | 6 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_reg.h | 32 - + drivers/gpu/drm/gma500/psb_irq.c | 110 - + drivers/gpu/drm/gma500/psb_irq.h | 4 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 39 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 47 +- + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 123 +- + drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + + drivers/gpu/drm/i915/display/icl_dsi.c | 28 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 166 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bw.c | 22 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 23 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 276 +- + drivers/gpu/drm/i915/display/intel_csr.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 2658 ++++++------------ + drivers/gpu/drm/i915/display/intel_ddi.h | 23 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 1394 ++++++++++ + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 100 + + drivers/gpu/drm/i915/display/intel_display.c | 2857 +++----------------- + drivers/gpu/drm/i915/display/intel_display.h | 48 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 162 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 231 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 32 + + drivers/gpu/drm/i915/display/intel_display_types.h | 117 +- + drivers/gpu/drm/i915/display/intel_dp.c | 134 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 31 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 509 ++++ + drivers/gpu/drm/i915/display/intel_dpll.h | 18 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 95 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 9 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 138 + + drivers/gpu/drm/i915/display/intel_fdi.h | 3 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 67 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_pps.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 611 +++-- + drivers/gpu/drm/i915/display/intel_psr.h | 10 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1718 +----------- + drivers/gpu/drm/i915/display/intel_sprite.h | 7 - + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 27 +- + drivers/gpu/drm/i915/display/intel_vga.c | 8 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 556 ++++ + drivers/gpu/drm/i915/display/skl_scaler.h | 29 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 2266 ++++++++++++++++ + drivers/gpu/drm/i915/display/skl_universal_plane.h | 37 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 8 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 68 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- + drivers/gpu/drm/i915/gvt/display.c | 107 +- + drivers/gpu/drm/i915/gvt/display.h | 14 +- + drivers/gpu/drm/i915/gvt/firmware.c | 10 +- + drivers/gpu/drm/i915/gvt/gtt.c | 16 +- + drivers/gpu/drm/i915/gvt/gvt.c | 31 +- + drivers/gpu/drm/i915/gvt/gvt.h | 13 +- + drivers/gpu/drm/i915/gvt/handlers.c | 261 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 37 - + drivers/gpu/drm/i915/gvt/interrupt.h | 7 - + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 - + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 84 +- + drivers/gpu/drm/i915/i915_drv.h | 130 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- + drivers/gpu/drm/i915/i915_getparam.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 106 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 18 +- + drivers/gpu/drm/i915/i915_perf.c | 84 +- + drivers/gpu/drm/i915/i915_perf_types.h | 8 + + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 53 +- + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 +- + drivers/gpu/drm/i915/intel_dram.c | 6 + + drivers/gpu/drm/i915/intel_pch.c | 11 +- + drivers/gpu/drm/i915/intel_pch.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 406 +-- + drivers/gpu/drm/i915/intel_pm.h | 5 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 20 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 64 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 92 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 55 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 77 +- + drivers/gpu/drm/kmb/kmb_plane.c | 50 +- + drivers/gpu/drm/lima/lima_devfreq.c | 11 +- + drivers/gpu/drm/lima/lima_devfreq.h | 2 + + drivers/gpu/drm/lima/lima_sched.c | 6 +- + drivers/gpu/drm/mcde/mcde_display.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 103 +- + drivers/gpu/drm/meson/meson_overlay.c | 31 +- + drivers/gpu/drm/meson/meson_plane.c | 51 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 54 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 57 +- + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 23 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 8 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 9 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 56 +- + drivers/gpu/drm/panel/panel-lvds.c | 2 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 11 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 39 +- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 3 +- + drivers/gpu/drm/qxl/qxl_display.c | 368 +-- + drivers/gpu/drm/qxl/qxl_draw.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 6 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_image.c | 2 +- + drivers/gpu/drm/qxl/qxl_irq.c | 1 + + drivers/gpu/drm/qxl/qxl_kms.c | 30 +- + drivers/gpu/drm/qxl/qxl_object.c | 57 +- + drivers/gpu/drm/qxl/qxl_object.h | 7 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 76 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 10 +- + drivers/gpu/drm/radeon/radeon.h | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 10 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 40 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 81 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 22 +- + drivers/gpu/drm/sti/sti_cursor.c | 41 +- + drivers/gpu/drm/sti/sti_gdp.c | 77 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 75 +- + drivers/gpu/drm/stm/ltdc.c | 84 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 15 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 59 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 5 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 78 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 11 + + drivers/gpu/drm/tegra/dc.c | 116 +- + drivers/gpu/drm/tegra/drm.c | 3 + + drivers/gpu/drm/tegra/hub.c | 62 +- + drivers/gpu/drm/tegra/plane.c | 4 +- + drivers/gpu/drm/tidss/tidss_kms.c | 4 + + drivers/gpu/drm/tidss/tidss_plane.c | 53 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 46 +- + drivers/gpu/drm/tiny/Kconfig | 10 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/arcpgu.c | 434 +++ + drivers/gpu/drm/tiny/cirrus.c | 43 +- + drivers/gpu/drm/tiny/gm12u320.c | 28 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 4 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 4 +- + drivers/gpu/drm/tiny/repaper.c | 3 +- + drivers/gpu/drm/tiny/st7586.c | 4 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/gpu/drm/ttm/Makefile | 7 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 335 +-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 25 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 24 +- + drivers/gpu/drm/ttm/ttm_device.c | 205 ++ + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_module.c | 54 +- + drivers/gpu/drm/ttm/ttm_module.h | 8 +- + drivers/gpu/drm/ttm/ttm_pool.c | 157 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 4 +- + drivers/gpu/drm/ttm/ttm_tt.c | 129 +- + drivers/gpu/drm/tve200/tve200_display.c | 4 +- + drivers/gpu/drm/udl/udl_modeset.c | 34 +- + drivers/gpu/drm/v3d/v3d_sched.c | 42 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 82 +- + drivers/gpu/drm/vc4/vc4_kms.c | 17 +- + drivers/gpu/drm/vc4/vc4_plane.c | 76 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 19 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 8 +- + drivers/gpu/drm/vkms/vkms_plane.c | 30 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 7 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/{ttm => vmwgfx}/ttm_memory.c | 22 +- + .../ttm => drivers/gpu/drm/vmwgfx}/ttm_memory.h | 5 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 103 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 44 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- + drivers/gpu/drm/xen/Kconfig | 10 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 3 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 32 +- + drivers/gpu/drm/zte/zx_plane.c | 49 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 85 +- + drivers/video/fbdev/amba-clcd.c | 17 +- + drivers/video/fbdev/efifb.c | 3 + + drivers/video/fbdev/omap/hwa742.c | 42 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 - + drivers/video/fbdev/simplefb.c | 5 +- + include/drm/drm_atomic.h | 4 + + include/drm/drm_dp_helper.h | 5 + + include/drm/drm_gem_atomic_helper.h | 113 + + include/drm/drm_gem_framebuffer_helper.h | 7 - + include/drm/drm_gem_vram_helper.h | 6 +- + include/drm/drm_modeset_helper_vtables.h | 31 +- + include/drm/drm_plane.h | 25 +- + include/drm/drm_simple_kms_helper.h | 29 +- + include/drm/drm_vblank.h | 1 - + include/drm/gpu_scheduler.h | 23 +- + include/drm/i915_pciids.h | 11 + + include/drm/ttm/ttm_bo_api.h | 48 +- + include/drm/ttm/ttm_bo_driver.h | 329 +-- + include/drm/ttm/ttm_device.h | 318 +++ + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 15 +- + include/linux/dma-heap.h | 9 + + include/linux/hdmi.h | 2 +- + include/linux/lockdep.h | 5 + + include/linux/platform_data/simplefb.h | 1 + + include/uapi/drm/drm_mode.h | 2 +- + lib/test_printf.c | 18 + + lib/vsprintf.c | 39 + + scripts/checkpatch.pl | 6 +- + 389 files changed, 14371 insertions(+), 12048 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/fsl,lcdif.yaml + delete mode 100644 Documentation/devicetree/bindings/display/mxsfb.txt + delete mode 100644 drivers/gpu/drm/arc/Kconfig + delete mode 100644 drivers/gpu/drm/arc/Makefile + delete mode 100644 drivers/gpu/drm/arc/arcpgu.h + delete mode 100644 drivers/gpu/drm/arc/arcpgu_crtc.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_drv.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_hdmi.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_regs.h + delete mode 100644 drivers/gpu/drm/arc/arcpgu_sim.c + delete mode 100644 drivers/gpu/drm/ast/ast_cursor.c + create mode 100644 drivers/gpu/drm/drm_gem_atomic_helper.c + delete mode 100644 drivers/gpu/drm/gma500/accel_2d.c + delete mode 100644 drivers/gpu/drm/gma500/blitter.c + delete mode 100644 drivers/gpu/drm/gma500/blitter.h + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.c + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.c + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.h + create mode 100644 drivers/gpu/drm/tiny/arcpgu.c + create mode 100644 drivers/gpu/drm/ttm/ttm_device.c + rename drivers/gpu/drm/{ttm => vmwgfx}/ttm_memory.c (97%) + rename {include/drm/ttm => drivers/gpu/drm/vmwgfx}/ttm_memory.h (97%) + create mode 100644 include/drm/drm_gem_atomic_helper.h + create mode 100644 include/drm/ttm/ttm_device.h +$ git am -3 ../patches/0001-merge-fix-for-drm-Switch-to-p4cc-format-modifier.patch +Applying: merge fix for "drm: Switch to %p4cc format modifier" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/display/skl_universal_plane.c +$ git add -A . +$ git commit -v -a --amend +[master 02eadc2efdeb] Merge remote-tracking branch 'drm/drm-next' + Date: Fri Mar 26 13:01:34 2021 +1100 +Merging drm-misc/for-linux-next (ce517f18944e drm: bridge: Add Chipone ICN6211 MIPI-DSI to RGB bridge) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/chipone,icn6211.yaml | 99 +++ + .../bindings/display/panel/panel-simple.yaml | 2 + + Documentation/driver-api/dma-buf.rst | 76 +++ + Documentation/gpu/todo.rst | 2 +- + MAINTAINERS | 15 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/bridge/Kconfig | 13 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 27 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 27 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 293 +++++++++ + drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 20 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- + drivers/gpu/drm/drm_connector.c | 1 + + drivers/gpu/drm/drm_probe_helper.c | 7 +- + drivers/gpu/drm/drm_property.c | 4 +- + drivers/gpu/drm/drm_sysfs.c | 9 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gud/Kconfig | 14 + + drivers/gpu/drm/gud/Makefile | 4 + + drivers/gpu/drm/gud/gud_connector.c | 729 +++++++++++++++++++++ + drivers/gpu/drm/gud/gud_drv.c | 661 +++++++++++++++++++ + drivers/gpu/drm/gud/gud_internal.h | 154 +++++ + drivers/gpu/drm/gud/gud_pipe.c | 552 ++++++++++++++++ + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 11 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- + drivers/gpu/drm/meson/meson_venc.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 1 - + drivers/gpu/drm/panel/panel-simple.c | 85 ++- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 3 +- + drivers/gpu/drm/qxl/qxl_release.c | 5 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 - + drivers/gpu/drm/scheduler/sched_entity.c | 6 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 9 +- + drivers/gpu/drm/stm/ltdc.c | 12 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 19 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 135 ++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - + drivers/gpu/drm/ttm/ttm_device.c | 71 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_resource.c | 9 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 1 + + drivers/gpu/drm/vkms/vkms_crtc.c | 3 +- + drivers/gpu/drm/vmwgfx/ttm_memory.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 27 +- + drivers/video/fbdev/core/fb_defio.c | 35 - + drivers/video/fbdev/core/fbmem.c | 4 - + drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- + include/drm/gud.h | 333 ++++++++++ + include/drm/ttm/ttm_bo_api.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 5 +- + include/drm/ttm/ttm_device.h | 13 +- + include/linux/fb.h | 3 - + include/linux/vgaarb.h | 4 +- + include/uapi/drm/drm.h | 125 +++- + include/uapi/drm/drm_mode.h | 1 + + 72 files changed, 3437 insertions(+), 321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml + create mode 100644 drivers/gpu/drm/bridge/chipone-icn6211.c + create mode 100644 drivers/gpu/drm/gud/Kconfig + create mode 100644 drivers/gpu/drm/gud/Makefile + create mode 100644 drivers/gpu/drm/gud/gud_connector.c + create mode 100644 drivers/gpu/drm/gud/gud_drv.c + create mode 100644 drivers/gpu/drm/gud/gud_internal.h + create mode 100644 drivers/gpu/drm/gud/gud_pipe.c + create mode 100644 include/drm/gud.h +Merging amdgpu/drm-next (d41c3b15e910 drm/amdgpu/pm: mark pcie link/speed arrays as const) +$ git merge amdgpu/drm-next +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/radeon_object.c +Auto-merging drivers/gpu/drm/radeon/radeon_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a11c688e5f75] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Kconfig | 9 - + drivers/gpu/drm/amd/amdgpu/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 47 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 16 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 43 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 487 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 161 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 202 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 150 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 191 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 105 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 464 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 - + drivers/gpu/drm/amd/amdgpu/cik.c | 77 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 + + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 163 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 1286 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 40 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 54 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 65 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 1329 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 28 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 225 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 378 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 181 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 232 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 28 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 121 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 363 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 48 + + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 99 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 49 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 190 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 5 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 492 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 1 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 204 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 122 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 174 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/display/Kconfig | 14 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 783 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 80 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 293 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 489 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 54 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 185 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 9 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 21 + + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 5 +- + .../drm/amd/display/dc/bios/bios_parser_helper.c | 5 +- + .../drm/amd/display/dc/bios/bios_parser_helper.h | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 21 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 93 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 137 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 316 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 42 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 36 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 + + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 64 + + drivers/gpu/drm/amd/display/dc/dc.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 10 - + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 34 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_stat.h | 42 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 21 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 40 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 52 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 90 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 60 + + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 33 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 19 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 314 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 11 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 124 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 36 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 15 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 100 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 26 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 23 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 1 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 101 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 5 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 1 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 1 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 - + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 105 +- + .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 4 - + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 9 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 15 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 9 - + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 21 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 31 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 63 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 63 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 3 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 55 + + drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h | 41 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1495 +- + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 3 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 57 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 35 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 7 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 84 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 105 + + .../drm/amd/display/modules/freesync/freesync.c | 65 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 10 +- + drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 1738 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h | 7683 +++++ + .../drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h | 32949 +++++++++++++++++++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_offset.h | 5125 +++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h | 32178 ++++++++++++++++++ + .../drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h | 361 + + .../amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h | 531 + + .../amd/include/asic_reg/sdma/sdma_4_4_0_offset.h | 5224 +++ + .../amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h | 13922 ++++++++ + .../include/asic_reg/smuio/smuio_13_0_2_offset.h | 516 + + .../include/asic_reg/smuio/smuio_13_0_2_sh_mask.h | 1163 + + .../amd/include/asic_reg/thm/thm_13_0_2_offset.h | 346 + + .../amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h | 1297 + + .../amd/include/asic_reg/umc/umc_6_7_0_offset.h | 2620 ++ + .../amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h | 10796 ++++++ + .../amd/include/asic_reg/vcn/vcn_2_6_0_offset.h | 1462 + + .../amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h | 4535 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 129 +- + .../drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 127 +- + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 9 +- + drivers/gpu/drm/amd/include/vi_structs.h | 32 +- + drivers/gpu/drm/amd/pm/Makefile | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 228 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 1012 +- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 126 + + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 98 +- + drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h | 7 + + drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h | 1 + + .../gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h | 98 +- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 512 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 30 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 19 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 272 + + drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h | 165 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 45 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 56 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 9 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 78 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 30 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 31 +- + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 501 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 19 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 646 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 62 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 66 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1544 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 72 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1811 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 46 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 + + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/radeon/nislands_smc.h | 10 +- + drivers/gpu/drm/radeon/r100.c | 84 +- + drivers/gpu/drm/radeon/r300.c | 33 +- + drivers/gpu/drm/radeon/r420.c | 28 +- + drivers/gpu/drm/radeon/r600.c | 27 +- + drivers/gpu/drm/radeon/radeon.h | 25 +- + drivers/gpu/drm/radeon/radeon_asic.h | 8 +- + drivers/gpu/drm/radeon/radeon_cs.c | 12 +- + drivers/gpu/drm/radeon/radeon_device.c | 47 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 20 +- + drivers/gpu/drm/radeon/radeon_fence.c | 42 +- + drivers/gpu/drm/radeon/radeon_gem.c | 20 +- + drivers/gpu/drm/radeon/radeon_ib.c | 26 +- + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 + + drivers/gpu/drm/radeon/radeon_pm.c | 32 +- + drivers/gpu/drm/radeon/radeon_ring.c | 80 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 93 +- + drivers/gpu/drm/radeon/rs400.c | 25 +- + drivers/gpu/drm/radeon/rs600.c | 8 +- + drivers/gpu/drm/radeon/rv515.c | 56 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 +- + drivers/gpu/drm/radeon/sislands_smc.h | 10 +- + drivers/usb/host/xhci-pci.c | 3 + + include/drm/amd_asic_type.h | 15 +- + include/uapi/drm/amdgpu_drm.h | 34 + + include/uapi/linux/kfd_ioctl.h | 4 +- + 353 files changed, 144056 insertions(+), 5113 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_stat.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv_stat.c + create mode 100644 drivers/gpu/drm/amd/include/aldebaran_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Merging drm-intel/for-linux-next (93fe86281259 drm/i915: Fix transposed arguments to skl_plane_wm_level()) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Resolved 'drivers/gpu/drm/i915/display/intel_dp_link_training.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6437e36b5bc0] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/g4x_dp.c | 1432 +++++++++++++++++ + drivers/gpu/drm/i915/display/g4x_dp.h | 30 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 616 +++++++ + drivers/gpu/drm/i915/display/g4x_hdmi.h | 19 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 56 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- + drivers/gpu/drm/i915/display/intel_audio.c | 48 +- + drivers/gpu/drm/i915/display/intel_bios.c | 1114 +++++++------ + drivers/gpu/drm/i915/display/intel_bios.h | 17 +- + drivers/gpu/drm/i915/display/intel_bw.c | 10 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 66 +- + drivers/gpu/drm/i915/display/intel_color.c | 32 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_crt.c | 12 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 20 +- + drivers/gpu/drm/i915/display/intel_csr.c | 4 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 14 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 143 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 +- + drivers/gpu/drm/i915/display/intel_display.c | 297 ++-- + .../gpu/drm/i915/display/intel_display_debugfs.c | 47 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 52 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 19 + + drivers/gpu/drm/i915/display/intel_dp.c | 1697 ++------------------ + drivers/gpu/drm/i915/display/intel_dp.h | 11 - + drivers/gpu/drm/i915/display/intel_dp_aux.c | 12 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 39 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 35 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 20 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 22 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 62 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 8 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 54 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 647 +------- + drivers/gpu/drm/i915/display/intel_hdmi.h | 3 - + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- + drivers/gpu/drm/i915/display/intel_panel.c | 18 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 16 +- + drivers/gpu/drm/i915/display/intel_pps.c | 7 +- + drivers/gpu/drm/i915/display/intel_psr.c | 47 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 16 +- + drivers/gpu/drm/i915/display/intel_tc.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- + drivers/gpu/drm/i915/display/intel_vga.c | 4 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 8 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 70 +- + drivers/gpu/drm/i915/i915_drv.h | 26 +- + drivers/gpu/drm/i915/i915_irq.c | 66 +- + drivers/gpu/drm/i915/i915_pci.c | 3 +- + drivers/gpu/drm/i915/intel_device_info.h | 2 + + drivers/gpu/drm/i915/intel_pm.c | 140 +- + 61 files changed, 3723 insertions(+), 3480 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.c + create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.h + create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.c + create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.h +Merging drm-tegra/drm/tegra/for-next (09f5220aa699 drm/tegra: dc: Don't set PLL clock to 0Hz) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging drm-msm/msm-next (627dc55c273d drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_atomic.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 108 ++++++++++++++++++++---------- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 ++-- + drivers/gpu/drm/msm/dp/dp_aux.c | 7 ++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 2 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 6 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 11 +-- + drivers/gpu/drm/msm/msm_atomic.c | 7 +- + drivers/gpu/drm/msm/msm_drv.c | 12 ++++ + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_kms.h | 8 +-- + 12 files changed, 119 insertions(+), 60 deletions(-) +Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 ++++++++++++ + include/uapi/drm/etnaviv_drm.h | 3 +++ + 4 files changed, 20 insertions(+), 6 deletions(-) +Merging regmap/for-next (5af7bd5b148a Merge remote-tracking branch 'regmap/for-5.13' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 81 ++++++++++++++++++++++++++-------------- + include/linux/regmap.h | 7 ++++ + 2 files changed, 60 insertions(+), 28 deletions(-) +Merging sound/for-next (e839fbed26e8 ALSA: hda/hdmi: fix max DP-MST dev_num for Intel TGL+ platforms) +$ git merge sound/for-next +Auto-merging sound/usb/quirks.c +Auto-merging sound/usb/mixer_quirks.c +Auto-merging sound/pci/rme9652/rme9652.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/rme9652/hdsp.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + include/sound/hda_register.h | 8 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_snd.h | 334 +++++++++++ + sound/Kconfig | 2 + + sound/Makefile | 3 +- + sound/core/oss/pcm_oss.c | 8 +- + sound/core/pcm_memory.c | 12 +- + sound/core/seq_device.c | 15 +- + sound/drivers/vx/vx_core.c | 2 +- + sound/firewire/bebob/bebob.h | 2 + + sound/firewire/bebob/bebob_command.c | 36 ++ + sound/firewire/bebob/bebob_stream.c | 163 ++--- + sound/hda/Kconfig | 7 +- + sound/hda/hdac_stream.c | 2 +- + sound/pci/asihpi/hpicmn.h | 2 +- + sound/pci/asihpi/hpidspcd.h | 2 +- + sound/pci/ctxfi/ct20k1reg.h | 2 +- + sound/pci/ctxfi/ct20k2reg.h | 2 +- + sound/pci/ctxfi/ctamixer.c | 2 +- + sound/pci/ctxfi/ctamixer.h | 2 +- + sound/pci/ctxfi/ctatc.c | 2 +- + sound/pci/ctxfi/ctatc.h | 2 +- + sound/pci/ctxfi/ctdaio.c | 2 +- + sound/pci/ctxfi/ctdaio.h | 2 +- + sound/pci/ctxfi/cthardware.h | 2 +- + sound/pci/ctxfi/cthw20k1.h | 2 +- + sound/pci/ctxfi/cthw20k2.h | 2 +- + sound/pci/ctxfi/ctimap.h | 2 +- + sound/pci/ctxfi/ctmixer.h | 2 +- + sound/pci/ctxfi/ctpcm.h | 2 +- + sound/pci/ctxfi/ctresource.c | 2 +- + sound/pci/ctxfi/ctresource.h | 2 +- + sound/pci/ctxfi/ctsrc.c | 2 +- + sound/pci/ctxfi/ctsrc.h | 2 +- + sound/pci/ctxfi/ctvmem.c | 2 +- + sound/pci/ctxfi/ctvmem.h | 2 +- + sound/pci/hda/hda_auto_parser.h | 2 +- + sound/pci/hda/hda_jack.c | 73 ++- + sound/pci/hda/hda_jack.h | 8 + + sound/pci/hda/hda_local.h | 2 +- + sound/pci/hda/patch_cirrus.c | 1090 +++++++++++++++++++++++++++++++++- + sound/pci/hda/patch_hdmi.c | 25 +- + sound/pci/hda/patch_realtek.c | 15 +- + sound/pci/mixart/mixart_hwdep.c | 3 +- + sound/pci/rme9652/hdsp.c | 3 +- + sound/pci/rme9652/hdspm.c | 3 +- + sound/pci/rme9652/rme9652.c | 3 +- + sound/pci/vx222/vx222_ops.c | 10 +- + sound/ppc/keywest.c | 5 - + sound/ppc/snd_ps3_reg.h | 2 +- + sound/usb/midi.c | 123 +++- + sound/usb/midi.h | 2 + + sound/usb/mixer_quirks.c | 60 +- + sound/usb/quirks-table.h | 63 ++ + sound/usb/quirks.c | 3 + + sound/virtio/Kconfig | 10 + + sound/virtio/Makefile | 13 + + sound/virtio/virtio_card.c | 449 ++++++++++++++ + sound/virtio/virtio_card.h | 111 ++++ + sound/virtio/virtio_chmap.c | 219 +++++++ + sound/virtio/virtio_ctl_msg.c | 310 ++++++++++ + sound/virtio/virtio_ctl_msg.h | 78 +++ + sound/virtio/virtio_jack.c | 233 ++++++++ + sound/virtio/virtio_pcm.c | 513 ++++++++++++++++ + sound/virtio/virtio_pcm.h | 124 ++++ + sound/virtio/virtio_pcm_msg.c | 414 +++++++++++++ + sound/virtio/virtio_pcm_ops.c | 464 +++++++++++++++ + 68 files changed, 4872 insertions(+), 209 deletions(-) + create mode 100644 include/uapi/linux/virtio_snd.h + create mode 100644 sound/virtio/Kconfig + create mode 100644 sound/virtio/Makefile + create mode 100644 sound/virtio/virtio_card.c + create mode 100644 sound/virtio/virtio_card.h + create mode 100644 sound/virtio/virtio_chmap.c + create mode 100644 sound/virtio/virtio_ctl_msg.c + create mode 100644 sound/virtio/virtio_ctl_msg.h + create mode 100644 sound/virtio/virtio_jack.c + create mode 100644 sound/virtio/virtio_pcm.c + create mode 100644 sound/virtio/virtio_pcm.h + create mode 100644 sound/virtio/virtio_pcm_msg.c + create mode 100644 sound/virtio/virtio_pcm_ops.c +Merging sound-asoc/for-next (3cac585bcd41 Merge remote-tracking branch 'asoc/for-5.13' into asoc-next) +$ git merge sound-asoc/for-next +Removing include/sound/rt5645.h +Removing include/linux/platform_data/asoc-mx27vis.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 108 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 + + .../devicetree/bindings/sound/mchp,i2s-mcc.yaml | 108 ++ + .../devicetree/bindings/sound/mchp-i2s-mcc.txt | 43 - + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 1 + + .../devicetree/bindings/sound/rt1019.yaml | 33 + + Documentation/devicetree/bindings/sound/rt5682.txt | 2 +- + MAINTAINERS | 3 +- + drivers/extcon/Kconfig | 8 - + drivers/extcon/Makefile | 1 - + drivers/firmware/dmi_scan.c | 1 + + drivers/mfd/arizona-core.c | 20 - + drivers/reset/core.c | 215 +++ + drivers/spi/spi-imx.c | 5 +- + include/linux/platform_data/asoc-mx27vis.h | 12 - + include/linux/reset.h | 315 +++++ + include/sound/rt5645.h | 32 - + include/sound/soc-component.h | 7 +- + include/sound/soc-dpcm.h | 10 +- + include/sound/soc.h | 36 +- + include/sound/sof.h | 1 + + sound/soc/amd/Kconfig | 5 +- + sound/soc/amd/acp-da7219-max98357a.c | 357 ++++- + sound/soc/amd/renoir/rn-pci-acp3x.c | 2 +- + sound/soc/atmel/Kconfig | 3 + + sound/soc/atmel/mchp-i2s-mcc.c | 161 ++- + sound/soc/codecs/Kconfig | 27 + + sound/soc/codecs/Makefile | 10 +- + sound/soc/codecs/ab8500-codec.c | 7 - + sound/soc/codecs/ad1836.c | 2 - + sound/soc/codecs/adau1977.c | 2 - + .../soc/codecs/arizona-jack.c | 577 +++----- + sound/soc/codecs/arizona.h | 46 +- + sound/soc/codecs/cros_ec_codec.c | 2 +- + sound/soc/codecs/cs4270.c | 1 + + sound/soc/codecs/cs42l42.c | 323 +++-- + sound/soc/codecs/cs42l42.h | 28 +- + sound/soc/codecs/cx2072x.c | 11 +- + sound/soc/codecs/da7219-aad.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 14 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 3 +- + sound/soc/codecs/jz4760.c | 11 +- + sound/soc/codecs/jz4770.c | 7 +- + sound/soc/codecs/lpass-rx-macro.c | 3 +- + sound/soc/codecs/lpass-wsa-macro.c | 2 + + sound/soc/codecs/madera.h | 2 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/max98373.c | 14 + + sound/soc/codecs/max98373.h | 3 + + sound/soc/codecs/mt6358.c | 4 +- + sound/soc/codecs/mt6359.c | 4 +- + sound/soc/codecs/nau8825.c | 11 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/rt1011.c | 49 +- + sound/soc/codecs/rt1015.c | 27 +- + sound/soc/codecs/rt1015.h | 10 + + sound/soc/codecs/rt1015p.c | 10 + + sound/soc/codecs/rt1016.c | 11 +- + sound/soc/codecs/rt1019.c | 940 ++++++++++++ + sound/soc/codecs/rt1019.h | 320 +++++ + sound/soc/codecs/rt1305.c | 6 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt1308.c | 10 +- + sound/soc/codecs/rt1316-sdw.c | 744 ++++++++++ + sound/soc/codecs/rt1316-sdw.h | 55 + + sound/soc/codecs/rt5631.c | 4 +- + sound/soc/codecs/rt5640.c | 12 +- + sound/soc/codecs/rt5645.c | 47 +- + sound/soc/codecs/rt5645.h | 2 - + sound/soc/codecs/rt5651.c | 6 +- + sound/soc/codecs/rt5659.c | 4 +- + sound/soc/codecs/rt5660.c | 4 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5665.c | 4 +- + sound/soc/codecs/rt5668.c | 8 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5677.c | 6 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 6 +- + sound/soc/codecs/rt5682.c | 14 +- + sound/soc/codecs/rt5682.h | 1 + + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdca-sdw.c | 425 ++++++ + sound/soc/codecs/rt711-sdca-sdw.h | 99 ++ + sound/soc/codecs/rt711-sdca.c | 1492 ++++++++++++++++++++ + sound/soc/codecs/rt711-sdca.h | 238 ++++ + sound/soc/codecs/rt711-sdw.c | 2 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715-sdca-sdw.c | 278 ++++ + sound/soc/codecs/rt715-sdca-sdw.h | 170 +++ + sound/soc/codecs/rt715-sdca.c | 1075 ++++++++++++++ + sound/soc/codecs/rt715-sdca.h | 136 ++ + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/sgtl5000.c | 6 +- + sound/soc/codecs/sigmadsp-regmap.c | 2 +- + sound/soc/codecs/sigmadsp.h | 2 +- + sound/soc/codecs/sti-sas.c | 3 - + sound/soc/codecs/tas2562.c | 3 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tscs454.c | 7 +- + sound/soc/codecs/wcd-clsh-v2.h | 6 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd934x.c | 2 - + sound/soc/codecs/wm2200.c | 7 - + sound/soc/codecs/wm5102.c | 12 +- + sound/soc/codecs/wm5110.c | 12 +- + sound/soc/codecs/wm8524.c | 2 +- + sound/soc/codecs/wm8903.c | 2 - + sound/soc/codecs/wm8958-dsp2.c | 16 +- + sound/soc/codecs/wm8960.c | 12 +- + sound/soc/codecs/wm8962.c | 23 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8994.h | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/wm8997.c | 14 +- + sound/soc/codecs/wm8998.c | 9 + + sound/soc/codecs/wm_adsp.c | 2 +- + sound/soc/codecs/wm_hubs.h | 2 +- + sound/soc/fsl/Kconfig | 32 + + sound/soc/fsl/Makefile | 6 + + sound/soc/fsl/fsl-asoc-card.c | 17 +- + sound/soc/fsl/fsl_asrc.c | 59 +- + sound/soc/fsl/fsl_asrc_dma.c | 5 +- + sound/soc/fsl/fsl_audmix.c | 3 +- + sound/soc/fsl/fsl_dma.c | 3 - + sound/soc/fsl/fsl_easrc.c | 9 +- + sound/soc/fsl/fsl_esai.c | 50 +- + sound/soc/fsl/fsl_micfil.c | 27 +- + sound/soc/fsl/fsl_rpmsg.c | 279 ++++ + sound/soc/fsl/fsl_rpmsg.h | 35 + + sound/soc/fsl/fsl_sai.c | 62 +- + sound/soc/fsl/fsl_sai.h | 4 + + sound/soc/fsl/fsl_spdif.c | 33 +- + sound/soc/fsl/fsl_ssi.c | 7 +- + sound/soc/fsl/fsl_xcvr.c | 19 +- + sound/soc/fsl/imx-audio-rpmsg.c | 140 ++ + sound/soc/fsl/imx-hdmi.c | 5 - + sound/soc/fsl/imx-pcm-rpmsg.c | 918 ++++++++++++ + sound/soc/fsl/imx-pcm-rpmsg.h | 512 +++++++ + sound/soc/fsl/imx-rpmsg.c | 150 ++ + sound/soc/fsl/mpc5200_dma.c | 2 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/generic/simple-card-utils.c | 2 +- + sound/soc/intel/Makefile | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + sound/soc/intel/atom/sst/sst_loader.c | 2 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/bytcr_rt5640.c | 14 +- + sound/soc/intel/boards/bytcr_wm5102.c | 36 +- + sound/soc/intel/boards/sof_realtek_common.c | 105 ++ + sound/soc/intel/boards/sof_realtek_common.h | 7 + + sound/soc/intel/boards/sof_rt5682.c | 35 +- + sound/soc/intel/boards/sof_wm8804.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 23 - + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/skl-topology.c | 17 +- + sound/soc/mediatek/Kconfig | 1 + + sound/soc/mediatek/common/mtk-btcvsd.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 4 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 29 + + sound/soc/meson/aiu-acodec-ctrl.c | 2 +- + sound/soc/meson/aiu-codec-ctrl.c | 2 +- + sound/soc/meson/aiu.c | 4 +- + sound/soc/meson/aiu.h | 2 +- + sound/soc/mxs/mxs-saif.c | 10 - + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/qcom/lpass-cpu.c | 2 +- + sound/soc/qcom/lpass-hdmi.c | 4 - + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 4 +- + sound/soc/qcom/qdsp6/q6afe.c | 7 +- + sound/soc/qcom/qdsp6/q6afe.h | 2 +- + sound/soc/qcom/qdsp6/q6asm.h | 6 +- + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/s3c24xx_simtec.c | 5 + + sound/soc/samsung/smdk_wm8994.c | 1 + + sound/soc/samsung/snow.c | 5 +- + sound/soc/samsung/tm2_wm5110.c | 5 +- + sound/soc/sh/dma-sh7760.c | 1 - + sound/soc/sh/rcar/adg.c | 15 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 103 +- + sound/soc/sh/rcar/ctu.c | 2 + + sound/soc/sh/rcar/rsnd.h | 6 +- + sound/soc/sh/rcar/ssi.c | 46 +- + sound/soc/sh/rcar/ssiu.c | 22 +- + sound/soc/sh/siu_pcm.c | 6 +- + sound/soc/soc-component.c | 16 +- + sound/soc/soc-compress.c | 11 +- + sound/soc/soc-core.c | 26 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 24 +- + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 513 +++---- + sound/soc/soc-topology.c | 16 +- + sound/soc/sof/core.c | 5 +- + sound/soc/sof/debug.c | 21 +- + sound/soc/sof/intel/hda-dsp.c | 11 +- + sound/soc/sof/intel/hda.c | 2 - + sound/soc/sof/sof-audio.c | 27 + + sound/soc/sunxi/sun4i-i2s.c | 2 - + sound/soc/tegra/tegra20_ac97.c | 21 + + sound/soc/tegra/tegra20_ac97.h | 1 + + sound/soc/tegra/tegra20_i2s.c | 60 +- + sound/soc/tegra/tegra20_i2s.h | 1 + + sound/soc/tegra/tegra20_spdif.c | 16 +- + sound/soc/tegra/tegra30_ahub.c | 168 +-- + sound/soc/tegra/tegra30_ahub.h | 5 +- + sound/soc/tegra/tegra30_i2s.c | 65 +- + sound/soc/ti/ams-delta.c | 2 +- + sound/soc/uniphier/aio-cpu.c | 7 +- + 219 files changed, 11269 insertions(+), 1738 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mchp,i2s-mcc.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt1019.yaml + delete mode 100644 include/linux/platform_data/asoc-mx27vis.h + delete mode 100644 include/sound/rt5645.h + rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (76%) + create mode 100644 sound/soc/codecs/rt1019.c + create mode 100644 sound/soc/codecs/rt1019.h + create mode 100644 sound/soc/codecs/rt1316-sdw.c + create mode 100644 sound/soc/codecs/rt1316-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca.c + create mode 100644 sound/soc/codecs/rt711-sdca.h + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt715-sdca.c + create mode 100644 sound/soc/codecs/rt715-sdca.h + create mode 100644 sound/soc/fsl/fsl_rpmsg.c + create mode 100644 sound/soc/fsl/fsl_rpmsg.h + create mode 100644 sound/soc/fsl/imx-audio-rpmsg.c + create mode 100644 sound/soc/fsl/imx-pcm-rpmsg.c + create mode 100644 sound/soc/fsl/imx-pcm-rpmsg.h + create mode 100644 sound/soc/fsl/imx-rpmsg.c +Merging modules/modules-next (1e80d9cb579e module: potential uninitialized return in module_kallsyms_on_each_symbol()) +$ git merge modules/modules-next +Already up to date. +Merging input/next (bfcf3d48dd02 Input: elan_i2c - fix a typo in parameter name) +$ git merge input/next +Removing Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-input-exc3000 | 9 + + .../devicetree/bindings/input/atmel,maxtouch.yaml | 32 + + .../devicetree/bindings/input/iqs626a.yaml | 843 +++++++++ + .../bindings/input/touchscreen/azoteq,iqs5xx.yaml | 75 + + .../bindings/input/touchscreen/iqs5xx.txt | 80 - + Documentation/input/devices/rotary-encoder.rst | 8 +- + drivers/input/Makefile | 1 + + drivers/input/keyboard/gpio_keys.c | 89 +- + drivers/input/keyboard/tca6416-keypad.c | 3 +- + drivers/input/keyboard/tegra-kbc.c | 5 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ims-pcu.c | 1 - + drivers/input/misc/iqs626a.c | 1838 ++++++++++++++++++++ + drivers/input/misc/max8997_haptic.c | 9 +- + drivers/input/mouse/elan_i2c.h | 7 +- + drivers/input/mouse/elan_i2c_core.c | 58 +- + .../of_touchscreen.c => touchscreen.c} | 13 +- + drivers/input/touchscreen/Kconfig | 4 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/ar1021_i2c.c | 5 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 83 +- + drivers/input/touchscreen/bu21029_ts.c | 4 +- + drivers/input/touchscreen/cyttsp_core.c | 18 +- + drivers/input/touchscreen/exc3000.c | 253 +-- + drivers/input/touchscreen/iqs5xx.c | 171 +- + drivers/input/touchscreen/lpc32xx_ts.c | 10 +- + drivers/input/touchscreen/melfas_mip4.c | 5 +- + drivers/input/touchscreen/mms114.c | 4 +- + drivers/input/touchscreen/silead.c | 2 +- + drivers/input/touchscreen/stmfts.c | 3 +- + drivers/input/touchscreen/tsc2007.h | 4 +- + drivers/input/touchscreen/tsc2007_core.c | 60 +- + drivers/input/touchscreen/wacom_i2c.c | 56 +- + drivers/input/touchscreen/wm831x-ts.c | 3 +- + drivers/input/touchscreen/zinitix.c | 4 +- + include/dt-bindings/input/atmel-maxtouch.h | 10 + + include/linux/interrupt.h | 4 + + kernel/irq/manage.c | 11 +- + 39 files changed, 3344 insertions(+), 454 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/iqs626a.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt + create mode 100644 drivers/input/misc/iqs626a.c + rename drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} (93%) + create mode 100644 include/dt-bindings/input/atmel-maxtouch.h +Merging block/for-next (e69563db16fc Merge branch 'for-5.13/drivers' into for-next) +$ git merge block/for-next +Removing drivers/block/xsysace.c +Removing drivers/block/umem.h +Removing drivers/block/umem.c +Auto-merging arch/mips/configs/maltaup_xpa_defconfig +Auto-merging arch/mips/configs/malta_kvm_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-ceva.txt | 4 + + MAINTAINERS | 1 - + arch/microblaze/boot/dts/system.dts | 8 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/powerpc/boot/dts/icon.dts | 7 - + arch/powerpc/configs/44x/icon_defconfig | 1 - + block/bfq-cgroup.c | 2 + + block/bfq-iosched.c | 399 +++++- + block/bfq-iosched.h | 15 + + block/bfq-wf2q.c | 8 + + block/bio.c | 21 +- + block/blk-merge.c | 8 + + block/blk-mq-tag.c | 4 +- + drivers/ata/ahci_ceva.c | 43 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/libata-pmp.c | 2 +- + drivers/ata/libata-sata.c | 4 +- + drivers/ata/libata-transport.c | 6 +- + drivers/ata/pata_ali.c | 6 +- + drivers/ata/pata_amd.c | 6 +- + drivers/ata/pata_artop.c | 4 +- + drivers/ata/pata_atiixp.c | 3 +- + drivers/ata/pata_cs5520.c | 2 + + drivers/ata/pata_hpt366.c | 1 + + drivers/ata/pata_hpt37x.c | 6 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_ns87415.c | 4 +- + drivers/ata/pata_optidma.c | 5 +- + drivers/ata/pata_pdc2027x.c | 10 +- + drivers/ata/sata_dwc_460ex.c | 10 + + drivers/ata/sata_mv.c | 12 +- + drivers/block/Kconfig | 23 - + drivers/block/Makefile | 2 - + drivers/block/rsxx/core.c | 2 +- + drivers/block/umem.c | 1130 ----------------- + drivers/block/umem.h | 132 -- + drivers/block/xsysace.c | 1273 -------------------- + drivers/md/md.c | 26 +- + drivers/md/md.h | 2 + + drivers/md/raid0.c | 14 +- + drivers/md/raid10.c | 434 ++++++- + drivers/md/raid10.h | 1 + + drivers/s390/block/dasd.c | 17 +- + drivers/s390/block/dasd_devmap.c | 15 +- + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_fba.c | 10 +- + drivers/s390/block/dasd_int.h | 3 +- + fs/block_dev.c | 4 +- + fs/io-wq.c | 276 ++--- + fs/io_uring.c | 1132 +++++++++-------- + include/trace/events/io_uring.h | 11 +- + include/uapi/linux/io_uring.h | 17 + + 56 files changed, 1698 insertions(+), 3440 deletions(-) + delete mode 100644 drivers/block/umem.c + delete mode 100644 drivers/block/umem.h + delete mode 100644 drivers/block/xsysace.c +Merging device-mapper/for-next (625e61dbd65d dm integrity: add the "reset_recalculate" feature flag) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-ebs-target.c | 6 +- + drivers/md/dm-integrity.c | 21 +- + drivers/md/dm-ioctl.c | 294 +++++++++++++++---------- + drivers/md/dm-table.c | 33 ++- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-target.c | 42 +++- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 68 +++--- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 6 +- + include/linux/device-mapper.h | 15 +- + include/uapi/linux/dm-ioctl.h | 18 +- + 14 files changed, 328 insertions(+), 185 deletions(-) +Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cistpl.c | 12 ++++++------ + drivers/pcmcia/ds.c | 7 ++----- + drivers/pcmcia/pcmcia_cis.c | 10 +++++----- + drivers/pcmcia/pcmcia_resource.c | 11 ++++++----- + drivers/pcmcia/rsrc_nonstatic.c | 22 +++++++++++----------- + 5 files changed, 30 insertions(+), 32 deletions(-) +Merging mmc/next (b7b2feb44c61 mmc: sdhci: replace mmc->parent with mmc_dev() for consistency) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 20 ++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-of-dwcmshc.txt | 20 -- + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 87 ++++++ + drivers/memstick/core/memstick.c | 21 +- + drivers/memstick/core/mspro_block.c | 3 +- + drivers/mmc/core/block.c | 58 ++-- + drivers/mmc/core/core.c | 186 +----------- + drivers/mmc/core/core.h | 8 - + drivers/mmc/core/host.c | 40 ++- + drivers/mmc/core/mmc_ops.c | 39 +-- + drivers/mmc/core/queue.c | 11 +- + drivers/mmc/core/queue.h | 1 - + drivers/mmc/core/sd.c | 6 + + drivers/mmc/core/sdio.c | 28 +- + drivers/mmc/host/Kconfig | 2 + + drivers/mmc/host/cavium.c | 3 +- + drivers/mmc/host/dw_mmc.c | 16 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 38 ++- + drivers/mmc/host/sdhci-acpi.c | 2 + + drivers/mmc/host/sdhci-esdhc-imx.c | 16 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 8 +- + drivers/mmc/host/sdhci-of-aspeed.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 313 +++++++++++++++++++-- + drivers/mmc/host/sdhci-pci-core.c | 4 +- + drivers/mmc/host/sdhci-pci-gli.c | 8 + + drivers/mmc/host/sdhci-pci-o2micro.c | 8 + + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-st.c | 19 +- + drivers/mmc/host/sdhci-tegra.c | 34 +-- + drivers/mmc/host/sdhci.c | 113 ++++---- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/tmio_mmc.h | 3 +- + drivers/mmc/host/tmio_mmc_core.c | 56 ++-- + drivers/mmc/host/uniphier-sd.c | 5 +- + drivers/mmc/host/via-sdmmc.c | 3 +- + include/linux/mmc/host.h | 5 - + include/linux/mmc/sdio.h | 2 +- + 39 files changed, 712 insertions(+), 483 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml +Merging mfd/for-mfd-next (105cbb01200c mfd: intel_quark_i2c_gpio: Reuse BAR definitions for MFD cell indexing) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/ab3100.h +Auto-merging drivers/platform/x86/intel_pmt_class.c +Auto-merging drivers/mfd/intel_quark_i2c_gpio.c +Removing drivers/mfd/ab3100-otp.c +Removing drivers/mfd/ab3100-core.c +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/mfd/rn5t618.txt +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 3 + + Documentation/devicetree/bindings/input/input.yaml | 7 + + .../devicetree/bindings/mfd/actions,atc260x.yaml | 183 ++++ + .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 ++ + .../devicetree/bindings/mfd/ricoh,rn5t618.yaml | 111 +++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 52 -- + .../devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 123 +++ + .../devicetree/bindings/mfd/ti,lp87524-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87561-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 68 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/atc260x-onkey.c | 305 +++++++ + drivers/mfd/Kconfig | 67 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/ab3100-core.c | 929 --------------------- + drivers/mfd/ab3100-otp.c | 240 ------ + drivers/mfd/ab8500-core.c | 37 +- + drivers/mfd/arizona-spi.c | 4 +- + drivers/mfd/atc260x-core.c | 310 +++++++ + drivers/mfd/atc260x-i2c.c | 64 ++ + drivers/mfd/da9063-i2c.c | 10 + + drivers/mfd/ene-kb3930.c | 2 +- + drivers/mfd/intel-lpss-acpi.c | 32 +- + drivers/mfd/intel-lpss-pci.c | 46 +- + drivers/mfd/intel-lpss.c | 2 +- + drivers/mfd/intel-lpss.h | 4 +- + drivers/mfd/intel-m10-bmc.c | 30 +- + drivers/mfd/intel_pmt.c | 112 ++- + drivers/mfd/intel_quark_i2c_gpio.c | 35 +- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/mfd-core.c | 7 +- + drivers/mfd/ntxec.c | 271 ++++++ + drivers/mfd/rn5t618.c | 3 + + drivers/mfd/rohm-bd9576.c | 189 +++++ + drivers/mfd/sec-core.c | 14 +- + drivers/mfd/stm32-timers.c | 7 +- + drivers/mfd/stmpe.c | 14 +- + drivers/platform/x86/intel_pmt_class.c | 46 + + drivers/platform/x86/intel_pmt_class.h | 1 + + drivers/platform/x86/intel_pmt_telemetry.c | 20 - + drivers/power/supply/Kconfig | 2 +- + .../abx500 => drivers/power/supply}/ab8500-bm.h | 297 ++++++- + .../power/supply/ab8500-chargalg.h | 6 +- + drivers/power/supply/ab8500_bmdata.c | 3 +- + drivers/power/supply/ab8500_btemp.c | 45 +- + drivers/power/supply/ab8500_charger.c | 27 +- + drivers/power/supply/ab8500_fg.c | 20 +- + drivers/power/supply/abx500_chargalg.c | 22 +- + drivers/power/supply/pm2301_charger.c | 4 +- + drivers/pwm/Kconfig | 8 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-ntxec.c | 184 ++++ + drivers/rtc/Kconfig | 8 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ntxec.c | 145 ++++ + drivers/watchdog/Kconfig | 13 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/bd9576_wdt.c | 291 +++++++ + include/linux/mfd/ab3100.h | 128 --- + include/linux/mfd/abx500.h | 276 ------ + include/linux/mfd/atc260x/atc2603c.h | 281 +++++++ + include/linux/mfd/atc260x/atc2609a.h | 308 +++++++ + include/linux/mfd/atc260x/core.h | 58 ++ + include/linux/mfd/core.h | 6 +- + include/linux/mfd/da9063/registers.h | 3 + + include/linux/mfd/db8500-prcmu.h | 2 +- + include/linux/mfd/intel-m10-bmc.h | 7 +- + include/linux/mfd/lp87565.h | 3 - + include/linux/mfd/ntxec.h | 38 + + include/linux/mfd/rn5t618.h | 1 + + include/linux/mfd/rohm-bd957x.h | 140 ++++ + include/linux/mfd/rohm-generic.h | 2 + + 75 files changed, 3841 insertions(+), 1950 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/actions,atc260x.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ricoh,rn5t618.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rn5t618.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml + create mode 100644 drivers/input/misc/atc260x-onkey.c + delete mode 100644 drivers/mfd/ab3100-core.c + delete mode 100644 drivers/mfd/ab3100-otp.c + create mode 100644 drivers/mfd/atc260x-core.c + create mode 100644 drivers/mfd/atc260x-i2c.c + create mode 100644 drivers/mfd/ntxec.c + create mode 100644 drivers/mfd/rohm-bd9576.c + rename {include/linux/mfd/abx500 => drivers/power/supply}/ab8500-bm.h (58%) + rename include/linux/mfd/abx500/ux500_chargalg.h => drivers/power/supply/ab8500-chargalg.h (93%) + create mode 100644 drivers/pwm/pwm-ntxec.c + create mode 100644 drivers/rtc/rtc-ntxec.c + create mode 100644 drivers/watchdog/bd9576_wdt.c + delete mode 100644 include/linux/mfd/ab3100.h + create mode 100644 include/linux/mfd/atc260x/atc2603c.h + create mode 100644 include/linux/mfd/atc260x/atc2609a.h + create mode 100644 include/linux/mfd/atc260x/core.h + create mode 100644 include/linux/mfd/ntxec.h + create mode 100644 include/linux/mfd/rohm-bd957x.h +Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: qcom-wled: Add PMI8994 compatible) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging battery/for-next (3aeaf5093809 power: reset: replace curly brackets in Makefile) +$ git merge battery/for-next +Auto-merging drivers/power/supply/pm2301_charger.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/supply/twl-charger.txt +Removing Documentation/devicetree/bindings/power/supply/tps65217_charger.txt +Removing Documentation/devicetree/bindings/power/supply/tps65090.txt +Removing Documentation/devicetree/bindings/power/supply/ti,bq24735.txt +Removing Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt +Removing Documentation/devicetree/bindings/power/supply/sc2731_charger.txt +Removing Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt +Removing Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt +Removing Documentation/devicetree/bindings/power/supply/rx51-battery.txt +Removing Documentation/devicetree/bindings/power/supply/rt9455_charger.txt +Removing Documentation/devicetree/bindings/power/supply/qcom_smbb.txt +Removing Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt +Removing Documentation/devicetree/bindings/power/supply/power_supply.txt +Removing Documentation/devicetree/bindings/power/supply/olpc_battery.txt +Removing Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt +Removing Documentation/devicetree/bindings/power/supply/maxim,max14656.txt +Removing Documentation/devicetree/bindings/power/supply/maxim,ds2760.txt +Removing Documentation/devicetree/bindings/power/supply/max8903-charger.txt +Removing Documentation/devicetree/bindings/power/supply/max17042_battery.txt +Removing Documentation/devicetree/bindings/power/supply/max17040_battery.txt +Removing Documentation/devicetree/bindings/power/supply/ltc2941.txt +Removing Documentation/devicetree/bindings/power/supply/lt3651-charger.txt +Removing Documentation/devicetree/bindings/power/supply/lp8727_charger.txt +Removing Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt +Removing Documentation/devicetree/bindings/power/supply/isp1704.txt +Removing Documentation/devicetree/bindings/power/supply/da9150-fg.txt +Removing Documentation/devicetree/bindings/power/supply/da9150-charger.txt +Removing Documentation/devicetree/bindings/power/supply/cpcap-charger.txt +Removing Documentation/devicetree/bindings/power/supply/cpcap-battery.txt +Removing Documentation/devicetree/bindings/power/supply/bq25890.txt +Removing Documentation/devicetree/bindings/power/supply/bq24257.txt +Removing Documentation/devicetree/bindings/power/supply/bq24190.txt +Removing Documentation/devicetree/bindings/power/supply/bq2415x.txt +Removing Documentation/devicetree/bindings/power/supply/battery.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_battery.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt +Removing Documentation/devicetree/bindings/power/supply/act8945a-charger.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/charger.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt +Merge made by the 'recursive' strategy. + .../bindings/power/supply/ab8500/btemp.txt | 16 -- + .../bindings/power/supply/ab8500/chargalg.txt | 16 -- + .../bindings/power/supply/ab8500/charger.txt | 25 --- + .../bindings/power/supply/act8945a-charger.txt | 44 ------ + .../power/supply/active-semi,act8945a-charger.yaml | 76 +++++++++ + .../bindings/power/supply/axp20x_ac_power.txt | 25 --- + .../bindings/power/supply/axp20x_battery.txt | 20 --- + .../bindings/power/supply/axp20x_usb_power.txt | 41 ----- + .../devicetree/bindings/power/supply/battery.txt | 3 - + .../devicetree/bindings/power/supply/bq2415x.txt | 47 ------ + .../devicetree/bindings/power/supply/bq2415x.yaml | 98 ++++++++++++ + .../devicetree/bindings/power/supply/bq24190.txt | 61 -------- + .../devicetree/bindings/power/supply/bq24190.yaml | 92 +++++++++++ + .../devicetree/bindings/power/supply/bq24257.txt | 62 -------- + .../devicetree/bindings/power/supply/bq24257.yaml | 124 +++++++++++++++ + .../devicetree/bindings/power/supply/bq24735.yaml | 89 +++++++++++ + .../devicetree/bindings/power/supply/bq25890.txt | 60 -------- + .../devicetree/bindings/power/supply/bq25890.yaml | 123 +++++++++++++++ + .../devicetree/bindings/power/supply/bq27xxx.yaml | 3 +- + .../bindings/power/supply/cpcap-battery.txt | 31 ---- + .../bindings/power/supply/cpcap-battery.yaml | 87 +++++++++++ + .../bindings/power/supply/cpcap-charger.txt | 40 ----- + .../bindings/power/supply/cpcap-charger.yaml | 106 +++++++++++++ + .../bindings/power/supply/da9150-charger.txt | 26 ---- + .../devicetree/bindings/power/supply/da9150-fg.txt | 23 --- + .../bindings/power/supply/dlg,da9150-charger.yaml | 52 +++++++ + .../power/supply/dlg,da9150-fuel-gauge.yaml | 51 +++++++ + .../devicetree/bindings/power/supply/isp1704.txt | 17 --- + .../devicetree/bindings/power/supply/isp1704.yaml | 42 +++++ + .../bindings/power/supply/lego,ev3-battery.yaml | 55 +++++++ + .../bindings/power/supply/lego_ev3_battery.txt | 21 --- + .../bindings/power/supply/lltc,lt3651-charger.yaml | 44 ++++++ + .../bindings/power/supply/lltc,ltc294x.yaml | 66 ++++++++ + .../bindings/power/supply/lp8727_charger.txt | 43 ------ + .../bindings/power/supply/lt3651-charger.txt | 29 ---- + .../devicetree/bindings/power/supply/ltc2941.txt | 28 ---- + .../bindings/power/supply/max17040_battery.txt | 52 ------- + .../bindings/power/supply/max17042_battery.txt | 35 ----- + .../bindings/power/supply/max8903-charger.txt | 24 --- + .../bindings/power/supply/maxim,ds2760.txt | 26 ---- + .../bindings/power/supply/maxim,ds2760.yaml | 43 ++++++ + .../bindings/power/supply/maxim,max14656.txt | 23 --- + .../bindings/power/supply/maxim,max14656.yaml | 45 ++++++ + .../bindings/power/supply/maxim,max17040.yaml | 95 ++++++++++++ + .../bindings/power/supply/maxim,max17042.yaml | 78 ++++++++++ + .../bindings/power/supply/maxim,max8903.yaml | 67 ++++++++ + .../bindings/power/supply/microchip,ucs1002.txt | 27 ---- + .../bindings/power/supply/microchip,ucs1002.yaml | 51 +++++++ + .../bindings/power/supply/nokia,n900-battery.yaml | 49 ++++++ + .../bindings/power/supply/olpc-battery.yaml | 27 ++++ + .../bindings/power/supply/olpc_battery.txt | 5 - + .../bindings/power/supply/power_supply.txt | 2 - + .../power/supply/qcom,coincell-charger.txt | 48 ------ + .../bindings/power/supply/qcom,pm8941-charger.yaml | 169 +++++++++++++++++++++ + .../power/supply/qcom,pm8941-coincell.yaml | 57 +++++++ + .../devicetree/bindings/power/supply/qcom_smbb.txt | 150 ------------------ + .../bindings/power/supply/richtek,rt9455.yaml | 90 +++++++++++ + .../bindings/power/supply/rohm,bd99954.yaml | 2 +- + .../bindings/power/supply/rt9455_charger.txt | 46 ------ + .../bindings/power/supply/rx51-battery.txt | 25 --- + .../bindings/power/supply/sbs,sbs-battery.yaml | 7 +- + .../bindings/power/supply/sbs,sbs-charger.yaml | 55 +++++++ + .../bindings/power/supply/sbs,sbs-manager.txt | 66 -------- + .../bindings/power/supply/sbs,sbs-manager.yaml | 107 +++++++++++++ + .../bindings/power/supply/sbs_sbs-charger.txt | 21 --- + .../bindings/power/supply/sc2731-charger.yaml | 53 +++++++ + .../bindings/power/supply/sc2731_charger.txt | 40 ----- + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 59 ------- + .../bindings/power/supply/sc27xx-fg.yaml | 98 ++++++++++++ + .../fg.txt => stericsson,ab8500-battery.txt} | 32 +--- + .../power/supply/stericsson,ab8500-btemp.yaml | 73 +++++++++ + .../power/supply/stericsson,ab8500-chargalg.yaml | 37 +++++ + .../power/supply/stericsson,ab8500-charger.yaml | 123 +++++++++++++++ + .../power/supply/stericsson,ab8500-fg.yaml | 72 +++++++++ + .../bindings/power/supply/ti,bq24735.txt | 39 ----- + .../bindings/power/supply/ti,lp8727.yaml | 90 +++++++++++ + .../bindings/power/supply/tps65090-charger.yaml | 36 +++++ + .../devicetree/bindings/power/supply/tps65090.txt | 17 --- + .../bindings/power/supply/tps65217-charger.yaml | 43 ++++++ + .../bindings/power/supply/tps65217_charger.txt | 17 --- + .../bindings/power/supply/twl-charger.txt | 30 ---- + .../bindings/power/supply/twl4030-charger.yaml | 68 +++++++++ + .../supply/x-powers,axp20x-ac-power-supply.yaml | 32 ++++ + .../x-powers,axp20x-battery-power-supply.yaml | 30 ++++ + .../supply/x-powers,axp20x-usb-power-supply.yaml | 33 ++++ + MAINTAINERS | 7 + + drivers/power/reset/Makefile | 2 +- + drivers/power/reset/vexpress-poweroff.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 4 +- + drivers/power/supply/bq27xxx_battery.c | 169 +++++++++++++-------- + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/cw2015_battery.c | 6 + + drivers/power/supply/ds2781_battery.c | 8 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max17042_battery.c | 8 +- + drivers/power/supply/max1721x_battery.c | 14 +- + drivers/power/supply/max8997_charger.c | 2 +- + drivers/power/supply/pm2301_charger.c | 2 +- + drivers/power/supply/s3c_adc_battery.c | 19 +-- + drivers/power/supply/smb347-charger.c | 65 ++++---- + drivers/power/supply/tps65090-charger.c | 2 +- + drivers/power/supply/tps65217_charger.c | 2 +- + drivers/power/supply/z2_battery.c | 3 - + include/linux/power/bq27xxx_battery.h | 2 +- + include/linux/power_supply.h | 6 + + 106 files changed, 3037 insertions(+), 1592 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/act8945a-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq2415x.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq2415x.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq24190.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24190.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq24257.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24257.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24735.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq25890.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq25890.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/da9150-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/da9150-fg.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/dlg,da9150-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/dlg,da9150-fuel-gauge.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/isp1704.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/isp1704.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/lltc,lt3651-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/lp8727_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/lt3651-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ltc2941.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max17040_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max17042_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max8903-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/maxim,ds2760.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,ds2760.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14656.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max8903.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/nokia,n900-battery.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/olpc-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/olpc_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/power_supply.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8941-coincell.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/qcom_smbb.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/rt9455_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/rx51-battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sc2731-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sc2731_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml + rename Documentation/devicetree/bindings/power/supply/{ab8500/fg.txt => stericsson,ab8500-battery.txt} (52%) + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/ti,bq24735.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/tps65090-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/tps65090.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/tps65217-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/tps65217_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/twl-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/twl4030-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml +Merging regulator/for-next (1baf2b66e886 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/scmi-regulator.c +Merge made by the 'recursive' strategy. + drivers/regulator/bd9576-regulator.c | 11 ++++------- + drivers/regulator/mt6360-regulator.c | 4 +--- + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/qcom_spmi-regulator.c | 2 ++ + drivers/regulator/scmi-regulator.c | 4 +++- + 5 files changed, 11 insertions(+), 11 deletions(-) +Merging security/next-testing (215042ece980 Merge branch 'landlock_lsm' into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/ss/services.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/index.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5692f9312274] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/index.rst | 1 + + Documentation/security/landlock.rst | 79 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/landlock.rst | 307 +++ + MAINTAINERS | 15 + + arch/Kconfig | 7 + + arch/alpha/kernel/syscalls/syscall.tbl | 3 + + arch/arm/tools/syscall.tbl | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 + + arch/ia64/kernel/syscalls/syscall.tbl | 3 + + arch/m68k/kernel/syscalls/syscall.tbl | 3 + + arch/microblaze/kernel/syscalls/syscall.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 + + arch/parisc/kernel/syscalls/syscall.tbl | 3 + + arch/powerpc/kernel/syscalls/syscall.tbl | 3 + + arch/s390/kernel/syscalls/syscall.tbl | 3 + + arch/sh/kernel/syscalls/syscall.tbl | 3 + + arch/sparc/kernel/syscalls/syscall.tbl | 3 + + arch/um/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 3 + + arch/x86/entry/syscalls/syscall_64.tbl | 3 + + arch/xtensa/kernel/syscalls/syscall.tbl | 3 + + fs/super.c | 1 + + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 4 + + include/linux/security.h | 4 + + include/linux/syscalls.h | 7 + + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/landlock.h | 128 ++ + kernel/sys_ni.c | 5 + + samples/Kconfig | 7 + + samples/Makefile | 1 + + samples/landlock/.gitignore | 1 + + samples/landlock/Makefile | 13 + + samples/landlock/sandboxer.c | 238 ++ + security/Kconfig | 11 +- + security/Makefile | 2 + + security/landlock/Kconfig | 21 + + security/landlock/Makefile | 4 + + security/landlock/common.h | 20 + + security/landlock/cred.c | 46 + + security/landlock/cred.h | 58 + + security/landlock/fs.c | 687 ++++++ + security/landlock/fs.h | 56 + + security/landlock/limits.h | 21 + + security/landlock/object.c | 67 + + security/landlock/object.h | 91 + + security/landlock/ptrace.c | 120 + + security/landlock/ptrace.h | 14 + + security/landlock/ruleset.c | 473 ++++ + security/landlock/ruleset.h | 165 ++ + security/landlock/setup.c | 40 + + security/landlock/setup.h | 18 + + security/landlock/syscalls.c | 445 ++++ + security/security.c | 51 +- + security/selinux/hooks.c | 58 +- + security/selinux/include/objsec.h | 6 + + security/selinux/ss/services.c | 3 +- + security/smack/smack.h | 6 + + security/smack/smack_lsm.c | 35 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/landlock/.gitignore | 2 + + tools/testing/selftests/landlock/Makefile | 24 + + tools/testing/selftests/landlock/base_test.c | 219 ++ + tools/testing/selftests/landlock/common.h | 183 ++ + tools/testing/selftests/landlock/config | 7 + + tools/testing/selftests/landlock/fs_test.c | 2792 ++++++++++++++++++++++++ + tools/testing/selftests/landlock/ptrace_test.c | 337 +++ + tools/testing/selftests/landlock/true.c | 5 + + 72 files changed, 6896 insertions(+), 77 deletions(-) + create mode 100644 Documentation/security/landlock.rst + create mode 100644 Documentation/userspace-api/landlock.rst + create mode 100644 include/uapi/linux/landlock.h + create mode 100644 samples/landlock/.gitignore + create mode 100644 samples/landlock/Makefile + create mode 100644 samples/landlock/sandboxer.c + create mode 100644 security/landlock/Kconfig + create mode 100644 security/landlock/Makefile + create mode 100644 security/landlock/common.h + create mode 100644 security/landlock/cred.c + create mode 100644 security/landlock/cred.h + create mode 100644 security/landlock/fs.c + create mode 100644 security/landlock/fs.h + create mode 100644 security/landlock/limits.h + create mode 100644 security/landlock/object.c + create mode 100644 security/landlock/object.h + create mode 100644 security/landlock/ptrace.c + create mode 100644 security/landlock/ptrace.h + create mode 100644 security/landlock/ruleset.c + create mode 100644 security/landlock/ruleset.h + create mode 100644 security/landlock/setup.c + create mode 100644 security/landlock/setup.h + create mode 100644 security/landlock/syscalls.c + create mode 100644 tools/testing/selftests/landlock/.gitignore + create mode 100644 tools/testing/selftests/landlock/Makefile + create mode 100644 tools/testing/selftests/landlock/base_test.c + create mode 100644 tools/testing/selftests/landlock/common.h + create mode 100644 tools/testing/selftests/landlock/config + create mode 100644 tools/testing/selftests/landlock/fs_test.c + create mode 100644 tools/testing/selftests/landlock/ptrace_test.c + create mode 100644 tools/testing/selftests/landlock/true.c +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (92063f3ca73a integrity: double check iint_cache was initialized) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/iint.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Merge made by the 'recursive' strategy. + certs/Kconfig | 17 ++++++ + certs/Makefile | 21 ++++++- + certs/blacklist.c | 64 ++++++++++++++++++++++ + certs/blacklist.h | 2 + + certs/common.c | 57 +++++++++++++++++++ + certs/common.h | 9 +++ + certs/revocation_certificates.S | 21 +++++++ + certs/system_keyring.c | 55 +++---------------- + include/keys/system_keyring.h | 15 +++++ + scripts/Makefile | 1 + + .../integrity/platform_certs/keyring_handler.c | 11 ++++ + security/integrity/platform_certs/load_uefi.c | 20 ++++++- + 12 files changed, 242 insertions(+), 51 deletions(-) + create mode 100644 certs/common.c + create mode 100644 certs/common.h + create mode 100644 certs/revocation_certificates.S +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (1fb057dcde11 smack: differentiate between subjective and objective task credentials) +$ git merge selinux/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smack.h +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/apparmor/lsm.c +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/nfs/internal.h +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 11 ++- + fs/nfs/fs_context.c | 3 + + fs/nfs/internal.h | 1 + + fs/nfs/super.c | 6 +- + include/linux/cred.h | 2 +- + include/linux/lsm_hook_defs.h | 6 +- + include/linux/lsm_hooks.h | 18 +++- + include/linux/nfs_fs_sb.h | 1 + + include/linux/security.h | 18 +++- + kernel/audit.c | 4 +- + kernel/auditfilter.c | 3 +- + kernel/auditsc.c | 8 +- + kernel/bpf/bpf_lsm.c | 3 +- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + security/apparmor/lsm.c | 3 +- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_main.c | 14 +-- + security/security.c | 20 +++- + security/selinux/hooks.c | 170 ++++++++++++++++++++++++++-------- + security/selinux/ima.c | 87 ++++++++++++++++- + security/selinux/include/ima.h | 6 ++ + security/selinux/include/security.h | 2 +- + security/selinux/selinuxfs.c | 6 ++ + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/services.c | 2 +- + security/smack/smack.h | 18 +++- + security/smack/smack_lsm.c | 39 +++++--- + 28 files changed, 369 insertions(+), 90 deletions(-) +Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (8b12a62a4e3e Merge tag 'drm-fixes-2021-03-19' of git://anongit.freedesktop.org/drm/drm) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (1e28eed17697 Linux 5.12-rc3) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (7851dfc68810 Merge branches 'iommu/fixes', 'unisoc', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 15 +- + .../devicetree/bindings/iommu/sprd,iommu.yaml | 57 ++ + drivers/iommu/Kconfig | 12 + + drivers/iommu/Makefile | 1 + + drivers/iommu/dma-iommu.c | 13 +- + drivers/iommu/intel/dmar.c | 68 ++- + drivers/iommu/intel/iommu.c | 8 +- + drivers/iommu/intel/pasid.c | 29 ++ + drivers/iommu/intel/svm.c | 21 +- + drivers/iommu/iommu.c | 24 +- + drivers/iommu/iova.c | 62 ++- + drivers/iommu/sprd-iommu.c | 577 +++++++++++++++++++++ + include/linux/dma-iommu.h | 2 + + include/linux/intel-iommu.h | 6 + + include/uapi/linux/iommu.h | 3 +- + 15 files changed, 859 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/sprd,iommu.yaml + create mode 100644 drivers/iommu/sprd-iommu.c +Merging audit/next (d4ceb1d6e732 audit: avoid -Wempty-body warning) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/procfs-audit_loginuid | 27 ++++++++++++++++++++++++++ + MAINTAINERS | 2 ++ + kernel/audit.h | 12 ++++++------ + kernel/auditsc.c | 11 ++++------- + 4 files changed, 39 insertions(+), 13 deletions(-) + create mode 100644 Documentation/ABI/stable/procfs-audit_loginuid +Merging devicetree/for-next (592485bcb567 devicetree: bindings: clock: Minor typo fix in the file armada3700-tbg-clock.txt) +$ git merge devicetree/for-next +Auto-merging scripts/Makefile.lib +Removing arch/powerpc/kexec/ima.c +Removing arch/powerpc/include/asm/ima.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt +Removing Documentation/devicetree/bindings/media/video-mux.txt +Auto-merging Documentation/devicetree/bindings/input/input.yaml +Auto-merging Documentation/devicetree/bindings/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 5 +- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 5 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 - + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- + .../bindings/clock/armada3700-tbg-clock.txt | 2 +- + .../devicetree/bindings/clock/milbeaut-clock.yaml | 12 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 1 - + .../bindings/display/brcm,bcm2835-dsi0.yaml | 6 - + .../devicetree/bindings/display/msm/dpu.txt | 4 +- + .../bindings/display/panel/panel-dpi.yaml | 2 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 +- + .../bindings/gpio/socionext,uniphier-gpio.yaml | 3 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + Documentation/devicetree/bindings/i3c/i3c.yaml | 7 +- + .../bindings/iio/adc/brcm,iproc-static-adc.yaml | 5 - + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 2 +- + .../bindings/iio/light/capella,cm3605.yaml | 1 - + .../bindings/iio/light/upisemi,us5182.yaml | 4 +- + Documentation/devicetree/bindings/input/input.yaml | 1 - + .../interrupt-controller/loongson,htpic.yaml | 2 +- + .../devicetree/bindings/leds/leds-lgm.yaml | 26 +- + .../devicetree/bindings/media/video-mux.txt | 60 --- + .../devicetree/bindings/media/video-mux.yaml | 106 +++++ + .../memory-controllers/nvidia,tegra210-emc.yaml | 2 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 1 - + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 101 +++++ + .../bindings/net/wireless/brcm,bcm43xx-fmac.txt | 38 -- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 4 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 1 - + .../bindings/power/supply/cw2015_battery.yaml | 2 +- + .../bindings/power/supply/ltc4162-l.yaml | 2 - + .../bindings/power/supply/power-supply.yaml | 22 - + .../bindings/regulator/qcom-labibb-regulator.yaml | 1 - + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 2 +- + .../devicetree/bindings/serial/serial.yaml | 2 +- + .../devicetree/bindings/sound/ak4642.yaml | 2 - + .../bindings/sound/google,cros-ec-codec.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 1 - + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 4 +- + .../devicetree/bindings/spi/spi-controller.yaml | 21 +- + Documentation/devicetree/bindings/spi/spi-mux.yaml | 8 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 6 - + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 2 - + .../devicetree/bindings/trivial-devices.yaml | 3 + + Documentation/devicetree/bindings/usb/usb.yaml | 1 - + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kexec.h | 4 - + arch/arm64/kernel/machine_kexec_file.c | 196 +-------- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/ima.h | 30 -- + arch/powerpc/include/asm/kexec.h | 16 +- + arch/powerpc/kexec/Makefile | 7 - + arch/powerpc/kexec/elf_64.c | 30 +- + arch/powerpc/kexec/file_load.c | 183 +------- + arch/powerpc/kexec/file_load_64.c | 47 +-- + arch/powerpc/kexec/ima.c | 219 ---------- + arch/x86/include/asm/kexec.h | 5 - + arch/x86/kernel/crash.c | 14 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 4 +- + drivers/of/Makefile | 6 + + drivers/of/address.c | 3 + + drivers/of/base.c | 16 +- + drivers/of/device.c | 7 +- + drivers/of/dynamic.c | 4 +- + drivers/of/fdt.c | 23 +- + drivers/of/kexec.c | 458 +++++++++++++++++++++ + drivers/of/of_reserved_mem.c | 6 +- + drivers/of/overlay.c | 3 +- + drivers/of/platform.c | 2 +- + drivers/of/property.c | 5 +- + drivers/of/unittest-data/Makefile | 48 +++ + drivers/of/unittest-data/overlay_base.dts | 90 +--- + drivers/of/unittest-data/overlay_common.dtsi | 91 ++++ + drivers/of/unittest-data/static_base_1.dts | 4 + + drivers/of/unittest-data/static_base_2.dts | 4 + + drivers/of/unittest-data/testcases.dts | 23 +- + drivers/of/unittest-data/testcases_common.dtsi | 19 + + drivers/of/unittest-data/tests-interrupts.dtsi | 11 +- + include/linux/kexec.h | 8 + + include/linux/of.h | 7 + + scripts/Makefile.lib | 34 +- + security/integrity/ima/ima.h | 4 - + security/integrity/ima/ima_kexec.c | 9 +- + 86 files changed, 1091 insertions(+), 1052 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/video-mux.txt + create mode 100644 Documentation/devicetree/bindings/media/video-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt + delete mode 100644 arch/powerpc/include/asm/ima.h + delete mode 100644 arch/powerpc/kexec/ima.c + create mode 100644 drivers/of/kexec.c + create mode 100644 drivers/of/unittest-data/overlay_common.dtsi + create mode 100644 drivers/of/unittest-data/static_base_1.dts + create mode 100644 drivers/of/unittest-data/static_base_2.dts + create mode 100644 drivers/of/unittest-data/testcases_common.dtsi +Merging mailbox/mailbox-for-next (6b50df2b8c20 mailbox: arm_mhuv2: Skip calling kfree() with invalid pointer) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (811ba6ea42f6 Merge remote-tracking branch 'spi/for-5.13' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-imx.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-mt65xx.txt | 2 + + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 2 + + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 1 + + Documentation/spi/spi-summary.rst | 7 +- + arch/arm/mach-pxa/icontrol.c | 12 ++- + arch/arm/mach-pxa/zeus.c | 6 +- + drivers/spi/spi-atmel.c | 4 - + drivers/spi/spi-axi-spi-engine.c | 12 +-- + drivers/spi/spi-bcm-qspi.c | 2 +- + drivers/spi/spi-bcm63xx.c | 2 +- + drivers/spi/spi-bitbang.c | 9 +- + drivers/spi/spi-butterfly.c | 13 +-- + drivers/spi/spi-cadence-quadspi.c | 8 +- + drivers/spi/spi-dln2.c | 3 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 27 ++--- + drivers/spi/spi-fsl-espi.c | 17 +-- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-jcore.c | 3 +- + drivers/spi/spi-lm70llp.c | 13 +-- + drivers/spi/spi-mem.c | 6 +- + drivers/spi/spi-mtk-nor.c | 2 +- + drivers/spi/spi-nxp-fspi.c | 115 +++++++++++++++++++-- + drivers/spi/spi-omap-100k.c | 8 +- + drivers/spi/spi-omap2-mcspi.c | 24 +++-- + drivers/spi/spi-pl022.c | 2 +- + drivers/spi/spi-pxa2xx-pci.c | 2 +- + drivers/spi/spi-pxa2xx.c | 2 +- + drivers/spi/spi-rockchip.c | 19 ++-- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-slave-mt27xx.c | 36 ++++++- + drivers/spi/spi-sprd-adi.c | 2 +- + drivers/spi/spi-stm32.c | 36 +++---- + drivers/spi/spi-tegra20-sflash.c | 3 +- + drivers/spi/spi-topcliff-pch.c | 3 +- + drivers/spi/spi.c | 22 ++-- + drivers/staging/greybus/spilib.c | 5 +- + include/linux/parport.h | 12 ++- + include/linux/spi/spi.h | 19 +--- + 39 files changed, 283 insertions(+), 186 deletions(-) +Merging tip/auto-latest (4f469efcd03f Merge branch 'core/entry') +$ git merge tip/auto-latest +Auto-merging net/core/skbuff.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/lockdep.h +Auto-merging include/linux/irq.h +Auto-merging arch/x86/net/bpf_jit_comp.c +Removing arch/x86/kernel/paravirt_patch.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Removing arch/x86/include/asm/alternative-asm.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-sgi_uv | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 10 + + arch/arm/include/asm/paravirt.h | 14 +- + arch/arm/include/asm/spinlock.h | 2 +- + arch/arm/kernel/paravirt.c | 9 +- + arch/arm64/include/asm/paravirt.h | 14 +- + arch/arm64/kernel/paravirt.c | 13 +- + arch/s390/kernel/stacktrace.c | 6 - + arch/x86/Kconfig | 10 +- + arch/x86/Makefile | 10 +- + arch/x86/boot/compressed/efi_thunk_64.S | 2 +- + arch/x86/boot/compressed/head_64.S | 172 +++++- + arch/x86/boot/compressed/idt_64.c | 14 + + arch/x86/boot/compressed/kaslr.c | 4 +- + arch/x86/boot/compressed/mem_encrypt.S | 130 +++- + arch/x86/boot/compressed/misc.c | 9 +- + arch/x86/boot/compressed/misc.h | 6 + + arch/x86/boot/compressed/sev-es.c | 23 +- + arch/x86/crypto/crc32-pclmul_glue.c | 2 +- + arch/x86/crypto/curve25519-x86_64.c | 6 +- + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 2 +- + arch/x86/crypto/twofish_glue_3way.c | 2 +- + arch/x86/entry/entry_32.S | 103 +--- + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/vdso/vdso2c.c | 2 +- + arch/x86/entry/vdso/vdso2c.h | 2 +- + arch/x86/entry/vdso/vdso32/system_call.S | 4 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/entry/vdso/vsgx.S | 2 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/amd/iommu.h | 2 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/bts.c | 2 +- + arch/x86/events/intel/core.c | 14 +- + arch/x86/events/intel/ds.c | 13 +- + arch/x86/events/intel/lbr.c | 12 +- + arch/x86/events/intel/p4.c | 6 +- + arch/x86/events/intel/pt.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 12 +- + arch/x86/events/zhaoxin/core.c | 2 +- + arch/x86/hyperv/hv_init.c | 4 +- + arch/x86/hyperv/mmu.c | 10 +- + arch/x86/include/asm/agp.h | 2 +- + arch/x86/include/asm/alternative-asm.h | 114 ---- + arch/x86/include/asm/alternative.h | 142 ++++- + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/cpufeature.h | 41 +- + arch/x86/include/asm/cpufeatures.h | 4 +- + arch/x86/include/asm/elf.h | 10 +- + arch/x86/include/asm/idtentry.h | 2 +- + arch/x86/include/asm/inat.h | 2 +- + arch/x86/include/asm/insn-eval.h | 4 +- + arch/x86/include/asm/insn.h | 44 +- + arch/x86/include/asm/intel_pconfig.h | 2 +- + arch/x86/include/asm/intel_pt.h | 2 +- + arch/x86/include/asm/io.h | 2 +- + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/irqflags.h | 7 +- + arch/x86/include/asm/jump_label.h | 16 +- + arch/x86/include/asm/kprobes.h | 21 +- + arch/x86/include/asm/kvm_host.h | 4 +- + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/include/asm/msr-index.h | 2 - + arch/x86/include/asm/nops.h | 176 ++---- + arch/x86/include/asm/nospec-branch.h | 3 +- + arch/x86/include/asm/paravirt.h | 173 +++--- + arch/x86/include/asm/paravirt_types.h | 216 +++---- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/processor.h | 17 +- + arch/x86/include/asm/ptrace.h | 5 +- + arch/x86/include/asm/segment.h | 30 +- + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/include/asm/setup.h | 5 - + arch/x86/include/asm/smap.h | 5 +- + arch/x86/include/asm/special_insns.h | 4 +- + arch/x86/include/asm/stackprotector.h | 79 +-- + arch/x86/include/asm/suspend_32.h | 6 +- + arch/x86/include/asm/tlbflush.h | 48 +- + arch/x86/include/asm/trace/hyperv.h | 2 +- + arch/x86/include/asm/uv/uv_geo.h | 2 +- + arch/x86/include/asm/uv/uv_hub.h | 2 +- + arch/x86/include/uapi/asm/bootparam.h | 4 +- + arch/x86/include/uapi/asm/msgbuf.h | 2 +- + arch/x86/include/uapi/asm/sgx.h | 2 +- + arch/x86/include/uapi/asm/shmbuf.h | 2 +- + arch/x86/include/uapi/asm/sigcontext.h | 2 +- + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/alternative.c | 258 +++----- + arch/x86/kernel/amd_nb.c | 2 +- + arch/x86/kernel/apic/apic.c | 10 +- + arch/x86/kernel/apic/io_apic.c | 8 +- + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 3 + + arch/x86/kernel/apm_32.c | 6 +- + arch/x86/kernel/asm-offsets.c | 7 - + arch/x86/kernel/asm-offsets_32.c | 5 - + arch/x86/kernel/cpu/amd.c | 5 - + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/hygon.c | 4 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/mce/intel.c | 1 + + arch/x86/kernel/cpu/mce/severity.c | 14 +- + arch/x86/kernel/cpu/microcode/core.c | 8 +- + arch/x86/kernel/cpu/mshyperv.c | 4 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 2 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/resctrl/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 6 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +- + arch/x86/kernel/cpu/sgx/arch.h | 2 +- + arch/x86/kernel/cpu/sgx/main.c | 177 +++--- + arch/x86/kernel/cpu/sgx/sgx.h | 23 +- + arch/x86/kernel/cpu/topology.c | 4 +- + arch/x86/kernel/cpu/vmware.c | 5 +- + arch/x86/kernel/doublefault_32.c | 4 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 2 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_32.S | 18 +- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/irq.c | 2 +- + arch/x86/kernel/jump_label.c | 32 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kprobes/core.c | 543 +++++++++++------ + arch/x86/kernel/kprobes/ftrace.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 9 +- + arch/x86/kernel/kvm.c | 13 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 2 +- + arch/x86/kernel/paravirt-spinlocks.c | 9 + + arch/x86/kernel/paravirt.c | 77 +-- + arch/x86/kernel/paravirt_patch.c | 99 ---- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/pvclock.c | 2 +- + arch/x86/kernel/relocate_kernel_32.S | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 2 +- + arch/x86/kernel/setup.c | 7 +- + arch/x86/kernel/setup_percpu.c | 1 - + arch/x86/kernel/sev-es-shared.c | 16 +- + arch/x86/kernel/sev-es.c | 99 ++-- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/smp.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/stacktrace.c | 6 - + arch/x86/kernel/static_call.c | 4 +- + arch/x86/kernel/sysfb_efi.c | 2 +- + arch/x86/kernel/tboot.c | 44 +- + arch/x86/kernel/tls.c | 8 +- + arch/x86/kernel/topology.c | 2 +- + arch/x86/kernel/traps.c | 12 +- + arch/x86/kernel/tsc.c | 9 +- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/kernel/umip.c | 4 +- + arch/x86/kernel/uprobes.c | 8 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/pmu.h | 2 +- + arch/x86/kvm/svm/avic.c | 4 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/kvm/vmx/posted_intr.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 6 +- + arch/x86/kvm/x86.c | 14 +- + arch/x86/lib/atomic64_386_32.S | 2 +- + arch/x86/lib/atomic64_cx8_32.S | 2 +- + arch/x86/lib/copy_page_64.S | 2 +- + arch/x86/lib/copy_user_64.S | 2 +- + arch/x86/lib/inat.c | 2 +- + arch/x86/lib/insn-eval.c | 50 +- + arch/x86/lib/insn.c | 230 ++++++-- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/lib/memmove_64.S | 2 +- + arch/x86/lib/memset_64.S | 2 +- + arch/x86/lib/mmx_32.c | 2 +- + arch/x86/lib/msr-smp.c | 4 +- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/math-emu/fpu_trig.c | 11 +- + arch/x86/math-emu/reg_ld_str.c | 2 +- + arch/x86/math-emu/reg_round.S | 2 +- + arch/x86/mm/fault.c | 4 +- + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_64.c | 6 +- + arch/x86/mm/kaslr.c | 2 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mem_encrypt.c | 8 +- + arch/x86/mm/mem_encrypt_boot.S | 2 +- + arch/x86/mm/mem_encrypt_identity.c | 35 +- + arch/x86/mm/pat/memtype.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/mm/pkeys.c | 2 +- + arch/x86/mm/pti.c | 4 +- + arch/x86/mm/tlb.c | 182 +++--- + arch/x86/net/bpf_jit_comp.c | 12 +- + arch/x86/pci/fixup.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + arch/x86/platform/efi/quirks.c | 4 +- + arch/x86/platform/intel-quark/imr.c | 2 +- + arch/x86/platform/intel/iosf_mbi.c | 4 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +- + arch/x86/platform/olpc/olpc_dt.c | 2 +- + arch/x86/platform/pvh/head.S | 20 +- + arch/x86/platform/uv/uv_nmi.c | 2 +- + arch/x86/power/cpu.c | 8 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/tools/insn_decoder_test.c | 10 +- + arch/x86/tools/insn_sanity.c | 8 +- + arch/x86/xen/enlighten_pv.c | 5 +- + arch/x86/xen/mmu_pv.c | 13 +- + arch/x86/xen/time.c | 26 +- + drivers/atm/eni.c | 2 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 8 +- + drivers/clocksource/dw_apb_timer_of.c | 2 +- + drivers/clocksource/hyperv_timer.c | 2 +- + drivers/clocksource/timer-atmel-tcb.c | 4 +- + drivers/clocksource/timer-fsl-ftm.c | 2 +- + drivers/clocksource/timer-microchip-pit64b.c | 2 +- + drivers/clocksource/timer-of.c | 4 +- + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- + drivers/clocksource/timer-vf-pit.c | 2 +- + drivers/firewire/ohci.c | 4 +- + drivers/irqchip/irq-aspeed-vic.c | 4 +- + drivers/irqchip/irq-bcm7120-l2.c | 2 +- + drivers/irqchip/irq-csky-apb-intc.c | 2 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 10 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-loongson-pch-pic.c | 2 +- + drivers/irqchip/irq-meson-gpio.c | 2 +- + drivers/irqchip/irq-mtk-cirq.c | 2 +- + drivers/irqchip/irq-mxs.c | 4 +- + drivers/irqchip/irq-sun4i.c | 2 +- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + drivers/irqchip/irq-vic.c | 4 +- + drivers/irqchip/irq-xilinx-intc.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/jme.c | 10 +- + drivers/net/ethernet/jme.h | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/ath/ath9k/beacon.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/usb/usbip/usbip_common.h | 1 + + drivers/xen/time.c | 3 +- + include/linux/bottom_half.h | 8 +- + include/linux/clocksource.h | 2 +- + include/linux/cpumask.h | 6 +- + include/linux/entry-common.h | 4 +- + include/linux/hardirq.h | 1 + + include/linux/interrupt.h | 33 +- + include/linux/irq.h | 4 +- + include/linux/irqdesc.h | 2 +- + include/linux/kcov.h | 1 + + include/linux/lockdep.h | 20 +- + include/linux/mutex.h | 2 +- + include/linux/preempt.h | 6 +- + include/linux/psi.h | 1 - + include/linux/psi_types.h | 3 +- + include/linux/rcupdate.h | 3 +- + include/linux/rwsem.h | 2 +- + include/linux/sched.h | 6 +- + include/linux/smp.h | 50 +- + include/linux/stacktrace.h | 19 + + include/linux/static_call.h | 26 +- + include/linux/static_call_types.h | 18 + + include/linux/timex.h | 2 +- + include/linux/ww_mutex.h | 17 +- + include/trace/events/xen.h | 2 +- + include/uapi/linux/ptrace.h | 10 + + kernel/cpu.c | 194 +++--- + kernel/entry/common.c | 2 +- + kernel/events/core.c | 24 +- + kernel/events/ring_buffer.c | 9 +- + kernel/futex.c | 29 +- + kernel/irq/chip.c | 8 +- + kernel/irq/dummychip.c | 2 +- + kernel/irq/ipi.c | 2 +- + kernel/irq/irqdesc.c | 2 +- + kernel/irq/irqdomain.c | 8 +- + kernel/irq/manage.c | 12 +- + kernel/irq/matrix.c | 11 +- + kernel/irq/migration.c | 2 +- + kernel/irq/msi.c | 2 +- + kernel/irq/resend.c | 2 +- + kernel/irq/timings.c | 8 +- + kernel/locking/lockdep.c | 24 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/locking/locktorture.c | 146 +++-- + kernel/locking/mcs_spinlock.h | 2 +- + kernel/locking/mutex.c | 4 +- + kernel/locking/osq_lock.c | 4 +- + kernel/locking/rtmutex.c | 24 +- + kernel/locking/rtmutex_common.h | 1 - + kernel/locking/rwsem.c | 4 +- + kernel/locking/spinlock.c | 4 +- + kernel/ptrace.c | 25 + + kernel/sched/clock.c | 2 +- + kernel/sched/core.c | 36 +- + kernel/sched/cpuacct.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cpupri.c | 4 +- + kernel/sched/cputime.c | 6 +- + kernel/sched/deadline.c | 12 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 216 +++---- + kernel/sched/features.h | 2 +- + kernel/sched/idle.c | 10 +- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 2 +- + kernel/sched/pelt.h | 2 +- + kernel/sched/psi.c | 139 ++--- + kernel/sched/rt.c | 6 +- + kernel/sched/sched.h | 23 +- + kernel/sched/stats.c | 2 +- + kernel/sched/stats.h | 37 +- + kernel/sched/topology.c | 93 ++- + kernel/smp.c | 464 +++++++++++---- + kernel/softirq.c | 355 +++++++++-- + kernel/stop_machine.c | 1 + + kernel/time/alarmtimer.c | 6 +- + kernel/time/clocksource.c | 4 +- + kernel/time/hrtimer.c | 18 +- + kernel/time/jiffies.c | 2 +- + kernel/time/ntp.c | 2 +- + kernel/time/posix-cpu-timers.c | 6 +- + kernel/time/test_udelay.c | 7 +- + kernel/time/tick-broadcast-hrtimer.c | 2 +- + kernel/time/tick-broadcast.c | 4 +- + kernel/time/tick-oneshot.c | 2 +- + kernel/time/tick-sched.c | 4 +- + kernel/time/tick-sched.h | 2 +- + kernel/time/time.c | 2 +- + kernel/time/timekeeping.c | 10 +- + kernel/time/timer.c | 4 +- + kernel/time/vsyscall.c | 2 +- + kernel/up.c | 38 +- + net/core/skbuff.c | 1 + + net/mac80211/iface.c | 1 + + net/mac80211/rx.c | 1 + + scripts/gcc-x86_32-has-stack-protector.sh | 6 +- + tools/arch/x86/include/asm/inat.h | 2 +- + tools/arch/x86/include/asm/insn.h | 44 +- + tools/arch/x86/include/asm/msr-index.h | 2 - + tools/arch/x86/include/asm/nops.h | 81 +++ + tools/arch/x86/kcpuid/Makefile | 24 + + tools/arch/x86/kcpuid/cpuid.csv | 400 +++++++++++++ + tools/arch/x86/kcpuid/kcpuid.c | 657 +++++++++++++++++++++ + tools/arch/x86/lib/inat.c | 2 +- + tools/arch/x86/lib/insn.c | 230 ++++++-- + tools/include/linux/kconfig.h | 73 +++ + tools/include/linux/static_call_types.h | 18 + + tools/objtool/arch/x86/decode.c | 302 ++++++---- + tools/objtool/arch/x86/include/arch/cfi_regs.h | 12 +- + tools/objtool/builtin-check.c | 43 +- + tools/objtool/builtin-orc.c | 5 +- + tools/objtool/check.c | 39 +- + tools/objtool/include/objtool/arch.h | 1 - + tools/objtool/include/objtool/builtin.h | 5 +- + tools/objtool/objtool.c | 64 ++ + tools/objtool/sync-check.sh | 18 +- + tools/perf/arch/x86/tests/insn-x86.c | 9 +- + tools/perf/arch/x86/util/archinsn.c | 9 +- + tools/perf/check-headers.sh | 15 +- + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 2 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 17 +- + tools/testing/selftests/sgx/load.c | 69 ++- + tools/testing/selftests/sgx/main.c | 2 +- + .../testing/selftests/timers/clocksource-switch.c | 4 +- + tools/testing/selftests/timers/leap-a-day.c | 2 +- + tools/testing/selftests/timers/leapcrash.c | 4 +- + tools/testing/selftests/timers/threadtest.c | 2 +- + tools/testing/selftests/x86/thunks_32.S | 2 + + 381 files changed, 5616 insertions(+), 3292 deletions(-) + delete mode 100644 arch/x86/include/asm/alternative-asm.h + delete mode 100644 arch/x86/kernel/paravirt_patch.c + create mode 100644 tools/arch/x86/include/asm/nops.h + create mode 100644 tools/arch/x86/kcpuid/Makefile + create mode 100644 tools/arch/x86/kcpuid/cpuid.csv + create mode 100644 tools/arch/x86/kcpuid/kcpuid.c + create mode 100644 tools/include/linux/kconfig.h +$ git am -3 ../patches/0001-x86-fix-up-for-bpf-Use-NOP_ATOMIC5-instead-of-emit_n.patch +Applying: x86: fix up for "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/net/bpf_jit_comp.c +$ git add -A . +$ git commit -v -a --amend +[master 47f175299416] Merge remote-tracking branch 'tip/auto-latest' + Date: Fri Mar 26 14:46:25 2021 +1100 +Merging clockevents/timers/drivers/next (323397ef4d00 clocksource/drivers/dw_apb_timer_of: Add handling for potential memory leak) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/timer-ti-dm-systimer.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/clocksource/dw_apb_timer_of.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/ingenic,tcu.yaml | 30 ++++++++++++++++------ + .../devicetree/bindings/timer/renesas,cmt.yaml | 4 +++ + .../devicetree/bindings/timer/renesas,tmu.yaml | 6 +++++ + drivers/clocksource/dw_apb_timer_of.c | 26 +++++++++++++++---- + drivers/clocksource/ingenic-ost.c | 9 ++++--- + drivers/clocksource/ingenic-timer.c | 2 ++ + drivers/clocksource/sh_cmt.c | 5 ++-- + drivers/clocksource/timer-npcm7xx.c | 1 + + drivers/clocksource/timer-pistachio.c | 4 +-- + drivers/clocksource/timer-ti-dm-systimer.c | 13 +++++----- + 10 files changed, 73 insertions(+), 27 deletions(-) +Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (5fbecd2389f4 irqchip/ingenic: Add support for the JZ4760) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (9a6944fee68e tracing: Add a verifier to check string pointers for trace events) +$ git merge ftrace/for-next +Auto-merging arch/x86/kernel/kprobes/ftrace.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/ftrace.c +Auto-merging arch/riscv/kernel/probes/ftrace.c +Resolved 'arch/x86/kernel/kprobes/ftrace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b6f96f02c41d] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/ring_buffer.h | 3 +- + include/linux/seq_buf.h | 25 ++++ + include/linux/trace_events.h | 5 +- + init/main.c | 6 +- + kernel/trace/ring_buffer.c | 138 ++++++++++++++--- + kernel/trace/trace.c | 238 +++++++++++++++++++++++++++--- + kernel/trace/trace.h | 12 +- + kernel/trace/trace_events.c | 210 ++++++++++++++++++++++++++ + kernel/trace/trace_events_hist.c | 100 ++++++++----- + kernel/trace/trace_events_trigger.c | 45 +++--- + kernel/trace/trace_output.c | 2 +- + kernel/trace/trace_printk.c | 11 ++ + tools/tracing/latency/latency-collector.c | 4 +- + 13 files changed, 694 insertions(+), 105 deletions(-) +Merging rcu/rcu/next (1a0dfc099c1e rcu-tasks: Make ksoftirqd provide RCU Tasks quiescent states) +$ git merge rcu/rcu/next +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/cputime.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/mm.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 2 +- + Documentation/RCU/RTFP.txt | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 7 + + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/dev-tools/kcsan.rst | 7 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/mm.h | 4 + + include/linux/rcu_segcblist.h | 7 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 2 +- + include/linux/rcutiny.h | 7 +- + include/linux/rcutree.h | 2 + + include/linux/slab.h | 2 + + include/linux/timer.h | 2 - + include/linux/vmalloc.h | 2 +- + include/trace/events/rcu.h | 29 ++ + kernel/kcsan/Makefile | 4 +- + kernel/kcsan/atomic.h | 5 + + kernel/kcsan/core.c | 7 +- + kernel/kcsan/debugfs.c | 9 +- + kernel/kcsan/encoding.h | 5 + + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 118 +++-- + kernel/kcsan/report.c | 5 + + kernel/kcsan/selftest.c | 5 + + kernel/rcu/rcu_segcblist.c | 3 +- + kernel/rcu/rcuscale.c | 15 +- + kernel/rcu/rcutorture.c | 122 ++++-- + kernel/rcu/refscale.c | 109 ++++- + kernel/rcu/srcutree.c | 4 +- + kernel/rcu/sync.c | 4 +- + kernel/rcu/tasks.h | 97 ++++- + kernel/rcu/tiny.c | 40 ++ + kernel/rcu/tree.c | 176 +++++--- + kernel/rcu/tree.h | 11 +- + kernel/rcu/tree_exp.h | 1 + + kernel/rcu/tree_plugin.h | 418 +++++++++++------- + kernel/rcu/tree_stall.h | 2 + + kernel/softirq.c | 2 +- + kernel/time/timer.c | 14 - + kernel/torture.c | 6 +- + lib/Kconfig.kcsan | 5 +- + lib/bitmap.c | 49 ++- + lib/test_bitmap.c | 46 +- + mm/oom_kill.c | 2 +- + mm/slab.c | 2 + + mm/slab.h | 3 + + mm/slab_common.c | 16 +- + mm/slob.c | 2 + + mm/slub.c | 10 + + mm/util.c | 5 +- + mm/vmalloc.c | 2 + + .../memory-model/Documentation/access-marking.txt | 479 +++++++++++++++++++++ + tools/memory-model/Documentation/explanation.txt | 2 +- + tools/memory-model/Documentation/glossary.txt | 2 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 1 - + tools/testing/selftests/rcutorture/bin/jitter.sh | 20 +- + .../selftests/rcutorture/bin/jitterstart.sh | 37 ++ + .../testing/selftests/rcutorture/bin/jitterstop.sh | 23 + + .../testing/selftests/rcutorture/bin/kvm-again.sh | 184 ++++++++ + .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 40 ++ + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 226 ++++++++++ + .../rcutorture/bin/kvm-test-1-run-batch.sh | 67 +++ + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 176 ++++++++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 218 +++------- + .../selftests/rcutorture/bin/kvm-transform.sh | 54 ++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 140 +++--- + tools/testing/selftests/rcutorture/bin/torture.sh | 4 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 4 +- + .../rcutorture/configs/rcu/{SRCU-t => SRCU-T} | 0 + .../configs/rcu/{SRCU-t.boot => SRCU-T.boot} | 0 + .../rcutorture/configs/rcu/{SRCU-u => SRCU-U} | 0 + .../configs/rcu/{SRCU-u.boot => SRCU-U.boot} | 0 + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +- + .../rcutorture/configs/rcuscale/ver_functions.sh | 2 +- + .../rcutorture/configs/refscale/NOPREEMPT | 2 +- + .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +- + .../rcutorture/configs/refscale/ver_functions.sh | 2 +- + .../rcutorture/formal/srcu-cbmc/src/locks.h | 2 +- + 109 files changed, 3401 insertions(+), 747 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + create mode 100644 tools/memory-model/Documentation/access-marking.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstart.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstop.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-again.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-batch.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t => SRCU-T} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t.boot => SRCU-T.boot} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u => SRCU-U} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u.boot => SRCU-U.boot} (100%) +Merging kvm/next (4a98623d5d90 KVM: x86/mmu: Mark the PAE roots as decrypted for shadow paging) +$ git merge kvm/next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/avic.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/mmu/mmu_internal.h +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/locking.rst | 49 +-- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_host.h | 21 +- + arch/x86/include/asm/svm.h | 4 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/mmu.h | 23 +- + arch/x86/kvm/mmu/mmu.c | 375 +++++++++------- + arch/x86/kvm/mmu/mmu_audit.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 10 + + arch/x86/kvm/mmu/paging_tmpl.h | 3 +- + arch/x86/kvm/mmu/spte.c | 159 ++++--- + arch/x86/kvm/mmu/spte.h | 141 ++++-- + arch/x86/kvm/mmu/tdp_mmu.c | 99 ++--- + arch/x86/kvm/svm/avic.c | 24 +- + arch/x86/kvm/svm/nested.c | 499 ++++++++++++--------- + arch/x86/kvm/svm/sev.c | 27 +- + arch/x86/kvm/svm/svm.c | 867 +++++++++++++++++-------------------- + arch/x86/kvm/svm/svm.h | 64 ++- + arch/x86/kvm/svm/vmenter.S | 47 +- + arch/x86/kvm/vmx/nested.c | 28 +- + arch/x86/kvm/vmx/vmx.c | 232 ++++------ + arch/x86/kvm/vmx/vmx.h | 19 +- + arch/x86/kvm/x86.c | 111 +++-- + arch/x86/kvm/x86.h | 10 + + 24 files changed, 1516 insertions(+), 1301 deletions(-) +Merging kvm-arm/next (40acb795bffd Merge branch 'kvm-arm64/host-stage2' into kvmarm-master/next) +$ git merge kvm-arm/next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging arch/arm64/include/asm/assembler.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/devices/arm-vgic-its.rst | 2 +- + arch/arm64/Kconfig | 7 - + arch/arm64/include/asm/assembler.h | 27 +- + arch/arm64/include/asm/fpsimd.h | 9 + + arch/arm64/include/asm/fpsimdmacros.h | 10 +- + arch/arm64/include/asm/hyp_image.h | 7 + + arch/arm64/include/asm/kvm_asm.h | 9 + + arch/arm64/include/asm/kvm_host.h | 36 ++- + arch/arm64/include/asm/kvm_hyp.h | 13 + + arch/arm64/include/asm/kvm_mmu.h | 23 +- + arch/arm64/include/asm/kvm_pgtable.h | 164 +++++++++- + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/sysreg.h | 7 +- + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpu-reset.S | 5 +- + arch/arm64/kernel/image-vars.h | 31 ++ + arch/arm64/kernel/vmlinux.lds.S | 74 +++-- + arch/arm64/kvm/arm.c | 207 ++++++++++-- + arch/arm64/kvm/fpsimd.c | 26 +- + arch/arm64/kvm/guest.c | 6 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/fpsimd.S | 10 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 105 +++--- + arch/arm64/kvm/hyp/include/nvhe/early_alloc.h | 14 + + arch/arm64/kvm/hyp/include/nvhe/gfp.h | 68 ++++ + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 36 +++ + arch/arm64/kvm/hyp/include/nvhe/memory.h | 52 +++ + arch/arm64/kvm/hyp/include/nvhe/mm.h | 96 ++++++ + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 92 ++++++ + arch/arm64/kvm/hyp/nvhe/Makefile | 9 +- + arch/arm64/kvm/hyp/nvhe/cache.S | 13 + + arch/arm64/kvm/hyp/nvhe/early_alloc.c | 54 ++++ + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 54 +++- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 73 +++++ + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 281 ++++++++++++++++ + arch/arm64/kvm/hyp/nvhe/mm.c | 173 ++++++++++ + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 195 +++++++++++ + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 4 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 214 +++++++++++++ + arch/arm64/kvm/hyp/nvhe/stub.c | 22 ++ + arch/arm64/kvm/hyp/nvhe/switch.c | 25 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 4 +- + arch/arm64/kvm/hyp/pgtable.c | 410 ++++++++++++++++++------ + arch/arm64/kvm/hyp/reserved_mem.c | 113 +++++++ + arch/arm64/kvm/mmu.c | 115 ++++++- + arch/arm64/kvm/perf.c | 3 +- + arch/arm64/kvm/pmu.c | 8 +- + arch/arm64/kvm/reset.c | 46 +-- + arch/arm64/kvm/va_layout.c | 7 + + arch/arm64/kvm/vgic/vgic-its.c | 6 +- + arch/arm64/kvm/vgic/vgic-v3.c | 66 +++- + arch/arm64/kvm/vgic/vgic-v4.c | 38 +++ + arch/arm64/kvm/vgic/vgic.h | 1 + + arch/arm64/lib/clear_page.S | 4 +- + arch/arm64/lib/copy_page.S | 4 +- + arch/arm64/mm/init.c | 3 + + drivers/irqchip/irq-gic-v3-its.c | 18 +- + 59 files changed, 2733 insertions(+), 377 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/early_alloc.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/gfp.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/mem_protect.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/memory.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/mm.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/spinlock.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/cache.S + create mode 100644 arch/arm64/kvm/hyp/nvhe/early_alloc.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/mem_protect.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/mm.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/page_alloc.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/setup.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/stub.c + create mode 100644 arch/arm64/kvm/hyp/reserved_mem.c +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (c3171e94cc1c KVM: s390: VSIE: fix MVPG handling for prefixing and MSO) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/s390-diag.rst | 33 +++++++++++ + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/smp.h | 1 + + arch/s390/kernel/smp.c | 1 + + arch/s390/kvm/diag.c | 31 +++++++++- + arch/s390/kvm/gaccess.c | 30 ++++++++-- + arch/s390/kvm/gaccess.h | 60 ++++++++++++++----- + arch/s390/kvm/kvm-s390.c | 8 ++- + arch/s390/kvm/kvm-s390.h | 8 +++ + arch/s390/kvm/vsie.c | 109 ++++++++++++++++++++++++++++++++--- + 10 files changed, 250 insertions(+), 32 deletions(-) +Merging xen-tip/linux-next (af44a387e743 Revert "xen: fix p2m size in dom0 for disabled memory hotplug case") +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/xen/page.h | 12 ------------ + arch/x86/xen/p2m.c | 7 ++----- + arch/x86/xen/setup.c | 16 ++++++++++++++-- + drivers/xen/Kconfig | 4 ++-- + 4 files changed, 18 insertions(+), 21 deletions(-) +Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (a7347aa8e061 workqueue: Move the position of debug_work_activate() in __queue_work()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86/for-next (36974daf5388 platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'drivers/platform/x86/thinkpad_acpi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 506356d52089] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + .../admin-guide/laptops/thinkpad-acpi.rst | 20 + + .../driver-api/surface_aggregator/client.rst | 4 +- + .../driver-api/surface_aggregator/clients/dtx.rst | 718 +++++++++++ + .../surface_aggregator/clients/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 19 +- + drivers/platform/mellanox/mlxbf-bootctl.c | 2 +- + drivers/platform/surface/Kconfig | 69 ++ + drivers/platform/surface/Makefile | 3 + + drivers/platform/surface/aggregator/controller.c | 10 +- + .../platform/surface/surface_aggregator_registry.c | 644 ++++++++++ + drivers/platform/surface/surface_dtx.c | 1289 ++++++++++++++++++++ + .../platform/surface/surface_platform_profile.c | 190 +++ + drivers/platform/surface/surfacepro3_button.c | 2 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 3 +- + drivers/platform/x86/dell/dell-wmi-descriptor.c | 3 +- + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 3 +- + .../dell/dell-wmi-sysman/passwordattr-interface.c | 3 +- + drivers/platform/x86/dell/dell-wmi.c | 3 +- + drivers/platform/x86/hp-wmi.c | 101 +- + drivers/platform/x86/intel-wmi-sbl-fw-update.c | 3 +- + drivers/platform/x86/intel-wmi-thunderbolt.c | 3 +- + drivers/platform/x86/lg-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 134 +- + drivers/platform/x86/touchscreen_dmi.c | 2 +- + drivers/platform/x86/wmi-bmof.c | 3 +- + drivers/platform/x86/wmi.c | 6 +- + drivers/platform/x86/xo15-ebook.c | 6 +- + include/linux/surface_aggregator/controller.h | 74 +- + include/linux/surface_aggregator/device.h | 31 +- + include/linux/wmi.h | 2 +- + include/uapi/linux/surface_aggregator/dtx.h | 146 +++ + 35 files changed, 3406 insertions(+), 102 deletions(-) + create mode 100644 Documentation/driver-api/surface_aggregator/clients/dtx.rst + create mode 100644 drivers/platform/surface/surface_aggregator_registry.c + create mode 100644 drivers/platform/surface/surface_dtx.c + create mode 100644 drivers/platform/surface/surface_platform_profile.c + create mode 100644 include/uapi/linux/surface_aggregator/dtx.h +Merging chrome-platform/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (34a6ae672645 leds: Kconfig: LEDS_CLASS is usually selected.) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/Kconfig | 7 +++---- + drivers/leds/Makefile | 2 +- + drivers/leds/blink/Kconfig | 35 +++++++++++++++++------------------ + drivers/leds/blink/Makefile | 2 +- + 4 files changed, 22 insertions(+), 24 deletions(-) +Merging ipmi/for-next (c053c4eb5a0f ipmi: Handle device properties with software node API) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 6 +-- + drivers/char/ipmi/ipmi_plat_data.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 6 +-- + drivers/char/ipmi/ipmi_ssif.c | 81 +++++++++---------------------------- + 4 files changed, 25 insertions(+), 70 deletions(-) +Merging driver-core/driver-core-next (a7d30f3f41cf watchdog: retu_wdt: Clean-up by using managed work init) +$ git merge driver-core/driver-core-next +Auto-merging drivers/regulator/qcom_spmi-regulator.c +Auto-merging drivers/power/supply/axp20x_usb_power.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/base/dd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +++ + drivers/base/auxiliary.c | 5 --- + drivers/base/base.h | 1 + + drivers/base/component.c | 9 ++--- + drivers/base/core.c | 37 ++++++++++++++++- + drivers/base/cpu.c | 6 +-- + drivers/base/dd.c | 17 +++++--- + drivers/base/devcoredump.c | 15 ++++--- + drivers/base/devtmpfs.c | 6 +-- + drivers/base/swnode.c | 18 ++++++--- + drivers/base/test/property-entry-test.c | 50 +++++++++++++++++++++-- + drivers/clk/clk.c | 2 + + drivers/extcon/extcon-gpio.c | 15 ++----- + drivers/extcon/extcon-intel-int3496.c | 16 ++------ + drivers/extcon/extcon-palmas.c | 17 +++----- + drivers/extcon/extcon-qcom-spmi-misc.c | 17 +++----- + drivers/hwmon/raspberrypi-hwmon.c | 17 +++----- + drivers/platform/x86/gpd-pocket-fan.c | 17 +++----- + drivers/power/supply/axp20x_usb_power.c | 15 +++---- + drivers/power/supply/bq24735-charger.c | 18 +++------ + drivers/power/supply/ltc2941-battery-gauge.c | 20 ++++------ + drivers/power/supply/sbs-battery.c | 16 +++----- + drivers/regulator/qcom_spmi-regulator.c | 34 ++++------------ + drivers/watchdog/retu_wdt.c | 22 +++------- + include/linux/device.h | 6 ++- + include/linux/devm-helpers.h | 53 +++++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_namespace.c | 2 +- + 27 files changed, 261 insertions(+), 196 deletions(-) + create mode 100644 include/linux/devm-helpers.h +Merging usb/usb-next (049d3db625a6 usb: gadget: pch_udc: Provide a GPIO line used on Intel Minnowboard (v1)) +$ git merge usb/usb-next +Removing include/linux/platform_data/usb-mx2.h +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/dwc3-qcom.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/dwc3-xilinx.txt | 28 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 6 + + .../devicetree/bindings/usb/usb-device.yaml | 6 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 8 +- + drivers/usb/chipidea/host.c | 2 +- + drivers/usb/common/common.c | 76 +++++ + drivers/usb/common/debug.c | 22 +- + drivers/usb/core/devices.c | 21 +- + drivers/usb/core/driver.c | 10 +- + drivers/usb/core/endpoint.c | 35 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 97 ++++-- + drivers/usb/core/sysfs.c | 5 +- + drivers/usb/core/usb.c | 8 +- + drivers/usb/dwc2/debugfs.c | 2 + + drivers/usb/dwc3/Kconfig | 9 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 16 +- + drivers/usb/dwc3/core.h | 7 +- + drivers/usb/dwc3/dwc3-of-simple.c | 1 - + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/dwc3/dwc3-xilinx.c | 339 +++++++++++++++++++ + drivers/usb/dwc3/gadget.c | 32 +- + drivers/usb/gadget/function/f_fs.c | 14 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 - + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 272 ++++++++++++---- + drivers/usb/gadget/function/f_uac2.c | 263 +++++++++++---- + drivers/usb/gadget/function/f_uvc.c | 8 +- + drivers/usb/gadget/function/u_audio.c | 6 +- + drivers/usb/gadget/function/uvc_configfs.c | 2 +- + drivers/usb/gadget/legacy/mass_storage.c | 4 +- + drivers/usb/gadget/legacy/multi.c | 14 +- + drivers/usb/gadget/legacy/webcam.c | 3 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/pch_udc.c | 126 ++++++-- + drivers/usb/host/Kconfig | 1 + + drivers/usb/host/Makefile | 6 +- + drivers/usb/host/ehci-hcd.c | 15 +- + drivers/usb/host/ehci-hub.c | 4 +- + drivers/usb/host/ehci-platform.c | 5 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fotg210-hcd.c | 12 +- + drivers/usb/host/isp116x-hcd.c | 7 +- + drivers/usb/host/isp116x.h | 1 - + drivers/usb/host/isp1362-hcd.c | 8 +- + drivers/usb/host/isp1362.h | 1 - + drivers/usb/host/sl811-hcd.c | 16 +- + drivers/usb/host/sl811.h | 1 - + drivers/usb/host/sl811_cs.c | 2 +- + drivers/usb/host/uhci-hcd.c | 12 +- + drivers/usb/host/uhci-hcd.h | 4 - + drivers/usb/host/xhci-hub.c | 320 +++++++++++------- + drivers/usb/host/xhci-mem.c | 11 +- + drivers/usb/host/xhci-mtk-sch.c | 360 ++++++++++++++------- + drivers/usb/host/xhci-mtk.c | 19 +- + drivers/usb/host/xhci-mtk.h | 46 +-- + drivers/usb/host/xhci-ring.c | 6 +- + drivers/usb/host/xhci.c | 32 +- + drivers/usb/host/xhci.h | 8 + + drivers/usb/mtu3/mtu3_host.c | 8 +- + drivers/usb/renesas_usbhs/fifo.c | 4 +- + drivers/usb/typec/Kconfig | 15 +- + drivers/usb/typec/Makefile | 2 +- + drivers/usb/typec/stusb160x.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 5 +- + drivers/usb/typec/tcpm/tcpci.c | 17 +- + drivers/usb/typec/tcpm/tcpci.h | 16 + + drivers/usb/typec/tcpm/tcpm.c | 90 ++++-- + drivers/usb/typec/tipd/Kconfig | 12 + + drivers/usb/typec/tipd/Makefile | 6 + + drivers/usb/typec/{tps6598x.c => tipd/core.c} | 68 ++-- + drivers/usb/typec/tipd/tps6598x.h | 189 +++++++++++ + drivers/usb/typec/tipd/trace.c | 9 + + drivers/usb/typec/tipd/trace.h | 283 ++++++++++++++++ + include/linux/platform_data/usb-mx2.h | 29 -- + include/linux/usb.h | 6 +- + include/linux/usb/ch9.h | 62 +--- + include/linux/usb/ehci_pdriver.h | 1 + + include/uapi/linux/usb/video.h | 3 +- + 81 files changed, 2354 insertions(+), 832 deletions(-) + create mode 100644 drivers/usb/dwc3/dwc3-xilinx.c + create mode 100644 drivers/usb/typec/tipd/Kconfig + create mode 100644 drivers/usb/typec/tipd/Makefile + rename drivers/usb/typec/{tps6598x.c => tipd/core.c} (91%) + create mode 100644 drivers/usb/typec/tipd/tps6598x.h + create mode 100644 drivers/usb/typec/tipd/trace.c + create mode 100644 drivers/usb/typec/tipd/trace.h + delete mode 100644 include/linux/platform_data/usb-mx2.h +Merging usb-gadget/next (a38fd8748464 Linux 5.12-rc2) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (764de1059b97 USB: serial: pl2303: TA & TB alternate divider with non-standard baud rates) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/io_edgeport.c | 45 +--------- + drivers/usb/serial/keyspan.c | 20 ----- + drivers/usb/serial/pl2303.c | 175 +++++++++++++++++++++++++++++++-------- + 3 files changed, 143 insertions(+), 97 deletions(-) +Merging usb-chipidea-next/for-usb-next (c8ad0f64b7e0 usb: chipidea: tegra: Silence deferred probe error) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging include/linux/usb.h +Auto-merging drivers/usb/typec/tipd/core.c +CONFLICT (content): Merge conflict in drivers/usb/typec/tipd/core.c +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/typec/Makefile +Auto-merging drivers/usb/host/sl811-hcd.c +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/core/usb.c +Resolved 'drivers/usb/typec/tipd/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d8f3304ba767] Merge remote-tracking branch 'usb-chipidea-next/for-usb-next' +$ git diff -M --stat --summary HEAD^.. + drivers/usb/cdns3/cdns3-gadget.c | 44 +++--- + drivers/usb/cdns3/cdns3-gadget.h | 1 + + drivers/usb/cdns3/cdns3-imx.c | 34 +++++ + drivers/usb/cdns3/cdns3-plat.c | 23 ++- + drivers/usb/cdns3/cdns3-trace.h | 5 +- + drivers/usb/cdns3/core.c | 29 +++- + drivers/usb/cdns3/drd.c | 15 ++ + drivers/usb/cdns3/drd.h | 2 +- + drivers/usb/typec/Makefile | 3 + + drivers/usb/typec/tipd/core.c | 2 + + drivers/usb/typec/tps6598x.h | 189 +++++++++++++++++++++++++ + drivers/usb/typec/tps6598x_trace.h | 283 +++++++++++++++++++++++++++++++++++++ + 12 files changed, 600 insertions(+), 30 deletions(-) + create mode 100644 drivers/usb/typec/tps6598x.h + create mode 100644 drivers/usb/typec/tps6598x_trace.h +Merging tty/tty-next (22fce66c19ca tty: vt: Mundane typo fix in the file vt.c) +$ git merge tty/tty-next +Auto-merging sound/soc/ti/ams-delta.c +Removing include/uapi/linux/cyclades.h +Auto-merging include/linux/pci_ids.h +Removing include/linux/isicom.h +Removing include/linux/cyclades.h +Auto-merging drivers/tty/serial/sh-sci.c +Removing drivers/tty/rocket_int.h +Removing drivers/tty/rocket.h +Removing drivers/tty/rocket.c +Removing drivers/tty/isicom.c +Removing drivers/tty/cyclades.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/driver-api/serial/rocket.rst +Removing Documentation/driver-api/serial/cyclades_z.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/devices.txt | 12 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/samsung_uart.yaml | 14 +- + Documentation/driver-api/serial/cyclades_z.rst | 11 - + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/rocket.rst | 185 - + Documentation/process/magic-number.rst | 4 - + .../translations/it_IT/process/magic-number.rst | 4 - + .../translations/zh_CN/process/magic-number.rst | 4 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 22 +- + arch/arm/boot/dts/stm32mp151.dtsi | 24 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/xtensa/platforms/iss/console.c | 45 +- + drivers/accessibility/speakup/spk_ttyio.c | 1 - + drivers/bluetooth/hci_ldisc.c | 1 - + drivers/irqchip/irq-stm32-exti.c | 7 + + drivers/misc/ti-st/st_core.c | 1 - + drivers/net/caif/caif_serial.c | 18 +- + drivers/net/can/slcan.c | 1 - + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/ppp/ppp_async.c | 1 - + drivers/net/ppp/ppp_synctty.c | 1 - + drivers/net/slip/slip.c | 1 - + drivers/pps/clients/pps-ldisc.c | 3 - + drivers/s390/char/con3215.c | 56 +- + drivers/staging/gdm724x/gdm_tty.c | 2 +- + drivers/tty/Kconfig | 56 +- + drivers/tty/Makefile | 3 - + drivers/tty/amiserial.c | 8 +- + drivers/tty/cyclades.c | 4119 -------------------- + drivers/tty/hvc/hvcs.c | 24 - + drivers/tty/ipwireless/tty.c | 11 +- + drivers/tty/isicom.c | 1699 -------- + drivers/tty/moxa.c | 4 +- + drivers/tty/n_gsm.c | 18 +- + drivers/tty/n_hdlc.c | 1 - + drivers/tty/n_null.c | 1 - + drivers/tty/n_r3964.c | 1 - + drivers/tty/n_tty.c | 2 +- + drivers/tty/nozomi.c | 26 +- + drivers/tty/rocket.c | 3127 --------------- + drivers/tty/rocket.h | 111 - + drivers/tty/rocket_int.h | 1214 ------ + drivers/tty/serial/8250/8250_exar.c | 17 +- + drivers/tty/serial/8250/8250_fsl.c | 5 +- + drivers/tty/serial/8250/8250_port.c | 24 +- + drivers/tty/serial/8250/Kconfig | 5 +- + drivers/tty/serial/8250/serial_cs.c | 12 +- + drivers/tty/serial/Kconfig | 3 +- + drivers/tty/serial/imx.c | 16 +- + drivers/tty/serial/jsm/jsm_tty.c | 24 +- + drivers/tty/serial/kgdb_nmi.c | 4 +- + drivers/tty/serial/liteuart.c | 4 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/pch_uart.c | 22 +- + drivers/tty/serial/samsung_tty.c | 507 ++- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/stm32-usart.c | 236 +- + drivers/tty/serial/stm32-usart.h | 5 +- + drivers/tty/synclink_gt.c | 62 +- + drivers/tty/tty_io.c | 12 +- + drivers/tty/tty_ioctl.c | 3 +- + drivers/tty/vcc.c | 72 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/tty/vt/vt.c | 2 +- + drivers/usb/serial/mos7720.c | 2 +- + drivers/video/console/vgacon.c | 5 +- + include/linux/cyclades.h | 364 -- + include/linux/isicom.h | 85 - + include/linux/pci_ids.h | 29 - + include/linux/serial_s3c.h | 16 + + include/linux/tty.h | 2 +- + include/linux/tty_ldisc.h | 3 - + include/net/nfc/nci_core.h | 2 - + include/uapi/linux/cyclades.h | 494 --- + include/uapi/linux/major.h | 2 - + include/uapi/linux/serial.h | 4 +- + net/nfc/nci/uart.c | 148 +- + sound/soc/codecs/cx20442.c | 1 - + sound/soc/ti/ams-delta.c | 1 - + 82 files changed, 789 insertions(+), 12259 deletions(-) + delete mode 100644 Documentation/driver-api/serial/cyclades_z.rst + delete mode 100644 Documentation/driver-api/serial/rocket.rst + delete mode 100644 drivers/tty/cyclades.c + delete mode 100644 drivers/tty/isicom.c + delete mode 100644 drivers/tty/rocket.c + delete mode 100644 drivers/tty/rocket.h + delete mode 100644 drivers/tty/rocket_int.h + delete mode 100644 include/linux/cyclades.h + delete mode 100644 include/linux/isicom.h + delete mode 100644 include/uapi/linux/cyclades.h +Merging char-misc/char-misc-next (95e04eb04c68 char: lp: remove redundant space around (inside) parenthesized expressions) +$ git merge char-misc/char-misc-next +Removing include/linux/pps-gpio.h +Auto-merging drivers/android/binder.c +Merge made by the 'recursive' strategy. + .../bindings/fpga/xilinx-pr-decoupler.txt | 24 ++- + drivers/android/binder.c | 198 +++++++++++++++++++-- + drivers/android/binder_internal.h | 18 ++ + drivers/char/lp.c | 4 +- + drivers/char/mwave/tp3780i.c | 6 +- + drivers/char/mwave/tp3780i.h | 2 +- + drivers/char/virtio_console.c | 23 +-- + drivers/fpga/Kconfig | 9 +- + drivers/fpga/xilinx-pr-decoupler.c | 45 +++-- + drivers/fpga/xilinx-spi.c | 24 +-- + drivers/misc/ad525x_dpot.c | 3 + + drivers/misc/cxl/context.c | 2 +- + drivers/misc/cxl/fault.c | 2 +- + drivers/misc/kgdbts.c | 26 +-- + drivers/misc/lis3lv02d/lis3lv02d.c | 27 ++- + drivers/misc/sgi-xp/xpc_main.c | 2 +- + drivers/misc/vmw_balloon.c | 11 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/pps/clients/pps-gpio.c | 108 +++++------ + drivers/virt/acrn/vm.c | 2 +- + drivers/w1/slaves/w1_ds2780.c | 2 +- + drivers/w1/slaves/w1_ds2781.c | 2 +- + drivers/w1/slaves/w1_therm.c | 7 +- + include/linux/pps-gpio.h | 19 -- + include/uapi/linux/android/binder.h | 20 +++ + include/uapi/linux/map_to_7segment.h | 14 -- + 26 files changed, 403 insertions(+), 199 deletions(-) + delete mode 100644 include/linux/pps-gpio.h +Merging extcon/extcon-next (cf947ad92675 extcon: qcom-spmi: Add support for VBUS detection) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-qcom-spmi-misc.c +Removing Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt +Merge made by the 'recursive' strategy. + .../bindings/extcon/qcom,pm8941-misc.txt | 41 --------- + .../bindings/extcon/qcom,pm8941-misc.yaml | 62 ++++++++++++++ + drivers/extcon/extcon-max8997.c | 4 + + drivers/extcon/extcon-qcom-spmi-misc.c | 99 +++++++++++++++++----- + drivers/extcon/extcon-sm5502.c | 22 ++++- + 5 files changed, 166 insertions(+), 62 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt + create mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml +Merging phy-next/next (0d811cda22ab phy: qualcomm: remove duplicate argument) +$ git merge phy-next/next +Auto-merging drivers/phy/ti/phy-j721e-wiz.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml +Merge made by the 'recursive' strategy. + .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 3 + + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 +- + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 11 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 3 +- + .../devicetree/bindings/phy/mediatek,ufs-phy.yaml | 1 + + .../bindings/phy/microchip,sparx5-serdes.yaml | 100 + + .../bindings/phy/phy-cadence-torrent.yaml | 20 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 5 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 4 + + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/Kconfig | 2 +- + drivers/phy/intel/phy-intel-lgm-combo.c | 2 +- + drivers/phy/microchip/Kconfig | 12 + + drivers/phy/microchip/Makefile | 6 + + drivers/phy/microchip/sparx5_serdes.c | 2480 ++++++++++++++++++ + drivers/phy/microchip/sparx5_serdes.h | 136 + + drivers/phy/microchip/sparx5_serdes_regs.h | 2695 ++++++++++++++++++++ + drivers/phy/phy-core.c | 30 + + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 4 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 1 + + drivers/phy/rockchip/phy-rockchip-typec.c | 1 + + drivers/phy/st/Kconfig | 1 + + drivers/phy/st/phy-stm32-usbphyc.c | 65 + + drivers/phy/ti/phy-j721e-wiz.c | 1 + + drivers/phy/ti/phy-tusb1210.c | 27 +- + include/dt-bindings/mux/ti-serdes.h | 5 + + include/dt-bindings/phy/phy-cadence-torrent.h | 2 + + include/dt-bindings/phy/phy-ti.h | 21 + + include/linux/phy/phy.h | 26 + + 31 files changed, 5650 insertions(+), 30 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/microchip,sparx5-serdes.yaml + create mode 100644 drivers/phy/microchip/Kconfig + create mode 100644 drivers/phy/microchip/Makefile + create mode 100644 drivers/phy/microchip/sparx5_serdes.c + create mode 100644 drivers/phy/microchip/sparx5_serdes.h + create mode 100644 drivers/phy/microchip/sparx5_serdes_regs.h + create mode 100644 include/dt-bindings/phy/phy-ti.h +Merging soundwire/next (e6cb15b50065 soundwire: qcom: add missing \n in dev_err()) +$ git merge soundwire/next +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/bus.c +Merge made by the 'recursive' strategy. + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/bus.c | 39 ++++++++++ + drivers/soundwire/bus.h | 2 + + drivers/soundwire/cadence_master.c | 2 +- + drivers/soundwire/dmi-quirks.c | 96 ++++++++++++++++++++++++ + drivers/soundwire/generic_bandwidth_allocation.c | 4 +- + drivers/soundwire/intel.c | 22 +++--- + drivers/soundwire/qcom.c | 2 +- + drivers/soundwire/slave.c | 8 +- + drivers/soundwire/stream.c | 10 +-- + include/linux/soundwire/sdw.h | 26 ++++++- + 11 files changed, 192 insertions(+), 21 deletions(-) + create mode 100644 drivers/soundwire/dmi-quirks.c +Merging thunderbolt/next (2e7a5b3e2236 thunderbolt: Unlock on error path in tb_domain_add()) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/switch.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 35 +- + drivers/net/thunderbolt.c | 56 ++- + drivers/thunderbolt/ctl.c | 21 +- + drivers/thunderbolt/ctl.h | 8 +- + drivers/thunderbolt/debugfs.c | 37 +- + drivers/thunderbolt/dma_test.c | 35 +- + drivers/thunderbolt/domain.c | 89 +++-- + drivers/thunderbolt/eeprom.c | 105 +++-- + drivers/thunderbolt/icm.c | 34 +- + drivers/thunderbolt/property.c | 71 ++++ + drivers/thunderbolt/switch.c | 26 +- + drivers/thunderbolt/tb.c | 52 ++- + drivers/thunderbolt/tb.h | 45 +-- + drivers/thunderbolt/test.c | 492 ++++++++++++++++++++++++ + drivers/thunderbolt/tunnel.c | 102 +++-- + drivers/thunderbolt/tunnel.h | 8 +- + drivers/thunderbolt/xdomain.c | 416 ++++++++++++-------- + include/linux/thunderbolt.h | 54 ++- + 18 files changed, 1244 insertions(+), 442 deletions(-) +Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (d010995736cb staging: rtl8723bs: remove blank line os_dep/os_intfs.c) +$ git merge staging/staging-next +Removing drivers/staging/wimax/wimax-internal.h +Removing drivers/staging/wimax/stack.c +Removing drivers/staging/wimax/op-state-get.c +Removing drivers/staging/wimax/op-rfkill.c +Removing drivers/staging/wimax/op-reset.c +Removing drivers/staging/wimax/op-msg.c +Removing drivers/staging/wimax/net-wimax.h +Removing drivers/staging/wimax/linux-wimax.h +Removing drivers/staging/wimax/linux-wimax-debug.h +Removing drivers/staging/wimax/id-table.c +Removing drivers/staging/wimax/i2400m/usb.c +Removing drivers/staging/wimax/i2400m/usb-tx.c +Removing drivers/staging/wimax/i2400m/usb-rx.c +Removing drivers/staging/wimax/i2400m/usb-notif.c +Removing drivers/staging/wimax/i2400m/usb-fw.c +Removing drivers/staging/wimax/i2400m/usb-debug-levels.h +Removing drivers/staging/wimax/i2400m/tx.c +Removing drivers/staging/wimax/i2400m/sysfs.c +Removing drivers/staging/wimax/i2400m/rx.c +Removing drivers/staging/wimax/i2400m/op-rfkill.c +Removing drivers/staging/wimax/i2400m/netdev.c +Removing drivers/staging/wimax/i2400m/linux-wimax-i2400m.h +Removing drivers/staging/wimax/i2400m/i2400m.h +Removing drivers/staging/wimax/i2400m/i2400m-usb.h +Removing drivers/staging/wimax/i2400m/fw.c +Removing drivers/staging/wimax/i2400m/driver.c +Removing drivers/staging/wimax/i2400m/debugfs.c +Removing drivers/staging/wimax/i2400m/debug-levels.h +Removing drivers/staging/wimax/i2400m/control.c +Removing drivers/staging/wimax/i2400m/Makefile +Removing drivers/staging/wimax/i2400m/Kconfig +Removing drivers/staging/wimax/debugfs.c +Removing drivers/staging/wimax/debug-levels.h +Removing drivers/staging/wimax/TODO +Removing drivers/staging/wimax/Makefile +Removing drivers/staging/wimax/Kconfig +Removing drivers/staging/wimax/Documentation/wimax.rst +Removing drivers/staging/wimax/Documentation/index.rst +Removing drivers/staging/wimax/Documentation/i2400m.rst +Auto-merging drivers/staging/rtl8192e/rtllib_rx.c +Removing drivers/staging/most/sound/Makefile +Removing drivers/staging/most/sound/Kconfig +Removing drivers/staging/gasket/gasket_sysfs.h +Removing drivers/staging/gasket/gasket_sysfs.c +Removing drivers/staging/gasket/gasket_page_table.h +Removing drivers/staging/gasket/gasket_page_table.c +Removing drivers/staging/gasket/gasket_ioctl.h +Removing drivers/staging/gasket/gasket_ioctl.c +Removing drivers/staging/gasket/gasket_interrupt.h +Removing drivers/staging/gasket/gasket_interrupt.c +Removing drivers/staging/gasket/gasket_core.h +Removing drivers/staging/gasket/gasket_core.c +Removing drivers/staging/gasket/gasket_constants.h +Removing drivers/staging/gasket/gasket.h +Removing drivers/staging/gasket/apex_driver.c +Removing drivers/staging/gasket/apex.h +Removing drivers/staging/gasket/TODO +Removing drivers/staging/gasket/Makefile +Removing drivers/staging/gasket/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 - + drivers/most/Kconfig | 10 + + drivers/most/Makefile | 1 + + .../most/sound/sound.c => most/most_snd.c} | 0 + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/android/uapi/ashmem.h | 2 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 369 +++- + drivers/staging/comedi/drivers/das800.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 152 +- + drivers/staging/emxx_udc/emxx_udc.c | 1 - + drivers/staging/fwserial/fwserial.c | 6 +- + drivers/staging/gasket/Kconfig | 25 - + drivers/staging/gasket/Makefile | 10 - + drivers/staging/gasket/TODO | 22 - + drivers/staging/gasket/apex.h | 30 - + drivers/staging/gasket/apex_driver.c | 726 -------- + drivers/staging/gasket/gasket.h | 122 -- + drivers/staging/gasket/gasket_constants.h | 44 - + drivers/staging/gasket/gasket_core.c | 1815 -------------------- + drivers/staging/gasket/gasket_core.h | 638 ------- + drivers/staging/gasket/gasket_interrupt.c | 515 ------ + drivers/staging/gasket/gasket_interrupt.h | 95 - + drivers/staging/gasket/gasket_ioctl.c | 388 ----- + drivers/staging/gasket/gasket_ioctl.h | 28 - + drivers/staging/gasket/gasket_page_table.c | 1359 --------------- + drivers/staging/gasket/gasket_page_table.h | 249 --- + drivers/staging/gasket/gasket_sysfs.c | 398 ----- + drivers/staging/gasket/gasket_sysfs.h | 175 -- + drivers/staging/greybus/audio_module.c | 4 +- + drivers/staging/greybus/audio_topology.c | 12 +- + drivers/staging/greybus/sdio.c | 1 - + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 8 +- + drivers/staging/kpc2000/kpc2000_i2c.c | 6 +- + drivers/staging/kpc2000/kpc2000_spi.c | 2 +- + drivers/staging/most/Kconfig | 2 - + drivers/staging/most/Makefile | 1 - + drivers/staging/most/sound/Kconfig | 14 - + drivers/staging/most/sound/Makefile | 4 - + drivers/staging/mt7621-pci/pci-mt7621.c | 1 - + drivers/staging/nvec/nvec_ps2.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 32 +- + drivers/staging/octeon/ethernet-spi.c | 2 +- + drivers/staging/qlge/qlge_main.c | 9 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 6 - + drivers/staging/rtl8188eu/core/rtw_debug.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 72 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 11 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 12 +- + drivers/staging/rtl8188eu/include/odm_hwconfig.h | 8 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 2 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 13 - + drivers/staging/rtl8188eu/include/wifi.h | 156 -- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 88 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 22 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 31 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 27 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 40 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 127 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 23 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 58 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 18 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 62 +- + drivers/staging/rtl8192e/rtllib_rx.c | 170 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 14 +- + drivers/staging/rtl8192e/rtllib_tx.c | 8 +- + drivers/staging/rtl8192e/rtllib_wx.c | 76 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 42 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 7 +- + drivers/staging/rtl8192u/r8192U.h | 6 +- + drivers/staging/rtl8192u/r8192U_wx.c | 20 +- + drivers/staging/rtl8712/ieee80211.c | 6 +- + drivers/staging/rtl8712/rtl8712_xmit.h | 5 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 3 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/wifi.h | 178 +- + drivers/staging/rtl8723bs/TODO | 1 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 117 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 37 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 20 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 51 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 323 +--- + drivers/staging/rtl8723bs/core/rtw_odm.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 66 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 561 +++--- + drivers/staging/rtl8723bs/core/rtw_security.c | 98 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 205 +-- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 105 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 156 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 52 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 146 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 48 +- + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 166 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 6 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 6 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 2 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 12 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 6 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 8 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 24 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 56 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 12 +- + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 4 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 139 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 104 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 22 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 23 +- + drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 22 +- + drivers/staging/rtl8723bs/hal/odm.c | 1727 +++++++++---------- + drivers/staging/rtl8723bs/hal/odm.h | 333 ++-- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 28 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 66 +- + drivers/staging/rtl8723bs/hal/odm_DIG.h | 22 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 8 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 6 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 35 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 79 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 4 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 16 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 16 +- + drivers/staging/rtl8723bs/hal/odm_debug.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_debug.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_interface.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_types.h | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 1232 +------------ + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 15 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 208 +-- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 24 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 8 - + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 454 +---- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 37 - + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 12 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 62 +- + drivers/staging/rtl8723bs/include/autoconf.h | 3 - + drivers/staging/rtl8723bs/include/basic_types.h | 4 +- + drivers/staging/rtl8723bs/include/drv_conf.h | 10 - + drivers/staging/rtl8723bs/include/drv_types.h | 190 +- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 5 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 4 +- + drivers/staging/rtl8723bs/include/hal_com.h | 42 +- + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 120 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 40 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 6 +- + drivers/staging/rtl8723bs/include/hal_data.h | 39 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 52 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 38 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 6 +- + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 22 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 121 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 12 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 13 +- + .../rtl8723bs/include/osdep_service_linux.h | 29 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 8 +- + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 6 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 48 +- + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 44 - + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 10 - + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 247 +-- + drivers/staging/rtl8723bs/include/rtw_debug.h | 6 - + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 11 - + drivers/staging/rtl8723bs/include/rtw_ht.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 113 +- + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 112 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 72 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 49 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 78 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 62 +- + drivers/staging/rtl8723bs/include/rtw_rf.h | 18 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 17 +- + drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 5 - + drivers/staging/rtl8723bs/include/rtw_xmit.h | 55 +- + drivers/staging/rtl8723bs/include/sdio_ops.h | 7 - + drivers/staging/rtl8723bs/include/sta_info.h | 26 +- + drivers/staging/rtl8723bs/include/wifi.h | 31 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 48 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 14 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 81 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 179 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 14 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 394 +---- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 76 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 65 - + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 32 +- + drivers/staging/sm750fb/sm750.h | 29 +- + drivers/staging/unisys/visornic/visornic_main.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 +- + drivers/staging/vt6655/baseband.c | 6 +- + drivers/staging/vt6655/channel.c | 42 +- + drivers/staging/vt6656/card.c | 3 +- + drivers/staging/wfx/hif_rx.c | 6 +- + drivers/staging/wfx/sta.c | 2 +- + drivers/staging/wimax/Documentation/i2400m.rst | 283 --- + drivers/staging/wimax/Documentation/index.rst | 19 - + drivers/staging/wimax/Documentation/wimax.rst | 89 - + drivers/staging/wimax/Kconfig | 47 - + drivers/staging/wimax/Makefile | 15 - + drivers/staging/wimax/TODO | 18 - + drivers/staging/wimax/debug-levels.h | 29 - + drivers/staging/wimax/debugfs.c | 38 - + drivers/staging/wimax/i2400m/Kconfig | 37 - + drivers/staging/wimax/i2400m/Makefile | 23 - + drivers/staging/wimax/i2400m/control.c | 1434 ---------------- + drivers/staging/wimax/i2400m/debug-levels.h | 32 - + drivers/staging/wimax/i2400m/debugfs.c | 253 --- + drivers/staging/wimax/i2400m/driver.c | 1003 ----------- + drivers/staging/wimax/i2400m/fw.c | 1666 ------------------ + drivers/staging/wimax/i2400m/i2400m-usb.h | 275 --- + drivers/staging/wimax/i2400m/i2400m.h | 970 ----------- + drivers/staging/wimax/i2400m/linux-wimax-i2400m.h | 572 ------ + drivers/staging/wimax/i2400m/netdev.c | 603 ------- + drivers/staging/wimax/i2400m/op-rfkill.c | 196 --- + drivers/staging/wimax/i2400m/rx.c | 1394 --------------- + drivers/staging/wimax/i2400m/sysfs.c | 65 - + drivers/staging/wimax/i2400m/tx.c | 1015 ----------- + drivers/staging/wimax/i2400m/usb-debug-levels.h | 28 - + drivers/staging/wimax/i2400m/usb-fw.c | 365 ---- + drivers/staging/wimax/i2400m/usb-notif.c | 258 --- + drivers/staging/wimax/i2400m/usb-rx.c | 462 ----- + drivers/staging/wimax/i2400m/usb-tx.c | 273 --- + drivers/staging/wimax/i2400m/usb.c | 765 --------- + drivers/staging/wimax/id-table.c | 130 -- + drivers/staging/wimax/linux-wimax-debug.h | 491 ------ + drivers/staging/wimax/linux-wimax.h | 239 --- + drivers/staging/wimax/net-wimax.h | 503 ------ + drivers/staging/wimax/op-msg.c | 391 ----- + drivers/staging/wimax/op-reset.c | 108 -- + drivers/staging/wimax/op-rfkill.c | 431 ----- + drivers/staging/wimax/op-state-get.c | 52 - + drivers/staging/wimax/stack.c | 616 ------- + drivers/staging/wimax/wimax-internal.h | 85 - + drivers/staging/wlan-ng/p80211conv.h | 3 - + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + 267 files changed, 3592 insertions(+), 30331 deletions(-) + rename drivers/{staging/most/sound/sound.c => most/most_snd.c} (100%) + delete mode 100644 drivers/staging/gasket/Kconfig + delete mode 100644 drivers/staging/gasket/Makefile + delete mode 100644 drivers/staging/gasket/TODO + delete mode 100644 drivers/staging/gasket/apex.h + delete mode 100644 drivers/staging/gasket/apex_driver.c + delete mode 100644 drivers/staging/gasket/gasket.h + delete mode 100644 drivers/staging/gasket/gasket_constants.h + delete mode 100644 drivers/staging/gasket/gasket_core.c + delete mode 100644 drivers/staging/gasket/gasket_core.h + delete mode 100644 drivers/staging/gasket/gasket_interrupt.c + delete mode 100644 drivers/staging/gasket/gasket_interrupt.h + delete mode 100644 drivers/staging/gasket/gasket_ioctl.c + delete mode 100644 drivers/staging/gasket/gasket_ioctl.h + delete mode 100644 drivers/staging/gasket/gasket_page_table.c + delete mode 100644 drivers/staging/gasket/gasket_page_table.h + delete mode 100644 drivers/staging/gasket/gasket_sysfs.c + delete mode 100644 drivers/staging/gasket/gasket_sysfs.h + delete mode 100644 drivers/staging/most/sound/Kconfig + delete mode 100644 drivers/staging/most/sound/Makefile + delete mode 100644 drivers/staging/wimax/Documentation/i2400m.rst + delete mode 100644 drivers/staging/wimax/Documentation/index.rst + delete mode 100644 drivers/staging/wimax/Documentation/wimax.rst + delete mode 100644 drivers/staging/wimax/Kconfig + delete mode 100644 drivers/staging/wimax/Makefile + delete mode 100644 drivers/staging/wimax/TODO + delete mode 100644 drivers/staging/wimax/debug-levels.h + delete mode 100644 drivers/staging/wimax/debugfs.c + delete mode 100644 drivers/staging/wimax/i2400m/Kconfig + delete mode 100644 drivers/staging/wimax/i2400m/Makefile + delete mode 100644 drivers/staging/wimax/i2400m/control.c + delete mode 100644 drivers/staging/wimax/i2400m/debug-levels.h + delete mode 100644 drivers/staging/wimax/i2400m/debugfs.c + delete mode 100644 drivers/staging/wimax/i2400m/driver.c + delete mode 100644 drivers/staging/wimax/i2400m/fw.c + delete mode 100644 drivers/staging/wimax/i2400m/i2400m-usb.h + delete mode 100644 drivers/staging/wimax/i2400m/i2400m.h + delete mode 100644 drivers/staging/wimax/i2400m/linux-wimax-i2400m.h + delete mode 100644 drivers/staging/wimax/i2400m/netdev.c + delete mode 100644 drivers/staging/wimax/i2400m/op-rfkill.c + delete mode 100644 drivers/staging/wimax/i2400m/rx.c + delete mode 100644 drivers/staging/wimax/i2400m/sysfs.c + delete mode 100644 drivers/staging/wimax/i2400m/tx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-debug-levels.h + delete mode 100644 drivers/staging/wimax/i2400m/usb-fw.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-notif.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-rx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-tx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb.c + delete mode 100644 drivers/staging/wimax/id-table.c + delete mode 100644 drivers/staging/wimax/linux-wimax-debug.h + delete mode 100644 drivers/staging/wimax/linux-wimax.h + delete mode 100644 drivers/staging/wimax/net-wimax.h + delete mode 100644 drivers/staging/wimax/op-msg.c + delete mode 100644 drivers/staging/wimax/op-reset.c + delete mode 100644 drivers/staging/wimax/op-rfkill.c + delete mode 100644 drivers/staging/wimax/op-state-get.c + delete mode 100644 drivers/staging/wimax/stack.c + delete mode 100644 drivers/staging/wimax/wimax-internal.h +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (57bfc3abd8e5 Merge branch 'icc-fixes' into icc-next) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,sdm660.yaml | 147 ++++ + drivers/interconnect/bulk.c | 2 +- + drivers/interconnect/core.c | 2 + + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/msm8939.c | 16 +- + drivers/interconnect/qcom/sdm660.c | 922 +++++++++++++++++++++ + include/dt-bindings/interconnect/qcom,sdm660.h | 116 +++ + 9 files changed, 1209 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 drivers/interconnect/qcom/sdm660.c + create mode 100644 include/dt-bindings/interconnect/qcom,sdm660.h +Merging dmaengine/next (84b0aa2e0d91 dmaengine: dw-edma: Add pcim_iomap_table return check) +$ git merge dmaengine/next +Merge made by the 'recursive' strategy. + drivers/dma/dw-edma/dw-edma-core.c | 178 +++++++++++------- + drivers/dma/dw-edma/dw-edma-core.h | 37 ++-- + drivers/dma/dw-edma/dw-edma-pcie.c | 277 +++++++++++++++++++++------- + drivers/dma/dw-edma/dw-edma-v0-core.c | 300 ++++++++++++++++++++++++------- + drivers/dma/dw-edma/dw-edma-v0-core.h | 2 +- + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 77 ++++---- + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 4 +- + drivers/dma/dw-edma/dw-edma-v0-regs.h | 291 +++++++++++++++++++----------- + drivers/dma/xilinx/xilinx_dma.c | 8 + + drivers/pci/pci.c | 30 ++++ + include/linux/pci.h | 1 + + 11 files changed, 850 insertions(+), 355 deletions(-) +Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (213ce3262eda Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging block/blk-mq-sched.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 + + block/blk-mq-sched.c | 17 +- + block/blk-mq.c | 38 +- + block/blk-mq.h | 25 +- + block/kyber-iosched.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/scsi/3w-9xxx.c | 14 +- + drivers/scsi/3w-sas.c | 13 +- + drivers/scsi/3w-xxxx.c | 6 +- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/FlashPoint.c | 6 +- + drivers/scsi/a100u2w.c | 10 +- + drivers/scsi/aacraid/aachba.c | 8 +- + drivers/scsi/aacraid/commctrl.c | 2 +- + drivers/scsi/aacraid/commsup.c | 4 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aic94xx/aic94xx_dump.c | 186 +----- + drivers/scsi/aic94xx/aic94xx_hwi.c | 4 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 2 +- + drivers/scsi/atp870u.c | 7 +- + drivers/scsi/be2iscsi/be_iscsi.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 6 +- + drivers/scsi/be2iscsi/be_mgmt.c | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 20 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxlflash/main.c | 8 +- + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/cxlflash/vlun.c | 8 +- + drivers/scsi/dc395x.c | 9 +- + drivers/scsi/esas2r/esas2r_log.c | 7 + + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/fnic/fnic_fcs.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/fnic/fnic_trace.c | 18 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 31 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 70 +-- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 23 +- + drivers/scsi/initio.c | 18 +- + drivers/scsi/ipr.c | 8 +- + drivers/scsi/isci/host.c | 37 +- + drivers/scsi/isci/phy.c | 34 +- + drivers/scsi/isci/port.c | 62 +- + drivers/scsi/isci/port_config.c | 37 +- + drivers/scsi/isci/remote_device.c | 33 +- + drivers/scsi/isci/remote_node_context.c | 13 +- + drivers/scsi/isci/remote_node_table.c | 64 +-- + drivers/scsi/isci/request.c | 60 +- + drivers/scsi/isci/task.c | 3 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 12 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 14 +- + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 12 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 15 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 639 ++++++++++----------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 272 ++++----- + drivers/scsi/lpfc/lpfc_nvme.c | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 5 +- + drivers/scsi/lpfc/lpfc_scsi.c | 122 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 41 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 10 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 5 + + drivers/scsi/megaraid/megaraid_sas_base.c | 98 +++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 89 ++- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 + + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 508 ++++++++++------ + drivers/scsi/mpt3sas/mpt3sas_base.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 10 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 40 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 58 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- + drivers/scsi/mvumi.c | 9 +- + drivers/scsi/myrb.c | 47 +- + drivers/scsi/myrs.c | 12 +- + drivers/scsi/nsp32.c | 31 +- + drivers/scsi/pm8001/pm8001_ctl.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 8 +- + drivers/scsi/pm8001/pm8001_init.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.c | 9 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 - + drivers/scsi/pm8001/pm80xx_hwi.c | 18 +- + drivers/scsi/pmcraid.c | 70 ++- + drivers/scsi/qla1280.c | 8 +- + drivers/scsi/qla2xxx/qla_gs.c | 10 +- + drivers/scsi/qla2xxx/qla_iocb.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 4 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/qla2xxx/qla_target.c | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 17 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/scsi.c | 13 + + drivers/scsi/scsi_debug.c | 229 +++++++- + drivers/scsi/scsi_lib.c | 100 +++- + drivers/scsi/scsi_priv.h | 3 + + drivers/scsi/scsi_scan.c | 23 +- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/sim710.c | 14 +- + drivers/scsi/storvsc_drv.c | 84 ++- + drivers/scsi/ufs/cdns-pltfrm.c | 4 + + drivers/scsi/ufs/ufs-debugfs.c | 90 +++ + drivers/scsi/ufs/ufs-debugfs.h | 2 + + drivers/scsi/ufs/ufs-qcom.c | 4 +- + drivers/scsi/ufs/ufs-sysfs.c | 2 +- + drivers/scsi/ufs/ufs.h | 10 +- + drivers/scsi/ufs/ufshcd-pci.c | 169 ++++++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 6 +- + drivers/scsi/ufs/ufshcd.c | 251 ++++---- + drivers/scsi/ufs/ufshcd.h | 28 +- + drivers/scsi/ufs/ufshci.h | 18 +- + drivers/target/iscsi/iscsi_target.c | 19 +- + drivers/target/iscsi/iscsi_target_configfs.c | 3 +- + drivers/target/iscsi/iscsi_target_nego.c | 1 - + drivers/target/iscsi/iscsi_target_stat.c | 1 - + drivers/target/iscsi/iscsi_target_util.c | 17 - + drivers/target/loopback/tcm_loop.c | 60 +- + drivers/target/loopback/tcm_loop.h | 1 - + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_configfs.c | 25 +- + drivers/target/target_core_device.c | 10 +- + drivers/target/target_core_fabric_configfs.c | 58 ++ + drivers/target/target_core_file.c | 3 +- + drivers/target/target_core_iblock.c | 81 ++- + drivers/target/target_core_iblock.h | 10 + + drivers/target/target_core_internal.h | 2 + + drivers/target/target_core_pr.c | 36 +- + drivers/target/target_core_pscsi.c | 5 +- + drivers/target/target_core_sbc.c | 4 +- + drivers/target/target_core_stat.c | 3 - + drivers/target/target_core_tmr.c | 4 + + drivers/target/target_core_transport.c | 300 +++++++--- + drivers/target/target_core_user.c | 95 +-- + drivers/target/target_core_xcopy.c | 10 +- + drivers/target/tcm_fc/tfc_cmd.c | 14 +- + drivers/usb/gadget/function/f_tcm.c | 36 +- + drivers/vhost/scsi.c | 58 +- + drivers/xen/xen-scsiback.c | 21 +- + include/linux/blk-mq.h | 13 +- + include/linux/hyperv.h | 1 + + include/linux/sbitmap.h | 85 ++- + include/scsi/scsi_cmnd.h | 3 + + include/scsi/scsi_device.h | 8 +- + include/scsi/scsi_host.h | 83 +-- + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 59 +- + include/target/target_core_fabric.h | 21 +- + include/trace/events/ufs.h | 21 + + lib/sbitmap.c | 210 ++++--- + 170 files changed, 3306 insertions(+), 2404 deletions(-) +Merging scsi-mkp/for-next (c2255ece2be2 scsi: pm8001: Avoid -Wrestrict warning) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptbase.c | 6 +-- + drivers/scsi/bfa/bfa_fc.h | 4 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 85 ++++++++++++++++++------------------- + drivers/scsi/csiostor/csio_hw_t5.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/esp_scsi.c | 4 +- + drivers/scsi/fnic/fnic_debugfs.c | 3 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 6 +-- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/mac53c94.c | 13 +++--- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 6 ++- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 8 +++- + drivers/scsi/qla2xxx/qla_bsg.c | 4 ++ + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_iocb.c | 3 +- + drivers/scsi/qla2xxx/qla_isr.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 12 +++--- + drivers/scsi/qla2xxx/qla_mr.h | 8 +++- + drivers/scsi/qla2xxx/qla_nx2.c | 8 ---- + drivers/scsi/qla2xxx/qla_sup.c | 9 ++-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- + drivers/scsi/scsi_dh.c | 2 +- + drivers/scsi/ufs/ufs-exynos.c | 3 +- + drivers/scsi/ufs/ufshcd.c | 6 +-- + drivers/scsi/ufs/ufshcd.h | 2 +- + include/scsi/scsi_dh.h | 2 +- + 31 files changed, 113 insertions(+), 106 deletions(-) +Merging vhost/linux-next (723c7003c1ab vdpa: introduce virtio pci driver) +$ git merge vhost/linux-next +Auto-merging drivers/Makefile +Merge made by the 'recursive' strategy. + drivers/Makefile | 1 + + drivers/vdpa/Kconfig | 7 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/virtio_pci/Makefile | 2 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 458 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 469 insertions(+) + create mode 100644 drivers/vdpa/virtio_pci/Makefile + create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c +Merging rpmsg/for-next (2c2564b9d64d Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing drivers/hwspinlock/sirf_hwspinlock.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/remoteproc/imx-rproc.txt +Removing Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwlock/sirf,hwspinlock.txt | 28 - + .../bindings/remoteproc/fsl,imx-rproc.yaml | 90 ++++ + .../devicetree/bindings/remoteproc/imx-rproc.txt | 33 -- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 15 + + .../bindings/remoteproc/qcom,wcnss-pil.txt | 6 + + MAINTAINERS | 2 + + drivers/hwspinlock/Kconfig | 11 - + drivers/hwspinlock/Makefile | 1 - + drivers/hwspinlock/sirf_hwspinlock.c | 105 ---- + drivers/remoteproc/Kconfig | 6 +- + drivers/remoteproc/imx_rproc.c | 267 ++++++++- + drivers/remoteproc/ingenic_rproc.c | 2 +- + drivers/remoteproc/keystone_remoteproc.c | 2 +- + drivers/remoteproc/mtk_scp.c | 6 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/pru_rproc.c | 26 +- + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_mss.c | 26 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 595 +++++++++++++++++++-- + drivers/remoteproc/qcom_wcnss.c | 10 +- + drivers/remoteproc/remoteproc_cdev.c | 21 +- + drivers/remoteproc/remoteproc_core.c | 337 ++++++++++-- + drivers/remoteproc/remoteproc_coredump.c | 8 +- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + drivers/remoteproc/remoteproc_elf_loader.c | 21 +- + drivers/remoteproc/remoteproc_internal.h | 12 +- + drivers/remoteproc/remoteproc_sysfs.c | 21 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 168 +++--- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 17 + + drivers/rpmsg/qcom_smd.c | 16 + + drivers/rpmsg/rpmsg_char.c | 11 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 62 ++- + include/linux/remoteproc.h | 25 +- + include/linux/rpmsg.h | 3 +- + include/uapi/linux/rpmsg.h | 13 +- + 41 files changed, 1549 insertions(+), 435 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/imx-rproc.txt + delete mode 100644 drivers/hwspinlock/sirf_hwspinlock.c +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (deecc4d162c8 gpio: mockup: Adjust documentation to the code) +$ git merge gpio-brgl/gpio/for-next +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/irqdomain.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/gpio-mockup.rst | 11 ++--- + Documentation/core-api/irq/irq-domain.rst | 22 ++++----- + Documentation/driver-api/gpio/consumer.rst | 2 +- + drivers/gpio/gpio-mockup.c | 9 +--- + drivers/gpio/gpiolib-acpi.c | 7 +++ + drivers/gpio/gpiolib-acpi.h | 4 ++ + drivers/gpio/gpiolib-of.c | 6 ++- + drivers/gpio/gpiolib.c | 62 ++++++++++---------------- + include/linux/irqdomain.h | 19 +++++--- + kernel/irq/irqdomain.c | 20 ++++----- + 10 files changed, 84 insertions(+), 78 deletions(-) +Merging gpio-intel/for-next (12484a4ecc92 gpio: sch: Hook into ACPI GPE handler to catch GPIO edge events) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 3 +- + drivers/gpio/gpio-aggregator.c | 39 ++------ + drivers/gpio/gpio-sch.c | 198 +++++++++++++++++++++++++++++++++++++++-- + lib/cmdline.c | 1 + + 4 files changed, 198 insertions(+), 43 deletions(-) +Merging pinctrl/for-next (b9fd814e2c5d Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../arm/marvell/cp110-system-controller.txt | 4 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 12 ++ + Documentation/driver-api/gpio/legacy.rst | 2 +- + Documentation/driver-api/index.rst | 2 +- + .../driver-api/{pinctl.rst => pin-control.rst} | 37 +++++++ + MAINTAINERS | 2 +- + arch/arm64/Kconfig.platforms | 2 - + drivers/pinctrl/Kconfig | 7 +- + drivers/pinctrl/core.c | 37 +++++-- + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 2 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 + + drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-equilibrium.c | 16 ++- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-k210.c | 1 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 27 ++++- + drivers/pinctrl/pinctrl-single.c | 65 ++++++----- + drivers/pinctrl/pinmux.c | 106 +++++++++++++++++- + drivers/pinctrl/qcom/Kconfig | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 40 +++++-- + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 123 ++++++++++++++++++++- + drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 21 ++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 6 + + drivers/pinctrl/renesas/pfc-r8a77951.c | 30 ++++- + drivers/pinctrl/renesas/pfc-r8a7796.c | 30 ++++- + drivers/pinctrl/renesas/pfc-r8a77965.c | 34 +++++- + drivers/pinctrl/renesas/pfc-r8a77990.c | 34 +++++- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 3 +- + kernel/irq/generic-chip.c | 1 + + 36 files changed, 598 insertions(+), 79 deletions(-) + rename Documentation/driver-api/{pinctl.rst => pin-control.rst} (97%) +Merging pinctrl-intel/for-next (5b613df3f499 pinctrl: intel: No need to disable IRQs in the handler) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (61232cd6efca pinctrl: renesas: r8a7791: Add bias pinconf support) +$ git merge pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/core.c | 20 -- + drivers/pinctrl/renesas/core.h | 8 - + drivers/pinctrl/renesas/pfc-r8a73a4.c | 48 +--- + drivers/pinctrl/renesas/pfc-r8a7740.c | 46 +--- + drivers/pinctrl/renesas/pfc-r8a7778.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7791.c | 387 +++++++++++++++++++++++++++++++-- + drivers/pinctrl/renesas/pfc-r8a7792.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77950.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77951.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7796.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77965.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77970.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77980.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77990.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77995.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 1 - + drivers/pinctrl/renesas/pfc-sh73a0.c | 46 +--- + drivers/pinctrl/renesas/pinctrl.c | 109 ++++++++-- + drivers/pinctrl/renesas/sh_pfc.h | 24 +- + 19 files changed, 497 insertions(+), 202 deletions(-) +Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9666cec380d6 pwm: Drop function pwmchip_add_with_polarity()) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 48 +++++++------------------------------ + drivers/pwm/pwm-ab8500.c | 54 +++++++++++++++++++----------------------- + drivers/pwm/pwm-atmel-hlcdc.c | 3 +-- + drivers/pwm/pwm-atmel-tcb.c | 42 ++++++++++++++++++++++---------- + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-bcm-iproc.c | 1 - + drivers/pwm/pwm-bcm-kona.c | 3 +-- + drivers/pwm/pwm-bcm2835.c | 36 +++++++++++++++++++++------- + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-brcmstb.c | 1 - + drivers/pwm/pwm-clps711x.c | 1 - + drivers/pwm/pwm-crc.c | 1 - + drivers/pwm/pwm-cros-ec.c | 4 +++- + drivers/pwm/pwm-dwc.c | 1 - + drivers/pwm/pwm-ep93xx.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-hibvt.c | 1 - + drivers/pwm/pwm-img.c | 1 - + drivers/pwm/pwm-imx-tpm.c | 5 +--- + drivers/pwm/pwm-imx1.c | 1 - + drivers/pwm/pwm-imx27.c | 1 - + drivers/pwm/pwm-intel-lgm.c | 1 - + drivers/pwm/pwm-iqs620a.c | 1 - + drivers/pwm/pwm-jz4740.c | 1 - + drivers/pwm/pwm-keembay.c | 1 - + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-lpc18xx-sct.c | 1 - + drivers/pwm/pwm-lpc32xx.c | 1 - + drivers/pwm/pwm-lpss.c | 1 - + drivers/pwm/pwm-mediatek.c | 1 - + drivers/pwm/pwm-meson.c | 1 - + drivers/pwm/pwm-mtk-disp.c | 1 - + drivers/pwm/pwm-mxs.c | 1 - + drivers/pwm/pwm-omap-dmtimer.c | 1 - + drivers/pwm/pwm-pca9685.c | 1 - + drivers/pwm/pwm-pxa.c | 1 - + drivers/pwm/pwm-rcar.c | 1 - + drivers/pwm/pwm-renesas-tpu.c | 1 - + drivers/pwm/pwm-rockchip.c | 1 - + drivers/pwm/pwm-samsung.c | 1 - + drivers/pwm/pwm-sifive.c | 1 - + drivers/pwm/pwm-sl28cpld.c | 1 - + drivers/pwm/pwm-spear.c | 1 - + drivers/pwm/pwm-sprd.c | 4 +++- + drivers/pwm/pwm-sti.c | 1 - + drivers/pwm/pwm-stm32-lp.c | 1 - + drivers/pwm/pwm-stm32.c | 1 - + drivers/pwm/pwm-stmpe.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-tegra.c | 1 - + drivers/pwm/pwm-tiecap.c | 1 - + drivers/pwm/pwm-tiehrpwm.c | 1 - + drivers/pwm/pwm-twl-led.c | 1 - + drivers/pwm/pwm-twl.c | 1 - + drivers/pwm/pwm-vt8500.c | 1 - + include/linux/pwm.h | 2 -- + 56 files changed, 99 insertions(+), 148 deletions(-) +Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (a38fd8748464 Linux 5.12-rc2) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (81840f21d416 Merge branch 'for-5.12/doc' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (8d69f62fddf6 rtc: rx6110: add ACPI bindings to I2C) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-imxdi.c | 4 +--- + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-rv3028.c | 4 ++-- + drivers/rtc/rtc-rx6110.c | 7 +++++++ + drivers/rtc/rtc-tps65910.c | 1 + + 7 files changed, 14 insertions(+), 7 deletions(-) +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (15a2fd51384a seccomp: fix the cond to report loaded filters) +$ git merge seccomp/for-next/seccomp +Merge made by the 'recursive' strategy. + fs/proc/array.c | 2 ++ + init/init_task.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging kspp/for-next/kspp (414eece95b98 Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b36a5038a845] Merge remote-tracking branch 'slimbus/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (5350a8500263 nvmem: rmem: fix undefined reference to memremap) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 34 ++++++++ + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + drivers/nvmem/Kconfig | 10 +++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 78 ++++++++++++++++++ + drivers/nvmem/core.c | 95 ++++++++++++++++++++++ + drivers/nvmem/qcom-spmi-sdam.c | 2 +- + drivers/nvmem/qfprom.c | 21 +++++ + drivers/nvmem/snvs_lpgpr.c | 2 +- + include/linux/nvmem-consumer.h | 4 + + 10 files changed, 247 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/brcm,nvram.yaml + create mode 100644 drivers/nvmem/brcm_nvram.c +Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 26 ++++++++++++++------------ + lib/xarray.c | 11 ++++++----- + 2 files changed, 20 insertions(+), 17 deletions(-) +Merging hyperv/hyperv-next (6dc2a774cb4f x86/Hyper-V: Support for free page reporting) +$ git merge hyperv/hyperv-next +Auto-merging include/linux/hyperv.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/clocksource/hyperv_timer.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/include/asm/mshyperv.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/mshyperv.h +Auto-merging arch/x86/hyperv/hv_init.c +Resolved 'arch/x86/include/asm/mshyperv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 60b84081a628] Merge remote-tracking branch 'hyperv/hyperv-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/hyperv/hv_apic.c | 2 + + arch/x86/hyperv/hv_init.c | 104 ++++++++-------- + arch/x86/hyperv/hv_spinlock.c | 8 +- + arch/x86/include/asm/hyperv-tlfs.h | 131 ++++++++++--------- + arch/x86/include/asm/mshyperv.h | 67 ++-------- + arch/x86/kernel/cpu/mshyperv.c | 32 ++--- + drivers/clocksource/hyperv_timer.c | 249 +++++++++++++++++++++++++------------ + drivers/hv/Kconfig | 1 + + drivers/hv/channel.c | 2 +- + drivers/hv/channel_mgmt.c | 7 +- + drivers/hv/connection.c | 2 +- + drivers/hv/hv.c | 93 +++++++++++--- + drivers/hv/hv_balloon.c | 89 +++++++++++++ + drivers/hv/ring_buffer.c | 1 - + drivers/hv/vmbus_drv.c | 89 +++++++++++-- + include/asm-generic/hyperv-tlfs.h | 70 ++++++++++- + include/asm-generic/mshyperv.h | 24 ++-- + include/clocksource/hyperv_timer.h | 3 +- + include/linux/hyperv.h | 8 +- + 19 files changed, 648 insertions(+), 334 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-x86-paravirt-Switch-time-pvops-functions-.patch +Applying: fix up for "x86/paravirt: Switch time pvops functions to use static_call()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/clocksource/hyperv_timer.c +$ git add -A . +$ git commit -v -a --amend +[master 527b411889da] Merge remote-tracking branch 'hyperv/hyperv-next' + Date: Fri Mar 26 17:04:44 2021 +1100 +Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/charlcd.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) +Merging kgdb/kgdb/for-next (2bbd9b0f2b4e kernel: debug: Ordinary typo fixes in the file gdbstub.c) +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by the 'recursive' strategy. + kernel/debug/gdbstub.c | 4 +- + kernel/debug/kdb/kdb_bp.c | 75 ++++--- + kernel/debug/kdb/kdb_main.c | 446 ++++++++++++++++++++++++----------------- + kernel/debug/kdb/kdb_private.h | 5 +- + kernel/debug/kdb/kdb_support.c | 18 -- + 5 files changed, 313 insertions(+), 235 deletions(-) +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (9a8d3cda8daf fpga: dfl: afu: harden port enable logic) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-error.c | 10 ++++++---- + drivers/fpga/dfl-afu-main.c | 35 ++++++++++++++++++++++++----------- + drivers/fpga/dfl-afu.h | 2 +- + 3 files changed, 31 insertions(+), 16 deletions(-) +Merging kunit/test (a38fd8748464 Linux 5.12-rc2) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (a38fd8748464 Linux 5.12-rc2) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (2f9f21cdcd71 kunit: Match parenthesis alignment to improve code readability) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + lib/kunit/assert.c | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (9e40641f62cd bus: mhi: core: Check state before processing power_down) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 51 +++++---- + drivers/bus/mhi/core/debugfs.c | 2 +- + drivers/bus/mhi/core/init.c | 13 +-- + drivers/bus/mhi/core/internal.h | 1 + + drivers/bus/mhi/core/main.c | 88 ++++++++++------ + drivers/bus/mhi/core/pm.c | 27 ++++- + drivers/bus/mhi/pci_generic.c | 228 +++++++++++++++++++++++++++++++++++----- + include/linux/mhi.h | 2 +- + 8 files changed, 310 insertions(+), 102 deletions(-) +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (4c23541929b7 mm: unexport follow_pfn) +$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup +Auto-merging security/Kconfig +Auto-merging mm/memory.c +Auto-merging include/linux/mm.h +Auto-merging drivers/media/common/videobuf2/frame_vector.c +Merge made by the 'recursive' strategy. + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + include/linux/mm.h | 4 +-- + mm/memory.c | 46 +++++++++++++++++---------- + mm/nommu.c | 28 ++++++++++++---- + security/Kconfig | 13 ++++++++ + 6 files changed, 68 insertions(+), 27 deletions(-) +Merging rust/rust-next (98898dfbdf72 Rust support) +$ git merge rust/rust-next +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Auto-merging .gitignore +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 16e49e676906] Merge remote-tracking branch 'rust/rust-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 2 + + .rustfmt.toml | 1 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 9 + + Documentation/rust/arch-support.rst | 23 ++ + Documentation/rust/coding.rst | 92 +++++ + Documentation/rust/docs.rst | 109 ++++++ + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 191 ++++++++++ + MAINTAINERS | 12 + + Makefile | 143 ++++++- + arch/arm64/rust/target.json | 40 ++ + arch/x86/rust/target.json | 42 ++ + drivers/char/Kconfig | 12 + + drivers/char/Makefile | 2 + + drivers/char/rust_example.rs | 164 ++++++++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 27 ++ + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 100 +++++ + rust/.gitignore | 5 + + rust/Makefile | 142 +++++++ + rust/compiler_builtins.rs | 135 +++++++ + rust/exports.c | 17 + + rust/helpers.c | 65 ++++ + rust/kernel/allocator.rs | 68 ++++ + rust/kernel/bindings.rs | 21 + + rust/kernel/bindings_helper.h | 16 + + rust/kernel/buffer.rs | 39 ++ + rust/kernel/c_types.rs | 129 +++++++ + rust/kernel/chrdev.rs | 144 +++++++ + rust/kernel/error.rs | 103 +++++ + rust/kernel/file_operations.rs | 517 +++++++++++++++++++++++++ + rust/kernel/lib.rs | 144 +++++++ + rust/kernel/miscdev.rs | 97 +++++ + rust/kernel/module_param.rs | 479 +++++++++++++++++++++++ + rust/kernel/prelude.rs | 18 + + rust/kernel/printk.rs | 85 +++++ + rust/kernel/random.rs | 50 +++ + rust/kernel/static_assert.rs | 38 ++ + rust/kernel/sync/condvar.rs | 137 +++++++ + rust/kernel/sync/guard.rs | 82 ++++ + rust/kernel/sync/locked_by.rs | 112 ++++++ + rust/kernel/sync/mod.rs | 66 ++++ + rust/kernel/sync/mutex.rs | 101 +++++ + rust/kernel/sync/spinlock.rs | 108 ++++++ + rust/kernel/sysctl.rs | 188 +++++++++ + rust/kernel/types.rs | 73 ++++ + rust/kernel/user_ptr.rs | 267 +++++++++++++ + rust/module.rs | 677 +++++++++++++++++++++++++++++++++ + scripts/Makefile.build | 19 + + scripts/Makefile.lib | 15 +- + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +++- + scripts/rust-version.sh | 31 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 63 files changed, 5289 insertions(+), 34 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/char/rust_example.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + 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/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/printk.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/static_assert.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/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/module.rs + create mode 100755 scripts/rust-version.sh +Merging akpm-current/current (f466a65c17d8 mm, page_alloc: avoid page_to_pfn() in move_freepages()) +$ git merge --no-ff akpm-current/current +Auto-merging mm/vmalloc.c +Auto-merging mm/util.c +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/page-writeback.c +Auto-merging mm/oom_kill.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/up.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/irq/timings.c +Auto-merging kernel/irq/matrix.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/irq/chip.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cred.h +Auto-merging fs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/reflink.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/block_dev.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/mm/init_64.c +CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution. +Resolved 'arch/x86/mm/init_64.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 06b7cfd32339] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 + + Documentation/admin-guide/kdump/kdump.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 36 + + Documentation/admin-guide/mm/memory-hotplug.rst | 9 + + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 107 ++- + Documentation/core-api/mm-api.rst | 1 + + Documentation/dev-tools/gdb-kernel-debugging.rst | 2 +- + Documentation/dev-tools/kasan.rst | 345 ++++---- + Documentation/filesystems/proc.rst | 37 +- + Documentation/vm/page_owner.rst | 2 +- + arch/Kconfig | 31 + + arch/arm/include/asm/bug.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 2 - + arch/arm/include/asm/pgtable.h | 3 + + arch/arm/kernel/process.c | 11 + + arch/arm/kernel/traps.c | 1 + + arch/arm/mm/copypage-v4mc.c | 1 + + arch/arm/mm/copypage-v6.c | 1 + + arch/arm/mm/copypage-xscale.c | 1 + + arch/arm64/Kconfig | 4 + + arch/arm64/include/asm/memory.h | 4 +- + arch/arm64/include/asm/mte-kasan.h | 39 +- + arch/arm64/include/asm/vmalloc.h | 24 + + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/mm/hugetlbpage.c | 7 +- + arch/arm64/mm/mmu.c | 26 - + arch/csky/abiv1/cacheflush.c | 1 + + arch/ia64/Kconfig | 6 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/kernel/fsys.S | 4 +- + arch/ia64/kernel/head.S | 1 - + arch/ia64/mm/hugetlbpage.c | 3 +- + arch/mips/mm/cache.c | 1 + + arch/mips/mm/hugetlbpage.c | 4 +- + arch/nios2/mm/cacheflush.c | 1 + + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/powerpc/Kconfig | 7 +- + arch/powerpc/include/asm/vmalloc.h | 20 + + arch/powerpc/kernel/module.c | 22 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 21 - + arch/powerpc/mm/hugetlbpage.c | 3 +- + arch/s390/mm/hugetlbpage.c | 2 +- + arch/sh/include/asm/tlb.h | 10 +- + arch/sh/mm/cache-sh4.c | 1 + + arch/sh/mm/cache-sh7705.c | 1 + + arch/sh/mm/hugetlbpage.c | 2 +- + arch/sparc/include/asm/pgtable_32.h | 3 + + arch/sparc/mm/hugetlbpage.c | 2 +- + arch/sparc/mm/tlb.c | 1 + + arch/x86/Kconfig | 4 + + arch/x86/include/asm/vmalloc.h | 20 + + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/mm/init_64.c | 203 +++-- + arch/x86/mm/ioremap.c | 19 - + arch/x86/mm/pat/set_memory.c | 8 + + arch/x86/mm/pgtable.c | 13 - + block/blk-cgroup.c | 17 +- + block/blk-settings.c | 1 + + drivers/acpi/acpi_memhotplug.c | 5 +- + drivers/base/firmware_loader/main.c | 2 + + drivers/base/memory.c | 20 +- + drivers/block/brd.c | 1 + + drivers/block/loop.c | 1 + + drivers/infiniband/core/umem.c | 12 +- + drivers/md/bcache/super.c | 1 + + drivers/nvdimm/btt.c | 1 + + drivers/nvdimm/pmem.c | 1 + + drivers/scsi/scsicam.c | 1 + + fs/aio.c | 9 +- + fs/block_dev.c | 2 +- + fs/btrfs/compression.c | 5 +- + fs/btrfs/extent_io.c | 22 +- + fs/btrfs/inode.c | 33 +- + fs/btrfs/reflink.c | 6 +- + fs/btrfs/zlib.c | 5 +- + fs/btrfs/zstd.c | 5 +- + fs/buffer.c | 56 +- + fs/dax.c | 8 +- + fs/fat/fatent.c | 2 +- + fs/gfs2/glock.c | 3 +- + fs/hugetlbfs/inode.c | 6 +- + fs/inode.c | 2 +- + fs/iomap/direct-io.c | 24 +- + fs/ocfs2/blockcheck.c | 2 +- + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 4 +- + fs/proc/fd.c | 20 +- + fs/proc/page.c | 40 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/task_mmu.c | 3 + + fs/userfaultfd.c | 149 +++- + include/linux/async.h | 1 - + include/linux/blkdev.h | 1 - + include/linux/compaction.h | 1 - + include/linux/compat.h | 1 - + include/linux/compiler-gcc.h | 8 +- + include/linux/cred.h | 1 - + include/linux/fs.h | 4 +- + include/linux/gfp.h | 21 +- + include/linux/highmem.h | 35 +- + include/linux/hugetlb.h | 25 +- + include/linux/init_task.h | 1 - + include/linux/initrd.h | 2 + + include/linux/io.h | 9 - + include/linux/kasan.h | 53 +- + include/linux/memcontrol.h | 165 ++-- + include/linux/memory.h | 8 +- + include/linux/memory_hotplug.h | 21 +- + include/linux/memremap.h | 8 +- + include/linux/migrate.h | 1 + + include/linux/mm.h | 29 +- + include/linux/mmzone.h | 18 +- + include/linux/page-flags-layout.h | 62 +- + include/linux/pagemap.h | 15 + + include/linux/pgtable.h | 12 + + include/linux/sched.h | 10 +- + include/linux/sched/mm.h | 27 +- + include/linux/shmem_fs.h | 26 +- + include/linux/shrinker.h | 7 +- + include/linux/swap.h | 8 + + include/linux/userfaultfd_k.h | 49 +- + include/linux/vm_event_item.h | 8 + + include/linux/vmalloc.h | 46 + + include/linux/vmstat.h | 24 +- + include/linux/wait.h | 4 +- + include/trace/events/kmem.h | 24 +- + include/trace/events/migrate.h | 3 +- + include/trace/events/mmflags.h | 7 + + include/uapi/linux/mempolicy.h | 7 + + include/uapi/linux/userfaultfd.h | 38 +- + init/Kconfig | 17 + + init/initramfs.c | 38 +- + init/main.c | 2 +- + kernel/async.c | 66 +- + kernel/cgroup/cgroup.c | 34 +- + kernel/cgroup/rstat.c | 63 +- + kernel/crash_core.c | 7 + + kernel/cred.c | 2 +- + kernel/exit.c | 67 +- + kernel/fork.c | 36 +- + kernel/gcov/Kconfig | 1 + + kernel/gcov/base.c | 49 ++ + kernel/gcov/clang.c | 260 +----- + kernel/gcov/fs.c | 110 +++ + kernel/gcov/gcc_4_7.c | 173 +--- + kernel/gcov/gcov.h | 14 +- + kernel/hung_task.c | 44 + + kernel/kexec_core.c | 2 +- + kernel/kexec_file.c | 4 +- + kernel/kmod.c | 2 +- + kernel/sys.c | 14 +- + kernel/sysctl.c | 10 +- + kernel/task_work.c | 3 + + kernel/umh.c | 8 +- + kernel/up.c | 2 +- + kernel/user_namespace.c | 6 +- + kernel/watchdog.c | 97 ++- + lib/Kconfig.debug | 10 + + lib/Kconfig.kasan | 9 +- + lib/Makefile | 1 + + lib/bch.c | 2 +- + lib/decompress_unlzma.c | 2 +- + lib/iov_iter.c | 8 +- + lib/list_sort.c | 2 +- + lib/test_kasan.c | 4 +- + lib/test_slub.c | 122 +++ + mm/Kconfig | 20 +- + mm/Makefile | 6 +- + mm/cma.c | 20 +- + mm/cma.h | 20 + + mm/cma_sysfs.c | 110 +++ + mm/compaction.c | 13 +- + mm/debug_vm_pgtable.c | 4 +- + mm/dmapool.c | 2 +- + mm/filemap.c | 83 +- + mm/frontswap.c | 12 +- + mm/gup.c | 291 ++++--- + mm/gup_test.c | 29 +- + mm/gup_test.h | 3 +- + mm/highmem.c | 11 +- + mm/huge_memory.c | 134 ++- + mm/hugetlb.c | 246 ++++-- + mm/hugetlb_cgroup.c | 1 - + mm/internal.h | 4 +- + mm/interval_tree.c | 2 +- + mm/ioremap.c | 225 +---- + mm/kasan/common.c | 47 +- + mm/kasan/generic.c | 12 +- + mm/kasan/kasan.h | 23 +- + mm/kasan/report_generic.c | 4 +- + mm/kasan/shadow.c | 10 +- + mm/kasan/sw_tags.c | 2 +- + mm/kfence/core.c | 1 + + mm/khugepaged.c | 45 +- + mm/list_lru.c | 6 +- + mm/memcontrol.c | 581 +++++-------- + mm/memory.c | 94 +- + mm/memory_hotplug.c | 159 +++- + mm/mempolicy.c | 80 +- + mm/mempool.c | 6 +- + mm/memremap.c | 22 +- + mm/migrate.c | 2 +- + mm/mlock.c | 4 +- + mm/mm_init.c | 4 - + mm/mmap.c | 18 +- + mm/mremap.c | 3 +- + mm/msync.c | 6 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 9 +- + mm/page_alloc.c | 206 +++-- + mm/page_owner.c | 12 +- + mm/process_vm_access.c | 1 - + mm/shmem.c | 96 +- + mm/slab.c | 45 +- + mm/slab.h | 18 +- + mm/slub.c | 177 ++-- + mm/sparse.c | 2 +- + mm/swap_state.c | 17 +- + mm/swapfile.c | 4 +- + mm/truncate.c | 19 +- + mm/userfaultfd.c | 62 +- + mm/util.c | 36 +- + mm/vmalloc.c | 497 +++++++++-- + mm/vmscan.c | 406 ++++++--- + mm/vmstat.c | 35 +- + mm/workingset.c | 1 - + mm/zswap.c | 2 +- + samples/vfio-mdev/mdpy.c | 4 +- + scripts/Makefile.kasan | 10 +- + scripts/gdb/linux/cpus.py | 23 +- + scripts/gdb/linux/symbols.py | 3 +- + scripts/spelling.txt | 3 + + security/Kconfig.hardening | 4 +- + tools/testing/selftests/cgroup/test_kmem.c | 22 +- + tools/testing/selftests/kvm/lib/sparsebit.c | 1 - + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/config | 1 + + tools/testing/selftests/lib/slub.sh | 3 + + tools/testing/selftests/mincore/mincore_selftest.c | 1 - + tools/testing/selftests/powerpc/mm/tlbie_test.c | 1 - + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/gup_test.c | 36 +- + tools/testing/selftests/vm/split_huge_page_test.c | 313 +++++++ + tools/testing/selftests/vm/userfaultfd.c | 962 ++++++++++----------- + 246 files changed, 5475 insertions(+), 3613 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cma + create mode 100644 lib/test_slub.c + create mode 100644 mm/cma_sysfs.c + create mode 100644 tools/testing/selftests/lib/slub.sh + create mode 100644 tools/testing/selftests/vm/split_huge_page_test.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/9)
Rebasing (2/9)
Rebasing (3/9)
Rebasing (4/9)
Rebasing (5/9)
Rebasing (6/9)
Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8c233162c2ac...70a8df67d31f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (70a8df67d31f secretmem: test: add basic selftest for memfd_secret(2)) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/kfence.h | 2 +- + arch/arm64/include/asm/set_memory.h | 17 ++ + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/machine_kexec.c | 1 + + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/mm/pageattr.c | 23 ++- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/mm/pageattr.c | 8 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/mm/pat/set_memory.c | 8 +- + fs/dax.c | 11 +- + include/linux/pgtable.h | 3 + + include/linux/secretmem.h | 30 +++ + include/linux/set_memory.h | 16 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/magic.h | 1 + + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys_ni.c | 2 + + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/gup.c | 10 + + mm/internal.h | 3 + + mm/mlock.c | 3 +- + mm/mmap.c | 5 +- + mm/secretmem.c | 261 ++++++++++++++++++++++++++ + mm/vmalloc.c | 5 +- + scripts/checksyscalls.sh | 4 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++++++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 17 ++ + 39 files changed, 726 insertions(+), 53 deletions(-) + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/linux/secretmem.h + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c +$ git am -3 ../patches/0001-Revert-kernel-doc-better-handle-sequences.patch +Applying: Revert "kernel-doc: better handle '::' sequences" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..78434d05658f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210326 |