diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-01 20:11:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-02-01 20:11:12 +1100 |
| commit | fd821bf0ed9a7db09d2e007df697f4d9ecfda99a (patch) | |
| tree | 89ad68ce0965cf3701425ab38d31997db6acd655 | |
| parent | 8bf3836b651666846ca4988046f03a3397c74c08 (diff) | |
| download | linux-fd821bf0ed9a7db09d2e007df697f4d9ecfda99a.tar.gz linux-fd821bf0ed9a7db09d2e007df697f4d9ecfda99a.tar.xz | |
Add linux-next specific files for 20210201next-20210201
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 333 | ||||
| -rw-r--r-- | Next/Trees | 335 | ||||
| -rw-r--r-- | Next/merge.log | 12000 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 12669 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..96a4791e1d13 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,333 @@ +Name SHA1 +---- ---- +origin ac8c6edd20bcb965b22ceb36752499b3d5cf5dd4 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current ed4e9e615b7ec4992a4eba1643e62ec2d9d979db +arc-current 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +arm-current d80cd9abcd942eb217b6c68e5bd0d5c3feb2f956 +arm64-fixes a1df829ead5877d4a1061e976a50e2e665a16f24 +arm-soc-fixes e2fc2de8e1aacef4c76f7a4b8c6162874d3e2801 +drivers-memory-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +m68k-current 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 +powerpc-fixes 66f0a9e058fad50e569ad752be72e52701991fd5 +s390-fixes e82080e1f456467cc185fe65ee69fe9f9bd0b576 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net eb4e8fac00d1e01ada5e57c05d24739156086677 +bpf 06cc6e5dc659e1995804cbeda643d0fa45b68999 +ipsec da64ae2d35d3673233f0403b035d4c6acbf71965 +netfilter 44a674d6f79867d5652026f1cc11f7ba8a390183 +ipvs 44a674d6f79867d5652026f1cc11f7ba8a390183 +wireless-drivers 93a1d4791c10d443bc67044def7efee2991d48b7 +mac80211 44a674d6f79867d5652026f1cc11f7ba8a390183 +rdma-fixes f1b0a8ea9f12b8ade0dbe40dd57e4ffa9a30ed93 +sound-current 4961167bf7482944ca09a6f71263b9e47f949851 +sound-asoc-fixes 87277d99081ac431f1640a91294ba2c82198cd87 +regmap-fixes 19c329f6808995b142b3966301f217c831e7cf31 +regulator-fixes b96353f3607a1cd0377010fdf1f2d7b767047675 +spi-fixes 3277f2e72f8624d760338e5a35bef52d5caf93f3 +pci-current 7e69d07d7c3c7a8ed69ff10a6fa65afa7c56685c +driver-core.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +tty.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +usb.current 3e1f4a2e1184ae6ad7f4caf682ced9554141a0f4 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes e478d6029dca9d8462f426aee0d32896ef64f10f +usb-chipidea-fixes 491b1bea00040233b791dc8fea1608ac6a7003bc +phy 36acd5e24e3000691fb8d1ee31cf959cb1582d35 +staging.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +char-misc.current 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +soundwire-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +thunderbolt-fixes 4d395c5e74398f664405819330e5a298da37f655 +input-current 9bbd77d5bbc9aff8cb74d805c31751f5f0691ba8 +crypto-current 4f6543f28bb05433d87b6de6c21e9c14c35ecf33 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 7a6eb7c34a78498742b5f82543b7a68c1c443329 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes fed1b6a00a191cad4dd843519b590e3d6ad9f843 +backlight-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +mtd-fixes b135b3358d73aa2a8b2be35d08e422421d1c609e +mfd-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +v4l-dvb-fixes ef357e02b6c420dc2d668ebf3165838c77358acd +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 7b490a8ab0f2d3ab8d838a4ff22ae86edafd34a1 +at91-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +omap-fixes 177d8f1f7f47fe7c18ceb1d87893890d7e9c95a7 +kvm-fixes 074489b77a37c61c0b090d63b2731a951064fd70 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 4008bc7d39537bb3be166d8a3129c4980e1dd7dc +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 8655ef25f7e5fff02ea64d93d556e569b4303782 +vfs-fixes d36a1dd9f77ae1e72da48f4123ed35627848507d +dma-mapping-fixes d17405d52bacd14fe7fdbb10c0434934ea496914 +i3c-fixes 291b5c9870fc546376d69cf792b7885cd0c9c1b3 +drivers-x86-fixes 67fbe02a5cebc3c653610f12e3c0424e58450153 +samsung-krzk-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-samsung-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +devicetree-fixes 32ada6b0980d86133d080d62371a5787ea2ec5ed +scsi-fixes 8c65830ae1629b03e5d65e9aafae7e2cf5f8b743 +drm-fixes e0ecafede87eb1a3d1e708f0365fad0d59489285 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 489140b5ba2e7cc4b853c29e0591895ddb462a82 +mmc-fixes 1bebdd0c6529852bbde958566d0c86fba70a81e0 +rtc-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +gnss-fixes 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +hyperv-fixes fff7b5e6ee63c5d20406a131b260c619cdd24fd1 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 336e8eb2a3cfe2285c314cd85630076da365f6c6 +pidfd-fixes a409ed156a90093a03fe6a93721ddf4c591eac87 +fpga-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +spdx 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +gpio-brgl-fixes c351bb64cbe67029c68dea3adbec1b9508c6ff0f +gpio-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2b8fdbbf1c616300312f71fe5b21fe8f03129950 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +drm-misc-fixes 2b1b3e544f65f40df5eef99753e460a127910479 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild f405db04ba7fb8176f95c9103d56e70c73ef7d96 +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping f726c72d6c059c1a6db425108cd6c220fb95cbf4 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm ecbbb88727aee7880527d4b320b4d06dde75d46d +arm64 fab0e5d091a722a713e549d6db6722950ba21b32 +arm-perf f0c140481d1b807217cacdcf11d24cfa407a7a53 +arm-soc c475c70afa969a1b88623b0309b9e017d18d8567 +actions 006828d706fda3c729ccc32e3e6ecda6dd05b299 +amlogic 35fe4b2c91ae71a6f9fa8ae5da78ae44e9bafcb5 +aspeed 41707a524026f9575d6f3a1162cc138f26fa5ca6 +at91 bcd7e8ebb203e2c7590e62edffdabc6ea533364b +drivers-memory 50af93f1fe8833c7327a9a7dc231c827d4a7fbd8 +imx-mxs 7535d59c5f11270e33c9ca425ae98ec461b55599 +keystone c3f9aaca29c00f84d59948fad2f8bedc48b32c6b +mediatek 727bfb2c55b0838d09e9578abd9feca1d31438b4 +mvebu 8e03d45cb7de0258f357fbfb2c0e6c5fd9c1d364 +omap 1a2ddab3ec7a6403c205f22843f99a2c775b62d8 +qcom 3e6a8ce094759be6fa5dcae1c1d4565dcc920373 +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas fc6f3211612623ac6266ad99c5b0b2830f9f048a +reset d17655759b3fc660ea49bd7be665c193030c77c0 +rockchip 573fc3d310a3d1042b83114c5a63e4370ad5f15c +samsung-krzk f9e152f183105567e050b08cd666e12a0661e635 +scmi 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 +stm32 a9c92a9671d7e1fc4fdba7c6eb868a37242838f0 +sunxi a352e9e72aa3f8d8fbb3c81b76596dba4d5d1195 +tegra b62f4a3fbb22f2e8f3422366a3a6f48faa7ed867 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new e37eac10bb5d084d81c8f94273f506d51ec7e431 +clk 6370ad6c0e83e49bf20955eba28db479fc22b7c3 +clk-renesas 24ece96554a963d5eab597be7d65a1812d854d10 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky 9d986b01feb991ded3fb8c1f8153a0c80ea84b9c +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +m68k c396dd2ec5bbd1cb80eafe32a72ab6bd6b17cb5a +m68knommu d2680cc0301e268ad1820be322502b51346e8272 +microblaze 57ddf08642f0b1912c97791413d8c1fe31b6a339 +mips 198688edbf77c6fc0e65f5d062f810d83d090166 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 2261352157a932717ec08b9dd18d1bfbb7c37c52 +parisc-hd 226c3155755912bd15e8dcb2b3c371b4462c6d37 +powerpc 6895c5ba7bdcc55eacad03cf309ab23be63b9cac +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v 8fae56d056e4500557779ac8642e64dec5becc47 +s390 58ccd7e118225fdf69dfdd8d543b4e2c88044443 +sh b89bc060b53e7054e5c8ca11feea4bc884d83611 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 7f3414226b58b0df0426104c8ab5e8d50ae71d11 +xtensa 7b79eba1d0d186de94ba661c499326e1b6071be5 +pidfd f736d93d76d3e97d6986c6d26c8eaa32536ccc5c +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache ef5176bf29b2f9d05e49f0ad0aa58919cfab9733 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 65cb48f457731bdc4fb1174291bf4102cc51f9a6 +ceph 9d5ae6f3c50a6f718b6d4be3c7b0828966e01b05 +cifs 1048ba83fb1c00cd24172e23e8263972f6b5d9ac +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs d8b3df8b1048405e73558b88cba2adf29490d468 +exfat 6a10625f5600cb9bafbd2f4eb0ae15dbfd8acc98 +ext3 8e8f048a69412e9ecbea78dc8e41337ccfeade33 +ext4 e9f53353e166a67dfe4f8295100f8ac39d6cf10b +f2fs 79a4aba20bed0de995c5a0e25f8d33415fc4a4c2 +fsverity bde493349025ca0559e2fff88592935af3b8df19 +fuse 5d069dbe8aaf2a197142558b6fb2978189ba3454 +jfs 3bef198f1b17d1bb89260bad947ef084c0a2d1a6 +nfs e4a7d1f7707eb44fd953a31dd59eff82009d879c +nfs-anna 11392155f2bd3d54a8ed5a4fcf8b81ee21435f7f +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel 428a23d2bf0ca8fd4d364a464c3e468f0e81671e +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs b80a974b8c58164ed57b0f025a47b8f003198d9e +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs ae29e4220fd3047b5442e7e8db8027d7745093f5 +zonefs 6716b125b33988a1d55ed044e78c856d68b40b7c +iomap 213f627104daf8589aad8ee73fcaeb603ab0af15 +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks 8d1ddb5e79374fb277985a6b3faa2ed8631c5b4c +vfs f012556f37ff4f6afd2b963c4bb347044898dafe +printk fdaae9394da455db4bd7dbdca38d045da8296bd6 +pci 92036125120b9afea79b9a7b8b516026257c2d82 +pstore 26fecbf7602dd69b649914e61526bd67c557fece +hid 27a8dea33bc0cffc94043b96c615617c2e4cb9bb +i2c e82d026aea28b07c64b2e91d35f389ff3a2c20b5 +i3c 5c8fe583cce542aa0b84adc939ce85293de36e5e +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 66102281f94afdf1f41cf6147c7ddce73a8e75f2 +jc_docs 20ccc8dd38a391daba3a5a5dbd5443855100c517 +v4l-dvb f0ddb4e9911665b9ad68fe94e0faaaff5953902e +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm e86d494782b7e43504b343d37b88c5c1d7af9ff6 +cpufreq-arm 7114ebffd330bfc5a95b9832a70b6bd857d26fd8 +cpupower 3a3ecfdb605cc8d98988012a4f88c34b4d220c21 +devfreq ec894883de5336e28313e531e2f3a8b86f1a8a1a +opp 59e50230871ca5e8a964cbeb92734f74c95808bb +thermal 7a583405f24bffdd9f696a8e1b2f02c297245f4d +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb e998879d4fb7991856916972168cf27c0d86ed12 +rdma f8e9a970159c7bd30429b86710397e9914fefbca +net-next 14e8e0f6008865d823a8184a276702a6c3cbef3d +bpf-next 61ca36c8c4eb3bae35a285b1ae18c514cde65439 +ipsec-next 0c87b1ac604518a0d3f527080c6883d5c2402fb4 +mlx5-next ab0da5a57188b80d16d3222236c4e184953a5bb4 +netfilter-next 08a01c11a5bb3de9b0a9c9b2685867e50eda9910 +ipvs-next a61e4b60761fa7fa2cfde6682760763537ce5549 +wireless-drivers-next 4832bb371c4175ffb506a96accbb08ef2b2466e7 +bluetooth b8ddc3b14c7abcc19b16c74bf6c21d54c2299c09 +mac80211-next 776a39b8196dbca4afb69669db0d9926ffac29ab +gfs2 82218943058d5e3fe692a38b5a549479738dab33 +mtd 12ba8f8ce29fdd277f3100052eddc1afd2f5ea3f +nand 65e4cbbd7cd15aef78e332a67bc748674b203570 +spi-nor fe6653460ee7a7dbe0cd5fd322992af862ce5ab0 +crypto 663f63ee6d9cdc68adf9afca5427e5c2b5b4ae2d +drm 32c3d9b0f51ee1e6bb0160496b97e50b5caca4d0 +amdgpu 7de5b0e170b324b6bb12d032970013bec8c5999d +drm-intel 5b6a9ba9f6cefa41b2dd9b0c9ba36646b81ce0a1 +drm-tegra dcdfe2712b68f1e9dbf4f1a96ad59b80e5cc0ef7 +drm-misc f3ebd4e6b692ab7af464561410a1f05dfc850823 +drm-msm c703d5789590935c573bbd080a2166b72d51a017 +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap aa3233086b48e5269cd0b5c16fb9711ce9341244 +sound 0417fadab493b55093ba2590f4e66c828f7084fe +sound-asoc 10000fc4a510b1a545b63ba6449ca8ae8e802a9b +modules ec2a29593c83ed71a7f16e3243941ebfcf75fdf6 +input 7a6a53b2b1a3e68b69cd75a74783f4d8fd5b6fb5 +block ce3788f764a85485513b1e7f4d6012c9ea70dce1 +device-mapper 266917bd4a2184a5e558555d373d368810844c0b +pcmcia 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 +mmc bdcefe241263433e99f19cea76ebd0164a8c8826 +mfd d0e648f2186a8ae33da6e4e52744f76347c0d688 +backlight 4a98e5ef88f8a7a9fd42e71b018d3070662f8a2a +battery a72acc56f3e939b9e10f2dd460ac1e4519de621f +regulator 5ccfaceb507f5a1f13f00b94b073a0191541af22 +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity b3f82afc1041a6a7d5347a01883f4aab7ec133b2 +keys f7b0fd0b96b10e9378e840beff3072385a63122f +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 365982aba1f264dba26f0908700d62bfa046918c +smack 9b0072e2b2b588ad75c94f2c6e6c52c8f4bd2657 +tomoyo 9c83465f3245c2faa82ffeb7016f40f02bfaa0ad +tpmdd 5cb9c551cb13fae790fc1d7f7a6b1eb28929b7b9 +watchdog 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +iommu 07a8e0e8c1b95d45d6a9970008c9c1a3e1d1fe61 +audit 127c8c5f0589cea2208c329bff7dcb36e375f46c +devicetree cb18a7979a35f5f14cab49715e97efe7700fd349 +mailbox 5a6338cce9f4133c478d3b10b300f96dd644379a +spi 05cda27d7eb59a3b09a2d5b6d06b5176ff9c2e59 +tip a7e0bdf1b07ea6169930ec42b0bdb17e1c1e3bb0 +clockevents 8ae954caf49ac403c177d117fb8e05cbc866aa3c +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip c60767421e102dfd1f4d99ad0cc7f8ba24461eb8 +ftrace f6a694665f132cbf6e2222dd2f173dc35330a8aa +rcu efc0f28cfe21af3aa97190992a573dad108b28a4 +kvm 9a78e15802a87de2b08dfd1bd88e855201d2c8fa +kvm-arm 429b205b73c81a2b28c64f0068e093e755ae96d3 +kvm-ppc dc924b062488a0376aae41d3e0a27dc99f852a5e +kvms390 50a05be484cb70d9dfb55fa5a6ed57eab193901f +xen-tip 2e92493637a09547734f92c62a2471f6f0cb9a2c +percpu 7dd3050a0194f5dc25b2679971a758339288d6e2 +workqueues e9ad2eb3d9ae05471c9b9fafcc0a31d8f565ca5b +drivers-x86 64b0efa18f8c3b1baac369b8d74d0fdae02bc4bc +chrome-platform 4daeb395f1754340927d8d58269593e4e3b6afcd +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds 9a5ad5c5b2d25508996f10ee6b428d5df91d9160 +ipmi fc26067c7417e7fafed7bcc97bda155d91988734 +driver-core 4731210c09f5977300f439b6c56ba220c65b2348 +usb 3c648d3deb0f95c360c9b91f49c0f313db0cef31 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial fea7372cbc40869876df0f045e367f6f97a1666c +usb-chipidea-next 4f30b9d2315fafa41841e5cfd5e48ea1d4a14148 +phy-next 71edb0b4fa0e3bc248df564ba01a0f7c41607c8e +tty 9159835a978f4092bf00a69b51256e69c961edb9 +char-misc 930c922a987a02936000f15ea62988b7a39c27f5 +extcon 226d336c1c75b7003ab70693cb332a1be19f1802 +soundwire 9a0c798c7a98d7c9db2d24c12f93ff72fa6ce7c4 +thunderbolt 2c2a2327bdb509c96737258ca6c91f176acc837d +vfio bdfae1c9a913930eae5ea506733aa7c285e12a06 +staging 02bd88b4834d22cedd47f17fbce6cfa66a323287 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 23145465c5b0f83ffee6459446ac8cfb3d66917f +dmaengine c281cde7a456aa9a56ced9175a4dead94048d3ba +cgroup 00bfa16052cd66855de9bee66d7a5468f4fdc850 +scsi 61629796ed22e65a24ddc6903560435a077c9bc1 +scsi-mkp d2aacd36a8e00bc1813841b482e3933acb1ea0b5 +vhost 79991caf5202c7989928be534727805f8f68bb8d +rpmsg 7cb4f293777e5245ab49ddb2566b4d0c766c2bd1 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl d60c1614b6dfd6de2b259e54b1eb380cf9785d37 +gpio-intel f9f1591ab4872fa6f3489bb203cdf3606b34b398 +pinctrl d3e0c0572caf3a26f5d4ef4e0cbd577b9b6f94ff +pinctrl-intel 0e793a4e283487378e9a5b7db37bc1781bc72fd7 +pinctrl-renesas a5cda861ed57710837bc560a3c715160da710555 +pinctrl-samsung 5c8fe583cce542aa0b84adc939ce85293de36e5e +pwm a2bc9b21fd3f89b1f9a5df46427855dcf344e6e7 +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest df00d02989024d193a6efd1a85513a5658c6a10f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 81840f21d4164e0db5162ccc736c65b369883cc9 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 15f57b3e3130790b6d06ea04f0c1edf0e5455bdd +nvdimm 127c3d2e7e8a79628160e56e54d2be099bdd47c6 +at24 5c8fe583cce542aa0b84adc939ce85293de36e5e +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp 2c07343abd8932200a45ff7b10950e71081e9e77 +kspp 112b6a8e038d793d016e330f53acb9383ac504b3 +gnss 45d5996e034cd5fc20ab0489e3179a6dfe44ca44 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 2c36185526adc8f8398888ad5d19d4a7ea97f4ed +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv 18194b7b3ddc07a5176bd394c7431a5b25d3695b +auxdisplay b45616445a6e346daf8a173a0c51413aec067ebb +kgdb d081a6e353168f15e63eb9e9334757f20343319f +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga e41d4c011706c97f2faea6ef2e46e51f52d8f715 +kunit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 77f2cb28ae5219decf9067e62907d3ecee839779 +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup 74b30195395c406c787280a77ae55aed82dbbfc7 +oprofile-removal be65de6b03aa638c46ea51e9d11a92e4914d8103 +akpm-current 8c6158474df0a2f5de406ef58c3ca9da8841d1c1 +akpm 2a2de8cce51298f3fb97a6838abcc5023c508474 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c88a4ea5091c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,335 @@ +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 +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 +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-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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 +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..28d3d9b51c6f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12000 @@ +$ date -R +Mon, 01 Feb 2021 07:26:24 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 84% (6208/7335)
Updating files: 85% (6235/7335)
Updating files: 86% (6309/7335)
Updating files: 87% (6382/7335)
Updating files: 88% (6455/7335)
Updating files: 89% (6529/7335)
Updating files: 90% (6602/7335)
Updating files: 91% (6675/7335)
Updating files: 92% (6749/7335)
Updating files: 93% (6822/7335)
Updating files: 94% (6895/7335)
Updating files: 95% (6969/7335)
Updating files: 96% (7042/7335)
Updating files: 97% (7115/7335)
Updating files: 98% (7189/7335)
Updating files: 99% (7262/7335)
Updating files: 100% (7335/7335)
Updating files: 100% (7335/7335), done. +HEAD is now at e5ff2cb9cf67 Merge tag 'for-linus-5.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip +Merging origin/master (ac8c6edd20bc Merge tag 'efi-urgent-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating e5ff2cb9cf67..ac8c6edd20bc +Fast-forward + Documentation/asm-annotations.rst | 5 + + Documentation/devicetree/bindings/arm/cpus.yaml | 1 - + .../devicetree/bindings/display/bridge/sii902x.txt | 2 +- + .../bindings/display/mediatek/mediatek,disp.txt | 4 +- + .../devicetree/bindings/extcon/wlf,arizona.yaml | 1 - + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 1 - + .../devicetree/bindings/hwmon/baikal,bt1-pvt.yaml | 8 +- + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 1 - + .../devicetree/bindings/i2c/i2c-gpio.yaml | 2 - + .../bindings/i2c/snps,designware-i2c.yaml | 3 - + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 2 +- + .../devicetree/bindings/iio/adc/maxim,max9611.yaml | 1 - + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 1 - + .../bindings/iio/adc/ti,palmas-gpadc.yaml | 2 - + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 41 ++- + .../bindings/iio/health/maxim,max30100.yaml | 1 - + .../bindings/input/touchscreen/touchscreen.yaml | 2 - + .../devicetree/bindings/leds/richtek,rt8515.yaml | 111 ++++++ + .../bindings/media/mediatek-jpeg-decoder.txt | 2 +- + .../bindings/media/mediatek-jpeg-encoder.txt | 2 +- + .../devicetree/bindings/media/mediatek-mdp.txt | 2 +- + .../devicetree/bindings/mmc/mmc-controller.yaml | 1 - + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 - + .../bindings/net/ethernet-controller.yaml | 2 - + .../devicetree/bindings/net/snps,dwmac.yaml | 1 - + .../devicetree/bindings/power/supply/battery.yaml | 3 - + .../devicetree/bindings/power/supply/bq2515x.yaml | 1 - + .../devicetree/bindings/regulator/dlg,da9121.yaml | 1 - + .../bindings/regulator/fixed-regulator.yaml | 2 - + Documentation/devicetree/bindings/rtc/rtc.yaml | 2 - + .../devicetree/bindings/serial/pl011.yaml | 2 - + .../devicetree/bindings/sound/sgtl5000.yaml | 2 - + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 4 + + .../devicetree/bindings/watchdog/watchdog.yaml | 1 - + Documentation/networking/ip-sysctl.rst | 12 + + MAINTAINERS | 2 + + arch/arm/boot/compressed/atags_to_fdt.c | 3 +- + arch/arm64/include/asm/memory.h | 6 +- + arch/powerpc/kernel/irq.c | 28 +- + arch/riscv/mm/init.c | 2 +- + arch/s390/boot/uv.c | 2 +- + arch/s390/include/asm/uv.h | 4 +- + arch/s390/kernel/uv.c | 2 +- + arch/x86/entry/thunk_64.S | 15 +- + block/blk-cgroup.c | 18 +- + block/blk-mq.h | 2 +- + block/genhd.c | 5 +- + block/partitions/core.c | 8 +- + drivers/acpi/arm64/iort.c | 14 +- + drivers/acpi/device_sysfs.c | 20 +- + drivers/acpi/thermal.c | 46 ++- + drivers/block/nbd.c | 8 + + drivers/block/null_blk/zoned.c | 16 +- + drivers/firmware/efi/apple-properties.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 3 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 31 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 7 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 12 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 47 ++- + drivers/gpu/drm/i915/i915_active.c | 28 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 + + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 28 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 17 +- + .../gpu/drm/nouveau/include/nvhw/class/cl917d.h | 4 + + drivers/gpu/drm/nouveau/include/nvif/push.h | 216 +++++------ + drivers/gpu/drm/nouveau/nouveau_svm.c | 4 + + drivers/gpu/drm/vc4/vc4_hvs.c | 8 +- + drivers/gpu/drm/vc4/vc4_plane.c | 11 +- + drivers/i2c/busses/i2c-mt65xx.c | 19 +- + drivers/iommu/amd/amd_iommu.h | 7 +- + drivers/iommu/amd/amd_iommu_types.h | 4 + + drivers/iommu/amd/init.c | 56 ++- + drivers/iommu/intel/dmar.c | 2 +- + drivers/iommu/intel/iommu.c | 32 +- + drivers/leds/Kconfig | 3 + + drivers/leds/Makefile | 3 + + drivers/leds/flash/Kconfig | 15 + + drivers/leds/flash/Makefile | 3 + + drivers/leds/flash/leds-rt8515.c | 397 +++++++++++++++++++++ + drivers/leds/led-triggers.c | 10 +- + drivers/leds/leds-ariel.c | 6 +- + drivers/leds/leds-lm3533.c | 2 +- + drivers/md/bcache/features.h | 6 + + drivers/net/can/dev.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 8 +- + drivers/net/dsa/microchip/ksz8795.c | 30 +- + drivers/net/dsa/microchip/ksz_common.c | 4 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 7 +- + drivers/net/ethernet/freescale/fec.h | 5 + + drivers/net/ethernet/freescale/fec_main.c | 9 +- + drivers/net/ethernet/ibm/ibmvnic.c | 6 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- + drivers/net/ethernet/intel/ice/ice.h | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 8 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 14 +- + drivers/net/ethernet/intel/ice/ice_main.c | 16 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 9 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 24 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 20 +- + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 13 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 58 +-- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 + + drivers/net/team/team.c | 6 +- + drivers/net/usb/cdc_ether.c | 6 + + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 25 ++ + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 65 +++- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 56 +-- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 7 - + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.h | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 + + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 53 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 + + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 + + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 55 ++- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 10 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 5 +- + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/multipath.c | 2 +- + drivers/nvme/host/pci.c | 2 + + drivers/of/device.c | 10 +- + drivers/rtc/rtc-cmos.c | 8 + + drivers/rtc/rtc-mc146818-lib.c | 7 + + drivers/s390/block/dasd_devmap.c | 20 +- + drivers/s390/block/dasd_eckd.c | 3 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/crypto/vfio_ap_drv.c | 6 +- + drivers/s390/crypto/vfio_ap_ops.c | 149 +++++--- + drivers/s390/crypto/vfio_ap_private.h | 12 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/soc/litex/Kconfig | 1 + + drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 6 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 10 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/tty/tty_io.c | 20 +- + fs/block_dev.c | 10 +- + fs/btrfs/block-group.c | 10 +- + fs/btrfs/ctree.h | 3 + + fs/btrfs/extent-tree.c | 61 +--- + fs/btrfs/free-space-tree.c | 10 +- + fs/btrfs/volumes.c | 2 +- + fs/btrfs/volumes.h | 11 +- + fs/cifs/cifs_dfs_ref.c | 12 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsproto.h | 6 +- + fs/cifs/connect.c | 32 +- + fs/cifs/dfs_cache.c | 8 +- + fs/cifs/fs_context.c | 41 ++- + fs/ecryptfs/inode.c | 10 +- + fs/io_uring.c | 95 ++--- + fs/nfs/pnfs.c | 69 ++-- + include/linux/linkage.h | 5 + + include/linux/sunrpc/xdr.h | 3 +- + include/net/lapb.h | 2 + + include/net/netfilter/nf_tables.h | 2 + + include/net/tcp.h | 3 +- + include/uapi/linux/mrp_bridge.h | 86 ----- + include/uapi/linux/rpl.h | 6 +- + kernel/entry/common.c | 2 +- + kernel/futex.c | 219 +++++------- + kernel/kexec_core.c | 2 - + kernel/locking/rtmutex.c | 3 +- + kernel/locking/rtmutex_common.h | 3 +- + kernel/power/swap.c | 2 +- + net/bridge/br_private_mrp.h | 29 ++ + net/decnet/dn_route.c | 2 +- + net/ipv4/tcp_input.c | 14 +- + net/ipv4/tcp_output.c | 2 + + net/ipv4/tcp_recovery.c | 5 +- + net/ipv4/tcp_timer.c | 18 + + net/key/af_key.c | 6 +- + net/lapb/lapb_iface.c | 70 +++- + net/lapb/lapb_timer.c | 30 +- + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/iface.c | 6 + + net/mac80211/spectmgmt.c | 10 +- + net/netfilter/nf_tables_api.c | 5 +- + net/netfilter/nft_dynset.c | 41 ++- + net/nfc/netlink.c | 1 + + net/nfc/rawsock.c | 2 +- + net/rxrpc/call_accept.c | 1 + + net/sunrpc/auth_gss/auth_gss.c | 30 +- + net/sunrpc/auth_gss/auth_gss_internal.h | 45 +++ + net/sunrpc/auth_gss/gss_krb5_mech.c | 31 +- + net/switchdev/switchdev.c | 23 +- + net/wireless/wext-core.c | 5 +- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_policy.c | 30 +- + .../selftests/net/forwarding/router_mpath_nh.sh | 2 +- + .../selftests/net/forwarding/router_multipath.sh | 2 +- + tools/testing/selftests/net/xfrm_policy.sh | 45 ++- + 229 files changed, 2503 insertions(+), 1191 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/richtek,rt8515.yaml + create mode 100644 drivers/leds/flash/Kconfig + create mode 100644 drivers/leds/flash/Makefile + create mode 100644 drivers/leds/flash/leds-rt8515.c + create mode 100644 net/sunrpc/auth_gss/auth_gss_internal.h +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (ed4e9e615b7e Documentation/llvm: Add a section about supported architectures) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Documentation/kbuild/gcc-plugins.rst | 47 ++++++++++++++++-------------------- + Documentation/kbuild/llvm.rst | 44 +++++++++++++++++++++++++++++++++ + scripts/Makefile | 8 ++++-- + scripts/bloat-o-meter | 2 +- + scripts/checkpatch.pl | 7 ------ + scripts/diffconfig | 2 +- + scripts/dummy-tools/gcc | 10 +++----- + scripts/kconfig/mconf-cfg.sh | 2 +- + 8 files changed, 77 insertions(+), 45 deletions(-) +Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (d80cd9abcd94 ARM: decompressor: tidy up register usage) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/head.S | 63 +++++++++++++++++++++++--------------- + arch/arm/include/debug/tegra.S | 54 ++++++++++++++++---------------- + arch/arm/mach-footbridge/dc21285.c | 12 ++++---- + 3 files changed, 71 insertions(+), 58 deletions(-) +Merging arm64-fixes/for-next/fixes (a1df829ead58 ACPI/IORT: Do not blindly trust DMA masks from firmware) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (e2fc2de8e1aa Merge tag 'amlogic-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-gta04.dtsi | 3 +-- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 5 ++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 16 +++++++++---- + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 4 ++-- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 3 ++- + arch/arm/mach-omap1/board-osk.c | 2 ++ + arch/arm/mach-omap2/Kconfig | 28 +++++++++++----------- + arch/arm/mach-omap2/cpuidle44xx.c | 16 ++++++------- + arch/arm/mach-omap2/pdata-quirks.c | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 -- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 +--- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 --- + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +++- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 14 ++++------- + arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 ++++ + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 +-- + arch/arm64/configs/defconfig | 2 +- + drivers/bus/simple-pm-bus.c | 3 ++- + drivers/soc/ti/omap_prm.c | 11 +++++++++ + 22 files changed, 76 insertions(+), 57 deletions(-) +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 (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (66f0a9e058fa powerpc/vdso64: remove meaningless vgettimeofday.o build rule) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/Makefile | 4 ++-- + arch/powerpc/kernel/vdso32/Makefile | 5 +---- + arch/powerpc/kernel/{vdso32 => }/vdso32_wrapper.S | 0 + arch/powerpc/kernel/vdso64/Makefile | 8 +------- + arch/powerpc/kernel/{vdso64 => }/vdso64_wrapper.S | 0 + arch/powerpc/lib/sstep.c | 14 ++++++++------ + 6 files changed, 12 insertions(+), 19 deletions(-) + rename arch/powerpc/kernel/{vdso32 => }/vdso32_wrapper.S (100%) + rename arch/powerpc/kernel/{vdso64 => }/vdso64_wrapper.S (100%) +Merging s390-fixes/fixes (e82080e1f456 s390: uv: Fix sysfs max number of VCPUs reporting) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Auto-merging arch/sparc/kernel/signal_64.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 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 (eb4e8fac00d1 neighbour: Prevent a dead entry from updating gc_list) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/arcnet/arc-rimi.c | 4 +- + drivers/net/arcnet/arcdevice.h | 6 +++ + drivers/net/arcnet/arcnet.c | 66 ++++++++++++++++++++++++++-- + drivers/net/arcnet/com20020-isa.c | 4 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/arcnet/com20020_cs.c | 2 +- + drivers/net/arcnet/com90io.c | 4 +- + drivers/net/arcnet/com90xx.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 71 ++++++++++++++++++++++++++++--- + fs/afs/main.c | 6 +-- + kernel/bpf/bpf_inode_storage.c | 6 ++- + kernel/bpf/bpf_lsm.c | 12 ++++++ + kernel/bpf/cgroup.c | 7 ++- + kernel/bpf/preload/Makefile | 5 ++- + net/core/neighbour.c | 7 +-- + net/rxrpc/af_rxrpc.c | 6 +-- + 16 files changed, 180 insertions(+), 32 deletions(-) +Merging bpf/master (06cc6e5dc659 Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (da64ae2d35d3 xfrm: Fix wraparound in xfrm_policy_addr_delta()) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ 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 (93a1d4791c10 mt76: dma: fix a possible memory leak in mt76_add_fragment()) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/Kconfig | 8 ++------ + drivers/net/wireless/mediatek/mt76/dma.c | 8 +++++--- + net/mac80211/Kconfig | 2 +- + 3 files changed, 8 insertions(+), 10 deletions(-) +Merging mac80211/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (f1b0a8ea9f12 Revert "RDMA/rxe: Remove VLAN code leftovers from RXE") +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (4961167bf748 ALSA: hda/via: Apply the workaround generically for Clevo machines) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (87277d99081a Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/max98373.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 7 ------- + sound/soc/qcom/lpass-cpu.c | 22 ++++++++-------------- + sound/soc/qcom/lpass-lpaif-reg.h | 3 --- + sound/soc/qcom/lpass.h | 1 - + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 4 ++++ + sound/soc/sof/intel/hda.c | 5 ++++- + sound/soc/sof/loader.c | 2 ++ + sound/soc/sof/topology.c | 2 ++ + 11 files changed, 23 insertions(+), 29 deletions(-) +Merging regmap-fixes/for-linus (19c329f68089 Linux 5.11-rc4) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b96353f3607a Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/pf8x00-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (3277f2e72f86 Merge remote-tracking branch 'spi/for-5.11' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (7e69d07d7c3c Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume") +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 7 ------- + drivers/pci/pci.h | 4 ---- + drivers/pci/pcie/aspm.c | 44 -------------------------------------------- + 3 files changed, 55 deletions(-) +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 (6ee1d745b7c9 Linux 5.11-rc5) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (3e1f4a2e1184 USB: gadget: legacy: fix an error code in eth_bind()) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/usblp.c | 19 +++-- + drivers/usb/gadget/legacy/ether.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 4 +- + drivers/usb/host/xhci-mtk-sch.c | 123 +++++++++++++++++++++---------- + drivers/usb/host/xhci-mtk.c | 2 + + drivers/usb/host/xhci-mtk.h | 13 ++++ + drivers/usb/host/xhci.c | 8 +- + drivers/usb/host/xhci.h | 4 + + drivers/usb/serial/cp210x.c | 2 + + drivers/usb/serial/option.c | 6 ++ + 10 files changed, 136 insertions(+), 49 deletions(-) +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 (e478d6029dca USB: serial: option: Adding support for Cinterion MV31) +$ 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 (36acd5e24e30 phy: lantiq: rcu-usb2: wait after clock enable) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt | 10 +++++----- + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 10 +++++++++- + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/rockchip/phy-rockchip-emmc.c | 12 +++++++----- + 4 files changed, 22 insertions(+), 12 deletions(-) +Merging staging.current/staging-linus (6ee1d745b7c9 Linux 5.11-rc5) +$ 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 (4d395c5e7439 thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (9bbd77d5bbc9 Input: xpad - sync supported devices with fork on GitHub) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/adc-keys.txt | 22 +++++++++- + .../bindings/input/touchscreen/goodix.yaml | 1 + + drivers/input/joystick/xpad.c | 17 +++++++- + drivers/input/misc/ariel-pwrbutton.c | 6 --- + drivers/input/serio/i8042-x86ia64io.h | 2 + + drivers/input/touchscreen/goodix.c | 2 + + drivers/input/touchscreen/ili210x.c | 26 ++++++++---- + drivers/input/touchscreen/st1232.c | 48 +++++++++++++++++++--- + 8 files changed, 102 insertions(+), 22 deletions(-) +Merging crypto-current/master (4f6543f28bb0 crypto: marvel/cesa - Fix tdma descriptor on 64-bit) +$ 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 (fed1b6a00a19 dmaengine: ti: k3-udma: Fix a resource leak in an error handling path) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dmaengine.c | 1 - + drivers/dma/idxd/dma.c | 5 +- + drivers/dma/idxd/irq.c | 122 +++++++++++++++++++++++++++-------------------- + drivers/dma/ti/k3-udma.c | 3 +- + 4 files changed, 77 insertions(+), 54 deletions(-) +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 +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/rkisp1.rst | 16 ++++ + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++--- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 5 +- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 11 +-- + include/uapi/linux/rkisp1-config.h | 86 +++++++++++++++++++--- + 6 files changed, 114 insertions(+), 26 deletions(-) +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 (5c8fe583cce5 Linux 5.11-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (177d8f1f7f47 ARM: dts: omap4-droid4: Fix lost keypad slide interrupts for droid4) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (074489b77a37 Merge tag 'kvmarm-fixes-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 20 +++++++++++--------- + arch/x86/kvm/cpuid.c | 2 +- + 2 files changed, 12 insertions(+), 10 deletions(-) +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 +Merge made by the 'recursive' strategy. + Documentation/hwmon/ina2xx.rst | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (8655ef25f7e5 Merge branch 'misc-5.11' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +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 +Merge made by the 'recursive' strategy. + kernel/dma/map_benchmark.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +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 +Merge made by the 'recursive' strategy. + drivers/i3c/master/mipi-i3c-hci/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86-fixes/fixes (67fbe02a5ceb platform/x86: hp-wmi: Disable tablet-mode reporting by default) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/x86/hp-wmi.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +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 (8c65830ae162 scsi: lpfc: Fix EEH encountering oops with NVMe traffic) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/lpfc/lpfc_nvme.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging drm-fixes/drm-fixes (e0ecafede87e Merge tag 'amd-drm-fixes-5.11-2021-01-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ 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 (489140b5ba2e drm/i915/gt: Always try to reserve GGTT address 0x0) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (1bebdd0c6529 mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/sdio_cis.c | 6 ++++++ + drivers/mmc/host/sdhci-pltfm.h | 7 ++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) +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 (336e8eb2a3cf riscv: Fixup pfn_valid error with wrong max_mapnr) +$ 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 (c351bb64cbe6 gpiolib: free device name on error path to fix kmemleak) +$ git merge gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-cdev.c | 2 ++ + drivers/gpio/gpiolib.c | 10 ++++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) +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 drm-misc-fixes/for-linux-next-fixes (2b1b3e544f65 drm/ttm: Use __GFP_NOWARN for huge pages in ttm_pool_alloc_page) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 57 +++++++++++++++++++++++------- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + 2 files changed, 46 insertions(+), 13 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 (f405db04ba7f Kbuild: Make composite object searching more generic) +$ git merge kbuild/for-next +Removing scripts/gcc-version.sh +Removing scripts/clang-version.sh +Auto-merging drivers/usb/gadget/udc/aspeed-vhub/hub.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 8 +-- + Documentation/kbuild/makefiles.rst | 8 +-- + Makefile | 11 ++-- + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + drivers/scsi/gdth.c | 6 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 4 +- + include/linux/compiler-clang.h | 10 ---- + include/linux/compiler-gcc.h | 11 ---- + include/linux/usb/composite.h | 4 +- + init/Kconfig | 9 +-- + kernel/sys.c | 2 +- + lib/Kconfig.debug | 1 - + scripts/Kconfig.include | 6 ++ + scripts/Makefile.lib | 22 ++++--- + scripts/cc-version.sh | 82 ++++++++++++++++++++++++++ + 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 +----------------- + tools/perf/tests/bpf-script-example.c | 2 +- + tools/perf/tests/bpf-script-test-kbuild.c | 2 +- + tools/perf/tests/bpf-script-test-prologue.c | 2 +- + 26 files changed, 138 insertions(+), 165 deletions(-) + create mode 100755 scripts/cc-version.sh + delete mode 100755 scripts/clang-version.sh + delete mode 100755 scripts/gcc-version.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 (f726c72d6c05 dma-mapping: benchmark: check the validity of dma mask bits) +$ git merge dma-mapping/for-next +Auto-merging kernel/dma/map_benchmark.c +Merge made by the 'recursive' strategy. + kernel/dma/map_benchmark.c | 6 ++++++ + 1 file changed, 6 insertions(+) +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 (ecbbb88727ae Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (fab0e5d091a7 Merge branches 'for-next/from-tip/irq/urgent', 'for-next/faultaround', 'for-next/kexec', 'for-next/misc', 'for-next/perf', 'for-next/random', 'for-next/rng', 'for-next/selftests', 'for-next/stacktrace', 'for-next/topology' and 'for-next/vdso' into for-next/core) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + Documentation/admin-guide/perf/arm-cmn.rst | 2 +- + arch/arm/include/asm/archrandom.h | 10 + + arch/arm64/Kconfig | 4 + + arch/arm64/Makefile | 10 +- + arch/arm64/include/asm/archrandom.h | 82 +++++- + arch/arm64/include/asm/cacheflush.h | 5 - + arch/arm64/include/asm/kexec.h | 5 +- + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/include/asm/mmu_context.h | 7 +- + arch/arm64/include/asm/pgtable.h | 12 +- + arch/arm64/include/asm/sparsemem.h | 23 +- + arch/arm64/include/asm/sysreg.h | 9 +- + arch/arm64/include/asm/trans_pgd.h | 39 +++ + arch/arm64/kernel/Makefile | 5 +- + arch/arm64/kernel/entry.S | 10 +- + arch/arm64/kernel/hibernate.c | 271 ++--------------- + arch/arm64/kernel/hyp-stub.S | 2 + + arch/arm64/kernel/machine_kexec.c | 57 ++-- + arch/arm64/kernel/relocate_kernel.S | 48 +-- + arch/arm64/kernel/stacktrace.c | 13 +- + arch/arm64/kernel/topology.c | 115 ++++---- + 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/mm/Makefile | 1 + + arch/arm64/mm/mmap.c | 15 +- + arch/arm64/mm/mmu.c | 2 + + arch/arm64/mm/trans_pgd.c | 324 +++++++++++++++++++++ + drivers/char/random.c | 15 +- + drivers/firmware/smccc/smccc.c | 6 + + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-cmn.c | 19 +- + drivers/perf/arm_dmc620_pmu.c | 4 +- + 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 +- + fs/xfs/xfs_file.c | 6 +- + include/linux/arm-smccc.h | 31 ++ + include/linux/mm.h | 25 +- + include/linux/pgtable.h | 11 + + mm/filemap.c | 178 ++++++++--- + mm/khugepaged.c | 37 ++- + mm/memory.c | 223 +++++--------- + mm/nommu.c | 3 +- + mm/shmem.c | 6 +- + mm/swapfile.c | 11 +- + .../selftests/arm64/mte/check_buffer_fill.c | 2 +- + 55 files changed, 998 insertions(+), 725 deletions(-) + create mode 100644 arch/arm/include/asm/archrandom.h + create mode 100644 arch/arm64/include/asm/trans_pgd.h + 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/mm/trans_pgd.c +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 (c475c70afa96 Merge branch 'arm/defconfig' into for-next) +$ git merge arm-soc/for-next +Removing drivers/soc/zte/zx2967_pm_domains.h +Removing drivers/soc/zte/zx2967_pm_domains.c +Removing drivers/soc/zte/zx296718_pm_domains.c +Removing drivers/soc/zte/Makefile +Removing drivers/soc/zte/Kconfig +Auto-merging drivers/i2c/busses/Kconfig +Removing arch/c6x/platforms/timer64.c +Removing arch/c6x/platforms/plldata.c +Removing arch/c6x/platforms/pll.c +Removing arch/c6x/platforms/megamod-pic.c +Removing arch/c6x/platforms/emif.c +Removing arch/c6x/platforms/dscr.c +Removing arch/c6x/platforms/cache.c +Removing arch/c6x/platforms/Makefile +Removing arch/c6x/platforms/Kconfig +Removing arch/c6x/mm/init.c +Removing arch/c6x/mm/dma-coherent.c +Removing arch/c6x/mm/Makefile +Removing arch/c6x/lib/strasgi_64plus.S +Removing arch/c6x/lib/strasgi.S +Removing arch/c6x/lib/remu.S +Removing arch/c6x/lib/remi.S +Removing arch/c6x/lib/push_rts.S +Removing arch/c6x/lib/pop_rts.S +Removing arch/c6x/lib/negll.S +Removing arch/c6x/lib/mpyll.S +Removing arch/c6x/lib/memcpy_64plus.S +Removing arch/c6x/lib/llshru.S +Removing arch/c6x/lib/llshr.S +Removing arch/c6x/lib/llshl.S +Removing arch/c6x/lib/divu.S +Removing arch/c6x/lib/divremu.S +Removing arch/c6x/lib/divremi.S +Removing arch/c6x/lib/divi.S +Removing arch/c6x/lib/csum_64plus.S +Removing arch/c6x/lib/checksum.c +Removing arch/c6x/lib/Makefile +Removing arch/c6x/kernel/vmlinux.lds.S +Removing arch/c6x/kernel/vectors.S +Removing arch/c6x/kernel/traps.c +Removing arch/c6x/kernel/time.c +Removing arch/c6x/kernel/sys_c6x.c +Removing arch/c6x/kernel/switch_to.S +Removing arch/c6x/kernel/soc.c +Removing arch/c6x/kernel/signal.c +Removing arch/c6x/kernel/setup.c +Removing arch/c6x/kernel/ptrace.c +Removing arch/c6x/kernel/process.c +Removing arch/c6x/kernel/module.c +Removing arch/c6x/kernel/irq.c +Removing arch/c6x/kernel/head.S +Removing arch/c6x/kernel/entry.S +Removing arch/c6x/kernel/devicetree.c +Removing arch/c6x/kernel/c6x_ksyms.c +Removing arch/c6x/kernel/asm-offsets.c +Removing arch/c6x/kernel/Makefile +Removing arch/c6x/include/uapi/asm/unistd.h +Removing arch/c6x/include/uapi/asm/swab.h +Removing arch/c6x/include/uapi/asm/sigcontext.h +Removing arch/c6x/include/uapi/asm/setup.h +Removing arch/c6x/include/uapi/asm/ptrace.h +Removing arch/c6x/include/uapi/asm/byteorder.h +Removing arch/c6x/include/uapi/asm/Kbuild +Removing arch/c6x/include/asm/vmalloc.h +Removing arch/c6x/include/asm/unaligned.h +Removing arch/c6x/include/asm/uaccess.h +Removing arch/c6x/include/asm/traps.h +Removing arch/c6x/include/asm/tlb.h +Removing arch/c6x/include/asm/timex.h +Removing arch/c6x/include/asm/timer64.h +Removing arch/c6x/include/asm/thread_info.h +Removing arch/c6x/include/asm/syscalls.h +Removing arch/c6x/include/asm/syscall.h +Removing arch/c6x/include/asm/switch_to.h +Removing arch/c6x/include/asm/string.h +Removing arch/c6x/include/asm/special_insns.h +Removing arch/c6x/include/asm/soc.h +Removing arch/c6x/include/asm/setup.h +Removing arch/c6x/include/asm/sections.h +Removing arch/c6x/include/asm/ptrace.h +Removing arch/c6x/include/asm/procinfo.h +Removing arch/c6x/include/asm/processor.h +Removing arch/c6x/include/asm/pgtable.h +Removing arch/c6x/include/asm/page.h +Removing arch/c6x/include/asm/module.h +Removing arch/c6x/include/asm/mmu_context.h +Removing arch/c6x/include/asm/megamod-pic.h +Removing arch/c6x/include/asm/linkage.h +Removing arch/c6x/include/asm/irqflags.h +Removing arch/c6x/include/asm/irq.h +Removing arch/c6x/include/asm/hardirq.h +Removing arch/c6x/include/asm/ftrace.h +Removing arch/c6x/include/asm/flat.h +Removing arch/c6x/include/asm/elf.h +Removing arch/c6x/include/asm/dscr.h +Removing arch/c6x/include/asm/delay.h +Removing arch/c6x/include/asm/cmpxchg.h +Removing arch/c6x/include/asm/clock.h +Removing arch/c6x/include/asm/checksum.h +Removing arch/c6x/include/asm/cacheflush.h +Removing arch/c6x/include/asm/cache.h +Removing arch/c6x/include/asm/bug.h +Removing arch/c6x/include/asm/bitops.h +Removing arch/c6x/include/asm/asm-offsets.h +Removing arch/c6x/include/asm/Kbuild +Removing arch/c6x/configs/evmc6678_defconfig +Removing arch/c6x/configs/evmc6474_defconfig +Removing arch/c6x/configs/evmc6472_defconfig +Removing arch/c6x/configs/evmc6457_defconfig +Removing arch/c6x/configs/dsk6455_defconfig +Removing arch/c6x/boot/dts/tms320c6678.dtsi +Removing arch/c6x/boot/dts/tms320c6474.dtsi +Removing arch/c6x/boot/dts/tms320c6472.dtsi +Removing arch/c6x/boot/dts/tms320c6457.dtsi +Removing arch/c6x/boot/dts/tms320c6455.dtsi +Removing arch/c6x/boot/dts/evmc6678.dts +Removing arch/c6x/boot/dts/evmc6474.dts +Removing arch/c6x/boot/dts/evmc6472.dts +Removing arch/c6x/boot/dts/evmc6457.dts +Removing arch/c6x/boot/dts/dsk6455.dts +Removing arch/c6x/boot/dts/Makefile +Removing arch/c6x/boot/Makefile +Removing arch/c6x/Makefile +Removing arch/c6x/Kconfig.debug +Removing arch/c6x/Kconfig +Removing arch/arm64/boot/dts/zte/zx296718.dtsi +Removing arch/arm64/boot/dts/zte/zx296718-pcbox.dts +Removing arch/arm64/boot/dts/zte/zx296718-evb.dts +Removing arch/arm64/boot/dts/zte/Makefile +Removing arch/arm/mach-zx/zx296702.c +Removing arch/arm/mach-zx/zx296702-pm-domain.c +Removing arch/arm/mach-zx/platsmp.c +Removing arch/arm/mach-zx/headsmp.S +Removing arch/arm/mach-zx/core.h +Removing arch/arm/mach-zx/Makefile +Removing arch/arm/mach-zx/Kconfig +Removing arch/arm/mach-u300/regulator.c +Removing arch/arm/mach-u300/core.c +Removing arch/arm/mach-u300/Makefile +Removing arch/arm/mach-u300/Kconfig +Removing arch/arm/mach-tango/smc.h +Removing arch/arm/mach-tango/smc.S +Removing arch/arm/mach-tango/setup.c +Removing arch/arm/mach-tango/pm.h +Removing arch/arm/mach-tango/pm.c +Removing arch/arm/mach-tango/platsmp.c +Removing arch/arm/mach-tango/Makefile +Removing arch/arm/mach-tango/Kconfig +Removing arch/arm/mach-prima2/sleep.S +Removing arch/arm/mach-prima2/rtciobrg.c +Removing arch/arm/mach-prima2/rstc.c +Removing arch/arm/mach-prima2/pm.h +Removing arch/arm/mach-prima2/pm.c +Removing arch/arm/mach-prima2/platsmp.c +Removing arch/arm/mach-prima2/hotplug.c +Removing arch/arm/mach-prima2/headsmp.S +Removing arch/arm/mach-prima2/common.h +Removing arch/arm/mach-prima2/common.c +Removing arch/arm/mach-prima2/Makefile +Removing arch/arm/mach-prima2/Kconfig +Removing arch/arm/mach-picoxcell/common.c +Removing arch/arm/mach-picoxcell/Makefile +Removing arch/arm/mach-picoxcell/Kconfig +Removing arch/arm/mach-efm32/dtmachine.c +Removing arch/arm/mach-efm32/Makefile.boot +Removing arch/arm/mach-efm32/Makefile +Removing arch/arm/include/debug/sirf.S +Removing arch/arm/include/debug/efm32.S +Removing arch/arm/configs/zx_defconfig +Removing arch/arm/configs/u300_defconfig +Removing arch/arm/configs/tango4_defconfig +Removing arch/arm/configs/prima2_defconfig +Removing arch/arm/configs/efm32_defconfig +Removing arch/arm/boot/dts/zx296702.dtsi +Removing arch/arm/boot/dts/zx296702-ad1.dts +Removing arch/arm/boot/dts/tango4-vantage-1172.dts +Removing arch/arm/boot/dts/tango4-smp8758.dtsi +Removing arch/arm/boot/dts/tango4-common.dtsi +Removing arch/arm/boot/dts/ste-u300.dts +Removing arch/arm/boot/dts/prima2.dtsi +Removing arch/arm/boot/dts/prima2-evb.dts +Removing arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts +Removing arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts +Removing arch/arm/boot/dts/picoxcell-pc3x3.dtsi +Removing arch/arm/boot/dts/picoxcell-pc3x2.dtsi +Removing arch/arm/boot/dts/efm32gg.dtsi +Removing arch/arm/boot/dts/efm32gg-dk3750.dts +Removing arch/arm/boot/dts/atlas7.dtsi +Removing arch/arm/boot/dts/atlas7-evb.dts +Removing arch/arm/boot/dts/atlas6.dtsi +Removing arch/arm/boot/dts/atlas6-evb.dts +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/timer/ti,c64x+timer64.txt +Removing Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt +Auto-merging Documentation/devicetree/bindings/serial/pl011.yaml +Removing Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt +Removing Documentation/devicetree/bindings/reset/sirf,rstc.txt +Removing Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt +Removing Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt +Removing Documentation/devicetree/bindings/c6x/soc.txt +Removing Documentation/devicetree/bindings/c6x/emifa.txt +Removing Documentation/devicetree/bindings/c6x/dscr.txt +Removing Documentation/devicetree/bindings/c6x/clocks.txt +Removing Documentation/devicetree/bindings/arm/zte.yaml +Removing Documentation/devicetree/bindings/arm/zte,sysctrl.txt +Removing Documentation/devicetree/bindings/arm/ste-u300.txt +Removing Documentation/devicetree/bindings/arm/sirf.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 8 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 2 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 2 + + Documentation/devicetree/bindings/arm/sirf.yaml | 30 - + Documentation/devicetree/bindings/arm/ste-u300.txt | 46 - + .../devicetree/bindings/arm/zte,sysctrl.txt | 30 - + Documentation/devicetree/bindings/arm/zte.yaml | 28 - + Documentation/devicetree/bindings/c6x/clocks.txt | 40 - + Documentation/devicetree/bindings/c6x/dscr.txt | 127 -- + Documentation/devicetree/bindings/c6x/emifa.txt | 62 - + Documentation/devicetree/bindings/c6x/soc.txt | 28 - + .../interrupt-controller/ti,c64x+megamod-pic.txt | 103 -- + .../reset/brcm,bcm4908-misc-pcie-reset.yaml | 39 + + .../bindings/reset/hisilicon,hi3660-reset.txt | 44 - + .../bindings/reset/hisilicon,hi3660-reset.yaml | 77 + + .../devicetree/bindings/reset/sirf,rstc.txt | 42 - + .../devicetree/bindings/reset/zte,zx2967-reset.txt | 20 - + .../devicetree/bindings/serial/pl011.yaml | 2 - + .../devicetree/bindings/soc/zte/pd-2967xx.txt | 19 - + .../devicetree/bindings/timer/ti,c64x+timer64.txt | 25 - + .../devicetree/bindings/vendor-prefixes.yaml | 4 +- + MAINTAINERS | 106 +- + arch/arm/Kconfig | 20 +- + arch/arm/Kconfig.debug | 95 +- + arch/arm/Makefile | 6 - + arch/arm/arm-soc-for-next-contents.txt | 119 ++ + arch/arm/boot/dts/Makefile | 18 +- + arch/arm/boot/dts/am335x-evm.dts | 13 +- + arch/arm/boot/dts/am335x-evmsk.dts | 14 +- + arch/arm/boot/dts/am335x-icev2.dts | 14 +- + arch/arm/boot/dts/am335x-myirtech-myc.dtsi | 267 +++ + arch/arm/boot/dts/am335x-myirtech-myd.dts | 536 ++++++ + arch/arm/boot/dts/am33xx-l4.dtsi | 49 + + arch/arm/boot/dts/am574x-idk.dts | 4 + + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 1 - + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 22 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_icp.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 - + arch/arm/boot/dts/atlas6-evb.dts | 78 - + arch/arm/boot/dts/atlas6.dtsi | 800 -------- + arch/arm/boot/dts/atlas7-evb.dts | 127 -- + arch/arm/boot/dts/atlas7.dtsi | 1955 -------------------- + arch/arm/boot/dts/berlin2.dtsi | 12 +- + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 6 +- + arch/arm/boot/dts/berlin2cd.dtsi | 12 +- + arch/arm/boot/dts/berlin2q.dtsi | 12 +- + arch/arm/boot/dts/dra71-evm.dts | 2 + + arch/arm/boot/dts/dra76x.dtsi | 36 + + arch/arm/boot/dts/efm32gg-dk3750.dts | 88 - + arch/arm/boot/dts/efm32gg.dtsi | 177 -- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 23 + + .../boot/dts/mstar-infinity-breadbee-common.dtsi | 49 + + .../dts/mstar-infinity-msc313-breadbee_crust.dts | 1 + + .../boot/dts/mstar-infinity3-msc313e-breadbee.dts | 1 + + arch/arm/boot/dts/omap3-echo.dts | 67 + + arch/arm/boot/dts/omap3-gta04.dtsi | 4 +- + arch/arm/boot/dts/omap3-igep.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030.dts | 2 +- + arch/arm/boot/dts/omap36xx.dtsi | 1 - + arch/arm/boot/dts/omap443x.dtsi | 6 +- + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 243 --- + arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 355 ---- + arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 78 - + arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 84 - + arch/arm/boot/dts/prima2-evb.dts | 37 - + arch/arm/boot/dts/prima2.dtsi | 838 --------- + arch/arm/boot/dts/socfpga_arria10.dtsi | 13 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 64 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 67 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 +- + arch/arm/boot/dts/ste-href.dtsi | 23 +- + arch/arm/boot/dts/ste-href520-tvk.dts | 42 +- + arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 19 + + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 19 + + arch/arm/boot/dts/ste-hrefprev60.dtsi | 8 +- + arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 39 + + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 39 + + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 76 +- + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 2 +- + arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +- + arch/arm/boot/dts/ste-snowball.dts | 8 +- + arch/arm/boot/dts/ste-u300.dts | 464 ----- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 894 +++++++++ + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 +- + arch/arm/boot/dts/stm32f429.dtsi | 2 +- + arch/arm/boot/dts/stm32f746.dtsi | 4 +- + arch/arm/boot/dts/stm32h743.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 40 + + arch/arm/boot/dts/stm32mp151.dtsi | 9 +- + arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 4 - + arch/arm/boot/dts/stm32mp157c-ed1.dts | 4 - + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 13 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 2 - + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 - + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 12 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 20 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 4 - + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 - + arch/arm/boot/dts/tango4-common.dtsi | 184 -- + arch/arm/boot/dts/tango4-smp8758.dtsi | 57 - + arch/arm/boot/dts/tango4-vantage-1172.dts | 42 - + arch/arm/boot/dts/tegra30-ouya.dts | 4 +- + arch/arm/boot/dts/zx296702-ad1.dts | 48 - + arch/arm/boot/dts/zx296702.dtsi | 142 -- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/efm32_defconfig | 98 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 13 +- + arch/arm/configs/prima2_defconfig | 72 - + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/configs/tango4_defconfig | 93 - + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/configs/u300_defconfig | 65 - + arch/arm/configs/zx_defconfig | 122 -- + arch/arm/include/debug/efm32.S | 45 - + arch/arm/include/debug/sirf.S | 40 - + arch/arm/mach-efm32/Makefile | 2 - + arch/arm/mach-efm32/Makefile.boot | 4 - + arch/arm/mach-efm32/dtmachine.c | 16 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-omap2/clockdomain.c | 4 +- + arch/arm/mach-picoxcell/Kconfig | 9 - + arch/arm/mach-picoxcell/Makefile | 2 - + arch/arm/mach-picoxcell/common.c | 81 - + arch/arm/mach-prima2/Kconfig | 48 - + arch/arm/mach-prima2/Makefile | 9 - + arch/arm/mach-prima2/common.c | 64 - + arch/arm/mach-prima2/common.h | 32 - + arch/arm/mach-prima2/headsmp.S | 36 - + arch/arm/mach-prima2/hotplug.c | 38 - + arch/arm/mach-prima2/platsmp.c | 123 -- + arch/arm/mach-prima2/pm.c | 153 -- + arch/arm/mach-prima2/pm.h | 28 - + arch/arm/mach-prima2/rstc.c | 107 -- + arch/arm/mach-prima2/rtciobrg.c | 179 -- + arch/arm/mach-prima2/sleep.S | 63 - + arch/arm/mach-tango/Kconfig | 13 - + arch/arm/mach-tango/Makefile | 4 - + arch/arm/mach-tango/platsmp.c | 52 - + arch/arm/mach-tango/pm.c | 31 - + arch/arm/mach-tango/pm.h | 7 - + arch/arm/mach-tango/setup.c | 20 - + arch/arm/mach-tango/smc.S | 12 - + arch/arm/mach-tango/smc.h | 9 - + arch/arm/mach-tegra/sleep-tegra20.S | 38 +- + arch/arm/mach-tegra/sleep-tegra30.S | 94 +- + arch/arm/mach-u300/Kconfig | 32 - + arch/arm/mach-u300/Makefile | 8 - + arch/arm/mach-u300/core.c | 413 ----- + arch/arm/mach-u300/regulator.c | 134 -- + arch/arm/mach-zx/Kconfig | 21 - + arch/arm/mach-zx/Makefile | 3 - + arch/arm/mach-zx/core.h | 16 - + arch/arm/mach-zx/headsmp.S | 30 - + arch/arm/mach-zx/platsmp.c | 186 -- + arch/arm/mach-zx/zx296702-pm-domain.c | 202 -- + arch/arm/mach-zx/zx296702.c | 22 - + arch/arm/mm/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/Makefile | 1 - + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 6 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 77 + + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 8 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 8 +- + .../arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi | 632 ++++++- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 6 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 9 +- + arch/arm64/boot/dts/intel/Makefile | 1 + + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 53 + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 742 ++++++++ + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 22 + + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 8 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 595 +++++- + .../dts/nvidia/tegra194-p3509-0000+p3668-0000.dts | 339 +--- + .../dts/nvidia/tegra194-p3509-0000+p3668-0001.dts | 10 + + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 351 ++++ + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 282 +-- + .../arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 19 + + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 284 +++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 48 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 299 +++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 175 ++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 261 ++- + arch/arm64/boot/dts/renesas/Makefile | 2 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 137 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 47 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 2 + + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 41 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 32 + + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 66 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 32 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 17 + + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 71 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 32 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 65 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 65 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 135 ++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 65 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 2 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 65 + + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 135 ++ + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 138 ++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 6 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 837 +++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 + + arch/arm64/boot/dts/synaptics/as370.dtsi | 4 +- + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 12 +- + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 5 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 12 + + arch/arm64/boot/dts/zte/Makefile | 3 - + arch/arm64/boot/dts/zte/zx296718-evb.dts | 144 -- + arch/arm64/boot/dts/zte/zx296718-pcbox.dts | 143 -- + arch/arm64/boot/dts/zte/zx296718.dtsi | 627 ------- + arch/arm64/configs/defconfig | 2 + + arch/c6x/Kconfig | 113 -- + arch/c6x/Kconfig.debug | 10 - + arch/c6x/Makefile | 60 - + arch/c6x/boot/Makefile | 11 - + arch/c6x/boot/dts/Makefile | 16 - + arch/c6x/boot/dts/dsk6455.dts | 57 - + arch/c6x/boot/dts/evmc6457.dts | 43 - + arch/c6x/boot/dts/evmc6472.dts | 68 - + arch/c6x/boot/dts/evmc6474.dts | 53 - + arch/c6x/boot/dts/evmc6678.dts | 78 - + arch/c6x/boot/dts/tms320c6455.dtsi | 97 - + arch/c6x/boot/dts/tms320c6457.dtsi | 69 - + arch/c6x/boot/dts/tms320c6472.dtsi | 135 -- + arch/c6x/boot/dts/tms320c6474.dtsi | 90 - + arch/c6x/boot/dts/tms320c6678.dtsi | 147 -- + arch/c6x/configs/dsk6455_defconfig | 42 - + arch/c6x/configs/evmc6457_defconfig | 39 - + arch/c6x/configs/evmc6472_defconfig | 40 - + arch/c6x/configs/evmc6474_defconfig | 40 - + arch/c6x/configs/evmc6678_defconfig | 40 - + arch/c6x/include/asm/Kbuild | 5 - + arch/c6x/include/asm/asm-offsets.h | 1 - + arch/c6x/include/asm/bitops.h | 95 - + arch/c6x/include/asm/bug.h | 20 - + arch/c6x/include/asm/cache.h | 94 - + arch/c6x/include/asm/cacheflush.h | 45 - + arch/c6x/include/asm/checksum.h | 34 - + arch/c6x/include/asm/clock.h | 145 -- + arch/c6x/include/asm/cmpxchg.h | 63 - + arch/c6x/include/asm/delay.h | 64 - + arch/c6x/include/asm/dscr.h | 30 - + arch/c6x/include/asm/elf.h | 117 -- + arch/c6x/include/asm/flat.h | 19 - + arch/c6x/include/asm/ftrace.h | 6 - + arch/c6x/include/asm/hardirq.h | 17 - + arch/c6x/include/asm/irq.h | 50 - + arch/c6x/include/asm/irqflags.h | 68 - + arch/c6x/include/asm/linkage.h | 31 - + arch/c6x/include/asm/megamod-pic.h | 10 - + arch/c6x/include/asm/mmu_context.h | 6 - + arch/c6x/include/asm/module.h | 20 - + arch/c6x/include/asm/page.h | 9 - + arch/c6x/include/asm/pgtable.h | 66 - + arch/c6x/include/asm/processor.h | 114 -- + arch/c6x/include/asm/procinfo.h | 24 - + arch/c6x/include/asm/ptrace.h | 32 - + arch/c6x/include/asm/sections.h | 12 - + arch/c6x/include/asm/setup.h | 31 - + arch/c6x/include/asm/soc.h | 35 - + arch/c6x/include/asm/special_insns.h | 60 - + arch/c6x/include/asm/string.h | 18 - + arch/c6x/include/asm/switch_to.h | 30 - + arch/c6x/include/asm/syscall.h | 75 - + arch/c6x/include/asm/syscalls.h | 46 - + arch/c6x/include/asm/thread_info.h | 94 - + arch/c6x/include/asm/timer64.h | 7 - + arch/c6x/include/asm/timex.h | 30 - + arch/c6x/include/asm/tlb.h | 7 - + arch/c6x/include/asm/traps.h | 33 - + arch/c6x/include/asm/uaccess.h | 97 - + arch/c6x/include/asm/unaligned.h | 104 -- + arch/c6x/include/asm/vmalloc.h | 4 - + arch/c6x/include/uapi/asm/Kbuild | 2 - + arch/c6x/include/uapi/asm/byteorder.h | 13 - + arch/c6x/include/uapi/asm/ptrace.h | 164 -- + arch/c6x/include/uapi/asm/setup.h | 7 - + arch/c6x/include/uapi/asm/sigcontext.h | 81 - + arch/c6x/include/uapi/asm/swab.h | 55 - + arch/c6x/include/uapi/asm/unistd.h | 29 - + arch/c6x/kernel/Makefile | 13 - + arch/c6x/kernel/asm-offsets.c | 123 -- + arch/c6x/kernel/c6x_ksyms.c | 62 - + arch/c6x/kernel/devicetree.c | 14 - + arch/c6x/kernel/entry.S | 736 -------- + arch/c6x/kernel/head.S | 81 - + arch/c6x/kernel/irq.c | 127 -- + arch/c6x/kernel/module.c | 119 -- + arch/c6x/kernel/process.c | 151 -- + arch/c6x/kernel/ptrace.c | 139 -- + arch/c6x/kernel/setup.c | 476 ----- + arch/c6x/kernel/signal.c | 322 ---- + arch/c6x/kernel/soc.c | 87 - + arch/c6x/kernel/switch_to.S | 71 - + arch/c6x/kernel/sys_c6x.c | 71 - + arch/c6x/kernel/time.c | 63 - + arch/c6x/kernel/traps.c | 409 ---- + arch/c6x/kernel/vectors.S | 78 - + arch/c6x/kernel/vmlinux.lds.S | 151 -- + arch/c6x/lib/Makefile | 8 - + arch/c6x/lib/checksum.c | 11 - + arch/c6x/lib/csum_64plus.S | 414 ----- + arch/c6x/lib/divi.S | 41 - + arch/c6x/lib/divremi.S | 34 - + arch/c6x/lib/divremu.S | 75 - + arch/c6x/lib/divu.S | 86 - + arch/c6x/lib/llshl.S | 25 - + arch/c6x/lib/llshr.S | 26 - + arch/c6x/lib/llshru.S | 26 - + arch/c6x/lib/memcpy_64plus.S | 43 - + arch/c6x/lib/mpyll.S | 37 - + arch/c6x/lib/negll.S | 19 - + arch/c6x/lib/pop_rts.S | 20 - + arch/c6x/lib/push_rts.S | 19 - + arch/c6x/lib/remi.S | 52 - + arch/c6x/lib/remu.S | 70 - + arch/c6x/lib/strasgi.S | 77 - + arch/c6x/lib/strasgi_64plus.S | 27 - + arch/c6x/mm/Makefile | 6 - + arch/c6x/mm/dma-coherent.c | 173 -- + arch/c6x/mm/init.c | 65 - + arch/c6x/platforms/Kconfig | 21 - + arch/c6x/platforms/Makefile | 13 - + arch/c6x/platforms/cache.c | 444 ----- + arch/c6x/platforms/dscr.c | 595 ------ + arch/c6x/platforms/emif.c | 84 - + arch/c6x/platforms/megamod-pic.c | 344 ---- + arch/c6x/platforms/pll.c | 440 ----- + arch/c6x/platforms/plldata.c | 467 ----- + arch/c6x/platforms/timer64.c | 241 --- + drivers/bus/Kconfig | 2 +- + drivers/firmware/arm_scmi/driver.c | 4 +- + drivers/firmware/arm_scmi/smc.c | 42 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/mtd/nand/raw/Kconfig | 3 +- + drivers/reset/Kconfig | 2 +- + drivers/reset/core.c | 4 +- + drivers/reset/hisilicon/reset-hi3660.c | 9 +- + drivers/reset/reset-simple.c | 2 + + drivers/soc/Kconfig | 1 - + drivers/soc/Makefile | 1 - + drivers/soc/atmel/soc.c | 227 ++- + drivers/soc/atmel/soc.h | 19 +- + drivers/soc/renesas/rcar-sysc.c | 37 +- + drivers/soc/samsung/Kconfig | 12 +- + drivers/soc/samsung/Makefile | 3 +- + drivers/soc/samsung/exynos-asv.c | 57 +- + drivers/soc/samsung/exynos-asv.h | 2 + + drivers/soc/samsung/exynos-chipid.c | 71 +- + drivers/soc/samsung/pm_domains.c | 97 +- + drivers/soc/zte/Kconfig | 15 - + drivers/soc/zte/Makefile | 6 - + drivers/soc/zte/zx296718_pm_domains.c | 181 -- + drivers/soc/zte/zx2967_pm_domains.c | 141 -- + drivers/soc/zte/zx2967_pm_domains.h | 44 - + drivers/spi/Kconfig | 1 - + fs/Kconfig.binfmt | 2 +- + include/asm-generic/page.h | 4 - + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/linux/reset.h | 19 + + 381 files changed, 8723 insertions(+), 22744 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/sirf.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/ste-u300.txt + delete mode 100644 Documentation/devicetree/bindings/arm/zte,sysctrl.txt + delete mode 100644 Documentation/devicetree/bindings/arm/zte.yaml + delete mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt + delete mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt + delete mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt + delete mode 100644 Documentation/devicetree/bindings/c6x/soc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm4908-misc-pcie-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/sirf,rstc.txt + delete mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt + delete mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt + delete mode 100644 Documentation/devicetree/bindings/timer/ti,c64x+timer64.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-myirtech-myc.dtsi + create mode 100644 arch/arm/boot/dts/am335x-myirtech-myd.dts + delete mode 100644 arch/arm/boot/dts/atlas6-evb.dts + delete mode 100644 arch/arm/boot/dts/atlas6.dtsi + delete mode 100644 arch/arm/boot/dts/atlas7-evb.dts + delete mode 100644 arch/arm/boot/dts/atlas7.dtsi + delete mode 100644 arch/arm/boot/dts/efm32gg-dk3750.dts + delete mode 100644 arch/arm/boot/dts/efm32gg.dtsi + create mode 100644 arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts + delete mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts + delete mode 100644 arch/arm/boot/dts/prima2-evb.dts + delete mode 100644 arch/arm/boot/dts/prima2.dtsi + delete mode 100644 arch/arm/boot/dts/ste-u300.dts + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-janice.dts + delete mode 100644 arch/arm/boot/dts/tango4-common.dtsi + delete mode 100644 arch/arm/boot/dts/tango4-smp8758.dtsi + delete mode 100644 arch/arm/boot/dts/tango4-vantage-1172.dts + delete mode 100644 arch/arm/boot/dts/zx296702-ad1.dts + delete mode 100644 arch/arm/boot/dts/zx296702.dtsi + delete mode 100644 arch/arm/configs/efm32_defconfig + delete mode 100644 arch/arm/configs/prima2_defconfig + delete mode 100644 arch/arm/configs/tango4_defconfig + delete mode 100644 arch/arm/configs/u300_defconfig + delete mode 100644 arch/arm/configs/zx_defconfig + delete mode 100644 arch/arm/include/debug/efm32.S + delete mode 100644 arch/arm/include/debug/sirf.S + delete mode 100644 arch/arm/mach-efm32/Makefile + delete mode 100644 arch/arm/mach-efm32/Makefile.boot + delete mode 100644 arch/arm/mach-efm32/dtmachine.c + delete mode 100644 arch/arm/mach-picoxcell/Kconfig + delete mode 100644 arch/arm/mach-picoxcell/Makefile + delete mode 100644 arch/arm/mach-picoxcell/common.c + delete mode 100644 arch/arm/mach-prima2/Kconfig + delete mode 100644 arch/arm/mach-prima2/Makefile + delete mode 100644 arch/arm/mach-prima2/common.c + delete mode 100644 arch/arm/mach-prima2/common.h + delete mode 100644 arch/arm/mach-prima2/headsmp.S + delete mode 100644 arch/arm/mach-prima2/hotplug.c + delete mode 100644 arch/arm/mach-prima2/platsmp.c + delete mode 100644 arch/arm/mach-prima2/pm.c + delete mode 100644 arch/arm/mach-prima2/pm.h + delete mode 100644 arch/arm/mach-prima2/rstc.c + delete mode 100644 arch/arm/mach-prima2/rtciobrg.c + delete mode 100644 arch/arm/mach-prima2/sleep.S + delete mode 100644 arch/arm/mach-tango/Kconfig + delete mode 100644 arch/arm/mach-tango/Makefile + delete mode 100644 arch/arm/mach-tango/platsmp.c + delete mode 100644 arch/arm/mach-tango/pm.c + delete mode 100644 arch/arm/mach-tango/pm.h + delete mode 100644 arch/arm/mach-tango/setup.c + delete mode 100644 arch/arm/mach-tango/smc.S + delete mode 100644 arch/arm/mach-tango/smc.h + delete mode 100644 arch/arm/mach-u300/Kconfig + delete mode 100644 arch/arm/mach-u300/Makefile + delete mode 100644 arch/arm/mach-u300/core.c + delete mode 100644 arch/arm/mach-u300/regulator.c + delete mode 100644 arch/arm/mach-zx/Kconfig + delete mode 100644 arch/arm/mach-zx/Makefile + delete mode 100644 arch/arm/mach-zx/core.h + delete mode 100644 arch/arm/mach-zx/headsmp.S + delete mode 100644 arch/arm/mach-zx/platsmp.c + delete mode 100644 arch/arm/mach-zx/zx296702-pm-domain.c + delete mode 100644 arch/arm/mach-zx/zx296702.c + create mode 100644 arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts + delete mode 100644 arch/arm64/boot/dts/zte/Makefile + delete mode 100644 arch/arm64/boot/dts/zte/zx296718-evb.dts + delete mode 100644 arch/arm64/boot/dts/zte/zx296718-pcbox.dts + delete mode 100644 arch/arm64/boot/dts/zte/zx296718.dtsi + delete mode 100644 arch/c6x/Kconfig + delete mode 100644 arch/c6x/Kconfig.debug + delete mode 100644 arch/c6x/Makefile + delete mode 100644 arch/c6x/boot/Makefile + delete mode 100644 arch/c6x/boot/dts/Makefile + delete mode 100644 arch/c6x/boot/dts/dsk6455.dts + delete mode 100644 arch/c6x/boot/dts/evmc6457.dts + delete mode 100644 arch/c6x/boot/dts/evmc6472.dts + delete mode 100644 arch/c6x/boot/dts/evmc6474.dts + delete mode 100644 arch/c6x/boot/dts/evmc6678.dts + delete mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi + delete mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi + delete mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi + delete mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi + delete mode 100644 arch/c6x/boot/dts/tms320c6678.dtsi + delete mode 100644 arch/c6x/configs/dsk6455_defconfig + delete mode 100644 arch/c6x/configs/evmc6457_defconfig + delete mode 100644 arch/c6x/configs/evmc6472_defconfig + delete mode 100644 arch/c6x/configs/evmc6474_defconfig + delete mode 100644 arch/c6x/configs/evmc6678_defconfig + delete mode 100644 arch/c6x/include/asm/Kbuild + delete mode 100644 arch/c6x/include/asm/asm-offsets.h + delete mode 100644 arch/c6x/include/asm/bitops.h + delete mode 100644 arch/c6x/include/asm/bug.h + delete mode 100644 arch/c6x/include/asm/cache.h + delete mode 100644 arch/c6x/include/asm/cacheflush.h + delete mode 100644 arch/c6x/include/asm/checksum.h + delete mode 100644 arch/c6x/include/asm/clock.h + delete mode 100644 arch/c6x/include/asm/cmpxchg.h + delete mode 100644 arch/c6x/include/asm/delay.h + delete mode 100644 arch/c6x/include/asm/dscr.h + delete mode 100644 arch/c6x/include/asm/elf.h + delete mode 100644 arch/c6x/include/asm/flat.h + delete mode 100644 arch/c6x/include/asm/ftrace.h + delete mode 100644 arch/c6x/include/asm/hardirq.h + delete mode 100644 arch/c6x/include/asm/irq.h + delete mode 100644 arch/c6x/include/asm/irqflags.h + delete mode 100644 arch/c6x/include/asm/linkage.h + delete mode 100644 arch/c6x/include/asm/megamod-pic.h + delete mode 100644 arch/c6x/include/asm/mmu_context.h + delete mode 100644 arch/c6x/include/asm/module.h + delete mode 100644 arch/c6x/include/asm/page.h + delete mode 100644 arch/c6x/include/asm/pgtable.h + delete mode 100644 arch/c6x/include/asm/processor.h + delete mode 100644 arch/c6x/include/asm/procinfo.h + delete mode 100644 arch/c6x/include/asm/ptrace.h + delete mode 100644 arch/c6x/include/asm/sections.h + delete mode 100644 arch/c6x/include/asm/setup.h + delete mode 100644 arch/c6x/include/asm/soc.h + delete mode 100644 arch/c6x/include/asm/special_insns.h + delete mode 100644 arch/c6x/include/asm/string.h + delete mode 100644 arch/c6x/include/asm/switch_to.h + delete mode 100644 arch/c6x/include/asm/syscall.h + delete mode 100644 arch/c6x/include/asm/syscalls.h + delete mode 100644 arch/c6x/include/asm/thread_info.h + delete mode 100644 arch/c6x/include/asm/timer64.h + delete mode 100644 arch/c6x/include/asm/timex.h + delete mode 100644 arch/c6x/include/asm/tlb.h + delete mode 100644 arch/c6x/include/asm/traps.h + delete mode 100644 arch/c6x/include/asm/uaccess.h + delete mode 100644 arch/c6x/include/asm/unaligned.h + delete mode 100644 arch/c6x/include/asm/vmalloc.h + delete mode 100644 arch/c6x/include/uapi/asm/Kbuild + delete mode 100644 arch/c6x/include/uapi/asm/byteorder.h + delete mode 100644 arch/c6x/include/uapi/asm/ptrace.h + delete mode 100644 arch/c6x/include/uapi/asm/setup.h + delete mode 100644 arch/c6x/include/uapi/asm/sigcontext.h + delete mode 100644 arch/c6x/include/uapi/asm/swab.h + delete mode 100644 arch/c6x/include/uapi/asm/unistd.h + delete mode 100644 arch/c6x/kernel/Makefile + delete mode 100644 arch/c6x/kernel/asm-offsets.c + delete mode 100644 arch/c6x/kernel/c6x_ksyms.c + delete mode 100644 arch/c6x/kernel/devicetree.c + delete mode 100644 arch/c6x/kernel/entry.S + delete mode 100644 arch/c6x/kernel/head.S + delete mode 100644 arch/c6x/kernel/irq.c + delete mode 100644 arch/c6x/kernel/module.c + delete mode 100644 arch/c6x/kernel/process.c + delete mode 100644 arch/c6x/kernel/ptrace.c + delete mode 100644 arch/c6x/kernel/setup.c + delete mode 100644 arch/c6x/kernel/signal.c + delete mode 100644 arch/c6x/kernel/soc.c + delete mode 100644 arch/c6x/kernel/switch_to.S + delete mode 100644 arch/c6x/kernel/sys_c6x.c + delete mode 100644 arch/c6x/kernel/time.c + delete mode 100644 arch/c6x/kernel/traps.c + delete mode 100644 arch/c6x/kernel/vectors.S + delete mode 100644 arch/c6x/kernel/vmlinux.lds.S + delete mode 100644 arch/c6x/lib/Makefile + delete mode 100644 arch/c6x/lib/checksum.c + delete mode 100644 arch/c6x/lib/csum_64plus.S + delete mode 100644 arch/c6x/lib/divi.S + delete mode 100644 arch/c6x/lib/divremi.S + delete mode 100644 arch/c6x/lib/divremu.S + delete mode 100644 arch/c6x/lib/divu.S + delete mode 100644 arch/c6x/lib/llshl.S + delete mode 100644 arch/c6x/lib/llshr.S + delete mode 100644 arch/c6x/lib/llshru.S + delete mode 100644 arch/c6x/lib/memcpy_64plus.S + delete mode 100644 arch/c6x/lib/mpyll.S + delete mode 100644 arch/c6x/lib/negll.S + delete mode 100644 arch/c6x/lib/pop_rts.S + delete mode 100644 arch/c6x/lib/push_rts.S + delete mode 100644 arch/c6x/lib/remi.S + delete mode 100644 arch/c6x/lib/remu.S + delete mode 100644 arch/c6x/lib/strasgi.S + delete mode 100644 arch/c6x/lib/strasgi_64plus.S + delete mode 100644 arch/c6x/mm/Makefile + delete mode 100644 arch/c6x/mm/dma-coherent.c + delete mode 100644 arch/c6x/mm/init.c + delete mode 100644 arch/c6x/platforms/Kconfig + delete mode 100644 arch/c6x/platforms/Makefile + delete mode 100644 arch/c6x/platforms/cache.c + delete mode 100644 arch/c6x/platforms/dscr.c + delete mode 100644 arch/c6x/platforms/emif.c + delete mode 100644 arch/c6x/platforms/megamod-pic.c + delete mode 100644 arch/c6x/platforms/pll.c + delete mode 100644 arch/c6x/platforms/plldata.c + delete mode 100644 arch/c6x/platforms/timer64.c + delete mode 100644 drivers/soc/zte/Kconfig + delete mode 100644 drivers/soc/zte/Makefile + delete mode 100644 drivers/soc/zte/zx296718_pm_domains.c + delete mode 100644 drivers/soc/zte/zx2967_pm_domains.c + delete mode 100644 drivers/soc/zte/zx2967_pm_domains.h +Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) +$ git merge actions/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 7 -- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 7 -- + arch/arm/boot/dts/owl-s500-labrador-base-m.dts | 7 -- + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 97 ++++++++++++++++- + arch/arm/boot/dts/owl-s500-sparky.dts | 7 -- + arch/arm/boot/dts/owl-s500.dtsi | 140 +++++++++++++++++++++++++ + 7 files changed, 233 insertions(+), 33 deletions(-) +Merging amlogic/for-next (35fe4b2c91ae Merge branch 'v5.12/soc' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + .../arm/amlogic/amlogic,meson-mx-secbus2.yaml | 42 +++++++ + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + arch/arm/boot/dts/meson.dtsi | 19 +++ + arch/arm/boot/dts/meson8.dtsi | 75 ++++++++++++ + arch/arm/boot/dts/meson8b-ec100.dts | 5 - + arch/arm/boot/dts/meson8b-mxq.dts | 5 - + arch/arm/boot/dts/meson8b-odroidc1.dts | 5 - + arch/arm/boot/dts/meson8b.dtsi | 75 ++++++++++++ + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 5 - + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 133 +++++++++++++++++++++ + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 16 ++- + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 2 +- + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 2 +- + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 6 +- + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 6 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 21 ++-- + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 10 +- + 34 files changed, 401 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-mx-secbus2.yaml + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts +Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/aspeed_g5_defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging at91/at91-next (bcd7e8ebb203 Merge branch 'at91-soc' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (50af93f1fe88 Merge branch 'for-v5.12/tegra-mc' into for-next) +$ git merge drivers-memory/for-next +Removing include/soc/tegra/emc.h +Merge made by the 'recursive' strategy. + .../memory-controllers/renesas,rpc-if.yaml | 6 +- + drivers/clk/tegra/Kconfig | 3 + + drivers/clk/tegra/Makefile | 2 +- + drivers/clk/tegra/clk-tegra124-emc.c | 41 ++- + drivers/clk/tegra/clk-tegra124.c | 26 +- + drivers/clk/tegra/clk.h | 18 +- + drivers/memory/Kconfig | 8 +- + drivers/memory/emif.c | 3 +- + drivers/memory/mtk-smi.c | 36 +- + drivers/memory/tegra/Kconfig | 4 +- + drivers/memory/tegra/mc.c | 7 + + drivers/memory/tegra/tegra124-emc.c | 368 ++++++++++++++++++--- + drivers/memory/tegra/tegra124.c | 82 ++++- + drivers/memory/tegra/tegra20-emc.c | 13 +- + drivers/memory/tegra/tegra30-emc.c | 13 +- + drivers/memory/ti-aemif.c | 8 +- + include/linux/clk/tegra.h | 8 + + include/soc/mediatek/smi.h | 2 +- + include/soc/tegra/emc.h | 16 - + 19 files changed, 541 insertions(+), 123 deletions(-) + delete mode 100644 include/soc/tegra/emc.h +Merging imx-mxs/for-next (7535d59c5f11 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 23 + + .../bindings/display/panel/panel-simple.yaml | 19 +- + .../devicetree/bindings/soc/imx/imx8m-soc.yaml | 86 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 8 + + arch/arm/boot/dts/e60k02.dtsi | 6 + + arch/arm/boot/dts/imx28.dtsi | 10 + + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 1 - + arch/arm/boot/dts/imx6dl-plybas.dts | 394 ++++++++++ + arch/arm/boot/dts/imx6dl-plym2m.dts | 446 +++++++++++ + arch/arm/boot/dts/imx6dl-prtmvt.dts | 852 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-victgo.dts | 852 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-vicut1.dts | 13 + + arch/arm/boot/dts/imx6q-vicut1.dts | 17 + + arch/arm/boot/dts/imx6q.dtsi | 20 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 803 +++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 42 +- + arch/arm/boot/dts/imx6qdl.dtsi | 25 +- + arch/arm/boot/dts/imx6qp-vicutp.dts | 13 + + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 18 +- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 15 +- + arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 13 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 + + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 54 +- + arch/arm/boot/dts/imx6ul-prti6g.dts | 356 +++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 2 + + arch/arm/boot/dts/imx7s.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/cpuidle-imx6sl.c | 1 + + arch/arm/mach-imx/hardware.h | 4 - + arch/arm/mach-imx/mach-imx6ul.c | 25 +- + arch/arm/mach-imx/pm-imx6.c | 1 + + arch/arm64/boot/dts/freescale/Makefile | 8 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 21 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 50 ++ + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 60 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 4 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 62 ++ + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 5 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 8 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 16 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 182 +++-- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 98 ++- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 100 ++- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 122 ++- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 118 ++- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 3 +- + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 12 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 10 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 24 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 147 +++- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 + + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 1 - + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 393 ++++++++++ + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 495 ++++++++++++ + .../boot/dts/freescale/imx8mm-venice-gw71xx-0x.dts | 19 + + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 186 +++++ + .../boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts | 20 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 311 ++++++++ + .../boot/dts/freescale/imx8mm-venice-gw73xx-0x.dts | 19 + + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 362 +++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 23 +- + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 307 ++++++++ + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 19 + + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 466 +++++++++++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 75 ++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 44 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 161 ++++ + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 293 +++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 23 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 20 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 6 + + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 35 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 113 ++- + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 93 +++ + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 30 + + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 118 ++- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 72 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 6 +- + arch/arm64/configs/defconfig | 18 + + 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/soc/imx/soc-imx8m.c | 84 +- + 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/linux/clk/imx.h | 15 + + 103 files changed, 8804 insertions(+), 388 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/imx/imx8m-soc.yaml + create mode 100644 arch/arm/boot/dts/imx6dl-plybas.dts + create mode 100644 arch/arm/boot/dts/imx6dl-plym2m.dts + create mode 100644 arch/arm/boot/dts/imx6dl-prtmvt.dts + create mode 100644 arch/arm/boot/dts/imx6dl-victgo.dts + create mode 100644 arch/arm/boot/dts/imx6dl-vicut1.dts + create mode 100644 arch/arm/boot/dts/imx6q-vicut1.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-vicut1.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-vicutp.dts + create mode 100644 arch/arm/boot/dts/imx6ul-prti6g.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts + create mode 100644 include/linux/clk/imx.h +Merging keystone/next (c3f9aaca29c0 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 76 ++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2e.dtsi | 6 +- + arch/arm/boot/dts/keystone.dtsi | 4 +- + drivers/soc/ti/knav_dma.c | 1 + + drivers/soc/ti/knav_qmss_queue.c | 3 + + drivers/soc/ti/pm33xx.c | 5 +- + drivers/soc/ti/pruss.c | 2 +- + 7 files changed, 90 insertions(+), 7 deletions(-) +Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-385-linksys.dtsi | 2 ++ + arch/arm/boot/dts/armada-388-helios4.dts | 28 +++++++++++++++++----- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 2 -- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 ++ + arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 ++++ + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 3 +++ + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 10 ++++++++ + arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++ + drivers/bus/mvebu-mbus.c | 2 +- + 10 files changed, 48 insertions(+), 10 deletions(-) +Merging omap/for-next (1a2ddab3ec7a Merge branch 'omap-for-v5.12/defconfig' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/omap2plus_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/omap2plus_defconfig | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) +Merging qcom/for-next (3e6a8ce09475 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 +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smem.txt | 57 -- + .../devicetree/bindings/soc/qcom/qcom,smem.yaml | 72 +++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 12 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 8 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 8 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 10 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 4 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 10 +- + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac-bit.dts | 28 + + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts | 27 + + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi | 254 ++++++++ + arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts | 214 +++++++ + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 18 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 8 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 90 ++- + arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 2 +- + arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 12 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 31 +- + arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 16 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 4 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 8 +- + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 14 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 32 +- + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 14 +- + .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 14 +- + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 18 +- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 16 +- + arch/arm/boot/dts/qcom-pmx55.dtsi | 84 +++ + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 251 ++++++++ + arch/arm/boot/dts/qcom-sdx55.dtsi | 505 ++++++++++++++++ + arch/arm/configs/qcom_defconfig | 18 + + arch/arm64/boot/dts/qcom/Makefile | 8 + + .../apq8094-sony-xperia-kitakami-karin_windy.dts | 23 + + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 195 +++++++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 6 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 39 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 53 +- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 35 +- + .../dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts | 26 + + .../qcom/msm8994-sony-xperia-kitakami-karin.dts | 45 ++ + .../qcom/msm8994-sony-xperia-kitakami-satsuki.dts | 18 + + .../qcom/msm8994-sony-xperia-kitakami-sumire.dts | 4 +- + .../qcom/msm8994-sony-xperia-kitakami-suzuran.dts | 20 + + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 439 +++++++++++--- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 91 ++- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 +- + arch/arm64/boot/dts/qcom/pms405.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 446 +++++++++++++- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 91 +-- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 27 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 623 ++++++++++++++++++++ + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 19 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 23 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 1 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm850.dtsi | 21 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 158 +++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 269 +++++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 647 ++++++++++++++++++++- + arch/arm64/configs/defconfig | 9 + + drivers/soc/qcom/llcc-qcom.c | 50 ++ + drivers/soc/qcom/qcom_aoss.c | 1 + + drivers/soc/qcom/rpmh-rsc.c | 24 +- + drivers/soc/qcom/rpmpd.c | 28 + + drivers/soc/qcom/smem.c | 4 +- + drivers/soc/qcom/socinfo.c | 105 +++- + include/dt-bindings/power/qcom-rpmpd.h | 9 + + include/linux/soc/qcom/llcc-qcom.h | 3 + + include/soc/qcom/tcs.h | 9 +- + 88 files changed, 5036 insertions(+), 505 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml + create mode 100644 arch/arm/boot/dts/qcom-ipq4018-ap120c-ac-bit.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts + create mode 100644 arch/arm/boot/dts/qcom-pmx55.dtsi + create mode 100644 arch/arm/boot/dts/qcom-sdx55-mtp.dts + create mode 100644 arch/arm/boot/dts/qcom-sdx55.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm850.dtsi +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. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++ + arch/arm/boot/dts/bcm2711.dtsi | 31 +++++++++++++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/configs/defconfig | 1 + + 6 files changed, 52 insertions(+) +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 (573fc3d310a3 Merge branch 'v5.12-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + arch/arm/boot/dts/rk3036.dtsi | 83 ++++- + arch/arm/boot/dts/rk322x.dtsi | 32 +- + arch/arm/boot/dts/rk3288-miqi.dts | 5 + + arch/arm/boot/dts/rk3288.dtsi | 115 +++---- + arch/arm/boot/dts/rk3xxx.dtsi | 106 +++--- + arch/arm/boot/dts/rv1108.dtsi | 14 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 83 +++-- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 63 ++-- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 382 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 33 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 62 ++-- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts | 52 +++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 53 +-- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 109 +++--- + arch/arm64/configs/defconfig | 1 + + 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.c | 4 +- + 27 files changed, 904 insertions(+), 408 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts +Merging samsung-krzk/for-next (f9e152f18310 Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 30 ++++++++++++++++----------- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos54xx.dtsi | 6 +++--- + 8 files changed, 27 insertions(+), 21 deletions(-) +Merging scmi/for-linux-next (6ee1d745b7c9 Linux 5.11-rc5) +$ 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/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 19 +- + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 12 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 3 + + .../media/allwinner,sun8i-h3-deinterlace.yaml | 3 + + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 1 - + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 1 + + arch/arm/boot/dts/sun4i-a10-inet1.dts | 1 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 8 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 1 + + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 1 + + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 6 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +- + .../boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts | 3 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 1 + + arch/arm/boot/dts/sun5i.dtsi | 12 ++ + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 4 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 6 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 6 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 10 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 5 +- + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 4 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 81 +++++++- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 4 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 4 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 8 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 1 + + arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 8 +- + arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 6 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 5 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 2 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 8 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 12 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 6 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 14 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 30 +++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 4 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 10 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 12 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 35 ++-- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 5 +- + arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi | 2 +- + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 11 +- + arch/arm/boot/dts/sun8i-v3-sl631-imx179.dts | 12 ++ + arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 138 +++++++++++++ + arch/arm/boot/dts/sun8i-v3s.dtsi | 17 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 4 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 1 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 ++ + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 20 -- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 11 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 7 +- + .../dts/allwinner/sun50i-a64-pinephone-1.0.dts | 2 +- + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 2 +- + .../dts/allwinner/sun50i-a64-pinephone-1.2.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 20 +- + .../allwinner/sun50i-a64-pinetab-early-adopter.dts | 26 +++ + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 4 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 3 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 6 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 26 +-- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 4 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 4 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 4 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 19 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 20 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 6 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 6 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 15 ++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 11 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 40 +++- + drivers/bus/sunxi-rsb.c | 215 +++++++++++++++------ + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 5 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 10 +- + drivers/clk/sunxi/clk-a10-ve.c | 2 +- + drivers/clk/sunxi/clk-mod0.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 32 +-- + drivers/mfd/axp20x-i2c.c | 4 +- + drivers/mfd/axp20x-rsb.c | 4 +- + drivers/mfd/axp20x.c | 4 +- + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 2 + + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 + + include/linux/mfd/axp20x.h | 2 +- + include/linux/sunxi-rsb.h | 2 +- + 137 files changed, 873 insertions(+), 392 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-v3-sl631-imx179.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3-sl631.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts +Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/tegra.yaml | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 38 +++++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 161 ++++++++++++++++++++- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 42 +++++- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 80 +++++++++- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 70 +++------ + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +- + 10 files changed, 342 insertions(+), 71 deletions(-) +Merging clk/clk-next (6370ad6c0e83 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + include/linux/clk.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging clk-renesas/renesas-clk (24ece96554a9 clk: renesas: cpg-mssr: Fix formatting issues for 'smstpcr_saved's documentation) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + .../clock/renesas,rcar-usb2-clock-sel.yaml | 3 + + 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 +- + 12 files changed, 406 insertions(+), 264 deletions(-) + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.c + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.h +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 +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 +Merge made by the 'recursive' strategy. + 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 +++ + drivers/macintosh/adb-iop.c | 6 +++--- + 13 files changed, 39 insertions(+), 3 deletions(-) +Merging m68knommu/for-next (d2680cc0301e 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 (57ddf08642f0 microblaze: do not select TRACING_SUPPORT directly) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging mips/mips-next (198688edbf77 MIPS: Fix inline asm input/output type mismatch in checksum.h used with Clang) +$ git merge mips/mips-next +Auto-merging arch/mips/kernel/relocate.c +Removing arch/mips/kernel/irq-rm7000.c +Auto-merging arch/mips/include/asm/Kbuild +Auto-merging MAINTAINERS +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../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 ++ + MAINTAINERS | 12 +- + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 34 +- + arch/mips/Makefile | 20 ++ + arch/mips/alchemy/common/prom.c | 4 - + arch/mips/ar7/memory.c | 5 - + arch/mips/ath25/prom.c | 4 - + arch/mips/ath79/prom.c | 5 - + arch/mips/bcm47xx/prom.c | 4 - + arch/mips/bcm63xx/prom.c | 4 - + arch/mips/bmips/setup.c | 6 +- + arch/mips/boot/compressed/head.S | 20 +- + 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 | 4 - + 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/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/inst.h | 6 +- + arch/mips/include/asm/irq.h | 1 + + arch/mips/include/asm/irq_cpu.h | 2 - + 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/pgtable.h | 14 +- + 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/jazz/Kconfig | 3 - + arch/mips/kernel/Makefile | 1 - + 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/idle.c | 1 + + arch/mips/kernel/irq-rm7000.c | 45 --- + arch/mips/kernel/module.c | 109 +++--- + arch/mips/kernel/perf_event_mipsxx.c | 22 +- + arch/mips/kernel/process.c | 89 +++-- + arch/mips/kernel/relocate.c | 54 +-- + arch/mips/kernel/smp-cps.c | 3 - + 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/lantiq/irq.c | 10 +- + arch/mips/lantiq/prom.c | 6 +- + 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 | 3 +- + arch/mips/mm/cache.c | 9 +- + 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/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-ar2315.c | 6 +- + arch/mips/pic32/pic32mzda/init.c | 6 +- + arch/mips/pistachio/init.c | 5 - + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.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 - + drivers/char/mem.c | 7 - + include/asm-generic/vmlinux.lds.h | 6 +- + sound/mips/Kconfig | 7 + + sound/mips/Makefile | 1 + + sound/mips/snd-n64.c | 372 +++++++++++++++++++++ + 101 files changed, 1143 insertions(+), 549 deletions(-) + 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 arch/mips/include/asm/mach-n64/irq.h + create mode 100644 arch/mips/include/asm/mach-n64/kmalloc.h + delete mode 100644 arch/mips/kernel/irq-rm7000.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 sound/mips/snd-n64.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 (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (2261352157a9 Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates) +$ 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 +++- + drivers/soc/litex/Kconfig | 14 +++- + drivers/soc/litex/litex_soc_ctrl.c | 116 +++++++++++----------------- + include/linux/litex.h | 150 +++++++++++++++++++++++++------------ + 8 files changed, 194 insertions(+), 135 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 (226c31557559 parisc: Optimize per-pagetable spinlocks) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + 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 | 74 ++++++++++------------------------ + arch/parisc/kernel/asm-offsets.c | 1 - + arch/parisc/kernel/entry.S | 38 ++++++------------ + 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 | 16 ++++---- + arch/parisc/mm/init.c | 10 ++--- + 14 files changed, 84 insertions(+), 168 deletions(-) +Merging powerpc/next (6895c5ba7bdc powerpc/xmon: Select CONSOLE_POLL for the 8xx) +$ git merge powerpc/next +Auto-merging arch/powerpc/lib/sstep.c +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 34 +---- + arch/powerpc/Kconfig.debug | 1 + + arch/powerpc/include/asm/book3s/64/kup.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 5 + + arch/powerpc/include/asm/kvm_book3s.h | 7 + + arch/powerpc/include/asm/mce.h | 20 ++- + arch/powerpc/include/asm/nmi.h | 1 + + arch/powerpc/include/asm/paca.h | 4 + + arch/powerpc/include/asm/paravirt.h | 1 + + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/include/asm/ppc-pci.h | 3 - + arch/powerpc/kernel/eeh.c | 121 ++++++++++----- + arch/powerpc/kernel/head_book3s_32.S | 12 ++ + arch/powerpc/kernel/iommu.c | 46 ++++++ + arch/powerpc/kernel/mce.c | 80 ++++++---- + arch/powerpc/kernel/optprobes.c | 21 +-- + arch/powerpc/kernel/pci_dn.c | 40 ----- + arch/powerpc/kernel/prom_init.c | 12 +- + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/setup_64.c | 7 +- + arch/powerpc/kernel/smp.c | 3 +- + arch/powerpc/kernel/time.c | 2 + + arch/powerpc/kernel/watchdog.c | 1 + + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 1 + + arch/powerpc/kvm/powerpc.c | 8 +- + arch/powerpc/lib/pmem.c | 1 + + arch/powerpc/lib/sstep.c | 85 ++++++++--- + arch/powerpc/mm/book3s32/Makefile | 4 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 4 - + arch/powerpc/mm/book3s64/iommu_api.c | 10 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/pgtable.c | 1 + + arch/powerpc/perf/hv-24x7.c | 15 ++ + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 13 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 4 + + arch/powerpc/platforms/powernv/vas.c | 11 +- + arch/powerpc/platforms/powernv/vas.h | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 5 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 5 +- + arch/powerpc/platforms/pseries/pci.c | 15 +- + arch/powerpc/platforms/pseries/ras.c | 15 +- + arch/powerpc/platforms/pseries/setup.c | 8 +- + arch/powerpc/xmon/xmon.c | 4 - + drivers/misc/cxl/cxllib.c | 4 +- + drivers/misc/ocxl/file.c | 3 +- + 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 +++++ + 50 files changed, 655 insertions(+), 295 deletions(-) + 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 (8fae56d056e4 RISC-V: probes: Treat the instruction stream as host-endian) +$ git merge risc-v/for-next +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 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/pgtable.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 +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 f549152b3071] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/sifive,gpio.yaml | 4 +- + .../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 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 34 +- + .../devicetree/bindings/riscv/sifive.yaml | 17 +- + MAINTAINERS | 22 + + 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/k210.dtsi | 621 +++++++++++++ + arch/riscv/boot/dts/canaan/k210_generic.dts | 46 + + 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 | 2 +- + arch/riscv/include/asm/bug.h | 1 + + arch/riscv/include/asm/kprobes.h | 40 + + arch/riscv/include/asm/mmzone.h | 13 + + arch/riscv/include/asm/numa.h | 8 + + 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 | 10 +- + 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 | 4 +- + 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/lib/Makefile | 2 + + arch/riscv/lib/error-inject.c | 10 + + arch/riscv/mm/Makefile | 3 +- + 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 | 27 +- + 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/{kendryte => canaan}/Kconfig | 4 +- + drivers/soc/{kendryte => canaan}/Makefile | 0 + drivers/soc/{kendryte => canaan}/k210-sysctl.c | 105 +-- + 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 | 41 + + init/initramfs.c | 45 + + 96 files changed, 5068 insertions(+), 740 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 arch/riscv/boot/dts/canaan/Makefile + create mode 100644 arch/riscv/boot/dts/canaan/k210.dtsi + create mode 100644 arch/riscv/boot/dts/canaan/k210_generic.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/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 (96%) + create mode 100644 drivers/pinctrl/pinctrl-k210.c + create mode 100644 drivers/reset/reset-k210.c + rename drivers/soc/{kendryte => canaan}/Kconfig (79%) + rename drivers/soc/{kendryte => canaan}/Makefile (100%) + rename drivers/soc/{kendryte => canaan}/k210-sysctl.c (63%) + 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 (58ccd7e11822 Merge branch 'features' into for-next) +$ git merge s390/for-next +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/Kconfig.debug | 10 +- + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 1 + + arch/s390/crypto/paes_s390.c | 28 +- + 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/lowcore.h | 4 +- + arch/s390/include/asm/nmi.h | 1 + + 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/syscall.h | 11 +- + arch/s390/include/asm/syscall_wrapper.h | 128 +++-- + arch/s390/include/asm/thread_info.h | 3 + + arch/s390/include/asm/tlb.h | 5 +- + arch/s390/include/asm/uaccess.h | 2 +- + 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 | 19 +- + arch/s390/kernel/compat_signal.c | 1 + + arch/s390/kernel/entry.S | 803 ++++------------------------- + 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/process.c | 30 +- + arch/s390/kernel/ptrace.c | 117 +---- + arch/s390/kernel/setup.c | 3 +- + arch/s390/kernel/signal.c | 13 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/{sys_s390.c => syscall.c} | 66 +++ + arch/s390/kernel/traps.c | 65 +++ + arch/s390/kernel/uprobes.c | 6 +- + arch/s390/kvm/kvm-s390.c | 3 + + arch/s390/kvm/vsie.c | 3 + + arch/s390/lib/uaccess.c | 12 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/pci/pci_event.c | 2 +- + drivers/s390/char/tape_3590.c | 4 +- + drivers/s390/cio/css.c | 20 +- + drivers/s390/cio/device.c | 39 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 15 +- + 51 files changed, 805 insertions(+), 1066 deletions(-) + create mode 100644 arch/s390/include/asm/entry-common.h + rename arch/s390/kernel/{sys_s390.c => syscall.c} (61%) +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 (7f3414226b58 um: time: fix initialization in time-travel mode) +$ git merge uml/linux-next +Removing arch/um/include/asm/set_memory.h +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 1 - + arch/um/drivers/ubd_kern.c | 6 ++--- + arch/um/drivers/virtio_uml.c | 3 ++- + arch/um/include/asm/io.h | 2 +- + arch/um/include/asm/pgtable.h | 3 --- + arch/um/include/asm/set_memory.h | 1 - + arch/um/include/shared/kern_util.h | 2 +- + arch/um/kernel/kmsg_dump.c | 9 +++++-- + arch/um/kernel/process.c | 11 +++----- + arch/um/kernel/time.c | 50 +++++++++++++++++++++-------------- + arch/um/kernel/tlb.c | 54 -------------------------------------- + arch/um/kernel/um_arch.c | 22 +++++++++++++--- + arch/um/os-Linux/helper.c | 4 +-- + arch/um/os-Linux/time.c | 15 ++++++++++- + 14 files changed, 84 insertions(+), 99 deletions(-) + delete mode 100644 arch/um/include/asm/set_memory.h +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 (f736d93d76d3 xfs: support idmapped mounts) +$ git merge pidfd/for-next +Auto-merging mm/shmem.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/sys.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/ecryptfs/inode.c +CONFLICT (content): Merge conflict in fs/ecryptfs/inode.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/ctree.h +Resolved 'fs/ecryptfs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e9d5a01a599a] 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 | 6 +- + fs/f2fs/acl.h | 3 +- + fs/f2fs/f2fs.h | 7 +- + fs/f2fs/file.c | 36 +- + fs/f2fs/namei.c | 23 +- + fs/f2fs/xattr.c | 4 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 24 +- + fs/fat/namei_msdos.c | 12 +- + fs/fat/namei_vfat.c | 15 +- + fs/fcntl.c | 3 +- + fs/fuse/acl.c | 3 +- + fs/fuse/dir.c | 46 +- + fs/fuse/fuse_i.h | 4 +- + fs/fuse/xattr.c | 2 + + fs/gfs2/acl.c | 5 +- + fs/gfs2/acl.h | 3 +- + fs/gfs2/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 | 6 +- + 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 | 37 +- + 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, 4900 insertions(+), 1753 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 (ef5176bf29b2 Merge branch 'fscache-iter-lib-nfs' of https://github.com/DaveWysochanskiRH/kernel into fscache-next) +$ git merge fscache/fscache-next +Auto-merging mm/filemap.c +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/nfs/internal.h +Auto-merging fs/internal.h +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/inode.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 +Resolved 'include/linux/fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7332428ff803] 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 | 472 ++++------------- + 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 | 1155 +++++++++++++++++++++++++++++++++++++++++ + fs/netfs/stats.c | 59 +++ + fs/nfs/file.c | 22 +- + fs/nfs/fscache.c | 230 ++++---- + fs/nfs/fscache.h | 105 +--- + fs/nfs/internal.h | 8 + + fs/nfs/pagelist.c | 2 + + fs/nfs/read.c | 240 ++++----- + fs/nfs/write.c | 10 +- + 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 | 167 ++++++ + include/linux/nfs_fs.h | 5 +- + include/linux/nfs_iostat.h | 2 +- + include/linux/nfs_page.h | 1 + + include/linux/nfs_xdr.h | 1 + + include/linux/pagemap.h | 16 + + 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 | 18 + + mm/readahead.c | 70 +++ + net/rxrpc/recvmsg.c | 9 +- + 60 files changed, 4002 insertions(+), 1942 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 (65cb48f45773 Merge branch 'for-next-next-v5.11-20210127' into for-next-20210127) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 19 +- + fs/btrfs/backref.c | 17 +- + fs/btrfs/backref.h | 9 +- + fs/btrfs/block-group.c | 44 +-- + fs/btrfs/btrfs_inode.h | 3 +- + fs/btrfs/compression.c | 10 +- + fs/btrfs/ctree.c | 7 +- + fs/btrfs/ctree.h | 11 +- + fs/btrfs/delalloc-space.c | 29 +- + fs/btrfs/delayed-ref.c | 79 +++--- + fs/btrfs/delayed-ref.h | 28 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/discard.c | 6 +- + fs/btrfs/disk-io.c | 116 ++++++-- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 131 +++------ + fs/btrfs/extent_io.c | 648 ++++++++++++++++++++++++++++++++++--------- + fs/btrfs/extent_io.h | 15 +- + fs/btrfs/extent_map.c | 18 +- + fs/btrfs/file-item.c | 22 +- + fs/btrfs/file.c | 66 ++--- + fs/btrfs/free-space-cache.c | 36 ++- + fs/btrfs/inode.c | 91 +++--- + fs/btrfs/ioctl.c | 21 +- + fs/btrfs/ordered-data.c | 138 +++++---- + fs/btrfs/ordered-data.h | 47 ++-- + fs/btrfs/raid56.c | 3 +- + fs/btrfs/ref-verify.c | 43 +-- + fs/btrfs/reflink.c | 5 +- + fs/btrfs/relocation.c | 65 ++++- + fs/btrfs/send.c | 31 +-- + fs/btrfs/space-info.c | 352 ++++++++++++++++++----- + fs/btrfs/space-info.h | 21 ++ + fs/btrfs/subpage.c | 278 +++++++++++++++++++ + fs/btrfs/subpage.h | 92 ++++++ + fs/btrfs/super.c | 8 +- + fs/btrfs/transaction.c | 103 ++++--- + fs/btrfs/tree-log.c | 3 +- + fs/btrfs/volumes.c | 7 +- + fs/btrfs/zoned.c | 2 - + include/linux/zstd.h | 8 +- + include/trace/events/btrfs.h | 111 +++++++- + 42 files changed, 1993 insertions(+), 756 deletions(-) + create mode 100644 fs/btrfs/subpage.c + create mode 100644 fs/btrfs/subpage.h +Merging ceph/master (9d5ae6f3c50a libceph: fix "Boolean result is used in bitwise operation" warning) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (1048ba83fb1c Linux 5.11-rc6) +$ git merge cifs/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (d8b3df8b1048 erofs: avoid using generic_block_bmap) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (6a10625f5600 exfat: fix shift-out-of-bounds in exfat_fill_super()) +$ git merge exfat/dev +Auto-merging fs/exfat/exfat_fs.h +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/exfat_raw.h | 4 ++++ + fs/exfat/fatent.c | 42 ++++++++++++++++++++++++++++++++++++------ + fs/exfat/super.c | 31 ++++++++++++++++++++++++++----- + 5 files changed, 69 insertions(+), 14 deletions(-) +Merging ext3/for_next (8e8f048a6941 Merge udf truncate fix.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/ext4/inode.c +Auto-merging Documentation/filesystems/vfs.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.rst | 5 +- + 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/inode.c | 38 ++++++------ + fs/isofs/dir.c | 1 + + fs/isofs/namei.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/group.c | 25 ++++++-- + fs/notify/inotify/inotify_user.c | 4 +- + fs/quota/quota_v2.c | 11 +++- + fs/udf/inode.c | 9 ++- + include/linux/fs.h | 33 +++++++++-- + include/linux/fsnotify_backend.h | 1 + + 17 files changed, 177 insertions(+), 121 deletions(-) +Merging ext4/dev (e9f53353e166 ext4: remove expensive flush on fast commit) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (79a4aba20bed f2fs: fix to avoid inconsistent quota data) +$ git merge f2fs/dev +Auto-merging include/linux/fs.h +Auto-merging fs/libfs.c +Auto-merging fs/f2fs/xattr.c +Removing fs/f2fs/trace.h +Removing fs/f2fs/trace.c +Auto-merging fs/f2fs/super.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 +Resolved 'fs/f2fs/acl.c' using previous resolution. +Resolved 'fs/f2fs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dd1df91ca713] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 32 +++ + Documentation/filesystems/f2fs.rst | 15 ++ + fs/f2fs/Kconfig | 20 +- + fs/f2fs/Makefile | 1 - + fs/f2fs/acl.c | 24 +- + fs/f2fs/checkpoint.c | 181 +++++++++++++- + fs/f2fs/compress.c | 195 ++++++++++++---- + fs/f2fs/data.c | 402 ++++++++++++-------------------- + fs/f2fs/debug.c | 12 + + fs/f2fs/f2fs.h | 104 +++++++-- + fs/f2fs/file.c | 46 +++- + fs/f2fs/gc.c | 8 +- + fs/f2fs/inline.c | 4 + + fs/f2fs/namei.c | 8 + + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.c | 3 - + fs/f2fs/segment.h | 4 +- + fs/f2fs/super.c | 183 +++++++++++++-- + fs/f2fs/sysfs.c | 128 +++++++++- + fs/f2fs/trace.c | 165 ------------- + fs/f2fs/trace.h | 43 ---- + fs/f2fs/xattr.c | 15 +- + fs/libfs.c | 8 +- + include/linux/f2fs_fs.h | 3 + + include/linux/fs.h | 5 - + 25 files changed, 1014 insertions(+), 599 deletions(-) + delete mode 100644 fs/f2fs/trace.c + delete mode 100644 fs/f2fs/trace.h +Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) +$ 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 (3bef198f1b17 JFS: more checks for invalid superblock) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_filsys.h | 1 + + fs/jfs/jfs_mount.c | 10 ++++++++++ + 2 files changed, 11 insertions(+) +Merging nfs/linux-next (e4a7d1f7707e SUNRPC: Handle 0 length opaque XDR object data properly) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (11392155f2bd NFS: Disable READ_PLUS by default) +$ git merge nfs-anna/linux-next +Auto-merging fs/nfs/nfs4proc.c +CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c +Resolved 'fs/nfs/nfs4proc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 683b13e91d36] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +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 +Auto-merging include/linux/sunrpc/xdr.h +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/Kconfig +Merge made by the 'recursive' strategy. + fs/Kconfig | 4 + + fs/lockd/svc4proc.c | 24 ++ + fs/lockd/svcproc.c | 24 ++ + fs/nfs/callback_xdr.c | 2 + + fs/nfs/export.c | 18 + + fs/nfs/nfs4file.c | 4 + + fs/nfs/super.c | 12 + + fs/nfs_common/Makefile | 2 +- + fs/nfs_common/nfs_ssc.c | 2 - + fs/nfs_common/nfsacl.c | 52 +++ + fs/nfsd/Kconfig | 1 + + fs/nfsd/export.c | 68 +++- + fs/nfsd/export.h | 15 + + fs/nfsd/netns.h | 23 +- + fs/nfsd/nfs2acl.c | 67 ++-- + fs/nfsd/nfs3acl.c | 45 ++- + fs/nfsd/nfs3proc.c | 93 +++-- + fs/nfsd/nfs3xdr.c | 582 ++++++++++++++++++-------------- + fs/nfsd/nfs4proc.c | 12 +- + fs/nfsd/nfs4state.c | 124 +++---- + fs/nfsd/nfscache.c | 52 ++- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/nfsfh.h | 5 +- + fs/nfsd/nfsproc.c | 92 +++-- + fs/nfsd/nfssvc.c | 34 -- + fs/nfsd/nfsxdr.c | 350 +++++++++---------- + fs/nfsd/state.h | 3 +- + fs/nfsd/stats.c | 114 +++++-- + fs/nfsd/stats.h | 96 ++++-- + fs/nfsd/vfs.c | 4 +- + fs/nfsd/xdr.h | 12 +- + fs/nfsd/xdr3.h | 20 +- + include/linux/exportfs.h | 1 + + include/linux/nfsacl.h | 3 + + include/linux/sunrpc/msg_prot.h | 3 - + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_rdma.h | 15 +- + include/linux/sunrpc/xdr.h | 13 +- + include/trace/events/sunrpc.h | 15 +- + include/uapi/linux/nfs3.h | 6 + + net/sunrpc/svc.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma.c | 198 +++++++---- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 91 ++--- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 3 + + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +- + 47 files changed, 1382 insertions(+), 941 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) +$ git merge overlayfs/overlayfs-next +Auto-merging security/commoncap.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 +Resolved 'fs/overlayfs/copy_up.c' using previous resolution. +Resolved 'fs/overlayfs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2167acf9ab3b] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/overlayfs.rst | 8 ++++ + fs/overlayfs/copy_up.c | 15 ++++---- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/file.c | 26 ++++++++++++- + fs/overlayfs/inode.c | 2 + + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/readdir.c | 28 +++++--------- + fs/overlayfs/super.c | 38 +++++++++++++++---- + fs/overlayfs/util.c | 27 +++++++++++++ + security/commoncap.c | 67 +++++++++++++++++++++------------ + 11 files changed, 157 insertions(+), 59 deletions(-) +Merging ubifs/next (b80a974b8c58 ubifs: ubifs_dump_node: Dump all branches of the index node) +$ 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 (ae29e4220fd3 xfs: reduce ilock acquisitions in xfs_file_fsync) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iops.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 +Resolved 'fs/xfs/xfs_inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cafeabc2cc8f] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/libxfs/xfs_alloc.c | 50 ++++++++ + fs/xfs/libxfs/xfs_alloc.h | 3 + + fs/xfs/libxfs/xfs_attr.c | 13 ++ + fs/xfs/libxfs/xfs_bmap.c | 285 ++++++++++++++++++++++++++++++----------- + fs/xfs/libxfs/xfs_dir2.h | 2 - + fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/libxfs/xfs_inode_fork.c | 27 ++++ + fs/xfs/libxfs/xfs_inode_fork.h | 63 +++++++++ + fs/xfs/xfs_bmap_item.c | 10 ++ + fs/xfs/xfs_bmap_util.c | 31 +++++ + fs/xfs/xfs_buf.c | 30 +++-- + fs/xfs/xfs_buf.h | 11 +- + fs/xfs/xfs_dquot.c | 8 +- + fs/xfs/xfs_error.c | 6 + + fs/xfs/xfs_file.c | 90 ++++++++----- + fs/xfs/xfs_inode.c | 110 ++++++++++++---- + fs/xfs/xfs_iomap.c | 10 ++ + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_log.c | 136 ++++++++++++++++---- + fs/xfs/xfs_log.h | 4 +- + fs/xfs/xfs_mount.c | 38 +----- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_reflink.c | 16 +++ + fs/xfs/xfs_rtalloc.c | 5 + + fs/xfs/xfs_super.c | 38 +----- + fs/xfs/xfs_symlink.c | 6 + + fs/xfs/xfs_trace.h | 2 +- + 28 files changed, 746 insertions(+), 259 deletions(-) +Merging zonefs/for-next (6716b125b339 zonefs: add tracepoints for file operations) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. + fs/zonefs/Makefile | 2 ++ + fs/zonefs/super.c | 7 ++++ + fs/zonefs/trace.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 112 insertions(+) + create mode 100644 fs/zonefs/trace.h +Merging iomap/iomap-for-next (213f627104da iomap: add a IOMAP_DIO_OVERWRITE_ONLY flag) +$ git merge iomap/iomap-for-next +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 7 +++---- + fs/ext4/file.c | 5 ++--- + fs/gfs2/file.c | 7 ++----- + fs/iomap/direct-io.c | 26 ++++++++++++++++---------- + fs/xfs/xfs_file.c | 5 ++--- + fs/zonefs/super.c | 4 ++-- + include/linux/iomap.h | 18 ++++++++++++++++-- + 7 files changed, 43 insertions(+), 29 deletions(-) +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 (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (f012556f37ff Merge branch 'work.sendfile' into for-next) +$ git merge vfs/for-next +Auto-merging kernel/kexec_core.c +Auto-merging include/linux/mount.h +Auto-merging fs/read_write.c +Auto-merging fs/open.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/Kconfig.binfmt +Auto-merging arch/x86/Kconfig +Removing arch/sparc/mm/extable.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Removing arch/mips/kernel/binfmt_elfo32.c +Removing arch/mips/kernel/binfmt_elfn32.c +Auto-merging arch/mips/kernel/Makefile +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging Documentation/filesystems/porting.rst +Resolved 'arch/Kconfig' using previous resolution. +Resolved 'fs/coredump.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0388e4cbf821] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 7 + + arch/Kconfig | 3 + + arch/arm64/Kconfig | 1 - + arch/ia64/kernel/crash.c | 2 +- + arch/mips/Kconfig | 8 +- + arch/mips/include/asm/elf.h | 56 ++-- + arch/mips/include/asm/elfcore-compat.h | 29 ++ + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/binfmt_elfn32.c | 113 -------- + arch/mips/kernel/binfmt_elfo32.c | 116 -------- + arch/mips/kernel/scall64-n64.S | 2 +- + arch/parisc/Kconfig | 1 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/platforms/powernv/opal-core.c | 6 +- + arch/s390/Kconfig | 1 - + arch/s390/kernel/crash_dump.c | 2 +- + arch/sparc/Kconfig | 1 - + 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 - + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/compat.h | 11 - + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/elfcore-compat.h | 31 ++ + drivers/infiniband/hw/qib/qib_fs.c | 68 +---- + fs/Kconfig.binfmt | 2 +- + fs/binfmt_elf.c | 22 +- + fs/binfmt_elf_fdpic.c | 22 +- + fs/cifs/cifs_debug.c | 4 +- + fs/compat_binfmt_elf.c | 7 +- + fs/coredump.c | 57 ++-- + fs/cramfs/inode.c | 18 +- + fs/dcache.c | 25 ++ + fs/erofs/namei.c | 4 +- + fs/inode.c | 1 + + fs/internal.h | 9 + + fs/jfs/super.c | 1 - + fs/namei.c | 88 +++--- + fs/namespace.c | 53 ++-- + fs/open.c | 6 + + fs/orangefs/file.c | 5 +- + fs/read_write.c | 19 +- + fs/splice.c | 44 +-- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 11 +- + include/linux/dcache.h | 2 + + include/linux/elfcore-compat.h | 15 +- + include/linux/elfcore.h | 7 +- + include/linux/fcntl.h | 2 +- + include/linux/mount.h | 1 - + include/linux/namei.h | 1 + + include/uapi/linux/openat2.h | 4 + + kernel/kexec_core.c | 2 +- + lib/extable.c | 5 - + security/lsm_audit.c | 5 +- + 72 files changed, 542 insertions(+), 1208 deletions(-) + create mode 100644 arch/mips/include/asm/elfcore-compat.h + delete mode 100644 arch/mips/kernel/binfmt_elfn32.c + delete mode 100644 arch/mips/kernel/binfmt_elfo32.c + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c + create mode 100644 arch/x86/include/asm/elfcore-compat.h +Merging printk/for-next (fdaae9394da4 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + kernel/printk/printk_ringbuffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (92036125120b Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Removing drivers/pci/controller/pcie-tango.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Merge made by the 'recursive' strategy. + .../PCI/endpoint/function/binding/pci-ntb.rst | 38 + + Documentation/PCI/endpoint/index.rst | 3 + + Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 10 + + Documentation/PCI/endpoint/pci-ntb-function.rst | 351 ++++ + Documentation/PCI/endpoint/pci-ntb-howto.rst | 160 ++ + .../devicetree/bindings/arm/rockchip.yaml | 1 + + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 37 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 1 + + MAINTAINERS | 2 +- + 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 | 754 +++++++ + drivers/pci/controller/Kconfig | 25 +- + drivers/pci/controller/Makefile | 1 - + drivers/pci/controller/cadence/pcie-cadence-ep.c | 60 +- + 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 | 62 +- + drivers/pci/controller/dwc/pcie-designware.h | 1 + + drivers/pci/controller/dwc/pcie-qcom.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-rcar-host.c | 2 +- + drivers/pci/controller/pcie-rockchip.c | 9 +- + drivers/pci/controller/pcie-tango.c | 341 ---- + drivers/pci/controller/pcie-xilinx-cpm.c | 1 + + drivers/pci/endpoint/functions/Kconfig | 12 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-ntb.c | 2114 ++++++++++++++++++++ + 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/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 | 1 + + 53 files changed, 4133 insertions(+), 571 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 drivers/ntb/hw/epf/Kconfig + create mode 100644 drivers/ntb/hw/epf/Makefile + create mode 100644 drivers/ntb/hw/epf/ntb_hw_epf.c + delete mode 100644 drivers/pci/controller/pcie-tango.c + create mode 100644 drivers/pci/endpoint/functions/pci-epf-ntb.c +Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (27a8dea33bc0 Merge branch 'for-5.12/doc' 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 +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 1487a28816ca] 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 +-- + arch/arm64/configs/defconfig | 3 +- + drivers/hid/Kconfig | 1 + + drivers/hid/Makefile | 2 +- + drivers/hid/hid-chicony.c | 55 +++++ + drivers/hid/hid-core.c | 9 +- + drivers/hid/hid-ids.h | 7 +- + drivers/hid/hid-logitech-hidpp.c | 246 +++++++++++++++++++- + drivers/hid/hid-multitouch.c | 10 + + drivers/hid/hid-quirks.c | 26 ++- + 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 | 252 ++++----------------- + 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 | 1 + + drivers/hid/intel-ish-hid/ipc/ipc.c | 27 +++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 54 ++++- + include/linux/hid-sensor-hub.h | 9 +- + include/linux/hid.h | 15 +- + include/linux/platform_data/i2c-hid.h | 41 ---- + 34 files changed, 1117 insertions(+), 390 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml + 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 (e82d026aea28 Merge branch 'i2c/for-5.12' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing drivers/i2c/busses/i2c-zx2967.c +Removing drivers/i2c/busses/i2c-stu300.c +Removing drivers/i2c/busses/i2c-sirf.c +Removing drivers/i2c/busses/i2c-efm32.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/gpio/gpiolib.c +Removing Documentation/devicetree/bindings/i2c/i2c-zx2967.txt +Removing Documentation/devicetree/bindings/i2c/i2c-stu300.txt +Removing Documentation/devicetree/bindings/i2c/i2c-sirf.txt +Merge made by the 'recursive' strategy. + 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 +- + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + drivers/gpio/gpiolib.c | 4 + + drivers/i2c/algos/i2c-algo-bit.c | 4 +- + drivers/i2c/busses/Kconfig | 39 - + drivers/i2c/busses/Makefile | 4 - + drivers/i2c/busses/i2c-bcm-iproc.c | 254 +++-- + drivers/i2c/busses/i2c-efm32.c | 469 --------- + drivers/i2c/busses/i2c-elektor.c | 3 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 13 +- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-mlxcpld.c | 97 +- + drivers/i2c/busses/i2c-qcom-geni.c | 59 +- + 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-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-stub.c | 1 - + drivers/i2c/muxes/i2c-mux-gpio.c | 112 ++- + include/uapi/linux/i2c-dev.h | 25 +- + include/uapi/linux/i2c.h | 128 +-- + 31 files changed, 562 insertions(+), 2956 deletions(-) + 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 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 +Merging i3c/i3c/next (5c8fe583cce5 Linux 5.11-rc1) +$ 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 (66102281f94a hwmon: (pmbus/max16601) Add support for MAX16508) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/abx500.h +Removing drivers/hwmon/abx500.c +Removing drivers/hwmon/ab8500.c +Removing Documentation/hwmon/abx500.rst +Removing Documentation/hwmon/ab8500.rst +Merge made by the 'recursive' strategy. + Documentation/hwmon/ab8500.rst | 26 --- + Documentation/hwmon/abx500.rst | 32 --- + Documentation/hwmon/aht10.rst | 46 ++++ + Documentation/hwmon/index.rst | 3 +- + Documentation/hwmon/max16601.rst | 197 +++++++--------- + Documentation/hwmon/nct6683.rst | 1 + + drivers/hwmon/Kconfig | 23 +- + drivers/hwmon/Makefile | 2 +- + drivers/hwmon/ab8500.c | 224 ------------------ + drivers/hwmon/abx500.c | 487 --------------------------------------- + drivers/hwmon/abx500.h | 69 ------ + drivers/hwmon/aht10.c | 348 ++++++++++++++++++++++++++++ + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/aspeed-pwm-tacho.c | 4 +- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/k10temp.c | 3 +- + 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/max16601.c | 91 ++++++-- + drivers/hwmon/pmbus/pmbus_core.c | 10 +- + drivers/hwmon/pwm-fan.c | 159 +++++++------ + drivers/hwmon/smsc47m1.c | 2 +- + drivers/hwmon/w83627ehf.c | 2 +- + include/linux/pmbus.h | 9 + + 27 files changed, 681 insertions(+), 1076 deletions(-) + delete mode 100644 Documentation/hwmon/ab8500.rst + delete mode 100644 Documentation/hwmon/abx500.rst + create mode 100644 Documentation/hwmon/aht10.rst + 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 +Merging jc_docs/docs-next (20ccc8dd38a3 Documentation: input: define ABS_PRESSURE/ABS_MT_PRESSURE resolution as grams) +$ git merge jc_docs/docs-next +Auto-merging fs/inode.c +Auto-merging fs/dcache.c +Auto-merging arch/Kconfig +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 94 +++++++++---------- + Documentation/accounting/cgroupstats.rst | 4 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 14 +-- + Documentation/admin-guide/cgroup-v2.rst | 64 +++++++------ + Documentation/admin-guide/cpu-load.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + .../admin-guide/kernel-per-CPU-kthreads.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/devicetree/usage-model.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 4 +- + Documentation/driver-api/men-chameleon-bus.rst | 12 +++ + Documentation/filesystems/afs.rst | 8 +- + Documentation/filesystems/dax.txt | 17 +--- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/vfs.rst | 2 +- + Documentation/gpu/todo.rst | 2 +- + Documentation/iio/ep93xx_adc.rst | 2 +- + Documentation/index.rst | 11 --- + Documentation/input/event-codes.rst | 15 +++ + Documentation/input/multi-touch-protocol.rst | 4 + + Documentation/kernel-hacking/hacking.rst | 4 +- + Documentation/power/freezing-of-tasks.rst | 2 +- + Documentation/process/adding-syscalls.rst | 18 ++-- + Documentation/process/howto.rst | 20 ++-- + Documentation/process/submit-checklist.rst | 14 ++- + Documentation/process/submitting-patches.rst | 9 +- + Documentation/scheduler/sched-bwc.rst | 17 +++- + Documentation/scheduler/sched-deadline.rst | 2 +- + Documentation/scheduler/sched-design-CFS.rst | 6 +- + Documentation/security/lsm-development.rst | 2 +- + 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/vm/split_page_table_lock.rst | 2 +- + Documentation/x86/boot.rst | 2 +- + arch/Kconfig | 4 +- + drivers/parport/share.c | 2 +- + drivers/rapidio/rio.c | 2 +- + fs/dcache.c | 63 ++++++------- + fs/inode.c | 4 +- + fs/pstore/zone.c | 2 +- + fs/seq_file.c | 5 +- + fs/super.c | 12 +-- + include/linux/connector.h | 2 +- + .../linux/firmware/intel/stratix10-svc-client.h | 10 +- + include/linux/memblock.h | 4 +- + include/linux/parport.h | 31 +++++++ + include/linux/w1.h | 2 +- + lib/crc7.c | 2 +- + samples/kprobes/kprobe_example.c | 9 +- + scripts/kernel-doc | 63 +++++++++---- + tools/testing/selftests/kselftest_harness.h | 26 +++--- + 69 files changed, 703 insertions(+), 282 deletions(-) + rename Documentation/arm/{marvel.rst => marvell.rst} (97%) + 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 +Merging v4l-dvb/master (f0ddb4e99116 media: venus: venc: set IDR period to FW only for H264 & HEVC) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/hantro/hantro_v4l2.c +Auto-merging drivers/staging/media/atomisp/pci/atomisp_subdev.c +Removing drivers/staging/media/allegro-dvt/TODO +Removing drivers/staging/media/allegro-dvt/Makefile +Removing drivers/staging/media/allegro-dvt/Kconfig +Auto-merging drivers/media/platform/qcom/venus/core.c +Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +Auto-merging drivers/media/i2c/ccs/ccs-data.c +Auto-merging drivers/media/i2c/ccs-pll.c +Auto-merging drivers/media/common/videobuf2/videobuf2-v4l2.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/allegro.txt +Merge made by the 'recursive' strategy. + .../display/tegra/nvidia,tegra20-host1x.txt | 4 +- + .../devicetree/bindings/media/allegro,al5e.yaml | 105 + + .../devicetree/bindings/media/allegro.txt | 43 - + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 11 +- + .../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 | 21 +- + .../bindings/media/i2c/maxim,max9286.yaml | 101 +- + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 17 +- + .../devicetree/bindings/media/i2c/ov5647.yaml | 20 +- + .../devicetree/bindings/media/i2c/ov8856.yaml | 22 +- + .../bindings/media/i2c/ovti,ov02a10.yaml | 29 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 6 +- + .../devicetree/bindings/media/i2c/ovti,ov5647.yaml | 88 + + .../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 +- + .../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 +- + 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-subdev.rst | 15 +- + Documentation/userspace-api/media/drivers/ccs.rst | 110 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/mediactl/media-types.rst | 7 + + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 81 +- + MAINTAINERS | 11 +- + drivers/acpi/utils.c | 30 +- + drivers/base/property.c | 15 +- + drivers/base/swnode.c | 180 +- + 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 | 2 +- + 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/rtl2832.c | 1 + + drivers/media/i2c/Kconfig | 27 + + drivers/media/i2c/Makefile | 2 + + 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 | 8 +- + 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/ov8865.c | 2972 ++++++++++++++++++++ + 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} | 36 +- + 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/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/aspeed-video.c | 6 +- + drivers/media/platform/davinci/vpbe.c | 2 +- + drivers/media/platform/davinci/vpif.c | 3 +- + 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/pxa_camera.c | 3 + + drivers/media/platform/qcom/camss/camss-video.c | 3 +- + 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-dma.c | 5 + + drivers/media/platform/rcar-vin/rcar-v4l2.c | 42 +- + drivers/media/platform/rcar_fdp1.c | 4 - + drivers/media/platform/rcar_jpu.c | 6 +- + .../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 + + .../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 | 389 ++- + drivers/media/platform/ti-vpe/cal.h | 105 +- + drivers/media/platform/ti-vpe/vpe.c | 2 - + drivers/media/platform/vsp1/vsp1.h | 20 +- + drivers/media/platform/vsp1/vsp1_drv.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 | 34 +- + 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 | 1 + + drivers/media/usb/em28xx/em28xx-core.c | 6 +- + 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/v4l2-async.c | 91 +- + 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 | 11 - + drivers/media/v4l2-core/v4l2-ioctl.c | 42 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 +- + 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 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- + .../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-dev.c | 7 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 108 +- + drivers/staging/media/imx/imx7-media-csi.c | 27 +- + 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 | 338 ++- + drivers/staging/media/tegra-video/vi.h | 23 +- + drivers/staging/media/tegra-video/video.c | 18 + + drivers/staging/media/zoran/zoran_driver.c | 2 +- + include/acpi/acpi_bus.h | 7 + + include/linux/fwnode.h | 7 + + include/media/v4l2-async.h | 25 +- + include/media/v4l2-event.h | 13 +- + include/media/v4l2-fwnode.h | 28 +- + include/uapi/linux/ccs.h | 18 + + include/uapi/linux/media.h | 1 + + include/uapi/linux/v4l2-controls.h | 22 + + lib/test_printf.c | 4 +- + 230 files changed, 17574 insertions(+), 4127 deletions(-) + 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/ovti,ov5647.yaml + 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/video-interface-devices.yaml + create mode 100644 Documentation/devicetree/bindings/media/video-interfaces.yaml + create mode 100644 Documentation/userspace-api/media/drivers/ccs.rst + create mode 100644 drivers/media/i2c/ov5648.c + create mode 100644 drivers/media/i2c/ov8865.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/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 include/uapi/linux/ccs.h +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/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 +Resolved 'Documentation/dev-tools/kasan.rst' using previous resolution. +Resolved 'drivers/gpu/drm/drm_dp_helper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a10d5e71f55] 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 (e86d494782b7 Merge branch 'pnp' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/linux/clk.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/acpi/utils.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-acpi | 43 ++ + Documentation/ABI/testing/sysfs-platform_profile | 24 ++ + Documentation/firmware-guide/acpi/debug.rst | 14 +- + .../firmware-guide/acpi/gpio-properties.rst | 1 + + Documentation/power/index.rst | 1 + + Documentation/power/powercap/dtpm.rst | 212 +++++++++ + Documentation/power/runtime_pm.rst | 14 +- + Documentation/userspace-api/index.rst | 1 + + .../userspace-api/sysfs-platform_profile.rst | 42 ++ + drivers/acpi/Kconfig | 25 ++ + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_configfs.c | 7 +- + drivers/acpi/acpi_fpdt.c | 264 ++++++++++++ + drivers/acpi/acpi_pad.c | 24 +- + drivers/acpi/acpi_tad.c | 14 +- + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbinput.c | 4 +- + drivers/acpi/acpica/dbobject.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 4 +- + drivers/acpi/acpica/dsdebug.c | 4 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 5 +- + drivers/acpi/acpica/dswload.c | 4 +- + drivers/acpi/acpica/dswload2.c | 4 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 6 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 6 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 4 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 5 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 4 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utstrsuppt.c | 4 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/apei/hest.c | 12 +- + drivers/acpi/bgrt.c | 20 +- + drivers/acpi/bus.c | 60 ++- + drivers/acpi/cppc_acpi.c | 8 +- + drivers/acpi/device_pm.c | 20 +- + drivers/acpi/device_sysfs.c | 44 +- + drivers/acpi/dock.c | 26 +- + drivers/acpi/platform_profile.c | 177 ++++++++ + drivers/acpi/power.c | 53 +-- + drivers/acpi/scan.c | 128 +++--- + drivers/acpi/sysfs.c | 2 - + drivers/acpi/utils.c | 56 +-- + drivers/base/power/clock_ops.c | 223 ++++++++-- + drivers/base/power/domain.c | 84 +++- + drivers/base/power/domain_governor.c | 102 ++++- + drivers/base/power/main.c | 9 +- + drivers/base/power/runtime.c | 2 +- + drivers/clk/clk.c | 21 + + drivers/cpufreq/intel_pstate.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 4 +- + drivers/gpu/drm/radeon/radeon_bios.c | 4 +- + drivers/hwmon/acpi_power_meter.c | 4 +- + drivers/idle/intel_idle.c | 2 +- + drivers/platform/x86/asus-laptop.c | 6 +- + drivers/pnp/interface.c | 1 + + drivers/pnp/pnpbios/bioscalls.c | 3 +- + drivers/powercap/Kconfig | 13 + + drivers/powercap/Makefile | 2 + + drivers/powercap/dtpm.c | 480 +++++++++++++++++++++ + drivers/powercap/dtpm_cpu.c | 257 +++++++++++ + drivers/spi/spi.c | 2 +- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 12 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_drivers.h | 2 - + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 26 +- + include/acpi/actbl3.h | 25 +- + include/acpi/actypes.h | 8 +- + include/acpi/acuuid.h | 2 +- + include/acpi/cppc_acpi.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 17 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/asm-generic/vmlinux.lds.h | 11 + + include/linux/clk.h | 24 +- + include/linux/cpuhotplug.h | 1 + + include/linux/dtpm.h | 77 ++++ + include/linux/platform_profile.h | 41 ++ + include/linux/pm.h | 2 + + include/linux/pm_domain.h | 12 + + include/linux/units.h | 4 + + kernel/power/process.c | 2 +- + sound/pci/hda/hda_intel.c | 4 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 236 files changed, 2568 insertions(+), 643 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform_profile + create mode 100644 Documentation/power/powercap/dtpm.rst + create mode 100644 Documentation/userspace-api/sysfs-platform_profile.rst + create mode 100644 drivers/acpi/acpi_fpdt.c + create mode 100644 drivers/acpi/platform_profile.c + create mode 100644 drivers/powercap/dtpm.c + create mode 100644 drivers/powercap/dtpm_cpu.c + create mode 100644 include/linux/dtpm.h + create mode 100644 include/linux/platform_profile.h +Merging cpufreq-arm/cpufreq/arm/linux-next (7114ebffd330 cpufreq: remove tango driver) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Removing drivers/cpufreq/tango-cpufreq.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/Kconfig.arm | 5 ---- + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/brcmstb-avs-cpufreq.c | 24 +++++++++++++------ + drivers/cpufreq/cpufreq-dt-platdev.c | 2 -- + drivers/cpufreq/qcom-cpufreq-hw.c | 6 +++++ + drivers/cpufreq/tango-cpufreq.c | 38 ----------------------------- + drivers/cpufreq/tegra20-cpufreq.c | 45 +++++++++++++++++------------------ + 7 files changed, 45 insertions(+), 76 deletions(-) + delete mode 100644 drivers/cpufreq/tango-cpufreq.c +Merging cpupower/cpupower (3a3ecfdb605c cpupower: Add cpuid cap flag for MSR_AMD_HWCR support) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 8 ++-- + tools/power/cpupower/bench/Makefile | 2 +- + tools/power/cpupower/utils/cpufreq-info.c | 3 +- + tools/power/cpupower/utils/helpers/amd.c | 65 +++++++++++++--------------- + tools/power/cpupower/utils/helpers/cpuid.c | 20 +++++++-- + tools/power/cpupower/utils/helpers/helpers.h | 14 +++--- + tools/power/cpupower/utils/helpers/misc.c | 9 +--- + 7 files changed, 62 insertions(+), 59 deletions(-) +Merging devfreq/devfreq-next (ec894883de53 PM / devfreq: Replace devfreq->dev.parent as dev in devfreq_add_device) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 4 ++-- + drivers/devfreq/governor.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging opp/opp/linux-next (59e50230871c opp: Don't ignore clk_get() errors other than -ENOENT) +$ git merge opp/opp/linux-next +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/devfreq/tegra30-devfreq.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 +- + drivers/opp/core.c | 745 ++++++++++++++++++++++++---------- + drivers/opp/of.c | 230 ++++++++--- + drivers/opp/opp.h | 17 +- + include/linux/pm_opp.h | 51 ++- + 7 files changed, 764 insertions(+), 293 deletions(-) +Merging thermal/thermal/linux-next (7a583405f24b thermal: power allocator: fail binding for non-power actor devices) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/hwmon/pwm-fan.c +Auto-merging drivers/acpi/thermal.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/thermal/sysfs-api.rst | 13 ---- + drivers/acpi/thermal.c | 49 ++++--------- + drivers/hwmon/pwm-fan.c | 1 - + drivers/platform/x86/acerhdf.c | 3 +- + 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/thermal_core.c | 72 +++--------------- + drivers/thermal/thermal_core.h | 7 +- + drivers/thermal/thermal_helpers.c | 7 ++ + drivers/thermal/thermal_sysfs.c | 85 +--------------------- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 +- + include/linux/thermal.h | 18 +---- + 16 files changed, 98 insertions(+), 231 deletions(-) +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (e998879d4fb7 x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (f8e9a970159c RDMA/sw/rdmavt/qp: Fix a bunch of kernel-doc misdemeanours) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/cache.c | 9 +- + drivers/infiniband/core/cma_configfs.c | 12 +- + drivers/infiniband/core/counters.c | 78 +++---- + drivers/infiniband/core/device.c | 9 +- + 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 | 2 +- + drivers/infiniband/core/umem.c | 3 + + drivers/infiniband/core/umem_dmabuf.c | 174 +++++++++++++++ + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 117 +++++++++- + 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_com.c | 2 +- + 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/qsfp.c | 4 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 115 ++++++++-- + drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 1 + + 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/mlx5/devx.c | 201 +++++++++++++----- + drivers/infiniband/hw/mlx5/mad.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 13 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 20 +- + drivers/infiniband/hw/mlx5/mr.c | 119 ++++++++++- + drivers/infiniband/hw/mlx5/odp.c | 111 ++++++++-- + drivers/infiniband/hw/mlx5/qp.c | 2 +- + 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/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/vt.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 64 +++--- + drivers/infiniband/sw/rxe/rxe_pool.c | 226 +++++++++++++------- + drivers/infiniband/sw/rxe/rxe_pool.h | 94 ++++++-- + drivers/infiniband/sw/rxe/rxe_qp.c | 11 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 16 +- + drivers/infiniband/sw/siw/siw.h | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 2 +- + 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_multicast.c | 2 +- + 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 | 120 +++++------ + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 20 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 32 +-- + include/linux/mlx5/mlx5_ifc.h | 12 ++ + include/rdma/ib_umem.h | 48 ++++- + include/rdma/ib_verbs.h | 6 +- + include/rdma/rdma_counter.h | 3 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 14 ++ + 103 files changed, 1761 insertions(+), 846 deletions(-) + create mode 100644 drivers/infiniband/core/umem_dmabuf.c +Merging net-next/master (14e8e0f60088 tcp: shrink inet_connection_sock icsk_mtup enabled and probe_size) +$ git merge net-next/master +Auto-merging tools/testing/selftests/Makefile +Removing net/mac80211/rc80211_minstrel_debugfs.c +Removing net/mac80211/rc80211_minstrel.h +Removing net/mac80211/rc80211_minstrel.c +Auto-merging net/core/neighbour.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Removing drivers/net/ethernet/aurora/nb8800.h +Removing drivers/net/ethernet/aurora/nb8800.c +Removing drivers/net/ethernet/aurora/Makefile +Removing drivers/net/ethernet/aurora/Kconfig +Removing drivers/net/can/dev.c +Auto-merging drivers/net/arcnet/com20020_cs.c +Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net-dsa | 11 +- + Documentation/ABI/testing/sysfs-class-net-qmi | 10 + + .../bindings/net/amlogic,meson-dwmac.yaml | 55 +- + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 101 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 11 + + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 73 + + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 173 +++ + .../devicetree/bindings/net/dsa/mt7530.txt | 6 + + .../devicetree/bindings/net/qca,ar803x.yaml | 16 + + .../devicetree/bindings/net/qcom,ipa.yaml | 15 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 2 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 50 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 7 + + Documentation/driver-api/auxiliary_bus.rst | 2 + + Documentation/networking/bonding.rst | 13 + + .../device_drivers/ethernet/marvell/octeontx2.rst | 70 + + .../device_drivers/ethernet/mellanox/mlx5.rst | 215 +++ + Documentation/networking/devlink/devlink-port.rst | 199 +++ + .../networking/devlink/devlink-resource.rst | 14 + + Documentation/networking/devlink/devlink-trap.rst | 5 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/filter.rst | 61 +- + Documentation/networking/ip-sysctl.rst | 10 + + Documentation/networking/phy.rst | 5 + + Documentation/networking/snmp_counter.rst | 28 +- + Documentation/networking/timestamping.rst | 3 +- + MAINTAINERS | 34 +- + Makefile | 3 +- + arch/arm/net/bpf_jit_32.c | 7 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 - + arch/arm64/net/bpf_jit_comp.c | 16 +- + arch/mips/net/ebpf_jit.c | 11 +- + arch/powerpc/net/bpf_jit_comp64.c | 25 +- + arch/riscv/net/bpf_jit_comp32.c | 20 +- + arch/riscv/net/bpf_jit_comp64.c | 16 +- + arch/s390/net/bpf_jit_comp.c | 27 +- + arch/sparc/net/bpf_jit_comp_64.c | 17 +- + arch/x86/net/bpf_jit_comp.c | 217 ++- + arch/x86/net/bpf_jit_comp32.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 9 + + drivers/bus/mhi/core/main.c | 12 + + drivers/net/Kconfig | 1 + + drivers/net/arcnet/com20020_cs.c | 2 +- + drivers/net/bareudp.c | 13 +- + drivers/net/bonding/bond_main.c | 174 ++- + drivers/net/bonding/bond_options.c | 55 +- + drivers/net/can/Makefile | 7 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/c_can/c_can.c | 4 +- + drivers/net/can/cc770/cc770.c | 4 +- + drivers/net/can/dev.c | 1338 ---------------- + drivers/net/can/dev/Makefile | 11 + + drivers/net/can/dev/bittiming.c | 261 ++++ + drivers/net/can/dev/dev.c | 468 ++++++ + drivers/net/can/dev/length.c | 95 ++ + drivers/net/can/dev/netlink.c | 379 +++++ + drivers/net/can/{ => dev}/rx-offload.c | 5 +- + drivers/net/can/dev/skb.c | 231 +++ + drivers/net/can/flexcan.c | 130 +- + drivers/net/can/grcan.c | 4 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 4 +- + drivers/net/can/kvaser_pciefd.c | 6 +- + drivers/net/can/m_can/Makefile | 4 + + drivers/net/can/m_can/m_can.c | 8 +- + .../net/can/m_can/{tcan4x5x.c => tcan4x5x-core.c} | 122 +- + drivers/net/can/m_can/tcan4x5x-regmap.c | 135 ++ + drivers/net/can/m_can/tcan4x5x.h | 57 + + drivers/net/can/mscan/mscan.c | 4 +- + drivers/net/can/pch_can.c | 4 +- + drivers/net/can/peak_canfd/peak_canfd.c | 4 +- + drivers/net/can/rcar/rcar_can.c | 4 +- + drivers/net/can/rcar/rcar_canfd.c | 4 +- + drivers/net/can/sja1000/sja1000.c | 4 +- + drivers/net/can/softing/softing_main.c | 4 +- + drivers/net/can/spi/hi311x.c | 4 +- + drivers/net/can/spi/mcp251x.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 139 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 2 +- + drivers/net/can/sun4i_can.c | 4 +- + drivers/net/can/ti_hecc.c | 4 +- + drivers/net/can/usb/ems_usb.c | 4 +- + drivers/net/can/usb/esd_usb2.c | 4 +- + drivers/net/can/usb/gs_usb.c | 4 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 +- + drivers/net/can/usb/mcba_usb.c | 10 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- + drivers/net/can/usb/ucan.c | 4 +- + drivers/net/can/usb/usb_8dev.c | 4 +- + drivers/net/can/xilinx_can.c | 6 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/b53_common.c | 113 +- + drivers/net/dsa/b53/b53_priv.h | 16 +- + drivers/net/dsa/bcm_sf2.c | 38 +- + drivers/net/dsa/bcm_sf2_cfp.c | 10 +- + drivers/net/dsa/bcm_sf2_regs.h | 1 + + drivers/net/dsa/dsa_loop.c | 74 +- + drivers/net/dsa/hirschmann/Kconfig | 1 + + drivers/net/dsa/hirschmann/hellcreek.c | 348 ++++- + drivers/net/dsa/hirschmann/hellcreek.h | 17 +- + drivers/net/dsa/lan9303-core.c | 12 +- + drivers/net/dsa/lantiq_gswip.c | 103 +- + drivers/net/dsa/microchip/ksz8795.c | 78 +- + drivers/net/dsa/microchip/ksz9477.c | 98 +- + drivers/net/dsa/microchip/ksz_common.c | 25 +- + drivers/net/dsa/microchip/ksz_common.h | 8 +- + drivers/net/dsa/mt7530.c | 164 +- + drivers/net/dsa/mt7530.h | 20 + + drivers/net/dsa/mv88e6xxx/Kconfig | 13 - + drivers/net/dsa/mv88e6xxx/Makefile | 6 +- + drivers/net/dsa/mv88e6xxx/chip.c | 464 ++++-- + drivers/net/dsa/mv88e6xxx/chip.h | 5 + + drivers/net/dsa/mv88e6xxx/global1.h | 4 - + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 69 +- + drivers/net/dsa/mv88e6xxx/global2.c | 8 +- + drivers/net/dsa/mv88e6xxx/global2.h | 187 +-- + drivers/net/dsa/mv88e6xxx/port.c | 21 + + drivers/net/dsa/mv88e6xxx/port.h | 5 + + drivers/net/dsa/ocelot/Kconfig | 2 + + drivers/net/dsa/ocelot/felix.c | 801 ++++++++-- + drivers/net/dsa/ocelot/felix.h | 4 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 38 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 21 +- + drivers/net/dsa/qca/ar9331.c | 165 +- + drivers/net/dsa/qca8k.c | 38 +- + drivers/net/dsa/realtek-smi-core.h | 9 +- + drivers/net/dsa/rtl8366.c | 152 +- + drivers/net/dsa/rtl8366rb.c | 276 ++-- + drivers/net/dsa/sja1105/sja1105.h | 3 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 9 +- + drivers/net/dsa/sja1105/sja1105_main.c | 101 +- + drivers/net/dsa/xrs700x/Kconfig | 26 + + drivers/net/dsa/xrs700x/Makefile | 4 + + drivers/net/dsa/xrs700x/xrs700x.c | 622 ++++++++ + drivers/net/dsa/xrs700x/xrs700x.h | 42 + + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 150 ++ + drivers/net/dsa/xrs700x/xrs700x_mdio.c | 163 ++ + drivers/net/dsa/xrs700x/xrs700x_reg.h | 203 +++ + drivers/net/ethernet/Kconfig | 1 - + drivers/net/ethernet/Makefile | 1 - + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 - + drivers/net/ethernet/aurora/Kconfig | 23 - + drivers/net/ethernet/aurora/Makefile | 2 - + drivers/net/ethernet/aurora/nb8800.c | 1520 ------------------ + drivers/net/ethernet/aurora/nb8800.h | 316 ---- + drivers/net/ethernet/broadcom/Kconfig | 1 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 186 +-- + drivers/net/ethernet/broadcom/bcm63xx_enet.h | 14 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 82 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 37 +- + drivers/net/ethernet/broadcom/bgmac.c | 114 +- + drivers/net/ethernet/broadcom/bgmac.h | 59 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 246 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 22 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 249 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 9 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 59 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 30 +- + drivers/net/ethernet/broadcom/tg3.h | 1 + + drivers/net/ethernet/broadcom/unimac.h | 68 + + drivers/net/ethernet/cadence/macb_main.c | 4 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 - + .../net/ethernet/cavium/liquidio/octeon_device.c | 3 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 13 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 38 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 13 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 3 - + drivers/net/ethernet/cisco/enic/enic_main.c | 4 - + drivers/net/ethernet/emulex/benet/be_main.c | 2 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 10 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 133 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 13 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 16 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 135 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 5 + + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 17 + + drivers/net/ethernet/freescale/dpaa2/dpni.c | 93 ++ + drivers/net/ethernet/freescale/dpaa2/dpni.h | 9 + + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 61 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 4 + + drivers/net/ethernet/freescale/gianfar.c | 1 - + drivers/net/ethernet/freescale/ucc_geth.c | 549 +++---- + drivers/net/ethernet/freescale/ucc_geth.h | 6 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 8 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 55 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 153 ++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 186 +++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 48 +- + drivers/net/ethernet/ibm/ibmvnic.c | 181 +-- + drivers/net/ethernet/intel/e100.c | 92 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 18 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 - + drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 7 +- + drivers/net/ethernet/intel/igb/igb_main.c | 32 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 14 +- + drivers/net/ethernet/intel/igc/igc_main.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 35 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 33 +- + drivers/net/ethernet/marvell/Kconfig | 1 - + drivers/net/ethernet/marvell/mvneta.c | 10 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 64 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 4 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 652 +++++++- + .../ethernet/marvell/octeontx2/af/rvu_devlink.h | 27 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 27 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 54 +- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 10 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 26 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 11 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 170 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 155 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 71 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 43 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 12 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 19 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 207 +++ + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 18 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 984 ++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/en/qos.h | 44 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 20 +- + .../mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 457 ++++++ + drivers/net/ethernet/mellanox/mlx5/core/en/trap.h | 37 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 14 - + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 29 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 21 + + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 212 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 234 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 56 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 100 ++ + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 - + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 26 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 41 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 78 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 54 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 62 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 12 + + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 20 + + drivers/net/ethernet/mellanox/mlx5/core/qos.c | 85 + + drivers/net/ethernet/mellanox/mlx5/core/qos.h | 30 + + drivers/net/ethernet/mellanox/mlx5/core/sf/cmd.c | 49 + + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 275 ++++ + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 55 + + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 101 ++ + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 556 +++++++ + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 233 +++ + .../mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h | 82 + + drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h | 21 + + drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 100 ++ + .../ethernet/mellanox/mlx5/core/sf/vhca_event.c | 189 +++ + .../ethernet/mellanox/mlx5/core/sf/vhca_event.h | 57 + + .../mellanox/mlx5/core/steering/dr_action.c | 579 +------ + .../mellanox/mlx5/core/steering/dr_domain.c | 6 + + .../mellanox/mlx5/core/steering/dr_matcher.c | 106 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 49 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 1592 +++---------------- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 167 ++ + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 1640 ++++++++++++++++++++ + .../mellanox/mlx5/core/steering/dr_types.h | 182 ++- + .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h | 85 - + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 3 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 77 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 56 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 54 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 165 +- + drivers/net/ethernet/micrel/Kconfig | 4 + + drivers/net/ethernet/micrel/ks8851.h | 2 + + drivers/net/ethernet/micrel/ks8851_common.c | 114 +- + drivers/net/ethernet/micrel/ks8851_par.c | 2 - + drivers/net/ethernet/micrel/ks8851_spi.c | 2 - + drivers/net/ethernet/microchip/lan743x_main.c | 66 +- + drivers/net/ethernet/microchip/lan743x_main.h | 20 +- + drivers/net/ethernet/mscc/Makefile | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 170 +- + drivers/net/ethernet/mscc/ocelot.h | 10 +- + drivers/net/ethernet/mscc/ocelot_devlink.c | 885 +++++++++++ + drivers/net/ethernet/mscc/ocelot_flower.c | 7 +- + drivers/net/ethernet/mscc/ocelot_net.c | 278 +++- + drivers/net/ethernet/mscc/ocelot_vcap.c | 19 +- + drivers/net/ethernet/mscc/ocelot_vcap.h | 295 +--- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 145 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 14 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 15 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 14 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 83 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 49 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 22 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 9 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 6 - + drivers/net/ethernet/qlogic/qla3xxx.c | 196 ++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 - + drivers/net/ethernet/realtek/r8169_main.c | 399 +++-- + drivers/net/ethernet/renesas/ravb.h | 37 +- + drivers/net/ethernet/renesas/ravb_main.c | 6 +- + drivers/net/ethernet/rocker/rocker.h | 6 +- + drivers/net/ethernet/rocker/rocker_main.c | 61 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 45 +- + drivers/net/ethernet/sfc/efx.c | 2 - + drivers/net/ethernet/sfc/efx_channels.c | 6 +- + drivers/net/ethernet/sfc/rx.c | 10 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 10 +- + drivers/net/ethernet/socionext/netsec.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 19 + + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 91 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 96 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 2 +- + drivers/net/ethernet/ti/am65-cpts.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 18 +- + drivers/net/ethernet/ti/cpsw_ale.c | 7 + + drivers/net/ethernet/ti/cpsw_new.c | 18 +- + drivers/net/ethernet/ti/cpsw_switchdev.c | 70 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +- + drivers/net/ethernet/toshiba/spider_net.c | 18 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + drivers/net/geneve.c | 19 +- + drivers/net/gtp.c | 527 +++++-- + drivers/net/hyperv/hyperv_net.h | 93 +- + drivers/net/hyperv/netvsc.c | 60 +- + drivers/net/hyperv/netvsc_bpf.c | 14 +- + drivers/net/hyperv/netvsc_drv.c | 56 +- + drivers/net/hyperv/rndis_filter.c | 246 ++- + drivers/net/ipa/Kconfig | 10 +- + drivers/net/ipa/gsi.c | 181 ++- + drivers/net/ipa/gsi_trans.h | 1 + + drivers/net/ipa/ipa.h | 4 +- + drivers/net/ipa/ipa_clock.c | 194 +-- + drivers/net/ipa/ipa_cmd.c | 45 +- + drivers/net/ipa/ipa_cmd.h | 24 +- + drivers/net/ipa/ipa_data-sc7180.c | 38 +- + drivers/net/ipa/ipa_data-sdm845.c | 38 +- + drivers/net/ipa/ipa_data.h | 26 +- + drivers/net/ipa/ipa_endpoint.c | 83 +- + drivers/net/ipa/ipa_main.c | 39 +- + drivers/net/ipvlan/ipvlan_core.c | 6 +- + drivers/net/macvlan.c | 2 +- + drivers/net/mhi_net.c | 39 +- + drivers/net/netdevsim/fib.c | 23 +- + drivers/net/netdevsim/netdev.c | 2 - + drivers/net/phy/at803x.c | 84 +- + drivers/net/phy/bcm7xxx.c | 2 + + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/micrel.c | 2 +- + drivers/net/phy/national.c | 2 - + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/phy/realtek.c | 132 ++ + drivers/net/phy/sfp-bus.c | 35 +- + drivers/net/phy/sfp.c | 208 ++- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/tap.c | 12 +- + drivers/net/tun.c | 20 +- + drivers/net/usb/hso.c | 3 +- + drivers/net/usb/qmi_wwan.c | 85 +- + drivers/net/usb/usbnet.c | 21 +- + drivers/net/veth.c | 14 +- + drivers/net/virtio_net.c | 18 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 46 +- + drivers/net/vmxnet3/vmxnet3_int.h | 2 - + drivers/net/vxlan.c | 20 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/net/wan/sbni.c | 2 +- + drivers/net/wireless/ath/ath11k/reg.c | 4 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/ath/ath6kl/core.c | 2 + + drivers/net/wireless/ath/ath6kl/init.c | 2 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 2 + + drivers/net/wireless/ath/wil6210/netdev.c | 11 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 24 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 74 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +- + drivers/net/wireless/marvell/mwifiex/main.c | 7 + + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 +- + drivers/net/wireless/microchip/wilc1000/mon.c | 4 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 5 +- + drivers/net/xen-netback/common.h | 3 +- + drivers/net/xen-netback/interface.c | 4 +- + drivers/net/xen-netback/netback.c | 5 +- + drivers/net/xen-netback/xenbus.c | 4 +- + drivers/net/xen-netfront.c | 16 +- + drivers/nfc/Kconfig | 11 + + drivers/nfc/Makefile | 1 + + drivers/nfc/fdp/i2c.c | 2 +- + drivers/nfc/trf7970a.c | 2 +- + drivers/nfc/virtual_ncidev.c | 215 +++ + drivers/s390/net/qeth_core.h | 44 +- + drivers/s390/net/qeth_core_main.c | 103 +- + drivers/s390/net/qeth_core_sys.c | 10 +- + drivers/s390/net/qeth_l2_main.c | 6 +- + drivers/s390/net/qeth_l3_main.c | 90 +- + drivers/soc/fsl/qe/qe_common.c | 20 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 115 +- + drivers/vhost/net.c | 30 +- + include/linux/bpf.h | 18 +- + include/linux/bpf_verifier.h | 3 + + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 3 + + include/linux/buildid.h | 12 + + include/linux/can/bittiming.h | 44 + + include/linux/can/dev.h | 136 +- + include/linux/can/length.h | 174 +++ + include/linux/can/rx-offload.h | 3 +- + include/linux/can/skb.h | 80 + + include/linux/dsa/8021q.h | 14 + + include/linux/dsa/brcm.h | 16 + + include/linux/filter.h | 27 +- + include/linux/ipv6.h | 1 + + include/linux/mdio.h | 23 +- + include/linux/mhi.h | 9 + + include/linux/mlx5/device.h | 9 + + include/linux/mlx5/driver.h | 32 +- + include/linux/mlx5/mlx5_ifc.h | 17 +- + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 77 +- + include/linux/phy.h | 11 +- + include/linux/qed/qed_chain.h | 2 +- + include/linux/remoteproc/qcom_rproc.h | 4 +- + include/linux/skbuff.h | 117 +- + include/linux/soc/qcom/mdt_loader.h | 35 + + include/linux/tcp.h | 3 +- + include/net/act_api.h | 5 +- + include/net/bonding.h | 4 + + include/net/cfg80211.h | 146 +- + include/net/devlink.h | 105 ++ + include/net/dsa.h | 182 ++- + include/net/flow_offload.h | 1 + + include/net/fq.h | 11 +- + include/net/fq_impl.h | 171 +- + include/net/gre.h | 19 +- + include/net/inet_connection_sock.h | 10 +- + include/net/ip6_route.h | 3 +- + include/net/iucv/af_iucv.h | 3 +- + include/net/mac80211.h | 26 +- + include/net/nexthop.h | 14 +- + include/net/pkt_cls.h | 36 + + include/net/sch_generic.h | 18 +- + include/net/switchdev.h | 27 +- + include/net/udp_tunnel.h | 8 + + include/net/xdp.h | 19 + + include/soc/fsl/qe/qe.h | 15 +- + include/soc/fsl/qe/ucc_fast.h | 1 - + include/soc/mscc/ocelot.h | 64 +- + include/soc/mscc/ocelot_qsys.h | 7 +- + include/soc/mscc/ocelot_vcap.h | 297 ++++ + include/uapi/linux/bpf.h | 20 +- + include/uapi/linux/devlink.h | 25 + + include/uapi/linux/gtp.h | 12 + + include/uapi/linux/if_bonding.h | 1 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/mptcp.h | 1 + + include/uapi/linux/perf_event.h | 42 +- + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/pkt_sched.h | 1 + + include/uapi/linux/sysctl.h | 1 + + include/uapi/linux/tcp.h | 23 +- + kernel/bpf/btf.c | 31 +- + kernel/bpf/core.c | 90 +- + kernel/bpf/disasm.c | 43 +- + kernel/bpf/preload/iterators/iterators.c | 2 +- + kernel/bpf/stackmap.c | 143 +- + kernel/bpf/verifier.c | 231 ++- + kernel/events/core.c | 32 +- + lib/Makefile | 3 +- + lib/buildid.c | 149 ++ + lib/test_bpf.c | 14 +- + net/8021q/vlan_dev.c | 9 + + net/9p/Kconfig | 1 - + net/Makefile | 23 +- + net/atm/pppoatm.c | 15 +- + net/batman-adv/Kconfig | 1 - + net/bluetooth/Kconfig | 2 +- + net/bpf/test_run.c | 11 +- + net/bpfilter/Kconfig | 2 +- + net/bridge/Makefile | 2 +- + net/bridge/br.c | 2 +- + net/bridge/br_fdb.c | 1 + + net/bridge/br_forward.c | 3 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_mrp.c | 6 +- + net/bridge/br_multicast.c | 257 +-- + net/bridge/br_multicast_eht.c | 878 +++++++++++ + net/bridge/br_netlink.c | 31 +- + net/bridge/br_private.h | 8 + + net/bridge/br_private_mcast_eht.h | 93 ++ + net/bridge/br_stp.c | 4 +- + net/bridge/br_switchdev.c | 6 +- + net/bridge/br_sysfs_br.c | 4 + + net/bridge/br_sysfs_if.c | 4 + + net/bridge/br_vlan.c | 2 +- + net/can/Kconfig | 1 - + net/can/gw.c | 2 +- + net/can/raw.c | 16 +- + net/core/dev.c | 305 ++-- + net/core/devlink.c | 315 +++- + net/core/filter.c | 25 +- + net/core/flow_dissector.c | 29 +- + net/core/neighbour.c | 1 - + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 2 +- + net/core/skbuff.c | 82 +- + net/core/sock.c | 200 +-- + net/core/sock_map.c | 2 +- + net/core/sysctl_net_core.c | 2 - + net/dcb/Makefile | 2 +- + net/dns_resolver/Kconfig | 2 +- + net/dsa/Kconfig | 27 +- + net/dsa/Makefile | 2 + + net/dsa/dsa.c | 60 +- + net/dsa/dsa2.c | 384 ++++- + net/dsa/dsa_priv.h | 102 +- + net/dsa/master.c | 39 +- + net/dsa/port.c | 226 ++- + net/dsa/slave.c | 410 +++-- + net/dsa/switch.c | 192 ++- + net/dsa/tag_8021q.c | 15 +- + net/dsa/tag_brcm.c | 1 + + net/dsa/tag_dsa.c | 17 +- + net/dsa/tag_ocelot_8021q.c | 68 + + net/dsa/tag_xrs700x.c | 61 + + net/ethtool/common.c | 1 + + net/ife/Kconfig | 1 - + net/ipv4/gre_offload.c | 22 +- + net/ipv4/ip_output.c | 5 +- + net/ipv4/ip_tunnel_core.c | 9 +- + net/ipv4/nexthop.c | 347 +++-- + net/ipv4/proc.c | 50 +- + net/ipv4/tcp.c | 156 +- + net/ipv4/tcp_cubic.c | 11 +- + net/ipv4/tcp_input.c | 16 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp_offload.c | 7 +- + net/ipv4/udp_tunnel_core.c | 24 +- + net/ipv6/addrconf.c | 11 + + net/ipv6/ip6_output.c | 5 +- + net/ipv6/ndisc.c | 12 +- + net/ipv6/route.c | 5 +- + net/iucv/af_iucv.c | 122 +- + net/kcm/kcmsock.c | 8 +- + net/l3mdev/Makefile | 2 +- + net/llc/Kconfig | 1 - + net/mac80211/Makefile | 2 - + net/mac80211/debugfs.c | 52 + + net/mac80211/debugfs_sta.c | 1 + + net/mac80211/driver-ops.h | 16 + + net/mac80211/he.c | 92 ++ + net/mac80211/ieee80211_i.h | 3 +- + net/mac80211/iface.c | 40 +- + net/mac80211/key.c | 4 +- + net/mac80211/main.c | 5 + + net/mac80211/pm.c | 6 +- + net/mac80211/rc80211_minstrel.c | 574 ------- + net/mac80211/rc80211_minstrel.h | 184 --- + net/mac80211/rc80211_minstrel_debugfs.c | 172 -- + net/mac80211/rc80211_minstrel_ht.c | 562 ++++--- + net/mac80211/rc80211_minstrel_ht.h | 96 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 57 +- + net/mac80211/rx.c | 243 ++- + net/mac80211/sta_info.h | 2 + + net/mac80211/tdls.c | 6 +- + net/mac80211/trace.h | 18 +- + net/mac80211/tx.c | 33 +- + net/mac80211/util.c | 14 +- + net/mac80211/vht.c | 9 +- + net/mptcp/mib.c | 2 + + net/mptcp/mib.h | 2 + + net/mptcp/options.c | 56 + + net/mptcp/pm.c | 8 + + net/mptcp/pm_netlink.c | 211 ++- + net/mptcp/protocol.c | 179 ++- + net/mptcp/protocol.h | 98 ++ + net/mptcp/subflow.c | 79 +- + net/netfilter/Kconfig | 2 +- + net/netfilter/ipvs/Kconfig | 2 +- + net/nfc/Kconfig | 1 - + net/nfc/hci/llc_shdlc.c | 2 +- + net/nfc/nci/core.c | 4 +- + net/nfc/netlink.c | 4 +- + net/openvswitch/actions.c | 12 +- + net/openvswitch/flow_netlink.c | 14 +- + net/packet/internal.h | 2 +- + net/psample/Kconfig | 1 - + net/sched/act_api.c | 104 +- + net/sched/act_ct.c | 2 + + net/sched/cls_api.c | 11 +- + net/sched/cls_flower.c | 10 +- + net/sched/sch_api.c | 7 +- + net/sched/sch_atm.c | 3 +- + net/sched/sch_cbq.c | 3 +- + net/sched/sch_drr.c | 3 +- + net/sched/sch_dsmark.c | 3 +- + net/sched/sch_hfsc.c | 3 +- + net/sched/sch_htb.c | 557 ++++++- + net/sched/sch_qfq.c | 3 +- + net/sched/sch_sfb.c | 3 +- + net/sched/sch_taprio.c | 6 +- + net/sctp/offload.c | 2 +- + net/switchdev/Makefile | 2 +- + net/switchdev/switchdev.c | 100 +- + net/tipc/monitor.c | 2 +- + net/tipc/msg.c | 4 - + net/tls/tls_device.c | 4 +- + net/tls/tls_device_fallback.c | 2 +- + net/wireless/chan.c | 5 +- + net/wireless/core.c | 159 +- + net/wireless/core.h | 2 +- + net/wireless/debugfs.c | 4 - + net/wireless/ibss.c | 3 +- + net/wireless/mlme.c | 6 +- + net/wireless/nl80211.c | 657 ++++---- + net/wireless/reg.c | 91 +- + net/wireless/reg.h | 1 - + net/wireless/scan.c | 35 +- + net/wireless/sme.c | 5 +- + net/wireless/sysfs.c | 5 + + net/wireless/util.c | 39 +- + net/wireless/wext-compat.c | 271 +++- + net/wireless/wext-sme.c | 4 +- + samples/bpf/bpf_insn.h | 4 +- + samples/bpf/cookie_uid_helper_example.c | 8 +- + samples/bpf/sock_example.c | 2 +- + samples/bpf/test_cgrp2_attach.c | 5 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/include/linux/filter.h | 24 +- + tools/include/uapi/linux/bpf.h | 20 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/include/uapi/linux/pkt_sched.h | 1 + + tools/lib/bpf/bpf_core_read.h | 169 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/libbpf.c | 50 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/Makefile | 60 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 3 + + tools/testing/selftests/bpf/prog_tests/atomics.c | 246 +++ + .../selftests/bpf/prog_tests/btf_map_in_map.c | 33 - + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 4 +- + .../selftests/bpf/prog_tests/core_read_macros.c | 64 + + .../selftests/bpf/prog_tests/ksyms_module.c | 31 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 1 - + tools/testing/selftests/bpf/progs/atomics.c | 154 ++ + tools/testing/selftests/bpf/progs/bind4_prog.c | 42 +- + tools/testing/selftests/bpf/progs/bind6_prog.c | 42 +- + .../selftests/bpf/progs/test_core_read_macros.c | 50 + + .../selftests/bpf/progs/test_ksyms_module.c | 26 + + tools/testing/selftests/bpf/test_cgroup_storage.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 11 + + tools/testing/selftests/bpf/test_progs.h | 1 + + tools/testing/selftests/bpf/verifier/atomic_and.c | 77 + + .../selftests/bpf/verifier/atomic_cmpxchg.c | 96 ++ + .../selftests/bpf/verifier/atomic_fetch_add.c | 106 ++ + tools/testing/selftests/bpf/verifier/atomic_or.c | 77 + + tools/testing/selftests/bpf/verifier/atomic_xchg.c | 46 + + tools/testing/selftests/bpf/verifier/atomic_xor.c | 77 + + tools/testing/selftests/bpf/verifier/ctx.c | 7 +- + .../selftests/bpf/verifier/direct_packet_access.c | 4 +- + tools/testing/selftests/bpf/verifier/leak_ptr.c | 10 +- + tools/testing/selftests/bpf/verifier/meta_access.c | 4 +- + tools/testing/selftests/bpf/verifier/unpriv.c | 3 +- + .../selftests/bpf/verifier/value_illegal_alu.c | 2 +- + tools/testing/selftests/bpf/verifier/xadd.c | 18 +- + .../selftests/drivers/net/mlxsw/port_scale.sh | 64 + + .../drivers/net/mlxsw/spectrum-2/port_scale.sh | 16 + + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 2 +- + .../drivers/net/mlxsw/spectrum/port_scale.sh | 16 + + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- + tools/testing/selftests/nci/Makefile | 6 + + tools/testing/selftests/nci/config | 3 + + tools/testing/selftests/nci/nci_dev.c | 599 +++++++ + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fcnal-test.sh | 402 ++--- + .../testing/selftests/net/forwarding/tc_chains.sh | 4 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 147 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 41 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 87 +- + tools/testing/selftests/net/mptcp/settings | 2 +- + tools/testing/selftests/net/nettest.c | 585 ++++--- + tools/testing/selftests/net/unicast_extensions.sh | 228 +++ + 737 files changed, 33559 insertions(+), 15882 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml + create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml + create mode 100644 Documentation/networking/devlink/devlink-port.rst + delete mode 100644 drivers/net/can/dev.c + create mode 100644 drivers/net/can/dev/Makefile + create mode 100644 drivers/net/can/dev/bittiming.c + create mode 100644 drivers/net/can/dev/dev.c + create mode 100644 drivers/net/can/dev/length.c + create mode 100644 drivers/net/can/dev/netlink.c + rename drivers/net/can/{ => dev}/rx-offload.c (98%) + create mode 100644 drivers/net/can/dev/skb.c + rename drivers/net/can/m_can/{tcan4x5x.c => tcan4x5x-core.c} (79%) + create mode 100644 drivers/net/can/m_can/tcan4x5x-regmap.c + create mode 100644 drivers/net/can/m_can/tcan4x5x.h + create mode 100644 drivers/net/dsa/xrs700x/Kconfig + create mode 100644 drivers/net/dsa/xrs700x/Makefile + create mode 100644 drivers/net/dsa/xrs700x/xrs700x.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x.h + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_i2c.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_mdio.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_reg.h + delete mode 100644 drivers/net/ethernet/aurora/Kconfig + delete mode 100644 drivers/net/ethernet/aurora/Makefile + delete mode 100644 drivers/net/ethernet/aurora/nb8800.c + delete mode 100644 drivers/net/ethernet/aurora/nb8800.h + create mode 100644 drivers/net/ethernet/broadcom/unimac.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/qos.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/qos.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/trap.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/trap.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/qos.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/qos.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/cmd.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_devlink.c + create mode 100644 drivers/nfc/virtual_ncidev.c + create mode 100644 include/linux/buildid.h + create mode 100644 include/linux/can/bittiming.h + create mode 100644 include/linux/can/length.h + create mode 100644 include/linux/dsa/brcm.h + create mode 100644 lib/buildid.c + create mode 100644 net/bridge/br_multicast_eht.c + create mode 100644 net/bridge/br_private_mcast_eht.h + create mode 100644 net/dsa/tag_ocelot_8021q.c + create mode 100644 net/dsa/tag_xrs700x.c + delete mode 100644 net/mac80211/rc80211_minstrel.c + delete mode 100644 net/mac80211/rc80211_minstrel.h + delete mode 100644 net/mac80211/rc80211_minstrel_debugfs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/atomics.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_read_macros.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_module.c + create mode 100644 tools/testing/selftests/bpf/progs/atomics.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_read_macros.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_module.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_and.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_cmpxchg.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_fetch_add.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_or.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_xchg.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_xor.c + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/port_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/port_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/port_scale.sh + create mode 100644 tools/testing/selftests/nci/Makefile + create mode 100644 tools/testing/selftests/nci/config + create mode 100644 tools/testing/selftests/nci/nci_dev.c + create mode 100755 tools/testing/selftests/net/unicast_extensions.sh +Merging bpf-next/for-next (61ca36c8c4eb bpf: Simplify cases in bpf_base_func_proto) +$ git merge bpf-next/for-next +Removing tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +Auto-merging net/socket.c +Auto-merging net/ipv4/tcp.c +CONFLICT (content): Merge conflict in net/ipv4/tcp.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/net/tcp.h +Resolved 'net/ipv4/tcp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3d76c8df984e] Merge remote-tracking branch 'bpf-next/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_design_QA.rst | 6 + + Documentation/bpf/bpf_devel_QA.rst | 11 +- + Documentation/networking/filter.rst | 24 +- + arch/x86/net/bpf_jit_comp.c | 140 ++++++-- + drivers/net/veth.c | 18 +- + include/linux/bpf-cgroup.h | 101 ++++-- + include/linux/bpf.h | 52 +-- + include/linux/filter.h | 5 + + include/linux/indirect_call_wrapper.h | 6 + + include/linux/skmsg.h | 1 - + include/net/inet_common.h | 2 + + include/net/sock.h | 2 + + include/net/tcp.h | 1 + + include/net/xdp.h | 5 + + include/trace/bpf_probe.h | 12 +- + kernel/bpf/btf.c | 5 - + kernel/bpf/cgroup.c | 120 ++++++- + kernel/bpf/cpumap.c | 46 +-- + kernel/bpf/disasm.c | 2 +- + kernel/bpf/helpers.c | 12 +- + kernel/bpf/verifier.c | 7 +- + lib/test_bpf.c | 7 +- + net/core/filter.c | 16 + + net/core/skmsg.c | 3 +- + net/core/xdp.c | 59 ++++ + net/ipv4/af_inet.c | 18 +- + net/ipv4/tcp.c | 14 + + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/udp.c | 7 +- + net/ipv6/af_inet6.c | 18 +- + net/ipv6/tcp_ipv6.c | 1 + + net/ipv6/udp.c | 7 +- + net/socket.c | 3 + + net/xdp/xsk.c | 47 ++- + net/xdp/xsk_buff_pool.c | 12 +- + samples/bpf/Makefile | 6 +- + samples/bpf/README.rst | 22 +- + samples/bpf/bpf_insn.h | 24 +- + samples/bpf/xdp_redirect_map_kern.c | 60 +++- + samples/bpf/xdp_redirect_map_user.c | 112 +++++-- + tools/bpf/bpftool/Makefile | 2 - + tools/bpf/runqslower/Makefile | 3 - + tools/build/feature/Makefile | 4 +- + tools/include/linux/types.h | 3 + + tools/include/uapi/linux/bpf_perf_event.h | 1 + + tools/include/uapi/linux/tcp.h | 357 +++++++++++++++++++++ + tools/lib/bpf/btf.c | 12 +- + tools/lib/bpf/xsk.c | 81 ++++- + tools/perf/Makefile.perf | 1 - + tools/scripts/Makefile.include | 7 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 5 +- + tools/testing/selftests/bpf/bpf_sockopt_helpers.h | 21 ++ + .../selftests/bpf/bpf_testmod/bpf_testmod-events.h | 6 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 21 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 + + tools/testing/selftests/bpf/prog_tests/bind_perm.c | 109 +++++++ + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 25 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 1 + + .../selftests/bpf/prog_tests/module_attach.c | 27 ++ + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 118 +++---- + .../selftests/bpf/prog_tests/sockmap_basic.c | 1 + + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 28 ++ + tools/testing/selftests/bpf/progs/bind_perm.c | 45 +++ + .../selftests/bpf/progs/connect_force_port4.c | 8 + + .../selftests/bpf/progs/connect_force_port6.c | 8 + + tools/testing/selftests/bpf/progs/recvmsg4_prog.c | 42 +++ + tools/testing/selftests/bpf/progs/recvmsg6_prog.c | 48 +++ + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 7 + + tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 5 + + tools/testing/selftests/bpf/progs/sockopt_sk.c | 23 +- + .../selftests/bpf/progs/test_module_attach.c | 10 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 28 +- + .../selftests/bpf/test_current_pid_tgid_new_ns.c | 160 --------- + tools/testing/selftests/bpf/test_progs.c | 2 +- + tools/testing/selftests/bpf/test_progs.h | 1 - + tools/testing/selftests/bpf/test_sock_addr.c | 86 +---- + tools/testing/selftests/bpf/test_verifier.c | 72 +++++ + tools/testing/selftests/bpf/verifier/jit.c | 24 ++ + tools/testing/selftests/bpf/xdpxceiver.c | 219 ++++++------- + tools/testing/selftests/bpf/xdpxceiver.h | 2 - + tools/testing/selftests/tc-testing/Makefile | 3 +- + 83 files changed, 1914 insertions(+), 735 deletions(-) + create mode 100644 tools/include/uapi/linux/tcp.h + create mode 100644 tools/testing/selftests/bpf/bpf_sockopt_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bind_perm.c + create mode 100644 tools/testing/selftests/bpf/progs/bind_perm.c + create mode 100644 tools/testing/selftests/bpf/progs/recvmsg4_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/recvmsg6_prog.c + delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +Merging ipsec-next/master (0c87b1ac6045 net: Simplify the calculation of variables) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4_offload.c | 2 +- + net/xfrm/xfrm_interface.c | 10 +++++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) +Merging mlx5-next/mlx5-next (ab0da5a57188 net/mlx5: Expose ifc bits for query modify header) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (08a01c11a5bb netfilter: nftables: statify nft_parse_register()) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nft_dynset.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/ipvs/Kconfig +Auto-merging include/net/netfilter/nf_tables.h +Merge made by the 'recursive' strategy. + include/linux/netfilter.h | 2 - + include/net/netfilter/nf_flow_table.h | 4 + + include/net/netfilter/nf_tables.h | 11 ++- + include/net/netfilter/nf_tables_core.h | 12 +-- + include/net/netfilter/nft_fib.h | 2 +- + include/net/netfilter/nft_meta.h | 4 +- + net/bridge/netfilter/nft_meta_bridge.c | 5 +- + net/ipv4/netfilter/nft_dup_ipv4.c | 18 ++--- + net/ipv6/netfilter/nft_dup_ipv6.c | 18 ++--- + net/netfilter/ipvs/Kconfig | 11 +++ + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_twos.c | 139 +++++++++++++++++++++++++++++++++ + net/netfilter/nf_conntrack_netlink.c | 7 -- + net/netfilter/nf_flow_table_core.c | 6 +- + net/netfilter/nf_tables_api.c | 55 ++++++++++--- + net/netfilter/nfnetlink_log.c | 8 +- + net/netfilter/nfnetlink_queue.c | 10 ++- + net/netfilter/nft_bitwise.c | 23 +++--- + net/netfilter/nft_byteorder.c | 14 ++-- + net/netfilter/nft_cmp.c | 8 +- + net/netfilter/nft_ct.c | 12 ++- + net/netfilter/nft_dup_netdev.c | 6 +- + net/netfilter/nft_dynset.c | 12 +-- + net/netfilter/nft_exthdr.c | 14 ++-- + net/netfilter/nft_fib.c | 5 +- + net/netfilter/nft_fwd_netdev.c | 18 ++--- + net/netfilter/nft_hash.c | 25 +++--- + net/netfilter/nft_immediate.c | 6 +- + net/netfilter/nft_lookup.c | 14 ++-- + net/netfilter/nft_masq.c | 18 ++--- + net/netfilter/nft_meta.c | 8 +- + net/netfilter/nft_nat.c | 35 ++++----- + net/netfilter/nft_numgen.c | 15 ++-- + net/netfilter/nft_objref.c | 6 +- + net/netfilter/nft_osf.c | 8 +- + net/netfilter/nft_payload.c | 10 +-- + net/netfilter/nft_queue.c | 12 +-- + net/netfilter/nft_range.c | 6 +- + net/netfilter/nft_redir.c | 18 ++--- + net/netfilter/nft_rt.c | 7 +- + net/netfilter/nft_socket.c | 7 +- + net/netfilter/nft_tproxy.c | 14 ++-- + net/netfilter/nft_tunnel.c | 8 +- + net/netfilter/nft_xfrm.c | 7 +- + 44 files changed, 405 insertions(+), 244 deletions(-) + create mode 100644 net/netfilter/ipvs/ip_vs_twos.c +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 (4832bb371c41 iwl4965: do not process non-QOS frames on txq->sched_retry path) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/mediatek/mt7601u/dma.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath.h | 3 +- + drivers/net/wireless/ath/ath10k/ahb.c | 5 +- + drivers/net/wireless/ath/ath10k/core.c | 25 +++++ + drivers/net/wireless/ath/ath10k/core.h | 5 + + drivers/net/wireless/ath/ath10k/pci.c | 7 +- + drivers/net/wireless/ath/ath10k/sdio.c | 5 +- + drivers/net/wireless/ath/ath10k/snoc.c | 103 +++++++++++---------- + drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 95 ++++++++++++++++++- + drivers/net/wireless/ath/key.c | 41 ++++---- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 11 ++- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 21 ++++- + drivers/net/wireless/mediatek/mt7601u/phy.c | 3 + + drivers/net/wireless/microchip/wilc1000/Kconfig | 2 +- + drivers/net/wireless/microchip/wilc1000/fw.h | 8 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 13 +-- + drivers/net/wireless/realtek/rtlwifi/ps.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 4 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 8 +- + drivers/net/wireless/realtek/rtw88/coex.c | 4 +- + drivers/net/wireless/realtek/rtw88/debug.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 1 - + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 7 -- + drivers/net/wireless/realtek/rtw88/tx.c | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 3 - + drivers/net/wireless/ti/wlcore/main.c | 17 +--- + drivers/net/wireless/ti/wlcore/wlcore.h | 3 - + 41 files changed, 283 insertions(+), 170 deletions(-) +Merging bluetooth/master (b8ddc3b14c7a Bluetooth: fix indentation and alignment reported by checkpatch) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/btusb.txt | 2 +- + drivers/bluetooth/btintel.c | 21 +- + drivers/bluetooth/btmtksdio.c | 16 +- + drivers/bluetooth/btqca.c | 67 ++++ + drivers/bluetooth/btqca.h | 1 + + drivers/bluetooth/btqcomsmd.c | 27 +- + drivers/bluetooth/btrtl.c | 43 ++- + drivers/bluetooth/btusb.c | 48 ++- + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_h5.c | 7 + + drivers/bluetooth/hci_ldisc.c | 7 +- + drivers/bluetooth/hci_qca.c | 18 +- + drivers/bluetooth/hci_serdev.c | 4 +- + include/net/bluetooth/hci.h | 8 + + include/net/bluetooth/hci_core.h | 36 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 16 + + net/bluetooth/a2mp.c | 3 +- + net/bluetooth/af_bluetooth.c | 22 +- + net/bluetooth/hci_conn.c | 17 + + net/bluetooth/hci_core.c | 201 ++++++++--- + net/bluetooth/hci_debugfs.c | 80 ++--- + net/bluetooth/hci_request.c | 74 ++-- + net/bluetooth/l2cap_core.c | 119 ++++-- + net/bluetooth/mgmt.c | 399 +++++++++++++++----- + net/bluetooth/msft.c | 460 +++++++++++++++++++++++- + net/bluetooth/msft.h | 30 ++ + net/bluetooth/smp.c | 5 +- + 28 files changed, 1420 insertions(+), 313 deletions(-) +Merging mac80211-next/master (776a39b8196d cfg80211: call cfg80211_destroy_ifaces() with wiphy lock held) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + net/wireless/core.c | 3 +++ + net/wireless/nl80211.c | 2 +- + net/wireless/wext-compat.c | 14 ++++++++++++-- + 3 files changed, 16 insertions(+), 3 deletions(-) +Merging gfs2/for-next (82218943058d gfs2: keep bios separate for each journal) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/incore.h | 2 +- + fs/gfs2/log.c | 7 +++---- + fs/gfs2/lops.c | 16 +++++++------- + fs/gfs2/lops.h | 6 +++--- + fs/gfs2/main.c | 4 ++-- + fs/gfs2/ops_fstype.c | 35 ++++++++++++++++--------------- + fs/gfs2/recovery.c | 10 ++++----- + fs/gfs2/super.c | 45 ++++----------------------------------- + fs/gfs2/util.c | 59 ++++++++++++++++++++++++++++++++++++++++++++-------- + fs/gfs2/util.h | 3 +++ + 10 files changed, 97 insertions(+), 90 deletions(-) +Merging mtd/mtd/next (12ba8f8ce29f mtd: parser: imagetag: fix error codes in bcm963xx_parse_imagetag_partitions()) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/phram.c | 6 +++++- + drivers/mtd/mtdswap.c | 1 - + drivers/mtd/parsers/parser_imagetag.c | 4 ++++ + 3 files changed, 9 insertions(+), 2 deletions(-) +Merging nand/nand/next (65e4cbbd7cd1 mtd: rawnand: intel: Fix an error handling path in 'ebu_dma_start()') +$ git merge nand/nand/next +Removing drivers/mtd/nand/raw/tango_nand.c +Auto-merging drivers/mtd/nand/raw/intel-nand-controller.c +Auto-merging drivers/mtd/nand/raw/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/qcom,smem-part.yaml | 33 + + drivers/mtd/devices/st_spi_fsm.c | 2 +- + drivers/mtd/maps/pci.c | 8 +- + 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/qcomsmempart.c | 170 +++++ + 14 files changed, 227 insertions(+), 748 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml + delete mode 100644 drivers/mtd/nand/raw/tango_nand.c + create mode 100644 drivers/mtd/parsers/qcomsmempart.c +Merging spi-nor/spi-nor/next (fe6653460ee7 mtd: spi-nor: hisi-sfc: Put child node np on error path) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 4 +++- + drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging crypto/master (663f63ee6d9c crypto: salsa20 - remove Salsa20 stream cipher algorithm) +$ git merge crypto/master +Auto-merging drivers/net/Kconfig +Removing drivers/crypto/picoxcell_crypto_regs.h +Removing drivers/crypto/picoxcell_crypto.c +Removing drivers/crypto/mediatek/mtk-sha.c +Removing drivers/crypto/mediatek/mtk-regs.h +Removing drivers/crypto/mediatek/mtk-platform.h +Removing drivers/crypto/mediatek/mtk-platform.c +Removing drivers/crypto/mediatek/mtk-aes.c +Removing drivers/crypto/mediatek/Makefile +Auto-merging drivers/crypto/marvell/cesa/cesa.h +Auto-merging drivers/crypto/Kconfig +Removing crypto/tgr192.c +Removing crypto/salsa20_generic.c +Removing crypto/rmd320.c +Removing crypto/rmd256.c +Removing crypto/rmd128.c +Removing arch/x86/include/asm/crypto/serpent-avx.h +Removing arch/x86/include/asm/crypto/glue_helper.h +Removing arch/x86/crypto/glue_helper.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/device-mapper/dm-integrity.rst +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 - + .../admin-guide/device-mapper/dm-integrity.rst | 4 +- + Documentation/crypto/api-skcipher.rst | 4 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 46 + + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/samsung-sss.yaml | 1 - + MAINTAINERS | 12 +- + 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/arm64/crypto/aes-glue.c | 50 +- + arch/arm64/crypto/aes-modes.S | 165 +- + arch/arm64/crypto/sha1-ce-glue.c | 1 + + arch/arm64/crypto/sha2-ce-glue.c | 2 + + arch/arm64/crypto/sha3-ce-glue.c | 4 + + arch/arm64/crypto/sha512-ce-glue.c | 2 + + arch/s390/crypto/aes_s390.c | 2 + + 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/include/asm/crypto/glue_helper.h | 118 -- + arch/x86/include/asm/crypto/serpent-avx.h | 42 - + crypto/Kconfig | 93 +- + crypto/Makefile | 4 - + crypto/adiantum.c | 2 + + crypto/ansi_cprng.c | 2 + + crypto/blake2b_generic.c | 249 +-- + crypto/blake2s_generic.c | 158 +- + 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/essiv.c | 2 + + crypto/keywrap.c | 2 + + 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/skcipher.c | 8 +- + crypto/tcrypt.c | 107 +- + crypto/testmgr.c | 51 +- + crypto/testmgr.h | 1553 ----------------- + crypto/tgr192.c | 682 -------- + crypto/vmac.c | 2 + + crypto/xcbc.c | 2 + + crypto/xts.c | 2 + + drivers/char/hw_random/ingenic-trng.c | 6 +- + drivers/char/hw_random/iproc-rng200.c | 38 +- + drivers/crypto/Kconfig | 33 - + 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/ccree/cc_driver.h | 1 - + drivers/crypto/geode-aes.c | 2 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 67 +- + drivers/crypto/hisilicon/qm.c | 8 +- + drivers/crypto/hisilicon/qm.h | 27 + + drivers/crypto/hisilicon/sec2/sec_main.c | 39 +- + drivers/crypto/hisilicon/zip/zip_main.c | 14 + + 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 | 4 +- + drivers/crypto/keembay/ocs-hcu.c | 840 +++++++++ + drivers/crypto/keembay/ocs-hcu.h | 106 ++ + drivers/crypto/marvell/Kconfig | 14 + + 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 | 429 +++++ + 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/net/Kconfig | 1 + + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 1 + + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 19 +- + 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/linux/crypto.h | 172 +- + lib/crypto/blake2s.c | 48 +- + lib/crypto/chacha20poly1305.c | 5 + + 183 files changed, 13442 insertions(+), 14628 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml + 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 + 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%) + delete mode 100644 arch/x86/include/asm/crypto/glue_helper.h + delete mode 100644 arch/x86/include/asm/crypto/serpent-avx.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/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 + create mode 100644 include/crypto/blake2b.h + create mode 100644 include/crypto/internal/blake2b.h + create mode 100644 include/crypto/internal/cipher.h +Merging drm/drm-next (32c3d9b0f51e Merge tag 'drm-intel-next-2021-01-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Removing drivers/gpu/drm/vmwgfx/vmwgfx_marker.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/vc4/vc4_hvs.c +Auto-merging drivers/gpu/drm/radeon/radeon_bios.c +Auto-merging drivers/gpu/drm/qxl/qxl_drv.c +Removing drivers/gpu/drm/omapdrm/omap_connector.h +Removing drivers/gpu/drm/omapdrm/omap_connector.c +Removing drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +Removing drivers/gpu/drm/omapdrm/dss/display.c +Removing drivers/gpu/drm/omapdrm/dss/Makefile +Removing drivers/gpu/drm/omapdrm/dss/Kconfig +Removing drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +Removing drivers/gpu/drm/omapdrm/displays/Makefile +Removing drivers/gpu/drm/omapdrm/displays/Kconfig +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/gen7_renderclear.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen7_renderclear.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/Makefile +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/ste,mcde.txt +Auto-merging Documentation/devicetree/bindings/display/panel/panel-simple.yaml +Recorded preimage for 'drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h' +Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/gen7_renderclear.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h'. +[master babe1c7dc10d] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../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,bcm2835-dpi.yaml | 7 +- + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../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 + + .../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 +- + .../display/panel/advantech,idk-2121wr.yaml | 21 +- + .../display/panel/mantix,mlaf057we51-x.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 + + .../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 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/i915.rst | 2 +- + Documentation/gpu/vkms.rst | 82 + + MAINTAINERS | 11 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + drivers/dma-buf/Kconfig | 8 + + drivers/dma-buf/dma-buf.c | 120 +- + drivers/gpu/drm/Kconfig | 5 - + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + 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_debugfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + 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_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_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 | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + 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_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 | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + 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/cz_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 +- + 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/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 | 10 - + 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 | 206 +- + 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/soc15.c | 100 +- + 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/amdkfd/kfd_int_process_v9.c | 54 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 116 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 - + 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 +- + .../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 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 79 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 62 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 42 +- + 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 | 7 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + + 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 | 8 + + 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 | 57 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 - + 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 | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 15 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 22 +- + 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 | 36 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + 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 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../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 | 83 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 6 + + 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 | 4 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 15 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 2 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 44 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../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/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 1 + + .../amd/display/modules/info_packet/info_packet.c | 13 +- + .../drm/amd/display/modules/power/power_helpers.c | 6 +- + .../amd/include/asic_reg/oss/osssys_4_2_0_offset.h | 345 + + .../include/asic_reg/oss/osssys_4_2_0_sh_mask.h | 1300 +++ + 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 | 191 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 543 ++ + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 1 - + drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/pm/inc/smu_v11_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/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 | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 330 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 1173 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 217 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 58 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + 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_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 | 5 +- + 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/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_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 | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 8 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 6 +- + drivers/gpu/drm/gma500/mid_bios.c | 9 +- + drivers/gpu/drm/gma500/mmu.c | 15 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 5 +- + 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 | 18 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + 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_sdvo.c | 8 +- + drivers/gpu/drm/gma500/psb_irq.c | 3 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 36 +- + 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 | 22 +- + drivers/gpu/drm/i915/Makefile | 26 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 704 ++ + 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_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 | 9117 ++++++-------------- + drivers/gpu/drm/i915/display/intel_display.h | 21 +- + .../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 | 3126 ++----- + drivers/gpu/drm/i915/display/intel_dp.h | 14 +- + 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 | 186 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 38 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 3 + + 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 | 278 +- + 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 | 5 +- + 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 | 115 +- + 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 | 104 +- + 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 | 44 +- + 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 | 41 +- + 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 | 75 +- + 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 | 11 +- + 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 | 106 +- + 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 | 646 +- + 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 | 336 +- + 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/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 | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 112 +- + drivers/gpu/drm/i915/i915_gem.c | 132 +- + 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 | 436 +- + 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 | 71 +- + 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_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 | 1106 ++- + 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_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/mediatek/mtk_drm_crtc.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + 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/head.c | 2 - + drivers/gpu/drm/nouveau/nouveau_abi16.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + 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/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_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/rs780_dpm.c | 7 +- + 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/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_hdmi.c | 165 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 8 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 9 + + 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_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 | 236 +- + 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/misc/mei/hdcp/mei_hdcp.c | 3 +- + drivers/pci/pci.c | 12 +- + drivers/pci/pci.h | 1 - + drivers/video/fbdev/Kconfig | 2 +- + 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/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/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 + + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 14 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 +- + 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/of_display_timing.c | 1 + + drivers/video/of_videomode.c | 6 +- + 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/linux/dma-buf.h | 45 +- + include/linux/pci.h | 9 + + include/linux/vgaarb.h | 6 +- + 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/video/sstfb.h | 4 +- + 907 files changed, 44348 insertions(+), 34490 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/connector/dp-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ste,mcde.txt + create mode 100644 Documentation/devicetree/bindings/display/ste,mcde.yaml + 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/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/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 + 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 + 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 +Merging amdgpu/drm-next (7de5b0e170b3 drm/amd/display: Fix unused variable warning) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c'. +[master ca3647e4746d] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 87 --------- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 138 ++++++++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 86 +++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 56 ++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 70 +++++++ + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 166 ++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/si.c | 104 +++++++++++ + drivers/gpu/drm/amd/amdgpu/soc15.c | 208 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/vi.c | 175 +++++++++++++++++ + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 61 ++++++ + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 30 +-- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 28 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 6 + + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 14 ++ + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 182 ++++++++++++++---- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 5 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 117 ++++++++---- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 32 ++-- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 11 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +- + .../drm/amd/display/modules/color/color_table.c | 26 ++- + drivers/gpu/drm/amd/include/amd_pcie.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 13 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 25 ++- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 - + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 172 +++++++++++++++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 25 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 ++- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 25 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 58 +----- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 11 +- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 32 ++++ + 54 files changed, 1749 insertions(+), 408 deletions(-) +$ git am -3 ../patches/0001-amdgpu-merge-fix-for-amdgpu_smu.h.patch +Applying: amdgpu: merge fix for amdgpu_smu.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +$ git add -A . +$ git commit -v -a --amend +[master e7e6e35066ea] Merge remote-tracking branch 'amdgpu/drm-next' + Date: Mon Feb 1 12:39:49 2021 +1100 +Merging drm-intel/for-linux-next (5b6a9ba9f6ce drm/i915: Don't check tc_mode unless dealing with a TC PHY) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++- + drivers/gpu/drm/i915/display/i9xx_plane.c | 213 ++++++++++++++++++++- + drivers/gpu/drm/i915/display/i9xx_plane.h | 2 +- + drivers/gpu/drm/i915/display/intel_bw.c | 80 +------- + drivers/gpu/drm/i915/display/intel_ddi.c | 77 ++++---- + drivers/gpu/drm/i915/display/intel_display.c | 16 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 12 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 36 ++-- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 98 ++++------ + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 6 +- + drivers/gpu/drm/i915/i915_irq.c | 39 ++-- + drivers/gpu/drm/i915/i915_reg.h | 3 + + drivers/gpu/drm/i915/intel_dram.c | 136 +++++++++---- + drivers/gpu/drm/i915/intel_pm.c | 2 +- + include/drm/drm_dp_mst_helper.h | 1 + + 17 files changed, 479 insertions(+), 279 deletions(-) +Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + 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 ++++++++++++++++++++++++++--------- + 9 files changed, 45 insertions(+), 20 deletions(-) +Merging drm-misc/for-linux-next (e4abd7ad2b77 dma-buf: Avoid comma separated statements) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/dma-buf/heaps/cma_heap.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/todo.rst +Removing Documentation/devicetree/bindings/display/mxsfb.txt +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 626fbef1e47d] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/brcm,bcm2711-hdmi.yaml | 20 +- + .../bindings/display/connector/dp-connector.yaml | 1 - + .../devicetree/bindings/display/fsl,lcdif.yaml | 110 +++++++ + .../devicetree/bindings/display/mxsfb.txt | 87 ------ + Documentation/gpu/todo.rst | 28 +- + MAINTAINERS | 2 +- + drivers/dma-buf/dma-fence.c | 70 ++++- + drivers/dma-buf/dma-heap.c | 14 +- + drivers/dma-buf/heaps/cma_heap.c | 22 +- + drivers/dma-buf/heaps/system_heap.c | 25 +- + drivers/dma-buf/st-dma-fence.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/drm_atomic.c | 39 +++ + drivers/gpu/drm/drm_atomic_helper.c | 61 +--- + drivers/gpu/drm/drm_file.c | 68 ++++- + drivers/gpu/drm/drm_gem_vram_helper.c | 14 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 + + drivers/gpu/drm/drm_plane.c | 58 +++- + drivers/gpu/drm/drm_syncobj.c | 12 + + drivers/gpu/drm/drm_vblank.c | 9 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 7 +- + drivers/gpu/drm/lima/lima_sched.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 8 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 9 +- + drivers/gpu/drm/qxl/qxl_drv.h | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/radeon/radeon.h | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 38 ++- + drivers/gpu/drm/scheduler/sched_main.c | 4 +- + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 298 ++++--------------- + drivers/gpu/drm/ttm/ttm_bo_util.c | 24 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 24 +- + drivers/gpu/drm/ttm/ttm_device.c | 195 ++++++++++++ + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_module.c | 4 + + drivers/gpu/drm/ttm/ttm_module.h | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 144 ++++++--- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 4 +- + drivers/gpu/drm/ttm/ttm_tt.c | 26 +- + drivers/gpu/drm/v3d/v3d_sched.c | 32 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 223 ++++++++++---- + drivers/gpu/drm/vc4/vc4_hdmi.h | 11 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 17 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- + drivers/video/fbdev/simplefb.c | 5 +- + include/drm/drm_atomic.h | 4 + + include/drm/drm_file.h | 3 + + include/drm/drm_gem_vram_helper.h | 6 +- + include/drm/drm_plane.h | 21 +- + include/drm/gpu_scheduler.h | 18 +- + include/drm/ttm/ttm_bo_api.h | 35 +-- + include/drm/ttm/ttm_bo_driver.h | 328 +-------------------- + include/drm/ttm/ttm_device.h | 319 ++++++++++++++++++++ + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/dma-fence.h | 3 + + include/linux/dma-heap.h | 12 +- + include/linux/lockdep.h | 5 + + include/linux/platform_data/simplefb.h | 1 + + 107 files changed, 1729 insertions(+), 1235 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/fsl,lcdif.yaml + delete mode 100644 Documentation/devicetree/bindings/display/mxsfb.txt + create mode 100644 drivers/gpu/drm/ttm/ttm_device.c + create mode 100644 include/drm/ttm/ttm_device.h +$ git reset --hard HEAD^ +HEAD is now at 32bcbdd600bf Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next' +Merging next-20210129 version of drm-misc +$ git merge -m next-20210129/drm-misc f3ebd4e6b692ab7af464561410a1f05dfc850823 +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/dma-buf/heaps/cma_heap.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/todo.rst +Removing Documentation/devicetree/bindings/display/mxsfb.txt +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7b27714e752d] next-20210129/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/brcm,bcm2711-hdmi.yaml | 20 +- + .../bindings/display/connector/dp-connector.yaml | 1 - + .../devicetree/bindings/display/fsl,lcdif.yaml | 110 +++++++ + .../devicetree/bindings/display/mxsfb.txt | 87 ------ + Documentation/gpu/todo.rst | 28 +- + MAINTAINERS | 2 +- + drivers/dma-buf/dma-fence.c | 70 ++++- + drivers/dma-buf/dma-heap.c | 14 +- + drivers/dma-buf/heaps/cma_heap.c | 22 +- + drivers/dma-buf/heaps/system_heap.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/drm_atomic.c | 39 +++ + drivers/gpu/drm/drm_atomic_helper.c | 61 +--- + drivers/gpu/drm/drm_file.c | 68 ++++- + drivers/gpu/drm/drm_gem_vram_helper.c | 14 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 + + drivers/gpu/drm/drm_plane.c | 58 +++- + drivers/gpu/drm/drm_syncobj.c | 12 + + drivers/gpu/drm/drm_vblank.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 8 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 + + drivers/gpu/drm/qxl/qxl_drv.h | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/radeon/radeon.h | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 38 ++- + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 298 ++++--------------- + drivers/gpu/drm/ttm/ttm_bo_util.c | 24 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 24 +- + drivers/gpu/drm/ttm/ttm_device.c | 195 ++++++++++++ + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_module.c | 4 + + drivers/gpu/drm/ttm/ttm_module.h | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 144 ++++++--- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 4 +- + drivers/gpu/drm/ttm/ttm_tt.c | 26 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 223 ++++++++++---- + drivers/gpu/drm/vc4/vc4_hdmi.h | 11 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 17 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- + drivers/video/fbdev/simplefb.c | 5 +- + include/drm/drm_atomic.h | 4 + + include/drm/drm_file.h | 3 + + include/drm/drm_gem_vram_helper.h | 6 +- + include/drm/drm_plane.h | 21 +- + include/drm/ttm/ttm_bo_api.h | 35 +-- + include/drm/ttm/ttm_bo_driver.h | 328 +-------------------- + include/drm/ttm/ttm_device.h | 319 ++++++++++++++++++++ + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/dma-fence.h | 3 + + include/linux/dma-heap.h | 12 +- + include/linux/lockdep.h | 5 + + include/linux/platform_data/simplefb.h | 1 + + 99 files changed, 1671 insertions(+), 1204 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/fsl,lcdif.yaml + delete mode 100644 Documentation/devicetree/bindings/display/mxsfb.txt + create mode 100644 drivers/gpu/drm/ttm/ttm_device.c + create mode 100644 include/drm/ttm/ttm_device.h +Merging drm-msm/msm-next (c703d5789590 drm/msm/dp: trigger unplug event in msm_dp_display_disable) +$ 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_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 | 17 +- + drivers/gpu/drm/msm/dp/dp_display.c | 12 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/msm/msm_kms.h | 8 +- + 31 files changed, 784 insertions(+), 198 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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (0417fadab493 ALSA: hda: Constify static attribute_group) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging sound/core/pcm_native.c +Auto-merging drivers/i2c/busses/i2c-elektor.c +Merge made by the 'recursive' strategy. + drivers/base/isa.c | 2 +- + drivers/i2c/busses/i2c-elektor.c | 4 +- + drivers/i2c/busses/i2c-pca-isa.c | 4 +- + drivers/input/touchscreen/htcpen.c | 4 +- + drivers/media/radio/radio-isa.c | 9 ++- + drivers/media/radio/radio-isa.h | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 4 +- + drivers/net/can/sja1000/tscan1.c | 4 +- + drivers/net/ethernet/3com/3c509.c | 3 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aha1542.c | 3 +- + drivers/scsi/fdomain_isa.c | 3 +- + drivers/scsi/g_NCR5380.c | 5 +- + drivers/watchdog/pcwd.c | 7 +-- + include/linux/isa.h | 2 +- + 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/compress_offload.c | 2 +- + sound/core/control.c | 20 +++---- + sound/core/ctljack.c | 2 +- + sound/core/hwdep.c | 6 +- + sound/core/init.c | 4 +- + sound/core/oss/mixer_oss.c | 14 ++--- + sound/core/oss/rate.c | 4 +- + sound/core/pcm.c | 2 +- + sound/core/pcm_native.c | 6 +- + 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/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/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/hdac_stream.c | 5 +- + sound/hda/hdac_sysfs.c | 2 +- + 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/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 | 3 +- + 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 | 12 ++-- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/hda/hda_tegra.c | 90 ++++++++++-------------------- + sound/pci/hda/patch_conexant.c | 2 +- + 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/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/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/qcom/qdsp6/q6afe.c | 2 +- + sound/soc/sh/rcar/core.c | 2 +- + 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/clock.c | 6 ++ + sound/usb/hiface/chip.c | 6 +- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/implicit.c | 3 +- + sound/usb/mixer.c | 30 ++++++---- + sound/usb/mixer_quirks.c | 2 +- + sound/usb/mixer_scarlett.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/mixer_us16x08.c | 2 +- + sound/usb/quirks-table.h | 60 ++++++++++++++++++++ + sound/x86/intel_hdmi_audio.c | 5 +- + sound/xen/xen_snd_front_cfg.c | 2 +- + 154 files changed, 396 insertions(+), 393 deletions(-) + create mode 100644 sound/firewire/dice/dice-harman.c +Merging sound-asoc/for-next (10000fc4a510 Merge remote-tracking branch 'asoc/for-5.12' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/zte/zx-tdm.c +Removing sound/soc/zte/zx-spdif.c +Removing sound/soc/zte/zx-i2s.c +Removing sound/soc/zte/Makefile +Removing sound/soc/zte/Kconfig +Removing sound/soc/txx9/txx9aclc.h +Removing sound/soc/txx9/txx9aclc.c +Removing sound/soc/txx9/txx9aclc-generic.c +Removing sound/soc/txx9/txx9aclc-ac97.c +Removing sound/soc/txx9/Makefile +Removing sound/soc/txx9/Kconfig +Removing sound/soc/sirf/sirf-usp.h +Removing sound/soc/sirf/sirf-usp.c +Removing sound/soc/sirf/sirf-audio.c +Removing sound/soc/sirf/sirf-audio-port.c +Removing sound/soc/sirf/Makefile +Removing sound/soc/sirf/Kconfig +Auto-merging sound/soc/sh/rcar/core.c +Removing sound/soc/codecs/zx_aud96p22.c +Removing sound/soc/codecs/sirf-audio-codec.c +Removing Documentation/devicetree/bindings/sound/zte,zx-spdif.txt +Removing Documentation/devicetree/bindings/sound/zte,zx-i2s.txt +Removing Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt +Removing Documentation/devicetree/bindings/sound/zte,tdm.txt +Removing Documentation/devicetree/bindings/sound/sirf-usp.txt +Removing Documentation/devicetree/bindings/sound/sirf-audio-codec.txt +Merge made by the 'recursive' strategy. + .../bindings/sound/audio-graph-port.yaml | 3 - + .../bindings/sound/intel,keembay-i2s.yaml | 12 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 5 + + .../sound/nvidia,tegra-audio-graph-card.yaml | 187 +++++ + .../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 +- + .../devicetree/bindings/sound/sirf-audio-codec.txt | 17 - + .../devicetree/bindings/sound/sirf-usp.txt | 27 - + 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 - + include/linux/platform_data/cros_ec_commands.h | 1 + + include/sound/rt5645.h | 2 + + include/sound/soc-component.h | 6 + + include/sound/soc-dai.h | 4 +- + include/sound/soc.h | 4 +- + 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/Makefile | 4 - + 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 | 127 +++- + 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 | 4 +- + 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/inno_rk3036.c | 2 +- + sound/soc/codecs/jz4740.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/lochnagar-sc.c | 12 +- + sound/soc/codecs/lpass-wsa-macro.c | 43 +- + sound/soc/codecs/max98373-sdw.c | 4 +- + 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/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-sdw.c | 21 +- + sound/soc/codecs/rt5682.c | 10 +- + sound/soc/codecs/rt5682.h | 2 +- + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt711-sdw.c | 2 +- + 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 | 98 +-- + sound/soc/codecs/wmfw.h | 6 +- + 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_esai.c | 8 +- + sound/soc/fsl/fsl_micfil.c | 7 +- + sound/soc/fsl/fsl_sai.c | 8 +- + sound/soc/fsl/fsl_spdif.c | 4 - + sound/soc/fsl/fsl_ssi.c | 12 +- + sound/soc/fsl/fsl_xcvr.c | 5 - + sound/soc/intel/Kconfig | 2 + + sound/soc/intel/boards/bytcht_es8316.c | 3 - + sound/soc/intel/boards/bytcr_rt5640.c | 52 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 15 +- + sound/soc/intel/boards/sof_rt5682.c | 7 - + sound/soc/intel/catpt/pcm.c | 12 +- + 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 | 3 - + 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 | 5 +- + sound/soc/intel/keembay/kmb_platform.c | 157 +++- + sound/soc/intel/keembay/kmb_platform.h | 9 + + 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 | 6 - + 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 | 60 +- + 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-cpu.c | 17 +- + 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 | 4 +- + 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-pcm.c | 258 +++---- + sound/soc/soc-topology-test.c | 843 +++++++++++++++++++++ + sound/soc/soc-topology.c | 30 +- + sound/soc/sof/core.c | 9 + + sound/soc/sof/intel/hda-compress.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/intel/hda-loader.c | 11 +- + sound/soc/sof/intel/hda-pcm.c | 16 +- + sound/soc/sof/intel/hda-stream.c | 38 +- + sound/soc/sof/intel/hda-trace.c | 4 +- + sound/soc/sof/intel/hda.c | 10 +- + sound/soc/sof/intel/hda.h | 6 +- + sound/soc/sof/intel/tgl.c | 3 +- + sound/soc/sof/loader.c | 6 - + sound/soc/sof/ops.h | 43 +- + sound/soc/sof/pm.c | 1 - + sound/soc/sof/sof-pci-dev.c | 12 +- + sound/soc/sof/sof-priv.h | 6 +- + sound/soc/sof/topology.c | 8 - + sound/soc/sprd/sprd-mcdt.c | 10 +- + sound/soc/sunxi/sun4i-i2s.c | 2 +- + sound/soc/sunxi/sun8i-codec.c | 12 +- + sound/soc/tegra/Kconfig | 9 + + 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 | 251 ++++++ + 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 ----------- + 245 files changed, 2629 insertions(+), 5480 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.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 + delete mode 100644 sound/soc/codecs/sirf-audio-codec.c + delete mode 100644 sound/soc/codecs/zx_aud96p22.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 +Merging modules/modules-next (ec2a29593c83 module: harden ELF info handling) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 164 ++++++++++++++++++++++++++++++++++++++++------ + kernel/module_signature.c | 2 +- + kernel/module_signing.c | 2 +- + 3 files changed, 145 insertions(+), 23 deletions(-) +Merging input/next (7a6a53b2b1a3 Input: iqs5xx - initialize an uninitialized variable) +$ git merge input/next +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by the 'recursive' strategy. + drivers/input/joystick/Kconfig | 7 + + drivers/input/joystick/Makefile | 2 +- + drivers/input/joystick/n64joy.c | 345 ++++++++++++++++++++++++++ + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/omap4-keypad.c | 302 +++++++++++++---------- + drivers/input/misc/da7280.c | 3 + + drivers/input/mouse/synaptics.c | 7 +- + drivers/input/touchscreen/ads7846.c | 376 +++++++++++++++-------------- + drivers/input/touchscreen/elants_i2c.c | 152 ++++++++++-- + 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/surface3_spi.c | 2 - + drivers/input/touchscreen/usbtouchscreen.c | 3 + + 15 files changed, 970 insertions(+), 452 deletions(-) + create mode 100644 drivers/input/joystick/n64joy.c +Merging block/for-next (ce3788f764a8 Merge branch 'for-5.12/io_uring' into for-next) +$ git merge block/for-next +Auto-merging mm/swapfile.c +Auto-merging lib/iov_iter.c +CONFLICT (content): Merge conflict in lib/iov_iter.c +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/super.c +Auto-merging fs/splice.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/libfs.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/io_uring.c +Auto-merging fs/internal.h +Auto-merging fs/hfsplus/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/exfat/file.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/block_dev.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/multipath.c +Auto-merging drivers/nvme/host/core.c +Auto-merging block/partitions/core.c +Auto-merging block/genhd.c +Auto-merging block/blk-cgroup.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging Documentation/filesystems/f2fs.rst +Resolved 'Documentation/filesystems/porting.rst' 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 9fdd75f13699] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/biovecs.rst | 2 + + Documentation/filesystems/f2fs.rst | 1 - + Documentation/filesystems/porting.rst | 16 + + MAINTAINERS | 5 + + arch/m68k/emu/nfblock.c | 2 +- + arch/xtensa/platforms/iss/simdisk.c | 2 +- + block/bfq-iosched.c | 445 +++++++++------ + block/bfq-iosched.h | 29 +- + block/bfq-wf2q.c | 3 - + block/bio-integrity.c | 18 +- + block/bio.c | 389 ++++++------- + block/blk-cgroup.c | 22 +- + block/blk-core.c | 99 ++-- + block/blk-crypto-fallback.c | 6 +- + block/blk-crypto.c | 2 +- + block/blk-exec.c | 14 +- + block/blk-flush.c | 17 +- + block/blk-merge.c | 17 +- + block/blk-mq.c | 69 ++- + block/blk-settings.c | 2 +- + block/blk-throttle.c | 2 +- + block/blk-wbt.c | 4 +- + block/blk.h | 9 +- + block/bounce.c | 4 +- + block/bsg.c | 6 +- + block/genhd.c | 306 ++-------- + block/kyber-iosched.c | 1 + + block/mq-deadline.c | 6 - + block/partitions/core.c | 34 +- + block/scsi_ioctl.c | 6 +- + drivers/ata/ahci_brcm.c | 14 +- + drivers/ata/pata_icside.c | 21 +- + drivers/block/brd.c | 8 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_int.h | 8 +- + drivers/block/drbd/drbd_main.c | 16 +- + drivers/block/drbd/drbd_receiver.c | 6 +- + drivers/block/drbd/drbd_req.c | 18 +- + drivers/block/drbd/drbd_req.h | 12 - + drivers/block/drbd/drbd_worker.c | 5 +- + drivers/block/loop.c | 93 +-- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 17 +- + drivers/block/null_blk/main.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/pktcdvd.c | 6 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/rbd.c | 19 - + drivers/block/rsxx/dev.c | 2 +- + drivers/block/rsxx/dma.c | 3 +- + drivers/block/sx8.c | 4 +- + drivers/block/umem.c | 2 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/zram/zram_drv.c | 5 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-devsets.c | 2 +- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-ioctls.c | 4 +- + drivers/ide/ide-park.c | 2 +- + drivers/ide/ide-pm.c | 4 +- + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide-taskfile.c | 2 +- + drivers/lightnvm/pblk-init.c | 2 +- + drivers/md/bcache/debug.c | 2 +- + drivers/md/bcache/request.c | 39 +- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm-bio-record.h | 9 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-clone-target.c | 14 +- + drivers/md/dm-raid1.c | 10 +- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/md/dm-zoned-metadata.c | 6 +- + drivers/md/dm.c | 14 +- + drivers/md/md-linear.c | 2 +- + drivers/md/md.c | 58 +- + drivers/md/md.h | 8 +- + drivers/md/raid1.c | 8 +- + drivers/md/raid10.c | 14 +- + drivers/md/raid5-ppl.c | 2 +- + drivers/md/raid5.c | 110 ++-- + drivers/mmc/core/block.c | 10 +- + drivers/nvdimm/blk.c | 4 +- + drivers/nvdimm/btt.c | 4 +- + drivers/nvdimm/pmem.c | 4 +- + drivers/nvme/host/core.c | 20 +- + drivers/nvme/host/lightnvm.c | 7 +- + drivers/nvme/host/multipath.c | 6 +- + drivers/nvme/host/pci.c | 4 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/target/io-cmd-bdev.c | 2 +- + drivers/nvme/target/passthru.c | 2 +- + drivers/s390/block/dasd.c | 26 +- + drivers/s390/block/dcssblk.c | 6 +- + drivers/s390/block/xpram.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/sg.c | 3 +- + drivers/scsi/st.c | 2 +- + drivers/target/target_core_file.c | 20 +- + drivers/target/target_core_pscsi.c | 3 +- + fs/block_dev.c | 20 +- + fs/btrfs/check-integrity.c | 10 +- + fs/btrfs/raid56.c | 7 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/volumes.c | 2 +- + fs/direct-io.c | 4 +- + fs/exfat/file.c | 2 +- + fs/ext4/fast_commit.c | 4 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/data.c | 40 +- + fs/f2fs/f2fs.h | 2 - + fs/f2fs/segment.c | 12 +- + fs/f2fs/super.c | 1 - + fs/fat/file.c | 2 +- + fs/file.c | 36 +- + fs/hfsplus/inode.c | 2 +- + fs/hfsplus/super.c | 2 +- + fs/internal.h | 1 + + fs/io-wq.c | 1 - + fs/io-wq.h | 1 - + fs/io_uring.c | 1013 +++++++++++++++++---------------- + fs/iomap/direct-io.c | 9 +- + fs/jbd2/checkpoint.c | 2 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/recovery.c | 2 +- + fs/libfs.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 5 - + fs/nfsd/blocklayout.c | 2 +- + fs/nilfs2/segbuf.c | 4 - + fs/nilfs2/the_nilfs.h | 2 +- + fs/ocfs2/file.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/splice.c | 9 +- + fs/super.c | 3 +- + fs/xfs/xfs_super.c | 2 +- + fs/zonefs/super.c | 4 +- + include/linux/bio.h | 43 +- + include/linux/blk-mq.h | 8 +- + include/linux/blk_types.h | 4 +- + include/linux/blkdev.h | 38 +- + include/linux/elevator.h | 2 + + include/linux/genhd.h | 27 +- + include/linux/swap.h | 1 - + include/uapi/linux/io_uring.h | 10 + + kernel/trace/blktrace.c | 16 +- + lib/iov_iter.c | 21 +- + mm/page_io.c | 47 +- + mm/swapfile.c | 16 +- + 154 files changed, 1779 insertions(+), 1949 deletions(-) +Merging device-mapper/for-next (266917bd4a21 dm writecache: fix unnecessary NULL check warnings) +$ git merge device-mapper/for-next +Auto-merging Documentation/admin-guide/device-mapper/dm-integrity.rst +Merge made by the 'recursive' strategy. + .../admin-guide/device-mapper/dm-integrity.rst | 11 ++ + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-dust.c | 2 +- + drivers/md/dm-integrity.c | 140 ++++++++++++++++++--- + drivers/md/dm-writecache.c | 8 +- + drivers/md/dm.c | 16 ++- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 2 +- + 8 files changed, 154 insertions(+), 29 deletions(-) +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 (bdcefe241263 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/scsi/ufs/ufshcd.c +Removing drivers/mmc/host/sdhci-sirf.c +Removing drivers/mmc/host/dw_mmc-zx.h +Removing drivers/mmc/host/dw_mmc-zx.c +Auto-merging drivers/mmc/core/block.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt +Removing Documentation/devicetree/bindings/mmc/sdhci-sirf.txt +Removing Documentation/devicetree/bindings/mmc/mmci.txt +Merge made by the 'recursive' strategy. + Documentation/block/inline-encryption.rst | 12 +- + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 223 ++++++++++++++ + .../bindings/mmc/marvell,xenon-sdhci.txt | 1 + + Documentation/devicetree/bindings/mmc/mmci.txt | 74 ----- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../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 -- + MAINTAINERS | 9 + + block/keyslot-manager.c | 29 ++ + drivers/firmware/qcom_scm.c | 16 +- + 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_test.c | 29 +- + drivers/mmc/core/queue.c | 4 +- + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sd.h | 2 +- + drivers/mmc/core/sdio.c | 2 +- + drivers/mmc/host/Kconfig | 36 +-- + drivers/mmc/host/Makefile | 4 +- + drivers/mmc/host/atmel-mci.c | 46 +-- + 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/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_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/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-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/tmio_mmc.h | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 8 +- + drivers/mmc/host/usdhi6rol0.c | 4 +- + drivers/scsi/ufs/ufshcd-crypto.c | 9 +- + drivers/scsi/ufs/ufshcd-crypto.h | 5 - + drivers/scsi/ufs/ufshcd.c | 1 - + include/linux/keyslot-manager.h | 3 + + include/linux/mmc/core.h | 6 + + include/linux/mmc/host.h | 24 ++ + include/linux/platform_data/mmc-omap.h | 3 +- + 67 files changed, 2010 insertions(+), 891 deletions(-) + 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 + create mode 100644 drivers/mmc/core/crypto.c + create mode 100644 drivers/mmc/core/crypto.h + 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 +Merging mfd/for-mfd-next (d0e648f2186a mfd: intel-lpss: Add Intel Alder Lake PCH-P PCI IDs) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/bd9571mwv.txt | 4 +- + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +- + drivers/gpio/gpio-bd9571mwv.c | 35 ++-- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/ab8500-core.c | 42 ++--- + drivers/mfd/altera-sysmgr.c | 3 +- + drivers/mfd/bd9571mwv.c | 178 ++++++++++++++------- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 13 ++ + drivers/mfd/max8997.c | 4 +- + drivers/mfd/mcp-sa11x0.c | 3 +- + drivers/mfd/mt6360-core.c | 12 +- + drivers/regulator/bd9571mwv-regulator.c | 59 ++++--- + include/linux/mfd/bd9571mwv.h | 45 ++---- + include/linux/mfd/core.h | 6 +- + include/linux/mfd/rohm-generic.h | 2 + + 17 files changed, 240 insertions(+), 178 deletions(-) +Merging backlight/for-backlight-next (4a98e5ef88f8 backlight: sky81452-backlight: Convert comma to semicolon) +$ git merge backlight/for-backlight-next +Removing include/linux/spi/lms283gf05.h +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/z2.c | 12 +++++--- + drivers/video/backlight/lms283gf05.c | 43 +++++++++++----------------- + drivers/video/backlight/sky81452-backlight.c | 2 +- + include/linux/spi/lms283gf05.h | 16 ----------- + 4 files changed, 26 insertions(+), 47 deletions(-) + delete mode 100644 include/linux/spi/lms283gf05.h +Merging battery/for-next (a72acc56f3e9 power-supply: use kobj_to_dev()) +$ git merge battery/for-next +Removing include/linux/power/max8903_charger.h +Removing drivers/power/reset/zx-reboot.c +Auto-merging arch/arm/mach-pxa/z2.c +Auto-merging Documentation/devicetree/bindings/arm/atmel-sysregs.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-power-ltc4162l | 82 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 5 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 110 ++ + .../bindings/power/supply/ltc4162-l.yaml | 69 + + 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 | 12 +- + 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 +- + include/linux/power/max8903_charger.h | 43 - + include/linux/wm97xx.h | 1 - + include/linux/z2_battery.h | 1 - + 42 files changed, 4331 insertions(+), 559 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-ltc4162l + create mode 100644 Documentation/devicetree/bindings/power/supply/bq256xx.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml + 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 include/linux/power/max8903_charger.h +Merging regulator/for-next (5ccfaceb507f Merge remote-tracking branch 'regulator/for-5.12' into regulator-next) +$ git merge regulator/for-next +Removing include/linux/regulator/ab8500.h +Removing drivers/regulator/ab3100.c +Auto-merging drivers/mfd/ab8500-core.c +Auto-merging arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/mcp16502-regulator.txt | 3 +- + .../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 + + MAINTAINERS | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 9 +- + drivers/mfd/ab8500-core.c | 1 - + drivers/regulator/Kconfig | 41 +- + drivers/regulator/Makefile | 4 +- + 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/core.c | 18 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 215 ++++++ + drivers/regulator/pf8x00-regulator.c | 276 +++++--- + drivers/regulator/qcom-labibb-regulator.c | 728 ++++++++++++++++++++- + drivers/regulator/qcom-rpmh-regulator.c | 34 + + drivers/regulator/rt4831-regulator.c | 198 ++++++ + drivers/regulator/s5m8767.c | 15 +- + include/linux/mfd/abx500/ab8500.h | 3 - + include/linux/regulator/ab8500.h | 166 ----- + lib/linear_ranges.c | 8 +- + 29 files changed, 2190 insertions(+), 1471 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4831-regulator.yaml + delete mode 100644 drivers/regulator/ab3100.c + create mode 100644 drivers/regulator/atc260x-regulator.c + create mode 100644 drivers/regulator/mtk-dvfsrc-regulator.c + create mode 100644 drivers/regulator/rt4831-regulator.c + delete mode 100644 include/linux/regulator/ab8500.h +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 (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b3f82afc1041 IMA: Measure kernel version in early boot) +$ git merge integrity/next-integrity +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 include/linux/ima.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +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 03de54006529] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 5 +- + include/linux/ima.h | 10 +++ + 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_main.c | 58 ++++++++++-- + security/integrity/ima/ima_policy.c | 115 +++++++++++++++++++----- + security/integrity/ima/ima_queue_keys.c | 3 +- + security/selinux/Makefile | 2 + + security/selinux/ima.c | 44 +++++++++ + security/selinux/include/ima.h | 24 +++++ + security/selinux/include/security.h | 3 +- + security/selinux/ss/services.c | 64 +++++++++++-- + 17 files changed, 313 insertions(+), 52 deletions(-) + create mode 100644 security/selinux/ima.c + create mode 100644 security/selinux/include/ima.h +Merging keys/keys-next (f7b0fd0b96b1 Merge branch 'keys-misc' into keys-next) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. + Documentation/security/keys/core.rst | 4 ++-- + certs/blacklist.c | 10 +++++----- + certs/system_keyring.c | 5 +++-- + crypto/asymmetric_keys/asymmetric_type.c | 6 ++++-- + crypto/asymmetric_keys/pkcs7_parser.h | 5 ++--- + crypto/asymmetric_keys/pkcs7_trust.c | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 9 ++++----- + include/crypto/public_key.h | 1 - + include/keys/encrypted-type.h | 2 +- + 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 +- + security/integrity/ima/ima_mok.c | 5 ++--- + 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 + + 22 files changed, 48 insertions(+), 48 deletions(-) +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 +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/libfs.c +Merge made by the 'recursive' strategy. + fs/anon_inodes.c | 157 +++++++++++++++++++++++++++--------- + fs/libfs.c | 5 -- + fs/userfaultfd.c | 19 ++--- + include/linux/anon_inodes.h | 5 ++ + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 9 +++ + include/linux/security.h | 10 +++ + security/security.c | 8 ++ + security/selinux/avc.c | 10 +-- + security/selinux/hooks.c | 141 ++++++++++++++++++++++++++------ + security/selinux/ibpkey.c | 1 - + security/selinux/include/classmap.h | 2 + + security/selinux/include/security.h | 1 - + 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 | 10 +-- + security/selinux/xfrm.c | 2 +- + 23 files changed, 294 insertions(+), 105 deletions(-) +Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') +$ git merge smack/next +Already up to date. +Merging tomoyo/master (9c83465f3245 tomoyo: recognize kernel threads correctly) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/file.c | 16 ++++++++-------- + security/tomoyo/network.c | 10 +++++----- + security/tomoyo/util.c | 24 ++++++++++++------------ + 3 files changed, 25 insertions(+), 25 deletions(-) +Merging tpmdd/next (5cb9c551cb13 tpm_tis: Clean up locality release) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm_tis_core.c | 50 +++-------------------------------------- + 1 file changed, 3 insertions(+), 47 deletions(-) +Merging watchdog/master (7c53f6b671f4 Linux 5.11-rc3) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (07a8e0e8c1b9 Merge branches 'iommu/fixes', 'arm/renesas', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + 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 | 9 +- + drivers/iommu/amd/io_pgtable.c | 558 ++++++++++++++++++++++++++++++ + drivers/iommu/amd/iommu.c | 672 ++++-------------------------------- + drivers/iommu/amd/iommu_v2.c | 4 +- + drivers/iommu/dma-iommu.c | 29 +- + drivers/iommu/intel/dmar.c | 3 + + drivers/iommu/intel/iommu.c | 14 +- + drivers/iommu/intel/pasid.c | 18 +- + drivers/iommu/intel/svm.c | 73 ++-- + drivers/iommu/io-pgtable.c | 3 + + drivers/iommu/iommu.c | 31 +- + drivers/iommu/iova.c | 35 +- + drivers/iommu/ipmmu-vmsa.c | 53 ++- + include/linux/intel-iommu.h | 2 + + include/linux/io-pgtable.h | 2 + + include/linux/iommu.h | 14 +- + include/linux/iova.h | 12 - + include/trace/events/intel_iommu.h | 37 ++ + 22 files changed, 827 insertions(+), 810 deletions(-) + create mode 100644 drivers/iommu/amd/io_pgtable.c +Merging audit/next (127c8c5f0589 audit: Make audit_filter_syscall() return void) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 4 ++-- + kernel/auditsc.c | 16 ++++++++-------- + 2 files changed, 10 insertions(+), 10 deletions(-) +Merging devicetree/for-next (cb18a7979a35 dt-bindings: gpu: Convert v3d to json-schema) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml +Auto-merging Documentation/devicetree/bindings/sram/sram.yaml +Auto-merging Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging Documentation/devicetree/bindings/mmc/mmc-controller.yaml +Auto-merging Documentation/devicetree/bindings/media/i2c/imx219.yaml +Auto-merging Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml +Removing Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt +Auto-merging Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml +Auto-merging Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml +Resolved 'Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f86d5b1c52c9] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../socionext/socionext,uniphier-system-cache.yaml | 4 +- + .../devicetree/bindings/ata/sata_highbank.yaml | 1 + + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 1 + + .../bindings/connector/usb-connector.yaml | 17 +-- + .../bindings/display/brcm,bcm2711-hdmi.yaml | 1 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 1 + + .../bindings/display/panel/jdi,lt070me05000.yaml | 1 + + .../display/panel/mantix,mlaf057we51-x.yaml | 3 +- + .../bindings/display/panel/novatek,nt36672a.yaml | 1 + + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 3 +- + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 2 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 33 ------ + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 75 ++++++++++++ + Documentation/devicetree/bindings/graph.txt | 129 +-------------------- + .../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 + + .../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/interrupt-controller/fsl,intmux.yaml | 2 +- + .../interrupt-controller/st,stm32-exti.yaml | 2 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + .../devicetree/bindings/media/i2c/imx219.yaml | 1 + + .../bindings/memory-controllers/exynos-srom.yaml | 2 + + .../bindings/misc/fsl,dpaa2-console.yaml | 1 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 2 + + .../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 ++- + .../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 | 3 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 1 + + .../bindings/remoteproc/ingenic,vpu.yaml | 2 +- + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 3 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 1 + + .../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/google,sc7180-trogdor.yaml | 1 + + .../bindings/sound/samsung,aries-wm8994.yaml | 3 + + .../bindings/sound/samsung,midas-audio.yaml | 2 + + .../devicetree/bindings/sound/tas2562.yaml | 2 + + .../devicetree/bindings/sound/tas2770.yaml | 2 + + .../devicetree/bindings/sound/tlv320adcx140.yaml | 1 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 2 + + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 + + .../bindings/timer/intel,ixp4xx-timer.yaml | 2 +- + .../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 + + drivers/of/base.c | 4 +- + drivers/of/fdt.c | 12 +- + 83 files changed, 224 insertions(+), 216 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt + create mode 100644 Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +Merging mailbox/mailbox-for-next (5a6338cce9f4 mailbox: arm_mhuv2: Add driver) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (05cda27d7eb5 Merge remote-tracking branch 'spi/for-5.12' into spi-next) +$ git merge spi/for-next +Removing include/linux/platform_data/efm32-spi.h +Auto-merging drivers/spi/spi.c +Removing drivers/spi/spi-txx9.c +Removing drivers/spi/spi-sirf.c +Removing drivers/spi/spi-efm32.c +Auto-merging drivers/spi/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-sirf.txt +Merge made by the 'recursive' strategy. + .../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/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 6 +- + Documentation/devicetree/bindings/spi/spi-sirf.txt | 42 - + MAINTAINERS | 8 + + drivers/spi/Kconfig | 33 +- + drivers/spi/Makefile | 4 +- + 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 | 388 +++++- + drivers/spi/spi-efm32.c | 462 ------- + drivers/spi/spi-hisi-sfc-v3xx.c | 33 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-mem.c | 1 + + drivers/spi/spi-mpc52xx.c | 4 +- + drivers/spi/spi-orion.c | 55 +- + drivers/spi/spi-pxa2xx.c | 4 + + drivers/spi/spi-qcom-qspi.c | 3 +- + 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 | 36 +- + drivers/spi/spi-tegra210-quad.c | 1410 ++++++++++++++++++++ + drivers/spi/spi-txx9.c | 477 ------- + drivers/spi/spi.c | 25 +- + include/linux/platform_data/efm32-spi.h | 15 - + include/linux/spi/spi.h | 42 +- + include/uapi/linux/spi/spi.h | 41 + + include/uapi/linux/spi/spidev.h | 30 +- + 35 files changed, 2128 insertions(+), 2445 deletions(-) + rename Documentation/devicetree/bindings/{mtd => spi}/cadence-quadspi.txt (97%) + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sirf.txt + delete mode 100644 drivers/spi/spi-efm32.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 include/linux/platform_data/efm32-spi.h + create mode 100644 include/uapi/linux/spi/spi.h +Merging tip/auto-latest (a7e0bdf1b07e Merge branch 'irq/urgent') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/lockdep.h +Removing arch/x86/platform/goldfish/goldfish.c +Removing arch/x86/platform/goldfish/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/scheduler/schedutil.txt | 169 ++++++++++ + MAINTAINERS | 4 +- + Makefile | 6 - + arch/ia64/include/asm/efi.h | 13 + + arch/ia64/kernel/efi.c | 1 + + arch/ia64/kernel/machine_kexec.c | 1 + + arch/ia64/kernel/mca.c | 1 + + arch/ia64/kernel/smpboot.c | 1 + + arch/ia64/kernel/time.c | 1 + + arch/ia64/kernel/uncached.c | 4 +- + arch/ia64/mm/contig.c | 1 + + arch/ia64/mm/discontig.c | 1 + + arch/ia64/mm/init.c | 1 + + arch/x86/Kconfig | 4 - + arch/x86/Makefile | 31 +- + arch/x86/events/core.c | 20 ++ + arch/x86/events/intel/core.c | 172 ---------- + 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 | 3 +- + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 17 +- + arch/x86/include/asm/disabled-features.h | 3 +- + arch/x86/include/asm/efi.h | 44 +-- + arch/x86/include/asm/fpu/api.h | 12 + + arch/x86/include/asm/insn.h | 45 +++ + arch/x86/include/asm/irq.h | 6 +- + arch/x86/include/asm/kprobes.h | 11 +- + arch/x86/include/asm/mce.h | 22 -- + arch/x86/include/asm/microcode.h | 2 - + arch/x86/include/asm/orc_types.h | 10 + + arch/x86/include/asm/perf_event.h | 6 +- + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/include/asm/required-features.h | 3 +- + arch/x86/include/asm/resctrl.h | 11 +- + arch/x86/include/asm/special_insns.h | 6 +- + arch/x86/include/asm/thermal.h | 21 ++ + arch/x86/include/asm/unwind_hints.h | 13 +- + arch/x86/include/asm/vm86.h | 1 - + arch/x86/include/uapi/asm/vm86.h | 4 +- + arch/x86/kernel/acpi/Makefile | 1 - + arch/x86/kernel/acpi/wakeup_64.S | 4 + + arch/x86/kernel/cpu/common.c | 3 + + arch/x86/kernel/cpu/intel.c | 3 + + arch/x86/kernel/cpu/mce/Makefile | 2 - + arch/x86/kernel/cpu/mce/core.c | 16 +- + arch/x86/kernel/cpu/mce/intel.c | 1 - + arch/x86/kernel/cpu/microcode/core.c | 2 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 1 - + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 - + arch/x86/kernel/cpu/resctrl/internal.h | 1 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 24 +- + arch/x86/kernel/cpu/scattered.c | 5 - + arch/x86/kernel/cpu/sgx/main.c | 14 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/ftrace_64.S | 8 +- + arch/x86/kernel/irq.c | 29 ++ + arch/x86/kernel/kprobes/core.c | 168 +++++----- + arch/x86/kernel/module.c | 1 + + arch/x86/kernel/msr.c | 7 + + arch/x86/kernel/pci-iommu_table.c | 3 - + arch/x86/kernel/reboot.c | 9 + + arch/x86/kernel/sys_x86_64.c | 8 +- + arch/x86/kernel/vm86_32.c | 62 +--- + arch/x86/lib/insn.c | 119 ++++--- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/mm/fault.c | 30 -- + arch/x86/mm/init.c | 19 +- + arch/x86/mm/mmio-mod.c | 2 - + arch/x86/platform/Makefile | 1 - + arch/x86/platform/efi/efi_64.c | 33 +- + arch/x86/platform/efi/efi_thunk_64.S | 6 +- + arch/x86/platform/geode/alix.c | 19 +- + arch/x86/platform/geode/geos.c | 19 +- + arch/x86/platform/geode/net5501.c | 13 +- + arch/x86/platform/goldfish/Makefile | 2 - + arch/x86/platform/goldfish/goldfish.c | 54 ---- + .../platform/intel-mid/device_libs/platform_bt.c | 4 +- + 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/tools/relocs.c | 12 +- + arch/x86/xen/Makefile | 1 - + arch/x86/xen/xen-asm.S | 29 +- + arch/x86/xen/xen-head.S | 5 +- + drivers/firmware/efi/libstub/arm64-stub.c | 4 +- + drivers/firmware/efi/libstub/efistub.h | 11 +- + drivers/thermal/cpufreq_cooling.c | 69 +++- + drivers/thermal/intel/Kconfig | 4 + + drivers/thermal/intel/Makefile | 1 + + .../mce => drivers/thermal/intel}/therm_throt.c | 39 +-- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 3 +- + include/linux/cgroup.h | 4 +- + include/linux/compiler.h | 2 + + include/linux/efi.h | 19 +- + include/linux/irqflags.h | 12 + + include/linux/jump_label.h | 12 +- + include/linux/local_lock_internal.h | 5 +- + include/linux/lockdep.h | 15 +- + include/linux/lockdep_types.h | 18 +- + include/linux/msi.h | 6 + + include/linux/objtool.h | 13 +- + include/linux/rbtree.h | 206 +++++++++++- + include/linux/sched.h | 7 +- + include/linux/syscalls.h | 8 +- + include/linux/topology.h | 1 + + init/Kconfig | 2 +- + kernel/events/core.c | 195 ++++++----- + kernel/events/uprobes.c | 80 +++-- + kernel/futex.c | 13 +- + kernel/irq/msi.c | 44 ++- + kernel/locking/Makefile | 1 + + kernel/locking/irqflag-debug.c | 11 + + kernel/locking/lockdep.c | 183 +++++++---- + kernel/locking/rtmutex.c | 71 ++-- + kernel/sched/core.c | 121 ++++++- + kernel/sched/cpufreq_schedutil.c | 108 +------ + kernel/sched/deadline.c | 79 ++--- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 318 +++++++++--------- + kernel/sched/features.h | 1 - + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 22 +- + kernel/sched/topology.c | 99 +++--- + lib/Kconfig.debug | 8 + + lib/locking-selftest.c | 334 ++++++++++++++++++- + lib/test_fpu.c | 6 +- + lib/timerqueue.c | 28 +- + tools/arch/x86/include/asm/disabled-features.h | 3 +- + tools/arch/x86/include/asm/insn.h | 45 +++ + tools/arch/x86/include/asm/orc_types.h | 10 + + tools/arch/x86/include/asm/required-features.h | 3 +- + tools/arch/x86/lib/insn.c | 119 ++++--- + tools/include/linux/objtool.h | 13 +- + tools/include/linux/rbtree.h | 192 ++++++++++- + tools/objtool/.gitignore | 2 +- + tools/objtool/Documentation/stack-validation.txt | 16 +- + tools/objtool/Makefile | 5 +- + tools/objtool/arch/x86/decode.c | 12 +- + .../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 | 357 ++++++++++++--------- + tools/objtool/elf.c | 113 ++----- + 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 | 9 +- + tools/objtool/orc_gen.c | 315 ++++++++++-------- + tools/objtool/special.c | 14 +- + tools/objtool/weak.c | 9 +- + tools/testing/selftests/x86/helpers.h | 24 +- + 169 files changed, 3186 insertions(+), 2140 deletions(-) + create mode 100644 Documentation/scheduler/schedutil.txt + create mode 100644 arch/ia64/include/asm/efi.h + create mode 100644 arch/x86/include/asm/thermal.h + delete mode 100644 arch/x86/platform/goldfish/Makefile + delete mode 100644 arch/x86/platform/goldfish/goldfish.c + rename {arch/x86/kernel/cpu/mce => drivers/thermal/intel}/therm_throt.c (96%) + create mode 100644 kernel/locking/irqflag-debug.c + 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 (8ae954caf49a clocksource/drivers/sh_cmt: Fix potential deadlock when calling runtime PM) +$ 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 +Removing drivers/edac/amd64_edac_inj.c +Removing drivers/edac/amd64_edac_dbg.c +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 15 +- + drivers/edac/Makefile | 7 +- + drivers/edac/amd64_edac.c | 332 +++++++++++++++++++++++++++++++++++++++--- + drivers/edac/amd64_edac.h | 11 -- + drivers/edac/amd64_edac_dbg.c | 55 ------- + drivers/edac/amd64_edac_inj.c | 235 ------------------------------ + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/edac/xgene_edac.c | 2 +- + 8 files changed, 319 insertions(+), 340 deletions(-) + delete mode 100644 drivers/edac/amd64_edac_dbg.c + delete mode 100644 drivers/edac/amd64_edac_inj.c +Merging irqchip/irq/irqchip-next (c60767421e10 irqchip/ls-extirq: add IRQCHIP_SKIP_SET_WAKE to the irqchip flags) +$ git merge irqchip/irq/irqchip-next +Removing drivers/irqchip/irq-tango.c +Removing drivers/irqchip/irq-sirfsoc.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging arch/arm64/Kconfig.platforms +Removing Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml +Recorded preimage for 'Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml'. +[master 440ac2b5f2d5] Merge remote-tracking branch 'irqchip/irq/irqchip-next' +$ git diff -M --stat --summary HEAD^.. + .../allwinner,sun6i-a31-r-intc.yaml | 67 ++++ + .../allwinner,sun7i-a20-sc-nmi.yaml | 10 - + .../bindings/interrupt-controller/qcom,pdc.txt | 2 + + .../interrupt-controller/sigma,smp8642-intc.txt | 48 --- + arch/arm/mach-sunxi/Kconfig | 2 + + arch/arm64/Kconfig.platforms | 2 + + drivers/irqchip/Kconfig | 5 - + drivers/irqchip/Makefile | 3 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-ls-extirq.c | 2 +- + 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 ------------ + 14 files changed, 459 insertions(+), 452 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun6i-a31-r-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt + 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 +Merging ftrace/for-next (f6a694665f13 tracing: Offload eval map updates to a work queue) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (efc0f28cfe21 rcu-tasks: Rectify kernel-doc for struct rcu_tasks) +$ git merge rcu/rcu/next +Auto-merging mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging lib/Makefile +Auto-merging kernel/sched/core.c +Auto-merging include/linux/mm.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Merge made by the 'recursive' strategy. + .../Expedited-Grace-Periods.rst | 4 +- + .../RCU/Design/Requirements/Requirements.rst | 732 +++++++++++---------- + Documentation/RCU/checklist.rst | 10 +- + Documentation/RCU/rcubarrier.rst | 6 +- + Documentation/RCU/stallwarn.rst | 27 +- + Documentation/RCU/whatisRCU.rst | 10 +- + Documentation/admin-guide/kernel-parameters.rst | 15 + + Documentation/admin-guide/kernel-parameters.txt | 74 ++- + Documentation/dev-tools/kcsan.rst | 3 + + .../litmus-tests/locking/DCL-broken.litmus | 55 ++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/tsc.c | 3 +- + include/linux/clocksource.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/list.h | 2 +- + include/linux/mm.h | 6 + + include/linux/rcu_segcblist.h | 120 +++- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 42 +- + include/linux/slab.h | 4 + + include/linux/srcu.h | 3 + + include/linux/srcutiny.h | 7 +- + include/linux/timer.h | 2 + + include/linux/torture.h | 27 +- + include/linux/vmalloc.h | 6 + + include/trace/events/rcu.h | 26 + + kernel/cpu.c | 7 + + kernel/kcsan/Makefile | 4 +- + kernel/kcsan/atomic.h | 5 + + kernel/kcsan/core.c | 31 +- + kernel/kcsan/debugfs.c | 5 + + kernel/kcsan/encoding.h | 5 + + kernel/kcsan/kcsan.h | 3 +- + kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 118 ++-- + kernel/kcsan/report.c | 5 + + kernel/kcsan/selftest.c | 5 + + kernel/locking/locktorture.c | 1 - + 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 | 476 +++++++++++--- + kernel/rcu/refscale.c | 23 +- + kernel/rcu/srcutiny.c | 77 ++- + kernel/rcu/srcutree.c | 147 ++++- + kernel/rcu/tasks.h | 83 ++- + kernel/rcu/tree.c | 171 +++-- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 494 ++++++++++++-- + kernel/rcu/tree_stall.h | 60 +- + kernel/rcu/update.c | 4 +- + kernel/scftorture.c | 6 +- + kernel/sched/core.c | 9 +- + kernel/time/clocksource.c | 138 +++- + kernel/time/timer.c | 14 + + kernel/torture.c | 173 ++++- + lib/Kconfig.kcsan | 5 +- + lib/Makefile | 3 - + lib/bitmap.c | 27 +- + lib/percpu-refcount.c | 12 +- + mm/slab.c | 22 + + mm/slab.h | 14 + + mm/slab_common.c | 79 +++ + mm/slob.c | 8 + + mm/slub.c | 42 ++ + mm/util.c | 34 + + mm/vmalloc.c | 15 + + tools/include/nolibc/nolibc.h | 153 +++-- + tools/memory-model/Documentation/glossary.txt | 14 +- + tools/memory-model/Documentation/locking.txt | 320 +++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/memory-model/README | 2 +- + tools/memory-model/litmus-tests/.gitignore | 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/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../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 | 25 +- + 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 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + 143 files changed, 4636 insertions(+), 1179 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/config2csv.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/torture.sh +Merging kvm/next (9a78e15802a8 KVM: x86: allow KVM_REQ_GET_NESTED_STATE_PAGES outside guest mode for VMX) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (429b205b73c8 Merge branch 'kvm-arm64/hyp-reloc' into kvmarm-master/next) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-init.S +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/hyp_image.h | 29 +- + arch/arm64/include/asm/kvm_asm.h | 24 +- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/kvm_mmu.h | 61 ++--- + arch/arm64/include/asm/kvm_pgtable.h | 5 + + arch/arm64/include/asm/sections.h | 3 +- + arch/arm64/kernel/image-vars.h | 1 - + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/vmlinux.lds.S | 18 +- + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 7 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +- + arch/arm64/kvm/hyp/nvhe/.gitignore | 2 + + arch/arm64/kvm/hyp/nvhe/Makefile | 29 +- + 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 | 19 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 17 +- + 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/hyp/vgic-v3-sr.c | 40 ++- + arch/arm64/kvm/hypercalls.c | 6 + + arch/arm64/kvm/mmu.c | 13 +- + arch/arm64/kvm/sys_regs.c | 75 +++--- + arch/arm64/kvm/trng.c | 85 ++++++ + arch/arm64/kvm/va_layout.c | 34 ++- + arch/arm64/kvm/vgic/vgic-v3.c | 12 +- + 30 files changed, 859 insertions(+), 222 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/nvhe/gen-hyprel.c + create mode 100644 arch/arm64/kvm/trng.c +Merging kvm-ppc/kvm-ppc-next (dc924b062488 KVM: SVM: check CR4 changes against vcpu->arch) +$ 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 (2e92493637a0 x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (7dd3050a0194 Merge branch 'for-5.12' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 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 (64b0efa18f8c platform/x86: dell-wmi-sysman: fix a NULL pointer dereference) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Removing drivers/platform/x86/intel_mid_thermal.c +Removing drivers/platform/x86/intel_mid_powerbtn.c +Auto-merging drivers/platform/x86/intel-vbtn.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../admin-guide/laptops/thinkpad-acpi.rst | 24 + + Documentation/driver-api/index.rst | 1 + + .../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/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 15 +- + drivers/platform/surface/Kconfig | 38 + + drivers/platform/surface/Makefile | 3 + + 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 | 2057 ++++++++++++++++ + .../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/surface_acpi_notify.c | 886 +++++++ + drivers/platform/surface/surface_aggregator_cdev.c | 322 +++ + drivers/platform/x86/Kconfig | 15 - + drivers/platform/x86/Makefile | 2 - + drivers/platform/x86/dell-wmi-sysman/sysman.c | 6 +- + 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/thinkpad_acpi.c | 181 ++ + include/linux/mod_devicetable.h | 18 + + include/linux/sony-laptop.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/uapi/linux/surface_aggregator/cdev.h | 78 + + scripts/mod/devicetable-offsets.c | 8 + + scripts/mod/file2alias.c | 23 + + 49 files changed, 14414 insertions(+), 870 deletions(-) + 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 + 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 + delete mode 100644 drivers/platform/x86/intel_mid_powerbtn.c + delete mode 100644 drivers/platform/x86/intel_mid_thermal.c + 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 + create mode 100644 include/uapi/linux/surface_aggregator/cdev.h +Merging chrome-platform/for-next (4daeb395f175 platform/chrome: cros_ec: Call interrupt bottom half at probe time) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + 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 | 247 +++++++++++++++++++++---- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + include/linux/platform_data/cros_ec_commands.h | 18 ++ + 11 files changed, 269 insertions(+), 68 deletions(-) +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (9a5ad5c5b2d2 leds: trigger: fix potential deadlock with libata) +$ git merge leds/for-next +Auto-merging drivers/leds/leds-lm3533.c +Merge made by the 'recursive' strategy. + 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-max8997.c | 12 ++++++------ + drivers/leds/leds-netxbig.c | 12 ++++++------ + drivers/leds/leds-ss4200.c | 18 +++++++----------- + drivers/leds/leds-wm831x-status.c | 12 ++++++------ + 10 files changed, 57 insertions(+), 60 deletions(-) +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 (4731210c09f5 gpiolib: Bind gpio_device to a driver to enable fw_devlink=on by default) +$ git merge driver-core/driver-core-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/base/Kconfig +Merge made by the 'recursive' strategy. + drivers/base/Kconfig | 2 +- + drivers/base/bus.c | 19 +-------- + drivers/base/core.c | 101 +++++++++++++++++++++++++++++++++++++++------ + drivers/base/test/Makefile | 1 + + drivers/gpio/gpiolib-of.c | 11 +++++ + drivers/gpio/gpiolib-of.h | 5 +++ + drivers/gpio/gpiolib.c | 38 +++++++++++++---- + drivers/of/property.c | 34 +++++++++++++++ + include/linux/device.h | 2 + + 9 files changed, 174 insertions(+), 39 deletions(-) +Merging usb/usb-next (3c648d3deb0f xhci: handle halting transfer event properly after endpoint stop and halt raced.) +$ git merge usb/usb-next +Auto-merging include/linux/usb/composite.h +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/host/xhci.c +Removing drivers/usb/host/ehci-tegra.c +Removing drivers/usb/gadget/udc/bdc/bdc_pci.c +Auto-merging drivers/base/swnode.c +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm/configs/tegra_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/usb/usb-xhci.txt +Removing Documentation/devicetree/bindings/usb/usb-device.txt +Auto-merging Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml +Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Removing Documentation/devicetree/bindings/usb/mediatek,musb.txt +Removing Documentation/devicetree/bindings/usb/mediatek,mtu3.txt +Removing Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt +Removing Documentation/devicetree/bindings/usb/generic.txt +Removing Documentation/devicetree/bindings/usb/dwc3.txt +Auto-merging Documentation/devicetree/bindings/net/btusb.txt +Resolved 'Documentation/devicetree/bindings/usb/qcom,dwc3.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 725f13d492a4] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/net/btusb.txt | 2 +- + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 6 +- + Documentation/devicetree/bindings/usb/dwc3-st.txt | 4 +- + .../devicetree/bindings/usb/dwc3-xilinx.txt | 2 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 128 --- + .../devicetree/bindings/usb/exynos-usb.txt | 2 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 105 ++ + .../devicetree/bindings/usb/generic-xhci.yaml | 65 ++ + Documentation/devicetree/bindings/usb/generic.txt | 57 - + .../bindings/usb/intel,keembay-dwc3.yaml | 9 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 121 --- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 178 ++++ + .../devicetree/bindings/usb/mediatek,mtu3.txt | 108 -- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 287 +++++ + .../devicetree/bindings/usb/mediatek,musb.txt | 57 - + .../devicetree/bindings/usb/mediatek,musb.yaml | 113 ++ + Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 12 +- + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 4 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 332 ++++++ + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 4 +- + .../devicetree/bindings/usb/usb-device.txt | 102 -- + .../devicetree/bindings/usb/usb-device.yaml | 124 +++ + Documentation/devicetree/bindings/usb/usb-drd.yaml | 78 ++ + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 36 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 41 - + .../devicetree/bindings/usb/usb-xhci.yaml | 42 + + Documentation/devicetree/bindings/usb/usb.yaml | 60 ++ + Documentation/usb/gadget-testing.rst | 30 +- + Documentation/usb/raw-gadget.rst | 102 +- + MAINTAINERS | 4 +- + arch/arm/configs/tegra_defconfig | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 21 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 82 ++ + drivers/base/swnode.c | 71 +- + drivers/usb/c67x00/c67x00-hcd.h | 2 +- + drivers/usb/c67x00/c67x00-sched.c | 12 +- + drivers/usb/chipidea/Kconfig | 3 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 344 +++++- + drivers/usb/chipidea/core.c | 10 +- + drivers/usb/chipidea/host.c | 104 +- + drivers/usb/class/usbtmc.c | 85 +- + drivers/usb/dwc2/hcd.c | 15 +- + drivers/usb/dwc2/hcd_intr.c | 14 +- + drivers/usb/dwc2/params.c | 8 + + drivers/usb/dwc3/Kconfig | 10 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 46 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/drd.c | 25 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 363 +++++++ + drivers/usb/dwc3/dwc3-keystone.c | 9 +- + drivers/usb/dwc3/dwc3-pci.c | 69 +- + drivers/usb/dwc3/dwc3-qcom.c | 59 +- + drivers/usb/dwc3/gadget.c | 131 ++- + drivers/usb/gadget/composite.c | 104 +- + drivers/usb/gadget/configfs.c | 24 +- + drivers/usb/gadget/function/f_midi.c | 12 +- + drivers/usb/gadget/function/f_printer.c | 5 + + drivers/usb/gadget/function/u_audio.c | 135 ++- + drivers/usb/gadget/function/u_ether.c | 33 +- + drivers/usb/gadget/function/u_ether.h | 12 + + drivers/usb/gadget/function/u_ether_configfs.h | 15 +- + drivers/usb/gadget/function/u_serial.c | 8 +- + drivers/usb/gadget/legacy/Kconfig | 13 +- + drivers/usb/gadget/legacy/raw_gadget.c | 3 +- + drivers/usb/gadget/udc/bdc/Kconfig | 11 - + drivers/usb/gadget/udc/bdc/Makefile | 2 - + drivers/usb/gadget/udc/bdc/bdc.h | 134 +-- + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_cmd.h | 21 +- + drivers/usb/gadget/udc/bdc/bdc_dbg.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_dbg.h | 10 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 +- + drivers/usb/gadget/udc/bdc/bdc_ep.h | 10 +- + drivers/usb/gadget/udc/bdc/bdc_pci.c | 128 --- + drivers/usb/gadget/udc/bdc/bdc_udc.c | 8 +- + drivers/usb/gadget/udc/core.c | 39 +- + drivers/usb/gadget/udc/snps_udc_core.c | 30 +- + drivers/usb/gadget/udc/udc-xilinx.c | 2 +- + drivers/usb/host/Kconfig | 10 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-tegra.c | 604 ----------- + drivers/usb/host/xhci-mem.c | 21 +- + drivers/usb/host/xhci-ring.c | 1111 +++++++++++--------- + drivers/usb/host/xhci.c | 94 +- + drivers/usb/host/xhci.h | 37 +- + drivers/usb/phy/phy-mxs-usb.c | 7 +- + drivers/usb/phy/phy-tegra-usb.c | 103 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 16 +- + drivers/usb/typec/tcpm/tcpm.c | 1063 +++++++++++++++---- + drivers/usb/typec/ucsi/Kconfig | 1 + + drivers/usb/typec/ucsi/ucsi.c | 55 +- + drivers/usb/typec/ucsi/ucsi.h | 3 + + drivers/usb/usbip/stub_main.c | 4 +- + drivers/usb/usbip/usbip_common.h | 29 + + drivers/usb/usbip/vhci_rx.c | 2 + + drivers/usb/usbip/vhci_sysfs.c | 1 + + include/linux/property.h | 3 + + include/linux/usb/ch9.h | 9 + + include/linux/usb/chipidea.h | 6 + + include/linux/usb/composite.h | 2 + + include/linux/usb/gadget.h | 11 + + include/linux/usb/pd.h | 3 + + include/linux/usb/tcpm.h | 4 + + include/linux/usb/tegra_usb_phy.h | 2 + + include/uapi/linux/usb/ch9.h | 13 + + include/uapi/linux/usb/tmc.h | 3 + + 108 files changed, 4927 insertions(+), 2776 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/dwc3.txt + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/generic-xhci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/generic.txt + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtu3.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/snps,dwc3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-device.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-device.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb-drd.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-xhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-xhci.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb.yaml + create mode 100644 drivers/usb/dwc3/dwc3-imx8mp.c + delete mode 100644 drivers/usb/gadget/udc/bdc/bdc_pci.c + delete mode 100644 drivers/usb/host/ehci-tegra.c +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 (fea7372cbc40 USB: serial: mos7720: fix error code in mos7720_write()) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 6 + + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/cp210x.c | 100 +++++-- + drivers/usb/serial/f81232.c | 12 +- + drivers/usb/serial/f81534.c | 4 +- + drivers/usb/serial/io_ti.c | 8 +- + drivers/usb/serial/mos7720.c | 8 +- + drivers/usb/serial/mos7840.c | 4 +- + drivers/usb/serial/mxuport.c | 7 - + drivers/usb/serial/pl2303.c | 8 +- + drivers/usb/serial/upd78f0730.c | 5 +- + drivers/usb/serial/xr_serial.c | 611 ++++++++++++++++++++++++++++++++++++++++ + 13 files changed, 730 insertions(+), 53 deletions(-) + create mode 100644 drivers/usb/serial/xr_serial.c +Merging usb-chipidea-next/for-usb-next (4f30b9d2315f usb: cdns3: Add support for TI's AM64 SoC) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdns3-imx.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/usb/Makefile | 2 + + drivers/usb/cdns3/Kconfig | 60 +- + drivers/usb/cdns3/Makefile | 43 +- + drivers/usb/cdns3/{debug.h => cdns3-debug.h} | 0 + drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} | 8 +- + drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} | 34 +- + drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} | 0 + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 315 +++ + drivers/usb/cdns3/cdns3-ti.c | 1 + + drivers/usb/cdns3/{trace.c => cdns3-trace.c} | 2 +- + drivers/usb/cdns3/{trace.h => cdns3-trace.h} | 6 +- + drivers/usb/cdns3/cdnsp-debug.h | 583 ++++++ + drivers/usb/cdns3/cdnsp-ep0.c | 494 +++++ + drivers/usb/cdns3/cdnsp-gadget.c | 2011 +++++++++++++++++++ + drivers/usb/cdns3/cdnsp-gadget.h | 1601 ++++++++++++++++ + drivers/usb/cdns3/cdnsp-mem.c | 1336 +++++++++++++ + drivers/usb/cdns3/cdnsp-pci.c | 254 +++ + drivers/usb/cdns3/cdnsp-ring.c | 2439 ++++++++++++++++++++++++ + drivers/usb/cdns3/cdnsp-trace.c | 12 + + drivers/usb/cdns3/cdnsp-trace.h | 840 ++++++++ + drivers/usb/cdns3/core.c | 455 ++--- + drivers/usb/cdns3/core.h | 65 +- + drivers/usb/cdns3/drd.c | 224 ++- + drivers/usb/cdns3/drd.h | 94 +- + drivers/usb/cdns3/gadget-export.h | 22 +- + drivers/usb/cdns3/host-export.h | 18 +- + drivers/usb/cdns3/host.c | 26 +- + 29 files changed, 10433 insertions(+), 523 deletions(-) + rename drivers/usb/cdns3/{debug.h => cdns3-debug.h} (100%) + rename drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} (99%) + rename drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} (99%) + rename drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} (100%) + create mode 100644 drivers/usb/cdns3/cdns3-plat.c + rename drivers/usb/cdns3/{trace.c => cdns3-trace.c} (89%) + rename drivers/usb/cdns3/{trace.h => cdns3-trace.h} (99%) + create mode 100644 drivers/usb/cdns3/cdnsp-debug.h + create mode 100644 drivers/usb/cdns3/cdnsp-ep0.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.h + create mode 100644 drivers/usb/cdns3/cdnsp-mem.c + create mode 100644 drivers/usb/cdns3/cdnsp-pci.c + create mode 100644 drivers/usb/cdns3/cdnsp-ring.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.h +Merging phy-next/next (71edb0b4fa0e dt-bindings: phy: qcom-qusb2: Document SDM660 compatible) +$ git merge phy-next/next +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 +Merge made by the 'recursive' strategy. + .../bindings/display/mediatek/mediatek,dsi.txt | 18 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 18 +- + .../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 | 94 +++++++ + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 2 + + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 +- + 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 | 295 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 100 +++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 30 ++- + drivers/phy/st/phy-stm32-usbphyc.c | 222 ++++++++++------ + 26 files changed, 1587 insertions(+), 555 deletions(-) + 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 +Merging tty/tty-next (9159835a978f vt: keyboard, use new API for keyboard_tasklet) +$ git merge tty/tty-next +Auto-merging include/linux/tty.h +CONFLICT (content): Merge conflict in include/linux/tty.h +Removing include/linux/spi/ifx_modem.h +Removing include/linux/platform_data/efm32-uart.h +Removing include/linux/kd.h +Auto-merging drivers/tty/tty_io.c +Removing drivers/tty/serial/sirfsoc_uart.h +Removing drivers/tty/serial/sirfsoc_uart.c +Removing drivers/tty/serial/ifx6x60.h +Removing drivers/tty/serial/ifx6x60.c +Removing drivers/tty/serial/efm32-uart.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/bluetooth/hci_ldisc.c +Removing Documentation/devicetree/bindings/serial/sirf-uart.txt +Auto-merging Documentation/devicetree/bindings/serial/renesas,hscif.yaml +Resolved 'include/linux/tty.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a219ae4fd161] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-class-led-trigger-tty | 6 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/sirf-uart.txt | 34 - + .../devicetree/bindings/serial/st,stm32-uart.yaml | 13 +- + Documentation/networking/caif/caif.rst | 1 - + drivers/accessibility/speakup/spk_ttyio.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 34 +- + drivers/char/pcmcia/synclink_cs.c | 2 - + drivers/input/serio/serport.c | 4 +- + drivers/leds/trigger/Kconfig | 9 + + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-tty.c | 183 +++ + drivers/net/caif/caif_serial.c | 3 +- + drivers/net/ppp/ppp_async.c | 3 +- + drivers/net/ppp/ppp_synctty.c | 3 +- + drivers/s390/char/con3215.c | 1 - + drivers/s390/char/sclp_tty.c | 1 - + drivers/s390/char/sclp_vt220.c | 1 - + drivers/s390/char/tty3270.c | 2 - + drivers/tty/amiserial.c | 3 - + drivers/tty/hvc/hvcs.c | 5 +- + drivers/tty/ipwireless/tty.c | 1 - + drivers/tty/mxser.c | 1 - + drivers/tty/n_gsm.c | 3 +- + drivers/tty/n_hdlc.c | 60 +- + drivers/tty/n_null.c | 3 +- + drivers/tty/n_r3964.c | 10 +- + drivers/tty/n_tracerouter.c | 4 +- + drivers/tty/n_tracesink.c | 4 +- + drivers/tty/n_tty.c | 153 +- + drivers/tty/pty.c | 16 +- + drivers/tty/serial/8250/8250_tegra.c | 11 +- + drivers/tty/serial/Kconfig | 42 - + drivers/tty/serial/Makefile | 3 - + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 43 +- + drivers/tty/serial/efm32-uart.c | 852 ----------- + drivers/tty/serial/fsl_lpuart.c | 4 +- + drivers/tty/serial/icom.c | 4 +- + drivers/tty/serial/ifx6x60.c | 1390 ------------------ + drivers/tty/serial/ifx6x60.h | 118 -- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/max3100.c | 3 - + drivers/tty/serial/mxs-auart.c | 45 +- + drivers/tty/serial/owl-uart.c | 38 + + drivers/tty/serial/serial_core.c | 3 - + drivers/tty/serial/sirfsoc_uart.c | 1503 -------------------- + drivers/tty/serial/sirfsoc_uart.h | 447 ------ + drivers/tty/serial/stm32-usart.c | 419 +++--- + drivers/tty/synclink_gt.c | 1 - + drivers/tty/tty_io.c | 210 ++- + drivers/tty/vcc.c | 10 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/defkeymap.c_shipped | 82 +- + drivers/tty/vt/keyboard.c | 18 +- + drivers/tty/vt/vt.c | 42 +- + drivers/tty/vt/vt_ioctl.c | 151 -- + drivers/video/console/vgacon.c | 19 - + include/linux/kbd_kern.h | 10 +- + include/linux/kd.h | 8 - + include/linux/platform_data/efm32-uart.h | 19 - + include/linux/spi/ifx_modem.h | 15 - + include/linux/tty.h | 11 +- + include/linux/tty_ldisc.h | 3 +- + include/linux/vt_kern.h | 12 - + include/uapi/linux/serial_core.h | 3 - + include/uapi/linux/termios.h | 15 - + net/nfc/nci/uart.c | 3 +- + 68 files changed, 951 insertions(+), 5179 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-tty + delete mode 100644 Documentation/devicetree/bindings/serial/sirf-uart.txt + create mode 100644 drivers/leds/trigger/ledtrig-tty.c + delete mode 100644 drivers/tty/serial/efm32-uart.c + delete mode 100644 drivers/tty/serial/ifx6x60.c + delete mode 100644 drivers/tty/serial/ifx6x60.h + delete mode 100644 drivers/tty/serial/sirfsoc_uart.c + delete mode 100644 drivers/tty/serial/sirfsoc_uart.h + delete mode 100644 include/linux/kd.h + delete mode 100644 include/linux/platform_data/efm32-uart.h + delete mode 100644 include/linux/spi/ifx_modem.h +Merging char-misc/char-misc-next (930c922a987a mei: me: add adler lake point LP DID) +$ 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 +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. +Removing drivers/misc/pti.c +Removing drivers/misc/atmel_tclib.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging drivers/accessibility/speakup/spk_ttyio.c +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 +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 9f54faba75c5] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-bus-fsl-mc | 19 + + .../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/admin-guide/spkguide.txt | 48 +- + .../devicetree/bindings/misc/eeprom-93xx46.txt | 1 + + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/pti_intel_mid.rst | 108 -- + Documentation/fpga/dfl.rst | 28 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 12 +- + 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 | 2 +- + 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 | 14 +- + drivers/accessibility/speakup/synth.c | 6 +- + 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 | 98 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 49 + + drivers/bus/fsl-mc/fsl-mc-uapi.c | 547 +++++++ + drivers/bus/fsl-mc/mc-sys.c | 2 +- + 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/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 | 17 + + drivers/misc/bcm-vk/Makefile | 12 + + drivers/misc/bcm-vk/bcm_vk.h | 513 ++++++ + drivers/misc/bcm-vk/bcm_vk_dev.c | 1651 ++++++++++++++++++++ + drivers/misc/bcm-vk/bcm_vk_msg.c | 1356 ++++++++++++++++ + 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 | 333 ++++ + drivers/misc/cardreader/rtsx_pcr.c | 6 - + drivers/misc/eeprom/eeprom_93xx46.c | 17 + + drivers/misc/mei/client.c | 2 +- + drivers/misc/mei/hbm.c | 28 +- + drivers/misc/mei/hw-me-regs.h | 5 + + drivers/misc/mei/interrupt.c | 33 +- + 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 | 16 +- + drivers/misc/vmw_vmci/vmci_queue_pair.h | 2 +- + drivers/most/core.c | 6 +- + drivers/platform/goldfish/goldfish_pipe.c | 28 +- + drivers/tty/Makefile | 2 - + drivers/tty/n_tracerouter.c | 235 --- + drivers/tty/n_tracesink.c | 230 --- + drivers/tty/n_tracesink.h | 26 - + drivers/virt/vboxguest/vboxguest_utils.c | 18 +- + drivers/w1/masters/ds2490.c | 25 +- + drivers/w1/slaves/w1_therm.c | 22 +- + drivers/w1/w1.c | 39 +- + include/linux/dfl.h | 86 + + include/linux/eeprom_93xx46.h | 2 + + include/linux/firmware/xlnx-zynqmp.h | 1 - + include/linux/fsl/mc.h | 8 +- + include/linux/intel-pti.h | 35 - + include/linux/mod_devicetable.h | 24 + + include/linux/vmw_vmci_defs.h | 4 +- + include/uapi/linux/fsl_mc.h | 34 + + include/uapi/linux/misc/bcm_vk.h | 84 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + scripts/spdxcheck.py | 2 +- + scripts/ver_linux | 12 +- + 94 files changed, 6901 insertions(+), 2224 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/driver-api/pti_intel_mid.rst + create mode 100644 drivers/bus/fsl-mc/fsl-mc-uapi.c + create mode 100644 drivers/fpga/dfl-n3000-nios.c + 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 + delete mode 100644 drivers/misc/pti.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 include/linux/dfl.h + delete mode 100644 include/linux/intel-pti.h + create mode 100644 include/uapi/linux/fsl_mc.h + create mode 100644 include/uapi/linux/misc/bcm_vk.h +Merging extcon/extcon-next (226d336c1c75 extcon: max8997: Add CHGINS and CHGRM interrupt handling) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max8997.c | 4 ++++ + include/linux/extcon.h | 23 +++++++++++++++++++++++ + 2 files changed, 27 insertions(+) +Merging soundwire/next (9a0c798c7a98 soundwire: cadence: adjust verbosity in response handling) +$ git merge soundwire/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/soundwire/bus.c | 11 ++++++----- + drivers/soundwire/cadence_master.c | 31 ++++++++++++++++--------------- + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/intel.c | 8 +++++--- + drivers/soundwire/slave.c | 10 ++++------ + drivers/soundwire/sysfs_slave.c | 2 +- + 7 files changed, 34 insertions(+), 31 deletions(-) +Merging thunderbolt/next (2c2a2327bdb5 thunderbolt: switch: Fix function name in the header) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/icm.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 20 +++++-- + Documentation/admin-guide/thunderbolt.rst | 16 ++++++ + drivers/thunderbolt/cap.c | 2 +- + drivers/thunderbolt/ctl.c | 4 +- + drivers/thunderbolt/dma_port.c | 2 + + drivers/thunderbolt/dma_test.c | 4 +- + drivers/thunderbolt/domain.c | 34 ++++++++++-- + drivers/thunderbolt/eeprom.c | 20 +++---- + drivers/thunderbolt/icm.c | 4 +- + drivers/thunderbolt/lc.c | 35 +++++++++++++ + drivers/thunderbolt/nhi.c | 10 ++-- + drivers/thunderbolt/switch.c | 69 ++++++++++++++++++++++--- + drivers/thunderbolt/tb.c | 32 +++++++++--- + drivers/thunderbolt/tb.h | 4 ++ + drivers/thunderbolt/tb_regs.h | 1 + + drivers/thunderbolt/tunnel.c | 2 +- + drivers/thunderbolt/xdomain.c | 6 +-- + 17 files changed, 219 insertions(+), 46 deletions(-) +Merging vfio/next (bdfae1c9a913 vfio/type1: Add vfio_group_iommu_domain()) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (02bd88b4834d staging: qlge: add documentation for debugging qlge) +$ git merge staging/staging-next +Auto-merging drivers/staging/rtl8723bs/os_dep/wifi_regd.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt +Removing Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 11 + + Documentation/ABI/testing/sysfs-bus-iio-dac-ad5766 | 31 + + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 3 + + .../devicetree/bindings/iio/adc/xilinx-xadc.txt | 49 +- + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 63 + + .../bindings/iio/dac/microchip,mcp4725.yaml | 31 +- + .../bindings/iio/gyroscope/bosch,bmg160.yaml | 3 + + .../bindings/iio/gyroscope/invensense,mpu3050.txt | 45 - + .../bindings/iio/gyroscope/invensense,mpu3050.yaml | 70 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 67 - + .../bindings/iio/imu/invensense,mpu6050.yaml | 104 ++ + .../iio/magnetometer/bosch,bmc150_magn.yaml | 3 + + .../bindings/iio/magnetometer/yamaha,yas530.yaml | 112 ++ + .../devicetree/bindings/trivial-devices.yaml | 10 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/networking/device_drivers/index.rst | 1 + + .../networking/device_drivers/qlogic/index.rst | 18 + + .../networking/device_drivers/qlogic/qlge.rst | 118 ++ + MAINTAINERS | 6 + + drivers/hid/hid-sensor-custom.c | 143 ++ + drivers/iio/accel/hid-sensor-accel-3d.c | 6 +- + drivers/iio/accel/kxcjk-1013.c | 32 + + drivers/iio/adc/Kconfig | 11 +- + drivers/iio/adc/ab8500-gpadc.c | 30 +- + drivers/iio/adc/ad7476.c | 6 + + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 3 +- + drivers/iio/adc/qcom-spmi-adc5.c | 95 +- + drivers/iio/adc/qcom-spmi-vadc.c | 3 +- + drivers/iio/adc/qcom-vadc-common.c | 229 +-- + drivers/iio/adc/sc27xx_adc.c | 2 +- + drivers/iio/adc/stm32-adc-core.c | 29 +- + drivers/iio/adc/stm32-adc.c | 14 +- + drivers/iio/adc/stm32-dfsdm-core.c | 3 +- + drivers/iio/adc/xilinx-xadc-core.c | 364 +++-- + drivers/iio/adc/xilinx-xadc-events.c | 9 +- + drivers/iio/adc/xilinx-xadc.h | 6 + + drivers/iio/chemical/bme680_core.c | 2 +- + drivers/iio/chemical/pms7003.c | 2 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 2 + + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 76 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.h | 15 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5766.c | 643 ++++++++ + drivers/iio/frequency/adf4350.c | 6 +- + drivers/iio/gyro/bmg160_core.c | 25 + + drivers/iio/gyro/hid-sensor-gyro-3d.c | 40 +- + drivers/iio/imu/inv_mpu6050/Kconfig | 8 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 5 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/industrialio-core.c | 44 +- + drivers/iio/inkern.c | 34 +- + drivers/iio/light/apds9960.c | 8 + + drivers/iio/light/hid-sensor-als.c | 39 +- + drivers/iio/light/tsl2583.c | 8 +- + drivers/iio/light/vl6180.c | 2 +- + drivers/iio/magnetometer/Kconfig | 15 + + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/bmc150_magn.c | 26 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 48 +- + drivers/iio/magnetometer/yamaha-yas530.c | 1049 +++++++++++++ + drivers/iio/orientation/hid-sensor-incl-3d.c | 43 +- + drivers/iio/orientation/hid-sensor-rotation.c | 46 +- + drivers/iio/position/Kconfig | 16 + + drivers/iio/position/Makefile | 1 + + .../iio/position/hid-sensor-custom-intel-hinge.c | 385 +++++ + drivers/iio/pressure/ms5637.c | 77 +- + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/board/Kconfig | 9 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 284 +++- + drivers/staging/comedi/drivers/adv_pci_dio.c | 289 +++- + drivers/staging/fwserial/fwserial.c | 2 + + drivers/staging/greybus/light.c | 3 +- + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 32 +- + drivers/staging/hikey9xx/hi6421v600-regulator.c | 508 +++--- + .../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml | 108 +- + .../hikey9xx/hisilicon,hisi-spmi-controller.yaml | 19 +- + drivers/staging/hikey9xx/phy-hi3670-usb3.c | 79 +- + drivers/staging/hikey9xx/phy-hi3670-usb3.yaml | 1 + + drivers/staging/most/net/net.c | 3 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 58 +- + drivers/staging/qlge/Kconfig | 1 + + drivers/staging/qlge/Makefile | 2 +- + drivers/staging/qlge/TODO | 10 - + drivers/staging/qlge/qlge.h | 244 +-- + drivers/staging/qlge/qlge_dbg.c | 1650 ++++++-------------- + drivers/staging/qlge/qlge_devlink.c | 164 ++ + drivers/staging/qlge/qlge_devlink.h | 9 + + drivers/staging/qlge/qlge_ethtool.c | 233 ++- + drivers/staging/qlge/qlge_main.c | 1376 ++++++++-------- + drivers/staging/qlge/qlge_mpi.c | 356 +++-- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + drivers/staging/rtl8192e/rtllib_rx.c | 5 +- + drivers/staging/rtl8192e/rtllib_tx.c | 8 +- + drivers/staging/rtl8192u/Kconfig | 1 + + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 + + drivers/staging/rtl8723bs/core/rtw_security.c | 24 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 90 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + drivers/staging/vc04_services/interface/TODO | 4 + + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 22 +- + .../interface/vchiq_arm/vchiq_connected.c | 3 +- + drivers/staging/wimax/i2400m/fw.c | 2 +- + include/linux/fixp-arith.h | 19 + + include/linux/hid-sensor-ids.h | 14 + + .../linux}/iio/adc/qcom-vadc-common.h | 28 +- + include/linux/iio/consumer.h | 36 + + include/linux/mfd/hi6421-spmi-pmic.h | 1 - + 116 files changed, 6522 insertions(+), 3628 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac-ad5766 + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5766.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/invensense,mpu6050.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/yamaha,yas530.yaml + create mode 100644 Documentation/networking/device_drivers/qlogic/index.rst + create mode 100644 Documentation/networking/device_drivers/qlogic/qlge.rst + create mode 100644 drivers/iio/dac/ad5766.c + create mode 100644 drivers/iio/magnetometer/yamaha-yas530.c + create mode 100644 drivers/iio/position/hid-sensor-custom-intel-hinge.c + create mode 100644 drivers/staging/qlge/qlge_devlink.c + create mode 100644 drivers/staging/qlge/qlge_devlink.h + rename {drivers => include/linux}/iio/adc/qcom-vadc-common.h (92%) +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 (23145465c5b0 Merge branch 'icc-msm8939' into icc-next) +$ git merge icc/icc-next +Removing Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,qcs404.yaml | 77 ----- + .../{qcom,msm8916.yaml => qcom,rpm.yaml} | 22 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 4 +- + 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 +------------- + include/dt-bindings/interconnect/qcom,msm8939.h | 105 ++++++ + 10 files changed, 769 insertions(+), 550 deletions(-) + 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 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 include/dt-bindings/interconnect/qcom,msm8939.h +Merging dmaengine/next (c281cde7a456 dmaengine: stedma40: fix 'physical' typo) +$ 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/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/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/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/sirfsoc-dma.txt | 44 - + .../devicetree/bindings/dma/ste-coh901318.txt | 32 - + Documentation/devicetree/bindings/dma/zxdma.txt | 38 - + MAINTAINERS | 4 +- + drivers/dma/Kconfig | 29 +- + 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/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 | 9 + + 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/sirf-dma.c | 1170 -------- + drivers/dma/ste_dma40.c | 2 +- + drivers/dma/ti/k3-udma.c | 131 +- + drivers/dma/zx_dma.c | 941 ------- + 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 - + 38 files changed, 2121 insertions(+), 5783 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/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 +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 6 ++-- + MAINTAINERS | 6 ++-- + kernel/cgroup/cgroup-v1.c | 3 ++ + kernel/cgroup/cgroup.c | 59 ++++++++++----------------------- + kernel/cgroup/cpuset.c | 6 ++-- + 5 files changed, 28 insertions(+), 52 deletions(-) +Merging scsi/for-next (61629796ed22 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ufs/ufshcd-crypto.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Removing drivers/scsi/gdth_proc.h +Removing drivers/scsi/gdth_proc.c +Removing drivers/scsi/gdth_ioctl.h +Removing drivers/scsi/gdth.h +CONFLICT (modify/delete): drivers/scsi/gdth.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/gdth.c left in tree. +Auto-merging drivers/scsi/aha1542.c +Auto-merging drivers/scsi/advansys.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/kbuild/makefiles.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/scsi/gdth.c +rm 'drivers/scsi/gdth.c' +$ git commit --no-edit -v -a +[master 3b175e689093] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-ufs | 11 + + Documentation/kbuild/makefiles.rst | 4 +- + Documentation/process/magic-number.rst | 2 - + Documentation/scsi/libsas.rst | 9 +- + Documentation/scsi/scsi-parameters.rst | 3 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 1 - + drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- + drivers/message/fusion/lsi/mpi_history.txt | 2 +- + 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 | 84 +- + drivers/scsi/aha1542.c | 133 +- + 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/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 | 47 +- + 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_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 | 91 +- + 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 | 4 +- + drivers/scsi/ufs/ufshcd.c | 565 +-- + drivers/scsi/ufs/ufshcd.h | 41 +- + drivers/scsi/wd33c93.c | 6 +- + 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 +- + 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/target/target_core_base.h | 1 + + include/trace/events/ufs.h | 108 +- + 153 files changed, 5489 insertions(+), 9018 deletions(-) + 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 +Merging scsi-mkp/for-next (d2aacd36a8e0 scsi: MAINTAINERS: Adjust to reflect gdth scsi driver removal) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ------- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/qla2xxx/qla_nvme.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 3 +++ + 5 files changed, 6 insertions(+), 10 deletions(-) +Merging vhost/linux-next (79991caf5202 vdpa_sim_net: Add support for user supported devices) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/Kconfig | 1 + + drivers/vdpa/ifcvf/ifcvf_main.c | 2 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 1 + + drivers/vdpa/mlx5/core/mr.c | 28 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + 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/virtio/virtio_mem.c | 2 +- + include/linux/vdpa.h | 44 ++- + include/uapi/linux/vdpa.h | 40 +++ + 12 files changed, 671 insertions(+), 55 deletions(-) + create mode 100644 include/uapi/linux/vdpa.h +Merging rpmsg/for-next (7cb4f293777e 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. + .../devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + + MAINTAINERS | 2 ++ + drivers/remoteproc/pru_rproc.c | 18 ++++++++++++++++++ + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_wcnss_iris.c | 1 + + drivers/rpmsg/qcom_glink_ssr.c | 17 +++++++++-------- + include/linux/rpmsg/qcom_glink.h | 8 ++++++-- + 7 files changed, 38 insertions(+), 11 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 (d60c1614b6df gpio: tegra: Fix irq_set_affinity) +$ git merge gpio-brgl/gpio/for-next +Removing tools/testing/selftests/gpio/gpio-mockup-chardev.c +Auto-merging tools/testing/selftests/Makefile +Removing drivers/gpio/gpio-zx.c +Auto-merging arch/arm64/boot/dts/toshiba/tmpv7708.dtsi +Auto-merging arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/zx296702-gpio.txt +Auto-merging Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml +Resolved 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d8e8a975c8b2] Merge remote-tracking branch 'gpio-brgl/gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-davinci.txt | 1 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 3 +- + .../bindings/gpio/renesas,rcar-gpio.yaml | 3 + + .../bindings/gpio/toshiba,gpio-visconti.yaml | 70 +++ + .../devicetree/bindings/gpio/zx296702-gpio.txt | 24 - + Documentation/driver-api/gpio/consumer.rst | 5 +- + Documentation/driver-api/gpio/intro.rst | 8 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 4 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 11 + + drivers/gpio/Kconfig | 28 +- + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-bd70528.c | 59 ++- + drivers/gpio/gpio-bd71828.c | 39 +- + drivers/gpio/gpio-max77620.c | 2 +- + drivers/gpio/gpio-mvebu.c | 47 +- + drivers/gpio/gpio-pca953x.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 | 2 +- + drivers/gpio/gpio-zx.c | 289 ------------ + drivers/pinctrl/visconti/pinctrl-common.c | 23 + + include/uapi/linux/gpio.h | 2 +- + tools/gpio/gpio-utils.c | 89 ---- + tools/gpio/gpio-utils.h | 6 - + tools/testing/selftests/Makefile | 9 - + 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/kselftest_deps.sh | 4 +- + 37 files changed, 1269 insertions(+), 1252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/zx296702-gpio.txt + create mode 100644 drivers/gpio/gpio-visconti.c + delete mode 100644 drivers/gpio/gpio-zx.c + create mode 100644 tools/testing/selftests/gpio/gpio-mockup-cdev.c + delete mode 100644 tools/testing/selftests/gpio/gpio-mockup-chardev.c +Merging gpio-intel/for-next (f9f1591ab487 gpio: wcove: Split out to_ireg() helper and deduplicate the code) +$ git merge gpio-intel/for-next +Auto-merging drivers/gpio/gpio-wcove.c +Removing drivers/gpio/gpio-msic.c +Removing drivers/gpio/gpio-intel-mid.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 - + drivers/gpio/Kconfig | 14 -- + drivers/gpio/Makefile | 1 - + drivers/gpio/TODO | 2 +- + drivers/gpio/gpio-aggregator.c | 40 +--- + drivers/gpio/gpio-intel-mid.c | 414 ----------------------------------------- + drivers/gpio/gpio-merrifield.c | 5 + + drivers/gpio/gpio-msic.c | 314 ------------------------------- + drivers/gpio/gpio-wcove.c | 63 ++++--- + include/linux/gpio/machine.h | 4 +- + lib/cmdline.c | 21 ++- + lib/cmdline_kunit.c | 56 ++++++ + 12 files changed, 119 insertions(+), 817 deletions(-) + delete mode 100644 drivers/gpio/gpio-intel-mid.c + delete mode 100644 drivers/gpio/gpio-msic.c +Merging pinctrl/for-next (d3e0c0572caf Merge branch 'devel' into for-next) +$ 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 +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 +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/microchip,sparx5-sgpio.yaml | 4 +- + .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 109 - + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 2 +- + .../devicetree/bindings/pinctrl/pinctrl-zx.txt | 84 - + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 62 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 +- + 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/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-st.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/pinctrl-u300.c | 1111 ---- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 - + 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 + + 70 files changed, 5441 insertions(+), 13388 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 + 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/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 (a2bc9b21fd3f pwm: Remove ZTE ZX driver) +$ 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-zx.c | 278 ----------------------- + 4 files changed, 311 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 (df00d0298902 selftests/vDSO: fix -Wformat warning in vdso_test_correctness) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/livepatch/index.rst | 1 + + Documentation/livepatch/livepatch.rst | 15 +- + Documentation/livepatch/module-elf-format.rst | 10 +- + Documentation/livepatch/reliable-stacktrace.rst | 309 ++++++++++++++++++++++++ + 4 files changed, 313 insertions(+), 22 deletions(-) + create mode 100644 Documentation/livepatch/reliable-stacktrace.rst +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. + drivers/hwtracing/coresight/coresight-cti-platform.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (15f57b3e3130 rtc: pcf2127: Run a OTP refresh if not done before) +$ git merge rtc/rtc-next +Removing include/linux/rtc/sirfsoc_rtciobrg.h +Removing drivers/rtc/rtc-tx4939.c +Removing drivers/rtc/rtc-sirfsoc.c +Removing drivers/rtc/rtc-coh901331.c +Auto-merging drivers/rtc/rtc-cmos.c +Removing drivers/rtc/rtc-ab3100.c +Removing Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt +Removing Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt +Merge made by the 'recursive' strategy. + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 1 + + .../devicetree/bindings/rtc/sirf,prima2-sysrtc.txt | 13 - + .../bindings/rtc/stericsson,coh901331.txt | 16 - + drivers/rtc/Kconfig | 35 +- + drivers/rtc/Makefile | 4 - + drivers/rtc/class.c | 5 + + drivers/rtc/interface.c | 12 +- + drivers/rtc/rtc-ab3100.c | 254 ------------ + drivers/rtc/rtc-ac100.c | 4 +- + drivers/rtc/rtc-armada38x.c | 21 +- + drivers/rtc/rtc-asm9260.c | 6 +- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-coh901331.c | 290 -------------- + drivers/rtc/rtc-ds1305.c | 5 +- + drivers/rtc/rtc-ds1307.c | 5 +- + drivers/rtc/rtc-ds1685.c | 6 +- + drivers/rtc/rtc-ds3232.c | 5 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-m41t80.c | 23 +- + drivers/rtc/rtc-m48t59.c | 22 +- + drivers/rtc/rtc-mcp795.c | 5 +- + drivers/rtc/rtc-mv.c | 14 +- + drivers/rtc/rtc-opal.c | 27 +- + drivers/rtc/rtc-pcf2123.c | 5 +- + drivers/rtc/rtc-pcf2127.c | 36 +- + drivers/rtc/rtc-pcf85063.c | 11 +- + drivers/rtc/rtc-pcf85363.c | 8 +- + drivers/rtc/rtc-pl031.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 9 + + drivers/rtc/rtc-rv3028.c | 11 +- + drivers/rtc/rtc-rv3029c2.c | 20 +- + drivers/rtc/rtc-rv3032.c | 11 +- + drivers/rtc/rtc-rv8803.c | 11 +- + drivers/rtc/rtc-rx6110.c | 4 +- + drivers/rtc/rtc-rx8010.c | 19 +- + drivers/rtc/rtc-rx8025.c | 5 +- + drivers/rtc/rtc-s5m.c | 33 +- + drivers/rtc/rtc-sirfsoc.c | 446 --------------------- + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-tps65910.c | 19 +- + drivers/rtc/rtc-tx4939.c | 303 -------------- + include/linux/rtc.h | 2 + + include/linux/rtc/sirfsoc_rtciobrg.h | 21 - + include/uapi/linux/rtc.h | 5 + + 44 files changed, 184 insertions(+), 1597 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt + delete mode 100644 drivers/rtc/rtc-ab3100.c + delete mode 100644 drivers/rtc/rtc-coh901331.c + delete mode 100644 drivers/rtc/rtc-sirfsoc.c + delete mode 100644 drivers/rtc/rtc-tx4939.c + delete mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h +Merging nvdimm/libnvdimm-for-next (127c3d2e7e8a Merge branch 'for-5.11/dax' into for-5.11/libnvdimm) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (2c07343abd89 selftests/seccomp: Update kernel config) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (112b6a8e038d arm64: allow LTO to be selected) +$ git merge kspp/for-next/kspp +Auto-merging scripts/Makefile.lib +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 +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 29cd848d3d2c] 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/rmem.yaml | 49 ++++++++++++ + drivers/nvmem/Kconfig | 8 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/rmem.c | 97 +++++++++++++++++++++++ + drivers/of/platform.c | 1 + + drivers/slimbus/slimbus.h | 2 +- + 6 files changed, 158 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/rmem.yaml + create mode 100644 drivers/nvmem/rmem.c +Merging nvmem/for-next (2c36185526ad nvmem: core: skip child nodes not matching binding) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 5 ++++- + drivers/nvmem/imx-iim.c | 7 +------ + 2 files changed, 5 insertions(+), 7 deletions(-) +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 (18194b7b3ddc hv_utils: Fix spelling mistake "Hearbeat" -> "Heartbeat") +$ git merge hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 7 + + drivers/hv/channel.c | 13 +- + drivers/hv/channel_mgmt.c | 39 +++++- + drivers/hv/hv_fcopy.c | 37 ++++-- + drivers/hv/hv_kvp.c | 123 +++++++++-------- + drivers/hv/hv_snapshot.c | 89 +++++++------ + drivers/hv/hv_util.c | 222 +++++++++++++++++++------------ + drivers/hv/hyperv_vmbus.h | 2 +- + drivers/hv/ring_buffer.c | 82 ++++++++++-- + drivers/hv/vmbus_drv.c | 61 ++++++--- + drivers/net/hyperv/hyperv_net.h | 3 + + drivers/net/hyperv/netvsc.c | 2 + + drivers/net/hyperv/rndis_filter.c | 2 + + drivers/scsi/storvsc_drv.c | 10 ++ + include/linux/hyperv.h | 58 ++++++-- + net/vmw_vsock/hyperv_transport.c | 4 +- + 16 files changed, 520 insertions(+), 234 deletions(-) +Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol) +$ git merge auxdisplay/auxdisplay +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/ht16k33.txt +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/holtek,ht16k33.yaml | 77 ++++++++++++++++++++++ + .../devicetree/bindings/display/ht16k33.txt | 40 ----------- + MAINTAINERS | 2 +- + drivers/auxdisplay/Kconfig | 3 - + drivers/auxdisplay/ht16k33.c | 17 ++--- + 5 files changed, 85 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ht16k33.txt +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ 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 (e71ba9452f0b Linux 5.11-rc2) +$ 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 (77f2cb28ae52 Merge branch 'mhi-net-immutable' into mhi-next) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/init.c | 9 +- + drivers/bus/mhi/core/main.c | 182 ++++++++------------- + drivers/bus/mhi/pci_generic.c | 371 +++++++++++++++++++++++++++++++++++++++--- + include/linux/mhi.h | 13 +- + 4 files changed, 430 insertions(+), 145 deletions(-) +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ git merge memblock/for-next +Auto-merging mm/memblock.c +Auto-merging include/linux/memblock.h +Merge made by the 'recursive' strategy. + include/linux/memblock.h | 2 +- + mm/memblock.c | 6 +----- + 2 files changed, 2 insertions(+), 6 deletions(-) +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 (74b30195395c sysfs: Support zapping of binary attr mmaps) +$ 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/proc.c | 5 ++ + 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 +++++++++- + 22 files changed, 275 insertions(+), 245 deletions(-) + rename {mm => drivers/media/common/videobuf2}/frame_vector.c (85%) + create mode 100644 include/media/frame_vector.h +Merging oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support) +$ git merge oprofile-removal/oprofile/removal +Auto-merging kernel/sys.c +Auto-merging init/Kconfig +Removing include/linux/oprofile.h +Removing include/linux/dcookies.h +Removing fs/dcookies.c +Auto-merging fs/Makefile +Removing drivers/oprofile/timer_int.c +Removing drivers/oprofile/oprofilefs.c +Removing drivers/oprofile/oprofile_stats.h +Removing drivers/oprofile/oprofile_stats.c +Removing drivers/oprofile/oprofile_perf.c +Removing drivers/oprofile/oprofile_files.c +Removing drivers/oprofile/oprof.h +Removing drivers/oprofile/oprof.c +Removing drivers/oprofile/nmi_timer_int.c +Removing drivers/oprofile/event_buffer.h +Removing drivers/oprofile/event_buffer.c +Removing drivers/oprofile/cpu_buffer.h +Removing drivers/oprofile/cpu_buffer.c +Removing drivers/oprofile/buffer_sync.h +Removing drivers/oprofile/buffer_sync.c +Removing arch/xtensa/oprofile/init.c +Removing arch/xtensa/oprofile/backtrace.c +Removing arch/xtensa/oprofile/Makefile +Auto-merging arch/xtensa/Kconfig +Removing arch/x86/oprofile/op_x86_model.h +Removing arch/x86/oprofile/op_model_ppro.c +Removing arch/x86/oprofile/op_model_p4.c +Removing arch/x86/oprofile/op_model_amd.c +Removing arch/x86/oprofile/op_counter.h +Removing arch/x86/oprofile/nmi_int.c +Removing arch/x86/oprofile/init.c +Removing arch/x86/oprofile/backtrace.c +Removing arch/x86/oprofile/Makefile +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Removing arch/sparc/oprofile/init.c +Removing arch/sparc/oprofile/Makefile +Auto-merging arch/sparc/Kconfig +Removing arch/sh/oprofile/common.c +Removing arch/sh/oprofile/backtrace.c +Removing arch/sh/oprofile/Makefile +Auto-merging arch/sh/configs/sh03_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/Kconfig +Removing arch/s390/oprofile/init.c +Removing arch/s390/oprofile/Makefile +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/platforms/cell/spu_notify.c +Removing arch/powerpc/oprofile/op_model_power4.c +Removing arch/powerpc/oprofile/op_model_pa6t.c +Removing arch/powerpc/oprofile/op_model_fsl_emb.c +Removing arch/powerpc/oprofile/op_model_cell.c +Removing arch/powerpc/oprofile/op_model_7450.c +Removing arch/powerpc/oprofile/common.c +Removing arch/powerpc/oprofile/cell/vma_map.c +Removing arch/powerpc/oprofile/cell/spu_task_sync.c +Removing arch/powerpc/oprofile/cell/spu_profiler.c +Removing arch/powerpc/oprofile/cell/pr_util.h +Removing arch/powerpc/oprofile/backtrace.c +Removing arch/powerpc/oprofile/Makefile +Removing arch/powerpc/include/asm/oprofile_impl.h +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/oprofile/init.c +Removing arch/parisc/oprofile/Makefile +Auto-merging arch/parisc/Kconfig +Removing arch/mips/oprofile/op_model_mipsxx.c +Removing arch/mips/oprofile/op_model_loongson3.c +Removing arch/mips/oprofile/op_model_loongson2.c +Removing arch/mips/oprofile/op_impl.h +Removing arch/mips/oprofile/common.c +Removing arch/mips/oprofile/backtrace.c +Removing arch/mips/oprofile/Makefile +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/Kconfig +Removing arch/microblaze/oprofile/microblaze_oprofile.c +Removing arch/microblaze/oprofile/Makefile +Auto-merging arch/microblaze/Kconfig +Removing arch/ia64/oprofile/init.c +Removing arch/ia64/oprofile/backtrace.c +Removing arch/ia64/oprofile/Makefile +Removing arch/ia64/kernel/perfmon_montecito.h +Removing arch/ia64/kernel/perfmon_mckinley.h +Removing arch/ia64/kernel/perfmon_generic.h +Removing arch/ia64/kernel/perfmon_default_smpl.c +Removing arch/ia64/include/uapi/asm/perfmon_default_smpl.h +Removing arch/ia64/include/uapi/asm/perfmon.h +Removing arch/ia64/include/asm/perfmon.h +Removing arch/arm/oprofile/common.c +Removing arch/arm/oprofile/Makefile +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/multi_v5_defconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Removing arch/arc/oprofile/common.c +Removing arch/arc/oprofile/Makefile +Removing arch/alpha/oprofile/op_model_ev67.c +Removing arch/alpha/oprofile/op_model_ev6.c +Removing arch/alpha/oprofile/op_model_ev5.c +Removing arch/alpha/oprofile/op_model_ev4.c +Removing arch/alpha/oprofile/op_impl.h +Removing arch/alpha/oprofile/common.c +Removing arch/alpha/oprofile/Makefile +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/process/magic-number.rst +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/NMI-RCU.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 14 - + Documentation/kbuild/makefiles.rst | 1 - + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + MAINTAINERS | 11 - + arch/Kconfig | 32 - + arch/alpha/Kconfig | 1 - + arch/alpha/Makefile | 1 - + arch/alpha/oprofile/Makefile | 20 - + arch/alpha/oprofile/common.c | 189 --- + arch/alpha/oprofile/op_impl.h | 55 - + arch/alpha/oprofile/op_model_ev4.c | 114 -- + arch/alpha/oprofile/op_model_ev5.c | 209 --- + arch/alpha/oprofile/op_model_ev6.c | 101 -- + arch/alpha/oprofile/op_model_ev67.c | 261 --- + arch/arc/Kconfig | 1 - + arch/arc/Makefile | 2 - + arch/arc/oprofile/Makefile | 10 - + arch/arc/oprofile/common.c | 23 - + arch/arm/Kconfig | 1 - + arch/arm/Makefile | 2 - + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/cns3420vb_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/oprofile/Makefile | 14 - + arch/arm/oprofile/common.c | 132 -- + arch/hexagon/Kconfig | 1 - + arch/ia64/Kconfig | 1 - + arch/ia64/Makefile | 1 - + arch/ia64/configs/bigsur_defconfig | 1 - + arch/ia64/include/asm/hw_irq.h | 1 - + arch/ia64/include/asm/perfmon.h | 111 -- + arch/ia64/include/uapi/asm/perfmon.h | 178 -- + arch/ia64/include/uapi/asm/perfmon_default_smpl.h | 84 - + arch/ia64/kernel/palinfo.c | 41 - + arch/ia64/kernel/perfmon_default_smpl.c | 297 ---- + arch/ia64/kernel/perfmon_generic.h | 46 - + arch/ia64/kernel/perfmon_itanium.h | 2 +- + arch/ia64/kernel/perfmon_mckinley.h | 188 --- + arch/ia64/kernel/perfmon_montecito.h | 270 ---- + arch/ia64/oprofile/Makefile | 10 - + arch/ia64/oprofile/backtrace.c | 131 -- + arch/ia64/oprofile/init.c | 28 - + arch/microblaze/Kconfig | 1 - + arch/microblaze/Makefile | 2 - + arch/microblaze/oprofile/Makefile | 14 - + arch/microblaze/oprofile/microblaze_oprofile.c | 22 - + arch/mips/Kconfig | 3 +- + arch/mips/Makefile | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rs90_defconfig | 1 - + arch/mips/include/asm/mach-loongson2ef/loongson.h | 9 - + arch/mips/loongson2ef/fuloong-2e/irq.c | 2 +- + arch/mips/loongson2ef/lemote-2f/irq.c | 1 - + arch/mips/oprofile/Makefile | 18 - + arch/mips/oprofile/backtrace.c | 177 -- + arch/mips/oprofile/common.c | 147 -- + arch/mips/oprofile/op_impl.h | 41 - + arch/mips/oprofile/op_model_loongson2.c | 161 -- + arch/mips/oprofile/op_model_loongson3.c | 213 --- + arch/mips/oprofile/op_model_mipsxx.c | 479 ------ + arch/parisc/Kconfig | 1 - + arch/parisc/Makefile | 2 - + arch/parisc/oprofile/Makefile | 10 - + arch/parisc/oprofile/init.c | 23 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/Makefile | 2 - + arch/powerpc/configs/44x/akebono_defconfig | 1 - + arch/powerpc/configs/44x/currituck_defconfig | 1 - + arch/powerpc/configs/44x/fsp2_defconfig | 1 - + arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/maple_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/include/asm/cputable.h | 20 - + arch/powerpc/include/asm/oprofile_impl.h | 135 -- + arch/powerpc/include/asm/spu.h | 33 - + arch/powerpc/kernel/cputable.c | 67 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 - + arch/powerpc/oprofile/Makefile | 19 - + arch/powerpc/oprofile/backtrace.c | 120 -- + arch/powerpc/oprofile/cell/pr_util.h | 110 -- + arch/powerpc/oprofile/cell/spu_profiler.c | 248 --- + arch/powerpc/oprofile/cell/spu_task_sync.c | 657 -------- + arch/powerpc/oprofile/cell/vma_map.c | 279 ---- + arch/powerpc/oprofile/common.c | 243 --- + arch/powerpc/oprofile/op_model_7450.c | 207 --- + arch/powerpc/oprofile/op_model_cell.c | 1709 -------------------- + arch/powerpc/oprofile/op_model_fsl_emb.c | 380 ----- + arch/powerpc/oprofile/op_model_pa6t.c | 227 --- + arch/powerpc/oprofile/op_model_power4.c | 438 ----- + arch/powerpc/platforms/cell/Kconfig | 5 - + arch/powerpc/platforms/cell/Makefile | 1 - + arch/powerpc/platforms/cell/spu_notify.c | 55 - + arch/powerpc/platforms/cell/spufs/run.c | 6 +- + arch/powerpc/platforms/cell/spufs/sched.c | 5 - + arch/powerpc/platforms/cell/spufs/spufs.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/Makefile | 3 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/s390/oprofile/Makefile | 10 - + arch/s390/oprofile/init.c | 37 - + arch/sh/Kconfig | 1 - + arch/sh/Makefile | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/oprofile/Makefile | 16 - + arch/sh/oprofile/backtrace.c | 80 - + arch/sh/oprofile/common.c | 64 - + arch/sparc/Kconfig | 1 - + arch/sparc/Makefile | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/oprofile/Makefile | 10 - + arch/sparc/oprofile/init.c | 87 - + arch/x86/Kconfig | 1 - + arch/x86/Makefile | 3 - + arch/x86/include/asm/nmi.h | 1 - + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/oprofile/Makefile | 12 - + arch/x86/oprofile/backtrace.c | 127 -- + arch/x86/oprofile/init.c | 38 - + arch/x86/oprofile/nmi_int.c | 780 --------- + arch/x86/oprofile/op_counter.h | 30 - + arch/x86/oprofile/op_model_amd.c | 542 ------- + arch/x86/oprofile/op_model_p4.c | 723 --------- + arch/x86/oprofile/op_model_ppro.c | 245 --- + arch/x86/oprofile/op_x86_model.h | 90 -- + arch/xtensa/Kconfig | 1 - + arch/xtensa/Makefile | 1 - + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + arch/xtensa/kernel/stacktrace.c | 2 +- + arch/xtensa/oprofile/Makefile | 10 - + arch/xtensa/oprofile/backtrace.c | 27 - + arch/xtensa/oprofile/init.c | 26 - + drivers/oprofile/buffer_sync.c | 591 ------- + drivers/oprofile/buffer_sync.h | 22 - + drivers/oprofile/cpu_buffer.c | 465 ------ + drivers/oprofile/cpu_buffer.h | 121 -- + drivers/oprofile/event_buffer.c | 209 --- + drivers/oprofile/event_buffer.h | 40 - + drivers/oprofile/nmi_timer_int.c | 157 -- + drivers/oprofile/oprof.c | 286 ---- + drivers/oprofile/oprof.h | 50 - + drivers/oprofile/oprofile_files.c | 201 --- + drivers/oprofile/oprofile_perf.c | 328 ---- + drivers/oprofile/oprofile_stats.c | 84 - + drivers/oprofile/oprofile_stats.h | 33 - + drivers/oprofile/oprofilefs.c | 300 ---- + drivers/oprofile/timer_int.c | 122 -- + fs/Makefile | 1 - + fs/dcookies.c | 356 ---- + include/linux/dcookies.h | 69 - + include/linux/oprofile.h | 209 --- + init/Kconfig | 2 +- + kernel/sys.c | 1 - + usr/include/Makefile | 2 - + 199 files changed, 8 insertions(+), 15569 deletions(-) + delete mode 100644 arch/alpha/oprofile/Makefile + delete mode 100644 arch/alpha/oprofile/common.c + delete mode 100644 arch/alpha/oprofile/op_impl.h + delete mode 100644 arch/alpha/oprofile/op_model_ev4.c + delete mode 100644 arch/alpha/oprofile/op_model_ev5.c + delete mode 100644 arch/alpha/oprofile/op_model_ev6.c + delete mode 100644 arch/alpha/oprofile/op_model_ev67.c + delete mode 100644 arch/arc/oprofile/Makefile + delete mode 100644 arch/arc/oprofile/common.c + delete mode 100644 arch/arm/oprofile/Makefile + delete mode 100644 arch/arm/oprofile/common.c + delete mode 100644 arch/ia64/include/asm/perfmon.h + delete mode 100644 arch/ia64/include/uapi/asm/perfmon.h + delete mode 100644 arch/ia64/include/uapi/asm/perfmon_default_smpl.h + delete mode 100644 arch/ia64/kernel/perfmon_default_smpl.c + delete mode 100644 arch/ia64/kernel/perfmon_generic.h + delete mode 100644 arch/ia64/kernel/perfmon_mckinley.h + delete mode 100644 arch/ia64/kernel/perfmon_montecito.h + delete mode 100644 arch/ia64/oprofile/Makefile + delete mode 100644 arch/ia64/oprofile/backtrace.c + delete mode 100644 arch/ia64/oprofile/init.c + delete mode 100644 arch/microblaze/oprofile/Makefile + delete mode 100644 arch/microblaze/oprofile/microblaze_oprofile.c + delete mode 100644 arch/mips/oprofile/Makefile + delete mode 100644 arch/mips/oprofile/backtrace.c + delete mode 100644 arch/mips/oprofile/common.c + delete mode 100644 arch/mips/oprofile/op_impl.h + delete mode 100644 arch/mips/oprofile/op_model_loongson2.c + delete mode 100644 arch/mips/oprofile/op_model_loongson3.c + delete mode 100644 arch/mips/oprofile/op_model_mipsxx.c + delete mode 100644 arch/parisc/oprofile/Makefile + delete mode 100644 arch/parisc/oprofile/init.c + delete mode 100644 arch/powerpc/include/asm/oprofile_impl.h + delete mode 100644 arch/powerpc/oprofile/Makefile + delete mode 100644 arch/powerpc/oprofile/backtrace.c + delete mode 100644 arch/powerpc/oprofile/cell/pr_util.h + delete mode 100644 arch/powerpc/oprofile/cell/spu_profiler.c + delete mode 100644 arch/powerpc/oprofile/cell/spu_task_sync.c + delete mode 100644 arch/powerpc/oprofile/cell/vma_map.c + delete mode 100644 arch/powerpc/oprofile/common.c + delete mode 100644 arch/powerpc/oprofile/op_model_7450.c + delete mode 100644 arch/powerpc/oprofile/op_model_cell.c + delete mode 100644 arch/powerpc/oprofile/op_model_fsl_emb.c + delete mode 100644 arch/powerpc/oprofile/op_model_pa6t.c + delete mode 100644 arch/powerpc/oprofile/op_model_power4.c + delete mode 100644 arch/powerpc/platforms/cell/spu_notify.c + delete mode 100644 arch/s390/oprofile/Makefile + delete mode 100644 arch/s390/oprofile/init.c + delete mode 100644 arch/sh/oprofile/Makefile + delete mode 100644 arch/sh/oprofile/backtrace.c + delete mode 100644 arch/sh/oprofile/common.c + delete mode 100644 arch/sparc/oprofile/Makefile + delete mode 100644 arch/sparc/oprofile/init.c + delete mode 100644 arch/x86/oprofile/Makefile + delete mode 100644 arch/x86/oprofile/backtrace.c + delete mode 100644 arch/x86/oprofile/init.c + delete mode 100644 arch/x86/oprofile/nmi_int.c + delete mode 100644 arch/x86/oprofile/op_counter.h + delete mode 100644 arch/x86/oprofile/op_model_amd.c + delete mode 100644 arch/x86/oprofile/op_model_p4.c + delete mode 100644 arch/x86/oprofile/op_model_ppro.c + delete mode 100644 arch/x86/oprofile/op_x86_model.h + delete mode 100644 arch/xtensa/oprofile/Makefile + delete mode 100644 arch/xtensa/oprofile/backtrace.c + delete mode 100644 arch/xtensa/oprofile/init.c + delete mode 100644 drivers/oprofile/buffer_sync.c + delete mode 100644 drivers/oprofile/buffer_sync.h + delete mode 100644 drivers/oprofile/cpu_buffer.c + delete mode 100644 drivers/oprofile/cpu_buffer.h + delete mode 100644 drivers/oprofile/event_buffer.c + delete mode 100644 drivers/oprofile/event_buffer.h + delete mode 100644 drivers/oprofile/nmi_timer_int.c + delete mode 100644 drivers/oprofile/oprof.c + delete mode 100644 drivers/oprofile/oprof.h + delete mode 100644 drivers/oprofile/oprofile_files.c + delete mode 100644 drivers/oprofile/oprofile_perf.c + delete mode 100644 drivers/oprofile/oprofile_stats.c + delete mode 100644 drivers/oprofile/oprofile_stats.h + delete mode 100644 drivers/oprofile/oprofilefs.c + delete mode 100644 drivers/oprofile/timer_int.c + delete mode 100644 fs/dcookies.c + delete mode 100644 include/linux/dcookies.h + delete mode 100644 include/linux/oprofile.h +Merging akpm-current/current (8c6158474df0 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/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memblock.c +Auto-merging mm/khugepaged.c +Auto-merging mm/filemap.c +Auto-merging mm/Makefile +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/initramfs.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +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 +Removing include/linux/mm-arch-hooks.h +Auto-merging include/linux/fs.h +Removing include/asm-generic/mm-arch-hooks.h +Auto-merging fs/seq_file.c +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/base.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/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 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/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 .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 3758459e32f3] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 14 +- + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 24 +- + Documentation/dev-tools/kfence.rst | 298 ++++++++ + Documentation/vm/arch_pgtable_helpers.rst | 8 +- + MAINTAINERS | 14 +- + arch/alpha/configs/defconfig | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kfence.h | 22 + + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mte-kasan.h | 12 + + arch/arm64/kernel/mte.c | 12 + + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 7 +- + 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/um/include/asm/Kbuild | 1 - + 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 + + drivers/base/memory.c | 10 +- + drivers/base/node.c | 33 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/video/fbdev/acornfb.c | 34 - + drivers/virtio/virtio_mem.c | 2 +- + drivers/xen/balloon.c | 2 +- + fs/aio.c | 9 +- + fs/block_dev.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/buffer.c | 56 +- + 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 | 58 +- + fs/iomap/seek.c | 125 +--- + fs/ntfs/layout.h | 4 +- + fs/ocfs2/dlm/dlmast.c | 10 - + fs/ocfs2/dlm/dlmcommon.h | 4 - + fs/ocfs2/namei.c | 17 +- + 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/vmcore.c | 7 +- + fs/ramfs/inode.c | 12 + + fs/seq_file.c | 3 + + include/asm-generic/Kbuild | 1 - + include/asm-generic/mm-arch-hooks.h | 16 - + include/linux/bitops.h | 2 +- + include/linux/cpumask.h | 2 +- + include/linux/cred.h | 2 +- + include/linux/fortify-string.h | 302 ++++++++ + include/linux/fs.h | 4 +- + include/linux/gfp.h | 2 + + include/linux/highmem-internal.h | 5 - + include/linux/hugetlb.h | 95 ++- + include/linux/kasan-checks.h | 6 + + include/linux/kasan.h | 46 +- + include/linux/kfence.h | 222 ++++++ + include/linux/khugepaged.h | 2 + + include/linux/mdev.h | 2 +- + include/linux/memcontrol.h | 36 +- + include/linux/memory_hotplug.h | 23 +- + include/linux/memremap.h | 12 + + include/linux/migrate.h | 2 +- + include/linux/mm-arch-hooks.h | 22 - + include/linux/mm.h | 19 +- + include/linux/mm_inline.h | 113 ++- + include/linux/mmzone.h | 60 +- + 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/vmalloc.h | 9 +- + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + 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 | 15 - + init/initramfs.c | 19 +- + init/main.c | 13 +- + init/version.c | 8 - + kernel/events/core.c | 8 +- + kernel/events/uprobes.c | 2 +- + kernel/gcov/Kconfig | 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/Makefile | 2 +- + lib/cpumask.c | 73 +- + lib/genalloc.c | 3 +- + lib/hexdump.c | 9 +- + lib/seq_buf.c | 9 +- + lib/stackdepot.c | 35 +- + lib/test_kasan.c | 424 ++++++++--- + lib/test_kasan_module.c | 5 +- + lib/ubsan.c | 31 + + lib/ubsan.h | 6 + + mm/Makefile | 1 + + mm/backing-dev.c | 3 +- + mm/cma.c | 60 +- + mm/compaction.c | 33 +- + mm/debug.c | 10 +- + mm/debug_vm_pgtable.c | 86 ++- + mm/dmapool.c | 3 +- + mm/early_ioremap.c | 12 +- + mm/filemap.c | 929 +++++++++++++----------- + mm/huge_memory.c | 60 +- + mm/hugetlb.c | 250 +++---- + mm/internal.h | 4 +- + mm/kasan/common.c | 64 +- + mm/kasan/generic.c | 41 +- + mm/kasan/kasan.h | 82 ++- + 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 | 40 +- + 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/memblock.c | 49 +- + mm/memcontrol.c | 202 +++--- + mm/memory-failure.c | 6 + + mm/memory.c | 6 +- + mm/memory_hotplug.c | 103 ++- + mm/mempolicy.c | 16 + + mm/mempool.c | 2 +- + mm/memremap.c | 35 + + mm/migrate.c | 25 +- + mm/mlock.c | 3 +- + mm/mmap.c | 47 +- + mm/mprotect.c | 7 +- + mm/mremap.c | 11 +- + mm/msync.c | 6 +- + mm/oom_kill.c | 5 +- + mm/page_alloc.c | 65 +- + mm/page_owner.c | 4 +- + mm/page_poison.c | 2 +- + mm/page_reporting.c | 2 +- + mm/rmap.c | 41 +- + mm/shmem.c | 152 ++-- + mm/slab.c | 47 +- + mm/slab.h | 20 +- + mm/slab_common.c | 41 +- + mm/slob.c | 2 +- + mm/slub.c | 219 +++--- + mm/swap.c | 88 +-- + mm/swap_slots.c | 3 +- + mm/swap_state.c | 36 +- + mm/swapfile.c | 8 +- + mm/truncate.c | 131 +--- + mm/vmscan.c | 89 +-- + mm/vmstat.c | 54 +- + mm/workingset.c | 5 +- + mm/z3fold.c | 12 +- + mm/zbud.c | 1 + + mm/zpool.c | 13 + + mm/zsmalloc.c | 3 +- + mm/zswap.c | 57 +- + scripts/Makefile.kasan | 10 +- + scripts/checkpatch.pl | 138 ++-- + scripts/gdb/linux/lists.py | 5 + + scripts/spelling.txt | 4 + + tools/objtool/check.c | 2 +- + 208 files changed, 6353 insertions(+), 2715 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 + delete mode 100644 include/asm-generic/mm-arch-hooks.h + create mode 100644 include/linux/fortify-string.h + create mode 100644 include/linux/kfence.h + delete mode 100644 include/linux/mm-arch-hooks.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 005006e69483] Merge branch 'akpm-current/current' + Date: Mon Feb 1 18:14:54 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/12)
Rebasing (2/12)
Rebasing (3/12)
Rebasing (4/12)
Rebasing (5/12)
Rebasing (6/12)
Rebasing (7/12)
Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c73144a81ef1...2a2de8cce512 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (2a2de8cce512 secretmem: test: add basic selftest for memfd_secret(2)) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/kfence.h | 2 +- + arch/arm64/include/asm/set_memory.h | 17 ++ + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/machine_kexec.c | 1 + + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/mm/pageattr.c | 23 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/mm/pageattr.c | 8 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/mm/pat/set_memory.c | 8 +- + fs/dax.c | 11 +- + include/linux/pgtable.h | 3 + + include/linux/secretmem.h | 30 ++ + include/linux/set_memory.h | 16 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/magic.h | 1 + + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys_ni.c | 2 + + mm/Kconfig | 5 + + mm/Makefile | 1 + + mm/filemap.c | 3 +- + mm/gup.c | 10 + + mm/internal.h | 3 + + mm/mmap.c | 5 +- + mm/secretmem.c | 451 ++++++++++++++++++++++++++++++ + mm/vmalloc.c | 5 +- + scripts/checksyscalls.sh | 4 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests | 17 ++ + 39 files changed, 918 insertions(+), 53 deletions(-) + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/linux/secretmem.h + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c +$ git am -3 ../patches/0001-Revert-sched-topology-Make-sched_init_numa-use-a-set.patch +Applying: Revert "sched/topology: Make sched_init_numa() use a set for the deduplicating sort" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..7ad845e5a245 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210201 |