diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-25 15:39:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-25 15:39:40 +1100 |
| commit | 7f206cf3ec2bee4621325cfacb2588e5085c07f5 (patch) | |
| tree | 48f5eed2c9af0bcf4524e60c1cec08e84738475e | |
| parent | 03c43ce18b23234ee4c91bfe2036e1375812b336 (diff) | |
| download | linux-next-next-20210225.tar.gz | |
Add linux-next specific files for 20210225next-20210225
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 334 | ||||
| -rw-r--r-- | Next/Trees | 336 | ||||
| -rw-r--r-- | Next/merge.log | 4206 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4877 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..94c3fda5e701 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,334 @@ +Name SHA1 +---- ---- +origin 062c84fccc4444805738d76a2699c4d3c95184ec +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f +arc-current 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +arm-current 4d62e81b60d4025e2dfcd5ea531cc1394ce9226f +arm64-fixes 430251cc864beb11ac5b6d2f5c6ef54ddd432612 +arm-soc-fixes 090e502e4e63c608ef8497d295feeb9743ef67b7 +drivers-memory-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +m68k-current c396dd2ec5bbd1cb80eafe32a72ab6bd6b17cb5a +powerpc-fixes f40ddce88593482919761f74910f42f4b84c004b +s390-fixes f40ddce88593482919761f74910f42f4b84c004b +sparc 062c84fccc4444805738d76a2699c4d3c95184ec +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2 +bpf 557c223b643a35effec9654958d8edc62fd2603a +ipsec 8fc0e3b6a8666d656923d214e4dc791e9a17164a +netfilter 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 +ipvs 44a674d6f79867d5652026f1cc11f7ba8a390183 +wireless-drivers 4538c5ed0f7e892f1b643472e48146757d1e60c5 +mac80211 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 +rdma-fixes 1048ba83fb1c00cd24172e23e8263972f6b5d9ac +sound-current c4294d7f057d05053412ebd0d5700228d0f2588d +sound-asoc-fixes 886fbd78319f930f9be48d6e3882b93e73019dcf +regmap-fixes 19c329f6808995b142b3966301f217c831e7cf31 +regulator-fixes 4a8a7d2512014eaf533ff6091e7a1c90d5ffd551 +spi-fixes 21b49223c0f5eedf57bd99766d0e38d236e9da0f +pci-current 7e69d07d7c3c7a8ed69ff10a6fa65afa7c56685c +driver-core.current 719bbd4a509f403f537adcaefd8ce17532be2e84 +tty.current 3b9cdafb5358eb9f3790de2f728f765fef100731 +usb.current 3b9cdafb5358eb9f3790de2f728f765fef100731 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes 92bf22614b21a2706f4993b278017e437f7785b3 +usb-chipidea-fixes 491b1bea00040233b791dc8fea1608ac6a7003bc +phy 9a8b9434c60f40e4d2603c822a68af6a9ca710df +staging.current c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +char-misc.current 719bbd4a509f403f537adcaefd8ce17532be2e84 +soundwire-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +thunderbolt-fixes f40ddce88593482919761f74910f42f4b84c004b +input-current 1bff77f41a805b16b5355497c217656711601282 +crypto-current 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 7a6eb7c34a78498742b5f82543b7a68c1c443329 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes b6c14d7a83802046f7098e9bae78fbde23affa74 +backlight-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +mtd-fixes b135b3358d73aa2a8b2be35d08e422421d1c609e +mfd-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +v4l-dvb-fixes ef357e02b6c420dc2d668ebf3165838c77358acd +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 7b490a8ab0f2d3ab8d838a4ff22ae86edafd34a1 +at91-fixes 16457a528e6343049724a84d0af419d8b5dec2eb +omap-fixes 9bbce32a20d6a72c767a7f85fd6127babd1410ac +kvm-fixes 031b91a5fe6f1ce61b7617614ddde9ed61e252be +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 4008bc7d39537bb3be166d8a3129c4980e1dd7dc +nvdimm-fixes 7018c897c2f243d4b5f1b94bc6b4831a7eab80fb +btrfs-fixes 08b609a13e80452114012ae1c9371e87e578b0a4 +vfs-fixes d36a1dd9f77ae1e72da48f4123ed35627848507d +dma-mapping-fixes d17405d52bacd14fe7fdbb10c0434934ea496914 +i3c-fixes 291b5c9870fc546376d69cf792b7885cd0c9c1b3 +drivers-x86-fixes 215164bfb7144c5890dd8021ff06e486939862d4 +samsung-krzk-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-samsung-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +devicetree-fixes 201158f866dddb75bbfec437424ed2fad52b652f +scsi-fixes f852c596f2ee6f0eb364ea8f28f89da6da0ae7b5 +drm-fixes f40ddce88593482919761f74910f42f4b84c004b +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f40ddce88593482919761f74910f42f4b84c004b +mmc-fixes d7fb9c24209556478e65211d7a1f056f2d43cceb +rtc-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +gnss-fixes 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +hyperv-fixes fff7b5e6ee63c5d20406a131b260c619cdd24fd1 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 3da3cc1b5f47115b16b5ffeeb4bf09ec331b0164 +pidfd-fixes a409ed156a90093a03fe6a93721ddf4c591eac87 +fpga-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +spdx c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +gpio-brgl-fixes f40ddce88593482919761f74910f42f4b84c004b +gpio-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2b8fdbbf1c616300312f71fe5b21fe8f03129950 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes 135d48d516bd528cf68331b427ed01024f0ecf2b +drm-misc-fixes 54dab3a718f7094532daf7d25cd14121a0e00e34 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 481083ec0bfc14c15f00fbe87c7b06dc01091950 +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping 3dc47131f8aacc2093f68a9971d24c754e435520 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm 1afb7e6348aa0b87437e2078f8f7aad9732bd3f7 +arm64 1ffa9763828cf73a4d4eaa04c29a4a89fb0708c7 +arm-perf f0c140481d1b807217cacdcf11d24cfa407a7a53 +arm-soc e6c44b8c57c95131a217170b982531cd14556da8 +actions 006828d706fda3c729ccc32e3e6ecda6dd05b299 +amlogic 9faeb18107d174a0701404b7798b5a3d6cc03f7a +aspeed 697dabd5d3700e23d8cbd86e4cb8a49744766b48 +at91 9639bdcf895463829fa88468fb69246c716b29fb +drivers-memory 5c289c7fae29d0e6c1f9b72f669bb4720121eed4 +imx-mxs 7535d59c5f11270e33c9ca425ae98ec461b55599 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek e6468af3b590a8d3970cf17fce3f58ab8f465f22 +mvebu 8e03d45cb7de0258f357fbfb2c0e6c5fd9c1d364 +omap 01e73147cbf8160cc395a78d00fd1c345053fbc5 +qcom d79b47c59576a51d8e288a6b98b75ccf4afb8acd +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas fc6f3211612623ac6266ad99c5b0b2830f9f048a +reset d17655759b3fc660ea49bd7be665c193030c77c0 +rockchip 38051549ac387948eb3819af47a3fe909640428e +samsung-krzk da2f247fcbf421c923e9ab0ade3efb98d3ba3549 +scmi f40ddce88593482919761f74910f42f4b84c004b +stm32 a9c92a9671d7e1fc4fdba7c6eb868a37242838f0 +sunxi a352e9e72aa3f8d8fbb3c81b76596dba4d5d1195 +tegra b62f4a3fbb22f2e8f3422366a3a6f48faa7ed867 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new e37eac10bb5d084d81c8f94273f506d51ec7e431 +clk 4d5c4ae32945ac86cf68740a2236205b333d5a66 +clk-renesas 24ece96554a963d5eab597be7d65a1812d854d10 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky 9d986b01feb991ded3fb8c1f8153a0c80ea84b9c +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +m68k c396dd2ec5bbd1cb80eafe32a72ab6bd6b17cb5a +m68knommu c1fb1bf64bb63a1d6ae3311a9a3581a527c1f185 +microblaze 48783be427c70a377c83a17d045eee98c90220da +mips 057a14d610cfd671df9c9044224f34e553cd7041 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 8f722f67452f4b28cd8d7acf1658daa5796437c2 +parisc-hd f40ddce88593482919761f74910f42f4b84c004b +powerpc 82d2c16b350f72aa21ac2a6860c542aa4b43a51e +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v d7fbcf40df86bb67193d9faf52138fc1202decb2 +s390 cf6acb8bdb1d829b85a4daa2944bf9e71c93f4b9 +sh b89bc060b53e7054e5c8ca11feea4bc884d83611 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ddad5187fc2a12cb84c9d1ac8ecb816708a2986b +xtensa 7b79eba1d0d186de94ba661c499326e1b6071be5 +pidfd f69e8091c4a2ae291e1f55225e8116fef05dc156 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 32685453751f3c64735d4d3fd82309aad886184c +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 191e697796c2eab1bbd2c7838cf114a754bf17c3 +ceph 558b4510f622a3d96cf9d95050a04e7793d343c7 +cifs c494a7f5f29ab29b647bac8ac31b56c45af2c319 +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs ce063129181312f8781a047a50be439c5859747b +exfat b12b47249688915e987a9a2a393b522f86f6b7ab +ext3 c5b8ccc3da766549a4464b6a30cec755c2a1d393 +ext4 0a76945fd1ba2ab44da7b578b311efdfedf92e6c +f2fs c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 5d069dbe8aaf2a197142558b6fb2978189ba3454 +jfs c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +nfs 92bf22614b21a2706f4993b278017e437f7785b3 +nfs-anna 7ae017c7322e2b12472033e65a48aa25cde2fb22 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel f1dc78fb9a135ff4109696dc15b88a33202a6a66 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs 42119dbe571eb419dae99b81dd20fa42f47464e1 +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs 1cd738b13ae9b29e03d6149f0246c61f76e81fcf +zonefs 059c01039c0185dbee7ed080f1f2bd22cb1e4dab +iomap ed1128c2d0c87e5ff49c40f5529f06bc35f4251b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cc4a3f885e8f2bc3c86a265972e94fef32d68f67 +vfs 934ada4633ef0ff604f4294a6a360c7dbe22c494 +printk f78dd21aa363bdfa2df8940649e133571d3eebe3 +pci e18fb64b79860cf5f381208834b8fbc493ef7cbc +pstore 9c7d83ae6ba67d6c6199cce24573983db3b56332 +hid 914fe0466c863dbc9a9c08dffbfdb708bcb13105 +i2c 35ea257a39ae91c6d52e12abacbb4c779bc87204 +i3c 5c34b8e7e8bb605925b33e1aa7dc17966811219a +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 6ab3332cc692ad04dfa30c92d3391aea8b971ef2 +jc_docs c418eed8c3b73b2cc5ed3da1f074a421372fded2 +v4l-dvb 8f202f8e9ff38e29694a4bc0a519b4e03c1726ee +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm aa22459146987c639004f1fe5a30fe95743c1a1c +cpufreq-arm 67fc209b527d023db4d087c68e44e9790aa089ef +cpupower 3a3ecfdb605cc8d98988012a4f88c34b4d220c21 +devfreq fc1745c0e40cfc98c0bc466b95ddedf28e5019b4 +opp de04241ab87afcaac26f15fcc32a7bd27294dd47 +thermal a51afb13311cd85b2f638c691b2734622277d8f5 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb 47cfc5be19344c1ba5c01ca7a9cff804e9944fbc +rdma 7289e26f395b583f68b676d4d12a0971e4f6f65c +net-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +bpf-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +ipsec-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +mlx5-next 432119de33d9013467371fc85238d623f64ff67e +netfilter-next 38b5133ad607ecdcc8d24906d1ac9cc8df41acd5 +ipvs-next a61e4b60761fa7fa2cfde6682760763537ce5549 +wireless-drivers-next 773dc50d71690202afd7b5017c060c6ca8c75dd9 +bluetooth d310ec03a34e92a77302edb804f7d68ee4f01ba0 +mac80211-next 38b5133ad607ecdcc8d24906d1ac9cc8df41acd5 +gfs2 f6e1e1d1e149802ed4062fa514c2d184d30aacdf +mtd 6e9dff6fe3fbc452f16566e4a7e293b0decefdba +nand 073abfa7ea9a5b0537d6f92b42baedaf82a04c53 +spi-nor 75386810d3a61f4bb9e180774291454f7235b8b3 +crypto 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +drm 12458e351799e06967932dd58981fc7a48a15cbc +drm-misc 583065c7aa23d4bb0c298222c1128353a2007c9c +amdgpu 0de5c1dcd3809cbdc6a3808e4b7657276b6ca978 +drm-intel ed428ffc28521b9f1b6a71584d1875318a122859 +drm-tegra dcdfe2712b68f1e9dbf4f1a96ad59b80e5cc0ef7 +drm-msm 8490f02a3ca45fd1bbcadc243b4db9b69d0e3450 +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap aa3233086b48e5269cd0b5c16fb9711ce9341244 +sound c4294d7f057d05053412ebd0d5700228d0f2588d +sound-asoc 886fbd78319f930f9be48d6e3882b93e73019dcf +modules 1e80d9cb579ed7edd121753eeccce82ff82521b4 +input 4c47097f8514e4b35a31e04e33172d0193cb38ed +block 226fc5e811e1cc4a89c166f8b3098e1b67ba6257 +device-mapper a666e5c05e7c4aaabb2c5d58117b0946803d03d2 +pcmcia 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 +mmc a56f44138a2c57047f1ea94ea121af31c595132b +mfd 26783d74cc6a440ee3ef9836a008a697981013d0 +backlight 0b5e0f45af403cb6e9df574e1cb52691611dc0b8 +battery a72acc56f3e939b9e10f2dd460ac1e4519de621f +regulator 4a8a7d2512014eaf533ff6091e7a1c90d5ffd551 +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity f6692213b5045dc461ce0858fb18cf46f328c202 +keys 5bcd72358a7d7794ade0452ed12919b8c4d6ffc7 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 365982aba1f264dba26f0908700d62bfa046918c +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo 31caf8b2a847214be856f843e251fc2ed2cd1075 +tpmdd c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +watchdog a4f3407c41605d14f09e490045d0609990cd5d94 +iommu 45e606f2726926b04094e1c9bf809bca4884c57f +audit 127c8c5f0589cea2208c329bff7dcb36e375f46c +devicetree cb8be8b4b27f6eea88268d6991175df1a27e557e +mailbox 6b50df2b8c208a04d44b8df5b7baaf668ceb8fc3 +spi 21b49223c0f5eedf57bd99766d0e38d236e9da0f +tip 2126d722fe93be10880b3ee5c1593137ea801d06 +clockevents e85c1d21b16b278f50d191155bc674633270e9c6 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip c83fd57be3fefa1522e7381f044fe0b702cbc6ad +ftrace e23db805da2dfc39e5281b5efd3e36d132aa83af +rcu c8c430f4a2fb91b9804ed2f749364fc0dcd663fe +kvm 8c6e67bec3192f16fa624203c8131e10cc4814ba +kvm-arm c93199e93e1232b7220482dffa05b7a32a195fe8 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 50a05be484cb70d9dfb55fa5a6ed57eab193901f +xen-tip 53f131c284e83c29c227c0938926a82b2ed4d7ba +percpu df1c002198a80b89b8b18ccf219456d95483d4a1 +workqueues e9ad2eb3d9ae05471c9b9fafcc0a31d8f565ca5b +drivers-x86 a7d53dbbc70a81d5781da7fc905b656f41ad2381 +chrome-platform b996c10e0f5b2cfd5b2cbf048cce83982bfe662d +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds b0a82efa51ad3ba1117817817cbabe9c9a37b893 +ipmi fc26067c7417e7fafed7bcc97bda155d91988734 +driver-core 719bbd4a509f403f537adcaefd8ce17532be2e84 +usb 3b9cdafb5358eb9f3790de2f728f765fef100731 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 1542d1324be1191d970f69c55e885af5dd810b84 +usb-chipidea-next 1ee18ded86ece87227a76d7101034fd305b8c803 +tty 3b9cdafb5358eb9f3790de2f728f765fef100731 +char-misc 719bbd4a509f403f537adcaefd8ce17532be2e84 +extcon bb512233bffe4082fb147f89bdb2893f59d8395b +phy-next d68f2cb095979dff1c99e7803c7730ec2b53fc83 +soundwire 8d8d958428674518cef083cd97e535ac5ac9f9d8 +thunderbolt c6da62a219d028de10f2e22e93a34c7ee2b88d03 +vfio 4d83de6da265cd84e74c19d876055fa5f261cde4 +staging c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 6715ea06ced45c8910c878877722ccf502301499 +dmaengine eda38ce482b2c88b27e3a7c8aa1ddffa646f3e7f +cgroup 00bfa16052cd66855de9bee66d7a5468f4fdc850 +scsi 89263dedffa2911f9c4e9cd73b81a607a9041570 +scsi-mkp f749d8b7a9896bc6e5ffe104cc64345037e0b152 +vhost 2ec759d2fc934633b1a2e5582e5be7b394156ab1 +rpmsg fcb4c469244ba9934c3594755b04aca79efc5932 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl a8002a35935aaefcd6a42ad3289f62bab947f2ca +gpio-intel c5318e248f527fc8753e361bb61439f4e0c6d745 +pinctrl b40b760aa2a9587cdcde62759642b4e99c40dedc +pinctrl-intel 0e793a4e283487378e9a5b7db37bc1781bc72fd7 +pinctrl-renesas a5cda861ed57710837bc560a3c715160da710555 +pinctrl-samsung 5c8fe583cce542aa0b84adc939ce85293de36e5e +pwm 9a9dd7e473517b68412fd2da3da8a4aeb4ecb38a +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest e0c0840a46db9d50ba7391082d665d74f320c39f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 81840f21d4164e0db5162ccc736c65b369883cc9 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 49dfc1f16b03a6abc17721d4600f7a0bf3d3e4ed +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 5366c48f327ec9e0261333a876384a26da91c854 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a381b70a1cf88e4a2d54f24d59abdcad0ff2dfe6 +kspp 414eece95b98b209cef0f49cfcac108fd00b8ced +gnss 45d5996e034cd5fc20ab0489e3179a6dfe44ca44 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 667fbb3fcde1eb9f4cd8d6bdc0a20435b718fb77 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv 3019270282a175defc02c8331786c73e082cd2a8 +auxdisplay b45616445a6e346daf8a173a0c51413aec067ebb +kgdb f11e2bc682cc197e33bfd118178cadb61326dc0e +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga e41d4c011706c97f2faea6ef2e46e51f52d8f715 +kunit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 7af29141a31a2a2350589471c8979ff5f22fb9b7 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 9e04adfcab788baa51c31c8157b710d8faffe93b +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup 636b21b50152d4e203223ee337aca1cb3c1bfe53 +oprofile-removal be65de6b03aa638c46ea51e9d11a92e4914d8103 +akpm-current 2e862ce7025be71feefadb51e4e7fbab33c69c4b +akpm c80e4b3413a6bf717bf6215e6213ecfbb6fe8202 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7bd469ebd99f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,336 @@ +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-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 +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 +oprofile-removal git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git#oprofile/removal +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..8ad315d8e9a8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4206 @@ +$ date -R +Thu, 25 Feb 2021 09:24:51 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5cf0fd591f2e Kbuild: disable TRIM_UNUSED_KSYMS option +Merging origin/master (062c84fccc44 Merge tag 'rproc-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc) +$ git merge origin/master +Updating 5cf0fd591f2e..062c84fccc44 +Fast-forward + .clang-format | 1 + + CREDITS | 8 +- + Documentation/ABI/stable/sysfs-bus-fsl-mc | 19 + + Documentation/ABI/stable/sysfs-driver-speakup | 37 +- + .../ABI/testing/debugfs-driver-habanalabs | 50 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 8 + + Documentation/ABI/testing/sysfs-bus-cxl | 26 + + .../ABI/testing/sysfs-bus-dfl-devices-emif | 25 + + .../ABI/testing/sysfs-bus-dfl-devices-n3000-nios | 47 + + .../ABI/testing/sysfs-bus-pci-devices-pvpanic | 24 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 58 +- + .../ABI/testing/sysfs-driver-input-cros-ec-keyb | 6 + + Documentation/ABI/testing/sysfs-firmware-sfi | 15 - + Documentation/ABI/testing/sysfs-platform-kim | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/admin-guide/spkguide.txt | 48 +- + Documentation/core-api/dma-api.rst | 64 +- + .../devicetree/bindings/arm/coresight.txt | 5 +- + .../bindings/display/mediatek/mediatek,dsi.txt | 18 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 18 +- + .../devicetree/bindings/dma/ingenic,dma.yaml | 2 + + .../devicetree/bindings/dma/intel,ldma.yaml | 116 + + Documentation/devicetree/bindings/dma/owl-dma.yaml | 7 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 76 +- + .../devicetree/bindings/dma/sirfsoc-dma.txt | 44 - + .../devicetree/bindings/dma/snps,dw-axi-dmac.txt | 39 - + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 126 + + .../devicetree/bindings/dma/ste-coh901318.txt | 32 - + Documentation/devicetree/bindings/dma/zxdma.txt | 38 - + .../bindings/hwlock/ti,omap-hwspinlock.yaml | 1 + + .../devicetree/bindings/input/goodix,gt7375p.yaml | 65 + + .../bindings/input/google,cros-ec-keyb.yaml | 24 + + .../bindings/interconnect/qcom,qcs404.yaml | 77 - + .../{qcom,msm8916.yaml => qcom,rpm.yaml} | 22 +- + .../bindings/interconnect/qcom,rpmh.yaml | 4 + + .../devicetree/bindings/mailbox/omap-mailbox.txt | 4 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 34 + + .../devicetree/bindings/misc/eeprom-93xx46.txt | 1 + + Documentation/devicetree/bindings/nvmem/rmem.yaml | 49 + + .../bindings/phy/brcm,brcmstb-usb-phy.txt | 86 - + .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 196 ++ + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 85 + + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 92 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 260 ++ + .../devicetree/bindings/phy/mediatek,ufs-phy.yaml | 64 + + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 199 ++ + .../devicetree/bindings/phy/phy-mtk-tphy.txt | 162 -- + .../devicetree/bindings/phy/phy-mtk-ufs.txt | 38 - + .../devicetree/bindings/phy/phy-mtk-xsphy.txt | 109 - + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 22 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 97 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 2 + + .../devicetree/bindings/phy/qcom,usb-hs-28nm.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 2 + + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 10 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 +- + .../devicetree/bindings/remoteproc/mtk,scp.txt | 8 +- + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 12 + + .../bindings/remoteproc/qcom,wcnss-pil.txt | 1 + + Documentation/driver-api/cxl/index.rst | 12 + + Documentation/driver-api/cxl/memory-devices.rst | 46 + + Documentation/driver-api/index.rst | 2 +- + Documentation/driver-api/pti_intel_mid.rst | 108 - + Documentation/filesystems/locking.rst | 7 +- + Documentation/filesystems/porting.rst | 2 + + Documentation/filesystems/vfs.rst | 19 +- + Documentation/fpga/dfl.rst | 28 + + Documentation/hid/amd-sfh-hid.rst | 22 +- + Documentation/hid/hid-alps.rst | 4 +- + Documentation/hid/hid-sensor.rst | 18 +- + Documentation/hid/hid-transport.rst | 12 +- + Documentation/hid/hiddev.rst | 10 +- + Documentation/hid/hidraw.rst | 5 +- + Documentation/hid/intel-ish-hid.rst | 78 +- + Documentation/hid/uhid.rst | 34 +- + Documentation/security/keys/core.rst | 4 +- + Documentation/trace/coresight/coresight.rst | 32 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 3 + + Documentation/virt/acrn/cpuid.rst | 46 + + Documentation/virt/acrn/index.rst | 12 + + Documentation/virt/acrn/introduction.rst | 43 + + Documentation/virt/acrn/io-request.rst | 97 + + Documentation/virt/index.rst | 1 + + MAINTAINERS | 56 +- + Makefile | 10 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 93 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/configs/defconfig | 3 +- + arch/arm64/include/asm/sysreg.h | 11 + + 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/nios2/kernel/entry.S | 3 + + arch/nios2/kernel/setup.c | 21 +- + arch/nios2/kernel/sys_nios2.c | 11 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 5 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 + + arch/sparc/configs/sparc64_defconfig | 11 +- + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/cmpxchg_32.h | 2 +- + arch/sparc/include/asm/mman.h | 54 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/include/asm/signal.h | 12 - + arch/sparc/kernel/entry.S | 8 +- + arch/sparc/kernel/led.c | 2 + + arch/sparc/kernel/pci.c | 3 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/rtrap_32.S | 2 +- + arch/sparc/kernel/signal_32.c | 4 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/viohs.c | 6 +- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/init_32.c | 3 + + arch/sparc/mm/srmmu.c | 20 +- + arch/x86/Kconfig | 22 +- + arch/x86/Makefile | 5 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/include/asm/acrn.h | 78 + + arch/x86/include/asm/apb_timer.h | 40 - + arch/x86/include/asm/fixmap.h | 3 - + arch/x86/include/asm/intel-mid.h | 93 +- + arch/x86/include/asm/intel_mid_vrtc.h | 10 - + arch/x86/include/asm/intel_scu_ipc.h | 2 - + arch/x86/include/asm/intel_scu_ipc_legacy.h | 91 - + arch/x86/include/asm/platform_sst_audio.h | 2 - + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/apb_timer.c | 347 --- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/cpu/acrn.c | 16 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/pci/intel_mid_pci.c | 18 +- + arch/x86/pci/mmconfig-shared.c | 6 +- + arch/x86/platform/Makefile | 1 - + arch/x86/platform/intel-mid/Makefile | 7 +- + arch/x86/platform/intel-mid/device_libs/Makefile | 32 - + .../intel-mid/device_libs/platform_bcm43xx.c | 101 - + .../intel-mid/device_libs/platform_bma023.c | 16 - + .../platform/intel-mid/device_libs/platform_bt.c | 101 - + .../intel-mid/device_libs/platform_emc1403.c | 39 - + .../intel-mid/device_libs/platform_gpio_keys.c | 81 - + .../intel-mid/device_libs/platform_lis331.c | 37 - + .../intel-mid/device_libs/platform_max7315.c | 77 - + .../intel-mid/device_libs/platform_mpu3050.c | 32 - + .../intel-mid/device_libs/platform_mrfld_pinctrl.c | 39 - + .../device_libs/platform_mrfld_power_btn.c | 78 - + .../intel-mid/device_libs/platform_mrfld_rtc.c | 44 - + .../intel-mid/device_libs/platform_mrfld_sd.c | 43 - + .../intel-mid/device_libs/platform_mrfld_spidev.c | 50 - + .../platform/intel-mid/device_libs/platform_msic.c | 83 - + .../platform/intel-mid/device_libs/platform_msic.h | 15 - + .../intel-mid/device_libs/platform_msic_audio.c | 42 - + .../intel-mid/device_libs/platform_msic_battery.c | 32 - + .../intel-mid/device_libs/platform_msic_gpio.c | 43 - + .../intel-mid/device_libs/platform_msic_ocd.c | 44 - + .../device_libs/platform_msic_power_btn.c | 31 - + .../intel-mid/device_libs/platform_msic_thermal.c | 32 - + .../intel-mid/device_libs/platform_pcal9555a.c | 95 - + .../intel-mid/device_libs/platform_tc35876x.c | 42 - + .../intel-mid/device_libs/platform_tca6416.c | 53 - + arch/x86/platform/intel-mid/intel-mid.c | 106 +- + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 173 -- + arch/x86/platform/intel-mid/sfi.c | 543 ---- + arch/x86/platform/sfi/sfi.c | 100 - + arch/x86/power/Makefile | 4 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + certs/blacklist.c | 10 +- + certs/system_keyring.c | 5 +- + crypto/asymmetric_keys/asymmetric_type.c | 6 +- + crypto/asymmetric_keys/pkcs7_parser.h | 5 +- + crypto/asymmetric_keys/pkcs7_trust.c | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 9 +- + drivers/Kconfig | 1 + + drivers/Makefile | 3 +- + drivers/accessibility/speakup/serialio.c | 22 +- + drivers/accessibility/speakup/speakup_acntpc.c | 4 +- + drivers/accessibility/speakup/speakup_apollo.c | 4 +- + drivers/accessibility/speakup/speakup_audptr.c | 8 +- + drivers/accessibility/speakup/speakup_decext.c | 2 +- + drivers/accessibility/speakup/speakup_decpc.c | 4 +- + drivers/accessibility/speakup/speakup_dectlk.c | 13 +- + drivers/accessibility/speakup/speakup_dtlk.c | 4 +- + drivers/accessibility/speakup/speakup_keypc.c | 4 +- + drivers/accessibility/speakup/speakup_ltlk.c | 2 +- + drivers/accessibility/speakup/speakup_soft.c | 4 +- + drivers/accessibility/speakup/speakup_spkout.c | 4 +- + drivers/accessibility/speakup/spk_priv.h | 4 +- + drivers/accessibility/speakup/spk_ttyio.c | 185 +- + drivers/accessibility/speakup/spk_types.h | 17 +- + drivers/accessibility/speakup/synth.c | 9 +- + drivers/accessibility/speakup/varhandlers.c | 1 + + drivers/acpi/acpica/acobject.h | 1 + + drivers/acpi/acpica/evhandler.c | 7 + + drivers/acpi/acpica/evregion.c | 69 +- + drivers/acpi/acpica/evxfregn.c | 2 + + drivers/android/binderfs.c | 6 +- + drivers/base/Kconfig | 2 +- + drivers/base/auxiliary.c | 13 +- + drivers/base/base.h | 5 + + drivers/base/bus.c | 19 +- + drivers/base/core.c | 159 +- + drivers/base/devtmpfs.c | 15 +- + drivers/base/init.c | 1 + + drivers/base/platform.c | 11 +- + drivers/base/power/domain.c | 2 + + drivers/base/regmap/regmap-sdw-mbq.c | 10 +- + drivers/base/regmap/regmap-sdw.c | 4 +- + drivers/base/test/Makefile | 1 + + drivers/bus/fsl-mc/Kconfig | 7 + + drivers/bus/fsl-mc/Makefile | 3 + + drivers/bus/fsl-mc/dprc-driver.c | 33 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 104 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 49 + + drivers/bus/fsl-mc/fsl-mc-uapi.c | 597 +++++ + drivers/bus/fsl-mc/mc-sys.c | 2 +- + drivers/bus/mhi/core/init.c | 12 +- + drivers/bus/mhi/core/main.c | 182 +- + drivers/bus/mhi/pci_generic.c | 381 ++- + drivers/char/random.c | 2 +- + drivers/clk/clk.c | 3 + + drivers/cpufreq/Kconfig.x86 | 10 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/acpi-cpufreq.c | 62 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/freq_table.c | 8 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 40 +- + drivers/cpufreq/sfi-cpufreq.c | 127 - + drivers/cxl/Kconfig | 53 + + drivers/cxl/Makefile | 7 + + drivers/cxl/bus.c | 29 + + drivers/cxl/cxl.h | 95 + + drivers/cxl/mem.c | 1552 +++++++++++ + drivers/cxl/pci.h | 31 + + drivers/dax/bus.c | 24 +- + drivers/dax/bus.h | 2 +- + drivers/dax/device.c | 8 +- + drivers/dax/kmem.c | 7 +- + drivers/dax/pmem/compat.c | 3 +- + drivers/dma/Kconfig | 30 +- + drivers/dma/Makefile | 4 +- + drivers/dma/at_hdmac.c | 19 + + drivers/dma/at_hdmac_regs.h | 28 +- + drivers/dma/coh901318.c | 2808 -------------------- + drivers/dma/coh901318.h | 141 - + drivers/dma/coh901318_lli.c | 313 --- + drivers/dma/dma-jz4780.c | 14 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 698 ++++- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 34 +- + drivers/dma/fsldma.c | 6 + + drivers/dma/hsu/pci.c | 21 +- + drivers/dma/idxd/dma.c | 1 + + drivers/dma/idxd/init.c | 11 +- + drivers/dma/imx-sdma.c | 46 +- + drivers/dma/lgm/Kconfig | 10 + + drivers/dma/lgm/Makefile | 2 + + drivers/dma/lgm/lgm-dma.c | 1739 ++++++++++++ + drivers/dma/mmp_pdma.c | 14 - + drivers/dma/owl-dma.c | 4 +- + drivers/dma/qcom/bam_dma.c | 29 +- + drivers/dma/qcom/gpi.c | 4 +- + drivers/dma/sh/rcar-dmac.c | 112 +- + drivers/dma/sirf-dma.c | 1170 -------- + drivers/dma/ste_dma40.c | 2 +- + drivers/dma/ti/k3-udma.c | 131 +- + drivers/dma/xilinx/xilinx_dma.c | 2 +- + drivers/dma/zx_dma.c | 941 ------- + drivers/firewire/core-device.c | 4 +- + drivers/firmware/google/coreboot_table.c | 5 +- + drivers/firmware/google/coreboot_table.h | 2 +- + drivers/firmware/google/framebuffer-coreboot.c | 4 +- + drivers/firmware/google/memconsole-coreboot.c | 4 +- + drivers/firmware/google/vpd.c | 4 +- + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/dfl-fme-perf.c | 6 +- + drivers/fpga/dfl-n3000-nios.c | 588 ++++ + drivers/fpga/dfl-pci.c | 165 +- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/dfl.h | 85 +- + drivers/fpga/fpga-bridge.c | 4 +- + drivers/gpio/gpiolib-of.c | 11 + + drivers/gpio/gpiolib-of.h | 5 + + drivers/gpio/gpiolib.c | 52 +- + drivers/greybus/es2.c | 9 +- + drivers/greybus/greybus_trace.h | 6 +- + drivers/hid/Kconfig | 19 + + drivers/hid/Makefile | 3 +- + drivers/hid/hid-chicony.c | 55 + + drivers/hid/hid-core.c | 9 +- + drivers/hid/hid-google-hammer.c | 85 +- + drivers/hid/hid-ids.h | 11 +- + drivers/hid/hid-input.c | 12 + + drivers/hid/hid-ite.c | 12 +- + drivers/hid/hid-lg-g15.c | 2 +- + drivers/hid/hid-logitech-dj.c | 8 +- + drivers/hid/hid-logitech-hidpp.c | 246 +- + drivers/hid/hid-multitouch.c | 10 + + drivers/hid/hid-playstation.c | 1351 ++++++++++ + drivers/hid/hid-quirks.c | 26 +- + drivers/hid/hid-roccat-arvo.c | 6 +- + drivers/hid/hid-sony.c | 20 +- + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 2 + + drivers/hid/i2c-hid/Kconfig | 47 +- + drivers/hid/i2c-hid/Makefile | 6 +- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 143 + + drivers/hid/i2c-hid/i2c-hid-core.c | 254 +- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 + + drivers/hid/i2c-hid/i2c-hid-of.c | 143 + + drivers/hid/i2c-hid/i2c-hid.h | 22 + + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 + + drivers/hid/intel-ish-hid/ipc/ipc.c | 27 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 55 +- + drivers/hid/wacom_sys.c | 2 +- + drivers/hid/wacom_wac.c | 7 +- + drivers/hwspinlock/omap_hwspinlock.c | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 12 +- + drivers/hwtracing/coresight/coresight-core.c | 122 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 18 +- + .../hwtracing/coresight/coresight-cti-platform.c | 6 +- + drivers/hwtracing/coresight/coresight-etb10.c | 10 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 32 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 9 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 824 ++++-- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 189 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 505 +++- + drivers/hwtracing/coresight/coresight-funnel.c | 7 +- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +- + drivers/hwtracing/coresight/coresight-stm.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 16 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 31 +- + drivers/input/joydev.c | 7 +- + drivers/input/joystick/Kconfig | 7 + + drivers/input/joystick/Makefile | 2 +- + drivers/input/joystick/n64joy.c | 345 +++ + drivers/input/joystick/xpad.c | 1 + + drivers/input/keyboard/Kconfig | 6 +- + drivers/input/keyboard/applespi.c | 23 +- + drivers/input/keyboard/cros_ec_keyb.c | 79 + + drivers/input/keyboard/omap4-keypad.c | 302 ++- + drivers/input/misc/da7280.c | 3 + + drivers/input/mouse/alps.c | 2 +- + drivers/input/mouse/synaptics.c | 7 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 4 + + drivers/input/tablet/aiptek.c | 80 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/ads7846.c | 376 +-- + drivers/input/touchscreen/elants_i2c.c | 151 +- + drivers/input/touchscreen/elo.c | 4 +- + drivers/input/touchscreen/iqs5xx.c | 209 +- + drivers/input/touchscreen/melfas_mip4.c | 8 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 3 +- + drivers/input/touchscreen/st1232.c | 9 +- + drivers/input/touchscreen/stmpe-ts.c | 1 + + drivers/input/touchscreen/sur40.c | 1 + + drivers/input/touchscreen/surface3_spi.c | 2 - + drivers/input/touchscreen/usbtouchscreen.c | 3 + + drivers/input/touchscreen/zinitix.c | 4 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 6 +- + drivers/interconnect/qcom/icc-rpm.c | 191 ++ + drivers/interconnect/qcom/icc-rpm.h | 73 + + drivers/interconnect/qcom/msm8916.c | 241 +- + drivers/interconnect/qcom/msm8939.c | 355 +++ + drivers/interconnect/qcom/qcs404.c | 242 +- + drivers/interconnect/qcom/sdx55.c | 356 +++ + drivers/interconnect/qcom/sdx55.h | 70 + + drivers/iommu/dma-iommu.c | 30 - + drivers/ipack/ipack.c | 11 +- + drivers/mailbox/arm_mhuv2.c | 26 +- + drivers/mailbox/omap-mailbox.c | 6 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 8 +- + drivers/mailbox/sprd-mailbox.c | 2 +- + drivers/mailbox/tegra-hsp.c | 15 + + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 2 + + drivers/memory/dfl-emif.c | 207 ++ + drivers/mfd/Kconfig | 9 - + drivers/mfd/Makefile | 1 - + drivers/mfd/intel_msic.c | 425 --- + drivers/misc/Kconfig | 22 +- + drivers/misc/Makefile | 3 +- + drivers/misc/atmel_tclib.c | 200 -- + drivers/misc/bcm-vk/Kconfig | 29 + + drivers/misc/bcm-vk/Makefile | 12 + + drivers/misc/bcm-vk/bcm_vk.h | 549 ++++ + drivers/misc/bcm-vk/bcm_vk_dev.c | 1652 ++++++++++++ + drivers/misc/bcm-vk/bcm_vk_msg.c | 1357 ++++++++++ + drivers/misc/bcm-vk/bcm_vk_msg.h | 163 ++ + drivers/misc/bcm-vk/bcm_vk_sg.c | 275 ++ + drivers/misc/bcm-vk/bcm_vk_sg.h | 61 + + drivers/misc/bcm-vk/bcm_vk_tty.c | 339 +++ + drivers/misc/cardreader/rts5227.c | 5 + + drivers/misc/cardreader/rtsx_pcr.c | 9 +- + drivers/misc/cxl/sysfs.c | 2 +- + drivers/misc/eeprom/eeprom_93xx46.c | 17 + + drivers/misc/fastrpc.c | 7 +- + drivers/misc/habanalabs/common/Makefile | 10 +- + drivers/misc/habanalabs/common/asid.c | 6 +- + drivers/misc/habanalabs/common/command_buffer.c | 8 +- + .../misc/habanalabs/common/command_submission.c | 473 +++- + drivers/misc/habanalabs/common/context.c | 33 +- + drivers/misc/habanalabs/common/debugfs.c | 43 +- + drivers/misc/habanalabs/common/device.c | 46 +- + drivers/misc/habanalabs/common/firmware_if.c | 157 +- + drivers/misc/habanalabs/common/habanalabs.h | 109 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 25 +- + drivers/misc/habanalabs/common/hw_queue.c | 51 +- + drivers/misc/habanalabs/common/memory.c | 621 +++-- + drivers/misc/habanalabs/common/mmu/Makefile | 2 + + drivers/misc/habanalabs/common/{ => mmu}/mmu.c | 124 +- + drivers/misc/habanalabs/common/{ => mmu}/mmu_v1.c | 4 +- + .../misc/habanalabs/common/pci}/Makefile | 2 +- + drivers/misc/habanalabs/common/{ => pci}/pci.c | 47 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 481 +++- + drivers/misc/habanalabs/gaudi/gaudiP.h | 3 + + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 18 +- + drivers/misc/habanalabs/gaudi/gaudi_security.c | 5 + + drivers/misc/habanalabs/goya/goya.c | 106 +- + drivers/misc/habanalabs/goya/goyaP.h | 1 + + drivers/misc/habanalabs/goya/goya_coresight.c | 11 +- + drivers/misc/habanalabs/goya/goya_security.c | 5 + + drivers/misc/habanalabs/include/common/cpucp_if.h | 14 + + .../misc/habanalabs/include/common/hl_boot_if.h | 19 + + .../habanalabs/include/gaudi/gaudi_async_events.h | 4 + + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 5 +- + .../misc/habanalabs/include/gaudi/gaudi_packets.h | 27 +- + .../habanalabs/include/goya/asic_reg/goya_masks.h | 5 +- + drivers/misc/mei/bus.c | 24 +- + drivers/misc/mei/client.c | 291 +- + drivers/misc/mei/client.h | 8 + + drivers/misc/mei/debugfs.c | 1 + + drivers/misc/mei/hbm.c | 165 +- + drivers/misc/mei/hbm.h | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 7 +- + drivers/misc/mei/hw-me-regs.h | 5 + + drivers/misc/mei/hw.h | 61 + + drivers/misc/mei/init.c | 5 +- + drivers/misc/mei/interrupt.c | 43 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/mei/mei_dev.h | 18 + + drivers/misc/mei/pci-me.c | 5 + + drivers/misc/pti.c | 978 ------- + drivers/misc/pvpanic.c | 59 +- + drivers/misc/sgi-xp/xpnet.c | 4 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 19 +- + drivers/misc/vmw_vmci/vmci_queue_pair.h | 2 +- + drivers/most/core.c | 6 +- + drivers/nfc/microread/mei.c | 4 +- + drivers/nfc/pn544/mei.c | 4 +- + drivers/nvdimm/blk.c | 3 +- + drivers/nvdimm/bus.c | 13 +- + drivers/nvdimm/dimm.c | 7 +- + drivers/nvdimm/pmem.c | 4 +- + drivers/nvdimm/region.c | 4 +- + drivers/nvmem/Kconfig | 8 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 5 +- + drivers/nvmem/imx-iim.c | 7 +- + drivers/nvmem/qcom-spmi-sdam.c | 7 +- + drivers/nvmem/rmem.c | 97 + + drivers/of/platform.c | 1 + + drivers/of/property.c | 59 +- + drivers/opp/core.c | 8 +- + drivers/opp/opp.h | 2 + + drivers/phy/Kconfig | 1 + + drivers/phy/broadcom/Kconfig | 3 +- + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 18 +- + drivers/phy/cadence/phy-cadence-torrent.c | 1 + + drivers/phy/ingenic/phy-ingenic-usb.c | 23 - + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 10 +- + drivers/phy/mediatek/phy-mtk-hdmi.c | 1 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 3 +- + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 430 ++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 147 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 74 +- + drivers/phy/qualcomm/phy-qcom-usb-hs-28nm.c | 13 + + drivers/phy/rockchip/phy-rockchip-emmc.c | 12 +- + drivers/phy/st/phy-stm32-usbphyc.c | 222 +- + drivers/phy/xilinx/phy-zynqmp.c | 11 +- + drivers/platform/goldfish/goldfish_pipe.c | 28 +- + drivers/platform/x86/intel_scu_pcidrv.c | 22 +- + drivers/remoteproc/Kconfig | 25 +- + drivers/remoteproc/ingenic_rproc.c | 7 + + drivers/remoteproc/mtk_common.h | 7 + + drivers/remoteproc/mtk_scp.c | 82 +- + drivers/remoteproc/qcom_q6v5_pas.c | 63 + + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/qcom_wcnss_iris.c | 1 + + drivers/remoteproc/remoteproc_core.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 23 +- + drivers/rpmsg/qcom_glink_ssr.c | 17 +- + drivers/sbus/char/display7seg.c | 4 +- + drivers/sfi/Kconfig | 18 - + drivers/sfi/Makefile | 4 - + drivers/sfi/sfi_acpi.c | 214 -- + drivers/sfi/sfi_core.c | 522 ---- + drivers/sfi/sfi_core.h | 81 - + drivers/soundwire/bus.c | 179 +- + drivers/soundwire/cadence_master.c | 31 +- + drivers/soundwire/intel.c | 8 +- + drivers/soundwire/intel_init.c | 3 +- + drivers/soundwire/slave.c | 10 +- + drivers/soundwire/sysfs_slave.c | 2 +- + drivers/spmi/spmi-pmic-arb.c | 5 +- + .../media/atomisp/include/linux/atomisp_platform.h | 1 - + drivers/staging/vme/devices/vme_user.c | 4 +- + drivers/tty/Makefile | 2 - + drivers/tty/n_tracerouter.c | 235 -- + drivers/tty/n_tracesink.c | 230 -- + drivers/tty/n_tracesink.h | 26 - + drivers/uio/uio_pci_generic.c | 2 +- + drivers/vfio/pci/Kconfig | 12 - + drivers/vfio/pci/Makefile | 2 +- + drivers/vfio/pci/vfio_pci.c | 12 +- + drivers/vfio/pci/vfio_pci_igd.c | 10 +- + drivers/vfio/pci/vfio_pci_private.h | 2 +- + drivers/vfio/pci/vfio_pci_zdev.c | 24 +- + drivers/vfio/vfio.c | 5 + + drivers/vfio/vfio_iommu_type1.c | 564 ++-- + drivers/virt/Kconfig | 2 + + drivers/virt/Makefile | 1 + + drivers/virt/acrn/Kconfig | 15 + + drivers/virt/acrn/Makefile | 3 + + drivers/virt/acrn/acrn_drv.h | 227 ++ + drivers/virt/acrn/hsm.c | 470 ++++ + drivers/virt/acrn/hypercall.h | 254 ++ + drivers/virt/acrn/ioeventfd.c | 273 ++ + drivers/virt/acrn/ioreq.c | 657 +++++ + drivers/virt/acrn/irqfd.c | 235 ++ + drivers/virt/acrn/mm.c | 306 +++ + drivers/virt/acrn/vm.c | 126 + + drivers/virt/vboxguest/vboxguest_utils.c | 18 +- + drivers/vme/vme.c | 4 +- + drivers/w1/masters/ds2490.c | 25 +- + drivers/w1/slaves/w1_therm.c | 22 +- + drivers/w1/w1.c | 39 +- + drivers/watchdog/mei_wdt.c | 4 +- + fs/9p/acl.c | 8 +- + fs/9p/v9fs.h | 3 +- + fs/9p/v9fs_vfs.h | 3 +- + fs/9p/vfs_inode.c | 36 +- + fs/9p/vfs_inode_dotl.c | 39 +- + fs/9p/xattr.c | 1 + + fs/adfs/adfs.h | 3 +- + fs/adfs/inode.c | 5 +- + fs/affs/affs.h | 24 +- + fs/affs/inode.c | 7 +- + fs/affs/namei.c | 15 +- + fs/afs/dir.c | 34 +- + fs/afs/inode.c | 9 +- + fs/afs/internal.h | 7 +- + fs/afs/security.c | 3 +- + fs/afs/xattr.c | 2 + + fs/attr.c | 126 +- + fs/autofs/root.c | 17 +- + fs/bad_inode.c | 36 +- + fs/bfs/dir.c | 12 +- + fs/btrfs/acl.c | 6 +- + fs/btrfs/ctree.h | 3 +- + fs/btrfs/inode.c | 46 +- + fs/btrfs/ioctl.c | 27 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/xattr.c | 2 + + fs/cachefiles/interface.c | 4 +- + fs/cachefiles/namei.c | 21 +- + fs/cachefiles/xattr.c | 29 +- + fs/ceph/acl.c | 6 +- + fs/ceph/dir.c | 23 +- + fs/ceph/inode.c | 18 +- + fs/ceph/super.h | 12 +- + fs/ceph/xattr.c | 1 + + fs/cifs/cifsfs.c | 5 +- + fs/cifs/cifsfs.h | 25 +- + fs/cifs/dir.c | 8 +- + fs/cifs/inode.c | 26 +- + fs/cifs/link.c | 3 +- + fs/cifs/xattr.c | 1 + + fs/coda/coda_linux.h | 8 +- + fs/coda/dir.c | 18 +- + fs/coda/inode.c | 9 +- + fs/coda/pioctl.c | 6 +- + fs/configfs/configfs_internal.h | 6 +- + fs/configfs/dir.c | 3 +- + fs/configfs/inode.c | 5 +- + fs/configfs/symlink.c | 6 +- + fs/coredump.c | 10 +- + fs/crypto/policy.c | 2 +- + fs/debugfs/inode.c | 14 +- + fs/ecryptfs/crypto.c | 4 +- + fs/ecryptfs/inode.c | 84 +- + fs/ecryptfs/main.c | 6 + + fs/ecryptfs/mmap.c | 4 +- + fs/efivarfs/file.c | 2 +- + fs/efivarfs/inode.c | 4 +- + fs/erofs/inode.c | 7 +- + fs/erofs/internal.h | 5 +- + fs/exec.c | 12 +- + fs/exfat/exfat_fs.h | 8 +- + fs/exfat/file.c | 14 +- + fs/exfat/namei.c | 14 +- + fs/ext2/acl.c | 6 +- + fs/ext2/acl.h | 3 +- + fs/ext2/ext2.h | 5 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 15 +- + fs/ext2/ioctl.c | 6 +- + fs/ext2/namei.c | 22 +- + fs/ext2/xattr_security.c | 1 + + fs/ext2/xattr_trusted.c | 1 + + fs/ext2/xattr_user.c | 1 + + fs/ext4/acl.c | 5 +- + fs/ext4/acl.h | 3 +- + fs/ext4/ext4.h | 22 +- + fs/ext4/ialloc.c | 7 +- + fs/ext4/inode.c | 21 +- + fs/ext4/ioctl.c | 20 +- + fs/ext4/namei.c | 49 +- + fs/ext4/super.c | 2 +- + fs/ext4/xattr_hurd.c | 1 + + fs/ext4/xattr_security.c | 1 + + fs/ext4/xattr_trusted.c | 1 + + fs/ext4/xattr_user.c | 1 + + fs/f2fs/acl.c | 7 +- + fs/f2fs/acl.h | 3 +- + fs/f2fs/f2fs.h | 7 +- + fs/f2fs/file.c | 36 +- + fs/f2fs/namei.c | 23 +- + fs/f2fs/xattr.c | 4 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 24 +- + fs/fat/namei_msdos.c | 12 +- + fs/fat/namei_vfat.c | 15 +- + fs/fcntl.c | 3 +- + fs/fuse/acl.c | 3 +- + fs/fuse/dir.c | 46 +- + fs/fuse/fuse_i.h | 4 +- + fs/fuse/xattr.c | 2 + + fs/gfs2/acl.c | 5 +- + fs/gfs2/acl.h | 3 +- + fs/gfs2/bmap.c | 10 +- + fs/gfs2/file.c | 12 +- + fs/gfs2/glock.c | 22 +- + fs/gfs2/glock.h | 6 + + fs/gfs2/glops.c | 38 +- + fs/gfs2/incore.h | 54 +- + fs/gfs2/inode.c | 70 +- + fs/gfs2/inode.h | 3 +- + fs/gfs2/lock_dlm.c | 8 +- + fs/gfs2/log.c | 525 ++-- + fs/gfs2/log.h | 20 +- + fs/gfs2/lops.c | 26 +- + fs/gfs2/lops.h | 23 +- + fs/gfs2/main.c | 4 +- + fs/gfs2/ops_fstype.c | 71 +- + fs/gfs2/recovery.c | 14 +- + fs/gfs2/rgrp.c | 442 +-- + fs/gfs2/rgrp.h | 6 +- + fs/gfs2/super.c | 73 +- + fs/gfs2/super.h | 8 +- + fs/gfs2/trace_gfs2.h | 37 +- + fs/gfs2/trans.c | 102 +- + fs/gfs2/trans.h | 5 +- + fs/gfs2/util.c | 59 +- + fs/gfs2/util.h | 3 + + fs/gfs2/xattr.c | 55 +- + fs/hfs/attr.c | 1 + + fs/hfs/dir.c | 13 +- + fs/hfs/hfs_fs.h | 3 +- + fs/hfs/inode.c | 8 +- + fs/hfsplus/dir.c | 22 +- + fs/hfsplus/hfsplus_fs.h | 5 +- + fs/hfsplus/inode.c | 16 +- + fs/hfsplus/ioctl.c | 2 +- + fs/hfsplus/xattr.c | 1 + + fs/hfsplus/xattr_security.c | 1 + + fs/hfsplus/xattr_trusted.c | 1 + + fs/hfsplus/xattr_user.c | 1 + + fs/hostfs/hostfs_kern.c | 29 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 7 +- + fs/hpfs/namei.c | 20 +- + fs/hugetlbfs/inode.c | 35 +- + fs/init.c | 24 +- + fs/inode.c | 44 +- + fs/internal.h | 2 +- + fs/jffs2/acl.c | 6 +- + fs/jffs2/acl.h | 3 +- + fs/jffs2/dir.c | 33 +- + fs/jffs2/fs.c | 7 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/security.c | 1 + + fs/jffs2/xattr_trusted.c | 1 + + fs/jffs2/xattr_user.c | 1 + + fs/jfs/acl.c | 5 +- + fs/jfs/file.c | 9 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_acl.h | 3 +- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_inode.h | 2 +- + fs/jfs/namei.c | 21 +- + fs/jfs/xattr.c | 2 + + fs/kernfs/dir.c | 6 +- + fs/kernfs/inode.c | 19 +- + fs/kernfs/kernfs-internal.h | 9 +- + fs/libfs.c | 28 +- + fs/minix/bitmap.c | 2 +- + fs/minix/file.c | 7 +- + fs/minix/inode.c | 6 +- + fs/minix/minix.h | 3 +- + fs/minix/namei.c | 24 +- + fs/mount.h | 10 - + fs/namei.c | 511 +++- + fs/namespace.c | 484 +++- + fs/nfs/dir.c | 25 +- + fs/nfs/inode.c | 9 +- + fs/nfs/internal.h | 14 +- + fs/nfs/namespace.c | 15 +- + fs/nfs/nfs3_fs.h | 3 +- + fs/nfs/nfs3acl.c | 3 +- + fs/nfs/nfs4proc.c | 3 + + fs/nfsd/export.c | 12 +- + fs/nfsd/nfs2acl.c | 6 +- + fs/nfsd/nfs3acl.c | 6 +- + fs/nfsd/nfs4acl.c | 5 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfsfh.c | 3 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/vfs.c | 50 +- + fs/nilfs2/inode.c | 14 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 19 +- + fs/nilfs2/nilfs.h | 6 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/inode.h | 3 +- + fs/ocfs2/acl.c | 6 +- + fs/ocfs2/acl.h | 3 +- + fs/ocfs2/dlmfs/dlmfs.c | 17 +- + fs/ocfs2/file.c | 18 +- + fs/ocfs2/file.h | 11 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/namei.c | 21 +- + fs/ocfs2/refcounttree.c | 4 +- + fs/ocfs2/xattr.c | 3 + + fs/omfs/dir.c | 13 +- + fs/omfs/file.c | 7 +- + fs/omfs/inode.c | 2 +- + fs/open.c | 35 +- + fs/orangefs/acl.c | 6 +- + fs/orangefs/inode.c | 20 +- + fs/orangefs/namei.c | 12 +- + fs/orangefs/orangefs-kernel.h | 13 +- + fs/orangefs/xattr.c | 1 + + fs/overlayfs/copy_up.c | 22 +- + fs/overlayfs/dir.c | 31 +- + fs/overlayfs/file.c | 6 +- + fs/overlayfs/inode.c | 27 +- + fs/overlayfs/overlayfs.h | 45 +- + fs/overlayfs/super.c | 21 +- + fs/overlayfs/util.c | 4 +- + fs/posix_acl.c | 103 +- + fs/proc/base.c | 28 +- + fs/proc/fd.c | 5 +- + fs/proc/fd.h | 3 +- + fs/proc/generic.c | 12 +- + fs/proc/internal.h | 6 +- + fs/proc/proc_net.c | 5 +- + fs/proc/proc_sysctl.c | 15 +- + fs/proc/root.c | 5 +- + fs/proc_namespace.c | 3 + + fs/ramfs/file-nommu.c | 9 +- + fs/ramfs/inode.c | 18 +- + fs/reiserfs/acl.h | 3 +- + fs/reiserfs/inode.c | 7 +- + fs/reiserfs/ioctl.c | 4 +- + fs/reiserfs/namei.c | 21 +- + fs/reiserfs/reiserfs.h | 3 +- + fs/reiserfs/xattr.c | 13 +- + fs/reiserfs/xattr.h | 3 +- + fs/reiserfs/xattr_acl.c | 8 +- + fs/reiserfs/xattr_security.c | 3 +- + fs/reiserfs/xattr_trusted.c | 3 +- + fs/reiserfs/xattr_user.c | 3 +- + fs/remap_range.c | 7 +- + fs/stat.c | 26 +- + fs/sysv/file.c | 7 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/itree.c | 6 +- + fs/sysv/namei.c | 21 +- + fs/sysv/sysv.h | 3 +- + fs/tracefs/inode.c | 4 +- + fs/ubifs/dir.c | 30 +- + fs/ubifs/file.c | 5 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/ubifs.h | 5 +- + fs/ubifs/xattr.c | 1 + + fs/udf/file.c | 9 +- + fs/udf/ialloc.c | 2 +- + fs/udf/namei.c | 24 +- + fs/udf/symlink.c | 7 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 7 +- + fs/ufs/namei.c | 19 +- + fs/ufs/ufs.h | 3 +- + fs/utimes.c | 3 +- + fs/vboxsf/dir.c | 12 +- + fs/vboxsf/utils.c | 9 +- + fs/vboxsf/vfsmod.h | 8 +- + fs/verity/enable.c | 2 +- + fs/xattr.c | 139 +- + fs/xfs/xfs_acl.c | 5 +- + fs/xfs/xfs_acl.h | 3 +- + fs/xfs/xfs_file.c | 4 +- + fs/xfs/xfs_inode.c | 26 +- + fs/xfs/xfs_inode.h | 16 +- + fs/xfs/xfs_ioctl.c | 35 +- + fs/xfs/xfs_ioctl32.c | 13 +- + fs/xfs/xfs_iops.c | 101 +- + fs/xfs/xfs_iops.h | 3 +- + fs/xfs/xfs_itable.c | 17 +- + fs/xfs/xfs_itable.h | 1 + + fs/xfs/xfs_qm.c | 3 +- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_symlink.c | 5 +- + fs/xfs/xfs_symlink.h | 5 +- + fs/xfs/xfs_xattr.c | 7 +- + fs/zonefs/super.c | 9 +- + include/crypto/public_key.h | 1 - + include/dt-bindings/input/cros-ec-keyboard.h | 103 + + include/dt-bindings/interconnect/qcom,msm8939.h | 105 + + include/dt-bindings/interconnect/qcom,sdx55.h | 76 + + include/keys/encrypted-type.h | 2 +- + include/linux/capability.h | 14 +- + include/linux/compiler_attributes.h | 6 + + include/linux/coresight-pmu.h | 20 +- + include/linux/coresight.h | 218 +- + include/linux/device.h | 2 + + include/linux/device/driver.h | 2 +- + include/linux/dfl.h | 86 + + include/linux/dma-map-ops.h | 5 - + include/linux/dma-mapping.h | 17 +- + include/linux/dma/k3-psil.h | 13 +- + include/linux/dma/mmp-pdma.h | 16 - + include/linux/dmaengine.h | 2 + + include/linux/eeprom_93xx46.h | 2 + + include/linux/firmware/xlnx-zynqmp.h | 339 ++- + include/linux/fs.h | 186 +- + include/linux/fsl/mc.h | 8 +- + include/linux/fwnode.h | 20 +- + include/linux/hid-sensor-hub.h | 9 +- + include/linux/hid.h | 15 +- + include/linux/ima.h | 18 +- + include/linux/intel-pti.h | 35 - + include/linux/key.h | 5 +- + include/linux/lsm_hook_defs.h | 15 +- + include/linux/lsm_hooks.h | 1 + + include/linux/mei_cl_bus.h | 2 +- + include/linux/mfd/intel_msic.h | 453 ---- + include/linux/mhi.h | 13 +- + include/linux/mod_devicetable.h | 24 + + include/linux/mount.h | 7 + + include/linux/nd.h | 2 +- + include/linux/nfs_fs.h | 7 +- + include/linux/of_irq.h | 9 +- + include/linux/pci_ids.h | 1 + + include/linux/platform_data/dma-atmel.h | 61 - + include/linux/platform_data/dma-coh901318.h | 72 - + include/linux/platform_data/dma-imx-sdma.h | 11 - + include/linux/platform_data/i2c-hid.h | 41 - + include/linux/posix_acl.h | 21 +- + include/linux/posix_acl_xattr.h | 12 +- + include/linux/rpmsg/qcom_glink.h | 8 +- + include/linux/security.h | 54 +- + include/linux/sfi.h | 210 -- + include/linux/sfi_acpi.h | 93 - + include/linux/sirfsoc_dma.h | 7 - + include/linux/soundwire/sdw.h | 2 + + include/linux/syscalls.h | 4 + + include/linux/verification.h | 2 + + include/linux/vfio.h | 7 + + include/linux/vme.h | 2 +- + include/linux/vmw_vmci_defs.h | 4 +- + include/linux/xattr.h | 30 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/acrn.h | 580 ++++ + include/uapi/linux/cxl_mem.h | 172 ++ + include/uapi/linux/fsl_mc.h | 34 + + include/uapi/linux/gfs2_ondisk.h | 5 +- + include/uapi/linux/map_to_7segment.h | 11 +- + include/uapi/linux/misc/bcm_vk.h | 84 + + include/uapi/linux/mount.h | 16 + + include/uapi/linux/vfio.h | 27 + + include/uapi/misc/habanalabs.h | 74 +- + init/Kconfig | 4 +- + init/main.c | 2 - + ipc/mqueue.c | 9 +- + kernel/auditsc.c | 5 +- + kernel/bpf/inode.c | 13 +- + kernel/capability.c | 14 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/dma/map_benchmark.c | 12 +- + kernel/dma/mapping.c | 40 - + kernel/irq/irqdomain.c | 2 + + kernel/sched/cpufreq_schedutil.c | 14 +- + kernel/sys.c | 2 +- + kernel/trace/Kconfig | 13 + + kernel/watch_queue.c | 2 +- + mm/madvise.c | 5 +- + mm/memcontrol.c | 2 +- + mm/mincore.c | 5 +- + mm/percpu.c | 36 +- + mm/shmem.c | 50 +- + net/socket.c | 6 +- + net/unix/af_unix.c | 5 +- + samples/Kconfig | 2 +- + samples/acrn/Makefile | 12 + + samples/acrn/guest.ld | 9 + + samples/acrn/payload.ld | 9 + + samples/acrn/vm-sample.c | 136 + + samples/watch_queue/watch_test.c | 2 +- + scripts/Makefile.build | 19 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 19 +- + scripts/dtc/.gitignore | 1 + + scripts/dtc/Makefile | 1 + + scripts/link-vmlinux.sh | 28 +- + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + scripts/spdxcheck.py | 2 +- + scripts/ver_linux | 12 +- + security/apparmor/apparmorfs.c | 3 +- + security/apparmor/domain.c | 13 +- + security/apparmor/file.c | 4 +- + security/apparmor/lsm.c | 21 +- + security/commoncap.c | 108 +- + security/integrity/evm/evm_crypto.c | 11 +- + security/integrity/evm/evm_main.c | 4 +- + security/integrity/evm/evm_secfs.c | 2 +- + security/integrity/ima/ima.h | 19 +- + security/integrity/ima/ima_api.c | 10 +- + security/integrity/ima/ima_appraise.c | 23 +- + security/integrity/ima/ima_asymmetric_keys.c | 3 +- + security/integrity/ima/ima_main.c | 40 +- + security/integrity/ima/ima_mok.c | 5 +- + security/integrity/ima/ima_policy.c | 20 +- + security/integrity/ima/ima_queue_keys.c | 4 +- + security/keys/Kconfig | 8 +- + security/keys/big_key.c | 9 +- + security/keys/key.c | 2 + + security/keys/keyctl.c | 2 +- + security/keys/keyctl_pkey.c | 2 - + security/keys/keyring.c | 10 +- + security/keys/process_keys.c | 1 + + security/security.c | 25 +- + security/selinux/hooks.c | 23 +- + security/smack/smack_lsm.c | 22 +- + tools/include/uapi/asm-generic/unistd.h | 4 +- + tools/objtool/builtin-check.c | 10 +- + tools/objtool/check.c | 97 +- + tools/objtool/include/objtool/builtin.h | 2 +- + tools/objtool/include/objtool/check.h | 1 + + tools/objtool/include/objtool/objtool.h | 1 + + tools/objtool/objtool.c | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/dma/dma_map_benchmark.c | 21 +- + tools/testing/selftests/mount_setattr/.gitignore | 1 + + tools/testing/selftests/mount_setattr/Makefile | 7 + + tools/testing/selftests/mount_setattr/config | 1 + + .../selftests/mount_setattr/mount_setattr_test.c | 1424 ++++++++++ + 988 files changed, 35417 insertions(+), 20298 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-bus-fsl-mc + create mode 100644 Documentation/ABI/testing/sysfs-bus-cxl + create mode 100644 Documentation/ABI/testing/sysfs-bus-dfl-devices-emif + create mode 100644 Documentation/ABI/testing/sysfs-bus-dfl-devices-n3000-nios + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-pvpanic + create mode 100644 Documentation/ABI/testing/sysfs-driver-input-cros-ec-keyb + delete mode 100644 Documentation/ABI/testing/sysfs-firmware-sfi + create mode 100644 Documentation/devicetree/bindings/dma/intel,ldma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/sirfsoc-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/ste-coh901318.txt + delete mode 100644 Documentation/devicetree/bindings/dma/zxdma.txt + create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml + rename Documentation/devicetree/bindings/interconnect/{qcom,msm8916.yaml => qcom,rpm.yaml} (77%) + create mode 100644 Documentation/devicetree/bindings/nvmem/rmem.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,tphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,xsphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt + create mode 100644 Documentation/driver-api/cxl/index.rst + create mode 100644 Documentation/driver-api/cxl/memory-devices.rst + delete mode 100644 Documentation/driver-api/pti_intel_mid.rst + create mode 100644 Documentation/virt/acrn/cpuid.rst + create mode 100644 Documentation/virt/acrn/index.rst + create mode 100644 Documentation/virt/acrn/introduction.rst + create mode 100644 Documentation/virt/acrn/io-request.rst + create mode 100644 arch/x86/include/asm/acrn.h + delete mode 100644 arch/x86/include/asm/apb_timer.h + delete mode 100644 arch/x86/include/asm/intel_mid_vrtc.h + delete mode 100644 arch/x86/include/asm/intel_scu_ipc_legacy.h + delete mode 100644 arch/x86/kernel/apb_timer.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/Makefile + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bma023.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bt.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_emc1403.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_lis331.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max7315.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_pinctrl.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_sd.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.h + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tca6416.c + delete mode 100644 arch/x86/platform/intel-mid/intel_mid_vrtc.c + delete mode 100644 arch/x86/platform/intel-mid/sfi.c + delete mode 100644 arch/x86/platform/sfi/sfi.c + create mode 100644 drivers/bus/fsl-mc/fsl-mc-uapi.c + delete mode 100644 drivers/cpufreq/sfi-cpufreq.c + create mode 100644 drivers/cxl/Kconfig + create mode 100644 drivers/cxl/Makefile + create mode 100644 drivers/cxl/bus.c + create mode 100644 drivers/cxl/cxl.h + create mode 100644 drivers/cxl/mem.c + create mode 100644 drivers/cxl/pci.h + delete mode 100644 drivers/dma/coh901318.c + delete mode 100644 drivers/dma/coh901318.h + delete mode 100644 drivers/dma/coh901318_lli.c + create mode 100644 drivers/dma/lgm/Kconfig + create mode 100644 drivers/dma/lgm/Makefile + create mode 100644 drivers/dma/lgm/lgm-dma.c + delete mode 100644 drivers/dma/sirf-dma.c + delete mode 100644 drivers/dma/zx_dma.c + create mode 100644 drivers/fpga/dfl-n3000-nios.c + create mode 100644 drivers/hid/hid-playstation.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c + create mode 100644 drivers/input/joystick/n64joy.c + create mode 100644 drivers/interconnect/qcom/icc-rpm.c + create mode 100644 drivers/interconnect/qcom/icc-rpm.h + create mode 100644 drivers/interconnect/qcom/msm8939.c + create mode 100644 drivers/interconnect/qcom/sdx55.c + create mode 100644 drivers/interconnect/qcom/sdx55.h + create mode 100644 drivers/memory/dfl-emif.c + delete mode 100644 drivers/mfd/intel_msic.c + delete mode 100644 drivers/misc/atmel_tclib.c + create mode 100644 drivers/misc/bcm-vk/Kconfig + create mode 100644 drivers/misc/bcm-vk/Makefile + create mode 100644 drivers/misc/bcm-vk/bcm_vk.h + create mode 100644 drivers/misc/bcm-vk/bcm_vk_dev.c + create mode 100644 drivers/misc/bcm-vk/bcm_vk_msg.c + create mode 100644 drivers/misc/bcm-vk/bcm_vk_msg.h + create mode 100644 drivers/misc/bcm-vk/bcm_vk_sg.c + create mode 100644 drivers/misc/bcm-vk/bcm_vk_sg.h + create mode 100644 drivers/misc/bcm-vk/bcm_vk_tty.c + create mode 100644 drivers/misc/habanalabs/common/mmu/Makefile + rename drivers/misc/habanalabs/common/{ => mmu}/mmu.c (77%) + rename drivers/misc/habanalabs/common/{ => mmu}/mmu_v1.c (99%) + rename {arch/x86/platform/sfi => drivers/misc/habanalabs/common/pci}/Makefile (50%) + rename drivers/misc/habanalabs/common/{ => pci}/pci.c (91%) + delete mode 100644 drivers/misc/pti.c + create mode 100644 drivers/nvmem/rmem.c + delete mode 100644 drivers/sfi/Kconfig + delete mode 100644 drivers/sfi/Makefile + delete mode 100644 drivers/sfi/sfi_acpi.c + delete mode 100644 drivers/sfi/sfi_core.c + delete mode 100644 drivers/sfi/sfi_core.h + delete mode 100644 drivers/tty/n_tracerouter.c + delete mode 100644 drivers/tty/n_tracesink.c + delete mode 100644 drivers/tty/n_tracesink.h + create mode 100644 drivers/virt/acrn/Kconfig + create mode 100644 drivers/virt/acrn/Makefile + create mode 100644 drivers/virt/acrn/acrn_drv.h + create mode 100644 drivers/virt/acrn/hsm.c + create mode 100644 drivers/virt/acrn/hypercall.h + create mode 100644 drivers/virt/acrn/ioeventfd.c + create mode 100644 drivers/virt/acrn/ioreq.c + create mode 100644 drivers/virt/acrn/irqfd.c + create mode 100644 drivers/virt/acrn/mm.c + create mode 100644 drivers/virt/acrn/vm.c + create mode 100644 include/dt-bindings/input/cros-ec-keyboard.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8939.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdx55.h + create mode 100644 include/linux/dfl.h + delete mode 100644 include/linux/dma/mmp-pdma.h + delete mode 100644 include/linux/intel-pti.h + delete mode 100644 include/linux/mfd/intel_msic.h + delete mode 100644 include/linux/platform_data/dma-atmel.h + delete mode 100644 include/linux/platform_data/dma-coh901318.h + delete mode 100644 include/linux/platform_data/i2c-hid.h + delete mode 100644 include/linux/sfi.h + delete mode 100644 include/linux/sfi_acpi.h + delete mode 100644 include/linux/sirfsoc_dma.h + create mode 100644 include/uapi/linux/acrn.h + create mode 100644 include/uapi/linux/cxl_mem.h + create mode 100644 include/uapi/linux/fsl_mc.h + create mode 100644 include/uapi/linux/misc/bcm_vk.h + create mode 100644 samples/acrn/Makefile + create mode 100644 samples/acrn/guest.ld + create mode 100644 samples/acrn/payload.ld + create mode 100644 samples/acrn/vm-sample.c + create mode 100644 tools/testing/selftests/mount_setattr/.gitignore + create mode 100644 tools/testing/selftests/mount_setattr/Makefile + create mode 100644 tools/testing/selftests/mount_setattr/config + create mode 100644 tools/testing/selftests/mount_setattr/mount_setattr_test.c +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (fe968c41ac4f scripts: set proper OpenSSL include dir also for sign-file) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (4d62e81b60d4 ARM: kexec: fix oops after TLB are invalidated) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (430251cc864b arm64: Add missing ISB after invalidating TLB in enter_vhe) +$ git merge arm64-fixes/for-next/fixes +Auto-merging include/linux/kexec.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/module.lds.h | 6 ++--- + arch/arm64/kernel/head.S | 1 + + arch/arm64/kernel/hyp-stub.S | 40 +++++++++++++++++++++++----------- + arch/arm64/kernel/machine_kexec_file.c | 4 +++- + arch/arm64/kernel/probes/uprobes.c | 2 +- + arch/arm64/kernel/suspend.c | 2 +- + arch/arm64/kvm/hyp/hyp-entry.S | 2 +- + arch/arm64/mm/mmu.c | 6 ++--- + include/linux/kexec.h | 2 ++ + kernel/kexec_internal.h | 2 -- + 10 files changed, 42 insertions(+), 25 deletions(-) +Merging arm-soc-fixes/arm/fixes (090e502e4e63 Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (f40ddce88593 Linux 5.11) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (f40ddce88593 Linux 5.11) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (062c84fccc44 Merge tag 'rproc-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc) +$ 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 (88eee9b7b42e net: usb: qmi_wwan: support ZTE P685M modem) +$ git merge net/master +Auto-merging drivers/net/Kconfig +Merge made by the 'recursive' strategy. + drivers/net/Kconfig | 2 +- + drivers/net/dsa/b53/b53_common.c | 39 +++++++--- + drivers/net/dsa/b53/b53_priv.h | 8 ++ + drivers/net/dsa/b53/b53_regs.h | 1 + + drivers/net/dsa/bcm_sf2.c | 18 +---- + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 16 ++-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 64 ++++++---------- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 11 ++- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 2 - + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 6 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 34 +++++++-- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 35 ++++++++- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 25 ++++--- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 5 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 30 +++++++- + drivers/net/gtp.c | 1 - + drivers/net/phy/icplus.c | 9 ++- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/usb/r8152.c | 67 +++++++++++------ + drivers/net/vxlan.c | 11 ++- + drivers/net/wireguard/device.c | 21 +++--- + drivers/net/wireguard/device.h | 15 ++-- + drivers/net/wireguard/peer.c | 28 +++---- + drivers/net/wireguard/peer.h | 8 +- + drivers/net/wireguard/queueing.c | 86 +++++++++++++++++----- + drivers/net/wireguard/queueing.h | 45 ++++++++--- + drivers/net/wireguard/receive.c | 16 ++-- + drivers/net/wireguard/send.c | 31 +++----- + drivers/net/wireguard/socket.c | 8 +- + include/linux/icmpv6.h | 26 +++++-- + include/linux/ipv6.h | 1 - + include/net/icmp.h | 6 +- + net/dsa/Kconfig | 1 + + net/ipv4/icmp.c | 5 +- + net/ipv6/icmp.c | 18 ++--- + net/ipv6/ip6_icmp.c | 12 +-- + net/mptcp/options.c | 23 +++--- + net/mptcp/protocol.c | 64 ++++++++++++++-- + net/mptcp/subflow.c | 6 ++ + net/qrtr/tun.c | 12 ++- + net/sched/cls_flower.c | 15 ++++ + tools/testing/selftests/wireguard/netns.sh | 15 +++- + 48 files changed, 576 insertions(+), 290 deletions(-) +Merging bpf/master (557c223b643a selftests/bpf: No need to drop the packet when there is no geneve opt) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/x86/net/bpf_jit_comp.c | 10 +++++++--- + include/uapi/linux/bpf.h | 1 - + kernel/bpf/btf.c | 2 -- + kernel/bpf/core.c | 2 ++ + kernel/bpf/verifier.c | 2 +- + tools/bpf/resolve_btfids/main.c | 5 +++++ + tools/include/uapi/linux/bpf.h | 1 - + .../selftests/bpf/progs/test_global_func11.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 6 ++---- + tools/testing/selftests/bpf/verifier/atomic_and.c | 23 ++++++++++++++++++++++ + 10 files changed, 41 insertions(+), 13 deletions(-) +Merging ipsec/master (8fc0e3b6a866 xfrm: interface: fix ipv4 pmtu check to honor ip header df) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_interface.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging netfilter/master (3af409ca278d net: enetc: fix destroyed phylink dereference during unbind) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (4538c5ed0f7e iwlwifi: avoid crash on unsupported debug collection) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/ath9k.h | 3 ++- + drivers/net/wireless/ath/ath9k/xmit.c | 6 ++++++ + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 ++ + drivers/net/wireless/mediatek/mt76/dma.c | 15 ++++++--------- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 10 +++++----- + 5 files changed, 21 insertions(+), 15 deletions(-) +Merging mac80211/master (3af409ca278d net: enetc: fix destroyed phylink dereference during unbind) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (1048ba83fb1c Linux 5.11-rc6) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (c4294d7f057d ALSA: hda: intel-dsp-config: add Alder Lake support) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (886fbd78319f 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/ak4458.c | 1 + + sound/soc/codecs/ak5558.c | 1 + + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/rt1015.c | 2 + + sound/soc/codecs/rt5670.c | 110 +++++++++++++++++++++++++++++++++----- + sound/soc/codecs/rt5670.h | 9 ++-- + sound/soc/fsl/fsl_ssi.c | 6 ++- + 7 files changed, 110 insertions(+), 21 deletions(-) +Merging regmap-fixes/for-linus (19c329f68089 Linux 5.11-rc4) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4a8a7d251201 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/mt6315-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging spi-fixes/for-linus (21b49223c0f5 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm63xx-hsspi.c | 7 ++++++- + drivers/spi/spi-bcm63xx.c | 6 +++++- + drivers/spi/spi-ti-qspi.c | 20 ++++++++++++++------ + 3 files changed, 25 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (7e69d07d7c3c Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume") +$ git merge pci-current/for-linus +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. +Merging driver-core.current/driver-core-linus (719bbd4a509f Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (92bf22614b21 Linux 5.11-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (9a8b9434c60f phy: mediatek: Add missing MODULE_DEVICE_TABLE()) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (719bbd4a509f Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (f40ddce88593 Linux 5.11) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (1bff77f41a80 Input: st1232 - fix NORMAL vs. IDLE state handling) +$ git merge input-current/for-linus +Already up to date. +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 (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (7a6eb7c34a78 selftests: Skip BPF seftests by default) +$ 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 (b6c14d7a8380 dmaengine dw: Revert "dmaengine: dw: Enable runtime PM") +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (ef357e02b6c4 media: rockchip: rkisp1: extend uapi array sizes) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +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 (7b490a8ab0f2 MIPS: OCTEON: fix unreachable code in octeon_irq_init_ciu) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (16457a528e63 ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) +$ git merge at91-fixes/at91-fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sam9x60ek.dts | 6 +++--- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging omap-fixes/fixes (9bbce32a20d6 ARM: dts: am33xx: add aliases for mmc interfaces) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx.dtsi | 3 +++ + drivers/bus/omap_l3_noc.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging kvm-fixes/master (031b91a5fe6f KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset) +$ 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 (4008bc7d3953 hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist) +$ 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 (08b609a13e80 Merge branch 'misc-5.12' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 33 +++++++++++++++++++++++- + fs/btrfs/block-group.h | 9 +++++++ + fs/btrfs/compression.c | 62 +++++++++++++++++++++++++++++++-------------- + fs/btrfs/ctree.h | 5 ++++ + fs/btrfs/free-space-cache.c | 14 +++++----- + fs/btrfs/inode.c | 44 +++++++++++++++++++++++++++----- + fs/btrfs/raid56.c | 21 ++++++++------- + fs/btrfs/reflink.c | 18 +++++++++++++ + fs/btrfs/scrub.c | 9 ++++++- + fs/btrfs/tree-checker.c | 16 +++--------- + fs/btrfs/tree-log.c | 3 --- + 11 files changed, 175 insertions(+), 59 deletions(-) +Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name) +$ git merge vfs-fixes/fixes +Already up to date. +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 (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (215164bfb714 platform/x86: dell-wmi-sysman: fix a NULL pointer dereference) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (201158f866dd dt-bindings: media: Use graph and video-interfaces schemas, round 2) +$ git merge devicetree-fixes/dt/linus +Removing scripts/dtc/include-prefixes/c6x +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + Documentation/devicetree/bindings/media/i2c/imx258.yaml | 14 +++++++------- + .../devicetree/bindings/media/i2c/ovti,ov5647.yaml | 5 ++--- + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 16 +++++----------- + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 16 +++++----------- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 11 +++++------ + scripts/dtc/include-prefixes/c6x | 1 - + 7 files changed, 25 insertions(+), 40 deletions(-) + delete mode 120000 scripts/dtc/include-prefixes/c6x +Merging scsi-fixes/fixes (f852c596f2ee scsi: scsi_debug: Fix a memory leak) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (f40ddce88593 Linux 5.11) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (f40ddce88593 Linux 5.11) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (d7fb9c242095 mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (7c53f6b671f4 Linux 5.11-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (fff7b5e6ee63 x86/hyperv: Initialize clockevents after LAPIC is initialized) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +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 (3da3cc1b5f47 Revert "dts: phy: add GPIO number and active state used for phy reset") +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (f40ddce88593 Linux 5.11) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ 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 (2b8fdbbf1c61 kunit: tool: move kunitconfig parsing into __init__, make it optional) +$ 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 (135d48d516bd nfsd: don't abort copies early) +$ git merge cel-fixes/for-rc +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 1 + + fs/nfsd/filecache.c | 2 ++ + fs/nfsd/nfs4state.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 6 +++--- + 4 files changed, 7 insertions(+), 4 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (54dab3a718f7 drm/panel: kd35t133: allow using non-continuous dsi clock) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 ++- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 11 +++++++++++ + drivers/gpu/drm/ttm/ttm_bo.c | 9 ++++++--- + 3 files changed, 19 insertions(+), 4 deletions(-) +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 (481083ec0bfc initramfs: Remove redundant dependency of RD_ZSTD on BLK_DEV_INITRD) +$ git merge kbuild/for-next +Removing scripts/lld-version.sh +Removing scripts/gcc-version.sh +Removing scripts/clang-version.sh +Auto-merging scripts/Makefile.lib +CONFLICT (content): Merge conflict in scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sys.c +Auto-merging init/Kconfig +Auto-merging include/linux/usb/composite.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging arch/mips/loongson64/Platform +Auto-merging arch/mips/kernel/syscalls/Makefile +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/Makefile +Removing arch/ia64/kernel/nr-irqs.c +Auto-merging arch/ia64/kernel/mca.c +Auto-merging arch/ia64/kernel/efi.c +Auto-merging arch/ia64/kernel/crash.c +Auto-merging arch/ia64/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/devicetree/bindings/Makefile +Resolved 'arch/mips/kernel/syscalls/Makefile' using previous resolution. +Resolved 'scripts/Makefile.lib' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29f376bbf19c] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/Makefile | 8 +- + Documentation/kbuild/makefiles.rst | 8 +- + MAINTAINERS | 2 - + Makefile | 105 ++++++++++++++----------- + arch/alpha/kernel/syscalls/Makefile | 13 +-- + arch/arm/tools/Makefile | 2 +- + arch/arm64/Kconfig | 2 +- + arch/ia64/Makefile | 6 -- + arch/ia64/include/asm/irq.h | 4 +- + arch/ia64/include/asm/mca.h | 11 +-- + arch/ia64/include/asm/pal.h | 4 +- + arch/ia64/include/asm/sal.h | 2 +- + arch/ia64/kernel/Makefile | 5 -- + arch/ia64/kernel/asm-offsets.c | 18 ++--- + arch/ia64/kernel/crash.c | 1 + + arch/ia64/kernel/efi.c | 1 + + arch/ia64/kernel/mca.c | 5 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/nr-irqs.c | 22 ------ + arch/ia64/kernel/syscalls/Makefile | 13 +-- + arch/m68k/kernel/syscalls/Makefile | 13 +-- + arch/microblaze/kernel/syscalls/Makefile | 13 +-- + arch/mips/kernel/syscalls/Makefile | 33 ++++---- + arch/mips/loongson64/Platform | 2 +- + arch/mips/vdso/Kconfig | 2 +- + arch/parisc/kernel/syscalls/Makefile | 19 ++--- + arch/powerpc/Makefile | 2 +- + arch/powerpc/kernel/syscalls/Makefile | 21 ++--- + arch/powerpc/lib/Makefile | 2 +- + arch/sh/kernel/syscalls/Makefile | 13 +-- + arch/sparc/kernel/syscalls/Makefile | 19 ++--- + arch/x86/entry/syscalls/Makefile | 29 +++---- + arch/xtensa/kernel/syscalls/Makefile | 13 +-- + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 4 +- + include/asm-generic/vmlinux.lds.h | 7 +- + include/linux/compiler-clang.h | 10 --- + include/linux/compiler-gcc.h | 11 --- + include/linux/usb/composite.h | 4 +- + init/Kconfig | 30 ++++--- + kernel/sys.c | 2 +- + lib/Kconfig.debug | 49 ++++++++++-- + scripts/Kbuild.include | 6 +- + scripts/Kconfig.include | 13 ++- + scripts/Makefile.build | 1 - + scripts/Makefile.clean | 3 - + scripts/Makefile.lib | 38 ++++----- + scripts/cc-version.sh | 82 +++++++++++++++++++ + scripts/clang-tools/gen_compile_commands.py | 12 ++- + scripts/clang-version.sh | 19 ----- + scripts/gcc-version.sh | 20 ----- + scripts/gdb/linux/Makefile | 4 +- + scripts/genksyms/genksyms.c | 2 +- + scripts/genksyms/genksyms.h | 2 +- + scripts/genksyms/lex.l | 56 +------------ + scripts/kconfig/Makefile | 36 ++++----- + scripts/kconfig/conf.c | 78 ++++++++---------- + scripts/ld-version.sh | 82 ++++++++++++++++--- + scripts/lld-version.sh | 20 ----- + scripts/syscallhdr.sh | 98 +++++++++++++++++++++++ + scripts/syscalltbl.sh | 73 +++++++++++++++++ + scripts/test_dwarf5_support.sh | 8 ++ + usr/Kconfig | 1 - + 65 files changed, 698 insertions(+), 498 deletions(-) + delete mode 100644 arch/ia64/kernel/nr-irqs.c + create mode 100755 scripts/cc-version.sh + delete mode 100755 scripts/clang-version.sh + delete mode 100755 scripts/gcc-version.sh + delete mode 100755 scripts/lld-version.sh + create mode 100755 scripts/syscallhdr.sh + create mode 100755 scripts/syscalltbl.sh + create mode 100755 scripts/test_dwarf5_support.sh +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 (3dc47131f8aa media: uvcvideo: Use dma_alloc_noncontiguos API) +$ git merge dma-mapping/for-next +Auto-merging kernel/dma/mapping.c +Auto-merging include/linux/dma-map-ops.h +Auto-merging drivers/media/usb/uvc/uvcvideo.h +Auto-merging drivers/media/usb/uvc/uvc_video.c +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'recursive' strategy. + Documentation/core-api/dma-api.rst | 84 +++++++++++++++++++++ + drivers/iommu/dma-iommu.c | 102 ++++++++++++++++++-------- + drivers/media/usb/uvc/uvc_video.c | 79 ++++++++++++++------ + drivers/media/usb/uvc/uvcvideo.h | 4 +- + include/linux/dma-map-ops.h | 18 +++++ + include/linux/dma-mapping.h | 33 +++++++++ + kernel/dma/mapping.c | 145 ++++++++++++++++++++++++++++++++++--- + 7 files changed, 400 insertions(+), 65 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 (1afb7e6348aa Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (1ffa9763828c Merge branch 'for-next/vdso' into for-next/core) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e6c44b8c57c9 soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 219 +++++++++++++++++++++++++++++++++ + 1 file changed, 219 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 (9faeb18107d1 Merge branch 'v5.12/soc' 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 + + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 120 +++++++++++++++++++++ + 3 files changed, 122 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 (9639bdcf8954 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 (5c289c7fae29 Merge branch 'mem-ctrl-next' into for-next) +$ git merge drivers-memory/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (7535d59c5f11 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (01e73147cbf8 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (d79b47c59576 Merge branches 'arm64-defconfig-for-5.12', 'arm64-for-5.12', 'defconfig-for-5.12', 'drivers-for-5.12' and 'dts-for-5.12' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (fc6f32116126 Merge branches 'renesas-arm-dt-for-v5.12' and 'renesas-drivers-for-v5.12' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (d17655759b3f reset: Add devm_reset_control_get_optional_exclusive_released()) +$ git merge reset/reset/next +Already up to date. +Merging rockchip/for-next (38051549ac38 Merge branch 'v5.12-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (da2f247fcbf4 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (f40ddce88593 Linux 5.11) +$ git merge scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (a9c92a9671d7 ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (a352e9e72aa3 Merge branch 'sunxi/dt-for-5.12-late' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +Auto-merging arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +Auto-merging arch/arm/boot/dts/sun8i-r16-parrot.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-parrot.dts +Auto-merging arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts +Auto-merging arch/arm/boot/dts/sun8i-a83t.dtsi +Auto-merging arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts +Auto-merging arch/arm/boot/dts/sun8i-a33-olinuxino.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-olinuxino.dts +Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi +Auto-merging arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi +Auto-merging arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +Auto-merging arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +Auto-merging arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi +Auto-merging arch/arm/boot/dts/sun6i-a31s-primo81.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-primo81.dts +Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi +Auto-merging arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts +Auto-merging arch/arm/boot/dts/sun6i-a31-m9.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-m9.dts +Auto-merging arch/arm/boot/dts/sun6i-a31-hummingbird.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-hummingbird.dts +Resolved 'arch/arm/boot/dts/sun6i-a31-hummingbird.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31-m9.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31s-primo81.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/sun8i-a33-olinuxino.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun8i-r16-parrot.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 75cdeb5b0dd7] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 +- + .../boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 +- + arch/arm/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 | 11 ++++------- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 2 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 16 ---------------- + arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 ++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 20 -------------------- + .../boot/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 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +++++--------------- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 ------ + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ++-- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 14 +++++--------- + 41 files changed, 73 insertions(+), 112 deletions(-) +Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (e37eac10bb5d Merge branch 'ti-k3-dts-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (4d5c4ae32945 Merge branches 'clk-socfpga', 'clk-mstar', 'clk-qcom' and 'clk-warnings' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-renesas/renesas-clk (24ece96554a9 clk: renesas: cpg-mssr: Fix formatting issues for 'smstpcr_saved's documentation) +$ git merge clk-renesas/renesas-clk +Already up to date. +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 (9d986b01feb9 csky: use free_initmem_default() in free_initmem()) +$ git merge csky/linux-next +Auto-merging include/linux/cpuhotplug.h +Removing arch/csky/include/asm/atomic.h +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 24 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 9 +- + arch/csky/abiv1/inc/abi/pgtable-bits.h | 39 ++- + arch/csky/abiv1/inc/abi/regdef.h | 5 + + arch/csky/abiv1/inc/abi/vdso.h | 18 +- + arch/csky/abiv2/cacheflush.c | 3 + + arch/csky/abiv2/inc/abi/ckmmu.h | 43 +++- + arch/csky/abiv2/inc/abi/entry.h | 19 +- + arch/csky/abiv2/inc/abi/pgtable-bits.h | 36 ++- + arch/csky/abiv2/inc/abi/regdef.h | 5 + + arch/csky/abiv2/inc/abi/vdso.h | 20 +- + arch/csky/include/asm/atomic.h | 212 ---------------- + arch/csky/include/asm/barrier.h | 82 +++++-- + arch/csky/include/asm/bug.h | 2 + + arch/csky/include/asm/clocksource.h | 8 + + arch/csky/include/asm/cmpxchg.h | 27 ++- + arch/csky/include/asm/futex.h | 121 ++++++++++ + arch/csky/include/asm/memory.h | 2 +- + arch/csky/include/asm/mmu_context.h | 9 +- + arch/csky/include/asm/page.h | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 78 +++--- + arch/csky/include/asm/processor.h | 2 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/include/asm/spinlock.h | 167 ------------- + arch/csky/include/asm/spinlock_types.h | 10 - + arch/csky/include/asm/thread_info.h | 1 - + arch/csky/include/asm/vdso.h | 21 +- + arch/csky/include/asm/vdso/clocksource.h | 9 + + arch/csky/include/asm/vdso/gettimeofday.h | 114 +++++++++ + arch/csky/include/asm/vdso/processor.h | 12 + + arch/csky/include/asm/vdso/vsyscall.h | 22 ++ + arch/csky/kernel/Makefile | 2 +- + arch/csky/kernel/atomic.S | 24 +- + arch/csky/kernel/entry.S | 106 +------- + arch/csky/kernel/head.S | 10 +- + arch/csky/kernel/perf_event.c | 4 +- + arch/csky/kernel/probes/simulate-insn.c | 22 +- + arch/csky/kernel/ptrace.c | 128 +++++++++- + arch/csky/kernel/setup.c | 18 +- + arch/csky/kernel/signal.c | 4 +- + arch/csky/kernel/smp.c | 7 +- + arch/csky/kernel/traps.c | 10 +- + arch/csky/kernel/vdso.c | 127 ++++++---- + arch/csky/kernel/vdso/.gitignore | 4 + + arch/csky/kernel/vdso/Makefile | 72 ++++++ + arch/csky/kernel/vdso/note.S | 12 + + arch/csky/kernel/vdso/rt_sigreturn.S | 14 ++ + arch/csky/kernel/vdso/so2s.sh | 5 + + arch/csky/kernel/vdso/vdso.S | 16 ++ + arch/csky/kernel/vdso/vdso.lds.S | 58 +++++ + arch/csky/kernel/vdso/vgettimeofday.c | 28 +++ + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 388 ++++++++++++++++++------------ + arch/csky/mm/init.c | 56 +++-- + arch/csky/mm/tlb.c | 42 +++- + include/linux/cpuhotplug.h | 1 + + 57 files changed, 1346 insertions(+), 940 deletions(-) + delete mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/include/asm/clocksource.h + create mode 100644 arch/csky/include/asm/futex.h + create mode 100644 arch/csky/include/asm/vdso/clocksource.h + create mode 100644 arch/csky/include/asm/vdso/gettimeofday.h + create mode 100644 arch/csky/include/asm/vdso/processor.h + create mode 100644 arch/csky/include/asm/vdso/vsyscall.h + create mode 100644 arch/csky/kernel/vdso/.gitignore + create mode 100644 arch/csky/kernel/vdso/Makefile + create mode 100644 arch/csky/kernel/vdso/note.S + create mode 100644 arch/csky/kernel/vdso/rt_sigreturn.S + create mode 100755 arch/csky/kernel/vdso/so2s.sh + create mode 100644 arch/csky/kernel/vdso/vdso.S + create mode 100644 arch/csky/kernel/vdso/vdso.lds.S + create mode 100644 arch/csky/kernel/vdso/vgettimeofday.c +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.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 (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (c1fb1bf64bb6 m68k: let clk_enable() return immediately if clk is NULL) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging microblaze/next (48783be427c7 microblaze: Fix built-in DTB alignment to be 8-byte aligned) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (057a14d610cf arch: mips: update references to current linux-mips list) +$ git merge mips/mips-next +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/bmips/setup.c | 2 +- + arch/mips/kernel/r4k-bugs64.c | 2 +- + arch/mips/lib/iomap-pci.c | 2 +- + arch/mips/sgi-ip32/ip32-irq.c | 2 +- + drivers/block/Kconfig | 6 ++ + drivers/block/Makefile | 1 + + drivers/block/n64cart.c | 178 ++++++++++++++++++++++++++++++++++++++ + include/asm-generic/vmlinux.lds.h | 2 +- + 8 files changed, 190 insertions(+), 5 deletions(-) + create mode 100644 drivers/block/n64cart.c +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +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 +Auto-merging drivers/soc/litex/Kconfig +Merge made by the 'recursive' strategy. + arch/openrisc/Kbuild | 3 + + arch/openrisc/Makefile | 21 +++--- + arch/openrisc/boot/.gitignore | 2 + + arch/openrisc/boot/Makefile | 10 +++ + arch/openrisc/kernel/process.c | 13 +++- + arch/openrisc/kernel/smp.c | 23 ++++-- + drivers/soc/litex/Kconfig | 14 +++- + drivers/soc/litex/litex_soc_ctrl.c | 116 +++++++++++----------------- + include/linux/litex.h | 150 +++++++++++++++++++++++++------------ + 9 files changed, 211 insertions(+), 141 deletions(-) + create mode 100644 arch/openrisc/Kbuild + create mode 100644 arch/openrisc/boot/.gitignore + create mode 100644 arch/openrisc/boot/Makefile +Merging parisc-hd/for-next (f40ddce88593 Linux 5.11) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (82d2c16b350f powerpc/perf: Adds support for programming of Thresholding in P10) +$ 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 (d7fbcf40df86 riscv: Improve kasan population by using hugepages when possible) +$ git merge risc-v/for-next +Removing drivers/soc/kendryte/k210-sysctl.c +Removing drivers/soc/kendryte/Makefile +Removing drivers/soc/kendryte/Kconfig +Auto-merging drivers/soc/Makefile +CONFLICT (content): Merge conflict in drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/Kconfig +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging arch/riscv/mm/kasan_init.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/stacktrace.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/include/asm/set_memory.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/page.h +Removing arch/riscv/boot/dts/kendryte/k210.dtsi +Removing arch/riscv/boot/dts/kendryte/k210.dts +Removing arch/riscv/boot/dts/kendryte/Makefile +Auto-merging arch/riscv/Kconfig +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/mm/Makefile +CONFLICT (content): Merge conflict in arch/arm64/mm/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml +Resolved 'arch/arm64/mm/Makefile' using previous resolution. +Resolved 'drivers/soc/Kconfig' using previous resolution. +Resolved 'drivers/soc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7117d36c46e2] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/sifive,gpio.yaml | 29 +- + .../interrupt-controller/sifive,plic-1.0.0.yaml | 13 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 109 +++ + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 171 ++++ + .../devicetree/bindings/pwm/pwm-sifive.yaml | 9 +- + .../devicetree/bindings/reset/canaan,k210-rst.yaml | 40 + + .../devicetree/bindings/riscv/canaan.yaml | 47 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 8 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 34 +- + .../devicetree/bindings/riscv/sifive.yaml | 17 +- + .../devicetree/bindings/serial/sifive-serial.yaml | 1 + + .../devicetree/bindings/timer/sifive,clint.yaml | 12 +- + .../bindings/timer/snps,dw-apb-timer.yaml | 3 + + MAINTAINERS | 23 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/numa.h | 48 +- + arch/arm64/kernel/acpi_numa.c | 12 - + arch/arm64/mm/Makefile | 1 - + arch/arm64/mm/init.c | 4 +- + arch/riscv/Kconfig | 48 +- + arch/riscv/Kconfig.socs | 33 +- + arch/riscv/Makefile | 14 +- + arch/riscv/boot/dts/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 5 + + arch/riscv/boot/dts/canaan/canaan_kd233.dts | 152 +++ + arch/riscv/boot/dts/canaan/k210.dtsi | 459 +++++++++ + arch/riscv/boot/dts/canaan/k210_generic.dts | 46 + + arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 209 ++++ + arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 211 ++++ + arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 219 +++++ + arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 184 ++++ + arch/riscv/boot/dts/kendryte/Makefile | 4 - + arch/riscv/boot/dts/kendryte/k210.dts | 23 - + arch/riscv/boot/dts/kendryte/k210.dtsi | 125 --- + arch/riscv/boot/dts/sifive/Makefile | 3 +- + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 293 ++++++ + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 253 +++++ + arch/riscv/configs/nommu_k210_defconfig | 46 +- + arch/riscv/configs/nommu_k210_sdcard_defconfig | 92 ++ + arch/riscv/include/asm/bug.h | 1 + + arch/riscv/include/asm/csr.h | 6 + + arch/riscv/include/asm/kasan.h | 22 +- + arch/riscv/include/asm/kprobes.h | 40 + + arch/riscv/include/asm/mmu.h | 2 + + arch/riscv/include/asm/mmu_context.h | 10 + + arch/riscv/include/asm/mmzone.h | 13 + + arch/riscv/include/asm/numa.h | 8 + + arch/riscv/include/asm/page.h | 3 - + arch/riscv/include/asm/pci.h | 14 + + arch/riscv/include/asm/pgtable.h | 21 + + arch/riscv/include/asm/probes.h | 24 + + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/ptrace.h | 35 + + arch/riscv/include/asm/sbi.h | 18 +- + arch/riscv/include/asm/set_memory.h | 2 +- + arch/riscv/include/asm/soc.h | 38 - + arch/riscv/include/asm/stackprotector.h | 3 +- + arch/riscv/include/asm/stacktrace.h | 2 + + arch/riscv/include/asm/thread_info.h | 4 +- + arch/riscv/include/asm/uprobes.h | 40 + + arch/riscv/kernel/Makefile | 6 +- + arch/riscv/kernel/asm-offsets.c | 3 + + arch/riscv/kernel/ftrace.c | 95 +- + arch/riscv/kernel/head.S | 4 + + arch/riscv/kernel/image-vars.h | 2 +- + arch/riscv/kernel/mcount-dyn.S | 342 +++---- + arch/riscv/kernel/patch.c | 8 +- + arch/riscv/kernel/probes/Makefile | 6 + + arch/riscv/kernel/probes/decode-insn.c | 48 + + arch/riscv/kernel/probes/decode-insn.h | 18 + + arch/riscv/kernel/probes/ftrace.c | 53 ++ + arch/riscv/kernel/probes/kprobes.c | 398 ++++++++ + arch/riscv/kernel/probes/kprobes_trampoline.S | 93 ++ + arch/riscv/kernel/probes/simulate-insn.c | 85 ++ + arch/riscv/kernel/probes/simulate-insn.h | 47 + + arch/riscv/kernel/probes/uprobes.c | 186 ++++ + arch/riscv/kernel/process.c | 18 +- + arch/riscv/kernel/ptrace.c | 99 ++ + arch/riscv/kernel/sbi.c | 36 +- + arch/riscv/kernel/setup.c | 23 +- + arch/riscv/kernel/signal.c | 3 + + arch/riscv/kernel/smpboot.c | 12 +- + arch/riscv/kernel/soc.c | 27 - + arch/riscv/kernel/stacktrace.c | 22 +- + arch/riscv/kernel/traps.c | 22 +- + arch/riscv/kernel/vdso/Makefile | 3 +- + arch/riscv/lib/Makefile | 2 + + arch/riscv/lib/error-inject.c | 10 + + arch/riscv/mm/Makefile | 3 +- + arch/riscv/mm/context.c | 265 +++++- + arch/riscv/mm/fault.c | 38 +- + arch/riscv/mm/init.c | 108 +-- + arch/riscv/mm/kasan_init.c | 176 +++- + drivers/base/Kconfig | 6 + + drivers/base/Makefile | 1 + + arch/arm64/mm/numa.c => drivers/base/arch_numa.c | 40 +- + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-k210.c | 1007 ++++++++++++++++++++ + drivers/pinctrl/Kconfig | 13 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-k210.c | 985 +++++++++++++++++++ + drivers/reset/Kconfig | 10 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-k210.c | 131 +++ + drivers/soc/Kconfig | 2 +- + drivers/soc/Makefile | 2 +- + drivers/soc/canaan/Kconfig | 12 + + drivers/soc/canaan/Makefile | 3 + + drivers/soc/canaan/k210-sysctl.c | 78 ++ + drivers/soc/kendryte/Kconfig | 14 - + drivers/soc/kendryte/Makefile | 3 - + drivers/soc/kendryte/k210-sysctl.c | 260 ----- + drivers/soc/sifive/sifive_l2_cache.c | 27 +- + include/asm-generic/numa.h | 52 + + include/dt-bindings/clock/k210-clk.h | 1 - + include/dt-bindings/pinctrl/k210-fpioa.h | 276 ++++++ + include/dt-bindings/reset/k210-rst.h | 42 + + include/linux/initrd.h | 11 + + include/soc/canaan/k210-sysctl.h | 43 + + init/initramfs.c | 45 + + 121 files changed, 7605 insertions(+), 1040 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml + create mode 100644 Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml + create mode 100644 Documentation/devicetree/bindings/riscv/canaan.yaml + create mode 100644 arch/riscv/boot/dts/canaan/Makefile + create mode 100644 arch/riscv/boot/dts/canaan/canaan_kd233.dts + create mode 100644 arch/riscv/boot/dts/canaan/k210.dtsi + create mode 100644 arch/riscv/boot/dts/canaan/k210_generic.dts + create mode 100644 arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts + create mode 100644 arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts + create mode 100644 arch/riscv/boot/dts/canaan/sipeed_maix_go.dts + create mode 100644 arch/riscv/boot/dts/canaan/sipeed_maixduino.dts + delete mode 100644 arch/riscv/boot/dts/kendryte/Makefile + delete mode 100644 arch/riscv/boot/dts/kendryte/k210.dts + delete mode 100644 arch/riscv/boot/dts/kendryte/k210.dtsi + create mode 100644 arch/riscv/boot/dts/sifive/fu740-c000.dtsi + create mode 100644 arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts + create mode 100644 arch/riscv/configs/nommu_k210_sdcard_defconfig + create mode 100644 arch/riscv/include/asm/mmzone.h + create mode 100644 arch/riscv/include/asm/numa.h + create mode 100644 arch/riscv/include/asm/probes.h + create mode 100644 arch/riscv/include/asm/uprobes.h + create mode 100644 arch/riscv/kernel/probes/Makefile + create mode 100644 arch/riscv/kernel/probes/decode-insn.c + create mode 100644 arch/riscv/kernel/probes/decode-insn.h + create mode 100644 arch/riscv/kernel/probes/ftrace.c + create mode 100644 arch/riscv/kernel/probes/kprobes.c + create mode 100644 arch/riscv/kernel/probes/kprobes_trampoline.S + create mode 100644 arch/riscv/kernel/probes/simulate-insn.c + create mode 100644 arch/riscv/kernel/probes/simulate-insn.h + create mode 100644 arch/riscv/kernel/probes/uprobes.c + create mode 100644 arch/riscv/lib/error-inject.c + rename arch/arm64/mm/numa.c => drivers/base/arch_numa.c (93%) + create mode 100644 drivers/clk/clk-k210.c + create mode 100644 drivers/pinctrl/pinctrl-k210.c + create mode 100644 drivers/reset/reset-k210.c + create mode 100644 drivers/soc/canaan/Kconfig + create mode 100644 drivers/soc/canaan/Makefile + create mode 100644 drivers/soc/canaan/k210-sysctl.c + delete mode 100644 drivers/soc/kendryte/Kconfig + delete mode 100644 drivers/soc/kendryte/Makefile + delete mode 100644 drivers/soc/kendryte/k210-sysctl.c + create mode 100644 include/asm-generic/numa.h + create mode 100644 include/dt-bindings/pinctrl/k210-fpioa.h + create mode 100644 include/dt-bindings/reset/k210-rst.h + create mode 100644 include/soc/canaan/k210-sysctl.h +Merging s390/for-next (cf6acb8bdb1d s390/cpumf: Add support for complete counter set extraction) +$ git merge s390/for-next +Auto-merging include/linux/cpuhotplug.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/irq_work.h | 12 + + arch/s390/include/asm/pgalloc.h | 2 +- + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/include/uapi/asm/perf_cpum_cf_diag.h | 51 +++ + arch/s390/kernel/perf_cpum_cf_diag.c | 548 +++++++++++++++++++++++-- + arch/s390/kernel/smp.c | 28 +- + arch/s390/kernel/topology.c | 25 +- + arch/s390/mm/pgalloc.c | 22 +- + arch/s390/mm/vmem.c | 30 +- + arch/s390/tools/opcodes.txt | 2 +- + drivers/s390/virtio/virtio_ccw.c | 4 +- + include/linux/cpuhotplug.h | 1 + + 12 files changed, 660 insertions(+), 81 deletions(-) + create mode 100644 arch/s390/include/asm/irq_work.h + create mode 100644 arch/s390/include/uapi/asm/perf_cpum_cf_diag.h +Merging sh/for-next (b89bc060b53e sh/intc: Restore devm_ioremap() alignment) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge 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 (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pidfd/for-next (f69e8091c4a2 xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl) +$ git merge pidfd/for-next +Already up to date. +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (32685453751f netfs: Hold a ref on a page when PG_private_2 is set) +$ git merge fscache/fscache-next +Auto-merging mm/filemap.c +Auto-merging lib/iov_iter.c +CONFLICT (content): Merge conflict in lib/iov_iter.c +Auto-merging include/linux/uio.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/read_write.c +Auto-merging fs/internal.h +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/cachefiles/interface.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/inode.c +Auto-merging fs/afs/dir.c +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'lib/iov_iter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c023f7eeb46c] Merge remote-tracking branch 'fscache/fscache-next' +$ git diff -M --stat --summary HEAD^.. + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/afs/Kconfig | 1 + + fs/afs/dir.c | 225 +++++--- + fs/afs/file.c | 470 ++++------------- + fs/afs/fs_operation.c | 4 +- + fs/afs/fsclient.c | 108 ++-- + fs/afs/inode.c | 7 +- + fs/afs/internal.h | 58 +- + fs/afs/rxrpc.c | 150 ++---- + fs/afs/write.c | 610 ++++++++++++--------- + fs/afs/yfsclient.c | 82 +-- + fs/cachefiles/Makefile | 1 + + fs/cachefiles/interface.c | 5 +- + fs/cachefiles/internal.h | 9 + + fs/cachefiles/rdwr2.c | 412 +++++++++++++++ + fs/ceph/Kconfig | 1 + + fs/ceph/addr.c | 535 ++++++++----------- + fs/ceph/cache.c | 125 ----- + fs/ceph/cache.h | 101 +--- + fs/ceph/caps.c | 10 +- + fs/ceph/inode.c | 1 + + fs/ceph/super.h | 1 + + fs/fscache/Kconfig | 1 + + fs/fscache/Makefile | 3 +- + fs/fscache/internal.h | 3 + + fs/fscache/page.c | 2 +- + fs/fscache/page2.c | 117 +++++ + fs/fscache/stats.c | 1 + + fs/internal.h | 5 - + fs/netfs/Kconfig | 23 + + fs/netfs/Makefile | 5 + + fs/netfs/internal.h | 97 ++++ + fs/netfs/read_helper.c | 1169 +++++++++++++++++++++++++++++++++++++++++ + fs/netfs/stats.c | 59 +++ + fs/read_write.c | 1 + + include/linux/fs.h | 1 + + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 40 +- + include/linux/netfs.h | 197 +++++++ + 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 +- + 49 files changed, 3776 insertions(+), 1573 deletions(-) + create mode 100644 fs/cachefiles/rdwr2.c + create mode 100644 fs/fscache/page2.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 (191e697796c2 Merge branch 'for-next-next-v5.11-20210217' into for-next-20210217) +$ git merge btrfs/for-next +Auto-merging lib/iov_iter.c +CONFLICT (content): Merge conflict in lib/iov_iter.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/tree-checker.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/reflink.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.c +Resolved 'lib/iov_iter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a08989ac76b0] Merge remote-tracking branch 'btrfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/compression.c | 11 +- + fs/btrfs/extent_io.c | 22 +-- + fs/btrfs/file.c | 15 +- + fs/btrfs/inode.c | 52 +++--- + fs/btrfs/ioctl.c | 7 +- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/raid56.c | 10 +- + fs/btrfs/reflink.c | 12 +- + fs/btrfs/relocation.c | 414 +++++++++++++++++++++++++++++++++++++----------- + fs/btrfs/send.c | 7 +- + fs/btrfs/transaction.c | 37 +++-- + fs/btrfs/tree-checker.c | 5 + + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/zlib.c | 10 +- + fs/btrfs/zstd.c | 11 +- + include/linux/highmem.h | 56 +++++++ + lib/iov_iter.c | 28 +--- + 18 files changed, 486 insertions(+), 227 deletions(-) +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 (c494a7f5f29a cifs: update internal version number) +$ git merge cifs/for-next +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/cifsfs.h +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifs_debug.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cifs/authors.rst | 6 +- + Documentation/admin-guide/cifs/changes.rst | 5 +- + Documentation/admin-guide/cifs/introduction.rst | 30 +- + Documentation/admin-guide/cifs/todo.rst | 34 ++- + Documentation/admin-guide/cifs/usage.rst | 2 +- + fs/cifs/cifs_debug.c | 121 ++++---- + fs/cifs/cifs_swn.c | 2 +- + fs/cifs/cifsacl.c | 379 +++++++++++++++++++----- + fs/cifs/cifsacl.h | 4 +- + fs/cifs/cifsencrypt.c | 6 +- + fs/cifs/cifsfs.c | 15 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 11 +- + fs/cifs/connect.c | 25 +- + fs/cifs/file.c | 8 +- + fs/cifs/fs_context.c | 32 +- + fs/cifs/fs_context.h | 6 +- + fs/cifs/inode.c | 23 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2ops.c | 109 +++++-- + fs/cifs/smb2pdu.c | 22 +- + fs/cifs/trace.h | 36 ++- + fs/cifs/transport.c | 63 ++-- + 23 files changed, 688 insertions(+), 255 deletions(-) +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ 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 (ce0631291813 erofs: initialized fields can only be observed after bit is set) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (b12b47249688 Merge tag 'powerpc-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (c5b8ccc3da76 Pull udf & isofs UID/GID parsing fixes.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (0a76945fd1ba ext4: add .kunitconfig fragment to enable ext4-specific tests) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/fast_commit.c +Merge made by the 'recursive' strategy. + fs/ext4/.kunitconfig | 3 +++ + fs/ext4/Kconfig | 3 +-- + fs/ext4/extents.c | 16 ++++++++-------- + fs/ext4/fast_commit.c | 29 +++++++++++------------------ + fs/ext4/namei.c | 45 +++++++++++++++++++++++++++------------------ + fs/ext4/super.c | 12 +++++++++--- + 6 files changed, 59 insertions(+), 49 deletions(-) + create mode 100644 fs/ext4/.kunitconfig +Merging f2fs/dev (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (92bf22614b21 Linux 5.11-rc7) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (7ae017c7322e NFS: Support the '-owrite=' option in /proc/self/mounts and mountinfo) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_backchannel.c +Auto-merging include/linux/nfs_fs.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs3acl.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/file.c | 27 +++- + fs/nfs/fs_context.c | 35 +++++ + fs/nfs/fscache.c | 4 - + fs/nfs/inode.c | 111 ++++++++++------ + fs/nfs/nfs3acl.c | 1 + + fs/nfs/nfs4client.c | 1 + + fs/nfs/nfs4proc.c | 21 ++- + fs/nfs/nfs4state.c | 1 + + fs/nfs/pnfs.c | 2 + + fs/nfs/read.c | 204 +++++++++++++---------------- + fs/nfs/super.c | 7 + + fs/nfs/write.c | 37 ++++-- + include/linux/nfs_fs.h | 3 +- + include/linux/nfs_fs_sb.h | 4 +- + include/trace/events/rpcrdma.h | 50 ++++++- + net/sunrpc/rpc_pipe.c | 1 + + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 12 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 67 +++------- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 4 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 15 ++- + net/sunrpc/xprtsock.c | 17 ++- + 22 files changed, 356 insertions(+), 272 deletions(-) +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 (f1dc78fb9a13 NFSD: Clean up after updating NFSv3 ACL encoders) +$ git merge cel/for-next +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs3acl.c +Auto-merging fs/nfsd/nfs2acl.c +Merge made by the 'recursive' strategy. + fs/nfs_common/nfsacl.c | 71 +++ + fs/nfsd/nfs2acl.c | 87 ++-- + fs/nfsd/nfs3acl.c | 39 +- + fs/nfsd/nfs3proc.c | 97 ++-- + fs/nfsd/nfs3xdr.c | 1043 +++++++++++++++++++++++++++----------------- + fs/nfsd/nfs4proc.c | 31 +- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 110 ++--- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsfh.h | 2 +- + fs/nfsd/nfsproc.c | 53 ++- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/nfsxdr.c | 410 ++++++++++------- + 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/xdr.h | 20 + + net/sunrpc/xdr.c | 2 +- + 21 files changed, 1235 insertions(+), 834 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 (1cd738b13ae9 xfs: consider shutdown in bmapbt cursor delete assert) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (059c01039c01 zonefs: Fix file size of zones in full condition) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (ed1128c2d0c8 xfs: reduce exclusive locking on unaligned dio) +$ 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 (cc4a3f885e8f fcntl: make F_GETOWN(EX) return 0 on dead owner task) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (934ada4633ef Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/mount.h +Auto-merging include/linux/binfmts.h +Auto-merging fs/namespace.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging drivers/staging/vme/devices/vme_user.c +Auto-merging drivers/rtc/rtc-m41t80.c +Auto-merging drivers/block/loop.c +Removing arch/sparc/mm/extable.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Resolved 'fs/coredump.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a65f72b73f76] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 7 + + arch/powerpc/platforms/cell/spufs/coredump.c | 3 +- + arch/sh/boards/mach-landisk/gio.c | 6 +- + arch/sparc/include/asm/elf_64.h | 1 - + arch/sparc/include/asm/{extable_64.h => extable.h} | 4 +- + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/include/asm/uaccess.h | 3 + + arch/sparc/include/asm/uaccess_32.h | 38 --- + arch/sparc/include/asm/uaccess_64.h | 1 - + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 - + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 106 +------ + arch/sparc/lib/checksum_32.S | 64 ++--- + arch/sparc/lib/copy_user.S | 315 ++++++++------------- + arch/sparc/lib/memset.S | 87 +++--- + arch/sparc/mm/Makefile | 2 +- + arch/sparc/mm/extable.c | 107 ------- + arch/sparc/mm/fault_32.c | 80 +----- + arch/sparc/mm/mm_32.h | 2 - + drivers/block/loop.c | 2 +- + drivers/dax/super.c | 2 +- + drivers/infiniband/hw/qib/qib_fs.c | 68 +---- + drivers/rtc/rtc-m41t80.c | 4 +- + drivers/s390/char/vmur.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 12 +- + fs/9p/vfs_inode.c | 21 +- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/coredump.c | 72 +++-- + fs/gfs2/inode.c | 4 +- + fs/inode.c | 1 + + fs/jfs/super.c | 1 - + fs/namespace.c | 53 ++-- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 14 +- + include/linux/mount.h | 1 - + kernel/audit_fsnotify.c | 2 +- + lib/extable.c | 5 - + 42 files changed, 310 insertions(+), 818 deletions(-) + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c +Merging printk/for-next (f78dd21aa363 Merge branch 'for-5.12-no_hash_pointers' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (e18fb64b7986 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/acpi.h +Removing drivers/pci/pcie/bw_notification.c +Auto-merging drivers/pci/pci.c +Removing drivers/pci/controller/pcie-tango.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/gpu/drm/qxl/qxl_drv.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Merge made by the 'recursive' strategy. + .../PCI/endpoint/function/binding/pci-ntb.rst | 38 + + Documentation/PCI/endpoint/index.rst | 3 + + Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 10 + + Documentation/PCI/endpoint/pci-ntb-function.rst | 348 ++++ + Documentation/PCI/endpoint/pci-ntb-howto.rst | 161 ++ + .../devicetree/bindings/arm/rockchip.yaml | 1 + + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 37 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 1 + + .../bindings/pci/microchip,pcie-host.yaml | 92 + + .../devicetree/bindings/pci/qcom,pcie.txt | 17 +- + MAINTAINERS | 9 +- + arch/s390/include/asm/facility.h | 2 +- + drivers/acpi/pci_root.c | 40 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/misc/pci_endpoint_test.c | 1 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 +- + drivers/ntb/hw/Kconfig | 1 + + drivers/ntb/hw/Makefile | 1 + + drivers/ntb/hw/epf/Kconfig | 6 + + drivers/ntb/hw/epf/Makefile | 1 + + drivers/ntb/hw/epf/ntb_hw_epf.c | 753 +++++++ + drivers/pci/Makefile | 2 +- + drivers/pci/controller/Kconfig | 35 +- + drivers/pci/controller/Makefile | 2 +- + drivers/pci/controller/cadence/pci-j721e.c | 3 + + drivers/pci/controller/cadence/pcie-cadence-ep.c | 60 +- + drivers/pci/controller/cadence/pcie-cadence-host.c | 86 +- + drivers/pci/controller/cadence/pcie-cadence.h | 11 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 7 + + drivers/pci/controller/dwc/pci-layerscape.c | 5 +- + drivers/pci/controller/dwc/pcie-al.c | 4 - + drivers/pci/controller/dwc/pcie-designware-ep.c | 8 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 53 +- + drivers/pci/controller/dwc/pcie-designware.c | 70 +- + drivers/pci/controller/dwc/pcie-designware.h | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 22 +- + drivers/pci/controller/pci-host-common.c | 4 +- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/pci/controller/pci-xgene-msi.c | 10 +- + drivers/pci/controller/pci-xgene.c | 13 +- + drivers/pci/controller/pcie-altera-msi.c | 3 +- + drivers/pci/controller/pcie-brcmstb.c | 35 +- + drivers/pci/controller/pcie-mediatek.c | 7 +- + drivers/pci/controller/pcie-microchip-host.c | 1138 +++++++++++ + drivers/pci/controller/pcie-rcar-host.c | 2 +- + drivers/pci/controller/pcie-rockchip.c | 12 +- + drivers/pci/controller/pcie-tango.c | 341 ---- + drivers/pci/controller/pcie-xilinx-cpm.c | 1 + + drivers/pci/endpoint/functions/Kconfig | 13 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-ntb.c | 2128 ++++++++++++++++++++ + drivers/pci/endpoint/functions/pci-epf-test.c | 13 +- + drivers/pci/endpoint/pci-ep-cfs.c | 176 +- + drivers/pci/endpoint/pci-epc-core.c | 130 +- + drivers/pci/endpoint/pci-epf-core.c | 105 +- + drivers/pci/hotplug/acpiphp.h | 3 - + drivers/pci/pci-bridge-emul.c | 11 +- + drivers/pci/pci.c | 4 + + drivers/pci/pcie/Kconfig | 8 - + drivers/pci/pcie/Makefile | 1 - + drivers/pci/pcie/aer.c | 5 +- + drivers/pci/pcie/bw_notification.c | 138 -- + drivers/pci/pcie/err.c | 16 +- + drivers/pci/pcie/portdrv.h | 6 - + drivers/pci/pcie/portdrv_pci.c | 4 +- + drivers/pci/search.c | 4 - + drivers/pci/setup-res.c | 6 + + drivers/pci/syscall.c | 10 +- + include/linux/acpi.h | 3 - + include/linux/pci-epc.h | 39 +- + include/linux/pci-epf.h | 28 +- + include/linux/pci_ids.h | 3 + + lib/logic_pio.c | 3 + + 73 files changed, 5543 insertions(+), 781 deletions(-) + create mode 100644 Documentation/PCI/endpoint/function/binding/pci-ntb.rst + create mode 100644 Documentation/PCI/endpoint/pci-ntb-function.rst + create mode 100644 Documentation/PCI/endpoint/pci-ntb-howto.rst + create mode 100644 Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml + create mode 100644 drivers/ntb/hw/epf/Kconfig + create mode 100644 drivers/ntb/hw/epf/Makefile + create mode 100644 drivers/ntb/hw/epf/ntb_hw_epf.c + create mode 100644 drivers/pci/controller/pcie-microchip-host.c + delete mode 100644 drivers/pci/controller/pcie-tango.c + create mode 100644 drivers/pci/endpoint/functions/pci-epf-ntb.c + delete mode 100644 drivers/pci/pcie/bw_notification.c +Merging pstore/for-next/pstore (9c7d83ae6ba6 pstore: Fix warning in pstore_kill_sb()) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (914fe0466c86 Merge branch 'for-5.12/playstation-v2' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (35ea257a39ae Merge branch 'i2c/for-5.12' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (5c34b8e7e8bb i3c: master: dw: Drop redundant disec call) +$ git merge i3c/i3c/next +Already up to date. +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 (6ab3332cc692 MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (c418eed8c3b7 docs: ABI: testing: ima_policy: Fixed missing bracket) +$ git merge jc_docs/docs-next +Auto-merging Documentation/ABI/testing/ima_policy +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 2 +- + Documentation/conf.py | 3 +-- + Documentation/filesystems/proc.rst | 4 ++++ + Documentation/process/4.Coding.rst | 2 +- + Documentation/process/submit-checklist.rst | 2 +- + Documentation/translations/it_IT/process/4.Coding.rst | 2 +- + Documentation/translations/it_IT/process/submit-checklist.rst | 2 +- + Documentation/translations/zh_CN/process/4.Coding.rst | 2 +- + drivers/gpu/drm/tilcdc/Makefile | 2 +- + scripts/kernel-doc | 2 +- + 10 files changed, 13 insertions(+), 10 deletions(-) +Merging v4l-dvb/master (8f202f8e9ff3 media: v4l: async: Fix kerneldoc documentation for async functions) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) +$ git merge v4l-dvb-next/master +Auto-merging scripts/kernel-doc +Auto-merging include/linux/refcount.h +Auto-merging include/linux/phy.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/index.rst +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/dev-tools/kasan.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +CONFLICT (content): Merge conflict in Documentation/conf.py +Resolved 'Documentation/conf.py' using previous resolution. +Resolved 'Documentation/dev-tools/kasan.rst' using previous resolution. +Resolved 'drivers/gpu/drm/drm_dp_helper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 48c1e1e01bc2] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. +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 (aa2245914698 Merge branches 'acpi-platform' and 'acpi-tables' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-acpi | 43 ++++ + Documentation/ABI/testing/sysfs-platform_profile | 18 +- + drivers/acpi/Kconfig | 24 +-- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_fpdt.c | 264 +++++++++++++++++++++++ + drivers/acpi/platform_profile.c | 1 + + drivers/platform/x86/Kconfig | 4 +- + include/linux/platform_profile.h | 6 +- + 8 files changed, 334 insertions(+), 27 deletions(-) + create mode 100644 drivers/acpi/acpi_fpdt.c +Merging cpufreq-arm/cpufreq/arm/linux-next (67fc209b527d cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (3a3ecfdb605c cpupower: Add cpuid cap flag for MSR_AMD_HWCR support) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (fc1745c0e40c PM / devfreq: rk3399_dmc: Remove unneeded semicolon) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (de04241ab87a opp: Don't skip freq update for different frequency) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (a51afb13311c thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error) +$ git merge thermal/thermal/linux-next +Already up to date. +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 (4f19d071f9be fs: dlm: check on existing node address) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (47cfc5be1934 swiotlb: Validate bounce size in the sync/unmap path) +$ git merge swiotlb/linux-next +Auto-merging include/linux/dma-mapping.h +Auto-merging include/linux/device.h +Auto-merging drivers/nvme/host/pci.c +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci.c | 9 +- + drivers/nvme/host/pci.c | 1 + + include/linux/device.h | 1 + + include/linux/dma-mapping.h | 16 +++ + include/linux/swiotlb.h | 1 + + kernel/dma/swiotlb.c | 310 +++++++++++++++++++++++++++----------------- + 6 files changed, 215 insertions(+), 123 deletions(-) +Merging rdma/for-next (7289e26f395b Merge tag 'v5.11' into rdma.git for-next) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (432119de33d9 net/mlx5: Add cyc2time HW translation mode support) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam()) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (a61e4b60761f Merge branch 'net-dsa-hellcreek-add-taprio-offloading') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (773dc50d7169 Merge branch 'Xilinx-axienet-updates') +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam()) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f6e1e1d1e149 Merge tag 'gfs2-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (6e9dff6fe3fb dt-bindings: mtd: add binding for BCM4908 partitions) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (073abfa7ea9a mtd: rawnand: intel: Fix an error handling path in 'ebu_dma_start()') +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (75386810d3a6 mtd: spi-nor: sst: Add support for Global Unlock on sst26vf) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (12458e351799 Merge tag 'drm-msm-next-2021-02-07' of https://gitlab.freedesktop.org/drm/msm into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 2 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 195 ++++++++++++++++++--- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 105 ++++++----- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 49 ++---- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 139 ++++++++++++++- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 54 +++++- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 23 +-- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 22 ++- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 90 ++++++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 87 ++++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 26 +++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 14 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 73 +++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 7 - + drivers/gpu/drm/msm/dp/dp_catalog.c | 24 +++ + drivers/gpu/drm/msm/dp/dp_ctrl.c | 15 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- + drivers/gpu/drm/msm/dp/dp_display.c | 24 ++- + drivers/gpu/drm/msm/dp/dp_panel.c | 3 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 2 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 21 +-- + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 + + drivers/gpu/drm/msm/msm_kms.h | 8 +- + 36 files changed, 803 insertions(+), 219 deletions(-) +Merging drm-misc/for-linux-next (583065c7aa23 drm/drm_vblank: set the dma-fence timestamp during send_vblank_event) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + .../bindings/display/connector/dp-connector.yaml | 1 - + drivers/dma-buf/dma-fence.c | 70 +++++++++++++++++++--- + drivers/dma-buf/dma-heap.c | 14 ++++- + drivers/dma-buf/heaps/cma_heap.c | 22 +++---- + drivers/dma-buf/heaps/system_heap.c | 25 ++++---- + drivers/gpu/drm/drm_file.c | 68 +++++++++++++++++---- + drivers/gpu/drm/drm_vblank.c | 9 ++- + drivers/video/fbdev/aty/atyfb_base.c | 9 +++ + include/drm/drm_file.h | 3 + + include/linux/dma-fence.h | 3 + + include/linux/dma-heap.h | 12 ++-- + 11 files changed, 178 insertions(+), 58 deletions(-) +Merging amdgpu/drm-next (0de5c1dcd380 drm/amdgpu: always reset the asic in suspend) +$ git merge amdgpu/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Kconfig | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 180 ++++-------- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 43 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 46 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 25 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 88 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 73 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 184 +++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 77 +++++ + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 48 +-- + drivers/gpu/drm/amd/amdgpu/nv.c | 181 ++++++++++++ + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 +++++++ + drivers/gpu/drm/amd/amdgpu/soc15.c | 232 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 190 ++++++++++++ + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 47 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 327 +++++++++++++++------ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 35 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 67 ++--- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 72 ++++- + drivers/gpu/drm/amd/display/dc/core/dc.c | 109 +++---- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 +++ + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 22 ++ + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 17 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 52 +++- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 10 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 261 ++++++++++++++-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 - + 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 | 123 ++++++++ + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 9 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 66 +---- + 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 | 24 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 - + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 22 ++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 7 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 7 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 7 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 25 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 3 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 6 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 40 +-- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 2 +- + 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_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_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 32 +- + drivers/gpu/drm/radeon/radeon_ring.c | 80 +++-- + drivers/gpu/drm/radeon/radeon_ttm.c | 86 +++--- + drivers/gpu/drm/radeon/rs400.c | 25 +- + drivers/gpu/drm/radeon/rs600.c | 8 +- + drivers/gpu/drm/radeon/rv515.c | 56 +--- + include/uapi/drm/amdgpu_drm.h | 34 +++ + 109 files changed, 2632 insertions(+), 1320 deletions(-) + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c +Merging drm-intel/for-linux-next (ed428ffc2852 drm/i915: Nuke INTEL_OUTPUT_FORMAT_INVALID) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Makefile +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/Makefile | 1 - + drivers/gpu/drm/i915/display/intel_crtc.c | 1 - + drivers/gpu/drm/i915/display/intel_display.c | 3 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 1 - + drivers/gpu/drm/i915/gvt/cmd_parser.c | 93 +++++----------------- + drivers/gpu/drm/i915/gvt/execlist.c | 8 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 52 +++++++++--- + 7 files changed, 65 insertions(+), 94 deletions(-) +Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (8490f02a3ca4 drm/msm: a6xx: Make sure the SQE microcode is safe) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 77 +++++++++++++++++++++++++++++------ + drivers/gpu/drm/msm/msm_atomic.c | 7 +++- + drivers/gpu/drm/msm/msm_kms.h | 8 +--- + 4 files changed, 72 insertions(+), 22 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 (aa3233086b48 Merge remote-tracking branch 'regmap/for-5.12' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (c4294d7f057d ALSA: hda: intel-dsp-config: add Alder Lake support) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (886fbd78319f Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +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 (4c47097f8514 Input: aiptek - convert sysfs sprintf/snprintf family to sysfs_emit) +$ git merge input/next +Already up to date. +Merging block/for-next (226fc5e811e1 Merge branch 'io_uring-worker.v3' into for-next) +$ git merge block/for-next +Auto-merging net/socket.c +Auto-merging kernel/trace/blktrace.c +Auto-merging drivers/block/loop.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/riscv/kernel/process.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/openrisc/kernel/process.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/process.c | 2 +- + arch/arc/kernel/process.c | 2 +- + arch/arm/kernel/process.c | 2 +- + arch/arm64/kernel/process.c | 2 +- + arch/csky/kernel/process.c | 2 +- + arch/h8300/kernel/process.c | 2 +- + arch/hexagon/kernel/process.c | 2 +- + arch/ia64/kernel/process.c | 2 +- + arch/m68k/kernel/process.c | 2 +- + arch/microblaze/kernel/process.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/nds32/kernel/process.c | 2 +- + arch/nios2/kernel/process.c | 2 +- + arch/openrisc/kernel/process.c | 2 +- + arch/parisc/kernel/process.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/riscv/kernel/process.c | 2 +- + arch/s390/kernel/process.c | 2 +- + arch/sh/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/xtensa/kernel/process.c | 2 +- + block/bfq-iosched.c | 4 +- + block/blk-core.c | 1 + + block/blk-crypto-fallback.c | 12 +- + block/blk-mq-sched.c | 6 - + block/blk-mq-sched.h | 1 - + block/blk-pm.h | 38 - + block/blk-settings.c | 12 + + block/blk-sysfs.c | 7 +- + block/bounce.c | 24 +- + block/genhd.c | 4 +- + block/ioctl.c | 21 +- + block/kyber-iosched.c | 33 +- + block/mq-deadline.c | 4 +- + drivers/block/loop.c | 3 + + drivers/block/nbd.c | 32 +- + fs/io-wq.c | 588 ++++++------- + fs/io-wq.h | 32 +- + fs/io_uring.c | 1723 +++++++++++++++----------------------- + fs/proc/self.c | 7 - + fs/proc/thread_self.c | 7 - + include/linux/blkdev.h | 1 - + include/linux/blktrace_api.h | 4 +- + include/linux/io_uring.h | 22 +- + include/linux/net.h | 3 - + include/linux/sched.h | 3 + + include/trace/events/bcache.h | 10 +- + include/trace/events/block.h | 20 +- + include/uapi/linux/io_uring.h | 1 + + kernel/ptrace.c | 2 +- + kernel/signal.c | 4 +- + kernel/trace/blktrace.c | 20 +- + net/ipv4/af_inet.c | 1 - + net/ipv6/af_inet6.c | 1 - + net/socket.c | 10 - + 58 files changed, 1130 insertions(+), 1579 deletions(-) +Merging device-mapper/for-next (a666e5c05e7c dm: fix deadlock when swapping to encrypted device) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev()) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cistpl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (a56f44138a2c mmc: sdhci-esdhc-imx: fix kernel panic when remove module) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (26783d74cc6a mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (0b5e0f45af40 backlight/video: Use Platform getter/setter functions) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (a72acc56f3e9 power-supply: use kobj_to_dev()) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (4a8a7d251201 Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +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 (f6692213b504 integrity: Make function integrity_add_key() static) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (5bcd72358a7d Merge branch 'keys-cve-2020-26541' into keys-next) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Merge made by the 'recursive' strategy. + certs/Kconfig | 8 ++++ + certs/Makefile | 20 ++++++-- + certs/blacklist.c | 49 +++++++++++++++++++ + certs/blacklist.h | 12 +++++ + certs/common.c | 56 ++++++++++++++++++++++ + certs/common.h | 9 ++++ + certs/revocation_certificates.S | 21 ++++++++ + certs/system_keyring.c | 55 ++++----------------- + include/keys/system_keyring.h | 11 +++++ + scripts/Makefile | 1 + + .../integrity/platform_certs/keyring_handler.c | 11 +++++ + security/integrity/platform_certs/load_uefi.c | 20 +++++++- + 12 files changed, 222 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 (365982aba1f2 fs: anon_inodes: rephrase to appropriate kernel-doc) +$ git merge selinux/next +Already up to date. +Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (a4f3407c4160 watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (45e606f27269 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging audit/next (127c8c5f0589 audit: Make audit_filter_syscall() return void) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (cb8be8b4b27f driver core: platform: Drop of_device_node_put() wrapper) +$ git merge devicetree/for-next +Already up to date. +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 (21b49223c0f5 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (2126d722fe93 Merge branch 'sched/smp') +$ git merge tip/auto-latest +Auto-merging include/asm-generic/Kbuild +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/include/asm/Kbuild +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/kernel/irq.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/kernel/irq.c +Auto-merging arch/parisc/Kconfig +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 6 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/hardirq.h | 4 - + arch/parisc/kernel/irq.c | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/irq.h | 2 - + arch/powerpc/kernel/irq.c | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/hardirq.h | 1 - + arch/s390/kernel/irq.c | 1 + + arch/sh/Kconfig | 1 + + arch/sh/include/asm/irq.h | 1 - + arch/sh/kernel/irq.c | 1 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/irq_64.h | 1 - + arch/sparc/kernel/irq_64.c | 1 + + arch/um/include/asm/Kbuild | 1 + + arch/x86/Kconfig | 2 + + arch/x86/entry/common.c | 19 +-- + arch/x86/entry/entry_64.S | 41 ----- + arch/x86/include/asm/idtentry.h | 11 +- + arch/x86/include/asm/irq.h | 2 - + arch/x86/include/asm/irq_stack.h | 279 +++++++++++++++++++++++++---------- + arch/x86/include/asm/processor.h | 9 +- + arch/x86/include/asm/softirq_stack.h | 11 ++ + arch/x86/kernel/apic/apic.c | 31 ++-- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 22 ++- + arch/x86/kernel/irq.c | 2 +- + arch/x86/kernel/irq_32.c | 1 + + arch/x86/kernel/irq_64.c | 12 +- + arch/x86/kernel/process_64.c | 2 +- + include/asm-generic/Kbuild | 1 + + include/asm-generic/softirq_stack.h | 14 ++ + include/linux/interrupt.h | 9 -- + kernel/softirq.c | 2 + + kernel/time/hrtimer.c | 32 ++-- + 37 files changed, 323 insertions(+), 209 deletions(-) + create mode 100644 arch/x86/include/asm/softirq_stack.h + create mode 100644 include/asm-generic/softirq_stack.h +Merging clockevents/timers/drivers/next (e85c1d21b16b clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume) +$ git merge clockevents/timers/drivers/next +Already up to date. +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 (c83fd57be3fe irqdomain: Remove debugfs_file from struct irq_domain) +$ git merge irqchip/irq/irqchip-next +Auto-merging kernel/irq/irqdomain.c +Auto-merging fs/debugfs/inode.c +Merge made by the 'recursive' strategy. + include/linux/irqdomain.h | 4 ---- + kernel/irq/irqdomain.c | 9 ++++----- + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging ftrace/for-next (e23db805da2d tracing/tools: Add the latency-collector to tools directory) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (c8c430f4a2fb Merge branch 'nolibc.2021.01.21a' into HEAD) +$ git merge rcu/rcu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging kvm/next (8c6e67bec319 Merge tag 'kvmarm-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (c93199e93e12 Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +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 (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (53f131c284e8 xen-front-pgdir-shbuf: don't record wrong grant handle upon error) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-xenbus | 41 ++++++++++++++++ + drivers/xen/events/events_base.c | 27 ++++++++++- + drivers/xen/evtchn.c | 29 ++++++----- + drivers/xen/xen-acpi-processor.c | 3 +- + drivers/xen/xen-front-pgdir-shbuf.c | 11 ++++- + drivers/xen/xenbus/xenbus_probe.c | 66 ++++++++++++++++++++++++++ + include/xen/xenbus.h | 7 +++ + 7 files changed, 168 insertions(+), 16 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-xenbus +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 (e9ad2eb3d9ae workqueue: Use %s instead of function name) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (a7d53dbbc70a platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (b996c10e0f5b Merge tag 'tag-chrome-platform-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 (b0a82efa51ad leds: lp50xx: Get rid of redundant explicit casting) +$ git merge leds/for-next +Auto-merging drivers/leds/leds-lm3533.c +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lgm.yaml | 113 +++ + drivers/leds/Kconfig | 3 + + drivers/leds/Makefile | 3 + + drivers/leds/blink/Kconfig | 20 + + drivers/leds/blink/Makefile | 2 + + drivers/leds/blink/leds-lgm-sso.c | 888 +++++++++++++++++++++ + drivers/leds/led-class.c | 3 +- + drivers/leds/led-core.c | 20 +- + drivers/leds/leds-apu.c | 11 +- + drivers/leds/leds-blinkm.c | 24 +- + drivers/leds/leds-gpio.c | 3 +- + drivers/leds/leds-lm3530.c | 10 +- + drivers/leds/leds-lm3533.c | 2 +- + drivers/leds/leds-lm355x.c | 8 +- + drivers/leds/leds-lm3642.c | 16 +- + drivers/leds/leds-lp50xx.c | 83 +- + drivers/leds/leds-max8997.c | 12 +- + drivers/leds/leds-netxbig.c | 12 +- + drivers/leds/leds-ss4200.c | 18 +- + drivers/leds/leds-wm831x-status.c | 12 +- + drivers/leds/leds.h | 6 +- + include/linux/led-class-flash.h | 42 +- + include/linux/led-class-multicolor.h | 42 +- + include/linux/leds.h | 12 +- + 24 files changed, 1196 insertions(+), 169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lgm.yaml + create mode 100644 drivers/leds/blink/Kconfig + create mode 100644 drivers/leds/blink/Makefile + create mode 100644 drivers/leds/blink/leds-lgm-sso.c +Merging ipmi/for-next (fc26067c7417 ipmi: remove open coded version of SMBus block write) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (719bbd4a509f Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (1542d1324be1 USB: serial: drop bogus to_usb_serial_port() checks) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (1ee18ded86ec usb: cdnsp: Removes some useless trace events) +$ git merge usb-chipidea-next/for-usb-next +Already up to date. +Merging tty/tty-next (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (719bbd4a509f Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (bb512233bffe extcon: qcom-spmi: Add support for VBUS detection) +$ git merge extcon/extcon-next +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 ++++- + include/linux/extcon.h | 23 +++++ + 6 files changed, 189 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 (d68f2cb09597 phy: cpcap-usb: Simplify bool conversion) +$ git merge phy-next/next +Already up to date. +Merging soundwire/next (8d8d95842867 regmap: sdw-mbq: use MODULE_LICENSE("GPL")) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (c6da62a219d0 thunderbolt: Add support for native USB4 _OSC) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge staging/staging-next +Already up to date. +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 (6715ea06ced4 Merge branch 'icc-sdx55' into icc-next) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (eda38ce482b2 dmaengine: dw-axi-dmac: remove redundant null check on desc) +$ git merge dmaengine/next +Already up to date. +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 (89263dedffa2 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 - + drivers/scsi/isci/request.c | 8 +- + drivers/scsi/iscsi_tcp.c | 9 +- + drivers/scsi/libiscsi.c | 348 ++++++++++++++++++---------- + drivers/scsi/libiscsi_tcp.c | 86 ++++--- + drivers/scsi/mpt3sas/mpt3sas_base.c | 58 +++-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 52 ++++- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 67 +++++- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 22 ++ + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 44 +++- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 38 ++- + drivers/scsi/pmcraid.h | 6 +- + drivers/scsi/qla2xxx/qla_target.c | 3 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 3 - + drivers/scsi/sd.c | 8 +- + drivers/scsi/ufs/ufshcd.c | 6 +- + drivers/target/sbp/sbp_target.c | 2 +- + include/scsi/libiscsi.h | 6 +- + 19 files changed, 561 insertions(+), 209 deletions(-) +Merging scsi-mkp/for-next (f749d8b7a989 scsi: hpsa: Correct dev cmds outstanding for retried cmds) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/sd_zbc.c +Merge made by the 'recursive' strategy. + drivers/scsi/aic7xxx/aic79xx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx.h | 2 - + drivers/scsi/bnx2fc/Kconfig | 1 + + drivers/scsi/hpsa.c | 51 +++++++-- + drivers/scsi/hpsa_cmd.h | 2 +- + drivers/scsi/sd.c | 6 +- + drivers/scsi/sd_zbc.c | 6 +- + drivers/scsi/ufs/ufshcd.h | 2 +- + drivers/target/target_core_pr.c | 15 ++- + drivers/target/target_core_transport.c | 15 ++- + drivers/target/target_core_user.c | 189 ++++++++++++++++++--------------- + include/target/target_core_backend.h | 1 + + 12 files changed, 185 insertions(+), 107 deletions(-) +Merging vhost/linux-next (2ec759d2fc93 vdpa_sim: Skip typecasting from void*) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/block/virtio_blk.c | 11 +- + drivers/net/virtio_net.c | 1 + + drivers/vdpa/Kconfig | 8 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_main.c | 5 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 6 +- + drivers/vdpa/vdpa.c | 511 +++++++++++++++++++++++++++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 2 + + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 101 ++++-- + drivers/vdpa/virtio_pci/Makefile | 2 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 458 +++++++++++++++++++++++++ + drivers/vhost/scsi.c | 9 +- + drivers/virtio/Kconfig | 9 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 6 +- + drivers/virtio/virtio_input.c | 26 +- + drivers/virtio/virtio_mem.c | 2 +- + drivers/virtio/virtio_mmio.c | 5 +- + drivers/virtio/virtio_pci_common.h | 22 +- + drivers/virtio/virtio_pci_modern.c | 506 ++++------------------------ + drivers/virtio/virtio_pci_modern_dev.c | 599 +++++++++++++++++++++++++++++++++ + drivers/virtio/virtio_vdpa.c | 3 +- + include/linux/vdpa.h | 48 ++- + include/linux/virtio.h | 2 - + include/linux/virtio_pci_modern.h | 111 ++++++ + include/uapi/linux/vdpa.h | 40 +++ + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_snd.h | 334 ++++++++++++++++++ + sound/Kconfig | 2 + + sound/Makefile | 3 +- + sound/virtio/Kconfig | 10 + + sound/virtio/Makefile | 13 + + sound/virtio/virtio_card.c | 462 +++++++++++++++++++++++++ + sound/virtio/virtio_card.h | 113 +++++++ + 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 | 498 +++++++++++++++++++++++++++ + sound/virtio/virtio_pcm.h | 120 +++++++ + sound/virtio/virtio_pcm_msg.c | 392 +++++++++++++++++++++ + sound/virtio/virtio_pcm_ops.c | 491 +++++++++++++++++++++++++++ + 44 files changed, 5260 insertions(+), 526 deletions(-) + create mode 100644 drivers/vdpa/virtio_pci/Makefile + create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c + create mode 100644 drivers/virtio/virtio_pci_modern_dev.c + create mode 100644 include/linux/virtio_pci_modern.h + create mode 100644 include/uapi/linux/vdpa.h + 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 rpmsg/for-next (fcb4c469244b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/remoteproc/pru_rproc.c | 18 ++++++++++++++++++ + drivers/remoteproc/qcom_pil_info.c | 2 +- + 3 files changed, 21 insertions(+), 1 deletion(-) +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 (a8002a35935a gpio: pcf857x: Fix missing first interrupt) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (c5318e248f52 gpio: msic: Drop driver from Makefile) +$ git merge gpio-intel/for-next +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging pinctrl/for-next (b40b760aa2a9 pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (0e793a4e2834 pinctrl: tigerlake: Add Alder Lake-P ACPI ID) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (a5cda861ed57 pinctrl: renesas: r8a779a0: Add TPU pins, groups and functions) +$ git merge pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9a9dd7e47351 pwm: lpc18xx-sct: remove unneeded semicolon) +$ git merge pwm/for-next +Removing drivers/pwm/pwm-zx.c +Removing Documentation/devicetree/bindings/pwm/pwm-zx.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm-zx.txt | 22 -- + drivers/pwm/Kconfig | 10 - + drivers/pwm/Makefile | 1 - + drivers/pwm/pwm-iqs620a.c | 94 ++++---- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-rockchip.c | 32 ++- + drivers/pwm/pwm-zx.c | 278 ----------------------- + 7 files changed, 65 insertions(+), 374 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-zx.txt + delete mode 100644 drivers/pwm/pwm-zx.c +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 (e0c0840a46db selftests/seccomp: Accept any valid fd in user_notification_addfd) +$ 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 (49dfc1f16b03 rtc: abx80x: Add utility function for writing configuration key) +$ git merge rtc/rtc-next +Already up to date. +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 (5366c48f327e dt-bindings: eeprom: at24: Document ROHM BR24G01) +$ 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 (a381b70a1cf8 seccomp: Improve performace by optimizing rmb()) +$ git merge seccomp/for-next/seccomp +Already up to date. +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 (45d5996e034c 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 fe11164c4849] 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 (667fbb3fcde1 nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer) +$ git merge nvmem/for-next +Auto-merging drivers/of/platform.c +Merge made by the 'recursive' strategy. +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 (3019270282a1 Revert "Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer") +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (f11e2bc682cc kgdb: Remove kgdb_schedule_breakpoint()) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e41d4c011706 fpga: dfl: fme: Constify static attribute_group structs) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (e71ba9452f0b Linux 5.11-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 (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (7af29141a31a kunit: tool: fix unintentional statefulness in run_kernel()) +$ git merge kunit-next/kunit +Already up to date. +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 (9e04adfcab78 mhi: Fix double dma free) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. +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 (636b21b50152 PCI: Revoke mappings like devmem) +$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup +Already up to date. +Merging oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support) +$ git merge oprofile-removal/oprofile/removal +Already up to date. +Merging akpm-current/current (2e862ce7025b initramfs-panic-with-memory-information-fix) +$ git merge --no-ff akpm-current/current +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging init/initramfs.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +CONFLICT (content): Merge conflict in include/linux/pagemap.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/fs.h +Auto-merging fs/coredump.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging drivers/virtio/virtio_mem.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/vmem.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging CREDITS +Resolved 'fs/btrfs/file.c' using previous resolution. +Resolved 'include/linux/pagemap.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 371f8008a51a] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + CREDITS | 9 +- + Documentation/ABI/testing/sysfs-devices-memory | 58 +- + .../admin-guide/auxdisplay/cfag12864b.rst | 2 +- + Documentation/admin-guide/auxdisplay/ks0108.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 14 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 20 +- + Documentation/admin-guide/sysctl/vm.rst | 14 +- + Documentation/core-api/mm-api.rst | 7 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 32 +- + Documentation/dev-tools/kfence.rst | 298 +++++++ + Documentation/filesystems/seq_file.rst | 6 + + Documentation/vm/arch_pgtable_helpers.rst | 8 +- + MAINTAINERS | 26 +- + arch/alpha/configs/defconfig | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/cache.h | 1 - + arch/arm64/include/asm/kasan.h | 1 + + arch/arm64/include/asm/kfence.h | 22 + + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mte-def.h | 2 + + arch/arm64/include/asm/mte-kasan.h | 77 +- + arch/arm64/include/asm/mte.h | 2 - + arch/arm64/kernel/mte.c | 58 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/lib/mte.S | 16 - + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 21 +- + arch/hexagon/configs/comet_defconfig | 1 - + arch/ia64/include/asm/pgtable.h | 6 - + arch/ia64/mm/init.c | 14 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/s390/mm/init.c | 1 + + arch/s390/mm/vmem.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kfence.h | 64 ++ + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/mm/fault.c | 6 + + arch/x86/mm/pat/memtype.c | 4 +- + drivers/auxdisplay/cfag12864b.c | 4 +- + drivers/auxdisplay/cfag12864bfb.c | 4 +- + drivers/auxdisplay/ks0108.c | 4 +- + drivers/base/memory.c | 35 +- + drivers/base/node.c | 33 +- + drivers/block/zram/zram_drv.c | 2 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/video/fbdev/acornfb.c | 34 - + drivers/virtio/virtio_mem.c | 43 +- + drivers/xen/balloon.c | 2 +- + fs/aio.c | 9 +- + fs/block_dev.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/buffer.c | 63 +- + fs/coredump.c | 4 +- + fs/dcache.c | 4 +- + fs/direct-io.c | 4 +- + fs/exec.c | 4 +- + fs/fhandle.c | 2 +- + fs/fuse/dev.c | 6 +- + fs/hugetlbfs/inode.c | 72 +- + fs/iomap/seek.c | 125 +-- + fs/ntfs/inode.c | 6 + + fs/ntfs/layout.h | 4 +- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/dlm/dlmast.c | 10 - + fs/ocfs2/dlm/dlmcommon.h | 4 - + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/super.c | 2 - + fs/pipe.c | 2 +- + fs/proc/base.c | 19 +- + fs/proc/meminfo.c | 10 +- + fs/proc/page.c | 40 +- + fs/proc/proc_sysctl.c | 4 +- + fs/proc/vmcore.c | 7 +- + fs/ramfs/inode.c | 13 + + fs/seq_file.c | 3 + + include/linux/bitops.h | 2 +- + include/linux/cfag12864b.h | 2 +- + include/linux/cred.h | 2 +- + include/linux/fortify-string.h | 302 +++++++ + include/linux/fs.h | 4 +- + include/linux/gfp.h | 16 + + include/linux/highmem-internal.h | 5 - + include/linux/highmem.h | 28 +- + include/linux/huge_mm.h | 15 +- + include/linux/hugetlb.h | 98 ++- + include/linux/init.h | 4 +- + include/linux/kasan-checks.h | 6 + + include/linux/kasan.h | 50 +- + include/linux/kfence.h | 222 +++++ + include/linux/khugepaged.h | 2 + + include/linux/ks0108.h | 2 +- + include/linux/mdev.h | 2 +- + include/linux/memcontrol.h | 43 +- + include/linux/memory.h | 3 +- + include/linux/memory_hotplug.h | 33 +- + include/linux/memremap.h | 12 + + include/linux/migrate.h | 2 +- + include/linux/mm.h | 22 +- + include/linux/mm_inline.h | 113 +-- + include/linux/mmzone.h | 71 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 10 +- + include/linux/page_counter.h | 9 +- + include/linux/pagemap.h | 11 +- + include/linux/pagevec.h | 4 - + include/linux/printk.h | 8 +- + include/linux/ptrace.h | 2 +- + include/linux/rmap.h | 3 +- + include/linux/sched.h | 8 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/stackdepot.h | 9 + + include/linux/string.h | 282 +------ + include/linux/swap.h | 8 +- + include/linux/vmstat.h | 6 + + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + include/linux/zsmalloc.h | 2 +- + include/trace/events/error_report.h | 74 ++ + include/trace/events/kmem.h | 24 +- + include/trace/events/pagemap.h | 11 +- + include/uapi/linux/firewire-cdev.h | 2 +- + include/uapi/linux/input.h | 2 +- + include/uapi/linux/mempolicy.h | 4 +- + init/Kconfig | 14 - + init/initramfs.c | 19 +- + init/main.c | 5 + + init/version.c | 8 - + kernel/events/core.c | 8 +- + kernel/events/uprobes.c | 2 +- + kernel/groups.c | 7 +- + kernel/hung_task.c | 44 + + kernel/locking/rtmutex.c | 4 +- + kernel/locking/rwsem.c | 2 +- + kernel/locking/semaphore.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/membarrier.c | 2 +- + kernel/sysctl.c | 16 +- + kernel/trace/Makefile | 1 + + kernel/trace/error_report-traces.c | 12 + + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig | 9 + + lib/Kconfig.debug | 7 + + lib/Kconfig.kasan | 14 +- + lib/Kconfig.kfence | 82 ++ + lib/Kconfig.ubsan | 17 - + lib/Makefile | 2 +- + lib/cmdline.c | 7 +- + lib/genalloc.c | 3 +- + lib/hexdump.c | 9 +- + lib/seq_buf.c | 9 +- + lib/stackdepot.c | 37 +- + lib/test_kasan.c | 535 +++++++++--- + lib/test_kasan_module.c | 5 +- + lib/test_ubsan.c | 49 -- + lib/ubsan.c | 68 -- + mm/Makefile | 1 + + mm/backing-dev.c | 9 +- + mm/cma.c | 64 +- + mm/compaction.c | 73 +- + mm/debug.c | 10 +- + mm/debug_vm_pgtable.c | 86 +- + mm/dmapool.c | 3 +- + mm/early_ioremap.c | 12 +- + mm/filemap.c | 926 +++++++++++---------- + mm/gup.c | 5 +- + mm/huge_memory.c | 34 +- + mm/hugetlb.c | 346 ++++---- + mm/hugetlb_cgroup.c | 6 +- + mm/internal.h | 4 +- + mm/kasan/common.c | 237 ++++-- + mm/kasan/generic.c | 41 +- + mm/kasan/hw_tags.c | 18 +- + mm/kasan/kasan.h | 152 +++- + mm/kasan/quarantine.c | 22 +- + mm/kasan/report.c | 23 +- + mm/kasan/report_generic.c | 10 +- + mm/kasan/report_hw_tags.c | 8 +- + mm/kasan/report_sw_tags.c | 8 +- + mm/kasan/shadow.c | 83 +- + mm/kasan/sw_tags.c | 20 +- + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 845 +++++++++++++++++++ + mm/kfence/kfence.h | 113 +++ + mm/kfence/kfence_test.c | 858 +++++++++++++++++++ + mm/kfence/report.c | 260 ++++++ + mm/khugepaged.c | 28 +- + mm/list_lru.c | 12 +- + mm/memcontrol.c | 285 +++---- + mm/memory-failure.c | 40 +- + mm/memory.c | 24 +- + mm/memory_hotplug.c | 171 +++- + mm/mempolicy.c | 18 +- + mm/mempool.c | 2 +- + mm/memremap.c | 43 +- + mm/migrate.c | 10 +- + mm/mlock.c | 5 +- + mm/mmap.c | 47 +- + mm/mprotect.c | 7 +- + mm/mremap.c | 8 + + mm/msync.c | 6 +- + mm/oom_kill.c | 5 +- + mm/page_alloc.c | 268 +++--- + mm/page_io.c | 12 +- + mm/page_owner.c | 4 +- + mm/page_poison.c | 2 +- + mm/page_reporting.c | 2 +- + mm/pgtable-generic.c | 5 +- + mm/rmap.c | 57 +- + mm/shmem.c | 152 +--- + mm/slab.c | 59 +- + mm/slab.h | 20 +- + mm/slab_common.c | 63 +- + mm/slob.c | 2 +- + mm/slub.c | 232 +++--- + mm/swap.c | 88 +- + mm/swap_slots.c | 3 +- + mm/swap_state.c | 38 +- + mm/swapfile.c | 8 +- + mm/truncate.c | 131 +-- + mm/vmscan.c | 98 +-- + mm/vmstat.c | 81 +- + mm/workingset.c | 7 +- + mm/z3fold.c | 12 +- + mm/zbud.c | 1 + + mm/zpool.c | 13 + + mm/zsmalloc.c | 22 +- + mm/zswap.c | 57 +- + samples/auxdisplay/cfag12864b-example.c | 2 +- + scripts/Makefile.kasan | 10 +- + scripts/Makefile.ubsan | 2 - + scripts/checkpatch.pl | 152 +++- + scripts/gdb/linux/lists.py | 5 + + scripts/spelling.txt | 30 + + tools/objtool/check.c | 2 +- + 241 files changed, 7275 insertions(+), 3393 deletions(-) + create mode 100644 Documentation/dev-tools/kfence.rst + create mode 100644 arch/arm64/include/asm/kfence.h + create mode 100644 arch/x86/include/asm/kfence.h + create mode 100644 include/linux/fortify-string.h + create mode 100644 include/linux/kfence.h + create mode 100644 include/trace/events/error_report.h + create mode 100644 kernel/trace/error_report-traces.c + create mode 100644 lib/Kconfig.kfence + create mode 100644 mm/kfence/Makefile + create mode 100644 mm/kfence/core.c + create mode 100644 mm/kfence/kfence.h + create mode 100644 mm/kfence/kfence_test.c + create mode 100644 mm/kfence/report.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/1)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + fafe5ef21130...c80e4b3413a6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c80e4b3413a6 MIPS: make userspace mapping young by default) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/mips/mm/cache.c | 30 ++++++++++++++++-------------- + include/linux/pgtable.h | 8 -------- + mm/memory.c | 4 ---- + 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c3e20422bf2b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210225 |