diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-01-11 15:44:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-01-11 15:44:33 +1100 |
| commit | ef8b014ee4a1ccd9e751732690a8c7cdeed945e7 (patch) | |
| tree | d6ca6bc4596c0faddd828dc87e152a6178256f59 | |
| parent | bc6abfdae79e63b71b894f78e9573826b0b7746d (diff) | |
| download | linux-next-next-20210111.tar.gz | |
Add linux-next specific files for 20210111next-20210111
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 331 | ||||
| -rw-r--r-- | Next/Trees | 333 | ||||
| -rw-r--r-- | Next/merge.log | 5345 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6010 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..186452c00a23 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,331 @@ +Name SHA1 +---- ---- +origin 0653161f0faca68b77b3f36fb4b4b9b8b07050e5 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current 5625dcfbbcf892e40e8d60abbb5f56701a1d031c +arc-current e8deee4f1543eda9b75278f63322f412cad52f6a +arm-current e64ab473dddaffdfc4bd0b385204f472f2cb00d6 +arm64-fixes 83b5bd628f65e6b4d1924b307d6a88a57827bdb0 +arm-soc-fixes bac717171971176b78c72d15a8b6961764ab197f +drivers-memory-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +m68k-current 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 +powerpc-fixes 3ce47d95b7346dcafd9bed3556a8d072cb2b8571 +s390-fixes 129975e75b9a2ba528d7f58be2e338cd644f6ed8 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net f97844f9c518172f813b7ece18a9956b1f70c1bb +bpf 286e95eed12e218c0b73f95e3ff805db4b1cd9b5 +ipsec da64ae2d35d3673233f0403b035d4c6acbf71965 +netfilter c49243e8898233de18edfaaa5b7b261ea457f221 +ipvs a8f33c038f4e50b0f47448cb6c6ca184c4f717ef +wireless-drivers bfe55584713b4d4d518ffe9cf2dab1129eba6321 +mac80211 51d62f2f2c501a93d9a6a46f43731f984e227764 +rdma-fixes f2bc3af6353cb2a33dfa9d270d999d839eef54cb +sound-current 167c9dc84ec384c0940359e067301883ad2b42a8 +sound-asoc-fixes ed37719f60ffb4682a29757942de3834ff8c84b8 +regmap-fixes 72962ebcdd458fe51788fa220ba09a546b6dec8a +regulator-fixes cd66a1589b7cef06ba5d272da342e11d60357d2d +spi-fixes d7d09a547aac1436637958b7f9dfe0709797d8dd +pci-current e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +driver-core.current 29f7c54b253fc18bff9bf7e9f303b75deb285c7a +tty.current 54ca955b5a4024e2ce0f206b03adb7109bc4da26 +usb.current a5c7682aaaa10e42928d73de1c9e1e02d2b14c2e +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes 54d0a3ab80f49f19ee916def62fe067596833403 +usb-chipidea-fixes 491b1bea00040233b791dc8fea1608ac6a7003bc +phy d092bd9110494de3372722b317510b3692f1b2fe +staging.current 00b8c557d096f0930d5c07df618223d3d06902d6 +char-misc.current 384b77fd48fd683a82760bc88bef8611cba997fc +soundwire-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +thunderbolt-fixes c14556fc0c7c115ffb4a287560e1ec9f7869aac3 +input-current 2dce6db70c77bbe639f5cd9cc796fb8f2694a7d0 +crypto-current 382811940303f7cd01d0f3dcdf432dfd89c5a98e +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 7a6eb7c34a78498742b5f82543b7a68c1c443329 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes e1263f9277bad198c2acc8092a41aea1edbea0e4 +backlight-fixes bbf5c979011a099af5dc76498918ed7df445635b +mtd-fixes 4883a60c17eda6bf52d1c817ee7ead65b4a02da2 +mfd-fixes bbf5c979011a099af5dc76498918ed7df445635b +v4l-dvb-fixes 2984a99ff1c071c85dc09451c8adc859c22fbb96 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 698222457465ce343443be81c5512edda86e5914 +at91-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +omap-fixes 181739822cf6f8f4e12b173913af2967a28906c0 +kvm-fixes 872f36eb0b0f4f0e3a81ea1e51a6bdf58ccfdc6e +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 84e261553e6f919bf0b4d65244599ab2b41f1da5 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes aabcb20039287c3afda5015587168490fae41d05 +vfs-fixes a0a6df9afcaf439a6b4c88a3b522e3d05fdef46f +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 291b5c9870fc546376d69cf792b7885cd0c9c1b3 +drivers-x86-fixes 5b569302520ac8cef03e7a841e45cb37234f8b5f +samsung-krzk-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-samsung-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +devicetree-fixes 2b8f061a4f505aad11fd36adb24c3138ad09b96b +scsi-fixes eeb1b55b6e25c5f7265ff45cd050f3bc2cc423a4 +drm-fixes 29f95f20581c4bb4e58c1cc1cb15bff9b931cad9 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 9397d66212cdf7a21c66523f1583e5d63a609e84 +mmc-fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rtc-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +gnss-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +hyperv-fixes ad0a6bad44758afa3b440c254a24999a0c7e35d5 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 0ea02c73775277001c651ad4a0e83781a9acf406 +pidfd-fixes a409ed156a90093a03fe6a93721ddf4c591eac87 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 5c8fe583cce542aa0b84adc939ce85293de36e5e +gpio-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-intel-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 65a4e5299739abe0888cda0938d21f8ea3b5c606 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b9bc36704cca500e2b41be4c5bf615c1d7ddc3ce +drm-misc-fixes a0adc8eabb402cfb9f32d15edd9f65f65e35cdce +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild a76082b037f5e05347dd6c03809efb3098b76db4 +compiler-attributes 1967939462641d8b36bcb3fcf06d48e66cd67a4f +dma-mapping f726c72d6c059c1a6db425108cd6c220fb95cbf4 +asm-generic 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +arc def9d2780727cec3313ed3522d0123158d87224d +arm ecbbb88727aee7880527d4b320b4d06dde75d46d +arm64 7c29ada5e70083805bc3a68daa23441df421fbee +arm-perf 881b0520504a2e028a28ddacc05c26e46f21d483 +arm-soc 9b28a2eacfe4fc0ca91c3cebaff7496e47bc1f68 +actions a501abf8d8cbf40c58586257d288b39d0b0ec628 +amlogic 60f232d3c04a346ff94602f6edbe8e95ed281239 +aspeed 41707a524026f9575d6f3a1162cc138f26fa5ca6 +at91 3e3d5e8a7d731251c1192e1743df9dccc2a7daae +drivers-memory 81053f0e95da40ec4f53eb0b2211f4bbbac612df +imx-mxs 90330a6dbd8cf1938543227d16159f9636094c83 +keystone b2a8f6ce4bdcc33b8286a2a85b07edbdc778393b +mediatek 727bfb2c55b0838d09e9578abd9feca1d31438b4 +mvebu dc14300bb67b23d4debe159db0df637993f195e0 +omap 792952314166a6b030c360250337f793e50e7b37 +qcom b69b63bfed8293a6e447c1cbeae35d8f0e8cf80c +raspberrypi e10bb7f95cba97bd7aed4d16b518bc0f9a1a430b +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas b8e76cdb157494770d8feee237222a511468c788 +reset f2ad9bfd4dda69175b8ed2c38f115c8138239780 +rockchip 06f4ae17843720a20fcdac3a07707b165954a240 +samsung-krzk a867287e90665dd3fdb7fb86c47e6cd2f4fe13d2 +scmi dd63baa9d43fe3679529150471b1223c31a6660d +stm32 814fddb955f8b655057ba70cf676b1db66281c76 +sunxi 2e76c5b3726d4ffa37f27b7bac50477011929dcd +tegra b11a0dfbd31639724176a1820e34bd6d8c168022 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 5c8fe583cce542aa0b84adc939ce85293de36e5e +clk abe7e32f1d50392fbfb6391f4fe1a9f1348b24f3 +clk-renesas 193fd4c76240952c702846d6225c1c60d80537e8 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky f0bbf052ae463b3802f1c7ba36b36da2f54945f2 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 +m68knommu e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +microblaze 57ddf08642f0b1912c97791413d8c1fe31b6a339 +mips 99b40ced9ef63cef784905248735bd209ed6fe53 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc d8398bf840f8964220508aff7901c924e322f5e8 +parisc-hd 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +powerpc e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v 962cfa82d2600dda20da0503b6a9059fb9021336 +s390 5e935f340864824f949cbe17ce51330464807aa0 +sh b89bc060b53e7054e5c8ca11feea4bc884d83611 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 +xtensa 7b79eba1d0d186de94ba661c499326e1b6071be5 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 97847e06525b51ea44ddfc850f9aec422bfcc845 +ceph 4972cf605f8a10784bb9ec9bdf3465892fb547c8 +cifs 3ba507dc5ef7a74daab788fc2f0a7d2247f2ac05 +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs d8b3df8b1048405e73558b88cba2adf29490d468 +exfat 4b7bc2c32cba4e0c9a5b23ada5342a13e7d38f84 +ext3 d15cd626d7a4ea3f968ff213cf36b7f3a5737727 +ext4 5a3b590d4b2db187faa6f06adc9a53d6199fb1f9 +f2fs b21c46be11a056aa36fee5dc91ea43b92c984ff4 +fsverity bde493349025ca0559e2fff88592935af3b8df19 +fuse 5d069dbe8aaf2a197142558b6fb2978189ba3454 +jfs 3bef198f1b17d1bb89260bad947ef084c0a2d1a6 +nfs cb2856c5971723910a86b7d1d0cf623d6919cbc4 +nfs-anna 11392155f2bd3d54a8ed5a4fcf8b81ee21435f7f +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel 7b723008f9c95624c848fad661c01b06e47b20da +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs 459c7c565ac36ba09ffbf24231147f408fde4203 +ubifs b80a974b8c58164ed57b0f025a47b8f003198d9e +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs e82226138b20d4f638426413e83c6b5db532c6a2 +zonefs 4f8b848788f77c7f5c3bd98febce66b7aa14785f +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks 8d1ddb5e79374fb277985a6b3faa2ed8631c5b4c +vfs 5cc02325880f6b044f5f22218ab13dd25d7a346c +printk 0459d46d8a4461014376ea30dd58b2df02de1837 +pci e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +pstore 26fecbf7602dd69b649914e61526bd67c557fece +hid 8cd7ce929f882f27634571ae937c145f3a7bc80e +i2c e7ccf47c442b265f8787c22065d83e3fbc3c99ae +i3c 5c8fe583cce542aa0b84adc939ce85293de36e5e +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging d1f7b079ce5b69c88c813439eea6a9c133f0846b +jc_docs 9d54ee78aef62c29b15ae2f58a70b1d1cd63a8f0 +v4l-dvb ecd07f4b9d2173694be9214a3ab07f9efb5ba206 +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 75a052c6b1ba2bb2cb1a09af90576af93d4f95a7 +cpufreq-arm c8bb4520543823a9b3da3861304273dc7232e2c7 +cpupower fb7791e213a64495ec2336869b868fcd8af14346 +devfreq ec894883de5336e28313e531e2f3a8b86f1a8a1a +opp 0e1d9ca1766f5d95fb881f57b6c4a1ffa63d4648 +thermal 6250d904ae1dd4d0c1679de91220cfb0632566db +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb e998879d4fb7991856916972168cf27c0d86ed12 +rdma aaf1226bd95b25b910617019a71d0de13f221c9d +net-next 73b7a6047971aa6ce4a70fc4901964d14f077171 +bpf-next e22d7f05e445165e58feddb4e40cc9c0f94453bc +ipsec-next ede71cae72855f8d6f6268510895210adc317666 +mlx5-next 5c8fe583cce542aa0b84adc939ce85293de36e5e +netfilter-next 09b5b5fb3902bb206c61daad26d30b803bcadaf5 +ipvs-next 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +wireless-drivers-next 13458ffe0a953e17587f172a8e5059c243e6850a +bluetooth ad3a9c0ec2d2baed936cfdd05870f9d1e1f40e0e +mac80211-next 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +gfs2 2f31d01b4fe209b88ca71a1dc746adc6a6bf237e +mtd 341e4faf9cad1a3299cf06417fd4ed6b31ba35ec +nand 3d557b24bc824ae833d92cec1acd67e36039404f +spi-nor 31ad3eff093cf21872f385021242c00c7a2abf6b +crypto 622aae879c1d9449562e0cae353691a2a1f9eec0 +drm 5b2fc08c455bbf749489254a81baeffdf4c0a693 +amdgpu 7b2992e67b23eb718026f81f419d4178feccf112 +drm-intel 6fdb335f1c9c0845b50625de1624d8445c4c4a07 +drm-tegra bf3a3cdcad40e5928a22ea0fd200d17fd6d6308d +drm-misc be3e477effba636ad25dcd244db264c6cd5c1f36 +drm-msm 00fd44a1a4700718d5d962432b55c09820f7e709 +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 4612bad5701e158f3c40951f2c7aa8e64b3445eb +regmap 72962ebcdd458fe51788fa220ba09a546b6dec8a +sound 75b1a8f9d62e50f05d0e4e9f3c8bcde32527ffc1 +sound-asoc c11a66e4a9a181c0d6d55ad883c51e84cb128ab5 +modules 38dc717e97153e46375ee21797aa54777e5498f3 +input f5cace4b93d736cef348211ae0814cabdd26d86a +block a9f7c7a1f4085668af1e2c2cf5dd492d5d100b29 +device-mapper 9b5948267adc9e689da609eb61cf7ed49cae5fa8 +pcmcia 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 +mmc e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +mfd 2fc3f48ad7111be5a663004bca1fd8c929f317af +backlight 789eb04b6c569e3e5007afd040bef5d7216d2f3a +battery 32e4978bb920d047fe5de3ea42d176f267c01f63 +regulator d2725f3a363fb30244e081148f573d8e2a5fd2ec +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 207cdd565dfc95a0a5185263a567817b7ebf5467 +keys 6b8945603d05364bca1c8fa6ab86fe105e5c46f4 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux a9ffe682c58aaff643764547f5420e978b6e0830 +smack 9b0072e2b2b588ad75c94f2c6e6c52c8f4bd2657 +tomoyo dea8dcf2a9fa8cc540136a6cd885c3beece16ec3 +tpmdd 2a6f7a28785ce69d370db1b3200b2a110ec64cbf +watchdog 5c8fe583cce542aa0b84adc939ce85293de36e5e +iommu 4dd6ce478003525df8618750d30f0b90380047a7 +audit a1b861faa6844e323951c7a0609e6f310008eedd +devicetree e33dc2f3636749c2f949a59c2ff8acd4a69c9c78 +mailbox 5a6338cce9f4133c478d3b10b300f96dd644379a +spi 2ed03653da040196c9cfea1133acc22fb16a6cf9 +tip 1173fb292bae23f5e1a2bb6a95f4eca9b6725b30 +clockevents 8ae954caf49ac403c177d117fb8e05cbc866aa3c +edac f2a34093730f7f7808edbe304095912ca74d3e6c +irqchip 599b3063adf4bf041a87a69244ee36aded0d878f +ftrace f6a694665f132cbf6e2222dd2f173dc35330a8aa +rcu cffdc9c7c24c0bcdd0c9735a8eaca2a39d5c1291 +kvm 872f36eb0b0f4f0e3a81ea1e51a6bdf58ccfdc6e +kvm-arm 45ba7b195a369f35cb39094fdb32efe5908b34ad +kvm-ppc dc924b062488a0376aae41d3e0a27dc99f852a5e +kvms390 50a05be484cb70d9dfb55fa5a6ed57eab193901f +xen-tip 6190c0ccaf5dfee845df9c9cd8ad9fdc5856bb41 +percpu 7dd3050a0194f5dc25b2679971a758339288d6e2 +workqueues ac87f8ff6cf1bd974de00a27699791bbc2a4a925 +drivers-x86 fc00bc8ac1dada4085f9308f85f2d6359da0faa8 +chrome-platform 6ae9b5ffcaeba64c290dfb8bd7b0194b1fdf0c92 +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds 9a5ad5c5b2d25508996f10ee6b428d5df91d9160 +ipmi dea8dcf2a9fa8cc540136a6cd885c3beece16ec3 +driver-core 0fab972eef49ef8d30eb91d6bd98861122d083d1 +usb 841081d89d5adf96759f2df50185de950f5d8694 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 5c8fe583cce542aa0b84adc939ce85293de36e5e +usb-chipidea-next fc71a6268982ef71d08a0e2285594ae38672e9ab +phy-next 5c8fe583cce542aa0b84adc939ce85293de36e5e +tty c9cd57bf57fd450972a7802b9f09a680dbb4634e +char-misc 59b26d2e96c473b7b65cfe19381444d034e91715 +extcon 226d336c1c75b7003ab70693cb332a1be19f1802 +soundwire 235ae89b66767652f9e9e10946b8a38caf6a26f6 +thunderbolt 82096ecf589d8224447213c4592e54598fea0b9d +vfio bdfae1c9a913930eae5ea506733aa7c285e12a06 +staging d61adf609c48b9e91a84e9a943f0b3bcd84c3cad +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 4b1a60a1bb8f03d82c3f6da424adc96667b59f2a +dmaengine e2fcd6e427c2fae92b366b24759f95d77b6f7bc7 +cgroup 2d18e54dd8662442ef5898c6bdadeaf90b3cebbc +scsi eeb1b55b6e25c5f7265ff45cd050f3bc2cc423a4 +scsi-mkp 91b1b640b834b2d6f330baf04c0cc049eca9d689 +vhost e13a6915a03ffc3ce332d28c141a335e25187fa3 +rpmsg 7cb4f293777e5245ab49ddb2566b4d0c766c2bd1 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl efcdca286eefb248d15a49a32a802ed11146e65e +gpio-intel 2a8a3f09d9b1ce3ca851f64c8dace310578036ec +pinctrl 6d92949813bb3fb4eff9ba09746daef029e4682f +pinctrl-intel 5c8fe583cce542aa0b84adc939ce85293de36e5e +pinctrl-renesas 7ba4a9591a8ac058bf976485975f78128c273800 +pinctrl-samsung 5c8fe583cce542aa0b84adc939ce85293de36e5e +pwm 6eefb79d6f5bc4086bd02c76f1072dd4a8d9d9f6 +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest df00d02989024d193a6efd1a85513a5658c6a10f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 5c8fe583cce542aa0b84adc939ce85293de36e5e +nvdimm 127c3d2e7e8a79628160e56e54d2be099bdd47c6 +at24 5c8fe583cce542aa0b84adc939ce85293de36e5e +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp 2c07343abd8932200a45ff7b10950e71081e9e77 +kspp 09162bc32c880a791c6c0668ce0745cf7958f576 +gnss 5c8fe583cce542aa0b84adc939ce85293de36e5e +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 5c8fe583cce542aa0b84adc939ce85293de36e5e +nvmem 40f592233f78776f41137de5f105672edb1d3e36 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv d03419fe2048487a04b0740854582a909a0e9db0 +auxdisplay 351dcacc6d774258be9fec6f51c14f8ff38243f6 +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd 7abe0224623f35529f8017da896e8234650b29ca +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga e41d4c011706c97f2faea6ef2e46e51f52d8f715 +kunit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi e6ca384d3b09258395b46b1c4d37a977937a67ca +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 5bdba520c1b318578caffd325515b35d187f8a0e +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +akpm-current 790907e4ba85d8c69bd72016f74be1bd1894bbff +akpm 4bc5a2fb735e92fc4afe299657332764d61f30c4 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e2e90695c88a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,333 @@ +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-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 +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#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 +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +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.linux-nfs.org/projects/cel/cel-2.6.git#cel-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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#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 +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +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 +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..67426f1ee4eb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5345 @@ +$ date -R +Mon, 11 Jan 2021 08:08:45 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f5e6c330254a Merge tag 'spi-fix-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi +Merging origin/master (0653161f0fac Merge tag 'arc-5.11-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge origin/master +Updating f5e6c330254a..0653161f0fac +Fast-forward + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 8 +- + .../RCU/Design/Requirements/Requirements.rst | 20 +- + Documentation/admin-guide/binfmt-misc.rst | 4 +- + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/mm/concepts.rst | 2 +- + Documentation/core-api/index.rst | 1 - + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 4 +- + .../devicetree/bindings/dma/ti/k3-pktdma.yaml | 4 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 4 +- + Documentation/doc-guide/sphinx.rst | 32 ++-- + Documentation/hwmon/sbtsi_temp.rst | 2 +- + Documentation/kernel-hacking/locking.rst | 8 +- + .../device_drivers/ethernet/marvell/octeontx2.rst | 62 ++++--- + Documentation/networking/netdevices.rst | 4 +- + Documentation/process/4.Coding.rst | 6 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 16 +- + Documentation/virt/kvm/api.rst | 9 +- + MAINTAINERS | 22 ++- + arch/Kconfig | 6 + + arch/arc/include/asm/page.h | 1 + + arch/arc/kernel/entry.S | 2 +- + arch/arc/plat-hsdk/Kconfig | 1 + + arch/arm/boot/dts/omap3-n950-n9.dtsi | 8 + + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 4 + + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 1 + + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/crypto/chacha-glue.c | 1 + + arch/arm/mach-omap2/omap_device.c | 8 +- + arch/arm/mach-omap2/pmic-cpcap.c | 2 +- + arch/arm64/Makefile | 10 +- + arch/arm64/boot/dts/bitmain/bm1880.dtsi | 6 +- + arch/arm64/include/asm/kvm_host.h | 23 +++ + arch/arm64/include/asm/processor.h | 3 +- + arch/arm64/include/asm/uaccess.h | 16 +- + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/smp.c | 3 +- + arch/arm64/kernel/traps.c | 1 - + arch/arm64/kernel/vdso/Makefile | 3 +- + arch/arm64/kernel/vdso/vdso.lds.S | 5 +- + arch/arm64/kvm/Kconfig | 8 - + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arch_timer.c | 7 +- + arch/arm64/kvm/arm.c | 32 ++-- + arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 9 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 12 +- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 59 +++--- + arch/arm64/kvm/pmu-emul.c | 2 - + arch/arm64/kvm/sys_regs.c | 6 +- + arch/arm64/kvm/va_layout.c | 7 +- + arch/arm64/kvm/vgic/vgic-init.c | 11 +- + arch/arm64/kvm/vgic/vgic-v2.c | 20 +- + arch/arm64/kvm/vgic/vgic-v3.c | 21 +-- + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/proc.S | 2 +- + arch/powerpc/kernel/head_book3s_32.S | 9 + + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kvm_host.h | 19 +- + arch/x86/kernel/cpu/mtrr/generic.c | 6 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 117 +++++------- + arch/x86/kernel/sev-es-shared.c | 4 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 53 +++--- + arch/x86/kvm/mmu/tdp_mmu.c | 113 ++++++----- + arch/x86/kvm/mmu/tdp_mmu.h | 4 +- + arch/x86/kvm/svm/nested.c | 8 + + arch/x86/kvm/svm/sev.c | 24 ++- + arch/x86/kvm/svm/svm.c | 12 +- + arch/x86/kvm/svm/svm.h | 2 + + arch/x86/kvm/vmx/nested.c | 2 + + arch/x86/kvm/vmx/vmx.c | 2 + + arch/x86/kvm/x86.c | 30 ++- + arch/x86/mm/pgtable.c | 2 + + crypto/ecdh.c | 3 +- + drivers/acpi/Kconfig | 6 - + drivers/acpi/x86/s2idle.c | 14 +- + drivers/base/core.c | 9 +- + drivers/cpufreq/intel_pstate.c | 15 +- + drivers/cpufreq/powernow-k8.c | 9 +- + drivers/dma-buf/dma-buf.c | 21 ++- + drivers/dma/dw-edma/dw-edma-core.c | 4 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/dma/mediatek/mtk-hsdma.c | 1 + + drivers/dma/milbeaut-xdmac.c | 4 +- + drivers/dma/qcom/bam_dma.c | 6 +- + drivers/dma/qcom/gpi.c | 10 +- + drivers/dma/stm32-mdma.c | 2 +- + drivers/dma/ti/k3-udma.c | 6 +- + drivers/dma/xilinx/xilinx_dma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 21 --- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 5 - + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 4 - + drivers/gpu/drm/amd/display/dc/os_types.h | 4 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 166 +++++++++++++++-- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.h | 3 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 3 + + drivers/gpu/drm/i915/display/intel_dp.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 27 +-- + drivers/gpu/drm/i915/i915_drv.c | 5 - + drivers/gpu/drm/i915/i915_drv.h | 3 - + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 4 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 21 ++- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + + drivers/gpu/drm/msm/dp/dp_display.c | 7 + + drivers/gpu/drm/msm/dp/dp_panel.c | 12 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_gem.c | 13 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 3 - + drivers/gpu/drm/ttm/ttm_pool.c | 2 - + drivers/hwmon/amd_energy.c | 3 +- + drivers/hwmon/pwm-fan.c | 12 +- + drivers/i2c/busses/i2c-i801.c | 2 +- + drivers/i2c/busses/i2c-mt65xx.c | 27 ++- + drivers/i2c/busses/i2c-sprd.c | 8 +- + drivers/iommu/amd/init.c | 3 +- + drivers/iommu/amd/iommu.c | 3 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + drivers/iommu/dma-iommu.c | 27 --- + drivers/iommu/intel/dmar.c | 4 +- + drivers/iommu/intel/iommu.c | 148 +++++++++++---- + drivers/iommu/intel/irq_remapping.c | 2 + + drivers/iommu/intel/svm.c | 23 ++- + drivers/iommu/iova.c | 8 +- + drivers/isdn/mISDN/Kconfig | 1 + + drivers/net/bareudp.c | 22 ++- + drivers/net/can/Kconfig | 1 + + drivers/net/can/m_can/m_can.c | 2 - + drivers/net/can/m_can/tcan4x5x.c | 26 --- + drivers/net/can/rcar/Kconfig | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 17 +- + drivers/net/dsa/hirschmann/Kconfig | 1 + + drivers/net/dsa/lantiq_gswip.c | 7 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 71 +++---- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 1 + + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 9 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 9 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 + + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 77 +++++--- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 9 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 24 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- + .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 27 ++- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 2 +- + drivers/net/ethernet/natsemi/macsonic.c | 12 +- + drivers/net/ethernet/natsemi/xtsonic.c | 7 +- + drivers/net/ethernet/qlogic/Kconfig | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 129 ++++++++----- + drivers/net/usb/cdc_ncm.c | 8 +- + drivers/net/wan/Kconfig | 1 + + drivers/net/wireless/ath/wil6210/Kconfig | 1 + + drivers/ptp/Kconfig | 2 + + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 38 ++-- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 4 +- + drivers/tty/Kconfig | 14 ++ + drivers/tty/Makefile | 3 +- + drivers/tty/ttynull.c | 18 -- + fs/notify/fanotify/fanotify_user.c | 17 +- + fs/select.c | 14 +- + fs/zonefs/Kconfig | 1 + + include/kvm/arm_pmu.h | 2 +- + include/linux/acpi.h | 7 + + include/linux/console.h | 3 - + include/linux/intel-iommu.h | 18 +- + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/syscalls.h | 24 +++ + include/soc/nps/common.h | 172 ----------------- + include/soc/nps/mtm.h | 59 ------ + include/uapi/linux/if_link.h | 5 +- + include/uapi/linux/kvm.h | 2 + + init/main.c | 10 +- + kernel/bpf/task_iter.c | 1 + + net/8021q/vlan.c | 3 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ip_tunnel.c | 11 +- + net/ipv4/nexthop.c | 6 +- + net/ipv6/ip6_fib.c | 5 +- + net/qrtr/ns.c | 7 +- + net/qrtr/qrtr.c | 16 +- + net/qrtr/qrtr.h | 2 +- + net/wireless/Kconfig | 1 + + scripts/gcc-plugins/Makefile | 4 +- + tools/bpf/bpftool/net.c | 1 - + tools/bpf/resolve_btfids/main.c | 17 +- + tools/testing/kunit/kunit_kernel.py | 2 +- + tools/testing/selftests/bpf/progs/bprm_opts.c | 2 +- + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/kvm/demand_paging_test.c | 118 ++++-------- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 145 +++++---------- + tools/testing/selftests/kvm/dirty_log_test.c | 125 ++++--------- + tools/testing/selftests/kvm/include/guest_modes.h | 21 +++ + tools/testing/selftests/kvm/include/kvm_util.h | 9 + + .../testing/selftests/kvm/include/perf_test_util.h | 167 ++--------------- + tools/testing/selftests/kvm/lib/guest_modes.c | 70 +++++++ + tools/testing/selftests/kvm/lib/kvm_util.c | 9 +- + tools/testing/selftests/kvm/lib/perf_test_util.c | 134 ++++++++++++++ + tools/testing/selftests/net/fib_nexthops.sh | 2 +- + tools/testing/selftests/net/pmtu.sh | 71 ++++++- + tools/testing/selftests/net/udpgro.sh | 34 ++++ + tools/testing/selftests/netfilter/Makefile | 3 +- + .../selftests/netfilter/ipip-conntrack-mtu.sh | 206 +++++++++++++++++++++ + tools/testing/selftests/vDSO/.gitignore | 3 + + .../testing/selftests/vDSO/vdso_test_correctness.c | 2 +- + virt/kvm/kvm_main.c | 3 +- + 247 files changed, 2231 insertions(+), 1747 deletions(-) + delete mode 100644 include/soc/nps/common.h + delete mode 100644 include/soc/nps/mtm.h + create mode 100644 tools/testing/selftests/kvm/include/guest_modes.h + create mode 100644 tools/testing/selftests/kvm/lib/guest_modes.c + create mode 100644 tools/testing/selftests/kvm/lib/perf_test_util.c + create mode 100755 tools/testing/selftests/netfilter/ipip-conntrack-mtu.sh +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (5625dcfbbcf8 Documentation: kbuild: Fix section reference) +$ git merge kbuild-current/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 2 +- + MAINTAINERS | 1 - + lib/raid6/Makefile | 2 +- + scripts/config | 1 + + scripts/kconfig/Makefile | 10 ---------- + scripts/kconfig/mconf-cfg.sh | 4 +++- + 6 files changed, 6 insertions(+), 14 deletions(-) +Merging arc-current/for-curr (e8deee4f1543 ARC: [hsdk]: Enable FPU_SAVE_RESTORE) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (e64ab473ddda ARM: 9034/1: __div64_32(): straighten up inline asm constraints) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (83b5bd628f65 arm64: Move PSTATE.TCO setting to separate functions) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (bac717171971 ARM: picoxcell: fix missing interrupt-parent properties) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (3ce47d95b734 powerpc: Handle .text.{hot,unlikely}.* in linker script) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (129975e75b9a s390/Kconfig: sort config S390 select list once again) +$ 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 (f97844f9c518 dt-bindings: net: renesas,etheravb: RZ/G2H needs tx-internal-delay-ps) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/renesas,etheravb.yaml | 1 + + Documentation/networking/netdevices.rst | 171 ++++++++++++++++++++- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 13 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 7 +- + drivers/net/ipa/ipa_modem.c | 1 + + drivers/net/ppp/ppp_generic.c | 12 +- + net/8021q/vlan.c | 4 +- + net/core/dev.c | 25 +-- + net/core/rtnetlink.c | 23 +-- + net/core/skbuff.c | 20 ++- + net/core/sock_reuseport.c | 2 +- + net/ipv6/ip6_output.c | 41 ++++- + net/tipc/link.c | 9 +- + tools/testing/selftests/net/tls.c | 4 +- + 14 files changed, 276 insertions(+), 57 deletions(-) +Merging bpf/master (286e95eed12e Merge branch 's390-qeth-fixes-2021-01-07') +$ git merge bpf/master +Already up to date. +Merging ipsec/master (da64ae2d35d3 xfrm: Fix wraparound in xfrm_policy_addr_delta()) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_input.c +Merge made by the 'recursive' strategy. + net/key/af_key.c | 6 ++-- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_policy.c | 30 +++++++++++++------- + tools/testing/selftests/net/xfrm_policy.sh | 45 +++++++++++++++++++++++++++++- + 4 files changed, 68 insertions(+), 15 deletions(-) +Merging netfilter/master (c49243e88982 Merge branch 'net-fix-issues-around-register_netdevice-failures') +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (a8f33c038f4e Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (bfe55584713b MAINTAINERS: switch to different email address) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (51d62f2f2c50 cfg80211: Save the regulatory domain with a lock) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 5 ++++- + include/net/mac80211.h | 1 + + net/wireless/reg.c | 11 ++++++++++- + 3 files changed, 15 insertions(+), 2 deletions(-) +Merging rdma-fixes/for-rc (f2bc3af6353c RDMA/ocrdma: Fix use after free in ocrdma_dealloc_ucontext_pd()) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/restrack.c | 1 + + drivers/infiniband/core/ucma.c | 135 ++++++++++++++------------- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 3 + + 4 files changed, 77 insertions(+), 64 deletions(-) +Merging sound-current/for-linus (167c9dc84ec3 ALSA: usb-audio: Fix implicit feedback sync setup for Pioneer devices) +$ git merge sound-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/sound/ti,j721e-cpb-audio.yaml | 4 +- + .../bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 4 +- + MAINTAINERS | 6 +- + sound/pci/hda/patch_realtek.c | 4 ++ + sound/soc/amd/raven/pci-acp3x.c | 16 +---- + sound/soc/amd/renoir/rn-pci-acp3x.c | 14 ++++ + sound/soc/atmel/Kconfig | 4 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/max98373-i2c.c | 20 ++++++ + sound/soc/codecs/max98373-sdw.c | 20 ++++++ + sound/soc/codecs/max98373.c | 34 ++++++++- + sound/soc/codecs/max98373.h | 8 +++ + sound/soc/codecs/rt711.c | 6 ++ + sound/soc/fsl/imx-hdmi.c | 1 + + sound/soc/intel/boards/haswell.c | 1 + + sound/soc/intel/skylake/cnl-sst.c | 1 + + sound/soc/meson/axg-tdm-interface.c | 14 +++- + sound/soc/meson/axg-tdmin.c | 13 +--- + sound/soc/qcom/lpass-cpu.c | 20 +----- + sound/soc/qcom/lpass-platform.c | 50 +++++++++---- + sound/soc/sh/rcar/adg.c | 18 ++--- + sound/soc/soc-dapm.c | 1 + + sound/soc/sof/Kconfig | 2 +- + sound/usb/card.c | 5 +- + sound/usb/card.h | 3 + + sound/usb/endpoint.c | 84 ++++++++++++++++++---- + sound/usb/endpoint.h | 2 +- + sound/usb/implicit.c | 57 +++++++++++---- + sound/usb/quirks-table.h | 6 ++ + sound/usb/quirks.c | 58 +++++++++++---- + sound/usb/usbaudio.h | 1 + + 31 files changed, 358 insertions(+), 121 deletions(-) +Merging sound-asoc-fixes/for-linus (ed37719f60ff 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/hdmi-codec.c | 2 +- + sound/soc/fsl/imx-hdmi.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging regmap-fixes/for-linus (72962ebcdd45 Merge remote-tracking branch 'regmap/for-5.11' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (cd66a1589b7c Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (d7d09a547aac 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 (e71ba9452f0b Linux 5.11-rc2) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (29f7c54b253f Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 2 ++ + drivers/base/platform.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tty.current/tty-linus (54ca955b5a40 serial: mvebu-uart: fix tx lost characters at power off) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/mvebu-uart.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging usb.current/usb-linus (a5c7682aaaa1 usb: dwc3: gadget: Clear wait flag on dequeue) +$ git merge usb.current/usb-linus +Removing drivers/usb/gadget/udc/fsl_mxc_udc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 6 +- + MAINTAINERS | 2 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- + drivers/usb/class/cdc-acm.c | 4 + + drivers/usb/class/cdc-wdm.c | 16 ++- + drivers/usb/class/usblp.c | 21 +++- + drivers/usb/core/hcd.c | 8 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- + drivers/usb/dwc3/gadget.c | 16 +-- + drivers/usb/dwc3/ulpi.c | 38 ++++--- + drivers/usb/gadget/Kconfig | 2 + + drivers/usb/gadget/composite.c | 10 +- + drivers/usb/gadget/configfs.c | 19 +++- + drivers/usb/gadget/function/f_printer.c | 1 + + drivers/usb/gadget/function/f_uac2.c | 69 +++++++++--- + drivers/usb/gadget/function/u_ether.c | 9 +- + drivers/usb/gadget/legacy/acm_ms.c | 4 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/Makefile | 1 - + drivers/usb/gadget/udc/core.c | 3 +- + drivers/usb/gadget/udc/dummy_hcd.c | 35 ++++-- + drivers/usb/gadget/udc/fsl_mxc_udc.c | 122 --------------------- + drivers/usb/host/xhci.c | 24 ++-- + drivers/usb/misc/yurex.c | 3 + + drivers/usb/serial/iuu_phoenix.c | 20 +++- + drivers/usb/serial/option.c | 3 + + drivers/usb/storage/unusual_uas.h | 7 ++ + drivers/usb/typec/altmodes/Kconfig | 2 +- + drivers/usb/typec/class.c | 2 + + drivers/usb/typec/mux/intel_pmc_mux.c | 11 ++ + drivers/usb/usbip/vhci_hcd.c | 2 + + include/linux/kcov.h | 21 ++++ + 33 files changed, 267 insertions(+), 225 deletions(-) + delete mode 100644 drivers/usb/gadget/udc/fsl_mxc_udc.c +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 (54d0a3ab80f4 USB: serial: iuu_phoenix: fix DMA from stack) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +++--- + drivers/usb/cdns3/cdns3-imx.c | 22 +++++++++++----------- + 2 files changed, 14 insertions(+), 14 deletions(-) +Merging phy/fixes (d092bd911049 phy: mediatek: allow compile-testing the dsi phy) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/ingenic/Makefile | 2 +- + drivers/phy/mediatek/Kconfig | 4 +++- + drivers/phy/motorola/phy-cpcap-usb.c | 19 +++++++++++++------ + 3 files changed, 17 insertions(+), 8 deletions(-) +Merging staging.current/staging-linus (00b8c557d096 staging: ION: remove some references to CONFIG_ION) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/comedi/comedi_fops.c | 4 +++- + drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++++------ + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 20 -------------------- + drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +++- + kernel/configs/android-recommended.config | 1 - + 5 files changed, 21 insertions(+), 29 deletions(-) +Merging char-misc.current/char-misc-linus (384b77fd48fd Fonts: font_ter16x32: Update font with new upstream Terminus release) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + crypto/asymmetric_keys/asym_tpm.c | 2 +- + drivers/interconnect/imx/imx.c | 3 +- + drivers/interconnect/imx/imx8mq.c | 2 + + drivers/interconnect/qcom/Kconfig | 23 ++- + .../misc/habanalabs/common/command_submission.c | 77 +++++++-- + drivers/misc/habanalabs/common/device.c | 8 +- + drivers/misc/habanalabs/common/firmware_if.c | 60 +++++-- + drivers/misc/habanalabs/common/habanalabs.h | 4 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 1 + + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 7 +- + drivers/misc/habanalabs/common/hw_queue.c | 5 +- + drivers/misc/habanalabs/common/pci.c | 28 +-- + drivers/misc/habanalabs/gaudi/gaudi.c | 191 +++++++++------------ + drivers/misc/habanalabs/gaudi/gaudiP.h | 7 - + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 3 +- + drivers/misc/habanalabs/goya/goya.c | 75 ++++---- + .../misc/habanalabs/include/common/hl_boot_if.h | 9 +- + drivers/misc/pvpanic.c | 19 +- + include/uapi/misc/habanalabs.h | 5 + + lib/fonts/font_ter16x32.c | 6 +- + 21 files changed, 322 insertions(+), 217 deletions(-) +Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c14556fc0c7c thunderbolt: Drop duplicated 0x prefix from format string) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/icm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (2dce6db70c77 Input: goodix - add support for Goodix GT9286 chip) +$ 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/serio/i8042-x86ia64io.h | 2 + + drivers/input/touchscreen/goodix.c | 2 + + drivers/input/touchscreen/ili210x.c | 26 ++++++++---- + drivers/input/touchscreen/st1232.c | 48 +++++++++++++++++++--- + 6 files changed, 86 insertions(+), 15 deletions(-) +Merging crypto-current/master (382811940303 crypto: omap-sham - Fix link error without crypto-engine) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/xor.c | 2 ++ + drivers/crypto/Kconfig | 1 + + 2 files changed, 3 insertions(+) +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 +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +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 (e1263f9277ba dmaengine: stm32-mdma: fix STM32_MDMA_VERY_HIGH_PRIORITY value) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (4883a60c17ed mtd: rawnand: gpmi: fix dst bit offset when extracting raw payload) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (2984a99ff1c0 media: v4l: common: Fix naming of v4l2_get_link_rate) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/i2c/ccs-pll.c | 8 +------- + drivers/media/i2c/ccs/ccs-data.c | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 2 +- + drivers/media/rc/rc-main.c | 4 ++-- + drivers/media/v4l2-core/v4l2-common.c | 4 ++-- + include/media/v4l2-common.h | 4 ++-- + 7 files changed, 10 insertions(+), 16 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 (698222457465 MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/boot/compressed/decompress.c | 3 ++- + arch/mips/kernel/binfmt_elfn32.c | 7 +++++++ + arch/mips/kernel/binfmt_elfo32.c | 7 +++++++ + 3 files changed, 16 insertions(+), 1 deletion(-) +Merging at91-fixes/at91-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (181739822cf6 ARM: dts; gta04: SPI panel chip select is active low) +$ git merge omap-fixes/fixes +Auto-merging drivers/soc/ti/omap_prm.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-gta04.dtsi | 3 +-- + arch/arm/mach-omap1/board-osk.c | 2 ++ + drivers/soc/ti/omap_prm.c | 11 +++++++++++ + 3 files changed, 14 insertions(+), 2 deletions(-) +Merging kvm-fixes/master (872f36eb0b0f KVM: x86: __kvm_vcpu_halt can be static) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (84e261553e6f hwmon: (amd_energy) fix allocation of hwmon_channel_info config) +$ git merge hwmon-fixes/hwmon +Already up to date. +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 (aabcb2003928 Merge branch 'misc-5.11' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 4 +--- + fs/btrfs/inode.c | 60 +++++++++++++++++++++++++++++++++++-------------- + fs/btrfs/print-tree.c | 10 ++++----- + fs/btrfs/print-tree.h | 2 +- + fs/btrfs/relocation.c | 7 +++++- + fs/btrfs/space-info.c | 4 +++- + fs/btrfs/tree-checker.c | 7 ++++++ + 8 files changed, 67 insertions(+), 29 deletions(-) +Merging vfs-fixes/fixes (a0a6df9afcaf umount(2): move the flag validity checks first) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/namespace.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match) +$ git merge i3c-fixes/i3c/fixes +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 (5b569302520a platform/x86: amd-pmc: Fix CONFIG_DEBUG_FS check) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/surface/Kconfig | 8 +++--- + drivers/platform/surface/surface_gpe.c | 4 +-- + drivers/platform/x86/amd-pmc.c | 2 +- + drivers/platform/x86/i2c-multi-instantiate.c | 31 +++++++++++++++++------ + drivers/platform/x86/intel-vbtn.c | 6 +++++ + drivers/platform/x86/thinkpad_acpi.c | 4 +-- + drivers/platform/x86/touchscreen_dmi.c | 18 +++++++++++++ + tools/power/x86/intel-speed-select/isst-config.c | 32 ++++++++++++++++++++++++ + 8 files changed, 88 insertions(+), 17 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 (2b8f061a4f50 dt-bindings: Drop redundant maxItems/items) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (eeb1b55b6e25 scsi: ufs: Fix tm request when non-fatal error happens) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 34 +++++++++------ + drivers/scsi/hisi_sas/hisi_sas.h | 4 ++ + drivers/scsi/hisi_sas/hisi_sas_main.c | 11 +++++ + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 66 +++++++++++++++++++++++------ + drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 45 ++++++++++++++++++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 +++++++------ + drivers/scsi/mpt3sas/Kconfig | 2 +- + drivers/scsi/qedi/qedi_main.c | 4 +- + drivers/scsi/scsi_debug.c | 5 ++- + drivers/scsi/sd.c | 6 +-- + drivers/scsi/ufs/Kconfig | 1 + + drivers/scsi/ufs/ufshcd.c | 61 ++++++++++++++------------ + 13 files changed, 192 insertions(+), 80 deletions(-) +Merging drm-fixes/drm-fixes (29f95f20581c Merge tag 'drm-misc-fixes-2021-01-08' of git://anongit.freedesktop.org/drm/drm-misc 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 (9397d66212cd drm/i915/dp: Track pm_qos per connector) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (5c8fe583cce5 Linux 5.11-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (ad0a6bad4475 x86/hyperv: check cpu mask after interrupt has been disabled) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + arch/x86/hyperv/hv_init.c | 4 ++++ + arch/x86/hyperv/mmu.c | 12 +++++++++--- + arch/x86/include/asm/mshyperv.h | 2 ++ + arch/x86/kernel/cpu/mshyperv.c | 18 ++++++++++++++++++ + drivers/hv/vmbus_drv.c | 2 -- + 5 files changed, 33 insertions(+), 5 deletions(-) +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (0ea02c737752 riscv: Drop a duplicated PAGE_KERNEL_EXEC) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/pgtable.h | 1 - + arch/riscv/kernel/entry.S | 18 ++++++++++-------- + arch/riscv/kernel/time.c | 3 +++ + drivers/tty/serial/sifive.c | 1 + + 4 files changed, 14 insertions(+), 9 deletions(-) +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 (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (5c8fe583cce5 Linux 5.11-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (65a4e5299739 kunit: tool: Force the use of the 'tty' console for UML) +$ 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 (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (a0adc8eabb40 dma-buf: cma_heap: Fix memory leak in CMA heap) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/heaps/cma_heap.c | 3 +++ + 1 file changed, 3 insertions(+) +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 (a76082b037f5 Makefile: use smaller dictionary size for xz module compression) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging compiler-attributes/compiler-attributes (196793946264 Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) +$ 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 +Merge made by the 'recursive' strategy. + kernel/dma/map_benchmark.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging asm-generic/master (2c85ebc57b3e Linux 5.10) +$ git merge asm-generic/master +Already up to date. +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 (7c29ada5e700 iommu/vt-d: Fix ineffective devTLB invalidation for subdevices) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (881b0520504a perf/imx_ddr: Add system PMU identifier for userspace) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (9b28a2eacfe4 soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (a501abf8d8cb Merge branch 'v5.12/soc' into for-next) +$ git merge actions/for-next +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 (60f232d3c04a Merge branch 'v5.12/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 19 +++++++++---------- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 ++++---- + 5 files changed, 18 insertions(+), 19 deletions(-) +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 (3e3d5e8a7d73 Merge branches 'at91-soc' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 1 - + drivers/soc/atmel/soc.c | 12 ++++++++++++ + 5 files changed, 12 insertions(+), 4 deletions(-) +Merging drivers-memory/for-next (81053f0e95da 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 | 6 +- + drivers/memory/emif.c | 3 +- + drivers/memory/mtk-smi.c | 4 +- + drivers/memory/tegra/Kconfig | 4 +- + drivers/memory/tegra/tegra124-emc.c | 377 ++++++++++++++++++--- + drivers/memory/tegra/tegra124.c | 82 ++++- + include/linux/clk/tegra.h | 8 + + include/soc/tegra/emc.h | 16 - + 14 files changed, 517 insertions(+), 79 deletions(-) + delete mode 100644 include/soc/tegra/emc.h +Merging imx-mxs/for-next (90330a6dbd8c Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 1 + + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 25 ++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 25 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 31 ++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 33 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 31 ++ + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 + + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 307 +++++++++++++++ + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 19 + + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 433 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 2 + + drivers/clk/imx/clk-imx8qxp.c | 26 +- + include/dt-bindings/clock/imx8-clock.h | 2 + + 23 files changed, 963 insertions(+), 11 deletions(-) + 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 +Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +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 (dc14300bb67b Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (792952314166 Merge branch 'omap-for-v5.11/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi +Merge made by the 'recursive' strategy. + 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/am33xx-l4.dtsi | 49 ++++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/am574x-idk.dts | 4 ++++ + arch/arm/boot/dts/dra71-evm.dts | 2 ++ + arch/arm/boot/dts/dra76x.dtsi | 36 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++-- + 8 files changed, 113 insertions(+), 23 deletions(-) +Merging qcom/for-next (b69b63bfed82 Merge branches 'arm64-defconfig-for-5.12', 'arm64-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 +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/soc/qcom/qcom,smem.txt | 57 -- + .../devicetree/bindings/soc/qcom/qcom,smem.yaml | 72 +++ + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/qcom-pmx55.dtsi | 84 +++ + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 230 ++++++++ + arch/arm/boot/dts/qcom-sdx55.dtsi | 408 ++++++++++++++ + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 195 +++++++ + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 257 ++++++++- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 - + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 10 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 102 ++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 60 +++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 592 ++++++++++++++++++++- + arch/arm64/configs/defconfig | 4 +- + drivers/soc/qcom/llcc-qcom.c | 50 ++ + drivers/soc/qcom/rpmh-rsc.c | 24 +- + drivers/soc/qcom/smem.c | 4 +- + include/linux/soc/qcom/llcc-qcom.h | 3 + + include/soc/qcom/tcs.h | 9 +- + 24 files changed, 2087 insertions(+), 102 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-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/msm8916-asus-z00l.dts +Merging raspberrypi/for-next (e10bb7f95cba ARM: dts: bcm2711: Use compatible string for BCM2711 DSI1) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711.dtsi | 1 + + 1 file changed, 1 insertion(+) +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 (b8e76cdb1574 Merge branches 'renesas-arm-dt-for-v5.12' and 'renesas-dt-bindings-for-v5.12' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 2 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 37 +++--- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 12 +- + 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/r8a77990.dtsi | 65 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 135 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 5 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 10 ++ + 11 files changed, 572 insertions(+), 24 deletions(-) +Merging reset/reset/next (f2ad9bfd4dda dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt +Merge made by the 'recursive' strategy. + .../reset/brcm,bcm4908-misc-pcie-reset.yaml | 39 +++++++++++ + .../bindings/reset/hisilicon,hi3660-reset.txt | 44 ------------- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 77 ++++++++++++++++++++++ + drivers/reset/Kconfig | 2 +- + drivers/reset/hisilicon/reset-hi3660.c | 9 ++- + drivers/reset/reset-simple.c | 2 + + 6 files changed, 126 insertions(+), 47 deletions(-) + 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 +Merging rockchip/for-next (06f4ae178437 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. + arch/arm/boot/dts/rk3288-miqi.dts | 5 ++ + arch/arm/boot/dts/rk3288.dtsi | 28 +++++------ + arch/arm/boot/dts/rk3xxx.dtsi | 16 +++---- + arch/arm64/boot/dts/rockchip/px30.dtsi | 42 ++++++++-------- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++++++++++------------ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 ++ + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 27 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 52 ++++++++++---------- + arch/arm64/configs/defconfig | 1 + + 10 files changed, 129 insertions(+), 102 deletions(-) +Merging samsung-krzk/for-next (a867287e9066 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 +- + arch/arm/mach-exynos/Kconfig | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + 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 +++++++++++++++------- + 16 files changed, 107 insertions(+), 93 deletions(-) +Merging scmi/for-linux-next (dd63baa9d43f Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 8 +++++ + MAINTAINERS | 2 ++ + drivers/firmware/arm_scmi/smc.c | 42 +++++++++++++++++++++- + 3 files changed, 51 insertions(+), 1 deletion(-) +Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/connector/usb-connector.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/connector/usb-connector.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/stm32.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml +Resolved 'Documentation/devicetree/bindings/connector/usb-connector.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f091066ea8e9] Merge remote-tracking branch 'stm32/stm32-next' +$ git diff -M --stat --summary HEAD^.. +Merging sunxi/sunxi/for-next (2e76c5b3726d Merge branches 'sunxi/clk-for-5.12', 'sunxi/drivers-for-5.12' and 'sunxi/dt-for-5.12' 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 | 16 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 71 +++++++ + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 29 +++ + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 8 +- + 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 | 11 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../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 +- + .../allwinner/sun50i-a64-pinetab-early-adopter.dts | 26 +++ + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + drivers/bus/sunxi-rsb.c | 211 +++++++++++++++------ + 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 | 2 +- + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 2 + + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 + + 21 files changed, 472 insertions(+), 75 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 (b11a0dfbd316 Merge branch for-5.11/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ti-k3-new/ti-k3-next +Already up to date. +Merging clk/clk-next (abe7e32f1d50 Merge branches 'clk-ingenic', 'clk-vc5', 'clk-cleanup', 'clk-canaan' and 'clk-marvell' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-renesas/renesas-clk (193fd4c76240 clk: renesas: r8a779a0: Add MSIOF clocks) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + 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 | 35 +++++++++++++++++++++++++++++++-- + 5 files changed, 53 insertions(+), 2 deletions(-) +Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (f0bbf052ae46 csky: Reconstruct VDSO framework) +$ git merge csky/linux-next +Removing arch/csky/include/asm/atomic.h +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 20 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 9 +- + 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/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/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 | 4 +- + 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/vdso.h | 19 +- + 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 | 2 +- + arch/csky/kernel/ptrace.c | 126 ++++++++++- + 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 | 123 ++++++----- + arch/csky/kernel/vdso/.gitignore | 4 + + arch/csky/kernel/vdso/Makefile | 67 ++++++ + 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 | 54 +++++ + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 388 ++++++++++++++++++++------------- + arch/csky/mm/init.c | 35 ++- + arch/csky/mm/tlb.c | 42 +++- + include/linux/cpuhotplug.h | 1 + + 45 files changed, 1025 insertions(+), 842 deletions(-) + delete mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/include/asm/futex.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 +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 ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (e71ba9452f0b Linux 5.11-rc2) +$ git merge m68knommu/for-next +Already up to date. +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 (99b40ced9ef6 MIPS: bitops: Fix reference to ffz location) +$ git merge mips/mips-next +Removing arch/mips/kernel/irq-rm7000.c +Auto-merging arch/mips/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 6 +-- + 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/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/bitops.h | 2 +- + 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/traps.h | 1 + + arch/mips/include/uapi/asm/Kbuild | 3 -- + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/cacheinfo.c | 34 +++++++++++---- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/irq-rm7000.c | 45 -------------------- + arch/mips/kernel/perf_event_mipsxx.c | 22 ++++++---- + arch/mips/kernel/smp-cps.c | 3 -- + arch/mips/kernel/syscalls/Makefile | 16 +++---- + arch/mips/kernel/vpe-cmp.c | 4 +- + arch/mips/kernel/vpe-mt.c | 4 +- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lantiq/prom.c | 6 +-- + arch/mips/loongson2ef/common/init.c | 5 --- + arch/mips/loongson32/common/prom.c | 4 -- + arch/mips/loongson64/init.c | 54 +++++++++++++++++++++--- + arch/mips/loongson64/numa.c | 52 +---------------------- + arch/mips/loongson64/smp.c | 8 +++- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/init.c | 5 +++ + arch/mips/mti-malta/malta-init.c | 1 - + arch/mips/mti-malta/malta-memory.c | 4 -- + 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/vr41xx/common/init.c | 4 -- + 54 files changed, 141 insertions(+), 289 deletions(-) + delete mode 100644 arch/mips/kernel/irq-rm7000.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 (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (2c85ebc57b3e Linux 5.10) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (e71ba9452f0b Linux 5.11-rc2) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (962cfa82d260 riscv: Add machine name to kernel boot log and stack dump output) +$ git merge risc-v/for-next +Auto-merging drivers/reset/Kconfig +Auto-merging arch/riscv/include/asm/pgtable.h +Removing arch/riscv/boot/dts/kendryte/Makefile +Auto-merging arch/arm64/mm/init.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../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 | 15 ++ + 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 | 31 ++- + arch/riscv/Kconfig.socs | 32 ++- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 5 + + arch/riscv/boot/dts/{kendryte => canaan}/k210.dts | 0 + arch/riscv/boot/dts/{kendryte => canaan}/k210.dtsi | 5 - + arch/riscv/boot/dts/kendryte/Makefile | 4 - + 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/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/sbi.h | 10 +- + arch/riscv/include/asm/soc.h | 38 --- + arch/riscv/kernel/sbi.c | 4 +- + arch/riscv/kernel/setup.c | 23 +- + arch/riscv/kernel/smpboot.c | 12 +- + arch/riscv/kernel/soc.c | 27 -- + arch/riscv/mm/fault.c | 28 +- + arch/riscv/mm/init.c | 16 +- + drivers/base/Kconfig | 6 + + drivers/base/Makefile | 1 + + arch/arm64/mm/numa.c => drivers/base/arch_numa.c | 27 +- + 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/pinctrl/k210-fpioa.h | 276 +++++++++++++++++++ + include/dt-bindings/reset/k210-rst.h | 42 +++ + include/soc/canaan/k210-sysctl.h | 41 +++ + 54 files changed, 1760 insertions(+), 284 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 + rename arch/riscv/boot/dts/{kendryte => canaan}/k210.dts (100%) + rename arch/riscv/boot/dts/{kendryte => canaan}/k210.dtsi (94%) + delete mode 100644 arch/riscv/boot/dts/kendryte/Makefile + 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 + rename arch/arm64/mm/numa.c => drivers/base/arch_numa.c (96%) + 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 (5e935f340864 Merge branch 'fixes' into for-next) +$ git merge s390/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sh/for-next (b89bc060b53e sh/intc: Restore devm_ioremap() alignment) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/Kconfig | 1 - + arch/sh/boards/mach-sh03/rtc.c | 1 - + arch/sh/configs/landisk_defconfig | 9 ++++----- + arch/sh/configs/microdev_defconfig | 2 -- + arch/sh/configs/sdk7780_defconfig | 6 ++---- + arch/sh/configs/sdk7786_defconfig | 3 --- + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 3 --- + arch/sh/drivers/dma/Kconfig | 3 +-- + arch/sh/include/asm/gpio.h | 1 - + arch/sh/kernel/cpu/sh3/entry.S | 1 - + arch/sh/mm/Kconfig | 2 +- + arch/sh/mm/asids-debugfs.c | 15 ++------------- + arch/sh/mm/cache-debugfs.c | 15 ++------------- + arch/sh/mm/pmb.c | 15 ++------------- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/virq-debugfs.c | 14 ++------------ + 17 files changed, 17 insertions(+), 77 deletions(-) +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 (1fb1abc83636 um: Fix build w/o CONFIG_PM_SLEEP) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +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 (97847e06525b Merge branch 'for-next-next-v5.10-20201211' into for-next-20201211) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/space-info.c +CONFLICT (content): Merge conflict in fs/btrfs/space-info.c +Auto-merging fs/btrfs/qgroup.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Recorded preimage for 'fs/btrfs/inode.c' +Recorded preimage for 'fs/btrfs/space-info.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/btrfs/inode.c'. +Recorded resolution for 'fs/btrfs/space-info.c'. +[master cf4094de1699] Merge remote-tracking branch 'btrfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/block-group.c | 11 +- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/delayed-ref.h | 12 +- + fs/btrfs/disk-io.c | 9 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/free-space-cache.c | 6 +- + fs/btrfs/ordered-data.c | 13 +- + fs/btrfs/space-info.c | 274 +++++++++++++++++++++++++++++++++++-------- + fs/btrfs/space-info.h | 3 + + fs/btrfs/transaction.c | 85 ++++++-------- + include/trace/events/btrfs.h | 104 +++++++++++++++- + 11 files changed, 394 insertions(+), 129 deletions(-) +Merging ceph/master (4972cf605f8a libceph, ceph: disambiguate ceph_connection_operations handlers) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/mds_client.c | 34 ++++++++++++++--------------- + net/ceph/auth_x.c | 57 +++++++++++++++++++++++++++++-------------------- + net/ceph/crypto.c | 3 ++- + net/ceph/messenger_v2.c | 45 +++++++++++++++++++++----------------- + net/ceph/mon_client.c | 14 ++++++------ + net/ceph/osd_client.c | 40 +++++++++++++++++----------------- + 6 files changed, 106 insertions(+), 87 deletions(-) +Merging cifs/for-next (3ba507dc5ef7 cifs: check pointer before freeing) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_unicode.c | 6 ++++++ + fs/cifs/dfs_cache.c | 3 ++- + fs/cifs/dir.c | 10 ++++++++-- + fs/cifs/smb2pdu.h | 2 +- + 4 files changed, 17 insertions(+), 4 deletions(-) +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (d8b3df8b1048 erofs: avoid using generic_block_bmap) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (4b7bc2c32cba exfat: improve performance of exfat_free_cluster when using dirsync mount option) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/fatent.c | 42 ++++++++++++++++++++++++++++++++++++------ + 3 files changed, 39 insertions(+), 9 deletions(-) +Merging ext3/for_next (d15cd626d7a4 Pull inotify memcg accounting patch.) +$ git merge ext3/for_next +Auto-merging fs/notify/fanotify/fanotify_user.c +Merge made by the 'recursive' strategy. + 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 ++++++++--- + include/linux/fsnotify_backend.h | 1 + + 5 files changed, 32 insertions(+), 11 deletions(-) +Merging ext4/dev (5a3b590d4b2d ext4: don't leak old mountpoint samples) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ioctl.c +Resolved 'fs/ext4/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3851f08db9da] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/ext4_jbd2.c | 17 ----- + fs/ext4/ext4_jbd2.h | 5 -- + fs/ext4/file.c | 7 +- + fs/ext4/inode.c | 6 +- + fs/ext4/ioctl.c | 3 + + fs/ext4/namei.c | 10 ++- + fs/ext4/resize.c | 20 ++++-- + fs/ext4/super.c | 190 ++++++++++++++++++++++++++++++++-------------------- + fs/ext4/xattr.c | 5 +- + 9 files changed, 159 insertions(+), 104 deletions(-) +Merging f2fs/dev (b21c46be11a0 f2fs: fix to keep isolation of atomic write) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 21 ++ + Documentation/filesystems/f2fs.rst | 5 + + fs/f2fs/Kconfig | 10 + + fs/f2fs/acl.c | 23 +- + fs/f2fs/compress.c | 190 +++++++++++++---- + fs/f2fs/data.c | 361 +++++++++++++------------------- + fs/f2fs/f2fs.h | 69 +++++- + fs/f2fs/file.c | 35 +++- + fs/f2fs/gc.c | 8 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 7 + + fs/f2fs/segment.h | 4 +- + fs/f2fs/super.c | 87 +++++++- + fs/f2fs/sysfs.c | 77 ++++++- + fs/f2fs/xattr.c | 15 +- + include/linux/f2fs_fs.h | 3 + + 16 files changed, 621 insertions(+), 296 deletions(-) +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 (cb2856c59717 NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/internal.h | 26 ++++++++++++++++++--- + fs/nfs/nfs4proc.c | 28 +++++++++-------------- + fs/nfs/nfs4super.c | 4 ++-- + fs/nfs/pnfs.c | 67 ++++++++++++++++++++++++++++-------------------------- + fs/nfs/pnfs.h | 8 +++---- + fs/nfs/pnfs_nfs.c | 22 ++++++++---------- + net/sunrpc/addr.c | 2 +- + 7 files changed, 85 insertions(+), 72 deletions(-) +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 f0def8182220] 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/cel-next (7b723008f9c9 NFSD: Restore NFSv4 decoding's SAVEMEM functionality) +$ git merge cel/cel-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4proc.c | 5 +++ + fs/nfsd/nfs4xdr.c | 56 ++++++++++++++++++++++------------ + fs/nfsd/nfssvc.c | 6 ---- + fs/nfsd/xdr4.h | 1 - + net/sunrpc/svcsock.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++- + 5 files changed, 126 insertions(+), 28 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (459c7c565ac3 ovl: unprivieged mounts) +$ git merge overlayfs/overlayfs-next +Already up to date. +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 (e82226138b20 xfs: remove xfs_buf_t typedef) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (4f8b848788f7 zonefs: select CONFIG_CRC32) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (5cc02325880f Merge branches 'fixes', 'work.sparc', 'work.sparc32', 'work.elf-compat', 'work.recursive_removal', 'work.misc' and 'work.d_name' into for-next) +$ git merge vfs/for-next +Auto-merging arch/x86/Kconfig +Removing arch/sparc/mm/extable.c +Auto-merging arch/s390/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 +Resolved 'arch/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 66396880702a] 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 | 21 +- + fs/binfmt_elf_fdpic.c | 22 +- + fs/compat_binfmt_elf.c | 7 +- + fs/cramfs/inode.c | 18 +- + fs/erofs/namei.c | 4 +- + fs/inode.c | 1 + + fs/jfs/super.c | 1 - + fs/namespace.c | 53 ++-- + include/linux/elfcore-compat.h | 15 +- + include/linux/elfcore.h | 7 +- + include/linux/mount.h | 1 - + kernel/kexec_core.c | 2 +- + lib/extable.c | 5 - + 56 files changed, 370 insertions(+), 1096 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 (0459d46d8a44 Merge branch 'for-5.11-null-console-fixup' into for-next) +$ git merge printk/for-next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. +Merging pci/next (e71ba9452f0b Linux 5.11-rc2) +$ git merge pci/next +Already up to date. +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 (8cd7ce929f88 Merge branch 'for-5.11/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + 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 +++++++------- + drivers/hid/Kconfig | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 8 ++-- + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 2 +- + drivers/hid/hid-core.c | 3 ++ + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 2 + + drivers/hid/hid-logitech-dj.c | 4 ++ + drivers/hid/hid-multitouch.c | 4 ++ + drivers/hid/hid-quirks.c | 1 - + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 4 +- + drivers/hid/hid-wiimote-core.c | 2 +- + 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 +++++++++++++++++++++- + drivers/hid/wacom_sys.c | 35 ++++++++++++-- + 26 files changed, 234 insertions(+), 104 deletions(-) +Merging i2c/i2c/for-next (e7ccf47c442b Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib.c | 4 + + drivers/i2c/busses/i2c-bcm-iproc.c | 254 +++++++++++++++++++++++++++++-------- + 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 | 34 +---- + drivers/i2c/busses/i2c-qcom-geni.c | 59 ++++++--- + drivers/i2c/busses/i2c-rcar.c | 66 +++++++--- + drivers/i2c/i2c-core-acpi.c | 6 +- + 11 files changed, 310 insertions(+), 141 deletions(-) +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 (d1f7b079ce5b hwmon: (aspeed-pwm-tacho) Switch to using the new API kobj_to_dev()) +$ 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/index.rst | 2 - + drivers/hwmon/Kconfig | 13 -- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/ab8500.c | 224 ------------------ + drivers/hwmon/abx500.c | 487 --------------------------------------- + drivers/hwmon/abx500.h | 69 ------ + 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/pc87360.c | 4 +- + drivers/hwmon/pmbus/ibm-cffps.c | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 8 +- + drivers/hwmon/pwm-fan.c | 111 +++++---- + drivers/hwmon/smsc47m1.c | 2 +- + drivers/hwmon/w83627ehf.c | 2 +- + include/linux/pmbus.h | 9 + + 19 files changed, 94 insertions(+), 909 deletions(-) + delete mode 100644 Documentation/hwmon/ab8500.rst + delete mode 100644 Documentation/hwmon/abx500.rst + delete mode 100644 drivers/hwmon/ab8500.c + delete mode 100644 drivers/hwmon/abx500.c + delete mode 100644 drivers/hwmon/abx500.h +Merging jc_docs/docs-next (9d54ee78aef6 docs: admin-guide: bootconfig: Fix feils to fails) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (ecd07f4b9d21 media: allegro: rename stream_id to dst_handle) +$ git merge v4l-dvb/master +Removing drivers/staging/media/allegro-dvt/TODO +Removing drivers/staging/media/allegro-dvt/Kconfig +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 --- + MAINTAINERS | 3 +- + drivers/media/cec/core/cec-api.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 11 +- + drivers/media/platform/Kconfig | 15 + + drivers/media/platform/Makefile | 1 + + .../media => media/platform}/allegro-dvt/Makefile | 0 + .../platform}/allegro-dvt/allegro-core.c | 183 +++------- + .../platform}/allegro-dvt/allegro-mail.c | 8 +- + .../platform}/allegro-dvt/allegro-mail.h | 4 +- + .../platform}/allegro-dvt/nal-h264.c | 0 + .../platform}/allegro-dvt/nal-h264.h | 0 + 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 | 385 ++++++++++++++++---- + drivers/media/platform/ti-vpe/cal.h | 103 ++++-- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 38 +- + drivers/media/v4l2-core/v4l2-dev.c | 15 +- + drivers/media/v4l2-core/v4l2-event.c | 17 + + 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/TODO | 4 - + 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 + + include/media/v4l2-event.h | 13 +- + include/media/v4l2-fwnode.h | 2 +- + 34 files changed, 1679 insertions(+), 846 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allegro,al5e.yaml + delete mode 100644 Documentation/devicetree/bindings/media/allegro.txt + rename drivers/{staging/media => media/platform}/allegro-dvt/Makefile (100%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-core.c (95%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.c (98%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.h (98%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.c (100%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.h (100%) + delete mode 100644 drivers/staging/media/allegro-dvt/Kconfig + delete mode 100644 drivers/staging/media/allegro-dvt/TODO +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 95788afd5746] 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 (75a052c6b1ba Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/cpuhotplug.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform_profile | 24 ++ + Documentation/power/index.rst | 1 + + Documentation/power/powercap/dtpm.rst | 212 +++++++++ + Documentation/userspace-api/index.rst | 1 + + .../userspace-api/sysfs-platform_profile.rst | 42 ++ + drivers/acpi/Kconfig | 17 + + drivers/acpi/Makefile | 1 + + drivers/acpi/platform_profile.c | 181 ++++++++ + drivers/powercap/Kconfig | 13 + + drivers/powercap/Makefile | 2 + + drivers/powercap/dtpm.c | 473 +++++++++++++++++++++ + drivers/powercap/dtpm_cpu.c | 257 +++++++++++ + include/asm-generic/vmlinux.lds.h | 11 + + include/linux/cpuhotplug.h | 1 + + include/linux/dtpm.h | 77 ++++ + include/linux/platform_profile.h | 39 ++ + include/linux/units.h | 4 + + 17 files changed, 1356 insertions(+) + 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/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 (c8bb45205438 Merge branch 'cpufreq/scmi' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (fb7791e213a6 cpupower: add Makefile dependencies for install targets) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 8 ++++---- + tools/power/cpupower/bench/Makefile | 2 +- + 2 files changed, 5 insertions(+), 5 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 (0e1d9ca1766f opp: Call the missing clk_put() on error) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (6250d904ae1d thermal/core: Remove pointless thermal_zone_device_reset() function) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/thermal/sysfs-api.rst | 13 ---- + drivers/acpi/thermal.c | 49 ++++--------- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/da9062-thermal.c | 4 +- + drivers/thermal/gov_power_allocator.c | 2 +- + drivers/thermal/gov_step_wise.c | 14 +--- + drivers/thermal/thermal_core.c | 72 +++--------------- + drivers/thermal/thermal_core.h | 5 +- + 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 | 15 +--- + 12 files changed, 50 insertions(+), 225 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 (aaf1226bd95b RDMA: Use kzalloc for allocating only one thing) +$ git merge rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma_configfs.c | 12 ++---------- + drivers/infiniband/core/rw.c | 2 +- + drivers/infiniband/hw/cxgb4/restrack.c | 2 +- + drivers/infiniband/hw/hfi1/qsfp.c | 4 ++-- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- + 9 files changed, 11 insertions(+), 19 deletions(-) +Merging net-next/master (73b7a6047971 net: dsa: bcm_sf2: support BCM4908's integrated switch) +$ git merge net-next/master +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../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/brcm,sf2.yaml | 173 +++ + Documentation/networking/snmp_counter.rst | 28 +- + MAINTAINERS | 12 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 9 + + drivers/net/can/flexcan.c | 123 +- + drivers/net/can/m_can/Makefile | 4 + + .../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/dsa/b53/b53_common.c | 14 + + drivers/net/dsa/b53/b53_priv.h | 1 + + drivers/net/dsa/bcm_sf2.c | 36 +- + drivers/net/dsa/bcm_sf2_regs.h | 1 + + drivers/net/dsa/ocelot/felix.c | 1 + + drivers/net/dsa/sja1105/sja1105_main.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 - + 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 | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 59 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- + drivers/net/ethernet/broadcom/unimac.h | 68 + + 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/chelsio/cxgb4/cxgb4_main.c | 2 - + drivers/net/ethernet/cisco/enic/enic_main.c | 4 - + drivers/net/ethernet/emulex/benet/be_main.c | 2 - + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 53 +- + 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/enetc/enetc_mdio.c | 61 +- + drivers/net/ethernet/ibm/ibmvnic.c | 154 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 - + 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_lib.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 - + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 26 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 11 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 133 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 37 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 - + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 - + .../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/mlxfw/mlxfw_mfa2.c | 2 +- + drivers/net/ethernet/micrel/ks8851.h | 2 + + drivers/net/ethernet/micrel/ks8851_common.c | 112 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 - + drivers/net/ethernet/qlogic/qede/qede_main.c | 6 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 - + drivers/net/ethernet/realtek/r8169_main.c | 201 ++- + drivers/net/ethernet/renesas/ravb.h | 37 +- + drivers/net/ethernet/renesas/ravb_main.c | 6 +- + drivers/net/ethernet/sfc/efx.c | 2 - + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 91 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + drivers/net/geneve.c | 14 +- + drivers/net/ipa/Kconfig | 10 +- + drivers/net/ipa/gsi_trans.h | 1 + + drivers/net/macvlan.c | 2 +- + drivers/net/mhi_net.c | 15 +- + drivers/net/netdevsim/netdev.c | 2 - + drivers/net/phy/bcm7xxx.c | 2 + + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/micrel.c | 2 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/tap.c | 6 +- + drivers/net/tun.c | 6 +- + drivers/net/usb/hso.c | 3 +- + drivers/net/usb/qmi_wwan.c | 3 +- + drivers/net/vxlan.c | 15 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/net/wan/sbni.c | 2 +- + drivers/net/xen-netback/common.h | 3 +- + drivers/net/xen-netback/interface.c | 4 +- + drivers/net/xen-netback/netback.c | 5 +- + drivers/vhost/net.c | 4 +- + include/linux/brcmphy.h | 1 + + include/linux/dsa/brcm.h | 16 + + include/linux/netdevice.h | 18 - + include/linux/remoteproc/qcom_rproc.h | 4 +- + include/linux/skbuff.h | 106 +- + include/linux/soc/qcom/mdt_loader.h | 35 + + include/net/dsa.h | 53 +- + include/net/udp_tunnel.h | 8 + + include/uapi/linux/mptcp.h | 1 + + net/bridge/br.c | 2 +- + net/bridge/br_fdb.c | 1 + + net/bridge/br_input.c | 2 +- + net/bridge/br_mrp.c | 6 +- + net/bridge/br_stp.c | 4 +- + net/can/raw.c | 16 +- + net/core/dev.c | 13 +- + net/core/skbuff.c | 65 +- + net/dsa/dsa.c | 22 - + net/dsa/dsa2.c | 2 + + net/dsa/dsa_priv.h | 22 +- + net/dsa/slave.c | 208 +-- + net/dsa/tag_brcm.c | 1 + + net/ipv4/ip_output.c | 5 +- + net/ipv4/ip_tunnel_core.c | 9 +- + net/ipv4/tcp.c | 8 +- + net/ipv4/udp_tunnel_core.c | 24 +- + net/ipv6/ip6_output.c | 5 +- + net/kcm/kcmsock.c | 8 +- + 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 | 172 +- + net/mptcp/protocol.h | 11 + + net/nfc/nci/core.c | 4 +- + net/tipc/monitor.c | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 72 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 41 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 87 +- + 143 files changed, 4735 insertions(+), 3586 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml + 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/ethernet/broadcom/unimac.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 include/linux/dsa/brcm.h +Merging bpf-next/for-next (e22d7f05e445 libbpf: Clarify kernel type use with USER variants of CORE reading macros) +$ git merge bpf-next/for-next +Auto-merging net/core/dev.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 9 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 12 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 10 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 18 +-- + drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +- + drivers/net/ethernet/intel/igb/igb_main.c | 18 +-- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 ++- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 19 ++- + drivers/net/ethernet/marvell/mvneta.c | 10 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 12 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 9 +- + drivers/net/ethernet/sfc/rx.c | 10 +- + drivers/net/ethernet/socionext/netsec.c | 9 +- + drivers/net/ethernet/ti/cpsw.c | 18 +-- + drivers/net/ethernet/ti/cpsw_new.c | 18 +-- + drivers/net/hyperv/netvsc_bpf.c | 8 +- + drivers/net/tun.c | 12 +- + drivers/net/veth.c | 14 +- + drivers/net/virtio_net.c | 18 +-- + drivers/net/xen-netfront.c | 10 +- + include/net/xdp.h | 19 +++ + kernel/bpf/preload/iterators/iterators.c | 2 +- + net/bpf/test_run.c | 11 +- + net/core/dev.c | 24 ++- + net/core/sock_map.c | 2 +- + tools/lib/bpf/bpf_core_read.h | 169 ++++++++++++++++----- + .../selftests/bpf/prog_tests/core_read_macros.c | 64 ++++++++ + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 1 - + .../selftests/bpf/progs/test_core_read_macros.c | 50 ++++++ + 34 files changed, 409 insertions(+), 256 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_read_macros.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_read_macros.c +Merging ipsec-next/master (ede71cae7285 net-next: docs: Fix typos in snmp_counter.rst) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (09b5b5fb3902 ppp: clean up endianness conversions) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (13458ffe0a95 net: x25: Remove unimplemented X.25-over-LLC code stubs) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (ad3a9c0ec2d2 Bluetooth: hci_qca: Wait for SSR completion during suspend) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + 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 | 25 ++++++++++++++-- + drivers/bluetooth/btusb.c | 48 ++++++++++++++++++------------ + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_h5.c | 2 ++ + drivers/bluetooth/hci_ldisc.c | 7 ++--- + drivers/bluetooth/hci_qca.c | 18 +++++++----- + drivers/bluetooth/hci_serdev.c | 4 +-- + net/bluetooth/a2mp.c | 2 +- + net/bluetooth/hci_conn.c | 17 +++++++++++ + net/bluetooth/hci_request.c | 25 +++++----------- + net/bluetooth/mgmt.c | 8 +++++ + net/bluetooth/smp.c | 5 ++-- + 17 files changed, 210 insertions(+), 84 deletions(-) +Merging mac80211-next/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (2f31d01b4fe2 gfs2: amend SLAB_RECLAIM_ACCOUNT on gfs2 related slab cache) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/incore.h | 2 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/lops.h | 1 - + fs/gfs2/main.c | 4 ++-- + fs/gfs2/ops_fstype.c | 35 ++++++++++++++++++----------------- + fs/gfs2/recovery.c | 40 +++++++++++++++++++++++++++++----------- + fs/gfs2/super.c | 45 ++++----------------------------------------- + fs/gfs2/util.c | 43 +++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/util.h | 3 +++ + 9 files changed, 99 insertions(+), 76 deletions(-) +Merging mtd/mtd/next (341e4faf9cad mtd: remove redundant assignment to pointer eb) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/phram.c | 4 +++- + drivers/mtd/mtdswap.c | 1 - + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging nand/nand/next (3d557b24bc82 mtd: parsers: afs: Fix freeing the part name memory in failure) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/qcom,smem-part.yaml | 33 ++++ + drivers/mtd/nand/raw/mxc_nand.c | 2 +- + drivers/mtd/nand/raw/qcom_nandc.c | 4 +- + drivers/mtd/parsers/Kconfig | 8 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/afs.c | 4 +- + drivers/mtd/parsers/qcomsmempart.c | 170 +++++++++++++++++++++ + 7 files changed, 217 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml + create mode 100644 drivers/mtd/parsers/qcomsmempart.c +Merging spi-nor/spi-nor/next (31ad3eff093c mtd: spi-nor: keep lock bits if they are non-volatile) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (622aae879c1d crypto: vmx - Move extern declarations into header file) +$ git merge crypto/master +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/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 1 - + 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/s390/crypto/aes_s390.c | 2 + + arch/x86/crypto/aesni-intel_asm.S | 482 +++++- + arch/x86/crypto/aesni-intel_glue.c | 362 ++-- + arch/x86/crypto/blake2s-glue.c | 150 +- + crypto/Kconfig | 1 - + 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/skcipher.c | 2 + + crypto/tcrypt.c | 20 +- + crypto/testmgr.c | 3 + + 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/ccree/cc_driver.h | 1 - + drivers/crypto/geode-aes.c | 2 + + drivers/crypto/inside-secure/safexcel.c | 6 +- + drivers/crypto/inside-secure/safexcel_hash.c | 1 + + drivers/crypto/keembay/Kconfig | 29 + + drivers/crypto/keembay/Makefile | 3 + + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 1264 ++++++++++++++ + drivers/crypto/keembay/ocs-hcu.c | 840 +++++++++ + drivers/crypto/keembay/ocs-hcu.h | 106 ++ + 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/qat_common/adf_ctl_drv.c | 1 + + drivers/crypto/qat/qat_common/qat_algs.c | 1 + + drivers/crypto/sahara.c | 7 - + 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/internal/blake2b.h | 115 ++ + include/crypto/internal/blake2s.h | 109 +- + include/crypto/internal/cipher.h | 218 +++ + include/crypto/internal/skcipher.h | 1 + + include/linux/crypto.h | 163 -- + lib/crypto/blake2s.c | 48 +- + 87 files changed, 4915 insertions(+), 6703 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 + 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 + 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 (cb3cfbf79aff Merge tag 'drm-misc-next-2021-01-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.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/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/ste,mcde.txt +Merge made by the 'recursive' strategy. + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../bindings/display/bridge/renesas,lvds.yaml | 6 +- + .../display/bridge/thine,thc63lvd1024.yaml | 16 +- + .../bindings/display/connector/dp-connector.yaml | 56 + + .../display/panel/mantix,mlaf057we51-x.yaml | 1 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../devicetree/bindings/display/ste,mcde.txt | 104 -- + .../devicetree/bindings/display/ste,mcde.yaml | 169 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/vkms.rst | 70 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + drivers/dma-buf/dma-buf.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - + 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.h | 2 - + drivers/gpu/drm/ast/ast_mode.c | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - + 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_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_blend.c | 6 - + drivers/gpu/drm/drm_color_mgmt.c | 125 +- + drivers/gpu/drm/drm_crtc.c | 130 +- + drivers/gpu/drm/drm_dp_helper.c | 566 ++++++ + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/drm_dumb_buffers.c | 8 +- + drivers/gpu/drm/drm_edid.c | 103 ++ + drivers/gpu/drm/drm_encoder.c | 113 +- + drivers/gpu/drm/drm_fb_helper.c | 25 +- + drivers/gpu/drm/drm_file.c | 3 +- + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 141 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_irq.c | 32 + + drivers/gpu/drm/drm_mode_config.c | 51 +- + drivers/gpu/drm/drm_pci.c | 33 +- + drivers/gpu/drm/drm_plane.c | 170 +- + drivers/gpu/drm/drm_prime.c | 64 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 + + 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 | 95 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 - + drivers/gpu/drm/i915/Makefile | 4 +- + 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 | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 11 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + 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_cursor.c | 806 ++++++++ + drivers/gpu/drm/i915/display/intel_cursor.h | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 89 +- + drivers/gpu/drm/i915/display/intel_display.c | 1795 ++---------------- + drivers/gpu/drm/i915/display/intel_display.h | 13 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 124 ++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 127 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 64 +- + drivers/gpu/drm/i915/display/intel_dp.c | 525 +++++- + drivers/gpu/drm/i915/display/intel_dp.h | 7 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 115 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 21 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 259 ++- + 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_panel.c | 226 ++- + drivers/gpu/drm/i915/display/intel_psr.c | 22 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 50 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 10 + + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 582 +----- + drivers/gpu/drm/i915/i915_drv.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 38 +- + drivers/gpu/drm/i915/i915_irq.c | 355 ++-- + drivers/gpu/drm/i915/i915_reg.h | 7 +- + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 552 +++--- + 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/imx/Kconfig | 1 + + 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/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_prime.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + 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 | 221 ++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 24 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_dev.h | 16 +- + drivers/gpu/drm/qxl/qxl_drv.h | 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/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + 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 | 13 +- + 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 | 120 +- + 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/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 103 +- + 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/vc4/vc4_bo.c | 6 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 38 +- + drivers/gpu/drm/vc4/vc4_drv.h | 22 +- + 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.h | 1 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 81 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 + + drivers/gpu/drm/vkms/vkms_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 4 +- + 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/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 +- + .../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_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 | 14 +- + include/drm/drm_dp_helper.h | 218 +++ + 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_irq.h | 2 +- + include/drm/drm_legacy.h | 10 +- + include/drm/drm_managed.h | 2 - + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_plane.h | 42 + + include/drm/drm_prime.h | 7 +- + 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 | 1 - + include/drm/ttm/ttm_tt.h | 2 - + include/linux/dma-buf.h | 39 +- + include/uapi/drm/drm.h | 97 +- + include/uapi/drm/drm_mode.h | 13 +- + include/video/sstfb.h | 4 +- + 349 files changed, 11279 insertions(+), 9234 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 + 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_cursor.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h + 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%) +$ git reset --hard HEAD^ +HEAD is now at 89e77eb55fee Merge remote-tracking branch 'crypto/master' +Merging next-20210107 version of drm +$ git merge -m next-20210107/drm 5b2fc08c455bbf749489254a81baeffdf4c0a693 +Already up to date. +Merging amdgpu/drm-next (7b2992e67b23 MAINTAINERS: update radeon/amdgpu/amdkfd git trees) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 623a29d2ec34] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + 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_bios.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 43 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.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 | 3 +- + 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/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_gfx_if.h | 2 +- + 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/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 | 700 +++++++++++ + 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 | 105 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 + + .../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/core/dc.c | 31 +- + drivers/gpu/drm/amd/display/dc/dc.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 13 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 + + .../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 | 3 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 163 ++- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 535 ++++++++ + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 1 - + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 +- + 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/vangogh_ppt.c | 884 ++++++++++++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 223 +++- + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 38 +- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + sound/pci/hda/hda_intel.c | 9 +- + 82 files changed, 5818 insertions(+), 1193 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.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/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 +Merging drm-intel/for-linux-next (19fe4ac6f0e7 drm/i915: Disable RPM wakeref assertions during driver shutdown) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.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/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/ste,mcde.txt +Merge made by the 'recursive' strategy. + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../bindings/display/bridge/renesas,lvds.yaml | 6 +- + .../display/bridge/thine,thc63lvd1024.yaml | 16 +- + .../bindings/display/connector/dp-connector.yaml | 56 + + .../display/panel/mantix,mlaf057we51-x.yaml | 1 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../devicetree/bindings/display/ste,mcde.txt | 104 - + .../devicetree/bindings/display/ste,mcde.yaml | 169 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/vkms.rst | 70 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + drivers/dma-buf/dma-buf.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - + 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.h | 2 - + drivers/gpu/drm/ast/ast_mode.c | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - + 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_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_blend.c | 6 - + drivers/gpu/drm/drm_color_mgmt.c | 125 +- + drivers/gpu/drm/drm_crtc.c | 130 +- + drivers/gpu/drm/drm_dp_helper.c | 566 ++++++ + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/drm_dumb_buffers.c | 8 +- + drivers/gpu/drm/drm_edid.c | 103 + + drivers/gpu/drm/drm_encoder.c | 113 +- + drivers/gpu/drm/drm_fb_helper.c | 25 +- + drivers/gpu/drm/drm_file.c | 3 +- + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 141 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_irq.c | 32 + + drivers/gpu/drm/drm_mode_config.c | 51 +- + drivers/gpu/drm/drm_pci.c | 33 +- + drivers/gpu/drm/drm_plane.c | 170 +- + drivers/gpu/drm/drm_prime.c | 64 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 + + 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 | 95 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 - + drivers/gpu/drm/i915/Makefile | 14 +- + 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 | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 21 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + 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_cursor.c | 806 ++++++++ + drivers/gpu/drm/i915/display/intel_cursor.h | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 131 +- + drivers/gpu/drm/i915/display/intel_display.c | 2085 +++----------------- + drivers/gpu/drm/i915/display/intel_display.h | 15 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 124 ++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 127 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 64 +- + drivers/gpu/drm/i915/display/intel_dp.c | 533 ++++- + drivers/gpu/drm/i915/display/intel_dp.h | 7 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 115 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 21 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 259 ++- + 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_panel.c | 226 ++- + drivers/gpu/drm/i915/display/intel_psr.c | 131 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 50 +- + 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/vlv_dsi.c | 16 +- + 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 | 4 + + drivers/gpu/drm/i915/gvt/handlers.c | 5 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 5 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 11 + + drivers/gpu/drm/i915/gvt/mpt.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.h | 5 + + drivers/gpu/drm/i915/i915_debugfs.c | 582 +----- + drivers/gpu/drm/i915/i915_drv.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 38 +- + drivers/gpu/drm/i915/i915_irq.c | 355 ++-- + drivers/gpu/drm/i915/i915_reg.h | 7 +- + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 552 +++--- + 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/imx/Kconfig | 1 + + 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/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_prime.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + 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 | 221 ++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 24 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_dev.h | 16 +- + drivers/gpu/drm/qxl/qxl_drv.h | 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/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + 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 | 13 +- + 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 | 120 +- + 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/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 103 +- + 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/vc4/vc4_bo.c | 6 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 38 +- + drivers/gpu/drm/vc4/vc4_drv.h | 22 +- + 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.h | 1 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 81 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 + + drivers/gpu/drm/vkms/vkms_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 4 +- + 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/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 +- + .../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_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 | 14 +- + include/drm/drm_dp_helper.h | 218 ++ + 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_irq.h | 2 +- + include/drm/drm_legacy.h | 10 +- + include/drm/drm_managed.h | 2 - + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_plane.h | 42 + + include/drm/drm_prime.h | 7 +- + 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 | 1 - + include/drm/ttm/ttm_tt.h | 2 - + include/linux/dma-buf.h | 39 +- + include/uapi/drm/drm.h | 97 +- + include/uapi/drm/drm_mode.h | 13 +- + include/video/sstfb.h | 4 +- + 360 files changed, 11661 insertions(+), 9408 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 + 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_cursor.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h + 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%) +$ git reset --hard HEAD^ +HEAD is now at 623a29d2ec34 Merge remote-tracking branch 'amdgpu/drm-next' +Merging next-20210108 version of drm-intel +$ git merge -m next-20210108/drm-intel 6fdb335f1c9c0845b50625de1624d8445c4c4a07 +Auto-merging include/drm/drm_dsc.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/i915/Makefile | 14 +- + 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 | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 21 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + 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_cursor.c | 806 ++++++++ + drivers/gpu/drm/i915/display/intel_cursor.h | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 125 +- + drivers/gpu/drm/i915/display/intel_display.c | 2084 +++----------------- + drivers/gpu/drm/i915/display/intel_display.h | 15 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 124 ++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 127 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 54 +- + drivers/gpu/drm/i915/display/intel_dp.c | 85 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 115 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 21 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 26 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 162 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 12 + + drivers/gpu/drm/i915/display/intel_panel.c | 226 ++- + drivers/gpu/drm/i915/display/intel_psr.c | 131 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 50 +- + 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/vlv_dsi.c | 16 +- + 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 | 4 + + drivers/gpu/drm/i915/gvt/handlers.c | 5 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 5 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 11 + + drivers/gpu/drm/i915/gvt/mpt.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.h | 5 + + drivers/gpu/drm/i915/i915_debugfs.c | 582 +----- + drivers/gpu/drm/i915/i915_drv.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 38 +- + drivers/gpu/drm/i915/i915_irq.c | 355 ++-- + drivers/gpu/drm/i915/i915_reg.h | 7 +- + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 552 +++--- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.h | 6 +- + include/drm/drm_dsc.h | 1 + + include/drm/drm_rect.h | 13 + + 59 files changed, 3572 insertions(+), 3219 deletions(-) + 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_cursor.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h +Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (2b405ec0e1c4 drm/mipi-dbi: Switch to new kerneldoc syntax for named variable macro argument) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.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/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/ste,mcde.txt +Merge made by the 'recursive' strategy. + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../bindings/display/bridge/renesas,lvds.yaml | 6 +- + .../display/bridge/thine,thc63lvd1024.yaml | 16 +- + .../bindings/display/connector/dp-connector.yaml | 56 + + .../display/panel/mantix,mlaf057we51-x.yaml | 1 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../devicetree/bindings/display/ste,mcde.txt | 104 -- + .../devicetree/bindings/display/ste,mcde.yaml | 169 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/vkms.rst | 70 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + drivers/dma-buf/dma-buf.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - + 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_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_blend.c | 6 - + drivers/gpu/drm/drm_color_mgmt.c | 125 +- + drivers/gpu/drm/drm_crtc.c | 130 +- + drivers/gpu/drm/drm_dp_helper.c | 566 ++++++ + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_dumb_buffers.c | 8 +- + drivers/gpu/drm/drm_edid.c | 103 ++ + drivers/gpu/drm/drm_encoder.c | 113 +- + drivers/gpu/drm/drm_fb_helper.c | 25 +- + drivers/gpu/drm/drm_file.c | 3 +- + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 141 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_irq.c | 32 + + drivers/gpu/drm/drm_mode_config.c | 51 +- + drivers/gpu/drm/drm_pci.c | 33 +- + drivers/gpu/drm/drm_plane.c | 170 +- + drivers/gpu/drm/drm_prime.c | 64 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + 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 | 3 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 9 +- + drivers/gpu/drm/gma500/gma_device.c | 3 +- + drivers/gpu/drm/gma500/gma_display.c | 4 +- + drivers/gpu/drm/gma500/gtt.c | 20 +- + drivers/gpu/drm/gma500/intel_bios.c | 6 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 4 +- + drivers/gpu/drm/gma500/intel_i2c.c | 2 +- + drivers/gpu/drm/gma500/mdfld_device.c | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 8 +- + drivers/gpu/drm/gma500/mid_bios.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 2 +- + drivers/gpu/drm/gma500/opregion.c | 3 +- + drivers/gpu/drm/gma500/power.c | 13 +- + drivers/gpu/drm/gma500/psb_drv.c | 18 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 6 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- + 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 | 95 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 - + drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 1 - + drivers/gpu/drm/i915/display/intel_display_types.h | 10 + + drivers/gpu/drm/i915/display/intel_dp.c | 440 ++++- + drivers/gpu/drm/i915/display/intel_dp.h | 7 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 233 +++ + drivers/gpu/drm/i915/display/intel_hdmi.h | 7 + + drivers/gpu/drm/imx/Kconfig | 1 + + 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/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/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_prime.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + 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 | 221 ++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 24 +- + 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/radeon/atombios_encoders.c | 6 +- + drivers/gpu/drm/radeon/r100.c | 27 +- + drivers/gpu/drm/radeon/radeon.h | 33 +- + 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 | 3 +- + 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 | 20 +- + 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 | 13 +- + 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 | 120 +- + 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/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 | 6 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 38 +- + drivers/gpu/drm/vc4/vc4_drv.h | 22 +- + 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_vram.c | 2 + + drivers/gpu/drm/vkms/vkms_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 4 +- + 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/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 +- + .../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_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 | 14 +- + include/drm/drm_dp_helper.h | 218 +++ + include/drm/drm_drv.h | 2 - + 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_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_modeset_helper_vtables.h | 29 +- + include/drm/drm_plane.h | 42 + + include/drm/drm_prime.h | 7 +- + 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 | 1 - + include/drm/ttm/ttm_tt.h | 2 - + include/linux/dma-buf.h | 39 +- + include/uapi/drm/drm.h | 97 +- + include/uapi/drm/drm_mode.h | 13 +- + include/video/sstfb.h | 4 +- + 367 files changed, 8440 insertions(+), 6507 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 + delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.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%) +$ git reset --hard HEAD^ +HEAD is now at dab5276655bb next-20210108/drm-intel +Merging next-20210107 version of drm-misc +$ git merge -m next-20210107/drm-misc be3e477effba636ad25dcd244db264c6cd5c1f36 +Already up to date. +Merging drm-msm/msm-next (00fd44a1a470 drm/msm: Only enable A6xx LLCC code on A6xx) +$ git merge drm-msm/msm-next +Already up to date. +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 +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_crtc.c | 125 ++++++++++++++++++++++------- + drivers/gpu/drm/drm_encoder.c | 113 +++++++++++++++++++++------ + drivers/gpu/drm/drm_mode_config.c | 2 +- + drivers/gpu/drm/drm_plane.c | 134 +++++++++++++++++++++++++------- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +++- + 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/ipu-v3/ipu-di.c | 4 - + include/drm/drm_crtc.h | 33 ++++++++ + include/drm/drm_encoder.h | 32 +++++++- + include/drm/drm_modes.h | 10 +++ + include/drm/drm_plane.h | 42 ++++++++++ + include/drm/drm_simple_kms_helper.h | 24 ++++++ + 19 files changed, 723 insertions(+), 422 deletions(-) +Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (72962ebcdd45 Merge remote-tracking branch 'regmap/for-5.11' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (75b1a8f9d62e ALSA: Convert strlcpy to strscpy when return value is unused) +$ git merge sound/for-next +Auto-merging sound/usb/card.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + 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 | 2 +- + sound/firewire/dice/dice-hwdep.c | 2 +- + sound/firewire/digi00x/digi00x-hwdep.c | 2 +- + sound/firewire/fireface/ff-hwdep.c | 2 +- + sound/firewire/fireworks/fireworks_hwdep.c | 2 +- + sound/firewire/motu/motu-hwdep.c | 2 +- + sound/firewire/oxfw/oxfw-hwdep.c | 2 +- + sound/firewire/tascam/tascam-hwdep.c | 2 +- + sound/hda/hdac_stream.c | 5 ++--- + sound/i2c/i2c.c | 4 ++-- + sound/isa/ad1848/ad1848.c | 4 ++-- + sound/isa/cs423x/cs4231.c | 4 ++-- + sound/isa/cs423x/cs4236.c | 4 ++-- + sound/isa/es1688/es1688.c | 4 ++-- + sound/isa/sb/sb16_csp.c | 2 +- + sound/isa/sb/sb_mixer.c | 2 +- + sound/oss/dmasound/dmasound_core.c | 4 ++-- + sound/pci/asihpi/hpidebug.c | 2 +- + sound/pci/bt87x.c | 3 ++- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 4 ++-- + 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/es1968.c | 2 +- + 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 | 2 +- + sound/pci/hda/hda_jack.c | 2 +- + 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 | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident_main.c | 4 ++-- + 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 | 4 ++-- + sound/usb/hiface/chip.c | 6 +++--- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/mixer.c | 16 ++++++++-------- + 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/x86/intel_hdmi_audio.c | 2 +- + sound/xen/xen_snd_front_cfg.c | 2 +- + 96 files changed, 161 insertions(+), 162 deletions(-) +Merging sound-asoc/for-next (c11a66e4a9a1 Merge remote-tracking branch 'asoc/for-5.12' into asoc-next) +$ git merge sound-asoc/for-next +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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/wm8962.txt | 4 + + sound/soc/Kconfig | 1 - + sound/soc/Makefile | 1 - + sound/soc/amd/acp3x-rt5682-max9836.c | 4 +- + sound/soc/codecs/es8328.c | 3 +- + sound/soc/codecs/rt1015.c | 122 ++---- + sound/soc/codecs/rt1015.h | 5 - + sound/soc/codecs/rt5645.c | 33 +- + sound/soc/codecs/wm_adsp.c | 98 ++--- + sound/soc/codecs/wmfw.h | 6 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/intel/boards/bytcht_es8316.c | 3 - + sound/soc/intel/boards/sof_rt5682.c | 7 - + sound/soc/intel/catpt/pcm.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 - + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 - + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 6 - + 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/soc-pcm.c | 19 +- + sound/soc/sprd/sprd-mcdt.c | 10 +- + 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 ---- + 31 files changed, 138 insertions(+), 1088 deletions(-) + 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 +Merging modules/modules-next (38dc717e9715 module: delay kobject uevent until after module init call) +$ git merge modules/modules-next +Already up to date. +Merging input/next (f5cace4b93d7 Input: imx_keypad - add dependency on HAS_IOMEM) +$ git merge input/next +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/misc/da7280.c | 3 +++ + drivers/input/touchscreen/raydium_i2c_ts.c | 3 ++- + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging block/for-next (a9f7c7a1f408 Merge branch 'for-5.12/io_uring' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + fs/io_uring.c | 467 ++++++++++++++++++++++++------------------- + fs/namei.c | 88 ++++---- + fs/open.c | 6 + + include/linux/fcntl.h | 2 +- + include/linux/namei.h | 1 + + include/uapi/linux/openat2.h | 4 + + 6 files changed, 319 insertions(+), 249 deletions(-) +Merging device-mapper/for-next (9b5948267adc dm integrity: fix flush with external metadata device) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/Kconfig | 2 + + drivers/md/dm-bufio.c | 6 ++ + drivers/md/dm-crypt.c | 138 +++++++++++++++++++++++++++++++++++++++++----- + drivers/md/dm-integrity.c | 60 ++++++++++++++++---- + drivers/md/dm-raid.c | 6 +- + drivers/md/dm-snap.c | 24 ++++++++ + drivers/md/dm.c | 2 +- + include/linux/dm-bufio.h | 1 + + 8 files changed, 209 insertions(+), 30 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 (e71ba9452f0b Linux 5.11-rc2) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (2fc3f48ad711 mfd: mcp-sa11x0: Use DIV_ROUND_UP to calculate rw_timeout) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/altera-sysmgr.c | 3 ++- + drivers/mfd/max8997.c | 4 ++-- + drivers/mfd/mcp-sa11x0.c | 3 +-- + 5 files changed, 7 insertions(+), 7 deletions(-) +Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (32e4978bb920 power: supply: bq256xx: Introduce the BQ256XX charger driver) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq256xx.yaml | 110 ++ + drivers/power/reset/linkstation-poweroff.c | 1 + + drivers/power/supply/Kconfig | 12 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/bq256xx_charger.c | 1745 ++++++++++++++++++++ + drivers/power/supply/cpcap-battery.c | 13 +- + drivers/power/supply/cpcap-charger.c | 2 +- + drivers/power/supply/ingenic-battery.c | 2 +- + drivers/power/supply/max8997_charger.c | 96 ++ + 9 files changed, 1977 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/bq256xx.yaml + create mode 100644 drivers/power/supply/bq256xx_charger.c +Merging regulator/for-next (d2725f3a363f Merge remote-tracking branch 'regulator/for-5.12' into regulator-next) +$ git merge regulator/for-next +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 +- + .../regulator/richtek,rt4831-regulator.yaml | 35 ++ + MAINTAINERS | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 9 +- + drivers/regulator/Kconfig | 28 ++ + drivers/regulator/Makefile | 3 + + drivers/regulator/atc260x-regulator.c | 539 +++++++++++++++++++++ + drivers/regulator/bd70528-regulator.c | 11 +- + drivers/regulator/bd71828-regulator.c | 13 +- + drivers/regulator/bd718x7-regulator.c | 20 +- + drivers/regulator/core.c | 6 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 215 ++++++++ + drivers/regulator/qcom-rpmh-regulator.c | 26 + + drivers/regulator/rt4831-regulator.c | 198 ++++++++ + lib/linear_ranges.c | 8 +- + 16 files changed, 1080 insertions(+), 40 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4831-regulator.yaml + 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 +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 (207cdd565dfc ima: Don't modify file descriptor mode on the fly) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (6b8945603d05 certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID) +$ git merge keys/keys-next +Auto-merging security/keys/key.c +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 ++ + 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 + + 21 files changed, 47 insertions(+), 47 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 (a9ffe682c58a selinux: fix inconsistency between inode_getxattr and inode_listsecurity) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') +$ git merge smack/next +Already up to date. +Merging tomoyo/master (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (2a6f7a28785c keys: Update comment for restrict_link_by_key_or_keyring_chain) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/restrict.c | 7 +- + drivers/char/tpm/Kconfig | 10 + + drivers/char/tpm/Makefile | 2 + + drivers/char/tpm/eventlog/tpm1.c | 1 + + drivers/char/tpm/tpm-dev-common.c | 1 - + drivers/char/tpm/tpm_tis_i2c_cr50.c | 790 ++++++++++++++++++++++++++++++++++++ + 6 files changed, 807 insertions(+), 4 deletions(-) + create mode 100644 drivers/char/tpm/tpm_tis_i2c_cr50.c +Merging watchdog/master (5c8fe583cce5 Linux 5.11-rc1) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) +$ git merge iommu/next +Already up to date. +Merging audit/next (a1b861faa684 kernel/audit: convert comma to semicolon) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (e33dc2f36367 dt-bindings: mali-bifrost: Add dynamic-power-coefficient) +$ git merge devicetree/for-next +Already up to date. +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 (2ed03653da04 Merge remote-tracking branch 'spi/for-5.12' into spi-next) +$ git merge spi/for-next +Removing drivers/spi/spi-txx9.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/spi/nvidia,tegra210-quad.yaml | 117 ++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 6 +- + MAINTAINERS | 8 + + drivers/spi/Kconfig | 17 +- + drivers/spi/Makefile | 2 +- + drivers/spi/spi-cadence-quadspi.c | 364 ++++- + drivers/spi/spi-mem.c | 1 + + drivers/spi/spi-orion.c | 55 +- + drivers/spi/spi-rpc-if.c | 11 +- + drivers/spi/spi-stm32.c | 8 +- + drivers/spi/spi-tegra210-quad.c | 1410 ++++++++++++++++++++ + drivers/spi/spi-txx9.c | 477 ------- + drivers/spi/spi.c | 25 +- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/linux/spi/spi.h | 42 +- + include/uapi/linux/spi/spi.h | 41 + + include/uapi/linux/spi/spidev.h | 30 +- + 18 files changed, 2018 insertions(+), 599 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml + create mode 100644 drivers/spi/spi-tegra210-quad.c + delete mode 100644 drivers/spi/spi-txx9.c + create mode 100644 include/uapi/linux/spi/spi.h +Merging tip/auto-latest (1173fb292bae Merge branch 'x86/build') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/Makefile | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) +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 (f2a34093730f Merge branch 'edac-misc' 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 | 318 +++++++++++++++++++++++++++++++++++++++--- + 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 +- + 7 files changed, 311 insertions(+), 332 deletions(-) + delete mode 100644 drivers/edac/amd64_edac_dbg.c + delete mode 100644 drivers/edac/amd64_edac_inj.c +Merging irqchip/irq/irqchip-next (599b3063adf4 irqchip/mips-cpu: Set IPI domain parent chip) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/base/platform.c +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 5 +++-- + drivers/irqchip/irq-bcm2836.c | 4 ++-- + drivers/irqchip/irq-loongson-liointc.c | 4 ++-- + drivers/irqchip/irq-mips-cpu.c | 7 +++++++ + drivers/irqchip/irq-sl28cpld.c | 2 +- + kernel/irq/msi.c | 2 +- + 6 files changed, 16 insertions(+), 8 deletions(-) +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 (cffdc9c7c24c EXP sched: Print list of runnable tasks in the current rq) +$ git merge rcu/rcu/next +Auto-merging mm/slub.c +Auto-merging include/linux/mm.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Auto-merging Documentation/RCU/Design/Requirements/Requirements.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 | 20 + + Documentation/admin-guide/kernel-parameters.txt | 74 ++- + .../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/cpu/mce/core.c | 14 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/tsc.c | 3 +- + drivers/cpuidle/cpuidle-tegra.c | 2 +- + drivers/cpuidle/cpuidle.c | 33 +- + include/linux/clocksource.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/cpumask.h | 8 + + include/linux/list.h | 2 +- + include/linux/mm.h | 6 + + include/linux/rcu_segcblist.h | 120 +++- + 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/core.c | 26 +- + 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 | 434 ++++++++++-- + kernel/rcu/refscale.c | 23 +- + kernel/rcu/srcutiny.c | 77 ++- + kernel/rcu/srcutree.c | 147 ++++- + kernel/rcu/tasks.h | 79 +++ + kernel/rcu/tree.c | 101 ++- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 380 ++++++++++- + kernel/rcu/tree_stall.h | 60 +- + kernel/rcu/update.c | 4 +- + kernel/scftorture.c | 6 +- + kernel/sched/core.c | 29 +- + kernel/sched/idle.c | 18 +- + kernel/time/clocksource.c | 138 +++- + kernel/time/timer.c | 14 + + kernel/torture.c | 195 +++++- + lib/Makefile | 3 - + lib/cpumask.c | 132 ++++ + lib/percpu-refcount.c | 12 +- + mm/slab.c | 22 + + mm/slab.h | 14 + + mm/slab_common.c | 78 +++ + mm/slob.c | 8 + + mm/slub.c | 42 ++ + mm/util.c | 34 + + mm/vmalloc.c | 15 + + tools/memory-model/Documentation/glossary.txt | 12 +- + tools/memory-model/Documentation/locking.txt | 320 +++++++++ + 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 ++- + .../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/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + 131 files changed, 4464 insertions(+), 1010 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 + 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 (872f36eb0b0f KVM: x86: __kvm_vcpu_halt can be static) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (45ba7b195a36 arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST) +$ git merge kvm-arm/next +Already up to date. +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 (6190c0ccaf5d xen: Kconfig: remove X86_64 depends from XEN_512GB) +$ 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 (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (fc00bc8ac1da platform/surface: Add Surface ACPI Notify driver) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + 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 | 13 + + 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 | 1264 ++++++++++ + .../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 | 303 +++ + include/linux/mod_devicetable.h | 18 + + 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 + + 40 files changed, 14103 insertions(+) + 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 + 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 (6ae9b5ffcaeb platform/chrome: cros_ec_typec: Tolerate unrecognized mux flags) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +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 +Merge made by the 'recursive' strategy. + drivers/leds/led-triggers.c | 10 ++++++---- + drivers/leds/leds-ariel.c | 6 +++--- + drivers/leds/leds-blinkm.c | 24 ++++++++++++------------ + drivers/leds/leds-gpio.c | 3 ++- + drivers/leds/leds-lm3530.c | 10 +++++----- + drivers/leds/leds-lm3533.c | 4 ++-- + 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 ++++++------ + 12 files changed, 67 insertions(+), 68 deletions(-) +Merging ipmi/for-next (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (0fab972eef49 drivers: core: Detach device from power domain on shutdown) +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/core.c +Auto-merging drivers/base/Kconfig +Merge made by the 'recursive' strategy. + drivers/base/Kconfig | 2 +- + drivers/base/bus.c | 17 -------- + drivers/base/core.c | 104 ++++++++++++++++++++++++++++++++++++++++++------- + include/linux/device.h | 2 + + 4 files changed, 94 insertions(+), 31 deletions(-) +Merging usb/usb-next (841081d89d5a usb: usbip: Use DEFINE_SPINLOCK() for spinlock) +$ git merge usb/usb-next +Auto-merging drivers/usb/gadget/function/f_printer.c +Auto-merging drivers/usb/gadget/configfs.c +Auto-merging drivers/usb/gadget/composite.c +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/core.h +Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 95d0b5d0ceb2] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 105 ++++++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 21 ++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 82 +++++ + drivers/usb/class/usbtmc.c | 85 +++-- + drivers/usb/dwc3/Kconfig | 10 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/drd.c | 25 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 363 +++++++++++++++++++++ + drivers/usb/dwc3/gadget.c | 128 +++++--- + drivers/usb/gadget/composite.c | 21 +- + drivers/usb/gadget/configfs.c | 24 +- + drivers/usb/gadget/function/f_printer.c | 5 + + drivers/usb/gadget/function/u_serial.c | 4 +- + 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/usb/composite.h | 2 + + include/uapi/linux/usb/tmc.h | 3 + + 20 files changed, 827 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml + create mode 100644 drivers/usb/dwc3/dwc3-imx8mp.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 (5c8fe583cce5 Linux 5.11-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (fc71a6268982 usb: chipidea: tegra: Specify TX FIFO threshold in UDC SoC info) +$ 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 | 35 +- + 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/{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 | 59 +- + drivers/usb/cdns3/drd.c | 222 ++- + 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 +- + 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 +- + include/linux/usb/chipidea.h | 6 + + 33 files changed, 10835 insertions(+), 571 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 (5c8fe583cce5 Linux 5.11-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (c9cd57bf57fd tty: Protect disc_data in n_tty_close and n_tty_flush_buffer) +$ git merge tty/tty-next +Removing include/linux/kd.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/st,stm32-uart.yaml | 13 +- + Documentation/networking/caif/caif.rst | 1 - + drivers/accessibility/speakup/spk_ttyio.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 2 - + drivers/net/caif/caif_serial.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 | 2 +- + drivers/tty/ipwireless/tty.c | 1 - + drivers/tty/mxser.c | 1 - + drivers/tty/n_tty.c | 2 + + drivers/tty/pty.c | 16 +- + drivers/tty/serial/8250/8250_tegra.c | 11 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 43 ++- + drivers/tty/serial/icom.c | 4 +- + drivers/tty/serial/ifx6x60.c | 3 - + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/max3100.c | 3 - + drivers/tty/serial/serial_core.c | 3 - + drivers/tty/serial/stm32-usart.c | 415 +++++++++++---------- + drivers/tty/synclink_gt.c | 1 - + drivers/tty/tty_io.c | 118 ++++-- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/defkeymap.c_shipped | 82 ++-- + drivers/tty/vt/keyboard.c | 16 +- + 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/tty.h | 11 +- + include/linux/vt_kern.h | 12 - + include/uapi/linux/termios.h | 15 - + 37 files changed, 449 insertions(+), 575 deletions(-) + delete mode 100644 include/linux/kd.h +Merging char-misc/char-misc-next (59b26d2e96c4 bus: fsl-mc: add missing __iomem attribute) +$ 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 drivers/misc/atmel_tclib.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging MAINTAINERS +Recorded preimage for 'include/linux/mod_devicetable.h' +Recorded preimage for 'scripts/mod/devicetable-offsets.c' +Recorded preimage for 'scripts/mod/file2alias.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/mod_devicetable.h'. +Recorded resolution for 'scripts/mod/devicetable-offsets.c'. +Recorded resolution for 'scripts/mod/file2alias.c'. +[master bf4f84f0089b] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-dfl-devices-emif | 25 + + .../ABI/testing/sysfs-bus-dfl-devices-n3000-nios | 47 ++ + Documentation/fpga/dfl.rst | 27 + + MAINTAINERS | 3 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +- + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/dfl-n3000-nios.c | 588 +++++++++++++++++++++ + drivers/fpga/dfl-pci.c | 165 ++++-- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/dfl.h | 85 +-- + drivers/greybus/greybus_trace.h | 6 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 2 + + drivers/memory/dfl-emif.c | 207 ++++++++ + drivers/misc/Kconfig | 8 - + drivers/misc/Makefile | 1 - + drivers/misc/atmel_tclib.c | 200 ------- + drivers/misc/cardreader/rtsx_pcr.c | 6 - + drivers/misc/eeprom/eeprom_93xx46.c | 3 +- + drivers/misc/ocxl/file.c | 3 +- + include/linux/dfl.h | 86 +++ + include/linux/mod_devicetable.h | 24 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + 25 files changed, 1187 insertions(+), 344 deletions(-) + 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 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 include/linux/dfl.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 (235ae89b6676 soundwire: intel: Use kzalloc for allocating only one thing) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging thunderbolt/next (82096ecf589d thunderbolt: Use kmemdup instead of kzalloc and memcpy) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/dma_test.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging vfio/next (bdfae1c9a913 vfio/type1: Add vfio_group_iommu_domain()) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (d61adf609c48 staging: unisys: visorhba: enhance visorhba to use channel_interrupt) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/board/Kconfig | 9 ++- + drivers/staging/fwserial/fwserial.c | 2 + + drivers/staging/greybus/light.c | 3 +- + drivers/staging/most/net/net.c | 3 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 51 ++++++------ + 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/r8192U_core.c | 2 + + drivers/staging/rtl8723bs/core/rtw_security.c | 24 ++---- + drivers/staging/unisys/visorhba/visorhba_main.c | 90 ++++------------------ + drivers/staging/vc04_services/interface/TODO | 4 + + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 22 +++--- + .../interface/vchiq_arm/vchiq_connected.c | 3 +- + 19 files changed, 91 insertions(+), 151 deletions(-) +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 (4b1a60a1bb8f MAINTAINERS: Update Georgi's email address) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (e2fcd6e427c2 dma: idxd: use DEFINE_MUTEX() for mutex lock) +$ git merge dmaengine/next +Removing include/linux/platform_data/dma-atmel.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/owl-dma.yaml | 7 +-- + MAINTAINERS | 1 - + drivers/dma/at_hdmac.c | 19 +++++++ + drivers/dma/at_hdmac_regs.h | 28 ++++++++-- + drivers/dma/idxd/init.c | 3 +- + drivers/dma/owl-dma.c | 3 +- + include/linux/platform_data/dma-atmel.h | 61 ---------------------- + 7 files changed, 51 insertions(+), 71 deletions(-) + delete mode 100644 include/linux/platform_data/dma-atmel.h +Merging cgroup/for-next (2d18e54dd866 cgroup: Fix memory leak when parsing multiple source parameters) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (eeb1b55b6e25 scsi: ufs: Fix tm request when non-fatal error happens) +$ git merge scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (91b1b640b834 scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ufs/Kconfig +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Merge made by the 'recursive' strategy. + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 - + drivers/scsi/ibmvscsi/ibmvfc.c | 379 ++++++++++++++++++++++----------- + drivers/scsi/ibmvscsi/ibmvfc.h | 54 +++-- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 9 +- + 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 | 21 +- + drivers/scsi/lpfc/lpfc_init.c | 241 +++++++++++++-------- + 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 | 58 ++++- + drivers/scsi/lpfc/lpfc_sli.c | 141 +++++++----- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/scsi/storvsc_drv.c | 58 +++-- + drivers/scsi/ufs/Kconfig | 14 +- + drivers/scsi/ufs/ufs-exynos.c | 8 +- + drivers/scsi/ufs/ufs-mediatek.c | 1 + + drivers/scsi/ufs/ufs-sysfs.c | 30 +-- + drivers/scsi/ufs/ufs.h | 17 ++ + drivers/scsi/ufs/ufshcd.c | 112 ++++++---- + drivers/scsi/ufs/ufshcd.h | 6 + + include/trace/events/ufs.h | 108 ++++++---- + 26 files changed, 946 insertions(+), 491 deletions(-) +Merging vhost/linux-next (e13a6915a03f vhost/vsock: add IOTLB API support) +$ git merge vhost/linux-next +Already up to date. +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 (efcdca286eef gpio: tegra: Convert to gpio_irq_chip) +$ git merge gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-davinci.txt | 1 + + .../bindings/gpio/toshiba,gpio-visconti.yaml | 70 +++++++ + 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 | 16 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd70528.c | 46 ++--- + drivers/gpio/gpio-bd71828.c | 28 ++- + drivers/gpio/gpio-rcar.c | 27 --- + drivers/gpio/gpio-sl28cpld.c | 4 +- + drivers/gpio/gpio-tegra.c | 218 ++++++++++++++------- + drivers/gpio/gpio-visconti.c | 218 +++++++++++++++++++++ + drivers/pinctrl/visconti/pinctrl-common.c | 23 +++ + 16 files changed, 531 insertions(+), 151 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml + create mode 100644 drivers/gpio/gpio-visconti.c +Merging gpio-intel/for-next (2a8a3f09d9b1 gpio: wcove: convert comma to semicolon) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-wcove.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pinctrl/for-next (6d92949813bb Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 62 ++++++++--------- + drivers/pinctrl/actions/pinctrl-owl.c | 1 - + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2 +- + drivers/pinctrl/core.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - + drivers/pinctrl/mediatek/pinctrl-moore.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 ++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 - + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 - + drivers/pinctrl/pinctrl-at91.c | 3 +- + drivers/pinctrl/pinctrl-ingenic.c | 80 +++++++++++----------- + drivers/pinctrl/pinctrl-st.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 - + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 - + drivers/pinctrl/ralink/pinctrl-rt2880.c | 47 +++++++------ + 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/ti/pinctrl-ti-iodelay.c | 2 +- + 22 files changed, 102 insertions(+), 119 deletions(-) +Merging pinctrl-intel/for-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (7ba4a9591a8a pinctrl: renesas: Fix fall-through warnings for Clang) +$ 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 (6eefb79d6f5b pwm: sun4i: Remove erroneous else branch) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) +$ git merge userns/for-next +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 (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cti-platform.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge rtc/rtc-next +Already up to date. +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 (09162bc32c88 Linux 5.10-rc4) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (40f592233f78 nvmem: imx-iim: Use of_device_get_match_data()) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 1 + + drivers/nvmem/imx-iim.c | 7 +------ + 2 files changed, 2 insertions(+), 6 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 (d03419fe2048 scsi: storvsc: Resolve data race in storvsc_probe()) +$ git merge hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + 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 | 43 +++++--- + 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 +- + 15 files changed, 495 insertions(+), 234 deletions(-) +Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) +$ git merge auxdisplay/auxdisplay +Already up to date. +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 pidfd/for-next (7abe0224623f Merge tag 'time-namespace-v5.11' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-fme-perf.c | 6 +++--- + drivers/fpga/fpga-bridge.c | 4 +--- + 2 files changed, 4 insertions(+), 6 deletions(-) +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 (e6ca384d3b09 mhi: pci_generic: Fix shared MSI vector support) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/init.c | 9 +- + drivers/bus/mhi/core/main.c | 20 +++ + drivers/bus/mhi/pci_generic.c | 371 +++++++++++++++++++++++++++++++++++++++--- + include/linux/mhi.h | 13 +- + 4 files changed, 386 insertions(+), 27 deletions(-) +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging samples/watch_queue/watch_test.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/watch_queue.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/watch_queue.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4e007ac0f7c3] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 35 files changed, 411 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging memblock/for-next (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging akpm-current/current (790907e4ba85 aio: simplify read_events()) +$ git merge --no-ff akpm-current/current +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 lib/cpumask.c +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Removing include/linux/mm-arch-hooks.h +Auto-merging include/linux/cpumask.h +Removing include/asm-generic/mm-arch-hooks.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kfence.rst | 297 ++++++++++++ + MAINTAINERS | 12 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kfence.h | 17 + + arch/arm64/mm/fault.c | 4 + + arch/arm64/mm/mmu.c | 7 +- + 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 | 59 +++ + arch/x86/mm/fault.c | 5 + + drivers/base/node.c | 27 +- + fs/aio.c | 9 +- + fs/block_dev.c | 2 +- + fs/buffer.c | 56 ++- + fs/dcache.c | 4 +- + fs/direct-io.c | 4 +- + fs/exec.c | 4 +- + fs/fhandle.c | 2 +- + fs/hugetlbfs/inode.c | 17 +- + fs/iomap/seek.c | 125 +---- + 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/ramfs/inode.c | 12 + + include/asm-generic/Kbuild | 1 - + include/asm-generic/mm-arch-hooks.h | 16 - + include/linux/cpumask.h | 2 +- + include/linux/gfp.h | 2 + + include/linux/hugetlb.h | 2 +- + include/linux/kfence.h | 202 ++++++++ + include/linux/khugepaged.h | 2 + + include/linux/memblock.h | 1 + + include/linux/memcontrol.h | 35 +- + include/linux/memremap.h | 6 + + include/linux/mm-arch-hooks.h | 22 - + include/linux/mmzone.h | 17 + + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 4 +- + include/linux/pagemap.h | 6 +- + include/linux/pagevec.h | 4 - + include/linux/sched.h | 8 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/swap.h | 2 +- + include/linux/wait.h | 4 +- + include/trace/events/kmem.h | 24 +- + init/main.c | 3 + + kernel/hung_task.c | 44 ++ + kernel/sysctl.c | 16 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 7 + + lib/Kconfig.kfence | 72 +++ + lib/cpumask.c | 73 ++- + mm/Makefile | 1 + + mm/cma.c | 17 + + mm/compaction.c | 7 +- + mm/filemap.c | 347 ++++++++----- + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 37 +- + mm/internal.h | 4 +- + mm/kasan/common.c | 6 + + mm/kasan/generic.c | 3 +- + mm/kasan/init.c | 23 +- + mm/kasan/kasan.h | 9 + + mm/kasan/shadow.c | 13 + + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 835 ++++++++++++++++++++++++++++++++ + mm/kfence/kfence.h | 107 ++++ + mm/kfence/kfence_test.c | 823 +++++++++++++++++++++++++++++++ + mm/kfence/report.c | 244 ++++++++++ + mm/khugepaged.c | 28 +- + mm/memblock.c | 73 ++- + mm/memcontrol.c | 180 +++---- + mm/memremap.c | 20 + + mm/mmap.c | 69 +-- + mm/mprotect.c | 6 + + mm/mremap.c | 3 - + mm/msync.c | 6 +- + mm/page_alloc.c | 197 ++++---- + mm/page_reporting.c | 2 +- + mm/rmap.c | 26 +- + mm/shmem.c | 152 ++---- + mm/slab.c | 42 +- + mm/slab.h | 14 +- + mm/slab_common.c | 5 +- + mm/slob.c | 2 +- + mm/slub.c | 66 ++- + mm/swap.c | 38 +- + mm/swap_state.c | 8 +- + mm/truncate.c | 131 +---- + mm/vmscan.c | 68 ++- + mm/vmstat.c | 43 +- + mm/zswap.c | 6 +- + scripts/checkpatch.pl | 56 ++- + 102 files changed, 3975 insertions(+), 1134 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/kfence.h + delete mode 100644 include/linux/mm-arch-hooks.h + create mode 100644 lib/Kconfig.kfence + create mode 100644 mm/kfence/Makefile + create mode 100644 mm/kfence/core.c + create mode 100644 mm/kfence/kfence.h + create mode 100644 mm/kfence/kfence_test.c + create mode 100644 mm/kfence/report.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/16)
Rebasing (2/16)
Rebasing (3/16)
Rebasing (4/16)
Rebasing (5/16)
Rebasing (6/16)
Rebasing (7/16)
Rebasing (8/16)
Rebasing (9/16)
Rebasing (10/16)
Rebasing (11/16)
Rebasing (12/16)
Rebasing (13/16)
Rebasing (14/16)
Rebasing (15/16)
Rebasing (16/16)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5abc1e21fca0...4bc5a2fb735e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4bc5a2fb735e secretmem-test-add-basic-selftest-for-memfd_secret2-fix) +$ 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/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 | 439 ++++++++++++++++++++++++++++++ + 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 ++ + 38 files changed, 904 insertions(+), 51 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 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..bfaffedf5ce9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210111 |