diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-23 17:32:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-23 17:32:28 +1100 |
| commit | 8431fb50e1a7ffe7fcc4da2f798d3100315cee7b (patch) | |
| tree | a1ea9b12a7b3eac43b9f19ef2f13458cd0de8357 | |
| parent | a366e7de0b243dd17ed212d40b2f6d20a44a16a7 (diff) | |
Add linux-next specific files for 20210223next-20210223
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 | 10564 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 11235 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..84aa4f0d6b63 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,334 @@ +Name SHA1 +---- ---- +origin 7c70f3a7488d2fa62d32849d138bf2b8420fe788 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f +arc-current 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +arm-current 4d62e81b60d4025e2dfcd5ea531cc1394ce9226f +arm64-fixes 2596b6ae412be3d29632efc63976a2132032e620 +arm-soc-fixes 090e502e4e63c608ef8497d295feeb9743ef67b7 +drivers-memory-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +m68k-current c396dd2ec5bbd1cb80eafe32a72ab6bd6b17cb5a +powerpc-fixes f40ddce88593482919761f74910f42f4b84c004b +s390-fixes 92bf22614b21a2706f4993b278017e437f7785b3 +sparc 356184fb6d67770d7788f316226be810a430937b +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 3a2eb515d1367c0f667b76089a6e727279c688b8 +bpf 53f523f3052ac16bbc7718032aa6b848f971d28c +ipsec 3a2eb515d1367c0f667b76089a6e727279c688b8 +netfilter 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 +ipvs 44a674d6f79867d5652026f1cc11f7ba8a390183 +wireless-drivers 4538c5ed0f7e892f1b643472e48146757d1e60c5 +mac80211 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 +rdma-fixes 1048ba83fb1c00cd24172e23e8263972f6b5d9ac +sound-current c4294d7f057d05053412ebd0d5700228d0f2588d +sound-asoc-fixes ceae5d20f386be06e804463dd95524e0246952a1 +regmap-fixes 19c329f6808995b142b3966301f217c831e7cf31 +regulator-fixes e124039e956773b018ce034b0985a889ff5a473f +spi-fixes ecce3daec27ab1ae00b36a2c8022c98c071965a1 +pci-current 7e69d07d7c3c7a8ed69ff10a6fa65afa7c56685c +driver-core.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +tty.current 31caf8b2a847214be856f843e251fc2ed2cd1075 +usb.current 31caf8b2a847214be856f843e251fc2ed2cd1075 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes 92bf22614b21a2706f4993b278017e437f7785b3 +usb-chipidea-fixes 491b1bea00040233b791dc8fea1608ac6a7003bc +phy 9a8b9434c60f40e4d2603c822a68af6a9ca710df +staging.current 31caf8b2a847214be856f843e251fc2ed2cd1075 +char-misc.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +soundwire-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +thunderbolt-fixes f40ddce88593482919761f74910f42f4b84c004b +input-current 6524d8eac258452e547f8a49c8a965ac6dd8a161 +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 32ada6b0980d86133d080d62371a5787ea2ec5ed +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 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +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 4d12b727538609d7936fc509c032e0a52683367f +drm-misc-fixes 8fd1673613161888a6de5e5f3f3033bd63e9ca0c +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 2f9dbf67b29af294856db3d9d8c490e892d8635a +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping 3dc47131f8aacc2093f68a9971d24c754e435520 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm 1afb7e6348aa0b87437e2078f8f7aad9732bd3f7 +arm64 1ffa9763828cf73a4d4eaa04c29a4a89fb0708c7 +arm-perf f0c140481d1b807217cacdcf11d24cfa407a7a53 +arm-soc e6c44b8c57c95131a217170b982531cd14556da8 +actions 006828d706fda3c729ccc32e3e6ecda6dd05b299 +amlogic 70994f761efeaf7aadf35ad15b14126a25a30dba +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 13d41b537df7d2538f901aa98f82672482b50d12 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 8f722f67452f4b28cd8d7acf1658daa5796437c2 +parisc-hd f40ddce88593482919761f74910f42f4b84c004b +powerpc 82d2c16b350f72aa21ac2a6860c542aa4b43a51e +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v f49815047c1a3e3644a0ba38f3825c5cde8a0922 +s390 b47f625e102bab9ffb8c6b38fffd6d681b9f23e6 +sh b89bc060b53e7054e5c8ca11feea4bc884d83611 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ddad5187fc2a12cb84c9d1ac8ecb816708a2986b +xtensa 7b79eba1d0d186de94ba661c499326e1b6071be5 +pidfd f69e8091c4a2ae291e1f55225e8116fef05dc156 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 32685453751f3c64735d4d3fd82309aad886184c +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 191e697796c2eab1bbd2c7838cf114a754bf17c3 +ceph 558b4510f622a3d96cf9d95050a04e7793d343c7 +cifs 094f4884b3e6b16b89d683510534b5c5b7491c0e +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs ce063129181312f8781a047a50be439c5859747b +exfat f728760aa923f1dd3a4818368dbdbd2c7d63b370 +ext3 c5b8ccc3da766549a4464b6a30cec755c2a1d393 +ext4 0a76945fd1ba2ab44da7b578b311efdfedf92e6c +f2fs 31caf8b2a847214be856f843e251fc2ed2cd1075 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 5d069dbe8aaf2a197142558b6fb2978189ba3454 +jfs 4208c398aae4c2290864ba15c3dab7111f32bec1 +nfs 92bf22614b21a2706f4993b278017e437f7785b3 +nfs-anna 7ae017c7322e2b12472033e65a48aa25cde2fb22 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel 428a23d2bf0ca8fd4d364a464c3e468f0e81671e +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs 42119dbe571eb419dae99b81dd20fa42f47464e1 +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs 1cd738b13ae9b29e03d6149f0246c61f76e81fcf +zonefs 059c01039c0185dbee7ed080f1f2bd22cb1e4dab +iomap ed1128c2d0c87e5ff49c40f5529f06bc35f4251b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cc4a3f885e8f2bc3c86a265972e94fef32d68f67 +vfs 44903da5c0fff8725a2d8ef3d097ad334047c3f0 +printk f78dd21aa363bdfa2df8940649e133571d3eebe3 +pci 4cb431e82c251e2152d4ae5bcccd1513e64c1e6d +pstore 19d8e9149c27b689c6224f5c84b96a159342195a +hid 914fe0466c863dbc9a9c08dffbfdb708bcb13105 +i2c 35ea257a39ae91c6d52e12abacbb4c779bc87204 +i3c 5c34b8e7e8bb605925b33e1aa7dc17966811219a +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 6ab3332cc692ad04dfa30c92d3391aea8b971ef2 +jc_docs c418eed8c3b73b2cc5ed3da1f074a421372fded2 +v4l-dvb 8f202f8e9ff38e29694a4bc0a519b4e03c1726ee +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 4475f0291af9a9a16535123a859e154e35ad2277 +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 55c0bd77479b60ea29fd390faf4545cfb3a1d79e +mac80211-next 38b5133ad607ecdcc8d24906d1ac9cc8df41acd5 +gfs2 5f9b07b2a242861483ee543748ac3f5fc2f05e82 +mtd 6e9dff6fe3fbc452f16566e4a7e293b0decefdba +nand 073abfa7ea9a5b0537d6f92b42baedaf82a04c53 +spi-nor 75386810d3a61f4bb9e180774291454f7235b8b3 +crypto 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +drm f730f39eb981af249d57336b47cfe3925632a7fd +drm-misc bfa5782b9caa26f93f42ad79804e1f75a1ce9f18 +amdgpu fbce8fc8f9e74c1145366524e2fb17f2b9bb3089 +drm-intel 81ce8f04aa96f7f6cae05770f68b5d15be91f5a2 +drm-tegra dcdfe2712b68f1e9dbf4f1a96ad59b80e5cc0ef7 +drm-msm 182b4a2d251305201b6f9cae29067f7112f05835 +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap aa3233086b48e5269cd0b5c16fb9711ce9341244 +sound c4294d7f057d05053412ebd0d5700228d0f2588d +sound-asoc ceae5d20f386be06e804463dd95524e0246952a1 +modules 1e80d9cb579ed7edd121753eeccce82ff82521b4 +input e64123949e6c9581c97fc14594f1cf34bf1d87a8 +block 2709d6ab511e0401303c6706c2af8a45ef5b49f4 +device-mapper a666e5c05e7c4aaabb2c5d58117b0946803d03d2 +pcmcia 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 +mmc a56f44138a2c57047f1ea94ea121af31c595132b +mfd 26783d74cc6a440ee3ef9836a008a697981013d0 +backlight 0b5e0f45af403cb6e9df574e1cb52691611dc0b8 +battery a72acc56f3e939b9e10f2dd460ac1e4519de621f +regulator e124039e956773b018ce034b0985a889ff5a473f +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity f6692213b5045dc461ce0858fb18cf46f328c202 +keys 5bcd72358a7d7794ade0452ed12919b8c4d6ffc7 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 365982aba1f264dba26f0908700d62bfa046918c +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo 31caf8b2a847214be856f843e251fc2ed2cd1075 +tpmdd 8c657a0590de585b1115847c17b34a58025f2f4b +watchdog a4f3407c41605d14f09e490045d0609990cd5d94 +iommu 45e606f2726926b04094e1c9bf809bca4884c57f +audit 127c8c5f0589cea2208c329bff7dcb36e375f46c +devicetree cb8be8b4b27f6eea88268d6991175df1a27e557e +mailbox d1e6bc0ca01c0b0b1a2d543223024cf2c8f52fb7 +spi ecce3daec27ab1ae00b36a2c8022c98c071965a1 +tip 2126d722fe93be10880b3ee5c1593137ea801d06 +clockevents e85c1d21b16b278f50d191155bc674633270e9c6 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip c83fd57be3fefa1522e7381f044fe0b702cbc6ad +ftrace e23db805da2dfc39e5281b5efd3e36d132aa83af +rcu c8c430f4a2fb91b9804ed2f749364fc0dcd663fe +kvm 8c6e67bec3192f16fa624203c8131e10cc4814ba +kvm-arm c93199e93e1232b7220482dffa05b7a32a195fe8 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 50a05be484cb70d9dfb55fa5a6ed57eab193901f +xen-tip 5df230a009914342db4845cd4990231abc973664 +percpu df1c002198a80b89b8b18ccf219456d95483d4a1 +workqueues e9ad2eb3d9ae05471c9b9fafcc0a31d8f565ca5b +drivers-x86 a7d53dbbc70a81d5781da7fc905b656f41ad2381 +chrome-platform b996c10e0f5b2cfd5b2cbf048cce83982bfe662d +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds 7ab39384da0ba743bc8758138a6c0169bdb4941e +ipmi fc26067c7417e7fafed7bcc97bda155d91988734 +driver-core 3e4c982f1ce75faf5314477b8da296d2d00919df +usb 31caf8b2a847214be856f843e251fc2ed2cd1075 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 1542d1324be1191d970f69c55e885af5dd810b84 +usb-chipidea-next 1ee18ded86ece87227a76d7101034fd305b8c803 +tty 31caf8b2a847214be856f843e251fc2ed2cd1075 +char-misc d19db80a366576d3ffadf2508ed876b4c1faf959 +extcon bd30a35764e136dc372e74c4856de633cb7ed8de +phy-next d68f2cb095979dff1c99e7803c7730ec2b53fc83 +soundwire 8d8d958428674518cef083cd97e535ac5ac9f9d8 +thunderbolt c6da62a219d028de10f2e22e93a34c7ee2b88d03 +vfio 07956b6269d3ed05d854233d5bb776dca91751dd +staging 31caf8b2a847214be856f843e251fc2ed2cd1075 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 6715ea06ced45c8910c878877722ccf502301499 +dmaengine eda38ce482b2c88b27e3a7c8aa1ddffa646f3e7f +cgroup 00bfa16052cd66855de9bee66d7a5468f4fdc850 +scsi 89263dedffa2911f9c4e9cd73b81a607a9041570 +scsi-mkp d39bfd0686fd2b21f857c61bb2753db3a932cb24 +vhost bd4ff6766f479d29f1686c22d2bb2a3b1b4dd22d +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 2b8689520520175075ca97bc4eaf51ff3f7253aa +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 12e9b8a3c276cf68ee934d79fee66534f22a5a6b +akpm 42266a061cebe5407bfb5913c99d51953f011009 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..3725244575ce --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10564 @@ +$ date -R +Tue, 23 Feb 2021 09:02:33 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 93% (6762/7228)
Updating files: 94% (6795/7228)
Updating files: 95% (6867/7228)
Updating files: 96% (6939/7228)
Updating files: 97% (7012/7228)
Updating files: 98% (7084/7228)
Updating files: 99% (7156/7228)
Updating files: 100% (7228/7228)
Updating files: 100% (7228/7228), done. +HEAD is now at 5bbb336ba75d Merge tag 'for-5.12/io_uring-2021-02-17' of git://git.kernel.dk/linux-block +Merging origin/master (7c70f3a7488d Merge tag 'nfsd-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge origin/master +Updating 5bbb336ba75d..7c70f3a7488d +Fast-forward + .gitignore | 1 + + .mailmap | 2 +- + Documentation/ABI/stable/sysfs-bus-vmbus | 7 + + Documentation/ABI/stable/sysfs-class-tpm | 14 + + Documentation/ABI/testing/ima_policy | 5 +- + .../ABI/testing/sysfs-class-power-ltc4162l | 82 + + .../ABI/testing/sysfs-driver-intel-m10-bmc | 21 + + Documentation/ABI/testing/sysfs-driver-ufs | 11 + + .../ABI/testing/sysfs-platform-ideapad-laptop | 26 +- + .../Expedited-Grace-Periods.rst | 4 +- + .../RCU/Design/Requirements/Requirements.rst | 732 +- + Documentation/RCU/RTFP.txt | 94 +- + Documentation/RCU/checklist.rst | 10 +- + Documentation/RCU/rcubarrier.rst | 6 +- + Documentation/RCU/stallwarn.rst | 27 +- + Documentation/RCU/whatisRCU.rst | 10 +- + Documentation/accounting/cgroupstats.rst | 4 +- + Documentation/admin-guide/README.rst | 7 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 14 +- + Documentation/admin-guide/cgroup-v2.rst | 64 +- + Documentation/admin-guide/cpu-load.rst | 2 +- + .../admin-guide/device-mapper/dm-crypt.rst | 2 +- + .../admin-guide/device-mapper/dm-integrity.rst | 15 +- + Documentation/admin-guide/kernel-parameters.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 111 +- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 25 + + Documentation/admin-guide/perf-security.rst | 2 +- + Documentation/admin-guide/perf/arm-cmn.rst | 2 +- + Documentation/admin-guide/sysctl/fs.rst | 4 +- + Documentation/arm/booting.rst | 2 +- + Documentation/arm/index.rst | 2 +- + Documentation/arm/{marvel.rst => marvell.rst} | 7 +- + Documentation/block/inline-encryption.rst | 12 +- + Documentation/conf.py | 75 +- + Documentation/crypto/api-skcipher.rst | 4 +- + Documentation/dev-tools/kunit/index.rst | 2 + + Documentation/dev-tools/kunit/start.rst | 7 +- + Documentation/dev-tools/kunit/tips.rst | 115 + + Documentation/devicetree/bindings/Makefile | 2 +- + .../devicetree/bindings/arm/atmel-sysregs.txt | 5 +- + .../arm/marvell/ap80x-system-controller.txt | 8 + + Documentation/devicetree/bindings/arm/pmu.yaml | 1 + + .../socionext/socionext,uniphier-system-cache.yaml | 4 +- + .../devicetree/bindings/ata/sata_highbank.yaml | 1 + + .../bindings/auxdisplay/holtek,ht16k33.yaml | 77 + + .../devicetree/bindings/clock/adi,axi-clkgen.yaml | 1 + + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 4 + + ...ocks.yaml => allwinner,sun9i-a80-usb-clks.yaml} | 4 +- + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 4 +- + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 1 + + .../devicetree/bindings/clock/csr,atlas7-car.txt | 55 - + .../devicetree/bindings/clock/idt,versaclock5.yaml | 6 + + .../devicetree/bindings/clock/imx27-clock.yaml | 2 +- + .../devicetree/bindings/clock/imx31-clock.yaml | 2 +- + .../devicetree/bindings/clock/imx5-clock.yaml | 2 +- + .../devicetree/bindings/clock/intel,easic-n5x.yaml | 46 + + .../bindings/clock/mstar,msc313-mpll.yaml | 46 + + .../devicetree/bindings/clock/prima2-clock.txt | 73 - + .../devicetree/bindings/clock/qcom,a7pll.yaml | 51 + + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 92 + + .../bindings/clock/qcom,gcc-sc8180x.yaml | 76 + + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 96 + + .../bindings/clock/qcom,gpucc-sdm660.yaml | 76 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../clock/renesas,rcar-usb2-clock-sel.yaml | 3 + + .../devicetree/bindings/clock/silabs,si570.txt | 2 + + .../bindings/clock/ste-u300-syscon-clock.txt | 80 - + .../devicetree/bindings/clock/tango4-clock.txt | 23 - + .../devicetree/bindings/clock/zx296702-clk.txt | 34 - + .../devicetree/bindings/clock/zx296718-clk.txt | 37 - + .../bindings/connector/usb-connector.yaml | 17 +- + .../bindings/crypto/allwinner,sun8i-ce.yaml | 3 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 46 + + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/samsung-sss.yaml | 1 - + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 2 +- + .../allwinner,sun4i-a10-display-backend.yaml | 23 +- + .../allwinner,sun4i-a10-display-frontend.yaml | 19 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 19 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 25 +- + .../display/allwinner,sun4i-a10-tv-encoder.yaml | 6 +- + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 19 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 6 +- + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 19 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 19 +- + .../display/allwinner,sun8i-r40-tcon-top.yaml | 110 +- + .../bindings/display/allwinner,sun9i-a80-deu.yaml | 19 +- + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 4 +- + .../bindings/display/amlogic,meson-vpu.yaml | 4 +- + .../bindings/display/brcm,bcm2711-hdmi.yaml | 21 +- + .../bindings/display/brcm,bcm2835-dpi.yaml | 7 +- + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 1 + + .../bindings/display/brcm,bcm2835-hvs.yaml | 2 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 6 +- + .../bindings/display/bridge/analogix,anx7814.yaml | 19 +- + .../bindings/display/bridge/anx6345.yaml | 18 +- + .../bindings/display/bridge/cdns,mhdp8546.yaml | 22 +- + .../bindings/display/bridge/chrontel,ch7033.yaml | 6 +- + .../bindings/display/bridge/intel,keembay-dsi.yaml | 14 +- + .../bindings/display/bridge/ite,it6505.yaml | 2 +- + .../bindings/display/bridge/lontium,lt9611.yaml | 70 +- + .../bindings/display/bridge/lvds-codec.yaml | 18 +- + .../bindings/display/bridge/nwl-dsi.yaml | 41 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 24 +- + .../bindings/display/bridge/renesas,lvds.yaml | 24 +- + .../bindings/display/bridge/simple-bridge.yaml | 18 +- + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 7 +- + .../display/bridge/thine,thc63lvd1024.yaml | 35 +- + .../bindings/display/bridge/ti,sn65dsi86.yaml | 45 +- + .../bindings/display/bridge/ti,tfp410.yaml | 24 +- + .../bindings/display/bridge/toshiba,tc358762.yaml | 52 +- + .../bindings/display/bridge/toshiba,tc358768.yaml | 48 +- + .../bindings/display/bridge/toshiba,tc358775.yaml | 19 +- + .../display/connector/analog-tv-connector.yaml | 1 + + .../bindings/display/connector/dp-connector.yaml | 56 + + .../bindings/display/connector/dvi-connector.yaml | 1 + + .../bindings/display/connector/hdmi-connector.yaml | 1 + + .../bindings/display/connector/vga-connector.yaml | 1 + + .../devicetree/bindings/display/ht16k33.txt | 40 - + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 2 +- + .../devicetree/bindings/display/ingenic,ipu.yaml | 5 +- + .../devicetree/bindings/display/ingenic,lcd.yaml | 10 +- + .../bindings/display/intel,keembay-display.yaml | 2 +- + .../bindings/display/mediatek/mediatek,disp.txt | 12 +- + .../display/panel/advantech,idk-2121wr.yaml | 21 +- + .../bindings/display/panel/jdi,lt070me05000.yaml | 1 + + .../display/panel/mantix,mlaf057we51-x.yaml | 4 +- + .../bindings/display/panel/novatek,nt36672a.yaml | 1 + + .../bindings/display/panel/panel-common.yaml | 11 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/samsung,s6e63m0.yaml | 4 +- + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 16 +- + .../bindings/display/rockchip/rockchip-vop.yaml | 5 +- + .../devicetree/bindings/display/st,stm32-dsi.yaml | 12 +- + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 8 +- + .../devicetree/bindings/display/ste,mcde.txt | 104 - + .../devicetree/bindings/display/ste,mcde.yaml | 168 + + .../display/tegra/nvidia,tegra20-host1x.txt | 4 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 19 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 23 +- + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 3 +- + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 +- + Documentation/devicetree/bindings/eeprom/at24.yaml | 9 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 3 +- + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 2 + + .../devicetree/bindings/gpio/gpio-davinci.txt | 1 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 4 +- + .../bindings/gpio/mstar,msc313-gpio.yaml | 2 +- + .../bindings/gpio/renesas,rcar-gpio.yaml | 3 + + .../bindings/gpio/toshiba,gpio-visconti.yaml | 70 + + .../devicetree/bindings/gpio/zx296702-gpio.txt | 24 - + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 33 - + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 75 + + Documentation/devicetree/bindings/graph.txt | 129 +- + .../devicetree/bindings/hwmon/ti,tps23861.yaml | 51 + + Documentation/devicetree/bindings/i2c/i2c-sirf.txt | 19 - + .../devicetree/bindings/i2c/i2c-stu300.txt | 15 - + .../devicetree/bindings/i2c/i2c-zx2967.txt | 22 - + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 21 +- + .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + Documentation/devicetree/bindings/i3c/i3c.txt | 140 - + Documentation/devicetree/bindings/i3c/i3c.yaml | 179 + + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 9 +- + .../bindings/i3c/silvaco,i3c-master.yaml | 60 + + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 2 + + .../bindings/iio/adc/aspeed,ast2400-adc.yaml | 1 + + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 + + .../iio/dac/{adi,ad5686.yaml => adi,ad5696.yaml} | 10 +- + .../devicetree/bindings/iio/health/ti,afe4404.yaml | 2 +- + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 1 + + .../bindings/iio/potentiometer/adi,ad5272.yaml | 1 + + .../input/touchscreen/elan,elants_i2c.yaml | 1 + + .../bindings/interconnect/qcom,rpmh.yaml | 2 +- + .../allwinner,sun6i-a31-r-intc.yaml | 67 + + .../allwinner,sun7i-a20-sc-nmi.yaml | 10 - + .../bindings/interrupt-controller/fsl,intmux.yaml | 2 +- + .../bindings/interrupt-controller/qcom,pdc.txt | 2 + + .../interrupt-controller/realtek,rtl-intc.yaml | 57 + + .../interrupt-controller/sigma,smp8642-intc.txt | 48 - + .../interrupt-controller/st,stm32-exti.yaml | 2 + + .../interrupt-controller/ti,pruss-intc.yaml | 3 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + .../devicetree/bindings/iommu/mediatek,iommu.txt | 105 - + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 183 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 14 +- + .../devicetree/bindings/leds/ti,tca6507.yaml | 1 + + .../devicetree/bindings/media/allegro,al5e.yaml | 105 + + .../devicetree/bindings/media/allegro.txt | 43 - + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 11 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 12 +- + .../devicetree/bindings/media/i2c/adv7180.yaml | 36 +- + .../devicetree/bindings/media/i2c/adv7604.yaml | 37 +- + .../bindings/media/i2c/aptina,mt9v111.yaml | 4 +- + .../bindings/media/i2c/imi,rdacm2x-gmsl.yaml | 30 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 22 +- + .../devicetree/bindings/media/i2c/imx258.yaml | 134 + + .../bindings/media/i2c/maxim,max9286.yaml | 117 +- + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 17 +- + .../devicetree/bindings/media/i2c/ov8856.yaml | 22 +- + .../bindings/media/i2c/ovti,ov02a10.yaml | 29 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 6 +- + .../media/i2c/{ov5647.yaml => ovti,ov5647.yaml} | 22 +- + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 115 + + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 9 +- + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 124 + + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 25 +- + .../devicetree/bindings/media/i2c/sony,imx274.yaml | 3 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 91 + + .../bindings/media/marvell,mmp2-ccic.yaml | 15 +- + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 5 +- + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 32 +- + .../devicetree/bindings/media/renesas,ceu.yaml | 17 +- + .../devicetree/bindings/media/renesas,csi2.yaml | 54 +- + .../devicetree/bindings/media/renesas,vin.yaml | 113 +- + .../devicetree/bindings/media/rockchip-isp1.yaml | 40 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 18 +- + .../devicetree/bindings/media/ti,cal.yaml | 55 +- + .../bindings/media/video-interface-devices.yaml | 406 ++ + .../devicetree/bindings/media/video-interfaces.txt | 640 +- + .../bindings/media/video-interfaces.yaml | 344 + + .../bindings/media/xilinx/xlnx,csi2rxss.yaml | 39 +- + .../bindings/memory-controllers/exynos-srom.yaml | 2 + + .../devicetree/bindings/mfd/bd9571mwv.txt | 4 +- + .../devicetree/bindings/mfd/ene-kb930.yaml | 65 + + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 3 +- + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +- + .../bindings/mips/lantiq/lantiq,cgu.yaml | 32 + + .../bindings/mips/lantiq/lantiq,dma-xway.yaml | 32 + + .../bindings/mips/lantiq/lantiq,ebu.yaml | 32 + + .../bindings/mips/lantiq/lantiq,pmu.yaml | 32 + + .../devicetree/bindings/mips/realtek-rtl.yaml | 24 + + .../bindings/misc/fsl,dpaa2-console.yaml | 1 + + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 223 + + .../bindings/mmc/marvell,xenon-sdhci.txt | 1 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 2 + + Documentation/devicetree/bindings/mmc/mmci.txt | 74 - + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 3 +- + .../devicetree/bindings/mmc/sdhci-am654.yaml | 19 +- + .../devicetree/bindings/mmc/sdhci-msm.txt | 8 +- + .../devicetree/bindings/mmc/sdhci-sirf.txt | 18 - + .../devicetree/bindings/mmc/zx-dw-mshc.txt | 31 - + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 91 - + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 102 + + .../mtd/partitions/brcm,bcm4908-partitions.yaml | 70 + + .../bindings/mtd/partitions/fixed-partitions.yaml | 33 +- + .../bindings/mtd/partitions/partition.yaml | 47 + + .../bindings/mtd/partitions/qcom,smem-part.yaml | 33 + + .../devicetree/bindings/net/can/rcar_canfd.txt | 2 +- + .../bindings/net/ethernet-controller.yaml | 5 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 + + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 19 +- + .../devicetree/bindings/phy/brcm,sata-phy.yaml | 3 +- + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 5 +- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 2 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 2 +- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 2 +- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 2 +- + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 2 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 5 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 6 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 9 +- + .../devicetree/bindings/power/renesas,apmu.yaml | 2 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 110 + + .../devicetree/bindings/power/supply/bq25980.yaml | 1 + + .../bindings/power/supply/ltc4162-l.yaml | 69 + + .../devicetree/bindings/ptp/ptp-idtcm.yaml | 4 +- + .../bindings/regulator/max8997-regulator.txt | 1 + + .../bindings/regulator/mcp16502-regulator.txt | 3 +- + .../bindings/regulator/mt6315-regulator.yaml | 69 + + .../bindings/regulator/nxp,pca9450-regulator.yaml | 5 + + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 17 +- + .../bindings/regulator/qcom,rpmh-regulator.txt | 2 + + .../bindings/regulator/qcom-labibb-regulator.yaml | 30 +- + .../regulator/richtek,rt4831-regulator.yaml | 35 + + .../bindings/remoteproc/ingenic,vpu.yaml | 2 +- + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 3 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 1 + + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 1 + + .../devicetree/bindings/rtc/nxp,pcf2127.yaml | 51 + + Documentation/devicetree/bindings/rtc/pcf8563.txt | 3 +- + .../devicetree/bindings/rtc/sirf,prima2-sysrtc.txt | 13 - + .../bindings/rtc/stericsson,coh901331.txt | 16 - + .../devicetree/bindings/rtc/trivial-rtc.yaml | 6 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifa.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifb.yaml | 2 + + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 1 + + .../bindings/sound/audio-graph-port.yaml | 3 - + .../bindings/sound/google,sc7180-trogdor.yaml | 1 + + .../devicetree/bindings/sound/ingenic,codec.yaml | 11 +- + .../bindings/sound/intel,keembay-i2s.yaml | 13 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 5 + + .../sound/nvidia,tegra-audio-graph-card.yaml | 190 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 18 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 13 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 13 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 18 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 18 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 62 + + .../bindings/sound/qcom,lpass-tx-macro.yaml | 67 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 6 +- + Documentation/devicetree/bindings/sound/rt5659.txt | 11 + + .../bindings/sound/samsung,aries-wm8994.yaml | 3 + + .../bindings/sound/samsung,midas-audio.yaml | 2 + + .../devicetree/bindings/sound/sirf-audio-codec.txt | 17 - + .../devicetree/bindings/sound/sirf-usp.txt | 27 - + .../devicetree/bindings/sound/st,stm32-i2s.yaml | 4 + + .../devicetree/bindings/sound/tas2562.yaml | 2 + + .../devicetree/bindings/sound/tas2770.yaml | 2 + + .../devicetree/bindings/sound/tlv320adcx140.yaml | 1 + + Documentation/devicetree/bindings/sound/wm8962.txt | 4 + + .../devicetree/bindings/sound/zte,tdm.txt | 30 - + .../devicetree/bindings/sound/zte,zx-aud96p22.txt | 24 - + .../devicetree/bindings/sound/zte,zx-i2s.txt | 45 - + .../devicetree/bindings/sound/zte,zx-spdif.txt | 27 - + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + + .../bindings/{mtd => spi}/cadence-quadspi.txt | 1 + + .../bindings/spi/nvidia,tegra210-quad.yaml | 117 + + .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 41 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 2 + + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 6 +- + Documentation/devicetree/bindings/spi/spi-sirf.txt | 42 - + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 12 +- + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 153 + + .../devicetree/bindings/thermal/tango-thermal.txt | 17 - + .../devicetree/bindings/thermal/zx2967-thermal.txt | 116 - + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 + + .../timer/allwinner,sun5i-a13-hstimer.yaml | 3 +- + .../bindings/timer/intel,ixp4xx-timer.yaml | 2 +- + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 3 +- + .../bindings/timer/stericsson-u300-apptimer.txt | 18 - + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 3 + + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/ingenic,musb.yaml | 2 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 7 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 1 + + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 8 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 3 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 12 +- + .../bindings/watchdog/intel,keembay-wdt.yaml | 57 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 5 +- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 1 + + .../bindings/watchdog/sigma,smp8642-wdt.txt | 18 - + .../devicetree/bindings/watchdog/sirfsoc_wdt.txt | 18 - + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 + + .../bindings/watchdog/stericsson-coh901327.txt | 19 - + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 4 +- + .../bindings/watchdog/zte,zx2967-wdt.txt | 32 - + Documentation/devicetree/usage-model.rst | 2 +- + Documentation/doc-guide/sphinx.rst | 30 +- + Documentation/driver-api/gpio/consumer.rst | 5 +- + Documentation/driver-api/gpio/driver.rst | 4 +- + Documentation/driver-api/gpio/intro.rst | 8 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/media/camera-sensor.rst | 20 +- + Documentation/driver-api/media/cec-core.rst | 2 +- + Documentation/driver-api/media/csi2.rst | 4 +- + Documentation/driver-api/media/drivers/ccs/ccs.rst | 13 + + Documentation/driver-api/media/v4l2-clocks.rst | 31 - + Documentation/driver-api/media/v4l2-core.rst | 1 - + Documentation/driver-api/media/v4l2-subdev.rst | 63 +- + Documentation/driver-api/men-chameleon-bus.rst | 12 + + .../driver-api/surface_aggregator/client-api.rst | 38 + + .../driver-api/surface_aggregator/client.rst | 393 + + .../driver-api/surface_aggregator/clients/cdev.rst | 87 + + .../surface_aggregator/clients/index.rst | 21 + + .../driver-api/surface_aggregator/clients/san.rst | 44 + + .../driver-api/surface_aggregator/index.rst | 21 + + .../driver-api/surface_aggregator/internal-api.rst | 67 + + .../driver-api/surface_aggregator/internal.rst | 577 ++ + .../driver-api/surface_aggregator/overview.rst | 77 + + .../driver-api/surface_aggregator/ssh.rst | 344 + + Documentation/driver-api/thermal/sysfs-api.rst | 19 +- + Documentation/filesystems/afs.rst | 8 +- + Documentation/filesystems/dax.txt | 17 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/proc.rst | 5 +- + Documentation/filesystems/vfs.rst | 7 +- + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/i915.rst | 2 +- + Documentation/gpu/todo.rst | 21 +- + Documentation/gpu/vkms.rst | 82 + + Documentation/hwmon/ab8500.rst | 26 - + Documentation/hwmon/abx500.rst | 32 - + Documentation/hwmon/aht10.rst | 46 + + Documentation/hwmon/ina2xx.rst | 2 +- + Documentation/hwmon/index.rst | 4 +- + Documentation/hwmon/max16601.rst | 197 +- + Documentation/hwmon/nct6683.rst | 1 + + Documentation/hwmon/tps23861.rst | 41 + + Documentation/i2c/slave-testunit-backend.rst | 23 +- + Documentation/iio/ep93xx_adc.rst | 2 +- + Documentation/index.rst | 11 - + Documentation/input/event-codes.rst | 15 + + Documentation/input/multi-touch-protocol.rst | 4 + + Documentation/kbuild/makefiles.rst | 4 +- + Documentation/kernel-hacking/hacking.rst | 4 +- + Documentation/kernel-hacking/locking.rst | 2 +- + Documentation/livepatch/index.rst | 1 + + Documentation/livepatch/livepatch.rst | 15 +- + Documentation/livepatch/module-elf-format.rst | 10 +- + Documentation/livepatch/reliable-stacktrace.rst | 309 + + Documentation/power/freezing-of-tasks.rst | 2 +- + Documentation/process/adding-syscalls.rst | 20 +- + Documentation/process/coding-style.rst | 20 +- + Documentation/process/howto.rst | 20 +- + Documentation/process/magic-number.rst | 2 - + Documentation/process/submit-checklist.rst | 14 +- + Documentation/process/submitting-patches.rst | 29 +- + Documentation/scheduler/sched-bwc.rst | 17 +- + Documentation/scheduler/sched-deadline.rst | 2 +- + Documentation/scheduler/sched-design-CFS.rst | 6 +- + Documentation/scheduler/schedutil.txt | 169 + + Documentation/scsi/libsas.rst | 9 +- + Documentation/scsi/scsi-parameters.rst | 5 +- + Documentation/security/lsm-development.rst | 2 +- + Documentation/sound/designs/index.rst | 1 + + Documentation/sound/designs/jack-injection.rst | 166 + + Documentation/sphinx/automarkup.py | 7 +- + Documentation/sphinx/cdomain.py | 8 +- + Documentation/sphinx/kernel_abi.py | 27 +- + Documentation/sphinx/kernel_feat.py | 25 +- + Documentation/sphinx/kerneldoc.py | 26 +- + Documentation/sphinx/kernellog.py | 26 +- + Documentation/sphinx/kfigure.py | 14 +- + Documentation/sphinx/maintainers_include.py | 2 - + Documentation/sphinx/requirements.txt | 1 - + Documentation/sphinx/rstFlatTable.py | 10 - + Documentation/timers/timers-howto.rst | 2 +- + .../translations/it_IT/process/adding-syscalls.rst | 18 +- + .../it_IT/process/submitting-patches.rst | 4 +- + Documentation/translations/ja_JP/SubmittingPatches | 4 +- + Documentation/translations/ko_KR/howto.rst | 4 +- + Documentation/translations/ko_KR/index.rst | 15 + + .../translations/zh_CN/admin-guide/cpu-load.rst | 2 +- + Documentation/translations/zh_CN/arm/Booting | 2 +- + .../translations/zh_CN/iio/ep93xx_adc.rst | 46 + + .../translations/zh_CN/iio/iio_configfs.rst | 102 + + Documentation/translations/zh_CN/iio/index.rst | 20 + + Documentation/translations/zh_CN/mips/booting.rst | 31 + + Documentation/translations/zh_CN/mips/features.rst | 10 + + Documentation/translations/zh_CN/mips/index.rst | 26 + + .../translations/zh_CN/mips/ingenic-tcu.rst | 69 + + .../zh_CN/process/submitting-patches.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 3 +- + Documentation/userspace-api/media/drivers/ccs.rst | 110 + + .../userspace-api/media/drivers/index.rst | 1 + + Documentation/userspace-api/media/dvb/dvbstb.svg | 2 +- + .../userspace-api/media/mediactl/media-types.rst | 7 + + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 81 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 6 +- + Documentation/virt/kvm/amd-memory-encryption.rst | 21 + + Documentation/virt/kvm/api.rst | 228 +- + Documentation/virt/kvm/arm/hyp-abi.rst | 9 + + Documentation/virt/kvm/locking.rst | 9 +- + Documentation/virt/kvm/s390-pv-boot.rst | 2 +- + Documentation/vm/split_page_table_lock.rst | 2 +- + Documentation/x86/boot.rst | 2 +- + MAINTAINERS | 191 +- + Makefile | 5 +- + arch/Kconfig | 17 +- + arch/alpha/Kconfig | 1 + + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/crypto/Kconfig | 19 + + arch/arm/crypto/Makefile | 4 + + arch/arm/crypto/aes-neonbs-glue.c | 3 + + arch/arm/crypto/blake2b-neon-core.S | 347 + + arch/arm/crypto/blake2b-neon-glue.c | 105 + + arch/arm/crypto/blake2s-core.S | 285 + + arch/arm/crypto/blake2s-glue.c | 78 + + arch/arm/include/asm/archrandom.h | 10 + + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/cpuidle-imx6sl.c | 1 + + arch/arm/mach-imx/pm-imx6.c | 1 + + arch/arm/mach-pxa/devices.c | 8 + + arch/arm/mach-pxa/mioa701.c | 1 - + arch/arm/mach-pxa/palm27x.c | 1 - + arch/arm/mach-pxa/palmte2.c | 1 - + arch/arm/mach-pxa/z2.c | 24 +- + arch/arm/mach-spear/generic.h | 12 - + arch/arm/mach-spear/spear13xx.c | 1 + + arch/arm/mach-sunxi/Kconfig | 2 + + arch/arm/xen/p2m.c | 6 +- + arch/arm64/Kconfig | 11 +- + arch/arm64/Kconfig.platforms | 2 + + arch/arm64/Makefile | 10 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 9 +- + arch/arm64/crypto/aes-glue.c | 71 +- + arch/arm64/crypto/aes-modes.S | 217 +- + arch/arm64/crypto/aes-neonbs-core.S | 8 +- + arch/arm64/crypto/crct10dif-ce-core.S | 43 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 30 +- + arch/arm64/crypto/sha1-ce-core.S | 47 +- + arch/arm64/crypto/sha1-ce-glue.c | 23 +- + arch/arm64/crypto/sha2-ce-core.S | 38 +- + arch/arm64/crypto/sha2-ce-glue.c | 24 +- + arch/arm64/crypto/sha3-ce-core.S | 81 +- + arch/arm64/crypto/sha3-ce-glue.c | 18 +- + arch/arm64/crypto/sha512-ce-core.S | 29 +- + arch/arm64/crypto/sha512-ce-glue.c | 55 +- + arch/arm64/include/asm/archrandom.h | 82 +- + arch/arm64/include/asm/asm-uaccess.h | 4 +- + arch/arm64/include/asm/assembler.h | 33 + + arch/arm64/include/asm/cacheflush.h | 5 - + arch/arm64/include/asm/cpufeature.h | 11 + + arch/arm64/include/asm/el2_setup.h | 60 +- + arch/arm64/include/asm/hyp_image.h | 29 +- + arch/arm64/include/asm/kexec.h | 5 +- + arch/arm64/include/asm/kvm_asm.h | 26 - + arch/arm64/include/asm/kvm_host.h | 3 +- + arch/arm64/include/asm/kvm_mmu.h | 61 +- + arch/arm64/include/asm/kvm_pgtable.h | 5 + + arch/arm64/include/asm/memory.h | 12 + + arch/arm64/include/asm/mmu_context.h | 7 +- + arch/arm64/include/asm/pgtable.h | 12 +- + arch/arm64/include/asm/pointer_auth.h | 10 + + arch/arm64/include/asm/sections.h | 3 +- + arch/arm64/include/asm/setup.h | 11 + + arch/arm64/include/asm/sparsemem.h | 23 +- + arch/arm64/include/asm/spinlock.h | 2 +- + arch/arm64/include/asm/stackprotector.h | 1 + + arch/arm64/include/asm/sysreg.h | 12 +- + arch/arm64/include/asm/trans_pgd.h | 39 + + arch/arm64/include/asm/uaccess.h | 2 +- + arch/arm64/include/asm/virt.h | 7 +- + arch/arm64/kernel/Makefile | 7 +- + arch/arm64/kernel/alternative.c | 2 +- + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpu_errata.c | 2 - + arch/arm64/kernel/cpufeature.c | 75 +- + arch/arm64/kernel/entry-common.c | 54 +- + arch/arm64/kernel/entry.S | 14 +- + arch/arm64/kernel/head.S | 75 +- + arch/arm64/kernel/hibernate.c | 271 +- + arch/arm64/kernel/hyp-stub.S | 115 +- + arch/arm64/kernel/idreg-override.c | 216 + + arch/arm64/kernel/image-vars.h | 1 - + arch/arm64/kernel/kaslr.c | 43 +- + arch/arm64/kernel/machine_kexec.c | 57 +- + arch/arm64/kernel/module-plts.c | 2 +- + arch/arm64/kernel/perf_event.c | 15 +- + arch/arm64/kernel/process.c | 4 +- + arch/arm64/kernel/ptrace.c | 1 + + arch/arm64/kernel/relocate_kernel.S | 48 +- + arch/arm64/kernel/setup.c | 15 + + arch/arm64/kernel/sleep.S | 1 + + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/stacktrace.c | 13 +- + arch/arm64/kernel/syscall.c | 30 - + arch/arm64/kernel/topology.c | 115 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/kernel/{vdso/vdso.S => vdso-wrap.S} | 0 + arch/arm64/kernel/vdso/Makefile | 1 - + arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +- + arch/arm64/kernel/{vdso32/vdso.S => vdso32-wrap.S} | 0 + arch/arm64/kernel/vdso32/Makefile | 1 - + arch/arm64/kernel/vmlinux.lds.S | 26 +- + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 10 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +- + arch/arm64/kvm/hyp/nvhe/.gitignore | 2 + + arch/arm64/kvm/hyp/nvhe/Makefile | 33 +- + arch/arm64/kvm/hyp/nvhe/gen-hyprel.c | 438 ++ + arch/arm64/kvm/hyp/nvhe/host.S | 29 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 21 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 11 +- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 4 +- + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 9 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 24 +- + arch/arm64/kvm/hyp/pgtable.c | 83 +- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +- + arch/arm64/kvm/hypercalls.c | 6 + + arch/arm64/kvm/mmu.c | 13 +- + arch/arm64/kvm/pmu-emul.c | 14 +- + arch/arm64/kvm/sys_regs.c | 85 +- + arch/arm64/kvm/trng.c | 85 + + arch/arm64/kvm/va_layout.c | 34 +- + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/fault.c | 34 +- + arch/arm64/mm/mmap.c | 15 +- + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/mm/proc.S | 16 +- + arch/arm64/mm/ptdump.c | 1 + + arch/arm64/mm/trans_pgd.c | 324 + + arch/ia64/include/asm/tlb.h | 4 +- + arch/m68k/configs/amiga_defconfig | 3 + + arch/m68k/configs/apollo_defconfig | 3 + + arch/m68k/configs/atari_defconfig | 3 + + arch/m68k/configs/bvme6000_defconfig | 3 + + arch/m68k/configs/hp300_defconfig | 3 + + arch/m68k/configs/mac_defconfig | 3 + + arch/m68k/configs/multi_defconfig | 3 + + arch/m68k/configs/mvme147_defconfig | 3 + + arch/m68k/configs/mvme16x_defconfig | 3 + + arch/m68k/configs/q40_defconfig | 3 + + arch/m68k/configs/sun3_defconfig | 3 + + arch/m68k/configs/sun3x_defconfig | 3 + + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 69 +- + arch/mips/Makefile | 20 + + arch/mips/alchemy/common/prom.c | 4 - + arch/mips/alchemy/common/setup.c | 34 +- + arch/mips/ar7/memory.c | 5 - + arch/mips/ath25/prom.c | 4 - + arch/mips/ath79/prom.c | 5 - + arch/mips/ath79/setup.c | 13 +- + arch/mips/bcm47xx/prom.c | 4 - + arch/mips/bcm63xx/prom.c | 4 - + arch/mips/bmips/setup.c | 11 +- + arch/mips/boot/compressed/Makefile | 1 + + arch/mips/boot/compressed/head.S | 20 +- + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/realtek/Makefile | 2 + + arch/mips/boot/dts/realtek/cisco_sg220-26.dts | 25 + + arch/mips/boot/dts/realtek/rtl838x.dtsi | 21 + + arch/mips/boot/dts/realtek/rtl83xx.dtsi | 59 + + arch/mips/cavium-octeon/setup.c | 9 +- + arch/mips/cobalt/setup.c | 5 - + arch/mips/configs/loongson3_defconfig | 2 + + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/fw/sni/sniprom.c | 4 - + arch/mips/generic/init.c | 9 +- + arch/mips/include/asm/Kbuild | 4 + + arch/mips/include/asm/asm.h | 18 + + arch/mips/include/asm/atomic.h | 2 +- + arch/mips/include/asm/bitops.h | 12 +- + arch/mips/include/asm/bootinfo.h | 22 +- + arch/mips/include/asm/checksum.h | 6 +- + arch/mips/include/asm/cmpxchg.h | 6 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/dma-coherence.h | 38 - + arch/mips/include/asm/inst.h | 6 +- + arch/mips/include/asm/irq.h | 1 + + arch/mips/include/asm/irq_cpu.h | 2 - + arch/mips/include/asm/kvm_host.h | 1 - + arch/mips/include/asm/mach-generic/irq.h | 6 - + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/include/asm/mach-n64/irq.h | 9 + + arch/mips/include/asm/mach-n64/kmalloc.h | 8 + + arch/mips/include/asm/mach-pistachio/irq.h | 15 - + arch/mips/include/asm/mipsregs.h | 4 + + arch/mips/include/asm/octeon/octeon.h | 1 - + arch/mips/include/asm/page.h | 17 +- + arch/mips/include/asm/pgtable.h | 14 +- + arch/mips/include/asm/ptrace.h | 2 +- + arch/mips/include/asm/r4kcache.h | 67 +- + arch/mips/include/asm/spinlock.h | 2 +- + arch/mips/include/asm/spram.h | 2 +- + arch/mips/include/asm/traps.h | 1 + + arch/mips/include/asm/vermagic.h | 2 + + arch/mips/include/asm/vpe.h | 3 - + arch/mips/include/uapi/asm/Kbuild | 3 - + arch/mips/include/uapi/asm/perf_regs.h | 40 + + arch/mips/jazz/Kconfig | 3 - + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/cacheinfo.c | 30 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/cps-vec.S | 1 - + arch/mips/kernel/cpu-probe.c | 24 +- + arch/mips/kernel/crash_dump.c | 41 +- + arch/mips/kernel/ftrace.c | 4 - + arch/mips/kernel/genex.S | 4 +- + arch/mips/kernel/head.S | 31 - + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/irq-rm7000.c | 45 - + arch/mips/kernel/kgdb.c | 23 +- + arch/mips/kernel/module.c | 109 +- + arch/mips/kernel/perf_event_mipsxx.c | 22 +- + arch/mips/kernel/perf_regs.c | 68 + + arch/mips/kernel/process.c | 83 +- + arch/mips/kernel/relocate.c | 72 +- + arch/mips/kernel/setup.c | 71 +- + arch/mips/kernel/smp-cps.c | 3 - + arch/mips/kernel/smp.c | 6 +- + arch/mips/kernel/syscalls/Makefile | 16 +- + arch/mips/kernel/vmlinux.lds.S | 11 +- + arch/mips/kernel/vpe-cmp.c | 4 +- + arch/mips/kernel/vpe-mt.c | 4 +- + arch/mips/kernel/vpe.c | 33 - + arch/mips/kvm/mips.c | 2 +- + arch/mips/lantiq/irq.c | 10 +- + arch/mips/lantiq/prom.c | 11 +- + arch/mips/loongson2ef/common/init.c | 5 - + arch/mips/loongson2ef/common/mem.c | 11 - + arch/mips/loongson32/common/prom.c | 4 - + arch/mips/loongson64/Platform | 22 - + arch/mips/loongson64/init.c | 54 +- + arch/mips/loongson64/numa.c | 52 +- + arch/mips/loongson64/smp.c | 8 +- + arch/mips/mm/c-r4k.c | 13 +- + arch/mips/mm/cache.c | 9 +- + arch/mips/mm/dma-noncoherent.c | 3 +- + arch/mips/mm/fault.c | 5 +- + arch/mips/mm/init.c | 5 + + arch/mips/mm/tlbex.c | 1 + + arch/mips/mti-malta/malta-init.c | 1 - + arch/mips/mti-malta/malta-memory.c | 4 - + arch/mips/mti-malta/malta-setup.c | 34 +- + arch/mips/mti-malta/malta-time.c | 2 +- + arch/mips/n64/Makefile | 6 + + arch/mips/n64/Platform | 7 + + arch/mips/n64/init.c | 164 + + arch/mips/n64/irq.c | 16 + + arch/mips/netlogic/xlp/setup.c | 5 - + arch/mips/netlogic/xlr/setup.c | 5 - + arch/mips/pci/pci-alchemy.c | 7 +- + arch/mips/pci/pci-ar2315.c | 6 +- + arch/mips/pic32/pic32mzda/init.c | 19 +- + arch/mips/pistachio/Platform | 2 - + arch/mips/pistachio/init.c | 6 - + arch/mips/ralink/of.c | 11 +- + arch/mips/ralink/prom.c | 4 - + arch/mips/ralink/reset.c | 4 +- + arch/mips/rb532/prom.c | 5 - + arch/mips/sgi-ip27/ip27-memory.c | 5 - + arch/mips/sgi-ip32/ip32-memory.c | 5 - + arch/mips/sibyte/common/cfe.c | 5 - + arch/mips/txx9/generic/setup.c | 4 - + arch/mips/vdso/Makefile | 5 +- + arch/mips/vr41xx/common/init.c | 4 - + arch/parisc/Kconfig | 11 + + arch/parisc/include/asm/compat.h | 2 +- + arch/parisc/include/asm/io.h | 2 + + arch/parisc/include/asm/mmu_context.h | 7 + + arch/parisc/include/asm/page.h | 2 +- + arch/parisc/include/asm/pgalloc.h | 76 +- + arch/parisc/include/asm/pgtable.h | 89 +- + arch/parisc/kernel/asm-offsets.c | 1 - + arch/parisc/kernel/entry.S | 116 +- + arch/parisc/kernel/hpmc.S | 10 - + arch/parisc/kernel/irq.c | 4 + + arch/parisc/kernel/process.c | 2 + + arch/parisc/kernel/traps.c | 9 +- + arch/parisc/mm/hugetlbpage.c | 13 - + arch/parisc/mm/init.c | 10 +- + arch/powerpc/crypto/sha256-spe-glue.c | 2 +- + arch/powerpc/include/asm/hvcall.h | 25 +- + arch/powerpc/include/asm/kvm_book3s_asm.h | 11 - + arch/powerpc/include/asm/kvm_host.h | 8 +- + arch/powerpc/include/asm/kvm_ppc.h | 2 + + arch/powerpc/include/uapi/asm/kvm.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 9 +- + arch/powerpc/kvm/book3s_hv.c | 149 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 108 +- + arch/powerpc/kvm/book3s_hv_nested.c | 70 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 175 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/powerpc.c | 14 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/s390/Kconfig | 3 + + arch/s390/Kconfig.debug | 10 +- + arch/s390/configs/debug_defconfig | 12 +- + arch/s390/configs/defconfig | 9 +- + arch/s390/configs/zfcpdump_defconfig | 2 + + arch/s390/crypto/aes_s390.c | 2 + + arch/s390/crypto/paes_s390.c | 28 +- + arch/s390/crypto/prng.c | 2 +- + arch/s390/hypfs/hypfs_diag0c.c | 2 +- + arch/s390/hypfs/hypfs_vm.c | 4 +- + arch/s390/include/asm/alternative.h | 16 + + arch/s390/include/asm/ap.h | 2 +- + arch/s390/include/asm/atomic.h | 20 - + arch/s390/include/asm/bitops.h | 36 - + arch/s390/include/asm/cputime.h | 2 + + arch/s390/include/asm/elf.h | 7 +- + arch/s390/include/asm/entry-common.h | 60 + + arch/s390/include/asm/fpu/api.h | 2 + + arch/s390/include/asm/idle.h | 4 +- + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/include/asm/lowcore.h | 17 +- + arch/s390/include/asm/nmi.h | 1 + + arch/s390/include/asm/pci.h | 4 +- + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/include/asm/processor.h | 50 +- + arch/s390/include/asm/ptrace.h | 9 +- + arch/s390/include/asm/qdio.h | 7 +- + arch/s390/include/asm/scsw.h | 3 +- + arch/s390/include/asm/syscall.h | 11 +- + arch/s390/include/asm/syscall_wrapper.h | 128 +- + arch/s390/include/asm/thread_info.h | 5 + + arch/s390/include/asm/timex.h | 48 +- + arch/s390/include/asm/tlb.h | 5 +- + arch/s390/include/asm/uaccess.h | 2 +- + arch/s390/include/asm/vdso.h | 7 +- + arch/s390/include/asm/vdso/gettimeofday.h | 12 +- + arch/s390/include/asm/vtime.h | 14 + + arch/s390/include/uapi/asm/ptrace.h | 5 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/asm-offsets.c | 20 +- + arch/s390/kernel/compat_signal.c | 1 + + arch/s390/kernel/debug.c | 6 +- + arch/s390/kernel/early.c | 12 +- + arch/s390/kernel/entry.S | 872 +-- + arch/s390/kernel/entry.h | 12 +- + arch/s390/kernel/fpu.c | 88 + + arch/s390/kernel/idle.c | 24 + + arch/s390/kernel/irq.c | 89 +- + arch/s390/kernel/nmi.c | 19 +- + arch/s390/kernel/perf_cpum_cf_diag.c | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/process.c | 30 +- + arch/s390/kernel/ptrace.c | 117 +- + arch/s390/kernel/setup.c | 23 +- + arch/s390/kernel/signal.c | 13 +- + arch/s390/kernel/smp.c | 19 +- + arch/s390/kernel/{sys_s390.c => syscall.c} | 66 + + arch/s390/kernel/time.c | 50 +- + arch/s390/kernel/traps.c | 65 + + arch/s390/kernel/uprobes.c | 6 +- + arch/s390/kernel/vdso.c | 290 +- + arch/s390/kernel/vdso64/getcpu.c | 6 +- + arch/s390/kernel/vdso64/vdso64.lds.S | 7 +- + arch/s390/kernel/vtime.c | 18 +- + arch/s390/kvm/kvm-s390.c | 27 +- + arch/s390/kvm/vsie.c | 3 + + arch/s390/lib/uaccess.c | 12 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/pci/pci.c | 57 +- + arch/s390/pci/pci_clp.c | 40 +- + arch/s390/pci/pci_event.c | 6 +- + arch/s390/pci/pci_mmio.c | 4 +- + arch/sparc/include/asm/spinlock_64.h | 2 +- + arch/sparc/include/asm/tlb_64.h | 1 - + arch/um/drivers/Kconfig | 13 +- + arch/um/drivers/Makefile | 2 + + arch/um/drivers/rtc.h | 15 + + arch/um/drivers/rtc_kern.c | 211 + + arch/um/drivers/rtc_user.c | 80 + + arch/um/drivers/virtio_uml.c | 145 +- + arch/um/include/asm/Kbuild | 2 +- + arch/um/include/asm/io.h | 1 + + arch/um/include/asm/irq.h | 1 + + arch/um/include/asm/mmu_context.h | 29 +- + arch/um/include/linux/time-internal.h | 17 + + arch/um/include/shared/as-layout.h | 17 +- + arch/um/include/shared/common-offsets.h | 6 + + arch/um/include/shared/irq_kern.h | 60 + + arch/um/include/shared/skas/mm_id.h | 1 + + arch/um/include/shared/skas/stub-data.h | 2 +- + arch/um/kernel/exec.c | 4 +- + arch/um/kernel/irq.c | 171 +- + arch/um/kernel/skas/clone.c | 28 +- + arch/um/kernel/skas/mmu.c | 87 - + arch/um/kernel/time.c | 17 +- + arch/um/kernel/tlb.c | 14 +- + arch/um/kernel/um_arch.c | 5 + + arch/um/os-Linux/skas/mem.c | 2 + + arch/um/os-Linux/skas/process.c | 86 +- + arch/x86/Kconfig | 1 + + arch/x86/crypto/Makefile | 2 - + arch/x86/crypto/aesni-intel_asm.S | 482 +- + arch/x86/crypto/aesni-intel_glue.c | 753 +- + arch/x86/crypto/blake2s-glue.c | 150 +- + arch/x86/crypto/blowfish_glue.c | 107 - + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 298 - + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 351 - + arch/x86/{include/asm => }/crypto/camellia.h | 24 - + arch/x86/crypto/camellia_aesni_avx2_glue.c | 198 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 216 +- + arch/x86/crypto/camellia_glue.c | 145 +- + arch/x86/crypto/cast5_avx_glue.c | 287 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 84 - + arch/x86/crypto/cast6_avx_glue.c | 207 +- + arch/x86/crypto/des3_ede_glue.c | 104 - + arch/x86/crypto/ecb_cbc_helpers.h | 76 + + arch/x86/crypto/glue_helper-asm-avx.S | 104 - + arch/x86/crypto/glue_helper-asm-avx2.S | 136 - + arch/x86/crypto/glue_helper.c | 381 - + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 68 - + arch/x86/crypto/serpent-avx.h | 21 + + arch/x86/crypto/serpent-avx2-asm_64.S | 87 - + arch/x86/{include/asm => }/crypto/serpent-sse2.h | 0 + arch/x86/crypto/serpent_avx2_glue.c | 185 +- + arch/x86/crypto/serpent_avx_glue.c | 215 +- + arch/x86/crypto/serpent_sse2_glue.c | 150 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 80 - + arch/x86/{include/asm => }/crypto/twofish.h | 4 - + arch/x86/crypto/twofish_avx_glue.c | 211 +- + arch/x86/crypto/twofish_glue_3way.c | 160 +- + arch/x86/events/core.c | 28 +- + arch/x86/events/intel/core.c | 547 +- + arch/x86/events/intel/ds.c | 131 +- + arch/x86/events/intel/uncore.c | 58 +- + arch/x86/events/intel/uncore.h | 5 +- + arch/x86/events/intel/uncore_snb.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 114 +- + arch/x86/events/perf_event.h | 21 +- + arch/x86/events/probe.c | 7 +- + arch/x86/events/probe.h | 7 +- + arch/x86/events/rapl.c | 34 +- + arch/x86/hyperv/Makefile | 4 +- + arch/x86/hyperv/hv_init.c | 122 +- + arch/x86/hyperv/hv_proc.c | 219 + + arch/x86/hyperv/irqdomain.c | 385 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/crypto/glue_helper.h | 118 - + arch/x86/include/asm/crypto/serpent-avx.h | 42 - + arch/x86/include/asm/hyperv-tlfs.h | 38 + + arch/x86/include/asm/kprobes.h | 11 +- + arch/x86/include/asm/kvm-x86-ops.h | 127 + + arch/x86/include/asm/kvm_host.h | 89 +- + arch/x86/include/asm/mshyperv.h | 19 +- + arch/x86/include/asm/perf_event.h | 24 +- + arch/x86/include/asm/preempt.h | 48 +- + arch/x86/include/asm/static_call.h | 7 + + arch/x86/include/asm/tlb.h | 1 - + arch/x86/include/asm/virtext.h | 25 +- + arch/x86/include/asm/vmx.h | 1 + + arch/x86/include/asm/vmxfeatures.h | 1 + + arch/x86/include/asm/xen/interface.h | 3 + + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/include/uapi/asm/vmx.h | 4 +- + arch/x86/kernel/apic/apic.c | 1 + + arch/x86/kernel/cpu/mshyperv.c | 58 + + arch/x86/kernel/kprobes/core.c | 168 +- + arch/x86/kernel/ldt.c | 10 +- + arch/x86/kernel/reboot.c | 30 +- + arch/x86/kernel/static_call.c | 17 +- + arch/x86/kvm/Makefile | 5 +- + arch/x86/kvm/cpuid.c | 24 +- + arch/x86/kvm/cpuid.h | 24 +- + arch/x86/kvm/emulate.c | 14 +- + arch/x86/kvm/hyperv.c | 343 +- + arch/x86/kvm/hyperv.h | 54 +- + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/kvm_cache_regs.h | 10 +- + arch/x86/kvm/kvm_emulate.h | 2 +- + arch/x86/kvm/lapic.c | 60 +- + arch/x86/kvm/lapic.h | 20 +- + arch/x86/kvm/mmu.h | 8 +- + arch/x86/kvm/mmu/mmu.c | 353 +- + arch/x86/kvm/mmu/mmu_audit.c | 8 +- + arch/x86/kvm/mmu/mmu_internal.h | 7 +- + arch/x86/kvm/mmu/page_track.c | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 8 +- + arch/x86/kvm/mmu/spte.c | 2 +- + arch/x86/kvm/mmu/spte.h | 33 +- + arch/x86/kvm/mmu/tdp_iter.c | 46 +- + arch/x86/kvm/mmu/tdp_iter.h | 21 +- + arch/x86/kvm/mmu/tdp_mmu.c | 554 +- + arch/x86/kvm/mmu/tdp_mmu.h | 32 +- + arch/x86/kvm/mtrr.c | 12 +- + arch/x86/kvm/pmu.c | 10 +- + arch/x86/kvm/pmu.h | 2 + + arch/x86/kvm/svm/avic.c | 35 +- + arch/x86/kvm/svm/nested.c | 8 +- + arch/x86/kvm/svm/sev.c | 104 +- + arch/x86/kvm/svm/svm.c | 303 +- + arch/x86/kvm/svm/svm.h | 29 +- + arch/x86/kvm/svm/svm_ops.h | 69 + + arch/x86/kvm/trace.h | 40 +- + arch/x86/kvm/vmx/capabilities.h | 28 +- + arch/x86/kvm/vmx/nested.c | 106 +- + arch/x86/kvm/vmx/pmu_intel.c | 294 +- + arch/x86/kvm/vmx/posted_intr.c | 6 +- + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 282 +- + arch/x86/kvm/vmx/vmx.h | 56 +- + arch/x86/kvm/x86.c | 719 +- + arch/x86/kvm/x86.h | 12 +- + arch/x86/kvm/xen.c | 431 ++ + arch/x86/kvm/xen.h | 78 + + arch/x86/platform/intel-mid/device_libs/Makefile | 1 - + arch/x86/um/os-Linux/task_size.c | 2 +- + arch/x86/um/shared/sysdep/stub_32.h | 33 +- + arch/x86/um/shared/sysdep/stub_64.h | 36 +- + arch/x86/um/stub_32.S | 17 +- + arch/x86/um/stub_64.S | 5 +- + arch/x86/um/stub_segv.c | 5 +- + arch/x86/xen/p2m.c | 15 +- + arch/xtensa/include/asm/spinlock.h | 2 +- + block/blk-crypto.c | 1 + + block/blk-mq.c | 109 +- + block/keyslot-manager.c | 175 + + crypto/Kconfig | 96 +- + crypto/Makefile | 4 - + crypto/adiantum.c | 2 + + crypto/ansi_cprng.c | 2 + + crypto/asymmetric_keys/restrict.c | 7 +- + crypto/blake2b_generic.c | 249 +- + crypto/blake2s_generic.c | 158 +- + crypto/blowfish_generic.c | 23 +- + crypto/camellia_generic.c | 45 +- + crypto/cast5_generic.c | 23 +- + crypto/cast6_generic.c | 39 +- + crypto/cbc.c | 1 + + crypto/ccm.c | 2 + + crypto/cfb.c | 2 + + crypto/cipher.c | 7 +- + crypto/cmac.c | 2 + + crypto/ctr.c | 2 + + crypto/drbg.c | 2 + + crypto/ecb.c | 1 + + crypto/ecdh_helper.c | 3 + + crypto/essiv.c | 2 + + crypto/fcrypt.c | 1 - + crypto/keywrap.c | 2 + + crypto/michael_mic.c | 31 +- + crypto/ofb.c | 2 + + crypto/pcbc.c | 2 + + crypto/ripemd.h | 14 - + crypto/rmd128.c | 323 - + crypto/rmd256.c | 342 - + crypto/rmd320.c | 391 - + crypto/salsa20_generic.c | 212 - + crypto/serpent_generic.c | 126 +- + crypto/skcipher.c | 8 +- + crypto/tcrypt.c | 113 +- + crypto/testmgr.c | 57 +- + crypto/testmgr.h | 1632 ----- + crypto/tgr192.c | 682 -- + crypto/twofish_generic.c | 11 +- + crypto/vmac.c | 2 + + crypto/xcbc.c | 2 + + crypto/xor.c | 2 +- + crypto/xts.c | 2 + + drivers/acpi/thermal.c | 49 +- + drivers/acpi/utils.c | 30 +- + drivers/auxdisplay/Kconfig | 3 - + drivers/auxdisplay/ht16k33.c | 17 +- + drivers/base/core.c | 6 + + drivers/base/isa.c | 2 +- + drivers/base/platform.c | 2 +- + drivers/base/property.c | 15 +- + drivers/base/regmap/regcache.c | 2 +- + drivers/base/swnode.c | 180 +- + drivers/block/xen-blkback/blkback.c | 32 +- + drivers/char/hw_random/ingenic-trng.c | 6 +- + drivers/char/hw_random/iproc-rng200.c | 38 +- + drivers/char/hw_random/optee-rng.c | 3 +- + drivers/char/hw_random/timeriomem-rng.c | 5 +- + drivers/char/mem.c | 7 - + drivers/char/random.c | 15 +- + drivers/char/tpm/Kconfig | 10 + + drivers/char/tpm/Makefile | 2 + + drivers/char/tpm/eventlog/tpm1.c | 1 + + drivers/char/tpm/tpm-chip.c | 2 + + drivers/char/tpm/tpm-dev-common.c | 1 - + drivers/char/tpm/tpm-sysfs.c | 179 + + drivers/char/tpm/tpm.h | 4 - + drivers/char/tpm/tpm_ppi.c | 2 +- + drivers/char/tpm/tpm_tis_core.c | 50 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 790 +++ + drivers/clk/Kconfig | 5 +- + drivers/clk/Makefile | 7 +- + drivers/clk/at91/at91rm9200.c | 3 +- + drivers/clk/at91/at91sam9260.c | 16 +- + drivers/clk/at91/at91sam9g45.c | 3 +- + drivers/clk/at91/at91sam9n12.c | 3 +- + drivers/clk/at91/at91sam9rl.c | 3 +- + drivers/clk/at91/at91sam9x5.c | 20 +- + drivers/clk/at91/sama5d2.c | 3 +- + drivers/clk/at91/sama5d3.c | 2 +- + drivers/clk/at91/sama5d4.c | 3 +- + drivers/clk/bcm/clk-iproc-pll.c | 2 +- + drivers/clk/clk-ast2600.c | 37 +- + drivers/clk/clk-axi-clkgen.c | 15 +- + drivers/clk/clk-bd718x7.c | 12 +- + drivers/clk/clk-divider.c | 9 +- + drivers/clk/clk-efm32gg.c | 84 - + drivers/clk/clk-fixed-factor.c | 39 +- + drivers/clk/clk-fixed-mmio.c | 2 +- + drivers/clk/clk-npcm7xx.c | 108 - + drivers/clk/clk-qoriq.c | 62 +- + drivers/clk/clk-si570.c | 16 +- + drivers/clk/clk-tango4.c | 85 - + drivers/clk/clk-u300.c | 1199 ---- + drivers/clk/clk-versaclock5.c | 64 + + drivers/clk/clk-xgene.c | 5 +- + drivers/clk/imx/clk-imx31.c | 10 - + drivers/clk/imx/clk-imx6q.c | 6 +- + drivers/clk/imx/clk-imx6sl.c | 1 + + drivers/clk/imx/clk-imx8mm.c | 12 + + drivers/clk/imx/clk-imx8mn.c | 12 + + drivers/clk/imx/clk-imx8mq.c | 22 + + drivers/clk/imx/clk-imx8qxp.c | 26 +- + drivers/clk/mediatek/Kconfig | 11 + + drivers/clk/mediatek/clk-mux.c | 89 +- + drivers/clk/mediatek/clk-mux.h | 14 +- + drivers/clk/meson/axg.c | 3 - + drivers/clk/meson/axg.h | 1 - + drivers/clk/meson/clk-pll.c | 10 +- + drivers/clk/meson/meson8b.c | 45 +- + drivers/clk/mstar/Kconfig | 9 + + drivers/clk/mstar/Makefile | 6 + + drivers/clk/mstar/clk-msc313-mpll.c | 155 + + drivers/clk/mvebu/ap-cpu-clk.c | 2 +- + drivers/clk/qcom/Kconfig | 61 + + drivers/clk/qcom/Makefile | 7 + + drivers/clk/qcom/a7-pll.c | 100 + + drivers/clk/qcom/apcs-sdx55.c | 149 + + drivers/clk/qcom/clk-alpha-pll.c | 209 +- + drivers/clk/qcom/clk-alpha-pll.h | 4 + + drivers/clk/qcom/clk-rcg.h | 9 + + drivers/clk/qcom/clk-rcg2.c | 57 +- + drivers/clk/qcom/clk-regmap.c | 1 + + drivers/clk/qcom/clk-rpm.c | 63 - + drivers/clk/qcom/clk-rpmh.c | 49 +- + drivers/clk/qcom/gcc-ipq4019.c | 7 +- + drivers/clk/qcom/gcc-msm8998.c | 143 +- + drivers/clk/qcom/gcc-sc7180.c | 47 +- + drivers/clk/qcom/gcc-sc7280.c | 3603 ++++++++++ + drivers/clk/qcom/gcc-sc8180x.c | 4629 ++++++++++++ + drivers/clk/qcom/gcc-sdm660.c | 7 + + drivers/clk/qcom/gcc-sm8350.c | 3890 ++++++++++ + drivers/clk/qcom/gdsc.c | 10 +- + drivers/clk/qcom/gdsc.h | 3 +- + drivers/clk/qcom/gpucc-msm8998.c | 18 +- + drivers/clk/qcom/gpucc-sdm660.c | 349 + + drivers/clk/qcom/lpass-gfm-sm8250.c | 8 +- + drivers/clk/qcom/mmcc-msm8974.c | 16 - + drivers/clk/qcom/mmcc-msm8996.c | 29 +- + drivers/clk/qcom/mmcc-msm8998.c | 12 +- + drivers/clk/qcom/mmcc-sdm660.c | 2864 ++++++++ + drivers/clk/qcom/videocc-sm8250.c | 39 + + drivers/clk/renesas/Kconfig | 5 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 67 +- + drivers/clk/renesas/rcar-cpg-lib.c | 270 + + drivers/clk/renesas/rcar-cpg-lib.h | 33 + + drivers/clk/renesas/rcar-gen3-cpg.c | 267 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 4 +- + drivers/clk/rockchip/clk-cpu.c | 4 - + drivers/clk/rockchip/clk-half-divider.c | 2 +- + drivers/clk/rockchip/clk-pll.c | 6 +- + drivers/clk/rockchip/clk-rk3368.c | 6 +- + drivers/clk/rockchip/clk.c | 4 +- + drivers/clk/sifive/fu540-prci.h | 5 - + drivers/clk/sifive/sifive-prci.c | 5 + + drivers/clk/sirf/Makefile | 6 - + drivers/clk/sirf/atlas6.h | 32 - + drivers/clk/sirf/clk-atlas6.c | 150 - + drivers/clk/sirf/clk-atlas7.c | 1682 ----- + drivers/clk/sirf/clk-common.c | 1037 --- + drivers/clk/sirf/clk-prima2.c | 149 - + drivers/clk/sirf/prima2.h | 26 - + drivers/clk/socfpga/clk-agilex.c | 88 +- + drivers/clk/socfpga/clk-periph-s10.c | 53 + + drivers/clk/socfpga/clk-pll-a10.c | 3 +- + drivers/clk/socfpga/clk-pll-s10.c | 83 + + drivers/clk/socfpga/clk-pll.c | 3 +- + drivers/clk/socfpga/stratix10-clk.h | 17 +- + drivers/clk/spear/spear1310_clock.c | 1 + + drivers/clk/spear/spear1340_clock.c | 1 + + drivers/clk/st/clkgen-fsyn.c | 6 +- + drivers/clk/st/clkgen-pll.c | 3 +- + drivers/clk/sunxi-ng/Kconfig | 7 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 53 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 10 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++ + drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + + drivers/clk/sunxi/clk-a10-ve.c | 2 +- + drivers/clk/sunxi/clk-mod0.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 32 +- + drivers/clk/tegra/clk-tegra30.c | 5 +- + drivers/clk/tegra/cvb.c | 1 + + drivers/clk/ti/clkt_dpll.c | 3 +- + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/ti/dpll.c | 2 +- + drivers/clk/ti/dpll3xxx.c | 20 +- + drivers/clk/ti/dpll44xx.c | 6 +- + drivers/clk/ti/gate.c | 2 +- + drivers/clk/versatile/clk-icst.c | 7 +- + drivers/clk/xilinx/Kconfig | 19 + + drivers/clk/xilinx/Makefile | 2 + + drivers/clk/xilinx/xlnx_vcu.c | 743 ++ + drivers/clk/zte/Makefile | 4 - + drivers/clk/zte/clk-zx296702.c | 741 -- + drivers/clk/zte/clk-zx296718.c | 1074 --- + drivers/clk/zte/clk.c | 446 -- + drivers/clk/zte/clk.h | 174 - + drivers/clk/zynq/clkc.c | 73 +- + drivers/clk/zynq/pll.c | 12 +- + drivers/clk/zynqmp/divider.c | 1 + + drivers/clocksource/Kconfig | 36 - + drivers/clocksource/Makefile | 5 - + drivers/clocksource/hyperv_timer.c | 3 + + drivers/clocksource/timer-atlas7.c | 281 - + drivers/clocksource/timer-davinci.c | 5 +- + drivers/clocksource/timer-efm32.c | 278 - + drivers/clocksource/timer-microchip-pit64b.c | 86 +- + drivers/clocksource/timer-prima2.c | 242 - + drivers/clocksource/timer-tango-xtal.c | 57 - + drivers/clocksource/timer-u300.c | 457 -- + drivers/crypto/Kconfig | 35 +- + drivers/crypto/Makefile | 2 - + drivers/crypto/allwinner/Kconfig | 9 + + .../crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 196 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 52 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c | 6 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c | 6 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 8 + + drivers/crypto/bcm/cipher.c | 6 +- + drivers/crypto/bcm/cipher.h | 4 +- + drivers/crypto/bcm/spu.c | 20 +- + drivers/crypto/bcm/spu2.c | 6 +- + drivers/crypto/bcm/spu2.h | 8 +- + drivers/crypto/bcm/spum.h | 22 +- + drivers/crypto/bcm/util.c | 4 +- + drivers/crypto/bcm/util.h | 26 +- + drivers/crypto/caam/debugfs.c | 4 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 8 +- + drivers/crypto/ccp/sev-dev.c | 1 + + drivers/crypto/ccree/cc_cipher.c | 2 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/geode-aes.c | 2 + + drivers/crypto/hisilicon/hpre/hpre.h | 8 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 169 +- + drivers/crypto/hisilicon/qm.c | 193 +- + drivers/crypto/hisilicon/qm.h | 33 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 42 +- + drivers/crypto/hisilicon/zip/zip_main.c | 23 +- + drivers/crypto/inside-secure/safexcel.c | 6 +- + drivers/crypto/inside-secure/safexcel_hash.c | 1 + + drivers/crypto/keembay/Kconfig | 31 + + drivers/crypto/keembay/Makefile | 3 + + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 1264 ++++ + drivers/crypto/keembay/ocs-aes.c | 10 +- + drivers/crypto/keembay/ocs-hcu.c | 840 +++ + drivers/crypto/keembay/ocs-hcu.h | 106 + + drivers/crypto/marvell/Kconfig | 15 + + drivers/crypto/marvell/Makefile | 1 + + drivers/crypto/marvell/cesa/cesa.c | 10 +- + drivers/crypto/marvell/cesa/cesa.h | 31 +- + drivers/crypto/marvell/cesa/cipher.c | 34 +- + drivers/crypto/marvell/cesa/hash.c | 59 +- + drivers/crypto/marvell/cesa/tdma.c | 52 +- + drivers/crypto/marvell/octeontx2/Makefile | 10 + + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 137 + + .../crypto/marvell/octeontx2/otx2_cpt_hw_types.h | 464 ++ + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 202 + + drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h | 197 + + drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 428 ++ + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 353 + + drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 61 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 713 ++ + drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 356 + + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 1415 ++++ + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 162 + + drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 29 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 1758 +++++ + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h | 178 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 410 ++ + drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 167 + + .../crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 541 ++ + drivers/crypto/mediatek/Makefile | 3 - + drivers/crypto/mediatek/mtk-aes.c | 1271 ---- + drivers/crypto/mediatek/mtk-platform.c | 586 -- + drivers/crypto/mediatek/mtk-platform.h | 231 - + drivers/crypto/mediatek/mtk-regs.h | 190 - + drivers/crypto/mediatek/mtk-sha.c | 1353 ---- + drivers/crypto/picoxcell_crypto.c | 1807 ----- + drivers/crypto/picoxcell_crypto_regs.h | 115 - + drivers/crypto/qat/Kconfig | 2 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 14 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 17 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 27 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 3 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 + + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 8 +- + drivers/crypto/qat/qat_common/adf_transport.c | 2 + + .../crypto/qat/qat_common/adf_transport_debug.c | 4 +- + drivers/crypto/qat/qat_common/qat_algs.c | 1 + + drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 28 +- + drivers/crypto/sahara.c | 7 - + drivers/crypto/stm32/stm32-cryp.c | 2 +- + drivers/crypto/talitos.c | 50 +- + drivers/crypto/talitos.h | 1 + + drivers/crypto/vmx/aes.c | 1 + + drivers/crypto/vmx/aesp8-ppc.h | 6 + + drivers/crypto/vmx/vmx.c | 7 +- + drivers/dma-buf/Kconfig | 8 + + drivers/dma-buf/dma-buf.c | 120 +- + drivers/dma-buf/st-dma-fence.c | 7 +- + drivers/firmware/qcom_scm.c | 16 +- + drivers/firmware/smccc/smccc.c | 6 + + drivers/gpio/Kconfig | 44 +- + drivers/gpio/Makefile | 4 +- + drivers/gpio/TODO | 2 +- + drivers/gpio/gpio-aggregator.c | 40 +- + drivers/gpio/gpio-bd70528.c | 59 +- + drivers/gpio/gpio-bd71828.c | 39 +- + drivers/gpio/gpio-bd9571mwv.c | 35 +- + drivers/gpio/gpio-ep93xx.c | 28 +- + drivers/gpio/gpio-intel-mid.c | 414 -- + drivers/gpio/gpio-max77620.c | 2 +- + drivers/gpio/gpio-merrifield.c | 5 + + drivers/gpio/gpio-msic.c | 314 - + drivers/gpio/gpio-mvebu.c | 148 +- + drivers/gpio/gpio-pca953x.c | 2 + + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-rcar.c | 85 +- + drivers/gpio/gpio-sl28cpld.c | 4 +- + drivers/gpio/gpio-tegra.c | 263 +- + drivers/gpio/gpio-tegra186.c | 2 +- + drivers/gpio/gpio-visconti.c | 218 + + drivers/gpio/gpio-vx855.c | 2 +- + drivers/gpio/gpio-wcove.c | 65 +- + drivers/gpio/gpio-xilinx.c | 369 +- + drivers/gpio/gpio-zx.c | 289 - + drivers/gpio/gpiolib.c | 4 + + drivers/gpu/drm/Kconfig | 5 - + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 87 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 144 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 45 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 195 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 176 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 36 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 10 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 - + drivers/gpu/drm/amd/amdgpu/cik.c | 33 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 72 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 105 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 137 + + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 212 + + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 36 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 478 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 124 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 10 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 10 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 10 - + drivers/gpu/drm/amd/amdgpu/nv.c | 254 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 31 +- + drivers/gpu/drm/amd/amdgpu/si.c | 42 +- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c | 77 + + drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 126 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 154 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 483 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 703 ++ + drivers/gpu/drm/amd/amdgpu/vega20_ih.h | 30 + + drivers/gpu/drm/amd/amdgpu/vi.c | 36 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 147 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 14 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 10 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 9 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 22 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 - + drivers/gpu/drm/amd/display/dc/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 9 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 119 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 29 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 61 + + .../drm/amd/display/dc/bios/command_table_helper.c | 20 +- + .../amd/display/dc/bios/command_table_helper2.c | 20 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 13 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 30 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 18 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 132 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 104 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 19 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 46 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 22 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_edid_parser.c | 80 + + drivers/gpu/drm/amd/display/dc/dc_edid_parser.h | 44 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 10 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 73 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 126 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 13 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 24 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 2 - + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 8 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 23 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 3 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 28 +- + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 + + .../drm/amd/display/dc/dce110/dce110_compressor.c | 55 - + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 17 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 19 +- + .../display/dc/dce110/dce110_timing_generator.c | 76 +- + .../display/dc/dce110/dce110_timing_generator_v.c | 19 +- + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 19 +- + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 + + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- + .../display/dc/dce120/dce120_timing_generator.c | 99 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 18 +- + .../amd/display/dc/dce60/dce60_timing_generator.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 39 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 15 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 11 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 118 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 20 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 261 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 147 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 107 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 188 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 2 + + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 7 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 9 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 124 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 51 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 8 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 32 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + + .../display/dc/gpio/diagnostics/hw_factory_diag.h | 2 + + .../dc/gpio/diagnostics/hw_translate_diag.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 14 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 8 + + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 31 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq_types.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 35 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 11 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 3 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +- + .../drm/amd/display/modules/color/color_table.c | 26 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 4 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 4 +- + .../amd/display/modules/info_packet/info_packet.c | 13 +- + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + drivers/gpu/drm/amd/include/amd_pcie.h | 2 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/oss/osssys_4_2_0_offset.h | 345 + + .../include/asic_reg/oss/osssys_4_2_0_sh_mask.h | 1300 ++++ + .../include/asic_reg/smuio/smuio_11_0_6_offset.h | 35 + + .../include/asic_reg/smuio/smuio_11_0_6_sh_mask.h | 41 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 5 +- + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 259 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 583 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 1 - + drivers/gpu/drm/amd/pm/inc/smu_types.h | 9 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 25 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 6 +- + drivers/gpu/drm/amd/pm/inc/smu_v12_0.h | 2 - + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 4 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 137 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.h | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 11 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 11 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 221 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 29 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 31 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 370 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 91 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 1301 +++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 226 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 12 - + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 93 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + + drivers/gpu/drm/arc/arcpgu_crtc.c | 9 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - + drivers/gpu/drm/arm/malidp_crtc.c | 1 - + drivers/gpu/drm/armada/armada_crtc.c | 1 - + drivers/gpu/drm/ast/ast_cursor.c | 55 +- + drivers/gpu/drm/ast/ast_drv.c | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_main.c | 25 +- + drivers/gpu/drm/ast/ast_mm.c | 17 +- + drivers/gpu/drm/ast/ast_mode.c | 6 +- + drivers/gpu/drm/ast/ast_post.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 1 - + drivers/gpu/drm/bochs/bochs_hw.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +- + drivers/gpu/drm/bridge/display-connector.c | 46 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 67 +- + drivers/gpu/drm/drm_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_blend.c | 6 - + drivers/gpu/drm/drm_bufs.c | 4 +- + drivers/gpu/drm/drm_cache.c | 33 + + drivers/gpu/drm/drm_client_modeset.c | 7 +- + drivers/gpu/drm/drm_color_mgmt.c | 125 +- + drivers/gpu/drm/drm_crtc.c | 130 +- + drivers/gpu/drm/drm_dp_helper.c | 650 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 8 +- + drivers/gpu/drm/drm_drv.c | 16 +- + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/drm_dumb_buffers.c | 8 +- + drivers/gpu/drm/drm_edid.c | 110 +- + drivers/gpu/drm/drm_encoder.c | 113 +- + drivers/gpu/drm/drm_fb_helper.c | 25 +- + drivers/gpu/drm/drm_file.c | 8 +- + drivers/gpu/drm/drm_gem.c | 31 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 141 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_irq.c | 44 +- + drivers/gpu/drm/drm_legacy.h | 2 +- + drivers/gpu/drm/drm_memory.c | 51 - + drivers/gpu/drm/drm_mode_config.c | 51 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_pci.c | 59 +- + drivers/gpu/drm/drm_plane.c | 170 +- + drivers/gpu/drm/drm_prime.c | 66 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + drivers/gpu/drm/drm_vblank.c | 2 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/gma500/Kconfig | 17 +- + drivers/gpu/drm/gma500/Makefile | 37 +- + drivers/gpu/drm/gma500/cdv_device.c | 30 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 - + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 11 +- + drivers/gpu/drm/gma500/framebuffer.c | 15 +- + drivers/gpu/drm/gma500/gem.c | 6 +- + drivers/gpu/drm/gma500/gem.h | 2 + + drivers/gpu/drm/gma500/gma_device.c | 4 +- + drivers/gpu/drm/gma500/gma_display.c | 12 +- + drivers/gpu/drm/gma500/gtt.c | 20 +- + drivers/gpu/drm/gma500/intel_bios.c | 8 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 4 +- + drivers/gpu/drm/gma500/intel_i2c.c | 5 +- + drivers/gpu/drm/gma500/mdfld_device.c | 562 -- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 1017 --- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.h | 79 - + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 603 -- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 377 - + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 679 -- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h | 80 - + drivers/gpu/drm/gma500/mdfld_intel_display.c | 966 --- + drivers/gpu/drm/gma500/mdfld_output.c | 74 - + drivers/gpu/drm/gma500/mdfld_output.h | 76 - + drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 197 - + drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 83 - + drivers/gpu/drm/gma500/mid_bios.c | 9 +- + drivers/gpu/drm/gma500/mmu.c | 36 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 10 +- + drivers/gpu/drm/gma500/opregion.c | 3 +- + drivers/gpu/drm/gma500/power.c | 21 +- + drivers/gpu/drm/gma500/psb_drv.c | 34 +- + drivers/gpu/drm/gma500/psb_drv.h | 75 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 3 +- + drivers/gpu/drm/gma500/psb_intel_reg.h | 12 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 +- + drivers/gpu/drm/gma500/psb_irq.c | 75 +- + drivers/gpu/drm/gma500/psb_irq.h | 2 - + drivers/gpu/drm/gma500/psb_reg.h | 14 - + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 805 --- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.h | 38 - + drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 104 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 20 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 - + drivers/gpu/drm/i915/Kconfig.debug | 24 +- + drivers/gpu/drm/i915/Makefile | 26 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 926 +++ + drivers/gpu/drm/i915/display/i9xx_plane.h | 24 + + drivers/gpu/drm/i915/display/icl_dsi.c | 3 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 +- + drivers/gpu/drm/i915/display/intel_bios.c | 21 +- + drivers/gpu/drm/i915/display/intel_bw.c | 80 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + drivers/gpu/drm/i915/display/intel_color.c | 16 + + drivers/gpu/drm/i915/display/intel_combo_phy.c | 20 +- + drivers/gpu/drm/i915/display/intel_connector.c | 29 +- + drivers/gpu/drm/i915/display/intel_connector.h | 3 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 325 + + drivers/gpu/drm/i915/display/intel_crtc.h | 22 + + drivers/gpu/drm/i915/display/intel_cursor.c | 806 +++ + drivers/gpu/drm/i915/display/intel_cursor.h | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 244 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 7484 +++++--------------- + drivers/gpu/drm/i915/display/intel_display.h | 27 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 133 +- + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 133 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 202 +- + drivers/gpu/drm/i915/display/intel_dp.c | 3112 +++----- + drivers/gpu/drm/i915/display/intel_dp.h | 11 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 692 ++ + drivers/gpu/drm/i915/display/intel_dp_aux.h | 18 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 404 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 178 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 49 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 1363 ++++ + drivers/gpu/drm/i915/display/intel_dpll.h | 23 + + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 23 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 21 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 683 ++ + drivers/gpu/drm/i915/display/intel_fdi.h | 22 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 300 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 8 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 284 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 7 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 162 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 12 + + drivers/gpu/drm/i915/display/intel_overlay.c | 1 + + drivers/gpu/drm/i915/display/intel_panel.c | 552 +- + drivers/gpu/drm/i915/display/intel_panel.h | 4 + + drivers/gpu/drm/i915/display/intel_pps.c | 1406 ++++ + drivers/gpu/drm/i915/display/intel_pps.h | 52 + + drivers/gpu/drm/i915/display/intel_psr.c | 143 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 148 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 10 + + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 209 + + drivers/gpu/drm/i915/display/intel_vrr.h | 33 + + drivers/gpu/drm/i915/dma_resv_utils.c | 17 + + drivers/gpu/drm/i915/dma_resv_utils.h | 13 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 132 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_create.c | 113 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 59 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 112 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 43 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 76 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 28 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 79 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 54 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 22 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 1 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 + + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 1 + + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 27 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 15 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 14 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 635 ++ + drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 127 + + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 59 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 17 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 7 +- + drivers/gpu/drm/i915/gt/intel_context.h | 11 +- + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 1 - + drivers/gpu/drm/i915/gt/intel_context_types.h | 25 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 93 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 167 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 59 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 22 +- + drivers/gpu/drm/i915/gt/intel_engine_stats.h | 60 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 22 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 3896 ++++++++++ + .../gpu/drm/i915/gt/intel_execlists_submission.h | 47 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 22 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h | 3 +- + .../gpu/drm/i915/gt/intel_gt_buffer_pool_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 197 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.h | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 49 + + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 25 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 29 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 3 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 6881 +++--------------- + drivers/gpu/drm/i915/gt/intel_lrc.h | 167 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 41 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.c | 4 +- + drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.h | 2 - + drivers/gpu/drm/i915/gt/intel_renderstate.c | 3 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 101 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 + + drivers/gpu/drm/i915/gt/intel_ring.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 272 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 61 +- + drivers/gpu/drm/i915/gt/intel_rps_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 103 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 25 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 654 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 15 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 1 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 13 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 203 + + drivers/gpu/drm/i915/gt/selftest_execlists.c | 4741 +++++++++++++ + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 173 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 4771 +------------ + drivers/gpu/drm/i915/gt/selftest_mocs.c | 80 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 1 + + drivers/gpu/drm/i915/gt/selftest_reset.c | 28 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 196 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 7 - + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 457 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 54 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 7 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 337 +- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 5 + + drivers/gpu/drm/i915/gvt/execlist.h | 3 - + drivers/gpu/drm/i915/gvt/fb_decoder.h | 6 +- + drivers/gpu/drm/i915/gvt/gtt.h | 11 +- + drivers/gpu/drm/i915/gvt/gvt.h | 41 +- + drivers/gpu/drm/i915/gvt/handlers.c | 22 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 12 +- + drivers/gpu/drm/i915/gvt/mmio.h | 3 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.h | 12 + + drivers/gpu/drm/i915/gvt/mpt.h | 2 + + drivers/gpu/drm/i915/gvt/reg.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 24 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 5 + + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_active.c | 7 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 763 +- + drivers/gpu/drm/i915/i915_drv.c | 17 +- + drivers/gpu/drm/i915/i915_drv.h | 120 +- + drivers/gpu/drm/i915/i915_gem.c | 163 +- + drivers/gpu/drm/i915/i915_gem.h | 9 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 13 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 25 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/i915_irq.c | 475 +- + drivers/gpu/drm/i915/i915_irq.h | 3 - + drivers/gpu/drm/i915/i915_mm.c | 2 +- + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 17 +- + drivers/gpu/drm/i915/i915_pmu.c | 95 +- + drivers/gpu/drm/i915/i915_pmu.h | 35 +- + drivers/gpu/drm/i915/i915_reg.h | 81 +- + drivers/gpu/drm/i915/i915_request.c | 178 +- + drivers/gpu/drm/i915/i915_request.h | 10 +- + drivers/gpu/drm/i915/i915_scheduler.c | 32 +- + drivers/gpu/drm/i915/i915_scheduler.h | 7 + + drivers/gpu/drm/i915/i915_scheduler_types.h | 10 + + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 25 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 7 +- + drivers/gpu/drm/i915/i915_vma.h | 15 + + drivers/gpu/drm/i915/i915_vma_types.h | 3 + + drivers/gpu/drm/i915/intel_device_info.c | 159 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 - + drivers/gpu/drm/i915/intel_dram.c | 136 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.h | 13 +- + drivers/gpu/drm/i915/intel_pch.c | 39 +- + drivers/gpu/drm/i915/intel_pm.c | 1108 ++- + drivers/gpu/drm/i915/intel_pm.h | 7 +- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.h | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 1 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 28 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 9 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 4 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 110 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 - + drivers/gpu/drm/i915/selftests/mock_region.c | 19 +- + drivers/gpu/drm/imx/Kconfig | 3 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 95 +- + drivers/gpu/drm/imx/imx-ldb.c | 109 +- + drivers/gpu/drm/imx/imx-tve.c | 109 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 131 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 69 +- + drivers/gpu/drm/imx/ipuv3-plane.h | 3 - + drivers/gpu/drm/imx/parallel-display.c | 93 +- + drivers/gpu/drm/ingenic/Kconfig | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 60 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 14 + + drivers/gpu/drm/kmb/kmb_drv.c | 4 +- + drivers/gpu/drm/kmb/kmb_plane.c | 3 + + drivers/gpu/drm/lima/lima_sched.c | 2 +- + drivers/gpu/drm/mediatek/Makefile | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 223 + + drivers/gpu/drm/mediatek/mtk_disp_color.c | 89 +- + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 92 + + drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 197 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 254 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 194 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 57 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 108 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 28 - + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 503 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 100 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 88 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 50 +- + drivers/gpu/drm/mga/mga_ioc32.c | 14 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mm.c | 10 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 14 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 230 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 11 +- + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 52 +- + drivers/gpu/drm/nouveau/include/nvif/fifo.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 191 +- + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 13 +- + drivers/gpu/drm/nouveau/include/nvkm/core/enum.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h | 10 +- + drivers/gpu/drm/nouveau/include/nvkm/core/layout.h | 53 + + drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 31 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 18 +- + .../gpu/drm/nouveau/include/nvkm/engine/cipher.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 41 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h | 10 +- + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 42 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 80 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h | 10 +- + .../gpu/drm/nouveau/include/nvkm/engine/mspdec.h | 8 +- + .../gpu/drm/nouveau/include/nvkm/engine/msppp.h | 6 +- + .../gpu/drm/nouveau/include/nvkm/engine/msvld.h | 10 +- + .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/engine/nvenc.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 23 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/engine/xtensa.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/acr.h | 12 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | 14 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h | 2 +- + .../drm/nouveau/include/nvkm/subdev/bios/conn.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h | 10 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | 20 +- + .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 35 +- + .../gpu/drm/nouveau/include/nvkm/subdev/fault.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 75 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 12 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 18 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | 12 - + .../gpu/drm/nouveau/include/nvkm/subdev/iccsense.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 13 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 16 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 40 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 32 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 22 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 25 +- + .../gpu/drm/nouveau/include/nvkm/subdev/privring.h | 12 + + .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 18 +- + .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 27 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 12 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 20 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvif/fifo.c | 30 +- + drivers/gpu/drm/nouveau/nvkm/core/engine.c | 51 +- + drivers/gpu/drm/nouveau/nvkm/core/memory.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 110 +- + drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gp100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/tu102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 4599 ++++++------ + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 27 +- + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/gf119.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/gv100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 38 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 63 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/changf100.h | 11 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 6 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/channv04.h | 6 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.c | 28 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.h | 22 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c | 32 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c | 75 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 99 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 207 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 35 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 5 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 53 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 60 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 44 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 365 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp108.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv15.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv17.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv44.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/base.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msppp/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msppp/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 23 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/vp/g84.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp108.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp10b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv31.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/g84.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 16 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c | 5 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 20 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 12 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 16 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 3 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp10b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gt215.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp77.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp89.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv1a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv47.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv49.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv4e.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/g94.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gf119.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv10.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf119.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk110.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild | 7 - + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h | 9 - + .../gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 8 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/gf100.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 14 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 34 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 67 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk104.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv11.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv17.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c | 115 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk20a.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm200.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm20b.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv41.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv40.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv46.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv4c.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 8 +- + .../gpu/drm/nouveau/nvkm/subdev/privring/Kbuild | 7 + + .../nouveau/nvkm/subdev/{ibus => privring}/gf100.c | 44 +- + .../nouveau/nvkm/subdev/{ibus => privring}/gf117.c | 16 +- + .../nouveau/nvkm/subdev/{ibus => privring}/gk104.c | 46 +- + .../nouveau/nvkm/subdev/{ibus => privring}/gk20a.c | 30 +- + .../nouveau/nvkm/subdev/{ibus => privring}/gm200.c | 10 +- + .../nouveau/nvkm/subdev/{ibus => privring}/gp10b.c | 18 +- + .../gpu/drm/nouveau/nvkm/subdev/privring/priv.h | 8 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 43 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv40.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv41.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c | 70 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c | 107 + + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 46 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/nv40.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | 8 +- + drivers/gpu/drm/omapdrm/Kconfig | 120 +- + drivers/gpu/drm/omapdrm/Makefile | 19 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 10 - + drivers/gpu/drm/omapdrm/displays/Makefile | 2 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1385 ---- + drivers/gpu/drm/omapdrm/dss/Kconfig | 135 - + drivers/gpu/drm/omapdrm/dss/Makefile | 20 - + drivers/gpu/drm/omapdrm/dss/base.c | 87 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 202 +- + drivers/gpu/drm/omapdrm/dss/display.c | 60 - + drivers/gpu/drm/omapdrm/dss/dpi.c | 1 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 1949 ++--- + drivers/gpu/drm/omapdrm/dss/dsi.h | 456 ++ + drivers/gpu/drm/omapdrm/dss/dss.c | 28 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 72 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 - + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 229 - + drivers/gpu/drm/omapdrm/dss/omapdss.h | 347 +- + drivers/gpu/drm/omapdrm/dss/output.c | 57 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 6 + + drivers/gpu/drm/omapdrm/dss/sdi.c | 1 - + drivers/gpu/drm/omapdrm/dss/venc.c | 2 - + drivers/gpu/drm/omapdrm/omap_connector.c | 157 - + drivers/gpu/drm/omapdrm/omap_connector.h | 28 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 153 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 2 - + drivers/gpu/drm/omapdrm/omap_drv.c | 73 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 3 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 59 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 34 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 41 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 1 - + drivers/gpu/drm/panel/Kconfig | 20 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-dsi-cm.c | 665 ++ + drivers/gpu/drm/panel/panel-khadas-ts050.c | 870 +++ + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 39 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 59 +- + drivers/gpu/drm/panel/panel-simple.c | 223 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 24 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 1 + + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_dev.h | 16 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +- + drivers/gpu/drm/qxl/qxl_irq.c | 3 +- + drivers/gpu/drm/qxl/qxl_kms.c | 1 - + drivers/gpu/drm/qxl/qxl_object.h | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 - + drivers/gpu/drm/r128/r128_ioc32.c | 14 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 6 +- + drivers/gpu/drm/radeon/r100.c | 27 +- + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 36 +- + drivers/gpu/drm/radeon/radeon_asic.c | 3 + + drivers/gpu/drm/radeon/radeon_atombios.c | 89 +- + drivers/gpu/drm/radeon/radeon_bios.c | 6 +- + drivers/gpu/drm/radeon/radeon_combios.c | 55 +- + drivers/gpu/drm/radeon/radeon_cs.c | 6 +- + drivers/gpu/drm/radeon/radeon_device.c | 17 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 24 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 13 +- + drivers/gpu/drm/radeon/radeon_object.h | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_trace.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 15 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 38 +- + drivers/gpu/drm/radeon/radeon_vce.c | 1 - + drivers/gpu/drm/radeon/rs690.c | 2 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 7 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 1 - + drivers/gpu/drm/rcar-du/rcar_cmm.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 33 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 98 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 42 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 28 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 2 +- + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/scheduler/sched_main.c | 123 +- + drivers/gpu/drm/sti/sti_cursor.c | 9 +- + drivers/gpu/drm/sti/sti_gdp.c | 9 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 9 +- + drivers/gpu/drm/stm/ltdc.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tcon.c | 21 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 109 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 6 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 + + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 2 +- + drivers/gpu/drm/tegra/drm.c | 2 + + drivers/gpu/drm/tegra/dsi.c | 2 +- + drivers/gpu/drm/tegra/falcon.c | 9 +- + drivers/gpu/drm/tegra/gr2d.c | 9 +- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tegra/vic.c | 35 +- + drivers/gpu/drm/tiny/cirrus.c | 1 - + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 105 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 16 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_memory.c | 3 +- + drivers/gpu/drm/ttm/ttm_module.c | 3 +- + {include => drivers/gpu}/drm/ttm/ttm_module.h | 0 + drivers/gpu/drm/ttm/ttm_range_manager.c | 1 - + drivers/gpu/drm/ttm/ttm_tt.c | 15 +- + drivers/gpu/drm/tve200/tve200_display.c | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 1 - + drivers/gpu/drm/v3d/v3d_drv.c | 4 +- + drivers/gpu/drm/v3d/v3d_irq.c | 7 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 11 +- + drivers/gpu/drm/vboxvideo/vbox_irq.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 8 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 +- + drivers/gpu/drm/vc4/vc4_bo.c | 111 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 38 +- + drivers/gpu/drm/vc4/vc4_drv.c | 19 +- + drivers/gpu/drm/vc4/vc4_drv.h | 30 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 111 +- + drivers/gpu/drm/vc4/vc4_gem.c | 3 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 388 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 34 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 8 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 13 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 18 +- + drivers/gpu/drm/vc4/vc4_kms.c | 248 +- + drivers/gpu/drm/vc4/vc4_plane.c | 7 +- + drivers/gpu/drm/vc4/vc4_txp.c | 11 +- + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/via/via_irq.c | 2 +- + drivers/gpu/drm/virtio/Kconfig | 3 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 24 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 81 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + + drivers/gpu/drm/virtio/virtgpu_vram.c | 3 + + drivers/gpu/drm/vkms/vkms_drv.c | 54 +- + drivers/gpu/drm/vkms/vkms_drv.h | 12 +- + drivers/gpu/drm/vkms/vkms_output.c | 13 +- + drivers/gpu/drm/vmwgfx/Makefile | 6 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + .../gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} | 126 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 240 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 94 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 26 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 76 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 155 - + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 47 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 4 +- + drivers/gpu/drm/zte/zx_plane.c | 7 +- + drivers/gpu/ipu-v3/ipu-di.c | 4 - + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + drivers/hv/channel.c | 4 +- + drivers/hv/channel_mgmt.c | 77 +- + drivers/hv/connection.c | 7 + + drivers/hv/hv_fcopy.c | 36 +- + drivers/hv/hv_kvp.c | 122 +- + drivers/hv/hv_snapshot.c | 89 +- + drivers/hv/hv_util.c | 222 +- + drivers/hv/vmbus_drv.c | 64 +- + drivers/hwmon/Kconfig | 34 +- + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/ab8500.c | 224 - + drivers/hwmon/abx500.c | 487 -- + drivers/hwmon/abx500.h | 69 - + drivers/hwmon/aht10.c | 348 + + drivers/hwmon/amd_energy.c | 1 + + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/aspeed-pwm-tacho.c | 4 +- + drivers/hwmon/da9052-hwmon.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 7 + + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/k10temp.c | 3 +- + drivers/hwmon/lm70.c | 20 +- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/pc87360.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/pmbus/ibm-cffps.c | 2 +- + drivers/hwmon/pmbus/lm25066.c | 5 - + drivers/hwmon/pmbus/max16601.c | 91 +- + drivers/hwmon/pmbus/max31785.c | 13 +- + drivers/hwmon/pmbus/pmbus_core.c | 12 +- + drivers/hwmon/pwm-fan.c | 160 +- + drivers/hwmon/smsc47m1.c | 2 +- + drivers/hwmon/tps23861.c | 601 ++ + drivers/hwmon/w83627ehf.c | 2 +- + drivers/i2c/algos/i2c-algo-bit.c | 4 +- + drivers/i2c/busses/Kconfig | 39 - + drivers/i2c/busses/Makefile | 4 - + drivers/i2c/busses/i2c-amd-mp2-pci.c | 55 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 3 +- + drivers/i2c/busses/i2c-amd-mp2.h | 6 - + drivers/i2c/busses/i2c-bcm-iproc.c | 254 +- + drivers/i2c/busses/i2c-digicolor.c | 5 +- + drivers/i2c/busses/i2c-efm32.c | 469 -- + drivers/i2c/busses/i2c-elektor.c | 7 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 17 +- + drivers/i2c/busses/i2c-imx.c | 65 +- + drivers/i2c/busses/i2c-jz4780.c | 5 +- + drivers/i2c/busses/i2c-mlxcpld.c | 97 +- + drivers/i2c/busses/i2c-mv64xxx.c | 122 +- + drivers/i2c/busses/i2c-pca-isa.c | 4 +- + drivers/i2c/busses/i2c-qcom-geni.c | 93 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 66 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sirf.c | 475 -- + drivers/i2c/busses/i2c-stm32f7.c | 6 +- + drivers/i2c/busses/i2c-stu300.c | 1008 --- + drivers/i2c/busses/i2c-tegra.c | 9 +- + drivers/i2c/busses/i2c-zx2967.c | 602 -- + drivers/i2c/i2c-core-acpi.c | 6 +- + drivers/i2c/i2c-core-smbus.c | 46 +- + drivers/i2c/i2c-slave-testunit.c | 12 +- + drivers/i2c/i2c-stub.c | 1 - + drivers/i2c/muxes/i2c-mux-gpio.c | 112 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 163 +- + drivers/i3c/device.c | 5 + + drivers/i3c/master.c | 8 +- + drivers/i3c/master/Kconfig | 9 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/dw-i3c-master.c | 5 - + drivers/i3c/master/svc-i3c-master.c | 1478 ++++ + drivers/iio/adc/qcom-vadc-common.c | 50 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/cache.c | 9 +- + drivers/infiniband/core/cm.c | 8 +- + drivers/infiniband/core/cma.c | 81 +- + drivers/infiniband/core/cma_configfs.c | 12 +- + drivers/infiniband/core/counters.c | 78 +- + drivers/infiniband/core/device.c | 23 +- + drivers/infiniband/core/iwpm_msg.c | 16 +- + drivers/infiniband/core/iwpm_util.c | 6 +- + drivers/infiniband/core/multicast.c | 1 + + drivers/infiniband/core/nldev.c | 4 +- + drivers/infiniband/core/restrack.c | 4 +- + drivers/infiniband/core/roce_gid_mgmt.c | 2 +- + drivers/infiniband/core/rw.c | 2 +- + drivers/infiniband/core/sa_query.c | 26 +- + drivers/infiniband/core/umem.c | 3 + + drivers/infiniband/core/umem_dmabuf.c | 174 + + drivers/infiniband/core/user_mad.c | 17 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 117 +- + drivers/infiniband/core/verbs.c | 4 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 49 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 29 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- + drivers/infiniband/hw/cxgb4/restrack.c | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 25 +- + drivers/infiniband/hw/efa/efa_admin_defs.h | 4 +- + drivers/infiniband/hw/efa/efa_com.c | 33 +- + drivers/infiniband/hw/hfi1/chip.c | 46 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 8 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/intr.c | 16 +- + drivers/infiniband/hw/hfi1/iowait.c | 4 +- + drivers/infiniband/hw/hfi1/mad.c | 4 +- + drivers/infiniband/hw/hfi1/msix.c | 2 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 4 +- + drivers/infiniband/hw/hfi1/pio_copy.c | 1 + + drivers/infiniband/hw/hfi1/qp.c | 14 +- + drivers/infiniband/hw/hfi1/qsfp.c | 4 +- + drivers/infiniband/hw/hfi1/rc.c | 7 +- + drivers/infiniband/hw/hfi1/ruc.c | 5 +- + drivers/infiniband/hw/hfi1/sdma.c | 12 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 47 +- + drivers/infiniband/hw/hfi1/uc.c | 8 +- + drivers/infiniband/hw/hfi1/ud.c | 8 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +- + drivers/infiniband/hw/hfi1/verbs.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 26 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 116 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 82 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 33 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 43 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 791 +-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 141 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 30 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 458 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 38 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 331 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 21 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 18 +- + drivers/infiniband/hw/i40iw/i40iw_hmc.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 13 +- + drivers/infiniband/hw/i40iw/i40iw_pble.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 13 +- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 22 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 19 +- + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 19 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/sysfs.c | 4 +- + drivers/infiniband/hw/mlx5/devx.c | 227 +- + drivers/infiniband/hw/mlx5/mad.c | 14 +- + drivers/infiniband/hw/mlx5/main.c | 147 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 60 +- + drivers/infiniband/hw/mlx5/mr.c | 137 +- + drivers/infiniband/hw/mlx5/odp.c | 325 +- + drivers/infiniband/hw/mlx5/qp.c | 160 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/hw/qedr/qedr.h | 8 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 4 +- + drivers/infiniband/hw/qib/qib_driver.c | 2 +- + drivers/infiniband/hw/qib/qib_eeprom.c | 4 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 18 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 16 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 14 +- + drivers/infiniband/hw/qib/qib_intr.c | 16 +- + drivers/infiniband/hw/qib/qib_mad.c | 10 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/hw/qib/qib_qp.c | 12 +- + drivers/infiniband/hw/qib/qib_rc.c | 5 +- + drivers/infiniband/hw/qib/qib_twsi.c | 1 + + drivers/infiniband/hw/qib/qib_tx.c | 1 + + drivers/infiniband/hw/qib/qib_uc.c | 1 + + drivers/infiniband/hw/qib/qib_ud.c | 1 + + drivers/infiniband/hw/qib/qib_user_pages.c | 2 +- + drivers/infiniband/hw/qib/qib_verbs.c | 6 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 5 +- + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/mad.c | 7 +- + drivers/infiniband/sw/rdmavt/mcast.c | 2 +- + drivers/infiniband/sw/rdmavt/mr.c | 21 +- + drivers/infiniband/sw/rdmavt/qp.c | 34 +- + drivers/infiniband/sw/rdmavt/srq.c | 7 +- + drivers/infiniband/sw/rdmavt/vt.c | 2 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 49 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 178 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 64 +- + drivers/infiniband/sw/rxe/rxe_net.c | 24 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 300 +- + drivers/infiniband/sw/rxe/rxe_pool.h | 103 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 11 + + drivers/infiniband/sw/rxe/rxe_recv.c | 40 +- + drivers/infiniband/sw/rxe/rxe_req.c | 1 - + drivers/infiniband/sw/rxe/rxe_resp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 68 +- + drivers/infiniband/sw/siw/siw.h | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 4 +- + drivers/infiniband/sw/siw/siw_qp.c | 271 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 26 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 4 +- + drivers/infiniband/sw/siw/siw_verbs.c | 20 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 53 +- + drivers/infiniband/ulp/iser/iser_memory.c | 3 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 10 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 127 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 4 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 9 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 9 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 123 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 32 +- + drivers/infiniband/ulp/srp/ib_srp.c | 110 +- + drivers/input/touchscreen/htcpen.c | 4 +- + drivers/iommu/amd/Kconfig | 1 + + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 22 + + drivers/iommu/amd/amd_iommu_types.h | 43 +- + drivers/iommu/amd/init.c | 54 +- + drivers/iommu/amd/io_pgtable.c | 558 ++ + drivers/iommu/amd/iommu.c | 672 +- + drivers/iommu/amd/iommu_v2.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 10 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 154 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 14 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 5 + + drivers/iommu/dma-iommu.c | 29 +- + drivers/iommu/hyperv-iommu.c | 177 +- + drivers/iommu/intel/Makefile | 2 +- + drivers/iommu/intel/cap_audit.c | 205 + + drivers/iommu/intel/cap_audit.h | 130 + + drivers/iommu/intel/dmar.c | 11 + + drivers/iommu/intel/iommu.c | 279 +- + drivers/iommu/intel/irq_remapping.c | 8 + + drivers/iommu/intel/pasid.c | 18 +- + drivers/iommu/intel/svm.c | 73 +- + drivers/iommu/io-pgtable-arm-v7s.c | 65 +- + drivers/iommu/io-pgtable.c | 3 + + drivers/iommu/iommu.c | 54 +- + drivers/iommu/iova.c | 35 +- + drivers/iommu/ipmmu-vmsa.c | 53 +- + drivers/iommu/msm_iommu.c | 10 +- + drivers/iommu/mtk_iommu.c | 410 +- + drivers/iommu/mtk_iommu.h | 12 +- + drivers/iommu/tegra-gart.c | 7 +- + drivers/irqchip/Kconfig | 10 +- + drivers/irqchip/Makefile | 4 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-ls-extirq.c | 2 +- + drivers/irqchip/irq-realtek-rtl.c | 180 + + drivers/irqchip/irq-sirfsoc.c | 134 - + drivers/irqchip/irq-sun6i-r.c | 379 + + drivers/irqchip/irq-sunxi-nmi.c | 26 +- + drivers/irqchip/irq-tango.c | 227 - + drivers/macintosh/adb-iop.c | 6 +- + drivers/md/Kconfig | 1 + + drivers/md/dm-core.h | 9 + + drivers/md/dm-crypt.c | 39 +- + drivers/md/dm-dust.c | 2 +- + drivers/md/dm-era-target.c | 93 +- + drivers/md/dm-flakey.c | 6 +- + drivers/md/dm-integrity.c | 140 +- + drivers/md/dm-linear.c | 8 +- + drivers/md/dm-table.c | 399 +- + drivers/md/dm-writecache.c | 80 +- + drivers/md/dm.c | 96 +- + drivers/md/dm.h | 2 +- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 2 +- + drivers/media/cec/core/cec-adap.c | 4 +- + drivers/media/cec/core/cec-api.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 11 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 5 - + drivers/media/dvb-core/dvb_frontend.c | 1 + + drivers/media/dvb-frontends/Kconfig | 11 +- + drivers/media/dvb-frontends/Makefile | 1 + + drivers/media/dvb-frontends/af9033.c | 2 + + drivers/media/dvb-frontends/cx24120.c | 1 + + drivers/media/dvb-frontends/cxd2841er.c | 2 +- + drivers/media/dvb-frontends/dib0090.c | 2 + + drivers/media/dvb-frontends/drxk_hard.c | 1 + + drivers/media/dvb-frontends/m88rs2000.c | 1 + + drivers/media/dvb-frontends/mxl692.c | 1378 ++++ + drivers/media/dvb-frontends/mxl692.h | 38 + + drivers/media/dvb-frontends/mxl692_defs.h | 548 ++ + drivers/media/dvb-frontends/rtl2832.c | 1 + + drivers/media/i2c/Kconfig | 59 + + drivers/media/i2c/Makefile | 8 +- + drivers/media/i2c/ccs-pll.c | 116 +- + drivers/media/i2c/ccs-pll.h | 86 +- + drivers/media/i2c/ccs/ccs-core.c | 318 +- + drivers/media/i2c/ccs/ccs-data.c | 25 +- + drivers/media/i2c/ccs/ccs-data.h | 2 + + drivers/media/i2c/ccs/ccs-reg-access.c | 29 +- + drivers/media/i2c/ccs/ccs.h | 8 +- + drivers/media/i2c/ccs/smiapp-reg-defs.h | 2 + + drivers/media/i2c/imx219.c | 23 +- + drivers/media/i2c/imx258.c | 82 +- + drivers/media/i2c/imx334.c | 1132 +++ + drivers/media/i2c/max9271.c | 5 + + drivers/media/i2c/max9286.c | 74 +- + drivers/media/i2c/mt9m111.c | 17 +- + drivers/media/i2c/mt9v111.c | 6 - + drivers/media/i2c/ov02a10.c | 2 +- + drivers/media/i2c/ov5647.c | 1259 +++- + drivers/media/i2c/ov5648.c | 2624 +++++++ + drivers/media/i2c/ov5670.c | 3 +- + drivers/media/i2c/ov5675.c | 6 +- + drivers/media/i2c/ov6650.c | 28 +- + drivers/media/i2c/ov8856.c | 4 +- + drivers/media/i2c/ov8865.c | 2972 ++++++++ + drivers/media/i2c/ov9640.c | 15 +- + drivers/media/i2c/ov9640.h | 2 +- + drivers/media/i2c/rdacm20.c | 4 +- + drivers/media/i2c/rdacm21.c | 623 ++ + drivers/media/i2c/st-mipid02.c | 21 +- + drivers/media/pci/cx25821/cx25821-core.c | 4 +- + drivers/media/pci/intel/ipu3/Kconfig | 21 +- + drivers/media/pci/intel/ipu3/Makefile | 3 + + drivers/media/pci/intel/ipu3/cio2-bridge.c | 314 + + drivers/media/pci/intel/ipu3/cio2-bridge.h | 125 + + .../intel/ipu3/{ipu3-cio2.c => ipu3-cio2-main.c} | 54 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 24 + + drivers/media/pci/ivtv/ivtv-driver.c | 5 + + drivers/media/pci/saa7134/saa7134-empress.c | 5 +- + drivers/media/pci/saa7134/saa7134-tvaudio.c | 25 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 16 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/saa7164/saa7164.h | 2 +- + drivers/media/pci/smipcie/smipcie-ir.c | 46 +- + drivers/media/pci/smipcie/smipcie-main.c | 26 +- + drivers/media/platform/Kconfig | 18 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/Makefile | 6 + + .../platform}/allegro-dvt/allegro-core.c | 974 ++- + .../platform}/allegro-dvt/allegro-mail.c | 21 +- + .../platform}/allegro-dvt/allegro-mail.h | 5 +- + .../platform}/allegro-dvt/nal-h264.c | 336 +- + .../platform}/allegro-dvt/nal-h264.h | 0 + drivers/media/platform/allegro-dvt/nal-hevc.c | 824 +++ + drivers/media/platform/allegro-dvt/nal-hevc.h | 350 + + drivers/media/platform/allegro-dvt/nal-rbsp.c | 310 + + drivers/media/platform/allegro-dvt/nal-rbsp.h | 61 + + drivers/media/platform/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/aspeed-video.c | 6 +- + drivers/media/platform/atmel/atmel-isc.h | 1 + + drivers/media/platform/atmel/atmel-isi.c | 46 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 44 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 17 +- + drivers/media/platform/davinci/vpbe.c | 2 +- + drivers/media/platform/davinci/vpif.c | 3 +- + drivers/media/platform/davinci/vpif_capture.c | 2 +- + drivers/media/platform/davinci/vpif_display.c | 86 +- + drivers/media/platform/davinci/vpif_display.h | 1 - + drivers/media/platform/exynos4-is/media-dev.c | 25 +- + drivers/media/platform/exynos4-is/media-dev.h | 2 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 14 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 12 +- + drivers/media/platform/marvell-ccic/mcam-core.h | 1 - + drivers/media/platform/marvell-ccic/mmp-driver.c | 11 +- + drivers/media/platform/meson/ge2d/ge2d.c | 1 + + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 3 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 6 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 - + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 4 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 12 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 3 +- + drivers/media/platform/omap3isp/isp.c | 74 +- + drivers/media/platform/pxa_camera.c | 86 +- + drivers/media/platform/qcom/camss/camss-video.c | 3 +- + drivers/media/platform/qcom/camss/camss.c | 11 +- + drivers/media/platform/qcom/venus/Makefile | 4 +- + drivers/media/platform/qcom/venus/core.c | 47 +- + drivers/media/platform/qcom/venus/core.h | 78 +- + drivers/media/platform/qcom/venus/firmware.c | 3 + + drivers/media/platform/qcom/venus/helpers.c | 154 +- + drivers/media/platform/qcom/venus/helpers.h | 4 +- + drivers/media/platform/qcom/venus/hfi.c | 18 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 12 + + drivers/media/platform/qcom/venus/hfi_helper.h | 22 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 59 +- + drivers/media/platform/qcom/venus/hfi_parser.h | 7 +- + drivers/media/platform/qcom/venus/hfi_plat_bufs.h | 38 + + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 1317 ++++ + drivers/media/platform/qcom/venus/hfi_platform.c | 65 + + drivers/media/platform/qcom/venus/hfi_platform.h | 67 + + .../media/platform/qcom/venus/hfi_platform_v4.c | 319 + + .../media/platform/qcom/venus/hfi_platform_v6.c | 326 + + drivers/media/platform/qcom/venus/hfi_venus.c | 80 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 48 +- + drivers/media/platform/qcom/venus/vdec.c | 129 +- + drivers/media/platform/qcom/venus/venc.c | 202 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 138 +- + drivers/media/platform/rcar-vin/rcar-core.c | 5 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 2 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 5 + + drivers/media/platform/rcar-vin/rcar-v4l2.c | 42 +- + drivers/media/platform/rcar_drif.c | 2 +- + drivers/media/platform/rcar_fdp1.c | 4 - + drivers/media/platform/rcar_jpu.c | 6 +- + drivers/media/platform/renesas-ceu.c | 58 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 15 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 34 + + drivers/media/platform/sh_vou.c | 2 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 + + drivers/media/platform/sti/hva/hva-hw.c | 1 + + drivers/media/platform/stm32/stm32-dcmi.c | 87 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 9 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 1 - + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 4 - + drivers/media/platform/ti-vpe/cal-camerarx.c | 373 +- + drivers/media/platform/ti-vpe/cal-video.c | 394 +- + drivers/media/platform/ti-vpe/cal.c | 399 +- + drivers/media/platform/ti-vpe/cal.h | 105 +- + drivers/media/platform/ti-vpe/vpe.c | 2 - + drivers/media/platform/video-mux.c | 14 +- + drivers/media/platform/vsp1/vsp1.h | 20 +- + drivers/media/platform/vsp1/vsp1_drv.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 10 +- + drivers/media/radio/radio-isa.c | 9 +- + drivers/media/radio/radio-isa.h | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 4 +- + drivers/media/rc/Kconfig | 2 + + drivers/media/rc/img-ir/Kconfig | 1 + + drivers/media/rc/ir_toy.c | 1 + + drivers/media/rc/mceusb.c | 11 +- + drivers/media/rc/sunxi-cir.c | 169 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 5 - + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 36 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.h | 7 + + drivers/media/test-drivers/vidtv/vidtv_psi.c | 8 +- + drivers/media/test-drivers/vidtv/vidtv_ts.h | 1 - + drivers/media/test-drivers/vivid/vivid-ctrls.c | 38 +- + drivers/media/tuners/it913x.c | 1 + + drivers/media/tuners/qm1d1c0042.c | 4 +- + drivers/media/usb/cx231xx/Kconfig | 1 + + drivers/media/usb/dvb-usb-v2/af9015.c | 1 + + drivers/media/usb/dvb-usb-v2/lmedm04.c | 26 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 35 +- + drivers/media/usb/em28xx/Kconfig | 2 + + drivers/media/usb/em28xx/em28xx-cards.c | 46 + + drivers/media/usb/em28xx/em28xx-core.c | 10 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 26 + + drivers/media/usb/em28xx/em28xx-i2c.c | 6 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/pwc/pwc-if.c | 22 +- + drivers/media/usb/tm6000/tm6000-dvb.c | 4 + + drivers/media/usb/uvc/uvc_ctrl.c | 179 +- + drivers/media/usb/uvc/uvc_driver.c | 552 +- + drivers/media/usb/uvc/uvc_entity.c | 11 +- + drivers/media/usb/uvc/uvc_isight.c | 17 +- + drivers/media/usb/uvc/uvc_queue.c | 9 +- + drivers/media/usb/uvc/uvc_status.c | 44 +- + drivers/media/usb/uvc/uvc_v4l2.c | 62 +- + drivers/media/usb/uvc/uvc_video.c | 162 +- + drivers/media/usb/uvc/uvcvideo.h | 99 +- + drivers/media/usb/zr364xx/zr364xx.c | 49 +- + drivers/media/v4l2-core/Makefile | 2 +- + drivers/media/v4l2-core/v4l2-async.c | 180 +- + drivers/media/v4l2-core/v4l2-clk.c | 321 - + drivers/media/v4l2-core/v4l2-ctrls.c | 19 +- + drivers/media/v4l2-core/v4l2-dev.c | 20 +- + drivers/media/v4l2-core/v4l2-event.c | 17 + + drivers/media/v4l2-core/v4l2-fwnode.c | 17 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 42 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 +- + drivers/memory/mtk-smi.c | 8 + + drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- + drivers/message/fusion/lsi/mpi_history.txt | 2 +- + drivers/mfd/Kconfig | 13 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-core.c | 43 +- + drivers/mfd/acer-ec-a500.c | 202 + + drivers/mfd/altera-sysmgr.c | 3 +- + drivers/mfd/arizona-core.c | 11 - + drivers/mfd/arizona-i2c.c | 11 +- + drivers/mfd/arizona-spi.c | 138 +- + drivers/mfd/arizona.h | 9 - + drivers/mfd/bd9571mwv.c | 178 +- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 28 + + drivers/mfd/intel-m10-bmc.c | 43 + + drivers/mfd/iqs62x.c | 144 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/mcp-sa11x0.c | 3 +- + drivers/mfd/mt6360-core.c | 12 +- + drivers/mfd/wm831x-auxadc.c | 3 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 3 +- + drivers/mmc/core/Kconfig | 8 + + drivers/mmc/core/Makefile | 1 + + drivers/mmc/core/block.c | 3 + + drivers/mmc/core/core.c | 11 +- + drivers/mmc/core/crypto.c | 48 + + drivers/mmc/core/crypto.h | 40 + + drivers/mmc/core/host.c | 45 + + drivers/mmc/core/mmc.c | 6 +- + drivers/mmc/core/mmc_ops.c | 6 +- + drivers/mmc/core/mmc_test.c | 31 +- + drivers/mmc/core/queue.c | 6 +- + drivers/mmc/core/queue.h | 1 - + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sd.h | 2 +- + drivers/mmc/core/sdio.c | 2 +- + drivers/mmc/host/Kconfig | 43 +- + drivers/mmc/host/Makefile | 5 +- + drivers/mmc/host/android-goldfish.c | 545 -- + drivers/mmc/host/atmel-mci.c | 52 +- + drivers/mmc/host/au1xmmc.c | 14 +- + drivers/mmc/host/cavium.c | 5 +- + drivers/mmc/host/cb710-mmc.c | 12 +- + drivers/mmc/host/{cqhci.c => cqhci-core.c} | 69 +- + drivers/mmc/host/cqhci-crypto.c | 242 + + drivers/mmc/host/cqhci-crypto.h | 47 + + drivers/mmc/host/cqhci.h | 84 +- + drivers/mmc/host/dw_mmc-zx.c | 234 - + drivers/mmc/host/dw_mmc-zx.h | 32 - + drivers/mmc/host/dw_mmc.c | 6 +- + drivers/mmc/host/jz4740_mmc.c | 1 - + drivers/mmc/host/meson-gx-mmc.c | 37 +- + drivers/mmc/host/mmci.c | 70 +- + drivers/mmc/host/mtk-sd.c | 18 +- + drivers/mmc/host/mxs-mmc.c | 2 +- + drivers/mmc/host/omap.c | 7 +- + drivers/mmc/host/omap_hsmmc.c | 18 +- + drivers/mmc/host/owl-mmc.c | 9 +- + drivers/mmc/host/renesas_sdhi_core.c | 16 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 91 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 5 +- + drivers/mmc/host/s3cmci.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 3 +- + drivers/mmc/host/sdhci-iproc.c | 18 + + drivers/mmc/host/sdhci-msm.c | 322 +- + drivers/mmc/host/sdhci-of-arasan.c | 65 +- + drivers/mmc/host/sdhci-of-aspeed-test.c | 105 + + drivers/mmc/host/sdhci-of-aspeed.c | 289 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + drivers/mmc/host/sdhci-pci-gli.c | 23 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 20 + + drivers/mmc/host/sdhci-sirf.c | 235 - + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci-xenon.c | 1 + + drivers/mmc/host/sdhci_am654.c | 28 + + drivers/mmc/host/sunxi-mmc.c | 30 +- + drivers/mmc/host/tifm_sd.c | 7 +- + drivers/mmc/host/tmio_mmc.h | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 8 +- + drivers/mmc/host/uniphier-sd.c | 14 +- + drivers/mmc/host/usdhi6rol0.c | 4 +- + drivers/mmc/host/via-sdmmc.c | 9 +- + drivers/mmc/host/wbsd.c | 35 +- + drivers/mtd/devices/phram.c | 6 +- + drivers/mtd/devices/st_spi_fsm.c | 2 +- + drivers/mtd/maps/pci.c | 8 +- + drivers/mtd/mtdswap.c | 1 - + drivers/mtd/nand/raw/Kconfig | 7 - + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/intel-nand-controller.c | 6 +- + drivers/mtd/nand/raw/marvell_nand.c | 2 +- + drivers/mtd/nand/raw/mxc_nand.c | 2 +- + drivers/mtd/nand/raw/qcom_nandc.c | 4 +- + drivers/mtd/nand/raw/tango_nand.c | 727 -- + drivers/mtd/parsers/Kconfig | 8 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/afs.c | 4 +- + drivers/mtd/parsers/parser_imagetag.c | 4 + + drivers/mtd/parsers/qcomsmempart.c | 170 + + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 4 +- + drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/core.c | 49 +- + drivers/mtd/spi-nor/core.h | 2 + + drivers/mtd/spi-nor/sfdp.c | 5 +- + drivers/mtd/spi-nor/sst.c | 52 +- + drivers/mtd/ubi/eba.c | 1 - + drivers/mtd/ubi/io.c | 7 +- + drivers/net/Kconfig | 1 + + drivers/net/can/sja1000/tscan1.c | 4 +- + drivers/net/ethernet/3com/3c509.c | 3 +- + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 1 + + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 19 +- + drivers/net/ethernet/ibm/emac/core.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 1 + + drivers/net/ethernet/ti/davinci_mdio.c | 12 +- + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/of/base.c | 4 +- + drivers/of/device.c | 21 - + drivers/of/fdt.c | 12 +- + drivers/of/platform.c | 4 +- + drivers/of/unittest.c | 2 +- + drivers/parport/share.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/pci/pci.c | 12 +- + drivers/pci/pci.h | 1 - + drivers/perf/Kconfig | 2 +- + drivers/perf/arm-cci.c | 7 +- + drivers/perf/arm-cmn.c | 19 +- + drivers/perf/arm_dmc620_pmu.c | 5 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_smmuv3_pmu.c | 8 +- + drivers/perf/arm_spe_pmu.c | 23 +- + drivers/perf/fsl_imx8_ddr_perf.c | 10 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- + drivers/perf/qcom_l2_pmu.c | 6 +- + drivers/perf/qcom_l3_pmu.c | 6 +- + drivers/perf/xgene_pmu.c | 5 +- + drivers/pinctrl/visconti/pinctrl-common.c | 23 + + drivers/platform/chrome/cros_ec.c | 33 +- + drivers/platform/chrome/cros_ec.h | 4 +- + drivers/platform/chrome/cros_ec_ishtp.c | 6 +- + drivers/platform/chrome/cros_ec_lightbar.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 12 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 6 +- + drivers/platform/chrome/cros_ec_sysfs.c | 5 +- + drivers/platform/chrome/cros_ec_typec.c | 33 +- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + drivers/platform/olpc/olpc-ec.c | 37 +- + drivers/platform/surface/Kconfig | 57 + + drivers/platform/surface/Makefile | 4 + + drivers/platform/surface/aggregator/Kconfig | 68 + + drivers/platform/surface/aggregator/Makefile | 17 + + drivers/platform/surface/aggregator/bus.c | 415 ++ + drivers/platform/surface/aggregator/bus.h | 27 + + drivers/platform/surface/aggregator/controller.c | 2579 +++++++ + drivers/platform/surface/aggregator/controller.h | 285 + + drivers/platform/surface/aggregator/core.c | 839 +++ + drivers/platform/surface/aggregator/ssh_msgb.h | 205 + + .../platform/surface/aggregator/ssh_packet_layer.c | 2074 ++++++ + .../platform/surface/aggregator/ssh_packet_layer.h | 190 + + drivers/platform/surface/aggregator/ssh_parser.c | 228 + + drivers/platform/surface/aggregator/ssh_parser.h | 154 + + .../surface/aggregator/ssh_request_layer.c | 1263 ++++ + .../surface/aggregator/ssh_request_layer.h | 143 + + drivers/platform/surface/aggregator/trace.h | 632 ++ + drivers/platform/surface/surface3-wmi.c | 6 +- + drivers/platform/surface/surface_acpi_notify.c | 886 +++ + drivers/platform/surface/surface_aggregator_cdev.c | 322 + + drivers/platform/surface/surface_hotplug.c | 282 + + drivers/platform/x86/Kconfig | 207 +- + drivers/platform/x86/Makefile | 19 +- + drivers/platform/x86/acer-wmi.c | 4 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/platform/x86/amd-pmc.c | 14 +- + drivers/platform/x86/dell/Kconfig | 207 + + drivers/platform/x86/dell/Makefile | 21 + + drivers/platform/x86/{ => dell}/alienware-wmi.c | 0 + drivers/platform/x86/{ => dell}/dcdbas.c | 0 + drivers/platform/x86/{ => dell}/dcdbas.h | 0 + drivers/platform/x86/{ => dell}/dell-laptop.c | 0 + drivers/platform/x86/{ => dell}/dell-rbtn.c | 0 + drivers/platform/x86/{ => dell}/dell-rbtn.h | 0 + drivers/platform/x86/{ => dell}/dell-smbios-base.c | 0 + drivers/platform/x86/{ => dell}/dell-smbios-smm.c | 0 + drivers/platform/x86/{ => dell}/dell-smbios-wmi.c | 0 + drivers/platform/x86/{ => dell}/dell-smbios.h | 0 + drivers/platform/x86/{ => dell}/dell-smo8800.c | 0 + drivers/platform/x86/{ => dell}/dell-wmi-aio.c | 0 + .../platform/x86/{ => dell}/dell-wmi-descriptor.c | 0 + .../platform/x86/{ => dell}/dell-wmi-descriptor.h | 0 + drivers/platform/x86/{ => dell}/dell-wmi-led.c | 0 + .../x86/{ => dell}/dell-wmi-sysman/Makefile | 0 + .../dell-wmi-sysman/biosattr-interface.c | 0 + .../{ => dell}/dell-wmi-sysman/dell-wmi-sysman.h | 0 + .../{ => dell}/dell-wmi-sysman/enum-attributes.c | 0 + .../{ => dell}/dell-wmi-sysman/int-attributes.c | 0 + .../dell-wmi-sysman/passobj-attributes.c | 0 + .../dell-wmi-sysman/passwordattr-interface.c | 0 + .../{ => dell}/dell-wmi-sysman/string-attributes.c | 0 + .../x86/{ => dell}/dell-wmi-sysman/sysman.c | 0 + drivers/platform/x86/{ => dell}/dell-wmi.c | 0 + drivers/platform/x86/{ => dell}/dell_rbu.c | 0 + drivers/platform/x86/ideapad-laptop.c | 1456 ++-- + drivers/platform/x86/intel-uncore-frequency.c | 1 + + drivers/platform/x86/intel-vbtn.c | 138 +- + drivers/platform/x86/intel_mid_powerbtn.c | 233 - + drivers/platform/x86/intel_mid_thermal.c | 560 -- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + .../platform/x86/intel_scu_wdt.c | 41 +- + drivers/platform/x86/msi-wmi.c | 2 + + drivers/platform/x86/thinkpad_acpi.c | 464 +- + drivers/platform/x86/touchscreen_dmi.c | 27 + + drivers/power/reset/Kconfig | 15 +- + drivers/power/reset/Makefile | 2 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 74 +- + drivers/power/reset/atc260x-poweroff.c | 262 + + drivers/power/reset/linkstation-poweroff.c | 1 + + drivers/power/reset/zx-reboot.c | 86 - + drivers/power/supply/Kconfig | 27 + + drivers/power/supply/Makefile | 3 + + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/acer_a500_battery.c | 297 + + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/axp288_fuel_gauge.c | 6 + + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 1749 +++++ + drivers/power/supply/bq25980_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery.c | 39 +- + drivers/power/supply/charger-manager.c | 8 +- + drivers/power/supply/cpcap-battery.c | 217 +- + drivers/power/supply/cpcap-charger.c | 262 +- + drivers/power/supply/ds2760_battery.c | 2 +- + drivers/power/supply/ds2780_battery.c | 8 +- + drivers/power/supply/ingenic-battery.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 931 +++ + drivers/power/supply/max14656_charger_detector.c | 2 - + drivers/power/supply/max8903_charger.c | 360 +- + drivers/power/supply/max8997_charger.c | 96 + + drivers/power/supply/power_supply_hwmon.c | 2 - + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/smb347-charger.c | 12 +- + drivers/power/supply/wm97xx_battery.c | 45 +- + drivers/power/supply/z2_battery.c | 46 +- + drivers/rapidio/rio.c | 2 +- + drivers/regulator/Kconfig | 51 +- + drivers/regulator/Makefile | 5 +- + drivers/regulator/ab3100.c | 724 -- + drivers/regulator/ab8500-ext.c | 422 +- + drivers/regulator/ab8500.c | 116 +- + drivers/regulator/atc260x-regulator.c | 539 ++ + drivers/regulator/axp20x-regulator.c | 7 +- + drivers/regulator/bd70528-regulator.c | 11 +- + drivers/regulator/bd71828-regulator.c | 13 +- + drivers/regulator/bd718x7-regulator.c | 20 +- + drivers/regulator/bd9571mwv-regulator.c | 59 +- + drivers/regulator/core.c | 18 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mt6315-regulator.c | 299 + + drivers/regulator/mtk-dvfsrc-regulator.c | 215 + + drivers/regulator/pca9450-regulator.c | 22 + + drivers/regulator/pf8x00-regulator.c | 278 +- + drivers/regulator/qcom-labibb-regulator.c | 728 +- + drivers/regulator/qcom-rpmh-regulator.c | 34 + + drivers/regulator/rohm-regulator.c | 9 +- + drivers/regulator/rt4831-regulator.c | 198 + + drivers/regulator/s5m8767.c | 15 +- + drivers/rtc/Kconfig | 50 +- + drivers/rtc/Makefile | 5 - + drivers/rtc/class.c | 10 +- + drivers/rtc/interface.c | 12 +- + drivers/rtc/rtc-ab3100.c | 254 - + drivers/rtc/rtc-abx80x.c | 39 +- + drivers/rtc/rtc-ac100.c | 4 +- + drivers/rtc/rtc-armada38x.c | 21 +- + drivers/rtc/rtc-asm9260.c | 6 +- + drivers/rtc/rtc-bq32k.c | 2 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 2 +- + drivers/rtc/rtc-cmos.c | 17 +- + drivers/rtc/rtc-coh901331.c | 290 - + drivers/rtc/rtc-digicolor.c | 2 +- + drivers/rtc/rtc-ds1305.c | 5 +- + drivers/rtc/rtc-ds1307.c | 5 +- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-ds1685.c | 6 +- + drivers/rtc/rtc-ds3232.c | 7 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-isl1208.c | 2 +- + drivers/rtc/rtc-m41t80.c | 25 +- + drivers/rtc/rtc-m48t59.c | 22 +- + drivers/rtc/rtc-mcp795.c | 5 +- + drivers/rtc/rtc-meson.c | 2 +- + drivers/rtc/rtc-mrst.c | 521 -- + drivers/rtc/rtc-mv.c | 14 +- + drivers/rtc/rtc-mxc.c | 5 +- + drivers/rtc/rtc-mxc_v2.c | 7 +- + drivers/rtc/rtc-opal.c | 27 +- + drivers/rtc/rtc-pcf2123.c | 5 +- + drivers/rtc/rtc-pcf2127.c | 46 +- + drivers/rtc/rtc-pcf85063.c | 49 +- + drivers/rtc/rtc-pcf85363.c | 10 +- + drivers/rtc/rtc-pcf8563.c | 2 + + drivers/rtc/rtc-pl031.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 18 +- + drivers/rtc/rtc-r7301.c | 5 +- + drivers/rtc/rtc-rs5c372.c | 2 +- + drivers/rtc/rtc-rv3028.c | 23 +- + drivers/rtc/rtc-rv3029c2.c | 22 +- + drivers/rtc/rtc-rv3032.c | 13 +- + drivers/rtc/rtc-rv8803.c | 13 +- + drivers/rtc/rtc-rx6110.c | 4 +- + drivers/rtc/rtc-rx8010.c | 21 +- + drivers/rtc/rtc-rx8025.c | 5 +- + drivers/rtc/rtc-rx8581.c | 2 +- + drivers/rtc/rtc-s35390a.c | 2 +- + drivers/rtc/rtc-s3c.c | 17 +- + drivers/rtc/rtc-s5m.c | 33 +- + drivers/rtc/rtc-sd3078.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 446 -- + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-tegra.c | 6 +- + drivers/rtc/rtc-tps65910.c | 19 +- + drivers/rtc/rtc-tx4939.c | 303 - + drivers/s390/char/sclp_early_core.c | 4 +- + drivers/s390/char/tape_3590.c | 4 +- + drivers/s390/cio/css.c | 20 +- + drivers/s390/cio/device.c | 39 +- + drivers/s390/cio/qdio.h | 25 +- + drivers/s390/cio/qdio_debug.c | 9 +- + drivers/s390/cio/qdio_main.c | 209 +- + drivers/s390/cio/qdio_setup.c | 19 +- + drivers/s390/cio/qdio_thinint.c | 70 +- + drivers/s390/crypto/zcrypt_api.c | 14 + + drivers/s390/crypto/zcrypt_ccamisc.c | 15 +- + drivers/s390/net/qeth_core_main.c | 7 +- + drivers/s390/scsi/zfcp_fc.h | 1 - + drivers/scsi/3w-9xxx.c | 56 +- + drivers/scsi/3w-9xxx.h | 156 +- + drivers/scsi/3w-sas.c | 52 +- + drivers/scsi/3w-sas.h | 118 +- + drivers/scsi/3w-xxxx.c | 251 +- + drivers/scsi/3w-xxxx.h | 199 +- + drivers/scsi/Kconfig | 16 +- + drivers/scsi/Makefile | 2 - + drivers/scsi/aacraid/aachba.c | 173 +- + drivers/scsi/advansys.c | 87 +- + drivers/scsi/aha1542.c | 136 +- + drivers/scsi/aha1542.h | 33 +- + drivers/scsi/aic7xxx/aic79xx.h | 36 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 257 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 20 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 37 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 6 +- + drivers/scsi/aic7xxx/aic79xx_proc.c | 13 +- + drivers/scsi/aic7xxx/aic7xxx_93cx6.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 263 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 88 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 39 +- + drivers/scsi/aic7xxx/aic7xxx_proc.c | 15 +- + drivers/scsi/aic7xxx/aiclib.h | 15 - + drivers/scsi/aic7xxx/scsi_message.h | 41 - + drivers/scsi/aic94xx/aic94xx_scb.c | 24 +- + drivers/scsi/arm/acornscsi.c | 14 +- + drivers/scsi/atp870u.c | 451 +- + drivers/scsi/atp870u.h | 14 +- + drivers/scsi/bfa/bfa_fc.h | 15 - + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/dc395x.c | 28 +- + drivers/scsi/dc395x.h | 38 - + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/esp_scsi.c | 23 +- + drivers/scsi/fdomain_isa.c | 3 +- + drivers/scsi/g_NCR5380.c | 5 +- + drivers/scsi/gdth.c | 4322 ----------- + drivers/scsi/gdth.h | 981 --- + drivers/scsi/gdth_ioctl.h | 251 - + drivers/scsi/gdth_proc.c | 586 -- + drivers/scsi/gdth_proc.h | 18 - + drivers/scsi/hisi_sas/Kconfig | 6 + + drivers/scsi/hisi_sas/hisi_sas.h | 18 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 48 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 19 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 264 +- + drivers/scsi/hpsa.c | 4 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 1270 +++- + drivers/scsi/ibmvscsi/ibmvfc.h | 91 +- + drivers/scsi/initio.c | 64 +- + drivers/scsi/initio.h | 25 - + drivers/scsi/ips.c | 9 +- + drivers/scsi/isci/port.c | 11 +- + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/libsas/sas_event.c | 27 +- + drivers/scsi/libsas/sas_init.c | 19 +- + drivers/scsi/libsas/sas_internal.h | 6 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 9 +- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 6 +- + drivers/scsi/lpfc/lpfc_disc.h | 15 +- + drivers/scsi/lpfc/lpfc_els.c | 49 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +- + drivers/scsi/lpfc/lpfc_init.c | 241 +- + drivers/scsi/lpfc/lpfc_mbox.c | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 21 +- + drivers/scsi/lpfc/lpfc_nvme.c | 45 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 33 +- + drivers/scsi/lpfc/lpfc_scsi.c | 59 +- + drivers/scsi/lpfc/lpfc_sli.c | 141 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/scsi/mac53c94.c | 1 - + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/mvsas/mv_sas.c | 25 +- + drivers/scsi/ncr53c8xx.c | 83 +- + drivers/scsi/ncr53c8xx.h | 16 - + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 12 +- + drivers/scsi/pcmcia/nsp_cs.h | 11 - + drivers/scsi/pm8001/pm8001_hwi.c | 69 +- + drivers/scsi/pm8001/pm8001_init.c | 20 +- + drivers/scsi/pm8001/pm8001_sas.c | 21 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 + + drivers/scsi/pm8001/pm80xx_hwi.c | 280 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 17 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla1280.c | 12 +- + drivers/scsi/qla2xxx/qla_attr.c | 9 + + drivers/scsi/qla2xxx/qla_bsg.c | 342 + + drivers/scsi/qla2xxx/qla_bsg.h | 5 + + drivers/scsi/qla2xxx/qla_dbg.c | 1 + + drivers/scsi/qla2xxx/qla_def.h | 83 + + drivers/scsi/qla2xxx/qla_dfs.c | 28 + + drivers/scsi/qla2xxx/qla_fw.h | 27 +- + drivers/scsi/qla2xxx/qla_gbl.h | 29 + + drivers/scsi/qla2xxx/qla_gs.c | 1 + + drivers/scsi/qla2xxx/qla_init.c | 245 +- + drivers/scsi/qla2xxx/qla_iocb.c | 8 + + drivers/scsi/qla2xxx/qla_isr.c | 87 +- + drivers/scsi/qla2xxx/qla_mbx.c | 18 +- + drivers/scsi/qla2xxx/qla_nvme.c | 93 +- + drivers/scsi/qla2xxx/qla_os.c | 27 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla4xxx/ql4_fw.h | 1 - + drivers/scsi/qla4xxx/ql4_isr.c | 2 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_error.c | 23 +- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_transport_fc.c | 118 +- + drivers/scsi/stex.c | 25 +- + drivers/scsi/storvsc_drv.c | 60 +- + drivers/scsi/ufs/Kconfig | 14 +- + drivers/scsi/ufs/Makefile | 13 +- + drivers/scsi/ufs/ufs-debugfs.c | 56 + + drivers/scsi/ufs/ufs-debugfs.h | 22 + + drivers/scsi/ufs/ufs-exynos.c | 9 +- + drivers/scsi/ufs/ufs-mediatek.c | 1 + + drivers/scsi/ufs/ufs-qcom.c | 18 +- + drivers/scsi/ufs/ufs-sysfs.c | 175 +- + drivers/scsi/ufs/ufs.h | 52 +- + drivers/scsi/ufs/ufshcd-crypto.c | 13 +- + drivers/scsi/ufs/ufshcd-crypto.h | 5 - + drivers/scsi/ufs/ufshcd.c | 569 +- + drivers/scsi/ufs/ufshcd.h | 41 +- + drivers/scsi/wd33c93.c | 6 +- + drivers/soc/mediatek/Makefile | 1 + + .../mtk_drm_ddp.c => soc/mediatek/mtk-mutex.c} | 328 +- + drivers/soc/xilinx/Kconfig | 17 - + drivers/soc/xilinx/Makefile | 1 - + drivers/soc/xilinx/xlnx_vcu.c | 628 -- + drivers/spi/Kconfig | 33 +- + drivers/spi/Makefile | 5 +- + drivers/spi/atmel-quadspi.c | 1 + + drivers/spi/spi-atmel.c | 2 +- + drivers/spi/spi-au1550.c | 53 +- + drivers/spi/spi-bcm-qspi.c | 2 +- + drivers/spi/spi-bcm2835.c | 8 +- + drivers/spi/spi-bcm2835aux.c | 2 +- + drivers/spi/spi-cadence-quadspi.c | 333 +- + drivers/spi/spi-clps711x.c | 2 +- + drivers/spi/spi-dw-bt1.c | 2 +- + drivers/spi/spi-efm32.c | 462 -- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 33 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-mem.c | 23 +- + drivers/spi/spi-mpc52xx.c | 4 +- + drivers/spi/spi-mt65xx.c | 72 +- + drivers/spi/spi-orion.c | 55 +- + drivers/spi/spi-pxa2xx-pci.c | 29 +- + drivers/spi/spi-pxa2xx.c | 4 + + drivers/spi/spi-qcom-qspi.c | 3 +- + drivers/spi/spi-realtek-rtl.c | 209 + + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi-rpc-if.c | 13 +- + drivers/spi/spi-sh-msiof.c | 14 +- + drivers/spi/spi-sirf.c | 1236 ---- + drivers/spi/spi-stm32.c | 150 +- + drivers/spi/spi-synquacer.c | 4 + + drivers/spi/spi-tegra210-quad.c | 1410 ++++ + drivers/spi/spi-txx9.c | 477 -- + drivers/spi/spi.c | 59 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/allegro-dvt/Kconfig | 16 - + drivers/staging/media/allegro-dvt/Makefile | 5 - + drivers/staging/media/allegro-dvt/TODO | 4 - + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 24 +- + .../staging/media/atomisp/pci/ia_css_firmware.h | 1 + + .../media/atomisp/pci/runtime/isys/src/rx.c | 1 + + drivers/staging/media/atomisp/pci/sh_css_params.c | 6 +- + drivers/staging/media/hantro/hantro_v4l2.c | 2 +- + drivers/staging/media/imx/Kconfig | 9 +- + drivers/staging/media/imx/Makefile | 2 +- + drivers/staging/media/imx/imx-media-capture.c | 10 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 4 - + drivers/staging/media/imx/imx-media-csi.c | 14 +- + drivers/staging/media/imx/imx-media-dev.c | 7 +- + drivers/staging/media/imx/imx-media-of.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 127 +- + drivers/staging/media/imx/imx7-media-csi.c | 43 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 15 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 3 - + drivers/staging/media/omap4iss/iss.c | 1 - + drivers/staging/media/omap4iss/iss_video.h | 1 - + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 49 - + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 - + drivers/staging/media/tegra-video/csi.c | 35 +- + drivers/staging/media/tegra-video/csi.h | 14 +- + drivers/staging/media/tegra-video/tegra210.c | 340 +- + drivers/staging/media/tegra-video/vi.c | 348 +- + drivers/staging/media/tegra-video/vi.h | 23 +- + drivers/staging/media/tegra-video/video.c | 18 + + drivers/staging/media/zoran/zoran_driver.c | 2 +- + drivers/target/iscsi/iscsi_target.c | 20 +- + drivers/target/iscsi/iscsi_target.h | 2 +- + drivers/target/iscsi/iscsi_target_erl0.c | 2 +- + drivers/target/iscsi/iscsi_target_util.c | 11 +- + drivers/target/iscsi/iscsi_target_util.h | 2 +- + drivers/target/target_core_alua.c | 2 - + drivers/target/target_core_file.c | 2 +- + drivers/target/target_core_transport.c | 65 +- + drivers/thermal/Kconfig | 17 - + drivers/thermal/Makefile | 2 - + drivers/thermal/cpufreq_cooling.c | 71 +- + drivers/thermal/da9062-thermal.c | 4 +- + drivers/thermal/gov_power_allocator.c | 37 +- + drivers/thermal/gov_step_wise.c | 14 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 6 + + drivers/thermal/intel/intel_pch_thermal.c | 6 + + drivers/thermal/khadas_mcu_fan.c | 1 - + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 1 + + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 623 ++ + drivers/thermal/tango_thermal.c | 126 - + drivers/thermal/thermal_core.c | 72 +- + drivers/thermal/thermal_core.h | 7 +- + drivers/thermal/thermal_helpers.c | 7 + + drivers/thermal/thermal_sysfs.c | 85 +- + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 7 +- + drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h | 4 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 54 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 2 + + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 +- + drivers/thermal/zx2967_thermal.c | 256 - + drivers/tty/serial/stm32-usart.c | 71 +- + drivers/tty/serial/stm32-usart.h | 2 +- + drivers/usb/dwc3/dwc3-st.c | 2 +- + drivers/usb/misc/usb251xb.c | 12 +- + drivers/video/backlight/ktd253-backlight.c | 12 +- + drivers/video/backlight/lms283gf05.c | 43 +- + drivers/video/backlight/qcom-wled.c | 2 +- + drivers/video/backlight/sky81452-backlight.c | 2 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/amifb.c | 4 +- + drivers/video/fbdev/aty/atyfb_base.c | 11 +- + drivers/video/fbdev/aty/mach64_ct.c | 15 +- + drivers/video/fbdev/aty/radeon_monitor.c | 4 +- + drivers/video/fbdev/bw2.c | 2 +- + drivers/video/fbdev/cg3.c | 2 +- + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/cirrusfb.c | 20 +- + drivers/video/fbdev/controlfb.c | 4 +- + drivers/video/fbdev/core/fb_notify.c | 7 + + drivers/video/fbdev/core/fbcon.c | 25 +- + drivers/video/fbdev/core/fbmon.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 4 +- + drivers/video/fbdev/efifb.c | 3 +- + drivers/video/fbdev/ffb.c | 2 +- + drivers/video/fbdev/gbefb.c | 4 +- + drivers/video/fbdev/goldfishfb.c | 2 + + drivers/video/fbdev/hgafb.c | 10 +- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/leo.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 2 +- + drivers/video/fbdev/mx3fb.c | 13 +- + drivers/video/fbdev/neofb.c | 4 - + drivers/video/fbdev/nvidia/nv_setup.c | 7 +- + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 1 + + .../omapfb/displays/panel-lgphilips-lb035q02.c | 6 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 18 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 +- + drivers/video/fbdev/p9100.c | 2 +- + drivers/video/fbdev/pm2fb.c | 8 +- + drivers/video/fbdev/riva/fbdev.c | 9 +- + drivers/video/fbdev/riva/riva_hw.c | 28 +- + drivers/video/fbdev/s1d13xxxfb.c | 3 +- + drivers/video/fbdev/s3c-fb.c | 11 +- + drivers/video/fbdev/sis/init.c | 33 +- + drivers/video/fbdev/sis/oem310.h | 2 + + drivers/video/fbdev/sis/sis.h | 1 - + drivers/video/fbdev/sis/sis_main.c | 9 +- + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/tcx.c | 2 +- + drivers/video/fbdev/tdfxfb.c | 4 +- + drivers/video/fbdev/tgafb.c | 7 +- + drivers/video/fbdev/udlfb.c | 1 + + drivers/video/fbdev/uvesafb.c | 6 +- + drivers/video/fbdev/via/lcd.c | 4 +- + drivers/video/fbdev/wmt_ge_rops.c | 1 + + drivers/video/fbdev/xilinxfb.c | 2 +- + drivers/video/of_display_timing.c | 1 + + drivers/video/of_videomode.c | 6 +- + drivers/watchdog/Kconfig | 74 +- + drivers/watchdog/Makefile | 7 +- + drivers/watchdog/atlas7_wdt.c | 221 - + drivers/watchdog/coh901327_wdt.c | 408 -- + drivers/watchdog/hpwdt.c | 6 +- + drivers/watchdog/intel-mid_wdt.c | 8 +- + drivers/watchdog/intel_scu_watchdog.c | 533 -- + drivers/watchdog/intel_scu_watchdog.h | 50 - + drivers/watchdog/it8712f_wdt.c | 1 - + drivers/watchdog/keembay_wdt.c | 286 + + drivers/watchdog/mei_wdt.c | 1 + + drivers/watchdog/mtk_wdt.c | 23 +- + drivers/watchdog/pcwd.c | 7 +- + drivers/watchdog/qcom-wdt.c | 13 +- + drivers/watchdog/renesas_wdt.c | 33 +- + drivers/watchdog/sirfsoc_wdt.c | 216 - + drivers/watchdog/tangox_wdt.c | 209 - + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/ziirave_wdt.c | 1 - + drivers/watchdog/zx2967_wdt.c | 279 - + drivers/xen/gntdev.c | 37 +- + drivers/xen/xen-scsiback.c | 4 +- + fs/anon_inodes.c | 157 +- + fs/binfmt_elf.c | 5 +- + fs/binfmt_elf_fdpic.c | 5 +- + fs/binfmt_misc.c | 4 +- + fs/ceph/addr.c | 2 +- + fs/ceph/caps.c | 70 +- + fs/ceph/inode.c | 61 +- + fs/ceph/snap.c | 10 + + fs/ceph/super.h | 40 +- + fs/cifs/cifs_debug.c | 4 +- + fs/cramfs/inode.c | 18 +- + fs/dax.c | 5 +- + fs/dcache.c | 88 +- + fs/erofs/namei.c | 4 +- + fs/exec.c | 4 +- + fs/exfat/balloc.c | 4 +- + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/exfat_raw.h | 4 + + fs/exfat/fatent.c | 43 +- + fs/exfat/super.c | 31 +- + fs/ext4/inode.c | 20 +- + fs/f2fs/super.c | 3 - + fs/fat/misc.c | 23 +- + fs/fs-writeback.c | 116 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/super.c | 2 - + fs/hostfs/hostfs_kern.c | 10 +- + fs/inode.c | 42 +- + fs/isofs/dir.c | 1 + + fs/isofs/inode.c | 9 +- + fs/isofs/namei.c | 1 + + fs/jffs2/compr_rtime.c | 3 + + fs/jffs2/summary.c | 3 + + fs/libfs.c | 5 - + fs/nfsd/nfsctl.c | 14 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/group.c | 25 +- + fs/notify/inotify/inotify_user.c | 4 +- + fs/orangefs/file.c | 5 +- + fs/proc/task_mmu.c | 9 +- + fs/pstore/zone.c | 2 +- + fs/quota/quota_v2.c | 11 +- + fs/seq_file.c | 5 +- + fs/statfs.c | 5 +- + fs/super.c | 12 +- + fs/ubifs/auth.c | 2 +- + fs/ubifs/journal.c | 2 +- + fs/ubifs/replay.c | 4 +- + fs/ubifs/super.c | 4 +- + fs/ubifs/xattr.c | 2 +- + fs/udf/inode.c | 9 +- + fs/udf/super.c | 9 +- + fs/userfaultfd.c | 19 +- + fs/xfs/xfs_file.c | 6 +- + fs/zonefs/Makefile | 2 + + fs/zonefs/super.c | 10 + + fs/zonefs/trace.h | 104 + + include/acpi/acpi_bus.h | 7 + + include/acpi/acpi_numa.h | 4 + + include/acpi/actbl1.h | 11 +- + include/asm-generic/Kbuild | 1 - + include/asm-generic/export.h | 2 +- + include/asm-generic/hyperv-tlfs.h | 255 +- + include/asm-generic/mm-arch-hooks.h | 16 - + include/asm-generic/mshyperv.h | 5 + + include/asm-generic/qrwlock.h | 25 +- + include/asm-generic/tlb.h | 6 +- + include/asm-generic/vmlinux.lds.h | 11 +- + include/crypto/algapi.h | 39 - + include/crypto/blake2b.h | 67 + + include/crypto/blake2s.h | 63 +- + include/crypto/hash.h | 8 +- + include/crypto/internal/blake2b.h | 115 + + include/crypto/internal/blake2s.h | 109 +- + include/crypto/internal/cipher.h | 218 + + include/crypto/internal/skcipher.h | 2 +- + include/drm/drm_agpsupport.h | 18 - + include/drm/drm_atomic.h | 20 + + include/drm/drm_atomic_helper.h | 4 - + include/drm/drm_connector.h | 49 + + include/drm/drm_crtc.h | 33 + + include/drm/drm_device.h | 23 +- + include/drm/drm_dp_helper.h | 239 +- + include/drm/drm_drv.h | 2 - + include/drm/drm_dsc.h | 1 + + include/drm/drm_edid.h | 30 + + include/drm/drm_encoder.h | 32 +- + include/drm/drm_gem.h | 3 - + include/drm/drm_gem_cma_helper.h | 14 +- + include/drm/drm_hdcp.h | 8 +- + include/drm/drm_irq.h | 2 +- + include/drm/drm_legacy.h | 10 +- + include/drm/drm_managed.h | 2 - + include/drm/drm_mipi_dbi.h | 2 +- + include/drm/drm_modes.h | 10 + + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_plane.h | 42 + + include/drm/drm_prime.h | 7 +- + include/drm/drm_property.h | 2 +- + include/drm/drm_rect.h | 13 + + include/drm/drm_simple_kms_helper.h | 24 + + include/drm/gpu_scheduler.h | 14 +- + include/drm/ttm/ttm_bo_api.h | 13 +- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_resource.h | 5 +- + include/drm/ttm/ttm_tt.h | 2 - + include/dt-bindings/clock/axg-clkc.h | 1 - + include/dt-bindings/clock/imx8-clock.h | 2 + + include/dt-bindings/clock/imx8mm-clock.h | 10 +- + include/dt-bindings/clock/imx8mn-clock.h | 9 +- + include/dt-bindings/clock/imx8mq-clock.h | 16 +- + include/dt-bindings/clock/meson8b-clkc.h | 2 - + include/dt-bindings/clock/mstar-msc313-mpll.h | 19 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 2 + + include/dt-bindings/clock/qcom,gcc-sc7280.h | 226 + + include/dt-bindings/clock/qcom,gcc-sc8180x.h | 309 + + include/dt-bindings/clock/qcom,gcc-sm8350.h | 266 + + include/dt-bindings/clock/qcom,gpucc-sdm660.h | 28 + + include/dt-bindings/clock/qcom,mmcc-sdm660.h | 162 + + include/dt-bindings/clock/qcom,videocc-sm8250.h | 2 + + include/dt-bindings/clock/rk3368-cru.h | 3 + + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 2 + + include/dt-bindings/clock/sun50i-h616-ccu.h | 115 + + include/dt-bindings/clock/xlnx-vcu.h | 15 + + include/dt-bindings/clock/zx296702-clock.h | 180 - + include/dt-bindings/memory/mt2701-larb-port.h | 4 +- + include/dt-bindings/memory/mt2712-larb-port.h | 6 +- + include/dt-bindings/memory/mt6779-larb-port.h | 6 +- + include/dt-bindings/memory/mt8167-larb-port.h | 6 +- + include/dt-bindings/memory/mt8173-larb-port.h | 6 +- + include/dt-bindings/memory/mt8183-larb-port.h | 6 +- + include/dt-bindings/memory/mt8192-larb-port.h | 243 + + include/dt-bindings/memory/mtk-memory-port.h | 15 + + .../dt-bindings/reset-controller/mt8192-resets.h | 30 + + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 + + include/dt-bindings/reset/sun50i-h616-ccu.h | 70 + + include/linux/anon_inodes.h | 5 + + include/linux/arm-smccc.h | 31 + + include/linux/binfmts.h | 4 + + include/linux/blkdev.h | 2 +- + include/linux/ceph/libceph.h | 7 +- + include/linux/cgroup.h | 4 +- + include/linux/clk-provider.h | 4 +- + include/linux/clk.h | 4 +- + include/linux/clk/imx.h | 15 + + include/linux/clk/spear.h | 23 + + include/linux/compiler.h | 2 + + include/linux/connector.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/crypto.h | 172 +- + include/linux/dcache.h | 2 + + include/linux/device-mapper.h | 32 +- + include/linux/dma-buf.h | 45 +- + include/linux/dma-map-ops.h | 5 +- + include/linux/dmar.h | 2 + + include/linux/entry-common.h | 4 + + include/linux/entry-kvm.h | 14 + + .../linux/firmware/intel/stratix10-svc-client.h | 10 +- + include/linux/fs.h | 33 +- + include/linux/fsnotify_backend.h | 1 + + include/linux/fwnode.h | 7 + + include/linux/gpio/machine.h | 4 +- + include/linux/hyperv.h | 13 +- + include/linux/i3c/device.h | 2 +- + include/linux/iio/adc/qcom-vadc-common.h | 3 + + include/linux/ima.h | 10 + + include/linux/intel-iommu.h | 43 +- + include/linux/io-pgtable.h | 19 +- + include/linux/iommu.h | 21 +- + include/linux/iova.h | 12 - + include/linux/irqflags.h | 12 + + include/linux/isa.h | 2 +- + include/linux/jump_label.h | 12 +- + include/linux/kernel.h | 23 +- + include/linux/kexec.h | 5 + + include/linux/keyslot-manager.h | 14 + + include/linux/kgdb.h | 1 - + include/linux/kvm_host.h | 10 +- + include/linux/list.h | 2 +- + include/linux/local_lock_internal.h | 5 +- + include/linux/lockdep.h | 15 +- + include/linux/lockdep_types.h | 18 +- + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 9 + + include/linux/memblock.h | 6 +- + include/linux/mfd/abx500/ab8500.h | 3 - + include/linux/mfd/bd9571mwv.h | 45 +- + include/linux/mfd/core.h | 6 +- + include/linux/mfd/intel-m10-bmc.h | 9 + + include/linux/mfd/iqs62x.h | 11 +- + include/linux/mfd/rohm-generic.h | 16 +- + include/linux/mlx5/driver.h | 10 +- + include/linux/mlx5/mlx5_ifc.h | 5 +- + include/linux/mm-arch-hooks.h | 22 - + include/linux/mm.h | 33 +- + include/linux/mm_types.h | 7 +- + include/linux/mmc/card.h | 1 - + include/linux/mmc/core.h | 6 + + include/linux/mmc/host.h | 25 +- + include/linux/mod_devicetable.h | 18 + + include/linux/mtd/spi-nor.h | 1 + + include/linux/mutex.h | 25 - + include/linux/of_device.h | 14 +- + include/linux/parport.h | 31 + + include/linux/parser.h | 1 + + include/linux/pci.h | 9 + + include/linux/perf_event.h | 4 +- + include/linux/pgtable.h | 11 + + include/linux/platform_data/clk-u300.h | 1 - + include/linux/platform_data/cros_ec_commands.h | 2 + + include/linux/platform_data/efm32-spi.h | 15 - + include/linux/platform_data/mlxcpld.h | 31 + + include/linux/platform_data/mmc-omap.h | 3 +- + include/linux/platform_data/x86/mlxcpld.h | 52 - + include/linux/pmbus.h | 9 + + include/linux/power/max8903_charger.h | 43 - + include/linux/psp-sev.h | 17 + + include/linux/rbtree.h | 206 +- + include/linux/rcu_segcblist.h | 120 +- + include/linux/rcupdate.h | 44 +- + include/linux/regulator/ab8500.h | 166 - + include/linux/regulator/mt6315-regulator.h | 44 + + include/linux/regulator/pca9450.h | 7 + + include/linux/rtc.h | 2 + + include/linux/rtc/sirfsoc_rtciobrg.h | 21 - + include/linux/rwlock.h | 7 + + include/linux/sched.h | 63 +- + include/linux/sched/prio.h | 18 +- + include/linux/security.h | 10 + + include/linux/slab.h | 2 + + include/linux/soc/mediatek/mtk-mutex.h | 26 + + include/linux/sony-laptop.h | 2 +- + include/linux/spi/lms283gf05.h | 16 - + include/linux/spi/spi-mem.h | 9 + + include/linux/spi/spi.h | 44 +- + include/linux/srcu.h | 3 + + include/linux/srcutiny.h | 7 +- + include/linux/static_call.h | 77 +- + include/linux/static_call_types.h | 50 + + include/linux/sunrpc/svcsock.h | 2 + + include/linux/surface_acpi_notify.h | 39 + + include/linux/surface_aggregator/controller.h | 824 +++ + include/linux/surface_aggregator/device.h | 423 ++ + include/linux/surface_aggregator/serial_hub.h | 672 ++ + include/linux/syscalls.h | 8 +- + include/linux/thermal.h | 18 +- + include/linux/timer.h | 2 + + include/linux/topology.h | 1 + + include/linux/torture.h | 27 +- + include/linux/tpm.h | 14 +- + include/linux/types.h | 8 +- + include/linux/vgaarb.h | 6 +- + include/linux/vmalloc.h | 6 + + include/linux/w1.h | 2 +- + include/linux/wm97xx.h | 1 - + include/linux/z2_battery.h | 1 - + include/media/davinci/vpif_types.h | 2 - + include/media/v4l2-async.h | 146 +- + include/media/v4l2-clk.h | 73 - + include/media/v4l2-event.h | 13 +- + include/media/v4l2-fwnode.h | 28 +- + include/rdma/ib_sa.h | 4 - + include/rdma/ib_umem.h | 48 +- + include/rdma/ib_verbs.h | 9 +- + include/rdma/rdma_counter.h | 3 +- + include/scsi/libsas.h | 9 +- + include/scsi/scsi.h | 2 + + include/scsi/scsi_cmnd.h | 5 + + include/scsi/scsi_host.h | 6 + + include/scsi/scsi_transport_fc.h | 4 +- + include/soc/mediatek/smi.h | 3 +- + include/sound/core.h | 6 + + include/sound/dmaengine_pcm.h | 5 + + include/sound/graph_card.h | 6 +- + include/sound/hdaudio.h | 14 +- + include/sound/hdaudio_ext.h | 2 + + include/sound/hdmi-codec.h | 5 + + include/sound/jack.h | 1 + + include/sound/rt5645.h | 2 + + include/sound/soc-component.h | 6 + + include/sound/soc-dai.h | 4 +- + include/sound/soc.h | 4 +- + include/sound/sof/ext_manifest.h | 6 +- + include/target/target_core_base.h | 1 + + include/trace/events/intel_iommu.h | 39 +- + include/trace/events/rcu.h | 26 + + include/trace/events/ufs.h | 108 +- + include/uapi/drm/drm.h | 97 +- + include/uapi/drm/drm_fourcc.h | 23 +- + include/uapi/drm/drm_mode.h | 13 +- + include/uapi/drm/i915_drm.h | 3 +- + include/uapi/linux/binfmts.h | 4 + + include/uapi/linux/ccs.h | 18 + + include/uapi/linux/dm-ioctl.h | 4 +- + include/uapi/linux/gpio.h | 4 +- + include/uapi/linux/i2c-dev.h | 25 +- + include/uapi/linux/i2c.h | 128 +- + include/uapi/linux/kvm.h | 74 + + include/uapi/linux/media.h | 1 + + include/uapi/linux/perf_event.h | 54 +- + include/uapi/linux/rtc.h | 5 + + include/uapi/linux/spi/spi.h | 41 + + include/uapi/linux/spi/spidev.h | 30 +- + include/uapi/linux/surface_aggregator/cdev.h | 78 + + include/uapi/linux/v4l2-controls.h | 22 + + include/uapi/rdma/ib_user_ioctl_cmds.h | 14 + + include/video/sstfb.h | 4 +- + include/xen/grant_table.h | 1 + + include/xen/interface/xen.h | 4 +- + init/Kconfig | 2 +- + kernel/Kconfig.preempt | 19 + + kernel/audit.c | 4 +- + kernel/auditsc.c | 16 +- + kernel/cpu.c | 7 + + kernel/debug/debug_core.c | 28 +- + kernel/debug/gdbstub.c | 4 +- + kernel/debug/kdb/kdb_private.h | 12 +- + kernel/debug/kdb/kdb_support.c | 53 +- + kernel/dma/Kconfig | 3 - + kernel/dma/mapping.c | 2 + + kernel/entry/common.c | 17 +- + kernel/events/core.c | 206 +- + kernel/events/uprobes.c | 80 +- + kernel/futex.c | 13 +- + kernel/irq/resend.c | 4 +- + kernel/kcsan/core.c | 26 +- + kernel/kexec_file.c | 5 + + kernel/locking/Makefile | 1 + + kernel/locking/irqflag-debug.c | 13 + + kernel/locking/lockdep.c | 186 +- + kernel/locking/locktorture.c | 1 - + kernel/locking/mutex.c | 10 - + kernel/locking/qrwlock.c | 1 - + kernel/locking/rtmutex.c | 71 +- + kernel/locking/rwsem.h | 0 + kernel/printk/printk.c | 28 +- + kernel/printk/printk_ringbuffer.h | 2 +- + kernel/printk/printk_safe.c | 16 +- + kernel/rcu/Kconfig | 5 +- + kernel/rcu/rcu.h | 16 +- + kernel/rcu/rcu_segcblist.c | 216 +- + kernel/rcu/rcu_segcblist.h | 57 +- + kernel/rcu/rcutorture.c | 395 +- + kernel/rcu/refscale.c | 23 +- + kernel/rcu/srcutiny.c | 77 +- + kernel/rcu/srcutree.c | 147 +- + kernel/rcu/tasks.h | 79 + + kernel/rcu/tree.c | 154 +- + kernel/rcu/tree.h | 4 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 398 +- + kernel/rcu/tree_stall.h | 60 +- + kernel/rcu/update.c | 4 +- + kernel/scftorture.c | 6 +- + kernel/sched/core.c | 406 +- + kernel/sched/cpufreq_schedutil.c | 108 +- + kernel/sched/deadline.c | 94 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 322 +- + kernel/sched/features.h | 2 +- + kernel/sched/idle.c | 1 + + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 51 +- + kernel/sched/topology.c | 99 +- + kernel/seccomp.c | 4 +- + kernel/smp.c | 4 + + kernel/static_call.c | 60 +- + kernel/time/alarmtimer.c | 8 +- + kernel/time/namespace.c | 6 - + kernel/time/timer.c | 14 + + kernel/torture.c | 167 +- + lib/Kconfig.debug | 8 + + lib/Makefile | 3 - + lib/cmdline.c | 21 +- + lib/cmdline_kunit.c | 56 + + lib/crc7.c | 2 +- + lib/crypto/blake2s.c | 48 +- + lib/crypto/chacha20poly1305.c | 5 + + lib/kunit/Kconfig | 1 + + lib/kunit/assert.c | 39 +- + lib/kunit/executor.c | 93 +- + lib/linear_ranges.c | 8 +- + lib/locking-selftest.c | 334 +- + lib/parser.c | 44 +- + lib/percpu-refcount.c | 12 +- + lib/test_bitmap.c | 3 +- + lib/test_printf.c | 16 +- + lib/timerqueue.c | 28 +- + lib/vsprintf.c | 36 +- + mm/filemap.c | 179 +- + mm/hugetlb.c | 18 +- + mm/khugepaged.c | 37 +- + mm/madvise.c | 12 +- + mm/memblock.c | 6 +- + mm/memory.c | 272 +- + mm/mmap.c | 8 +- + mm/mmu_gather.c | 31 +- + mm/mremap.c | 3 - + mm/nommu.c | 3 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 6 +- + mm/slab.c | 20 + + mm/slab.h | 12 + + mm/slab_common.c | 75 + + mm/slob.c | 6 + + mm/slub.c | 40 + + mm/swapfile.c | 11 +- + mm/util.c | 31 + + mm/vmalloc.c | 13 + + net/ceph/ceph_common.c | 17 +- + net/sunrpc/svcsock.c | 35 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +- + samples/kprobes/kprobe_example.c | 9 +- + scripts/Makefile.dtbinst | 3 + + scripts/Makefile.lib | 5 + + scripts/checkpatch.pl | 6 - + scripts/coccinelle/free/put_device.cocci | 1 - + scripts/dtc/Makefile | 8 +- + scripts/dtc/data.c | 6 +- + scripts/dtc/dtc.c | 4 + + scripts/dtc/dtc.h | 8 +- + scripts/dtc/fdtdump.c | 163 - + scripts/dtc/fdtoverlay.c | 208 + + scripts/dtc/flattree.c | 8 +- + scripts/dtc/libfdt/fdt.c | 4 + + scripts/dtc/libfdt/fdt_ro.c | 20 +- + scripts/dtc/libfdt/fdt_rw.c | 4 +- + scripts/dtc/libfdt/fdt_sw.c | 2 +- + scripts/dtc/libfdt/libfdt.h | 126 +- + scripts/dtc/libfdt/libfdt_internal.h | 19 + + scripts/dtc/livetree.c | 2 +- + scripts/dtc/srcpos.c | 2 +- + scripts/dtc/update-dtc-source.sh | 3 +- + scripts/dtc/version_gen.h | 2 +- + scripts/dtc/yamltree.c | 6 +- + scripts/kernel-doc | 63 +- + scripts/mod/devicetable-offsets.c | 8 + + scripts/mod/file2alias.c | 23 + + scripts/sphinx-pre-install | 4 +- + security/integrity/digsig.c | 4 +- + security/integrity/evm/evm_crypto.c | 7 +- + security/integrity/ima/ima.h | 8 +- + security/integrity/ima/ima_api.c | 8 +- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_asymmetric_keys.c | 2 +- + security/integrity/ima/ima_init.c | 5 + + security/integrity/ima/ima_kexec.c | 3 + + security/integrity/ima/ima_main.c | 59 +- + security/integrity/ima/ima_policy.c | 115 +- + security/integrity/ima/ima_queue_keys.c | 3 +- + security/keys/trusted-keys/trusted_tpm1.c | 22 +- + security/keys/trusted-keys/trusted_tpm2.c | 22 +- + security/lsm_audit.c | 5 +- + security/security.c | 8 + + security/selinux/Makefile | 2 + + security/selinux/avc.c | 10 +- + security/selinux/hooks.c | 141 +- + security/selinux/ibpkey.c | 1 - + security/selinux/ima.c | 44 + + security/selinux/include/classmap.h | 2 + + security/selinux/include/ima.h | 24 + + security/selinux/include/security.h | 4 +- + security/selinux/netif.c | 1 - + security/selinux/netlink.c | 2 +- + security/selinux/netnode.c | 1 - + security/selinux/netport.c | 1 - + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/avtab.c | 4 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/services.c | 74 +- + security/selinux/xfrm.c | 2 +- + security/smack/smackfs.c | 21 +- + security/tomoyo/file.c | 16 +- + security/tomoyo/network.c | 10 +- + security/tomoyo/util.c | 24 +- + sound/ac97/bus.c | 2 +- + sound/aoa/codecs/onyx.c | 2 +- + sound/aoa/codecs/tas.c | 2 +- + sound/aoa/codecs/toonie.c | 2 +- + sound/aoa/core/alsa.c | 8 +- + sound/aoa/fabrics/layout.c | 6 +- + sound/aoa/soundbus/sysfs.c | 2 +- + sound/arm/aaci.c | 6 +- + sound/arm/pxa2xx-ac97.c | 2 +- + sound/core/Kconfig | 9 + + sound/core/compress_offload.c | 2 +- + sound/core/control.c | 20 +- + sound/core/ctljack.c | 2 +- + sound/core/hwdep.c | 6 +- + sound/core/init.c | 23 +- + sound/core/jack.c | 304 +- + sound/core/oss/mixer_oss.c | 14 +- + sound/core/oss/rate.c | 4 +- + sound/core/pcm.c | 29 +- + sound/core/pcm_dmaengine.c | 2 + + sound/core/pcm_local.h | 7 + + sound/core/pcm_memory.c | 12 +- + sound/core/pcm_native.c | 60 +- + sound/core/rawmidi.c | 2 +- + sound/core/seq/oss/seq_oss_midi.c | 4 +- + sound/core/seq/oss/seq_oss_synth.c | 6 +- + sound/core/seq/seq_clientmgr.c | 2 +- + sound/core/seq/seq_memory.c | 2 +- + sound/core/seq/seq_ports.c | 6 +- + sound/core/sound.c | 15 + + sound/core/timer.c | 10 +- + sound/core/timer_compat.c | 4 +- + sound/drivers/aloop.c | 2 +- + sound/drivers/dummy.c | 2 +- + sound/drivers/opl3/opl3_oss.c | 2 +- + sound/drivers/opl3/opl3_synth.c | 2 +- + sound/drivers/vx/vx_pcm.c | 3 +- + sound/firewire/bebob/bebob_hwdep.c | 10 +- + sound/firewire/dice/Makefile | 3 +- + sound/firewire/dice/dice-harman.c | 26 + + sound/firewire/dice/dice-hwdep.c | 2 +- + sound/firewire/dice/dice.c | 12 + + sound/firewire/dice/dice.h | 1 + + sound/firewire/digi00x/digi00x-hwdep.c | 2 +- + sound/firewire/fireface/ff-hwdep.c | 12 +- + sound/firewire/fireface/ff-protocol-latter.c | 118 +- + sound/firewire/fireworks/fireworks_hwdep.c | 2 +- + sound/firewire/motu/motu-hwdep.c | 2 +- + sound/firewire/oxfw/oxfw-hwdep.c | 12 +- + sound/firewire/tascam/tascam-hwdep.c | 2 +- + sound/hda/Kconfig | 14 + + sound/hda/ext/hdac_ext_controller.c | 37 + + sound/hda/hdac_bus.c | 23 + + sound/hda/hdac_controller.c | 14 + + sound/hda/hdac_stream.c | 5 +- + sound/hda/hdac_sysfs.c | 2 +- + sound/hda/intel-dsp-config.c | 41 +- + sound/i2c/i2c.c | 4 +- + sound/isa/ad1848/ad1848.c | 7 +- + sound/isa/adlib.c | 3 +- + sound/isa/cmi8328.c | 3 +- + sound/isa/cmi8330.c | 3 +- + sound/isa/cs423x/cs4231.c | 7 +- + sound/isa/cs423x/cs4236.c | 7 +- + sound/isa/es1688/es1688.c | 7 +- + sound/isa/es18xx.c | 5 +- + sound/isa/galaxy/galaxy.c | 3 +- + sound/isa/gus/gusclassic.c | 3 +- + sound/isa/gus/gusextreme.c | 3 +- + sound/isa/gus/gusmax.c | 3 +- + sound/isa/gus/interwave.c | 3 +- + sound/isa/msnd/msnd_pinnacle.c | 3 +- + sound/isa/opl3sa2.c | 3 +- + sound/isa/opti9xx/miro.c | 3 +- + sound/isa/opti9xx/opti92x-ad1848.c | 5 +- + sound/isa/sb/jazz16.c | 3 +- + sound/isa/sb/sb16.c | 3 +- + sound/isa/sb/sb16_csp.c | 2 +- + sound/isa/sb/sb8.c | 3 +- + sound/isa/sb/sb_mixer.c | 2 +- + sound/isa/sc6000.c | 3 +- + sound/isa/sscape.c | 3 +- + sound/isa/wavefront/wavefront.c | 3 +- + sound/mips/Kconfig | 7 + + sound/mips/Makefile | 1 + + sound/mips/snd-n64.c | 372 + + sound/oss/dmasound/dmasound_core.c | 4 +- + sound/pci/ad1889.c | 3 +- + sound/pci/ali5451/ali5451.c | 3 +- + sound/pci/als300.c | 3 +- + sound/pci/als4000.c | 3 +- + sound/pci/asihpi/hpidebug.c | 2 +- + sound/pci/au88x0/au88x0.c | 3 +- + sound/pci/aw2/aw2-alsa.c | 3 +- + sound/pci/azt3328.c | 5 +- + sound/pci/bt87x.c | 3 +- + sound/pci/ca0106/ca0106_main.c | 3 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 3 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 8 +- + sound/pci/ctxfi/cthw20k2.c | 8 +- + sound/pci/ctxfi/ctpcm.c | 2 +- + sound/pci/ctxfi/ctresource.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 4 +- + sound/pci/emu10k1/emu10k1_main.c | 2 +- + sound/pci/emu10k1/emufx.c | 6 +- + sound/pci/emu10k1/memory.c | 2 +- + sound/pci/ens1370.c | 4 +- + sound/pci/es1938.c | 3 +- + sound/pci/es1968.c | 5 +- + sound/pci/fm801.c | 2 +- + sound/pci/hda/hda_auto_parser.c | 2 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_eld.c | 2 +- + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/hda/hda_intel.c | 16 +- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/hda/hda_tegra.c | 90 +- + sound/pci/hda/patch_conexant.c | 2 +- + sound/pci/hda/patch_hdmi.c | 1 - + sound/pci/hda/patch_realtek.c | 40 + + sound/pci/ice1712/ice1712.c | 3 +- + sound/pci/ice1712/juli.c | 2 +- + sound/pci/ice1712/psc724.c | 4 +- + sound/pci/ice1712/quartet.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/pci/intel8x0m.c | 3 +- + sound/pci/lola/lola.c | 2 +- + sound/pci/lola/lola_clock.c | 2 +- + sound/pci/lola/lola_pcm.c | 2 +- + sound/pci/maestro3.c | 5 +- + sound/pci/rme9652/hdsp.c | 74 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 5 +- + sound/pci/trident/trident_main.c | 7 +- + sound/ppc/keywest.c | 2 +- + sound/soc/Kconfig | 20 +- + sound/soc/Makefile | 8 +- + sound/soc/adi/axi-i2s.c | 2 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 4 +- + sound/soc/atmel/atmel-i2s.c | 2 +- + sound/soc/atmel/atmel-pcm-pdc.c | 78 +- + sound/soc/atmel/mchp-i2s-mcc.c | 4 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 107 +- + sound/soc/cirrus/ep93xx-i2s.c | 2 +- + sound/soc/codecs/Kconfig | 31 +- + sound/soc/codecs/Makefile | 10 +- + sound/soc/codecs/ab8500-codec.c | 4 +- + sound/soc/codecs/adau1372.c | 2 +- + sound/soc/codecs/adau1373.c | 6 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau17x1.c | 3 +- + sound/soc/codecs/ak4554.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/cpcap.c | 139 +- + sound/soc/codecs/cros_ec_codec.c | 12 + + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs4234.c | 2 +- + sound/soc/codecs/cs4271.c | 2 +- + sound/soc/codecs/cs42l56.c | 3 +- + sound/soc/codecs/cs42l73.c | 6 +- + sound/soc/codecs/cs43130.c | 6 +- + sound/soc/codecs/cs4341.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs47l15.c | 12 +- + sound/soc/codecs/cs47l24.c | 12 +- + sound/soc/codecs/cs47l35.c | 12 +- + sound/soc/codecs/cs47l85.c | 16 +- + sound/soc/codecs/cs47l90.c | 16 +- + sound/soc/codecs/cs47l92.c | 12 +- + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/cx2072x.c | 2 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da7218.c | 8 +- + sound/soc/codecs/da7219.c | 4 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/es8316.c | 5 +- + sound/soc/codecs/es8328.c | 5 +- + sound/soc/codecs/hdmi-codec.c | 4 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/jz4740.c | 2 +- + sound/soc/codecs/jz4760.c | 889 +++ + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/lochnagar-sc.c | 12 +- + sound/soc/codecs/lpass-rx-macro.c | 3599 ++++++++++ + sound/soc/codecs/lpass-tx-macro.c | 1862 +++++ + sound/soc/codecs/lpass-wsa-macro.c | 43 +- + sound/soc/codecs/max98373-sdw.c | 4 +- + sound/soc/codecs/max98373.c | 2 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/mc13783.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/mt6359.c | 18 +- + sound/soc/codecs/mt6660.c | 4 +- + sound/soc/codecs/nau8810.c | 2 +- + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/rt1015.c | 122 +- + sound/soc/codecs/rt1015.h | 5 - + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt274.c | 2 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt298.c | 4 +- + sound/soc/codecs/rt5645.c | 78 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5682-i2c.c | 3 + + sound/soc/codecs/rt5682-sdw.c | 25 +- + sound/soc/codecs/rt5682.c | 16 +- + sound/soc/codecs/rt5682.h | 2 +- + sound/soc/codecs/rt700-sdw.c | 6 +- + sound/soc/codecs/rt711-sdw.c | 6 +- + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sirf-audio-codec.c | 575 -- + sound/soc/codecs/ssm2602.c | 4 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 4 +- + sound/soc/codecs/tlv320aic32x4.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tscs42xx.c | 4 +- + sound/soc/codecs/tscs454.c | 12 +- + sound/soc/codecs/wm5102.c | 12 +- + sound/soc/codecs/wm5110.c | 12 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8731.c | 2 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8983.c | 2 +- + sound/soc/codecs/wm8985.c | 2 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994.c | 4 +- + sound/soc/codecs/wm8997.c | 8 +- + sound/soc/codecs/wm8998.c | 12 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 108 +- + sound/soc/codecs/wmfw.h | 6 +- + sound/soc/codecs/wsa881x.c | 1 + + sound/soc/codecs/zl38060.c | 4 +- + sound/soc/codecs/zx_aud96p22.c | 401 -- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl_asrc.c | 5 - + sound/soc/fsl/fsl_easrc.c | 2 +- + sound/soc/fsl/fsl_esai.c | 13 +- + sound/soc/fsl/fsl_micfil.c | 9 +- + sound/soc/fsl/fsl_sai.c | 8 +- + sound/soc/fsl/fsl_spdif.c | 14 +- + sound/soc/fsl/fsl_ssi.c | 12 +- + sound/soc/fsl/fsl_xcvr.c | 7 +- + sound/soc/generic/audio-graph-card.c | 17 +- + sound/soc/generic/simple-card-utils.c | 13 +- + sound/soc/intel/Kconfig | 2 + + sound/soc/intel/boards/Kconfig | 12 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bytcht_es8316.c | 3 - + sound/soc/intel/boards/bytcr_rt5640.c | 89 +- + sound/soc/intel/boards/bytcr_rt5651.c | 13 + + sound/soc/intel/boards/bytcr_wm5102.c | 465 ++ + sound/soc/intel/boards/cht_bsw_nau8824.c | 15 +- + sound/soc/intel/boards/sof_maxim_common.c | 5 +- + sound/soc/intel/boards/sof_rt5682.c | 7 - + sound/soc/intel/boards/sof_sdw.c | 131 +- + sound/soc/intel/catpt/pcm.c | 14 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 1 - + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 19 +- + sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 5 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 3 - + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 3 - + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 32 +- + sound/soc/intel/common/soc-intel-quirks.h | 25 + + sound/soc/intel/keembay/kmb_platform.c | 230 +- + sound/soc/intel/keembay/kmb_platform.h | 10 + + sound/soc/intel/skylake/skl.c | 8 +- + sound/soc/jz4740/jz4740-i2s.c | 2 +- + sound/soc/kirkwood/kirkwood-dma.c | 79 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +- + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 - + sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 8 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 47 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 2 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 84 +- + sound/soc/meson/aiu-fifo-i2s.c | 1 - + sound/soc/meson/aiu-fifo-spdif.c | 1 - + sound/soc/meson/aiu-fifo.c | 18 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/qcom/lpass-apq8016.c | 2 +- + sound/soc/qcom/lpass-cpu.c | 47 +- + sound/soc/qcom/lpass-lpaif-reg.h | 3 - + sound/soc/qcom/lpass-sc7180.c | 2 +- + sound/soc/qcom/lpass.h | 1 - + sound/soc/qcom/qdsp6/q6afe.c | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 21 + + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + sound/soc/qcom/qdsp6/q6routing.c | 18 - + sound/soc/rockchip/rockchip_i2s.c | 4 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/samsung/pcm.c | 2 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/sirf/Kconfig | 21 - + sound/soc/sirf/Makefile | 8 - + sound/soc/sirf/sirf-audio-port.c | 86 - + sound/soc/sirf/sirf-audio.c | 160 - + sound/soc/sirf/sirf-usp.c | 435 -- + sound/soc/sirf/sirf-usp.h | 292 - + sound/soc/soc-component.c | 54 + + sound/soc/soc-dapm.c | 13 +- + sound/soc/soc-pcm.c | 465 +- + sound/soc/soc-topology-test.c | 843 +++ + sound/soc/soc-topology.c | 30 +- + sound/soc/sof/core.c | 19 + + sound/soc/sof/debug.c | 2 +- + sound/soc/sof/intel/hda-bus.c | 33 +- + sound/soc/sof/intel/hda-compress.c | 4 +- + sound/soc/sof/intel/hda-dsp.c | 24 +- + sound/soc/sof/intel/hda-loader.c | 17 +- + sound/soc/sof/intel/hda-pcm.c | 18 +- + sound/soc/sof/intel/hda-stream.c | 38 +- + sound/soc/sof/intel/hda-trace.c | 8 +- + sound/soc/sof/intel/hda.c | 277 +- + sound/soc/sof/intel/hda.h | 10 +- + sound/soc/sof/intel/tgl.c | 3 +- + sound/soc/sof/ipc.c | 4 +- + sound/soc/sof/loader.c | 8 +- + sound/soc/sof/ops.h | 43 +- + sound/soc/sof/pcm.c | 7 +- + sound/soc/sof/pm.c | 1 - + sound/soc/sof/sof-pci-dev.c | 22 +- + sound/soc/sof/sof-priv.h | 8 +- + sound/soc/sof/topology.c | 14 +- + sound/soc/sprd/sprd-mcdt.c | 10 +- + sound/soc/stm/stm32_i2s.c | 310 +- + sound/soc/sunxi/sun4i-i2s.c | 2 +- + sound/soc/sunxi/sun8i-codec.c | 12 +- + sound/soc/tegra/Kconfig | 42 +- + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_dspk.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 2 +- + sound/soc/tegra/tegra210_dmic.c | 2 +- + sound/soc/tegra/tegra210_i2s.c | 2 +- + sound/soc/tegra/tegra30_ahub.c | 64 +- + sound/soc/tegra/tegra30_ahub.h | 5 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/tegra/tegra_audio_graph_card.c | 252 + + sound/soc/tegra/tegra_pcm.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/txx9/Kconfig | 30 - + sound/soc/txx9/Makefile | 12 - + sound/soc/txx9/txx9aclc-ac97.c | 230 - + sound/soc/txx9/txx9aclc-generic.c | 88 - + sound/soc/txx9/txx9aclc.c | 422 -- + sound/soc/txx9/txx9aclc.h | 71 - + sound/soc/zte/Kconfig | 26 - + sound/soc/zte/Makefile | 4 - + sound/soc/zte/zx-i2s.c | 452 -- + sound/soc/zte/zx-spdif.c | 363 - + sound/soc/zte/zx-tdm.c | 458 -- + sound/usb/bcd2000/bcd2000.c | 2 +- + sound/usb/caiaq/audio.c | 2 +- + sound/usb/caiaq/device.c | 6 +- + sound/usb/caiaq/midi.c | 2 +- + sound/usb/card.c | 15 +- + sound/usb/card.h | 2 +- + sound/usb/clock.c | 6 + + sound/usb/endpoint.c | 87 +- + sound/usb/hiface/chip.c | 6 +- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/implicit.c | 5 +- + sound/usb/mixer.c | 30 +- + sound/usb/mixer_quirks.c | 369 +- + sound/usb/mixer_scarlett.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/mixer_us16x08.c | 2 +- + sound/usb/pcm.c | 7 +- + sound/usb/quirks-table.h | 117 + + sound/usb/quirks.c | 20 + + sound/x86/intel_hdmi_audio.c | 5 +- + sound/xen/xen_snd_front_cfg.c | 2 +- + tools/arch/powerpc/include/uapi/asm/kvm.h | 2 + + tools/gpio/gpio-utils.c | 89 - + tools/gpio/gpio-utils.h | 6 - + tools/include/linux/rbtree.h | 192 +- + tools/include/linux/static_call_types.h | 50 + + tools/include/nolibc/nolibc.h | 153 +- + tools/include/uapi/linux/kvm.h | 1 + + tools/memory-model/Documentation/glossary.txt | 12 +- + tools/memory-model/README | 2 +- + .../litmus-tests/CoRR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoRW+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWW+poonceonce.litmus | 4 +- + .../IRIW+fencembonceonces+OnceOnce.litmus | 5 +- + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 5 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 7 +- + .../litmus-tests/ISA2+poonceonces.litmus | 6 +- + ...cerelease+poacquirerelease+poacquireonce.litmus | 6 +- + .../LB+fencembonceonce+ctrlonceonce.litmus | 5 +- + .../LB+poacquireonce+pooncerelease.litmus | 5 +- + .../litmus-tests/LB+poonceonces.litmus | 5 +- + .../MP+fencewmbonceonce+fencermbonceonce.litmus | 5 +- + .../litmus-tests/MP+onceassign+derefonce.litmus | 4 +- + .../MP+polockmbonce+poacquiresilsil.litmus | 5 +- + .../MP+polockonce+poacquiresilsil.litmus | 5 +- + tools/memory-model/litmus-tests/MP+polocks.litmus | 6 +- + .../litmus-tests/MP+poonceonces.litmus | 5 +- + .../MP+pooncerelease+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/MP+porevlocks.litmus | 6 +- + .../litmus-tests/R+fencembonceonces.litmus | 5 +- + .../memory-model/litmus-tests/R+poonceonces.litmus | 5 +- + .../S+fencewmbonceonce+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/S+poonceonces.litmus | 5 +- + .../litmus-tests/SB+fencembonceonces.litmus | 5 +- + .../litmus-tests/SB+poonceonces.litmus | 5 +- + .../litmus-tests/SB+rfionceonce-poonceonces.litmus | 5 +- + .../litmus-tests/WRC+poonceonces+Once.litmus | 5 +- + .../WRC+pooncerelease+fencermbonceonce+Once.litmus | 5 +- + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 7 +- + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 7 +- + ...release+poacquirerelease+fencembonceonce.litmus | 6 +- + tools/objtool/check.c | 17 +- + tools/objtool/elf.c | 73 +- + tools/power/x86/intel-speed-select/isst-config.c | 115 +- + tools/power/x86/intel-speed-select/isst-core.c | 11 + + tools/power/x86/intel-speed-select/isst-display.c | 18 + + tools/power/x86/intel-speed-select/isst.h | 2 + + tools/testing/kunit/kunit.py | 30 +- + tools/testing/kunit/kunit_config.py | 13 +- + tools/testing/kunit/kunit_kernel.py | 18 +- + tools/testing/kunit/kunit_tool_test.py | 204 +- + tools/testing/scatterlist/main.c | 1 - + tools/testing/selftests/Makefile | 9 - + .../selftests/arm64/mte/check_buffer_fill.c | 2 +- + .../selftests/breakpoints/breakpoint_test_arm64.c | 4 +- + tools/testing/selftests/dmabuf-heaps/Makefile | 2 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 149 +- + tools/testing/selftests/gpio/Makefile | 26 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-mockup-cdev.c | 198 + + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 323 - + tools/testing/selftests/gpio/gpio-mockup-sysfs.sh | 168 +- + tools/testing/selftests/gpio/gpio-mockup.sh | 497 +- + tools/testing/selftests/ipc/msgque.c | 6 +- + tools/testing/selftests/kselftest_deps.sh | 4 +- + tools/testing/selftests/kselftest_harness.h | 26 +- + tools/testing/selftests/kselftest_module.h | 18 +- + tools/testing/selftests/kvm/.gitignore | 6 + + tools/testing/selftests/kvm/Makefile | 6 + + tools/testing/selftests/kvm/demand_paging_test.c | 43 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 92 +- + tools/testing/selftests/kvm/include/kvm_util.h | 6 - + tools/testing/selftests/kvm/include/numaif.h | 55 + + .../testing/selftests/kvm/include/perf_test_util.h | 7 +- + tools/testing/selftests/kvm/include/test_util.h | 16 +- + .../selftests/kvm/include/x86_64/processor.h | 41 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 1 + + tools/testing/selftests/kvm/lib/perf_test_util.c | 31 +- + tools/testing/selftests/kvm/lib/test_util.c | 31 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 144 + + tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 +- + .../kvm/memslot_modification_stress_test.c | 212 + + tools/testing/selftests/kvm/settings | 1 + + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 3 +- + .../testing/selftests/kvm/x86_64/get_cpuid_test.c | 175 + + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 31 +- + .../selftests/kvm/x86_64/vmx_pmu_msrs_test.c | 131 + + .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 544 ++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 167 + + .../testing/selftests/kvm/x86_64/xen_vmcall_test.c | 149 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 67 + + .../selftests/rcutorture/bin/console-badness.sh | 1 + + .../testing/selftests/rcutorture/bin/functions.sh | 36 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 9 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 3 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 12 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 103 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 2 +- + .../selftests/rcutorture/bin/parse-build.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 442 ++ + .../selftests/rcutorture/configs/rcu/RUDE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01.boot | 4 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + tools/testing/selftests/timens/.gitignore | 1 + + tools/testing/selftests/vDSO/vdso_config.h | 4 +- + tools/testing/selftests/x86/ldt_gdt.c | 2 +- + virt/kvm/dirty_ring.c | 8 +- + virt/kvm/kvm_main.c | 54 +- + virt/kvm/mmu_lock.h | 23 + + 4861 files changed, 199500 insertions(+), 129565 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-ltc4162l + rename Documentation/arm/{marvel.rst => marvell.rst} (97%) + create mode 100644 Documentation/dev-tools/kunit/tips.rst + create mode 100644 Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml + rename Documentation/devicetree/bindings/clock/{allwinner,sun9i-a80-usb-clocks.yaml => allwinner,sun9i-a80-usb-clks.yaml} (95%) + delete mode 100644 Documentation/devicetree/bindings/clock/csr,atlas7-car.txt + create mode 100644 Documentation/devicetree/bindings/clock/intel,easic-n5x.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/prima2-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,a7pll.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sc7280.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sc8180x.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sm8350.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc-sdm660.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/tango4-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/zx296702-clk.txt + delete mode 100644 Documentation/devicetree/bindings/clock/zx296718-clk.txt + create mode 100644 Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml + create mode 100644 Documentation/devicetree/bindings/display/connector/dp-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ht16k33.txt + delete mode 100644 Documentation/devicetree/bindings/display/ste,mcde.txt + create mode 100644 Documentation/devicetree/bindings/display/ste,mcde.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/zx296702-gpio.txt + delete mode 100644 Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt + create mode 100644 Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-sirf.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-stu300.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-zx2967.txt + delete mode 100644 Documentation/devicetree/bindings/i3c/i3c.txt + create mode 100644 Documentation/devicetree/bindings/i3c/i3c.yaml + create mode 100644 Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml + rename Documentation/devicetree/bindings/iio/dac/{adi,ad5686.yaml => adi,ad5696.yaml} (77%) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun6i-a31-r-intc.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt + delete mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml + create mode 100644 Documentation/devicetree/bindings/media/allegro,al5e.yaml + delete mode 100644 Documentation/devicetree/bindings/media/allegro.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/imx258.yaml + rename Documentation/devicetree/bindings/media/i2c/{ov5647.yaml => ovti,ov5647.yaml} (68%) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml + create mode 100644 Documentation/devicetree/bindings/media/video-interface-devices.yaml + create mode 100644 Documentation/devicetree/bindings/media/video-interfaces.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ene-kb930.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,cgu.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,ebu.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,pmu.yaml + create mode 100644 Documentation/devicetree/bindings/mips/realtek-rtl.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mmci.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-sirf.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt + create mode 100644 Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-partitions.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/partition.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/bq256xx.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4831-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/sirf-audio-codec.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,tdm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-spdif.txt + rename Documentation/devicetree/bindings/{mtd => spi}/cadence-quadspi.txt (97%) + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml + create mode 100644 Documentation/devicetree/bindings/spi/realtek,rtl-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sirf.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt + delete mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt + delete mode 100644 Documentation/devicetree/bindings/timer/stericsson-u300-apptimer.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/intel,keembay-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/sigma,smp8642-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/stericsson-coh901327.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt + delete mode 100644 Documentation/driver-api/media/v4l2-clocks.rst + create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst + create mode 100644 Documentation/driver-api/surface_aggregator/client.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/index.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/san.rst + create mode 100644 Documentation/driver-api/surface_aggregator/index.rst + create mode 100644 Documentation/driver-api/surface_aggregator/internal-api.rst + create mode 100644 Documentation/driver-api/surface_aggregator/internal.rst + create mode 100644 Documentation/driver-api/surface_aggregator/overview.rst + create mode 100644 Documentation/driver-api/surface_aggregator/ssh.rst + delete mode 100644 Documentation/hwmon/ab8500.rst + delete mode 100644 Documentation/hwmon/abx500.rst + create mode 100644 Documentation/hwmon/aht10.rst + create mode 100644 Documentation/hwmon/tps23861.rst + create mode 100644 Documentation/livepatch/reliable-stacktrace.rst + create mode 100644 Documentation/scheduler/schedutil.txt + create mode 100644 Documentation/sound/designs/jack-injection.rst + create mode 100644 Documentation/translations/zh_CN/iio/ep93xx_adc.rst + create mode 100644 Documentation/translations/zh_CN/iio/iio_configfs.rst + create mode 100644 Documentation/translations/zh_CN/iio/index.rst + create mode 100644 Documentation/translations/zh_CN/mips/booting.rst + create mode 100644 Documentation/translations/zh_CN/mips/features.rst + create mode 100644 Documentation/translations/zh_CN/mips/index.rst + create mode 100644 Documentation/translations/zh_CN/mips/ingenic-tcu.rst + create mode 100644 Documentation/userspace-api/media/drivers/ccs.rst + create mode 100644 arch/arm/crypto/blake2b-neon-core.S + create mode 100644 arch/arm/crypto/blake2b-neon-glue.c + create mode 100644 arch/arm/crypto/blake2s-core.S + create mode 100644 arch/arm/crypto/blake2s-glue.c + create mode 100644 arch/arm/include/asm/archrandom.h + create mode 100644 arch/arm64/include/asm/setup.h + create mode 100644 arch/arm64/include/asm/trans_pgd.h + create mode 100644 arch/arm64/kernel/idreg-override.c + rename arch/arm64/kernel/{vdso/vdso.S => vdso-wrap.S} (100%) + rename arch/arm64/kernel/{vdso32/vdso.S => vdso32-wrap.S} (100%) + create mode 100644 arch/arm64/kvm/hyp/nvhe/gen-hyprel.c + create mode 100644 arch/arm64/kvm/trng.c + create mode 100644 arch/arm64/mm/trans_pgd.c + create mode 100644 arch/mips/boot/dts/realtek/Makefile + create mode 100644 arch/mips/boot/dts/realtek/cisco_sg220-26.dts + create mode 100644 arch/mips/boot/dts/realtek/rtl838x.dtsi + create mode 100644 arch/mips/boot/dts/realtek/rtl83xx.dtsi + delete mode 100644 arch/mips/include/asm/dma-coherence.h + create mode 100644 arch/mips/include/asm/mach-n64/irq.h + create mode 100644 arch/mips/include/asm/mach-n64/kmalloc.h + delete mode 100644 arch/mips/include/asm/mach-pistachio/irq.h + create mode 100644 arch/mips/include/uapi/asm/perf_regs.h + delete mode 100644 arch/mips/kernel/irq-rm7000.c + create mode 100644 arch/mips/kernel/perf_regs.c + create mode 100644 arch/mips/n64/Makefile + create mode 100644 arch/mips/n64/Platform + create mode 100644 arch/mips/n64/init.c + create mode 100644 arch/mips/n64/irq.c + create mode 100644 arch/s390/include/asm/entry-common.h + rename arch/s390/kernel/{sys_s390.c => syscall.c} (61%) + create mode 100644 arch/um/drivers/rtc.h + create mode 100644 arch/um/drivers/rtc_kern.c + create mode 100644 arch/um/drivers/rtc_user.c + rename arch/x86/{include/asm => }/crypto/camellia.h (69%) + create mode 100644 arch/x86/crypto/ecb_cbc_helpers.h + delete mode 100644 arch/x86/crypto/glue_helper.c + create mode 100644 arch/x86/crypto/serpent-avx.h + rename arch/x86/{include/asm => }/crypto/serpent-sse2.h (100%) + rename arch/x86/{include/asm => }/crypto/twofish.h (80%) + create mode 100644 arch/x86/hyperv/hv_proc.c + create mode 100644 arch/x86/hyperv/irqdomain.c + delete mode 100644 arch/x86/include/asm/crypto/glue_helper.h + delete mode 100644 arch/x86/include/asm/crypto/serpent-avx.h + create mode 100644 arch/x86/include/asm/kvm-x86-ops.h + create mode 100644 arch/x86/kvm/svm/svm_ops.h + create mode 100644 arch/x86/kvm/xen.c + create mode 100644 arch/x86/kvm/xen.h + delete mode 100644 crypto/rmd128.c + delete mode 100644 crypto/rmd256.c + delete mode 100644 crypto/rmd320.c + delete mode 100644 crypto/salsa20_generic.c + delete mode 100644 crypto/tgr192.c + create mode 100644 drivers/char/tpm/tpm_tis_i2c_cr50.c + delete mode 100644 drivers/clk/clk-efm32gg.c + delete mode 100644 drivers/clk/clk-tango4.c + delete mode 100644 drivers/clk/clk-u300.c + create mode 100644 drivers/clk/mstar/Kconfig + create mode 100644 drivers/clk/mstar/Makefile + create mode 100644 drivers/clk/mstar/clk-msc313-mpll.c + create mode 100644 drivers/clk/qcom/a7-pll.c + create mode 100644 drivers/clk/qcom/apcs-sdx55.c + create mode 100644 drivers/clk/qcom/gcc-sc7280.c + create mode 100644 drivers/clk/qcom/gcc-sc8180x.c + create mode 100644 drivers/clk/qcom/gcc-sm8350.c + create mode 100644 drivers/clk/qcom/gpucc-sdm660.c + create mode 100644 drivers/clk/qcom/mmcc-sdm660.c + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.c + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.h + delete mode 100644 drivers/clk/sirf/Makefile + delete mode 100644 drivers/clk/sirf/atlas6.h + delete mode 100644 drivers/clk/sirf/clk-atlas6.c + delete mode 100644 drivers/clk/sirf/clk-atlas7.c + delete mode 100644 drivers/clk/sirf/clk-common.c + delete mode 100644 drivers/clk/sirf/clk-prima2.c + delete mode 100644 drivers/clk/sirf/prima2.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h616.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h616.h + create mode 100644 drivers/clk/xilinx/Kconfig + create mode 100644 drivers/clk/xilinx/Makefile + create mode 100644 drivers/clk/xilinx/xlnx_vcu.c + delete mode 100644 drivers/clk/zte/Makefile + delete mode 100644 drivers/clk/zte/clk-zx296702.c + delete mode 100644 drivers/clk/zte/clk-zx296718.c + delete mode 100644 drivers/clk/zte/clk.c + delete mode 100644 drivers/clk/zte/clk.h + delete mode 100644 drivers/clocksource/timer-atlas7.c + delete mode 100644 drivers/clocksource/timer-efm32.c + delete mode 100644 drivers/clocksource/timer-prima2.c + delete mode 100644 drivers/clocksource/timer-tango-xtal.c + delete mode 100644 drivers/clocksource/timer-u300.c + create mode 100644 drivers/crypto/keembay/keembay-ocs-hcu-core.c + create mode 100644 drivers/crypto/keembay/ocs-hcu.c + create mode 100644 drivers/crypto/keembay/ocs-hcu.h + create mode 100644 drivers/crypto/marvell/octeontx2/Makefile + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_common.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c + delete mode 100644 drivers/crypto/mediatek/Makefile + delete mode 100644 drivers/crypto/mediatek/mtk-aes.c + delete mode 100644 drivers/crypto/mediatek/mtk-platform.c + delete mode 100644 drivers/crypto/mediatek/mtk-platform.h + delete mode 100644 drivers/crypto/mediatek/mtk-regs.h + delete mode 100644 drivers/crypto/mediatek/mtk-sha.c + delete mode 100644 drivers/crypto/picoxcell_crypto.c + delete mode 100644 drivers/crypto/picoxcell_crypto_regs.h + delete mode 100644 drivers/gpio/gpio-intel-mid.c + delete mode 100644 drivers/gpio/gpio-msic.c + create mode 100644 drivers/gpio/gpio-visconti.c + delete mode 100644 drivers/gpio/gpio-zx.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_6_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_6_sh_mask.h + delete mode 100644 drivers/gpu/drm/gma500/mdfld_device.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_dpi.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_dpi.h + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_output.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_output.h + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h + delete mode 100644 drivers/gpu/drm/gma500/mdfld_intel_display.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_output.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_output.h + delete mode 100644 drivers/gpu/drm/gma500/mdfld_tmd_vid.c + delete mode 100644 drivers/gpu/drm/gma500/mdfld_tpo_vid.c + delete mode 100644 drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c + delete mode 100644 drivers/gpu/drm/gma500/tc35876x-dsi-lvds.h + delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.h + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pps.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pps.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vrr.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vrr.h + create mode 100644 drivers/gpu/drm/i915/dma_resv_utils.c + create mode 100644 drivers/gpu/drm/i915/dma_resv_utils.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.c + create mode 100644 drivers/gpu/drm/i915/gt/gen8_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen8_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_stats.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_execlists_submission.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_execlists_submission.h + rename drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.c (96%) + rename drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.h (80%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_execlists.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ccorr.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_drv.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_gamma.c + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/layout.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/privring.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/privring/Kbuild + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gf100.c (71%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gf117.c (79%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gk104.c (71%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gk20a.c (73%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gm200.c (83%) + rename drivers/gpu/drm/nouveau/nvkm/subdev/{ibus => privring}/gp10b.c (78%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/privring/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/Kconfig + delete mode 100644 drivers/gpu/drm/omapdrm/displays/Makefile + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/Kconfig + delete mode 100644 drivers/gpu/drm/omapdrm/dss/Makefile + delete mode 100644 drivers/gpu/drm/omapdrm/dss/display.c + create mode 100644 drivers/gpu/drm/omapdrm/dss/dsi.h + delete mode 100644 drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c + delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.c + delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.h + create mode 100644 drivers/gpu/drm/panel/panel-dsi-cm.c + create mode 100644 drivers/gpu/drm/panel/panel-khadas-ts050.c + rename {include => drivers/gpu}/drm/ttm/ttm_module.h (100%) + rename drivers/gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} (82%) + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_marker.c + delete mode 100644 drivers/hwmon/ab8500.c + delete mode 100644 drivers/hwmon/abx500.c + delete mode 100644 drivers/hwmon/abx500.h + create mode 100644 drivers/hwmon/aht10.c + create mode 100644 drivers/hwmon/tps23861.c + delete mode 100644 drivers/i2c/busses/i2c-efm32.c + delete mode 100644 drivers/i2c/busses/i2c-sirf.c + delete mode 100644 drivers/i2c/busses/i2c-stu300.c + delete mode 100644 drivers/i2c/busses/i2c-zx2967.c + create mode 100644 drivers/i3c/master/svc-i3c-master.c + create mode 100644 drivers/infiniband/core/umem_dmabuf.c + create mode 100644 drivers/iommu/amd/io_pgtable.c + create mode 100644 drivers/iommu/intel/cap_audit.c + create mode 100644 drivers/iommu/intel/cap_audit.h + create mode 100644 drivers/irqchip/irq-realtek-rtl.c + delete mode 100644 drivers/irqchip/irq-sirfsoc.c + create mode 100644 drivers/irqchip/irq-sun6i-r.c + delete mode 100644 drivers/irqchip/irq-tango.c + create mode 100644 drivers/media/dvb-frontends/mxl692.c + create mode 100644 drivers/media/dvb-frontends/mxl692.h + create mode 100644 drivers/media/dvb-frontends/mxl692_defs.h + create mode 100644 drivers/media/i2c/imx334.c + create mode 100644 drivers/media/i2c/ov5648.c + create mode 100644 drivers/media/i2c/ov8865.c + create mode 100644 drivers/media/i2c/rdacm21.c + create mode 100644 drivers/media/pci/intel/ipu3/cio2-bridge.c + create mode 100644 drivers/media/pci/intel/ipu3/cio2-bridge.h + rename drivers/media/pci/intel/ipu3/{ipu3-cio2.c => ipu3-cio2-main.c} (98%) + create mode 100644 drivers/media/platform/allegro-dvt/Makefile + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-core.c (76%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.c (96%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.h (98%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.c (73%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.h (100%) + create mode 100644 drivers/media/platform/allegro-dvt/nal-hevc.c + create mode 100644 drivers/media/platform/allegro-dvt/nal-hevc.h + create mode 100644 drivers/media/platform/allegro-dvt/nal-rbsp.c + create mode 100644 drivers/media/platform/allegro-dvt/nal-rbsp.h + create mode 100644 drivers/media/platform/qcom/venus/hfi_plat_bufs.h + create mode 100644 drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform.h + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform_v4.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform_v6.c + delete mode 100644 drivers/media/v4l2-core/v4l2-clk.c + create mode 100644 drivers/mfd/acer-ec-a500.c + create mode 100644 drivers/mmc/core/crypto.c + create mode 100644 drivers/mmc/core/crypto.h + delete mode 100644 drivers/mmc/host/android-goldfish.c + rename drivers/mmc/host/{cqhci.c => cqhci-core.c} (94%) + create mode 100644 drivers/mmc/host/cqhci-crypto.c + create mode 100644 drivers/mmc/host/cqhci-crypto.h + delete mode 100644 drivers/mmc/host/dw_mmc-zx.c + delete mode 100644 drivers/mmc/host/dw_mmc-zx.h + create mode 100644 drivers/mmc/host/sdhci-of-aspeed-test.c + delete mode 100644 drivers/mmc/host/sdhci-sirf.c + delete mode 100644 drivers/mtd/nand/raw/tango_nand.c + create mode 100644 drivers/mtd/parsers/qcomsmempart.c + create mode 100644 drivers/platform/surface/aggregator/Kconfig + create mode 100644 drivers/platform/surface/aggregator/Makefile + create mode 100644 drivers/platform/surface/aggregator/bus.c + create mode 100644 drivers/platform/surface/aggregator/bus.h + create mode 100644 drivers/platform/surface/aggregator/controller.c + create mode 100644 drivers/platform/surface/aggregator/controller.h + create mode 100644 drivers/platform/surface/aggregator/core.c + create mode 100644 drivers/platform/surface/aggregator/ssh_msgb.h + create mode 100644 drivers/platform/surface/aggregator/ssh_packet_layer.c + create mode 100644 drivers/platform/surface/aggregator/ssh_packet_layer.h + create mode 100644 drivers/platform/surface/aggregator/ssh_parser.c + create mode 100644 drivers/platform/surface/aggregator/ssh_parser.h + create mode 100644 drivers/platform/surface/aggregator/ssh_request_layer.c + create mode 100644 drivers/platform/surface/aggregator/ssh_request_layer.h + create mode 100644 drivers/platform/surface/aggregator/trace.h + create mode 100644 drivers/platform/surface/surface_acpi_notify.c + create mode 100644 drivers/platform/surface/surface_aggregator_cdev.c + create mode 100644 drivers/platform/surface/surface_hotplug.c + create mode 100644 drivers/platform/x86/dell/Kconfig + create mode 100644 drivers/platform/x86/dell/Makefile + rename drivers/platform/x86/{ => dell}/alienware-wmi.c (100%) + rename drivers/platform/x86/{ => dell}/dcdbas.c (100%) + rename drivers/platform/x86/{ => dell}/dcdbas.h (100%) + rename drivers/platform/x86/{ => dell}/dell-laptop.c (100%) + rename drivers/platform/x86/{ => dell}/dell-rbtn.c (100%) + rename drivers/platform/x86/{ => dell}/dell-rbtn.h (100%) + rename drivers/platform/x86/{ => dell}/dell-smbios-base.c (100%) + rename drivers/platform/x86/{ => dell}/dell-smbios-smm.c (100%) + rename drivers/platform/x86/{ => dell}/dell-smbios-wmi.c (100%) + rename drivers/platform/x86/{ => dell}/dell-smbios.h (100%) + rename drivers/platform/x86/{ => dell}/dell-smo8800.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-aio.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-descriptor.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-descriptor.h (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-led.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/Makefile (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/biosattr-interface.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/dell-wmi-sysman.h (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/enum-attributes.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/int-attributes.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/passobj-attributes.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/passwordattr-interface.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/string-attributes.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi-sysman/sysman.c (100%) + rename drivers/platform/x86/{ => dell}/dell-wmi.c (100%) + rename drivers/platform/x86/{ => dell}/dell_rbu.c (100%) + delete mode 100644 drivers/platform/x86/intel_mid_powerbtn.c + delete mode 100644 drivers/platform/x86/intel_mid_thermal.c + rename arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c => drivers/platform/x86/intel_scu_wdt.c (69%) + create mode 100644 drivers/power/reset/atc260x-poweroff.c + delete mode 100644 drivers/power/reset/zx-reboot.c + create mode 100644 drivers/power/supply/acer_a500_battery.c + create mode 100644 drivers/power/supply/bq256xx_charger.c + create mode 100644 drivers/power/supply/ltc4162-l-charger.c + delete mode 100644 drivers/regulator/ab3100.c + create mode 100644 drivers/regulator/atc260x-regulator.c + create mode 100644 drivers/regulator/mt6315-regulator.c + create mode 100644 drivers/regulator/mtk-dvfsrc-regulator.c + create mode 100644 drivers/regulator/rt4831-regulator.c + delete mode 100644 drivers/rtc/rtc-ab3100.c + delete mode 100644 drivers/rtc/rtc-coh901331.c + delete mode 100644 drivers/rtc/rtc-mrst.c + delete mode 100644 drivers/rtc/rtc-sirfsoc.c + delete mode 100644 drivers/rtc/rtc-tx4939.c + delete mode 100644 drivers/scsi/gdth.c + delete mode 100644 drivers/scsi/gdth.h + delete mode 100644 drivers/scsi/gdth_ioctl.h + delete mode 100644 drivers/scsi/gdth_proc.c + delete mode 100644 drivers/scsi/gdth_proc.h + create mode 100644 drivers/scsi/ufs/ufs-debugfs.c + create mode 100644 drivers/scsi/ufs/ufs-debugfs.h + rename drivers/{gpu/drm/mediatek/mtk_drm_ddp.c => soc/mediatek/mtk-mutex.c} (53%) + delete mode 100644 drivers/soc/xilinx/xlnx_vcu.c + delete mode 100644 drivers/spi/spi-efm32.c + create mode 100644 drivers/spi/spi-realtek-rtl.c + delete mode 100644 drivers/spi/spi-sirf.c + create mode 100644 drivers/spi/spi-tegra210-quad.c + delete mode 100644 drivers/spi/spi-txx9.c + delete mode 100644 drivers/staging/media/allegro-dvt/Kconfig + delete mode 100644 drivers/staging/media/allegro-dvt/Makefile + delete mode 100644 drivers/staging/media/allegro-dvt/TODO + create mode 100644 drivers/thermal/qcom/qcom-spmi-adc-tm5.c + delete mode 100644 drivers/thermal/tango_thermal.c + delete mode 100644 drivers/thermal/zx2967_thermal.c + delete mode 100644 drivers/watchdog/atlas7_wdt.c + delete mode 100644 drivers/watchdog/coh901327_wdt.c + delete mode 100644 drivers/watchdog/intel_scu_watchdog.c + delete mode 100644 drivers/watchdog/intel_scu_watchdog.h + create mode 100644 drivers/watchdog/keembay_wdt.c + delete mode 100644 drivers/watchdog/sirfsoc_wdt.c + delete mode 100644 drivers/watchdog/tangox_wdt.c + delete mode 100644 drivers/watchdog/zx2967_wdt.c + create mode 100644 fs/zonefs/trace.h + delete mode 100644 include/asm-generic/mm-arch-hooks.h + create mode 100644 include/crypto/blake2b.h + create mode 100644 include/crypto/internal/blake2b.h + create mode 100644 include/crypto/internal/cipher.h + create mode 100644 include/dt-bindings/clock/mstar-msc313-mpll.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sc8180x.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8350.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sdm660.h + create mode 100644 include/dt-bindings/clock/qcom,mmcc-sdm660.h + create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h + create mode 100644 include/dt-bindings/clock/xlnx-vcu.h + delete mode 100644 include/dt-bindings/clock/zx296702-clock.h + create mode 100644 include/dt-bindings/memory/mt8192-larb-port.h + create mode 100644 include/dt-bindings/memory/mtk-memory-port.h + create mode 100644 include/dt-bindings/reset-controller/mt8192-resets.h + create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h + create mode 100644 include/linux/clk/imx.h + create mode 100644 include/linux/clk/spear.h + delete mode 100644 include/linux/mm-arch-hooks.h + delete mode 100644 include/linux/platform_data/clk-u300.h + delete mode 100644 include/linux/platform_data/efm32-spi.h + create mode 100644 include/linux/platform_data/mlxcpld.h + delete mode 100644 include/linux/platform_data/x86/mlxcpld.h + delete mode 100644 include/linux/power/max8903_charger.h + delete mode 100644 include/linux/regulator/ab8500.h + create mode 100644 include/linux/regulator/mt6315-regulator.h + delete mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h + create mode 100644 include/linux/soc/mediatek/mtk-mutex.h + delete mode 100644 include/linux/spi/lms283gf05.h + create mode 100644 include/linux/surface_acpi_notify.h + create mode 100644 include/linux/surface_aggregator/controller.h + create mode 100644 include/linux/surface_aggregator/device.h + create mode 100644 include/linux/surface_aggregator/serial_hub.h + delete mode 100644 include/media/v4l2-clk.h + create mode 100644 include/uapi/linux/ccs.h + create mode 100644 include/uapi/linux/spi/spi.h + create mode 100644 include/uapi/linux/surface_aggregator/cdev.h + create mode 100644 kernel/locking/irqflag-debug.c + delete mode 100644 kernel/locking/rwsem.h + delete mode 100644 scripts/dtc/fdtdump.c + create mode 100644 scripts/dtc/fdtoverlay.c + create mode 100644 security/selinux/ima.c + create mode 100644 security/selinux/include/ima.h + create mode 100644 sound/firewire/dice/dice-harman.c + create mode 100644 sound/mips/snd-n64.c + create mode 100644 sound/soc/codecs/jz4760.c + create mode 100644 sound/soc/codecs/lpass-rx-macro.c + create mode 100644 sound/soc/codecs/lpass-tx-macro.c + delete mode 100644 sound/soc/codecs/sirf-audio-codec.c + delete mode 100644 sound/soc/codecs/zx_aud96p22.c + create mode 100644 sound/soc/intel/boards/bytcr_wm5102.c + delete mode 100644 sound/soc/sirf/Kconfig + delete mode 100644 sound/soc/sirf/Makefile + delete mode 100644 sound/soc/sirf/sirf-audio-port.c + delete mode 100644 sound/soc/sirf/sirf-audio.c + delete mode 100644 sound/soc/sirf/sirf-usp.c + delete mode 100644 sound/soc/sirf/sirf-usp.h + create mode 100644 sound/soc/soc-topology-test.c + create mode 100644 sound/soc/tegra/tegra_audio_graph_card.c + delete mode 100644 sound/soc/txx9/Kconfig + delete mode 100644 sound/soc/txx9/Makefile + delete mode 100644 sound/soc/txx9/txx9aclc-ac97.c + delete mode 100644 sound/soc/txx9/txx9aclc-generic.c + delete mode 100644 sound/soc/txx9/txx9aclc.c + delete mode 100644 sound/soc/txx9/txx9aclc.h + delete mode 100644 sound/soc/zte/Kconfig + delete mode 100644 sound/soc/zte/Makefile + delete mode 100644 sound/soc/zte/zx-i2s.c + delete mode 100644 sound/soc/zte/zx-spdif.c + delete mode 100644 sound/soc/zte/zx-tdm.c + create mode 100644 tools/testing/selftests/gpio/gpio-mockup-cdev.c + delete mode 100644 tools/testing/selftests/gpio/gpio-mockup-chardev.c + create mode 100644 tools/testing/selftests/kvm/include/numaif.h + create mode 100644 tools/testing/selftests/kvm/memslot_modification_stress_test.c + create mode 100644 tools/testing/selftests/kvm/settings + create mode 100644 tools/testing/selftests/kvm/x86_64/get_cpuid_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_pmu_msrs_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c + create mode 100755 tools/testing/selftests/rcutorture/bin/config2csv.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/torture.sh + create mode 100644 virt/kvm/mmu_lock.h +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 (2596b6ae412b kexec: move machine_kexec_post_load() to public interface) +$ 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/machine_kexec_file.c | 4 +++- + arch/arm64/kernel/suspend.c | 2 +- + include/linux/kexec.h | 2 ++ + kernel/kexec_internal.h | 2 -- + 5 files changed, 9 insertions(+), 7 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 (92bf22614b21 Linux 5.11-rc7) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (356184fb6d67 sparc: make xchg() into a statement expression) +$ git merge sparc/master +Auto-merging drivers/tty/hvc/hvcs.c +Auto-merging arch/sparc/mm/srmmu.c +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/kernel/signal_64.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/sparc/kernel/entry.S +Auto-merging arch/sparc/configs/sparc64_defconfig +Auto-merging arch/sparc/Kconfig +CONFLICT (content): Merge conflict in arch/sparc/Kconfig +Resolved 'arch/sparc/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e770a63627f] Merge remote-tracking branch 'sparc/master' +$ git diff -M --stat --summary HEAD^.. + 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/viohs.c | 6 ++-- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/init_32.c | 3 ++ + arch/sparc/mm/srmmu.c | 20 ++++++------- + drivers/sbus/char/display7seg.c | 4 +-- + 19 files changed, 72 insertions(+), 72 deletions(-) +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 (3a2eb515d136 octeontx2-af: Fix an off by one in rvu_dbg_qsize_write()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging bpf/master (53f523f3052a bpf: Clear percpu pointers in bpf_prog_clone_free()) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/x86/net/bpf_jit_comp.c | 10 +++++++--- + kernel/bpf/core.c | 2 ++ + kernel/bpf/verifier.c | 2 +- + tools/testing/selftests/bpf/verifier/atomic_and.c | 23 +++++++++++++++++++++++ + 4 files changed, 33 insertions(+), 4 deletions(-) +Merging ipsec/master (3a2eb515d136 octeontx2-af: Fix an off by one in rvu_dbg_qsize_write()) +$ git merge ipsec/master +Already up to date. +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 (ceae5d20f386 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/rt1015.c | 2 ++ + sound/soc/samsung/tm2_wm5110.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +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 (e124039e9567 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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (ecce3daec27a 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-ti-qspi.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 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 (6ee1d745b7c9 Linux 5.11-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt | 10 +++++----- + drivers/phy/Kconfig | 1 + + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + 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 | 1 + + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/rockchip/phy-rockchip-emmc.c | 12 +++++++----- + 8 files changed, 26 insertions(+), 13 deletions(-) +Merging staging.current/staging-linus (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (6ee1d745b7c9 Linux 5.11-rc5) +$ 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 (6524d8eac258 Input: st1232 - add IDLE state as ready condition) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 1 + + drivers/input/touchscreen/st1232.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +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 +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 (32ada6b0980d dt-bindings: Cleanup standard unit properties) +$ git merge devicetree-fixes/dt/linus +Already up to date. +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 (6ee1d745b7c9 Linux 5.11-rc5) +$ 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 (4d12b7275386 SUNRPC: Further clean up svc_tcp_sendmsg()) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (8fd167361316 drm/ttm: Fix a memory leak) +$ 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/ttm/ttm_bo.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 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 (2f9dbf67b29a kbuild: remove deprecated 'always' and 'hostprogs-y/m') +$ 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 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 +Recorded preimage for 'arch/mips/kernel/syscalls/Makefile' +Resolved 'scripts/Makefile.lib' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/mips/kernel/syscalls/Makefile'. +[master bb87e0d8458f] 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 | 93 +++++++++++++----------- + 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 +++ + 64 files changed, 692 insertions(+), 491 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 | 120 +++++++++++++----- + drivers/iommu/dma-iommu.c | 132 ++++++++++---------- + drivers/media/usb/uvc/uvc_video.c | 79 ++++++++---- + drivers/media/usb/uvc/uvcvideo.h | 4 +- + include/linux/dma-map-ops.h | 23 +++- + include/linux/dma-mapping.h | 50 +++++++- + kernel/dma/map_benchmark.c | 12 +- + kernel/dma/mapping.c | 157 ++++++++++++++++++------ + tools/testing/selftests/dma/dma_map_benchmark.c | 21 +++- + 9 files changed, 436 insertions(+), 162 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 +Auto-merging sound/arm/aaci.c +Auto-merging drivers/rtc/rtc-pl031.c +Auto-merging drivers/mmc/host/mmci.c +Auto-merging drivers/gpu/drm/pl111/pl111_drv.c +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Resolved 'arch/arm/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ff06413c1b3c] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 8 +- + arch/arm/Kconfig.debug | 40 ++-- + arch/arm/boot/compressed/Makefile | 5 +- + arch/arm/boot/compressed/fdt_check_mem_start.c | 131 ++++++++++++ + arch/arm/boot/compressed/head.S | 45 +++- + arch/arm/common/locomo.c | 5 +- + arch/arm/common/sa1111.c | 6 +- + arch/arm/include/asm/assembler.h | 17 ++ + arch/arm/include/asm/hardware/locomo.h | 2 +- + arch/arm/include/asm/hardware/sa1111.h | 2 +- + arch/arm/include/debug/sti.S | 26 +-- + arch/arm/kernel/smp.c | 3 - + arch/arm/kernel/sys_oabi-compat.c | 15 ++ + arch/arm/mach-sa1100/collie.c | 6 - + arch/arm/mm/dump.c | 9 +- + arch/arm/mm/mmu.c | 1 - + arch/arm/vdso/Makefile | 1 - + drivers/amba/bus.c | 234 +++++++++++---------- + drivers/char/hw_random/nomadik-rng.c | 3 +- + drivers/dma/pl330.c | 3 +- + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 3 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 4 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 4 +- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-replicator.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 +- + drivers/i2c/busses/i2c-nomadik.c | 4 +- + drivers/input/keyboard/locomokbd.c | 4 +- + drivers/input/serio/ambakmi.c | 3 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/mailbox/arm_mhuv2.c | 4 +- + drivers/memory/pl172.c | 4 +- + drivers/memory/pl353-smc.c | 4 +- + drivers/mmc/host/mmci.c | 4 +- + drivers/pcmcia/sa1111_generic.c | 3 +- + drivers/rtc/rtc-pl030.c | 4 +- + drivers/rtc/rtc-pl031.c | 4 +- + drivers/spi/spi-pl022.c | 5 +- + drivers/tty/serial/amba-pl010.c | 4 +- + drivers/tty/serial/amba-pl011.c | 3 +- + drivers/usb/host/ohci-sa1111.c | 4 +- + drivers/vfio/platform/vfio_amba.c | 15 +- + drivers/video/backlight/locomolcd.c | 3 +- + drivers/video/fbdev/amba-clcd.c | 4 +- + drivers/watchdog/sp805_wdt.c | 4 +- + include/linux/amba/bus.h | 2 +- + sound/arm/aaci.c | 4 +- + 53 files changed, 416 insertions(+), 283 deletions(-) + create mode 100644 arch/arm/boot/compressed/fdt_check_mem_start.c +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 (70994f761efe 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 8d9d64c9d8d6] 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 +Auto-merging arch/microblaze/Kconfig +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 1 - + arch/microblaze/kernel/module.c | 26 -------------------------- + arch/microblaze/kernel/vmlinux.lds.S | 2 +- + 3 files changed, 1 insertion(+), 28 deletions(-) +Merging mips/mips-next (13d41b537df7 n64: store dev instance into disk private data) +$ git merge mips/mips-next +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +Merge made by the 'recursive' strategy. + drivers/block/Kconfig | 6 ++ + drivers/block/Makefile | 1 + + drivers/block/n64cart.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 185 insertions(+) + 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 +Merge made by the 'recursive' strategy. + arch/nios2/kernel/entry.S | 3 +++ + arch/nios2/kernel/setup.c | 21 ++++++++++++--------- + arch/nios2/kernel/sys_nios2.c | 11 +++++++++-- + 3 files changed, 24 insertions(+), 11 deletions(-) +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 +Auto-merging drivers/spi/spi-mpc52xx.c +CONFLICT (content): Merge conflict in drivers/spi/spi-mpc52xx.c +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/lib/sstep.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/booke.c +Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/powerpc/include/asm/book3s/64/kup.h +Auto-merging arch/powerpc/configs/44x/akebono_defconfig +Auto-merging arch/powerpc/Kconfig +Resolved 'drivers/spi/spi-mpc52xx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2cd5d05aa13e] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 35 +- + arch/powerpc/Kconfig.debug | 1 + + arch/powerpc/configs/44x/akebono_defconfig | 5 + + arch/powerpc/include/asm/asm-prototypes.h | 29 -- + arch/powerpc/include/asm/book3s/32/kup.h | 8 +- + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 +- + arch/powerpc/include/asm/book3s/64/kup.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 5 + + arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 23 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 2 +- + arch/powerpc/include/asm/bug.h | 9 +- + arch/powerpc/include/asm/cacheflush.h | 6 + + arch/powerpc/include/asm/cputime.h | 14 + + arch/powerpc/include/asm/debug.h | 4 - + arch/powerpc/include/asm/firmware.h | 2 +- + arch/powerpc/include/asm/hugetlb.h | 2 - + arch/powerpc/include/asm/hw_irq.h | 96 +++-- + arch/powerpc/include/asm/interrupt.h | 449 +++++++++++++++++++++ + arch/powerpc/include/asm/kexec.h | 1 + + arch/powerpc/include/asm/kup.h | 2 + + arch/powerpc/include/asm/kvm_book3s.h | 7 + + arch/powerpc/include/asm/kvm_ppc.h | 10 +- + arch/powerpc/include/asm/machdep.h | 3 + + arch/powerpc/include/asm/mce.h | 20 +- + arch/powerpc/include/asm/mmu_context.h | 3 - + arch/powerpc/include/asm/nmi.h | 1 + + arch/powerpc/include/asm/paca.h | 13 +- + arch/powerpc/include/asm/paravirt.h | 1 + + arch/powerpc/include/asm/perf_event.h | 2 + + arch/powerpc/include/asm/perf_event_server.h | 5 +- + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/include/asm/pkeys.h | 6 - + arch/powerpc/include/asm/ppc-pci.h | 7 - + arch/powerpc/include/asm/ppc_asm.h | 24 -- + arch/powerpc/include/asm/ptrace.h | 8 + + arch/powerpc/include/asm/reg.h | 22 +- + arch/powerpc/include/asm/reg_booke.h | 3 + + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/setup.h | 6 +- + arch/powerpc/include/asm/simple_spinlock.h | 4 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/include/asm/time.h | 2 + + arch/powerpc/include/asm/uaccess.h | 99 +---- + arch/powerpc/include/asm/vdso/timebase.h | 6 - + arch/powerpc/include/asm/xmon.h | 4 +- + arch/powerpc/include/uapi/asm/perf_regs.h | 28 +- + arch/powerpc/kernel/Makefile | 4 +- + arch/powerpc/kernel/asm-offsets.c | 3 +- + arch/powerpc/kernel/dbell.c | 9 +- + arch/powerpc/kernel/eeh.c | 121 ++++-- + arch/powerpc/kernel/entry_32.S | 347 ++-------------- + arch/powerpc/kernel/entry_64.S | 8 +- + arch/powerpc/kernel/exceptions-64e.S | 8 +- + arch/powerpc/kernel/exceptions-64s.S | 324 ++++----------- + arch/powerpc/kernel/head_32.h | 98 +---- + arch/powerpc/kernel/head_40x.S | 11 +- + arch/powerpc/kernel/head_44x.S | 4 +- + arch/powerpc/kernel/head_8xx.S | 13 +- + arch/powerpc/kernel/head_book3s_32.S | 32 +- + arch/powerpc/kernel/head_booke.h | 57 +-- + arch/powerpc/kernel/head_fsl_booke.S | 6 +- + arch/powerpc/kernel/idle_book3s.S | 138 ++++--- + arch/powerpc/kernel/{syscall_64.c => interrupt.c} | 203 +++++++--- + arch/powerpc/kernel/iommu.c | 46 +++ + arch/powerpc/kernel/irq.c | 34 +- + arch/powerpc/kernel/mce.c | 96 ++--- + arch/powerpc/kernel/optprobes.c | 21 +- + arch/powerpc/kernel/pci-common.c | 10 + + arch/powerpc/kernel/pci_dn.c | 62 --- + arch/powerpc/kernel/process.c | 13 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/prom_init.c | 12 +- + arch/powerpc/kernel/ptrace/ptrace.c | 4 - + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/setup.h | 12 +- + arch/powerpc/kernel/setup_64.c | 7 +- + arch/powerpc/kernel/signal.c | 4 - + arch/powerpc/kernel/signal_32.c | 3 +- + arch/powerpc/kernel/smp.c | 3 +- + arch/powerpc/kernel/sys_ppc32.c | 49 ++- + arch/powerpc/kernel/syscalls/syscall.tbl | 20 +- + arch/powerpc/kernel/tau_6xx.c | 6 +- + arch/powerpc/kernel/time.c | 9 +- + arch/powerpc/kernel/traps.c | 274 +++++++------ + arch/powerpc/kernel/watchdog.c | 16 +- + arch/powerpc/kexec/elf_64.c | 2 +- + arch/powerpc/kexec/file_load_64.c | 35 ++ + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 1 + + arch/powerpc/kvm/book3s_emulate.c | 4 - + arch/powerpc/kvm/book3s_hv.c | 7 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 1 + + arch/powerpc/kvm/book3s_xive.c | 4 +- + arch/powerpc/kvm/booke.c | 1 + + arch/powerpc/kvm/powerpc.c | 8 +- + arch/powerpc/lib/pmem.c | 1 + + arch/powerpc/lib/sstep.c | 101 ++++- + arch/powerpc/mm/book3s32/Makefile | 4 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 4 - + arch/powerpc/mm/book3s64/hash_utils.c | 101 +++-- + arch/powerpc/mm/book3s64/internal.h | 2 + + arch/powerpc/mm/book3s64/iommu_api.c | 10 +- + arch/powerpc/mm/book3s64/pgtable.c | 13 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 299 +++++++++----- + arch/powerpc/mm/book3s64/slb.c | 40 +- + arch/powerpc/mm/fault.c | 75 ++-- + arch/powerpc/mm/hugetlbpage.c | 20 +- + arch/powerpc/mm/mem.c | 54 ++- + arch/powerpc/mm/pgtable.c | 15 +- + arch/powerpc/mm/ptdump/segment_regs.c | 2 +- + arch/powerpc/perf/core-book3s.c | 96 +++-- + arch/powerpc/perf/core-fsl-emb.c | 25 -- + arch/powerpc/perf/hv-24x7.c | 15 + + arch/powerpc/perf/isa207-common.c | 67 ++- + arch/powerpc/perf/isa207-common.h | 15 +- + arch/powerpc/perf/mpc7450-pmu.c | 5 +- + arch/powerpc/perf/perf_regs.c | 13 +- + arch/powerpc/perf/power10-pmu.c | 4 +- + arch/powerpc/perf/power5+-pmu.c | 5 +- + arch/powerpc/perf/power5-pmu.c | 5 +- + arch/powerpc/perf/power6-pmu.c | 5 +- + arch/powerpc/perf/power7-pmu.c | 5 +- + arch/powerpc/perf/ppc970-pmu.c | 5 +- + arch/powerpc/platforms/44x/Kconfig | 7 - + arch/powerpc/platforms/512x/mpc5121_ads.c | 13 +- + arch/powerpc/platforms/52xx/efika.c | 3 +- + arch/powerpc/platforms/52xx/lite5200.c | 3 +- + arch/powerpc/platforms/52xx/media5200.c | 3 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 3 +- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 8 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 2 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 13 +- + arch/powerpc/platforms/82xx/pq2fads.c | 3 +- + arch/powerpc/platforms/83xx/asp834x.c | 1 + + arch/powerpc/platforms/83xx/km83xx.c | 1 + + arch/powerpc/platforms/83xx/misc.c | 2 - + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 + + arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 + + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc83xx.h | 2 +- + arch/powerpc/platforms/8xx/machine_check.c | 2 +- + arch/powerpc/platforms/amigaone/setup.c | 10 +- + arch/powerpc/platforms/cell/pervasive.c | 1 + + arch/powerpc/platforms/cell/pervasive.h | 3 - + arch/powerpc/platforms/cell/ras.c | 6 +- + arch/powerpc/platforms/cell/ras.h | 9 +- + arch/powerpc/platforms/chrp/pci.c | 8 + + arch/powerpc/platforms/chrp/setup.c | 12 +- + arch/powerpc/platforms/embedded6xx/holly.c | 10 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 10 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 14 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 13 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 8 +- + arch/powerpc/platforms/maple/pci.c | 3 + + arch/powerpc/platforms/maple/setup.c | 4 +- + arch/powerpc/platforms/pasemi/setup.c | 3 +- + arch/powerpc/platforms/powermac/pci.c | 4 + + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/powernv/idle.c | 1 + + arch/powerpc/platforms/powernv/memtrace.c | 29 ++ + arch/powerpc/platforms/powernv/opal.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 4 + + arch/powerpc/platforms/powernv/pci-ioda.c | 27 +- + arch/powerpc/platforms/powernv/pci.h | 1 - + arch/powerpc/platforms/powernv/setup.c | 4 +- + arch/powerpc/platforms/powernv/subcore.h | 2 +- + arch/powerpc/platforms/powernv/vas.c | 11 +- + arch/powerpc/platforms/powernv/vas.h | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 12 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 5 +- + arch/powerpc/platforms/pseries/pci.c | 15 +- + arch/powerpc/platforms/pseries/pseries.h | 2 +- + arch/powerpc/platforms/pseries/ras.c | 36 +- + arch/powerpc/platforms/pseries/setup.c | 15 +- + arch/powerpc/xmon/xmon.c | 6 +- + drivers/misc/cxl/cxllib.c | 4 +- + drivers/misc/ocxl/file.c | 3 +- + drivers/spi/spi-mpc52xx.c | 12 +- + tools/testing/selftests/powerpc/eeh/eeh-basic.sh | 41 +- + .../testing/selftests/powerpc/eeh/eeh-functions.sh | 168 +++++++- + .../testing/selftests/powerpc/eeh/eeh-vf-aware.sh | 45 +++ + .../selftests/powerpc/eeh/eeh-vf-unaware.sh | 35 ++ + 193 files changed, 2718 insertions(+), 2133 deletions(-) + create mode 100644 arch/powerpc/include/asm/interrupt.h + rename arch/powerpc/kernel/{syscall_64.c => interrupt.c} (69%) + mode change 100755 => 100644 tools/testing/selftests/powerpc/eeh/eeh-functions.sh + create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-aware.sh + create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-unaware.sh +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 (f49815047c1a riscv: Disable KSAN_SANITIZE for vDSO) +$ 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/clk/Makefile +Auto-merging drivers/clk/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 1f076cc7cf9f] 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/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 | 87 +- + arch/riscv/mm/kasan_init.c | 57 +- + 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 + + 120 files changed, 7492 insertions(+), 991 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 (b47f625e102b Merge branch 'features' into for-next) +$ git merge s390/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Auto-merging tools/testing/selftests/Makefile +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_queue_keys.c +Auto-merging security/integrity/ima/ima_policy.c +CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_asymmetric_keys.c +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging security/integrity/ima/ima_api.c +CONFLICT (content): Merge conflict in security/integrity/ima/ima_api.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/evm/evm_crypto.c +Auto-merging security/commoncap.c +Auto-merging net/socket.c +Auto-merging mm/shmem.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging kernel/sys.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/auditsc.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/ima.h +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_inode.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/ubifs/xattr.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/inode.c +CONFLICT (content): Merge conflict in fs/overlayfs/inode.c +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/dir.c +Auto-merging fs/overlayfs/copy_up.c +CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c +Auto-merging fs/open.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfs3acl.c +Auto-merging fs/nfsd/nfs2acl.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/libfs.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hfsplus/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fcntl.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/acl.c +CONFLICT (content): Merge conflict in fs/f2fs/acl.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exec.c +Auto-merging fs/ecryptfs/inode.c +CONFLICT (content): Merge conflict in fs/ecryptfs/inode.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/affs/namei.c +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging Documentation/filesystems/porting.rst +Resolved 'fs/ecryptfs/inode.c' using previous resolution. +Resolved 'fs/f2fs/acl.c' using previous resolution. +Resolved 'fs/f2fs/file.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/overlayfs/copy_up.c' using previous resolution. +Resolved 'fs/overlayfs/inode.c' using previous resolution. +Resolved 'fs/xfs/xfs_inode.c' using previous resolution. +Resolved 'fs/xfs/xfs_ioctl.c' using previous resolution. +Resolved 'security/integrity/ima/ima_api.c' using previous resolution. +Resolved 'security/integrity/ima/ima_main.c' using previous resolution. +Resolved 'security/integrity/ima/ima_policy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d9497045363] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/locking.rst | 7 +- + Documentation/filesystems/porting.rst | 2 + + Documentation/filesystems/vfs.rst | 19 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 5 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/android/binderfs.c | 6 +- + drivers/base/devtmpfs.c | 15 +- + 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 | 9 +- + 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 | 39 +- + 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/file.c | 4 +- + fs/gfs2/inode.c | 64 +- + fs/gfs2/inode.h | 3 +- + fs/gfs2/xattr.c | 1 + + 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 | 512 +++++-- + 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/linux/capability.h | 14 +- + include/linux/fs.h | 186 ++- + include/linux/ima.h | 18 +- + include/linux/lsm_hook_defs.h | 15 +- + include/linux/lsm_hooks.h | 1 + + include/linux/mount.h | 7 + + include/linux/nfs_fs.h | 7 +- + include/linux/posix_acl.h | 21 +- + include/linux/posix_acl_xattr.h | 12 +- + include/linux/security.h | 54 +- + include/linux/syscalls.h | 4 + + include/linux/xattr.h | 30 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/mount.h | 16 + + ipc/mqueue.c | 9 +- + kernel/auditsc.c | 5 +- + kernel/bpf/inode.c | 13 +- + kernel/capability.c | 14 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/sys.c | 2 +- + mm/madvise.c | 5 +- + mm/memcontrol.c | 2 +- + mm/mincore.c | 5 +- + mm/shmem.c | 50 +- + net/socket.c | 6 +- + net/unix/af_unix.c | 5 +- + 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_policy.c | 20 +- + security/integrity/ima/ima_queue_keys.c | 4 +- + security/security.c | 25 +- + security/selinux/hooks.c | 23 +- + security/smack/smack_lsm.c | 22 +- + tools/include/uapi/asm-generic/unistd.h | 4 +- + tools/testing/selftests/Makefile | 1 + + 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 ++++++++++++++++++++ + 343 files changed, 4905 insertions(+), 1762 deletions(-) + 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 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 bbf120ce7c89] 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 c456d2dfb419] 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 (094f4884b3e6 cifs: cleanup a few le16 vs. le32 uses in cifsacl.c) +$ git merge cifs/for-next +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 | 1 + + fs/cifs/cifsglob.h | 11 +- + fs/cifs/connect.c | 21 +- + fs/cifs/file.c | 2 +- + fs/cifs/fs_context.c | 2 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2ops.c | 103 +++++-- + fs/cifs/smb2pdu.c | 22 +- + fs/cifs/trace.h | 36 ++- + fs/cifs/transport.c | 63 ++-- + 20 files changed, 614 insertions(+), 238 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 (f728760aa923 exfat: improve performance of exfat_free_cluster when using dirsync mount option) +$ 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 (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 (4208c398aae4 fs/jfs: fix potential integer overflow on shift of a int) +$ 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 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 (428a23d2bf0c nfsd: skip some unnecessary stats in the v4 case) +$ git merge cel/for-next +Already up to date. +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 (44903da5c0ff Merge branch 'work.namei' 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/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_elf.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 93c30e481751] 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/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/infiniband/hw/qib/qib_fs.c | 68 +---- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/coredump.c | 72 +++-- + 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 - + lib/extable.c | 5 - + 33 files changed, 285 insertions(+), 788 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 (4cb431e82c25 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Auto-merging include/linux/acpi.h +Removing drivers/pci/pcie/bw_notification.c +Auto-merging drivers/pci/pci.c +CONFLICT (content): Merge conflict in 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 +Recorded preimage for 'drivers/pci/pci.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pci/pci.c'. +[master 46a54acf3444] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + .../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 | 95 +- + 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, 5587 insertions(+), 828 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 (19d8e9149c27 pstore: Fix typo in compression option name) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (914fe0466c86 Merge branch 'for-5.12/playstation-v2' into for-next) +$ git merge hid/for-next +Removing include/linux/platform_data/i2c-hid.h +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a0617e7a9195] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/goodix,gt7375p.yaml | 65 + + 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 +- + MAINTAINERS | 6 + + arch/arm64/configs/defconfig | 3 +- + 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 +- + include/linux/hid-sensor-hub.h | 9 +- + include/linux/hid.h | 15 +- + include/linux/platform_data/i2c-hid.h | 41 - + 44 files changed, 2606 insertions(+), 419 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml + 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 + delete mode 100644 include/linux/platform_data/i2c-hid.h +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 +Recorded preimage for 'Documentation/conf.py' +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 +Recorded resolution for 'Documentation/conf.py'. +[master 54fa3d59a353] 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 (4475f0291af9 Merge branch 'acpica-fixes' into linux-next) +$ git merge pm/linux-next +Removing include/linux/sfi_acpi.h +Removing include/linux/sfi.h +Removing include/linux/mfd/intel_msic.h +Removing drivers/sfi/sfi_core.h +Removing drivers/sfi/sfi_core.c +Removing drivers/sfi/sfi_acpi.c +Removing drivers/sfi/Makefile +Removing drivers/sfi/Kconfig +Removing drivers/mfd/intel_msic.c +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Removing drivers/cpufreq/sfi-cpufreq.c +Removing arch/x86/platform/sfi/sfi.c +Removing arch/x86/platform/sfi/Makefile +Removing arch/x86/platform/intel-mid/sfi.c +Removing arch/x86/platform/intel-mid/intel_mid_vrtc.c +Removing arch/x86/platform/intel-mid/device_libs/platform_tca6416.c +Removing arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c +Removing arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c +Removing arch/x86/platform/intel-mid/device_libs/platform_msic.h +Removing arch/x86/platform/intel-mid/device_libs/platform_msic.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mrfld_sd.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mrfld_pinctrl.c +Removing arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c +Removing arch/x86/platform/intel-mid/device_libs/platform_max7315.c +Removing arch/x86/platform/intel-mid/device_libs/platform_lis331.c +Removing arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +Removing arch/x86/platform/intel-mid/device_libs/platform_emc1403.c +CONFLICT (modify/delete): arch/x86/platform/intel-mid/device_libs/platform_bt.c deleted in pm/linux-next and modified in HEAD. Version HEAD of arch/x86/platform/intel-mid/device_libs/platform_bt.c left in tree. +Removing arch/x86/platform/intel-mid/device_libs/platform_bma023.c +Removing arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c +Removing arch/x86/platform/intel-mid/device_libs/Makefile +Auto-merging arch/x86/platform/Makefile +Removing arch/x86/kernel/apb_timer.c +Removing arch/x86/include/asm/intel_scu_ipc_legacy.h +Removing arch/x86/include/asm/intel_mid_vrtc.h +Removing arch/x86/include/asm/apb_timer.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/ABI/testing/sysfs-firmware-sfi +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/platform/intel-mid/device_libs/platform_bt.c +rm 'arch/x86/platform/intel-mid/device_libs/platform_bt.c' +$ git commit --no-edit -v -a +[master db3cd5ffbff8] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-firmware-acpi | 43 ++ + Documentation/ABI/testing/sysfs-firmware-sfi | 15 - + Documentation/ABI/testing/sysfs-platform-kim | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 6 - + MAINTAINERS | 9 - + arch/x86/Kconfig | 19 +- + 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/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/Makefile | 2 - + arch/x86/platform/sfi/sfi.c | 100 ---- + drivers/Makefile | 2 +- + drivers/acpi/Kconfig | 8 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_fpdt.c | 264 ++++++++++ + 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/cpufreq/Kconfig.x86 | 10 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/acpi-cpufreq.c | 62 +-- + drivers/cpufreq/freq_table.c | 8 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 40 +- + drivers/cpufreq/sfi-cpufreq.c | 127 ----- + drivers/mfd/Kconfig | 9 - + drivers/mfd/Makefile | 1 - + drivers/mfd/intel_msic.c | 425 ---------------- + drivers/opp/core.c | 8 +- + drivers/opp/opp.h | 2 + + drivers/platform/x86/intel_scu_pcidrv.c | 22 +- + 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 --- + .../media/atomisp/include/linux/atomisp_platform.h | 1 - + include/linux/mfd/intel_msic.h | 453 ----------------- + include/linux/sfi.h | 210 -------- + include/linux/sfi_acpi.h | 93 ---- + init/main.c | 2 - + 81 files changed, 472 insertions(+), 5122 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-firmware-sfi + 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/Makefile + delete mode 100644 arch/x86/platform/sfi/sfi.c + create mode 100644 drivers/acpi/acpi_fpdt.c + delete mode 100644 drivers/cpufreq/sfi-cpufreq.c + delete mode 100644 drivers/mfd/intel_msic.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 include/linux/mfd/intel_msic.h + delete mode 100644 include/linux/sfi.h + delete mode 100644 include/linux/sfi_acpi.h +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 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 (55c0bd77479b Bluetooth: hci_qca: Fixed issue during suspend) +$ 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 (5f9b07b2a242 Merge branch 'rgrp-glock-sharing' into for-next) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/xattr.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 10 +- + fs/gfs2/file.c | 8 +- + fs/gfs2/glock.c | 22 +- + fs/gfs2/glock.h | 6 + + fs/gfs2/glops.c | 38 +-- + fs/gfs2/incore.h | 54 ++-- + fs/gfs2/inode.c | 6 +- + fs/gfs2/lock_dlm.c | 8 +- + fs/gfs2/log.c | 546 +++++++++++++++++++++++---------------- + 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 | 54 +++- + include/uapi/linux/gfs2_ondisk.h | 5 +- + 26 files changed, 984 insertions(+), 666 deletions(-) +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 (f730f39eb981 Merge tag 'drm-intel-next-fixes-2021-02-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (bfa5782b9caa fbdev: atyfb: add stubs for aty_{ld,st}_lcd()) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/connector/dp-connector.yaml | 1 - + drivers/video/fbdev/aty/atyfb_base.c | 9 +++++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging amdgpu/drm-next (8d322a7046b8 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 | 25 +- + 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 | 36 ++- + 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/cik.c | 77 +++++ + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + 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/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_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 +++ + 104 files changed, 2541 insertions(+), 1294 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 5f820ed62607 Merge remote-tracking branch 'drm-misc/for-linux-next' +Merging next-20210222 version of amdgpu +$ git merge -m next-20210222/amdgpu fbce8fc8f9e74c1145366524e2fb17f2b9bb3089 +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Kconfig | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 ++- + 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 | 36 ++- + 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 | 2 +- + 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/cik.c | 77 +++++++ + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/nv.c | 181 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/si.c | 111 ++++++++++ + drivers/gpu/drm/amd/amdgpu/soc15.c | 232 +++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/vi.c | 190 ++++++++++++++++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 245 +++++++++++++++------ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 8 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 45 ++-- + .../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 | 70 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 - + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + 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_stream.h | 14 +- + 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 | 36 +-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 - + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 64 ++---- + 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/hw_sequencer.h | 4 - + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 +- + 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/vangogh_ppt.c | 40 +--- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 20 +- + 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 +++ + 83 files changed, 1826 insertions(+), 1233 deletions(-) +Merging drm-intel/for-linux-next (81ce8f04aa96 drm/i915/gt: Correct surface base address for renderclear) +$ git merge drm-intel/for-linux-next +Already up to date. +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 (182b4a2d2513 drm/msm/dp: Add a missing semi-colon) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +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 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 (ceae5d20f386 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 +Auto-merging scripts/checkpatch.pl +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging init/Kconfig +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging arch/x86/tools/relocs.c +Auto-merging arch/sh/configs/sdk7780_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/arm/configs/bcm2835_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/mxs_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/configs/generic-64bit_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/platforms/powernv/pci-cxl.c | 22 -- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/tools/relocs.c | 4 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 10 - + drivers/gpu/drm/drm_fb_helper.c | 21 -- + drivers/gpu/drm/drm_kms_helper_common.c | 25 +- + include/asm-generic/vmlinux.lds.h | 42 --- + include/linux/export.h | 9 - + include/linux/kallsyms.h | 17 +- + include/linux/module.h | 48 +-- + init/Kconfig | 17 - + kernel/kallsyms.c | 8 +- + kernel/livepatch/core.c | 7 +- + kernel/module.c | 481 ++++++++++++++-------------- + kernel/module_signature.c | 2 +- + kernel/module_signing.c | 2 +- + kernel/trace/trace_kprobe.c | 4 +- + lib/bug.c | 3 - + scripts/checkpatch.pl | 6 +- + scripts/mod/modpost.c | 50 +-- + scripts/mod/modpost.h | 3 - + scripts/module.lds.S | 6 - + tools/include/linux/export.h | 3 - + 35 files changed, 287 insertions(+), 516 deletions(-) +Merging input/next (e64123949e6c Input: applespi - fix occasional crc errors under load.) +$ git merge input/next +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Auto-merging drivers/input/touchscreen/ads7846.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Merge made by the 'recursive' strategy. + drivers/input/joydev.c | 7 +- + drivers/input/joystick/Kconfig | 7 + + drivers/input/joystick/Makefile | 2 +- + drivers/input/joystick/n64joy.c | 345 ++++++++++++++++++++++++++ + drivers/input/keyboard/Kconfig | 6 +- + drivers/input/keyboard/applespi.c | 23 +- + drivers/input/keyboard/omap4-keypad.c | 302 +++++++++++++---------- + drivers/input/misc/da7280.c | 3 + + drivers/input/mouse/synaptics.c | 7 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 4 + + 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/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 +- + 23 files changed, 1005 insertions(+), 467 deletions(-) + create mode 100644 drivers/input/joystick/n64joy.c +Merging block/for-next (a52724b7fc22 Merge branch 'io_uring-worker.v3' into for-next) +$ git merge block/for-next +Auto-merging net/socket.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/riscv/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/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-mq-sched.c | 6 - + block/blk-mq-sched.h | 1 - + block/blk-pm.h | 38 - + block/blk-sysfs.c | 7 +- + block/kyber-iosched.c | 33 +- + block/mq-deadline.c | 4 +- + drivers/block/loop.c | 3 + + drivers/block/nbd.c | 32 +- + fs/io-wq.c | 447 ++++------ + fs/io-wq.h | 19 +- + fs/io_uring.c | 1696 +++++++++++++++----------------------- + fs/proc/self.c | 7 - + fs/proc/thread_self.c | 7 - + include/linux/blkdev.h | 1 - + include/linux/blktrace_api.h | 2 +- + include/linux/io_uring.h | 20 +- + 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 | 12 +- + net/ipv4/af_inet.c | 1 - + net/ipv6/af_inet6.c | 1 - + net/socket.c | 10 - + 51 files changed, 930 insertions(+), 1509 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1681e6ddf703 Merge remote-tracking branch 'input/next' +Merging next-20210222 version of block +$ git merge -m next-20210222/block 2709d6ab511e0401303c6706c2af8a45ef5b49f4 +Auto-merging net/socket.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/riscv/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/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 +- + fs/io-wq.c | 447 ++++------ + fs/io-wq.h | 19 +- + fs/io_uring.c | 1671 +++++++++++++++----------------------- + fs/proc/self.c | 7 - + fs/proc/thread_self.c | 7 - + include/linux/io_uring.h | 20 +- + include/linux/net.h | 3 - + include/linux/sched.h | 3 + + include/uapi/linux/io_uring.h | 1 + + kernel/ptrace.c | 2 +- + kernel/signal.c | 4 +- + net/ipv4/af_inet.c | 1 - + net/ipv6/af_inet6.c | 1 - + net/socket.c | 10 - + 36 files changed, 835 insertions(+), 1405 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 (e124039e9567 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. + Documentation/security/keys/core.rst | 4 +- + certs/Kconfig | 8 +++ + certs/Makefile | 20 ++++++-- + certs/blacklist.c | 59 +++++++++++++++++++-- + certs/blacklist.h | 12 +++++ + certs/common.c | 56 ++++++++++++++++++++ + certs/common.h | 9 ++++ + certs/revocation_certificates.S | 21 ++++++++ + certs/system_keyring.c | 60 +++++----------------- + 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 ++-- + include/crypto/public_key.h | 1 - + include/keys/encrypted-type.h | 2 +- + include/keys/system_keyring.h | 11 ++++ + include/linux/key.h | 5 +- + include/linux/verification.h | 2 + + kernel/watch_queue.c | 2 +- + samples/Kconfig | 2 +- + samples/watch_queue/watch_test.c | 2 +- + scripts/Makefile | 1 + + security/integrity/ima/ima_mok.c | 5 +- + .../integrity/platform_certs/keyring_handler.c | 11 ++++ + security/integrity/platform_certs/load_uefi.c | 20 +++++++- + 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 + + 32 files changed, 270 insertions(+), 99 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 (8c657a0590de KEYS: trusted: Reserve TPM for seal and unseal operations) +$ 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 (d1e6bc0ca01c mailbox: tegra-hsp: Set lockdep class dynamically) +$ git merge mailbox/mailbox-for-next +Auto-merging drivers/mailbox/arm_mhuv2.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/omap-mailbox.txt | 4 +++ + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 34 ++++++++++++++++++++++ + drivers/mailbox/arm_mhuv2.c | 22 +++++++------- + 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 ++++++++++ + 7 files changed, 77 insertions(+), 14 deletions(-) +Merging spi/for-next (ecce3daec27a 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/insn.h | 45 +++ + arch/x86/include/asm/irq.h | 2 - + arch/x86/include/asm/irq_stack.h | 279 +++++++++----- + arch/x86/include/asm/orc_types.h | 10 + + arch/x86/include/asm/processor.h | 9 +- + arch/x86/include/asm/softirq_stack.h | 11 + + arch/x86/include/asm/unwind_hints.h | 13 +- + arch/x86/kernel/acpi/Makefile | 1 - + arch/x86/kernel/acpi/wakeup_64.S | 4 + + arch/x86/kernel/apic/apic.c | 31 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 22 +- + arch/x86/kernel/ftrace_64.S | 8 +- + 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 +- + arch/x86/kernel/unwind_orc.c | 5 +- + arch/x86/lib/insn.c | 119 +++--- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/platform/pvh/head.S | 2 + + arch/x86/power/Makefile | 1 - + arch/x86/power/hibernate_asm_64.S | 103 +++--- + arch/x86/tools/Makefile | 8 +- + arch/x86/tools/insn_sanity.c | 4 - + arch/x86/xen/Makefile | 1 - + arch/x86/xen/xen-asm.S | 28 +- + arch/x86/xen/xen-head.S | 5 +- + include/asm-generic/Kbuild | 1 + + include/asm-generic/softirq_stack.h | 14 + + include/linux/interrupt.h | 9 - + include/linux/objtool.h | 13 +- + kernel/softirq.c | 2 + + kernel/time/hrtimer.c | 32 +- + tools/arch/x86/include/asm/insn.h | 45 +++ + tools/arch/x86/include/asm/orc_types.h | 10 + + tools/arch/x86/lib/insn.c | 119 +++--- + tools/include/linux/objtool.h | 13 +- + tools/objtool/.gitignore | 2 +- + tools/objtool/Documentation/stack-validation.txt | 16 +- + tools/objtool/Makefile | 5 +- + tools/objtool/arch/x86/decode.c | 54 ++- + .../objtool/arch/x86/include/{ => arch}/cfi_regs.h | 0 + .../arch/x86/include/{arch_elf.h => arch/elf.h} | 0 + tools/objtool/arch/x86/include/arch/endianness.h | 9 + + .../x86/include/{arch_special.h => arch/special.h} | 0 + tools/objtool/arch/x86/special.c | 6 +- + tools/objtool/builtin-check.c | 4 +- + tools/objtool/builtin-orc.c | 10 +- + tools/objtool/check.c | 402 +++++++++++++-------- + tools/objtool/elf.c | 40 +- + tools/objtool/{ => include/objtool}/arch.h | 8 +- + tools/objtool/{ => include/objtool}/builtin.h | 0 + tools/objtool/{ => include/objtool}/cfi.h | 2 +- + tools/objtool/{ => include/objtool}/check.h | 38 +- + tools/objtool/{ => include/objtool}/elf.h | 0 + tools/objtool/include/objtool/endianness.h | 38 ++ + tools/objtool/{ => include/objtool}/objtool.h | 5 +- + tools/objtool/{ => include/objtool}/special.h | 4 +- + tools/objtool/{ => include/objtool}/warn.h | 2 +- + tools/objtool/objtool.c | 6 +- + tools/objtool/orc_dump.c | 11 +- + tools/objtool/orc_gen.c | 315 +++++++++------- + tools/objtool/special.c | 14 +- + tools/objtool/weak.c | 9 +- + 86 files changed, 1285 insertions(+), 806 deletions(-) + create mode 100644 arch/x86/include/asm/softirq_stack.h + create mode 100644 include/asm-generic/softirq_stack.h + rename tools/objtool/arch/x86/include/{ => arch}/cfi_regs.h (100%) + rename tools/objtool/arch/x86/include/{arch_elf.h => arch/elf.h} (100%) + create mode 100644 tools/objtool/arch/x86/include/arch/endianness.h + rename tools/objtool/arch/x86/include/{arch_special.h => arch/special.h} (100%) + rename tools/objtool/{ => include/objtool}/arch.h (94%) + rename tools/objtool/{ => include/objtool}/builtin.h (100%) + rename tools/objtool/{ => include/objtool}/cfi.h (96%) + rename tools/objtool/{ => include/objtool}/check.h (64%) + rename tools/objtool/{ => include/objtool}/elf.h (100%) + create mode 100644 tools/objtool/include/objtool/endianness.h + rename tools/objtool/{ => include/objtool}/objtool.h (84%) + rename tools/objtool/{ => include/objtool}/special.h (94%) + rename tools/objtool/{ => include/objtool}/warn.h (98%) +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 fs/debugfs/inode.c +Merge made by the 'recursive' strategy. + fs/debugfs/inode.c | 5 ++++- + include/linux/irqdomain.h | 4 ---- + kernel/irq/irqdomain.c | 9 ++++----- + 3 files changed, 8 insertions(+), 10 deletions(-) +Merging ftrace/for-next (e23db805da2d tracing/tools: Add the latency-collector to tools directory) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +CONFLICT (content): Merge conflict in kernel/trace/trace.c +Auto-merging kernel/trace/blktrace.c +Resolved 'kernel/trace/trace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b5837d5af4be] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/ftrace.rst | 6 + + include/linux/ftrace.h | 2 - + include/linux/trace.h | 3 +- + include/linux/trace_events.h | 75 +- + include/linux/tracepoint.h | 54 +- + include/trace/trace_events.h | 31 +- + kernel/kprobes.c | 13 +- + kernel/trace/Kconfig | 6 +- + kernel/trace/blktrace.c | 17 +- + kernel/trace/preemptirq_delay_test.c | 14 + + kernel/trace/ring_buffer.c | 41 +- + kernel/trace/trace.c | 283 +-- + kernel/trace/trace.h | 63 +- + kernel/trace/trace_branch.c | 6 +- + kernel/trace/trace_dynevent.c | 35 +- + kernel/trace/trace_dynevent.h | 4 +- + kernel/trace/trace_event_perf.c | 5 +- + kernel/trace/trace_events.c | 40 +- + kernel/trace/trace_events_inject.c | 6 +- + kernel/trace/trace_events_synth.c | 320 ++- + kernel/trace/trace_functions.c | 31 +- + kernel/trace/trace_functions_graph.c | 32 +- + kernel/trace/trace_hwlat.c | 7 +- + kernel/trace/trace_irqsoff.c | 86 +- + kernel/trace/trace_kprobe.c | 43 +- + kernel/trace/trace_mmiotrace.c | 16 +- + kernel/trace/trace_output.c | 12 +- + kernel/trace/trace_probe.c | 17 + + kernel/trace/trace_probe.h | 1 + + kernel/trace/trace_sched_wakeup.c | 71 +- + kernel/trace/trace_syscalls.c | 20 +- + kernel/trace/trace_uprobe.c | 23 +- + kernel/tracepoint.c | 91 +- + tools/Makefile | 14 +- + .../inter-event/trigger-synthetic-event-syntax.tc | 4 + + .../trigger-synthetic_event_syntax_errors.tc | 35 +- + tools/tracing/Makefile | 19 + + tools/tracing/latency/.gitignore | 2 + + tools/tracing/latency/Makefile | 24 + + tools/tracing/latency/latency-collector.c | 2108 ++++++++++++++++++++ + 40 files changed, 3062 insertions(+), 618 deletions(-) + create mode 100644 tools/tracing/Makefile + create mode 100644 tools/tracing/latency/.gitignore + create mode 100644 tools/tracing/latency/Makefile + create mode 100644 tools/tracing/latency/latency-collector.c +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 (5df230a00991 xen: Replace lkml.org links with lore) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-xenbus | 41 +++++++ + drivers/xen/events/events_2l.c | 22 ++-- + drivers/xen/events/events_base.c | 158 ++++++++++++++++++++----- + drivers/xen/events/events_fifo.c | 7 -- + drivers/xen/events/events_internal.h | 14 ++- + drivers/xen/evtchn.c | 29 +++-- + drivers/xen/xen-acpi-processor.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 66 +++++++++++ + include/xen/xenbus.h | 7 ++ + 9 files changed, 283 insertions(+), 64 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 +Merge made by the 'recursive' strategy. + include/linux/compiler_attributes.h | 6 ++++++ + mm/percpu.c | 36 +++++++++++++++++++++--------------- + 2 files changed, 27 insertions(+), 15 deletions(-) +Merging workqueues/for-next (e9ad2eb3d9ae workqueue: Use %s instead of function name) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 2 +- + include/trace/events/workqueue.h | 6 +++--- + kernel/workqueue.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +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 (7ab39384da0b 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 +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging driver-core/driver-core-next (3e4c982f1ce7 Revert "driver core: Set fw_devlink=on by default") +$ git merge driver-core/driver-core-next +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/fwnode.h +Auto-merging include/linux/device.h +Auto-merging fs/debugfs/inode.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/base/power/domain.c +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/core.c +Auto-merging drivers/base/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + 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/init.c | 1 + + drivers/base/platform.c | 11 +- + drivers/base/power/domain.c | 2 + + drivers/base/test/Makefile | 1 + + drivers/clk/clk.c | 3 + + drivers/gpio/gpiolib-of.c | 11 ++ + drivers/gpio/gpiolib-of.h | 5 + + drivers/gpio/gpiolib.c | 52 ++++++-- + drivers/of/property.c | 59 +++++++-- + include/linux/device.h | 2 + + include/linux/device/driver.h | 2 +- + include/linux/fwnode.h | 20 ++- + include/linux/of_irq.h | 9 +- + kernel/irq/irqdomain.c | 2 + + 20 files changed, 316 insertions(+), 67 deletions(-) +Merging usb/usb-next (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (d19db80a3665 spmi: spmi-pmic-arb: Fix hw_irq overflow) +$ git merge char-misc/char-misc-next +Auto-merging scripts/mod/file2alias.c +CONFLICT (content): Merge conflict in scripts/mod/file2alias.c +Auto-merging scripts/mod/devicetable-offsets.c +CONFLICT (content): Merge conflict in scripts/mod/devicetable-offsets.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Removing include/linux/intel-pti.h +Auto-merging drivers/watchdog/mei_wdt.c +Removing drivers/tty/n_tracesink.h +CONFLICT (modify/delete): drivers/tty/n_tracesink.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracesink.c left in tree. +CONFLICT (modify/delete): drivers/tty/n_tracerouter.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracerouter.c left in tree. +Auto-merging drivers/of/platform.c +Removing drivers/misc/pti.c +Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c +Removing drivers/misc/atmel_tclib.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/char/random.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging drivers/accessibility/speakup/spk_ttyio.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/driver-api/pti_intel_mid.rst +Auto-merging Documentation/driver-api/index.rst +Removing Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt +Removing Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt +Removing Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +Removing Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt +Auto-merging Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +Removing Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml +Resolved 'include/linux/mod_devicetable.h' using previous resolution. +Resolved 'scripts/mod/devicetable-offsets.c' using previous resolution. +Resolved 'scripts/mod/file2alias.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/tty/n_tracerouter.c drivers/tty/n_tracesink.c +rm 'drivers/tty/n_tracerouter.c' +rm 'drivers/tty/n_tracesink.c' +$ git commit --no-edit -v -a +[master 879771e77085] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + 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 + + .../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 +- + Documentation/admin-guide/spkguide.txt | 48 +- + .../devicetree/bindings/arm/coresight.txt | 5 +- + .../bindings/display/mediatek/mediatek,dsi.txt | 18 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 18 +- + .../bindings/interconnect/qcom,qcs404.yaml | 77 - + .../{qcom,msm8916.yaml => qcom,rpm.yaml} | 22 +- + .../bindings/interconnect/qcom,rpmh.yaml | 4 + + .../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/ti,phy-j721e-wiz.yaml | 2 +- + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/pti_intel_mid.rst | 108 -- + Documentation/fpga/dfl.rst | 28 + + Documentation/trace/coresight/coresight.rst | 32 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + 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 | 26 +- + arch/arm64/include/asm/sysreg.h | 11 + + arch/x86/include/asm/acrn.h | 78 + + arch/x86/kernel/cpu/acrn.c | 16 +- + 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/base/regmap/regmap-sdw-mbq.c | 10 +- + drivers/base/regmap/regmap-sdw.c | 4 +- + 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/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/greybus/es2.c | 9 +- + drivers/greybus/greybus_trace.h | 6 +- + 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/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/ipack/ipack.c | 11 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 2 + + drivers/memory/dfl-emif.c | 207 +++ + 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 +- + drivers/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/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/phy/broadcom/Kconfig | 3 +- + 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/mediatek/phy-mtk-mipi-dsi.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/st/phy-stm32-usbphyc.c | 222 ++- + drivers/phy/xilinx/phy-zynqmp.c | 11 +- + drivers/platform/goldfish/goldfish_pipe.c | 28 +- + 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 +- + 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/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 +- + include/dt-bindings/interconnect/qcom,msm8939.h | 105 ++ + include/dt-bindings/interconnect/qcom,sdx55.h | 76 + + include/linux/coresight-pmu.h | 20 +- + include/linux/coresight.h | 218 ++- + include/linux/dfl.h | 86 + + include/linux/eeprom_93xx46.h | 2 + + include/linux/firmware/xlnx-zynqmp.h | 339 ++-- + include/linux/fsl/mc.h | 8 +- + include/linux/intel-pti.h | 35 - + include/linux/mei_cl_bus.h | 2 +- + include/linux/mhi.h | 13 +- + include/linux/mod_devicetable.h | 24 + + include/linux/soundwire/sdw.h | 2 + + include/linux/vme.h | 2 +- + include/linux/vmw_vmci_defs.h | 4 +- + include/uapi/linux/acrn.h | 580 +++++++ + include/uapi/linux/fsl_mc.h | 34 + + include/uapi/linux/map_to_7segment.h | 11 +- + include/uapi/linux/misc/bcm_vk.h | 84 + + include/uapi/misc/habanalabs.h | 74 +- + samples/acrn/Makefile | 12 + + samples/acrn/guest.ld | 9 + + samples/acrn/payload.ld | 9 + + samples/acrn/vm-sample.c | 136 ++ + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + scripts/spdxcheck.py | 2 +- + scripts/ver_linux | 12 +- + 272 files changed, 18871 insertions(+), 5053 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-bus-fsl-mc + 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 + 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 + 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 + create mode 100644 drivers/bus/fsl-mc/fsl-mc-uapi.c + create mode 100644 drivers/fpga/dfl-n3000-nios.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/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%) + create mode 100644 drivers/misc/habanalabs/common/pci/Makefile + 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/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/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/intel-pti.h + create mode 100644 include/uapi/linux/acrn.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 +Merging extcon/extcon-next (bd30a35764e1 extcon: sm5502: Detect OTG when USB_ID is connected to ground) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max8997.c | 4 ++++ + drivers/extcon/extcon-sm5502.c | 22 ++++++++++++++++++++-- + include/linux/extcon.h | 23 +++++++++++++++++++++++ + 3 files changed, 47 insertions(+), 2 deletions(-) +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 (07956b6269d3 vfio/type1: Use follow_pte()) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + 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 | 349 ++++++++++++++++++++++++++---------- + include/linux/vfio.h | 7 + + include/uapi/linux/vfio.h | 27 +++ + 10 files changed, 320 insertions(+), 130 deletions(-) +Merging staging/staging-next (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 +Removing include/linux/sirfsoc_dma.h +Removing include/linux/platform_data/dma-coh901318.h +Removing include/linux/platform_data/dma-atmel.h +Removing include/linux/dma/mmp-pdma.h +Removing drivers/dma/zx_dma.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/ti/k3-udma.c +Removing drivers/dma/sirf-dma.c +Auto-merging drivers/dma/qcom/gpi.c +Auto-merging drivers/dma/qcom/bam_dma.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/dma.c +Removing drivers/dma/coh901318_lli.c +Removing drivers/dma/coh901318.h +Removing drivers/dma/coh901318.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/dma/zxdma.txt +Removing Documentation/devicetree/bindings/dma/ste-coh901318.txt +Removing Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt +Removing Documentation/devicetree/bindings/dma/sirfsoc-dma.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 + + .../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 - + MAINTAINERS | 4 +- + 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 ------- + include/linux/dma/k3-psil.h | 13 +- + include/linux/dma/mmp-pdma.h | 16 - + include/linux/dmaengine.h | 2 + + 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/sirfsoc_dma.h | 7 - + 46 files changed, 3018 insertions(+), 5988 deletions(-) + 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 + 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 + delete mode 100644 include/linux/dma/mmp-pdma.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/sirfsoc_dma.h +Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 55 +++++++++++++------------------------------------- + kernel/cgroup/cpuset.c | 6 +++--- + 2 files changed, 17 insertions(+), 44 deletions(-) +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 (d39bfd0686fd scsi: iscsi: Drop session lock in iscsi_session_chkready()) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (bd4ff6766f47 ALSA: virtio: introduce device suspend/resume support) +$ 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 | 1 + + drivers/vdpa/ifcvf/ifcvf_main.c | 2 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +- + drivers/vdpa/vdpa.c | 503 ++++++++++++++++++++++++++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 2 + + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 98 ++++-- + drivers/vhost/scsi.c | 9 +- + drivers/virtio/Kconfig | 10 +- + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio_input.c | 26 +- + drivers/virtio/virtio_mem.c | 2 +- + drivers/virtio/virtio_mmio.c | 2 +- + 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 | 44 ++- + 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 | 311 +++++++++++++++++ + sound/virtio/virtio_ctl_msg.h | 78 +++++ + sound/virtio/virtio_jack.c | 233 +++++++++++++ + sound/virtio/virtio_pcm.c | 499 +++++++++++++++++++++++++++ + sound/virtio/virtio_pcm.h | 121 +++++++ + sound/virtio/virtio_pcm_msg.c | 393 +++++++++++++++++++++ + sound/virtio/virtio_pcm_ops.c | 493 +++++++++++++++++++++++++++ + 39 files changed, 4785 insertions(+), 509 deletions(-) + 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. + .../bindings/hwlock/ti,omap-hwspinlock.yaml | 1 + + .../devicetree/bindings/remoteproc/mtk,scp.txt | 8 +-- + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 12 ++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 1 + + MAINTAINERS | 2 + + drivers/hwspinlock/omap_hwspinlock.c | 4 +- + drivers/remoteproc/Kconfig | 25 +++++-- + drivers/remoteproc/ingenic_rproc.c | 7 ++ + drivers/remoteproc/mtk_common.h | 7 ++ + drivers/remoteproc/mtk_scp.c | 82 ++++++++++++++++++---- + drivers/remoteproc/pru_rproc.c | 18 +++++ + drivers/remoteproc/qcom_pil_info.c | 2 +- + 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 ++--- + include/linux/rpmsg/qcom_glink.h | 8 ++- + 19 files changed, 238 insertions(+), 47 deletions(-) +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 +Removing drivers/pinctrl/zte/pinctrl-zx296718.c +Removing drivers/pinctrl/zte/pinctrl-zx.h +Removing drivers/pinctrl/zte/pinctrl-zx.c +Removing drivers/pinctrl/zte/Makefile +Removing drivers/pinctrl/zte/Kconfig +Removing drivers/pinctrl/sirf/pinctrl-sirf.h +Removing drivers/pinctrl/sirf/pinctrl-sirf.c +Removing drivers/pinctrl/sirf/pinctrl-prima2.c +Removing drivers/pinctrl/sirf/pinctrl-atlas7.c +Removing drivers/pinctrl/sirf/pinctrl-atlas6.c +Removing drivers/pinctrl/sirf/Makefile +Removing drivers/pinctrl/pinctrl-u300.c +Auto-merging drivers/pinctrl/pinctrl-ingenic.c +Removing drivers/pinctrl/pinctrl-coh901.h +Removing drivers/pinctrl/pinctrl-coh901.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt +Removing Documentation/devicetree/bindings/gpio/gpio-stericsson-coh901.txt +Removing Documentation/devicetree/bindings/gpio/gpio-atlas7.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-atlas7.txt | 50 - + .../bindings/gpio/gpio-stericsson-coh901.txt | 7 - + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 17 +- + .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 8 +- + .../bindings/pinctrl/brcm,ns2-pinmux.txt | 2 +- + .../bindings/pinctrl/brcm,nsp-pinmux.txt | 2 +- + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 2 +- + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 4 +- + .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 109 - + .../bindings/pinctrl/pinctrl-bindings.txt | 4 +- + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 2 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 2 +- + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 12 +- + .../devicetree/bindings/pinctrl/pinctrl-zx.txt | 84 - + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 152 + + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 145 + + .../bindings/pinctrl/qcom,tlmm-common.yaml | 85 + + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 62 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 2 +- + drivers/pinctrl/Kconfig | 25 - + drivers/pinctrl/Makefile | 4 - + drivers/pinctrl/actions/Kconfig | 3 + + drivers/pinctrl/actions/pinctrl-owl.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- + drivers/pinctrl/core.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - + drivers/pinctrl/intel/pinctrl-intel.c | 117 +- + drivers/pinctrl/intel/pinctrl-intel.h | 4 + + drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 + + drivers/pinctrl/mediatek/mtk-eint.c | 13 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 137 +- + drivers/pinctrl/pinctrl-at91.c | 3 +- + drivers/pinctrl/pinctrl-coh901.c | 774 --- + drivers/pinctrl/pinctrl-coh901.h | 6 - + drivers/pinctrl/pinctrl-ingenic.c | 98 +- + drivers/pinctrl/pinctrl-single.c | 1 + + drivers/pinctrl/pinctrl-st.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/pinctrl-u300.c | 1111 ---- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 18 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 1624 ++++++ + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 - + drivers/pinctrl/qcom/pinctrl-sm8350.c | 1649 ++++++ + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 + + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 - + drivers/pinctrl/ralink/pinctrl-rt2880.c | 47 +- + drivers/pinctrl/renesas/Kconfig | 5 + + drivers/pinctrl/renesas/Makefile | 1 + + drivers/pinctrl/renesas/core.c | 38 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77951.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7796.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77965.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 4460 ++++++++++++++ + drivers/pinctrl/renesas/pinctrl.c | 16 +- + drivers/pinctrl/renesas/sh_pfc.h | 28 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 16 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 4 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 22 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 +- + drivers/pinctrl/sirf/Makefile | 7 - + drivers/pinctrl/sirf/pinctrl-atlas6.c | 1137 ---- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 6157 -------------------- + drivers/pinctrl/sirf/pinctrl-prima2.c | 1131 ---- + drivers/pinctrl/sirf/pinctrl-sirf.c | 894 --- + drivers/pinctrl/sirf/pinctrl-sirf.h | 116 - + drivers/pinctrl/sprd/pinctrl-sprd.c | 2 +- + drivers/pinctrl/sunxi/Kconfig | 10 + + drivers/pinctrl/sunxi/Makefile | 2 + + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 2 + + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 56 + + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 548 ++ + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 7 +- + drivers/pinctrl/zte/Kconfig | 14 - + drivers/pinctrl/zte/Makefile | 3 - + drivers/pinctrl/zte/pinctrl-zx.c | 445 -- + drivers/pinctrl/zte/pinctrl-zx.h | 102 - + drivers/pinctrl/zte/pinctrl-zx296718.c | 1024 ---- + include/linux/kconfig.h | 6 + + 88 files changed, 9220 insertions(+), 13458 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-atlas7.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-stericsson-coh901.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8180x-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8350-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,tlmm-common.yaml + delete mode 100644 drivers/pinctrl/pinctrl-coh901.c + delete mode 100644 drivers/pinctrl/pinctrl-coh901.h + delete mode 100644 drivers/pinctrl/pinctrl-u300.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8180x.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8350.c + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779a0.c + delete mode 100644 drivers/pinctrl/sirf/Makefile + delete mode 100644 drivers/pinctrl/sirf/pinctrl-atlas6.c + delete mode 100644 drivers/pinctrl/sirf/pinctrl-atlas7.c + delete mode 100644 drivers/pinctrl/sirf/pinctrl-prima2.c + delete mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.c + delete mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.h + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c + delete mode 100644 drivers/pinctrl/zte/Kconfig + delete mode 100644 drivers/pinctrl/zte/Makefile + delete mode 100644 drivers/pinctrl/zte/pinctrl-zx.c + delete mode 100644 drivers/pinctrl/zte/pinctrl-zx.h + delete mode 100644 drivers/pinctrl/zte/pinctrl-zx296718.c +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 +Auto-merging security/commoncap.c +Merge made by the 'recursive' strategy. + security/commoncap.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) +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 +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/blk.c +Auto-merging drivers/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/driver-api/index.rst +Auto-merging .clang-format +Merge made by the 'recursive' strategy. + .clang-format | 1 + + Documentation/ABI/testing/sysfs-bus-cxl | 26 + + Documentation/driver-api/cxl/index.rst | 12 + + Documentation/driver-api/cxl/memory-devices.rst | 46 + + Documentation/driver-api/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 11 + + drivers/Kconfig | 1 + + drivers/Makefile | 1 + + 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/nvdimm/blk.c | 3 +- + drivers/nvdimm/bus.c | 13 +- + drivers/nvdimm/dimm.c | 7 +- + drivers/nvdimm/pmem.c | 4 +- + drivers/nvdimm/region.c | 4 +- + include/linux/nd.h | 2 +- + include/linux/pci_ids.h | 1 + + include/uapi/linux/cxl_mem.h | 172 +++ + 28 files changed, 2076 insertions(+), 41 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-cxl + create mode 100644 Documentation/driver-api/cxl/index.rst + create mode 100644 Documentation/driver-api/cxl/memory-devices.rst + 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 + create mode 100644 include/uapi/linux/cxl_mem.h +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 (2b8689520520 kbuild: prevent CC_FLAGS_LTO self-bloating on recursive rebuilds) +$ git merge kspp/for-next/kspp +Auto-merging scripts/module.lds.S +Auto-merging scripts/mod/modpost.h +Auto-merging scripts/mod/modpost.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging kernel/trace/Kconfig +Auto-merging init/Kconfig +Auto-merging include/linux/pci.h +Auto-merging include/asm-generic/vmlinux.lds.h +CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h +Auto-merging arch/arm64/kernel/vdso/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging .gitignore +Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 961e8e1c70a9] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Makefile | 45 ++++-- + arch/Kconfig | 90 ++++++++++++ + arch/arm64/Kconfig | 4 + + arch/arm64/kernel/vdso/Makefile | 3 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/misc/lkdtm/Makefile | 1 + + include/asm-generic/vmlinux.lds.h | 5 +- + include/linux/init.h | 79 ++++++++-- + include/linux/pci.h | 27 +++- + init/Kconfig | 1 + + kernel/trace/Kconfig | 16 ++ + scripts/Makefile.build | 48 +++++- + scripts/Makefile.lib | 6 +- + scripts/Makefile.modfinal | 9 +- + scripts/Makefile.modpost | 25 +++- + scripts/generate_initcall_order.pl | 270 ++++++++++++++++++++++++++++++++++ + scripts/link-vmlinux.sh | 70 +++++++-- + scripts/lto-used-symbollist.txt | 5 + + scripts/mod/Makefile | 1 + + scripts/mod/modpost.c | 16 +- + scripts/mod/modpost.h | 9 ++ + scripts/mod/sumversion.c | 6 +- + scripts/module.lds.S | 24 +++ + 24 files changed, 704 insertions(+), 59 deletions(-) + create mode 100755 scripts/generate_initcall_order.pl + create mode 100644 scripts/lto-used-symbollist.txt +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 8f65535991b0] 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 +Auto-merging mm/memory.c +Auto-merging include/linux/mm.h +Auto-merging drivers/misc/habanalabs/common/memory.c +Auto-merging drivers/misc/habanalabs/common/habanalabs.h +Auto-merging drivers/char/mem.c +Merge made by the 'recursive' strategy. + drivers/char/mem.c | 86 +------------------ + drivers/gpu/drm/exynos/Kconfig | 1 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 48 +++++------ + drivers/media/common/videobuf2/Kconfig | 1 - + drivers/media/common/videobuf2/Makefile | 1 + + .../media/common/videobuf2}/frame_vector.c | 55 +++++------- + drivers/media/common/videobuf2/videobuf2-memops.c | 3 +- + drivers/media/platform/omap/Kconfig | 1 - + drivers/misc/habanalabs/Kconfig | 1 - + drivers/misc/habanalabs/common/habanalabs.h | 6 +- + drivers/misc/habanalabs/common/memory.c | 52 +++++------- + drivers/pci/pci-sysfs.c | 11 +++ + drivers/pci/proc.c | 6 ++ + fs/sysfs/file.c | 11 +++ + include/linux/ioport.h | 6 +- + include/linux/mm.h | 45 +--------- + include/linux/sysfs.h | 2 + + include/media/frame_vector.h | 47 +++++++++++ + include/media/videobuf2-core.h | 1 + + kernel/resource.c | 98 +++++++++++++++++++++- + mm/Kconfig | 3 - + mm/Makefile | 1 - + mm/memory.c | 46 +++++++++- + 23 files changed, 287 insertions(+), 245 deletions(-) + rename {mm => drivers/media/common/videobuf2}/frame_vector.c (85%) + create mode 100644 include/media/frame_vector.h +$ git am -3 ../patches/0001-mm-fixup-for-follow_pte-API-change.patch +Applying: mm: fixup for follow_pte() API change +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master c8428f2c5bd2] Merge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup' + Date: Tue Feb 23 15:53:49 2021 +1100 +Merging oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support) +$ git merge oprofile-removal/oprofile/removal +Already up to date. +Merging akpm-current/current (12e9b8a3c276 initramfs-panic-with-memory-information-fix) +$ git merge --no-ff akpm-current/current +Auto-merging tools/objtool/check.c +Auto-merging scripts/checkpatch.pl +Auto-merging mm/swapfile.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/shmem.c +Auto-merging mm/page_io.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mremap.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging mm/Makefile +Auto-merging lib/cmdline.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/locking/rtmutex.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/initramfs.c +Auto-merging init/Kconfig +Auto-merging include/linux/swap.h +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/mm.h +Auto-merging include/linux/init.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/gfp.h +Auto-merging include/linux/fs.h +Auto-merging fs/seq_file.c +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/hugetlbfs/inode.c +CONFLICT (content): Merge conflict in fs/hugetlbfs/inode.c +Auto-merging fs/exec.c +Auto-merging fs/direct-io.c +Auto-merging fs/dcache.c +Auto-merging fs/coredump.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/block_dev.c +Auto-merging drivers/virtio/virtio_mem.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kernel/acpi/wakeup_64.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/sleep.S +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging CREDITS +Auto-merging .mailmap +Resolved 'fs/btrfs/file.c' using previous resolution. +Resolved 'fs/hugetlbfs/inode.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 a8d703f37d65] 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 | 4 +- + 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/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 | 12 + + 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 | 13 + + include/linux/highmem-internal.h | 5 - + include/linux/highmem.h | 28 +- + include/linux/huge_mm.h | 15 +- + include/linux/hugetlb.h | 88 +- + 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 | 341 ++++---- + 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 | 269 +++--- + 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 | 59 +- + mm/slob.c | 2 +- + mm/slub.c | 224 ++--- + 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 | 89 +- + 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 +- + 240 files changed, 7229 insertions(+), 3367 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 am -3 ../mmotm/broken-out/fs-ramfs-inodec-update-inode_operationstmpfile.patch +Applying: fs/ramfs/inode.c: update inode_operations.tmpfile +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ramfs/inode.c +$ git add -A . +$ git commit -v -a --amend +[master a83530efbd05] Merge branch 'akpm-current/current' + Date: Tue Feb 23 16:36:26 2021 +1100 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/1)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 229c23bf1331...42266a061ceb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (42266a061ceb 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..cbd812bf55be --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210223 |