diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-20 17:27:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-20 17:27:58 +0100 |
| commit | b5b3bd898ba99fb0fb6aed3b23ec6353a1724d6f (patch) | |
| tree | a843cf3ef22be6eaa94052cb0d75227606101aeb | |
| parent | 2853edd3d0eadcd6471200af45c5c3e65342504f (diff) | |
| download | linux-b5b3bd898ba99fb0fb6aed3b23ec6353a1724d6f.tar.gz linux-b5b3bd898ba99fb0fb6aed3b23ec6353a1724d6f.tar.xz | |
Add linux-next specific files for 20190920next-20190920
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 313 | ||||
| -rw-r--r-- | Next/Trees | 314 | ||||
| -rw-r--r-- | Next/merge.log | 7821 | ||||
| -rw-r--r-- | Next/quilt-import.log | 12 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8461 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d24df72f3707 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,313 @@ +Name SHA1 +---- ---- +origin 574cc4539762561d96b456dbc0544d8898bd4c6e +fixes 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild-current d45331b00ddb179e291766617259261c112db872 +arc-current 089cf7f6ecb266b6a4164919a2e69bd2f938374a +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes b74d957f6317e60924d0d3c0c01750814c24611b +arm64-fixes 799c85105233514309b201a2d2d7a7934458c999 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes a8318c13e79badb92bc6640704a64cc022a6eb97 +s390-fixes d45331b00ddb179e291766617259261c112db872 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 864668bfc374dfbf4851ec828b9049e08f9057b1 +bpf 733ef7f056a5e23b66e8e7bb3508ca882db388f0 +ipsec 00b368502d18f790ab715e055869fd4bb7484a9b +netfilter 864668bfc374dfbf4851ec828b9049e08f9057b1 +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 2d88b2cf2f002417cd7436f0fd34716e8c288fb1 +mac80211 f794dc2304d83ab998c2eee5bab0549aff5c53a2 +rdma-fixes 531a64e4c35bb9844b0cf813a6c9a87e00be05ff +sound-current bd9c10bc663dd2eaac8fe39dad0f18cd21527446 +sound-asoc-fixes 4f3ded8cc889049a9c832d3781eca9b22de9aa78 +regmap-fixes 0161b8716465a93db726147e12f2514ba356c271 +regulator-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +spi-fixes 6979d5d444d02328344649c326715b4cab9d7cf0 +pci-current 7bafda88de20b2990461d253c5475007436e355c +driver-core.current b41dae061bbd722b9d7fa828f35d22035b218e18 +tty.current b41dae061bbd722b9d7fa828f35d22035b218e18 +usb.current b41dae061bbd722b9d7fa828f35d22035b218e18 +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 609488bc979f99f805f34e9a32c1e3b71179d10b +staging.current b41dae061bbd722b9d7fa828f35d22035b218e18 +char-misc.current 38c7a30a9d5ff8dd0c7a9ab1441aa5a96cf60afa +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +input-current 0898782247ae533d1f4e47a06bc5d4870931b284 +crypto-current 9575d1a5c0780ea26ff8dd29c94a32be32ce3c85 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes cf24aac38698bfa1d021afd3883df3c4c65143a4 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418 +at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +omap-fixes a4c8723a162e6244fb01944fbf446750575dba59 +kvm-fixes b60fe990c6b07ef6d4df67bc0530c7c90a62623a +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 98d1a3c245e4beb450867bcc7798c85a09aa0095 +nvdimm-fixes 274b924088e93593c76fb122d24bc0ef18d0ddf4 +btrfs-fixes 43271a33245c764c647e940205c27eb362850976 +vfs-fixes cdf88216f62fb7ca9cb864ec90fba507d521d918 +erofs-fixes erofs-fixes^{} +git: git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git/^{} +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 83f82d7a42583e93d0f0dde3d61ed10f75c0f4d8 +scsi-fixes 0622800d2ebccead42b3a85e255f7d473a36ec99 +drm-fixes e6bb711600db23eef2fa0c16a2d361e17b45bb28 +amdgpu-fixes e16a7cbced7110866dcde84e504909ea85099bbd +drm-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +mmc-fixes 87b5d602a1cc76169b8d81ec2c74c8d95d9350dc +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes e395071a12f9df7d22ca6657614e93453b69f72a +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 4c250fa8d9889958fe4fbbe206ef87b45c96c408 +pidfd-fixes 28f59b04707dfe62223b95c1a73eb9c7f4f32def +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +gpio-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +drm-misc-fixes 21670bd78a25001cf8ef2679b378c73fb73b904f +kspp-gustavo 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild 77564a4829ef6d309331d443ea6ceb065f3dc371 +compiler-attributes 32ee8230b2b06c50f583e14fcd174d7d2edb52f5 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm 3a6d5fc4376059d0f4047b58170325df9bd90e18 +arm64 e376897f424a1c807779a2635f62eb02d7e382f9 +arm-perf 3724e186fead350d1446d5202cd92fa6250bffda +arm-soc cc01ccf8045fac2f44e2170736eb2ab61c3583ee +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 83405c3ff5e14778316045e0cb594250997eeaba +aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd +at91 1069a5a3f3d88f0236cca790ba27069a3db62a1a +bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1 +imx-mxs d26d83e3e1fc7c7d21f1406cbd842fa612079828 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 153e97d3bdf3549705d352ae49ce9d8fea2262c8 +omap 7d6340ab2965f5b4b96a9fb0e49c04b26b3d2d46 +qcom 63e5846442478bbd493377aee59ed817226c6475 +renesas ae688e1720fd387de34f2140a735917411672bf1 +renesas-geert e180e8bda8292eb2ed3f396f44487ef6e4dc26b9 +reset 2d94bccca49ff6b9c6795bf5206cf56f56718a57 +rockchip 155cb7cd4cd417d54b57b731cc2331bf9e545156 +samsung-krzk 2f776c5a7270d5c8f45d7115042655767535f3df +scmi 03791902740b038acfa66e3307f7a37d0f6e8602 +sunxi 15ea63583bfb82c93bc9d6b21321b4133c0b8482 +tegra 6290ae1fb7e26c04b4eddc8aa4c99d1af3dbc556 +clk ebd47c8434064687ab6641e837144e0a3ea3872d +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 4ad35c1f56386c8e7019c921bba1af109fde9693 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 0f1979b402df5f0dd86425830ddaa191d70f3655 +m68knommu 372ea263b3d9cdeb70f8cffa025b2e0875e51b62 +microblaze 7cca9b8b7c5bcc56d627851550840586a25aaa1b +mips c4d48cf5e2f08476c2c59cc68133177c191cf4d5 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175 +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +powerpc d9101bfa6adc831bda8836c4d774820553c14942 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5 +risc-v 9ce06497c2722a0f9109e4cc3ce35b7a69617886 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 93426cadc339939d723a71fa1e2fdbfb97773ef0 +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml f2f4bf5aabadd6575f5daabcb0a2f506e3f5f68c +xtensa 9c2ec7545cbd21199b1cdee2da195cabf4839ad7 +fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835 +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave a406b66710ba8af4dc116365372d327f34ce850c +ceph 3ee5a7015c8b7cb4de21f7345f8381946f2fce55 +cifs b9345b51f84073c58068d5688d35171e14db3657 +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +ext3 0f7dbaee76f40c0089b573f56b262ce3be92a24a +ext4 040823b5372b445d1d9483811e85a24d71314d33 +f2fs fbbf779989d2ef9a51daaa4e53c0b2ecc8c55c4e +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse 3a4807386a52682efc6a49cb7adab321955c10ad +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +nfs-anna ac25ec92aa9565bf630efa3f82e16693cf6f86ef +nfsd 6ee95d1c899186c0798cafd25998d436bcdb9618 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 14e15f1bcd738dc13dd7c1e78e4800e8bc577980 +iomap 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d +djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk c38822ab9bd624e6f99bbc2576aa04151bff93f4 +pci 42055e9cc44bd237ad42b0ee9b99c0585f5c3e98 +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid 8c97be0a0aa0844b7972358318a230ab2deb6b41 +i2c 5ae7657f46b2b78e7c4e4e176187b210ffa0ead2 +i3c 6030f42d20cedc04df019891851320f3e257038b +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 4e19e72f45d360975c59df8272f98bff59f6b748 +jc_docs fe013f8bc160d79c6e33bb66d9bb0cd24949274c +v4l-dvb 6f51fdfd8229d5358c2d6e272cf73478866e8ddc +v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 315ea754a4c4b180c262041dbba6c8c9808d53c5 +cpufreq-arm f75d2accca7785657311653c125bb22f342dc5d9 +cpupower 87ce243206944a57383309dcbcdcc5750e6c905b +opp 071afa50609d46f2f760851b90696f9a09714d24 +thermal 0ca7ab5b009299d18e6f78b683294d96d6853469 +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 3eca7fc2d8d1275d9cf0c709f0937becbfcf6d96 +net-next b41dae061bbd722b9d7fa828f35d22035b218e18 +bpf-next b41dae061bbd722b9d7fa828f35d22035b218e18 +ipsec-next 990925fad5c227269c3fcb76c7c46811b1e86c73 +mlx5-next fc603294267f890b34684588f6980ea8c7b72ecf +netfilter-next 67e80b99a5546b26561c7848f9fc1cf73d707792 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next aa2eaa8c272a3211dec07ce9c6c863a7e355c10e +bluetooth 990925fad5c227269c3fcb76c7c46811b1e86c73 +mac80211-next c1d3ad84eae35414b6b334790048406bd6301b12 +gfs2 f0b444b349e33ae0d3dd93e25ca365482a5d17d4 +mtd 2cfcfadb8e1380938d6631cffa4fa567b13f52b2 +nand f480b969448ee3896f55ef6d037ad4a2df3914bf +spi-nor 9607af6f857ff062b29562fc1fe36d22b16b9d27 +crypto 9575d1a5c0780ea26ff8dd29c94a32be32ce3c85 +drm 945b584c94f8c665b2df3834a8a6a8faf256cd5f +amdgpu 9c9284f9cee9052da4cad575da8dc5f2bbb31065 +drm-intel a95819a173788bec7414d260f76f42a9934890b4 +drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 +drm-misc 65e51e30d8625c82ddfe405da46124e9bbffaa71 +drm-msm 9f614197c744002f9968e82c649fdf7fe778e1e7 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 +regmap 1bd4584626a9715634d2cb91ae2ed0364c070b01 +sound bd9c10bc663dd2eaac8fe39dad0f18cd21527446 +sound-asoc 4f3ded8cc889049a9c832d3781eca9b22de9aa78 +modules 2e6fcfeb9df6048a63fe0d5f7dfa39274bacbb71 +input 410f25de467ee94c1a577c6ee7370c37b376c17c +block 23846d01858b0529b31c8fa6415ae3ae493fbaf0 +device-mapper afa179eb603847494aa5061d4f501224a30dd187 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc b46119796721301e410a357b91195eed46980ea6 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 8391c6cb2414d9a75bbe247a838d28cb0cee77ee +backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08 +battery 7f7378618b4103c083db7de5017df958f8ada070 +regulator 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 1f96e0f129eb2bea15a00c154eee8b85aa181d1a +selinux 15322a0d90b6fd62ae8f22e5b87f735c3fdfeff7 +smack 92604e825304ce170955df44b00973843054dcd5 +tpmdd 1c2725a707561f1d2711b39079a49ba08013c596 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu e95adb9add75affb98570a518c902f50e5fcce1b +vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f +audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree 59e9fcf8772bd97b6d681706fb8c9a972500c524 +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi b83ced70fa09cc4359466a1d6da15d6734e43c32 +tip 55cd259e59740d5668aaa0fce7aa885bc5f598d4 +clockevents befd04abfbe4b933515dddb5659d0744be9dba6a +edac 3e443eb353eda6f4b4796e07f2599683fa752f1d +irqchip bb0fed1c60cccbe4063b455a7228818395dac86e +ftrace b78b94b82122208902c0f83805e614e1239f9893 +rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672 +kvm fb3925d06c285e1acb248addc5d80b33ea771b0f +kvm-arm aac60f1a867773de9eb164013d89c99f3ea1f009 +kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69 +kvms390 0af2889f89bbb8bdab463862c59ceb5586f290eb +xen-tip a4098bc6eed5e31e0391bcc068e61804c98138df +percpu 69f98a60cdbb22aeb565044b858eee4930502a7c +workqueues def98c84b6cdf2eeea19ec5736e90e316df5206b +drivers-x86 b3abfd778bf1dbdd96f70bd7d00671d027f67c62 +chrome-platform 4c1fde5077dcad1a2a10a6a0883c8f94326c4971 +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 6d4faf3b6b6eb3c8a750b2e6659a5b1ff3dd9e75 +ipmi c9acc3c4f8e42ae538aea7f418fddc16f257ba75 +driver-core b41dae061bbd722b9d7fa828f35d22035b218e18 +usb b41dae061bbd722b9d7fa828f35d22035b218e18 +usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d +usb-serial 7a786b84790789eff5bad49e3f6c15f75b7bf691 +usb-chipidea-next ecd55e367f3d706788632e176ec6b94e1a72a07c +phy-next 5af67635c36ed92ef172c7bbf4d711364bc3bdf7 +tty b41dae061bbd722b9d7fa828f35d22035b218e18 +char-misc 6cfae0c26b21dce323fe8799b66cf4bc996e3565 +extcon f25379de41238ccf59f53202b38fdcc0a2dbf2f5 +soundwire dfcff3f8a5f18a0cfa233522b5647c2e6035fcb5 +thunderbolt dfda204198848b47bdb98ab83b94dbb7c7692b55 +staging b41dae061bbd722b9d7fa828f35d22035b218e18 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 6311b6521bcc804e4d2fd45a5640562a7b8b5241 +slave-dma c5c6faaee6e0c374c7dfaf053aa23750f5a68e20 +cgroup 275278e1525a43d19ae50dbf20e597dd5ca3a5e3 +scsi 9a119be2bb130b5d1da8c8e4c48f8ae7e6db5b60 +scsi-mkp 16da6112047eb06d23fd8511acb19742d338920b +vhost 0d4a3f2abbef73b9e5bb5f12213c275565473588 +rpmsg 741dc0aa4122c5e1ec8c6b576503284281e29960 +gpio 367677d498390067a7b2769862185787077da412 +gpio-brgl b630cea7bee7c72382cbd106179ee4503838960a +gpio-intel 85af79659f455ddbdc5b6b6e2a888a430cb58948 +pinctrl cb0438e4436085d89706b5ccfce4d5da531253de +pinctrl-intel 55dac43747be98516a337285428806d177afaa3a +pinctrl-samsung 10971e2ab6eb86c490fea92eb67549a8f46f0ae9 +pwm 6cf9481b440da6d6d86bd8e4c99a8b553b9d1271 +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest ce54eab71e210f36eebe291e632ed85913c5617e +y2038 870e0167cd9cff1246746bd163db90df60d1dd61 +livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9 +coresight c165d8947bc41ebd3b0de3f520490cffb627af90 +rtc b99a3120f9a30e1429d8d634e18da8dff93340c6 +nvdimm 5a852248b320f498589b86dd8fa1d6dff03821b7 +at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd +ntb 767202a1e247e8c7b4a065df9241eae5c1b843e1 +kspp 6f88ed285e67555e31e2601f0e8c5fb25501c366 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 0a43bffb7e21345444cd09302808b75cd8b6f9d5 +nvmem ad732da57bded90c99c3d9f9e63bfae1f9783e33 +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv d8bd2d442bb2688b428ac7164e5dc6d95d4fa65b +auxdisplay 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +kgdb-dt d8a050f5a3e8242242df6430d5980c142350e461 +pidfd 590ef0128b4277eaa9cb74d7ba878d48b261950c +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm 62974fc389b364d8af70e044836362222bd3ae53 +fpga e56476897448a0cc6f748535a199d2b68ad47d55 +akpm-current f7dcf869ad39f01af2b1ce5fa522ec1c859943e8 +akpm 793d439d9d5ec78c7ff7c3b03370124dfc13cadb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..987a964bbc8e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,314 @@ +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#master +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 +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/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/davem/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#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/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 +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.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 +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes no +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#master +drivers-x86-fixes git git://git.infradead.org/linux-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#pinctrl-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 +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 +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +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/afaerber/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-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-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 +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +renesas-geert 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 +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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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 +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-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/mason/linux-btrfs.git#next +btrfs-kdave 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 +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 +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.infradead.org/ubifs-2.6.git#linux-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 +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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +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/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/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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 git://people.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 +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tpmdd git git://git.infradead.org/users/jjs/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 +vfio git git://github.com/awilliam/linux-vfio.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#clockevents/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#linux-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.infradead.org/linux-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/j.anaszewski/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#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/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 +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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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://github.com/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-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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +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 +siox git https://git.pengutronix.de/git/ukl/linux#siox/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/linux-dax.git#xarray +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-dt 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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.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 +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..c9be427d46f8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7821 @@ +$ date -R +Fri, 20 Sep 2019 11:10:43 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux +Merging origin/master (574cc45397625 Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm) +$ git merge origin/master +Updating b41dae061bbd7..574cc45397625 +Fast-forward + Documentation/DMA-API.txt | 19 +- + Documentation/devicetree/bindings/arm/actions.txt | 56 - + Documentation/devicetree/bindings/arm/actions.yaml | 38 + + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 - + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 52 + + Documentation/devicetree/bindings/arm/arm-boards | 2 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/arm/idle-states.txt | 32 +- + .../arm/marvell/cp110-system-controller.txt | 4 +- + Documentation/devicetree/bindings/arm/realtek.txt | 22 - + Documentation/devicetree/bindings/arm/realtek.yaml | 23 + + .../devicetree/bindings/ata/ahci-platform.txt | 2 +- + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 85 + + .../devicetree/bindings/bus/qcom,ebi2.txt | 2 +- + .../devicetree/bindings/bus/sun50i-de2-bus.txt | 40 - + .../crypto/allwinner,sun4i-a10-crypto.yaml | 79 + + .../devicetree/bindings/crypto/sun4i-ss.txt | 23 - + .../bindings/display/amlogic,meson-dw-hdmi.txt | 119 - + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 150 + + .../bindings/display/amlogic,meson-vpu.txt | 121 - + .../bindings/display/amlogic,meson-vpu.yaml | 137 + + .../devicetree/bindings/display/arm,pl11x.txt | 9 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 5 +- + .../bindings/display/connector/hdmi-connector.txt | 1 + + .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 - + .../display/panel/ampire,am-480272h3tmqw-t01h.yaml | 42 + + .../display/panel/arm,versatile-tft-panel.txt | 2 +- + .../display/panel/armadeus,st0700-adapt.txt | 9 - + .../display/panel/armadeus,st0700-adapt.yaml | 33 + + .../display/panel/bananapi,s070wv20-ct16.txt | 12 - + .../display/panel/bananapi,s070wv20-ct16.yaml | 31 + + .../bindings/display/panel/boe,himax8279d.txt | 24 + + .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 - + .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 31 + + .../bindings/display/panel/edt,et-series.txt | 2 +- + .../bindings/display/panel/giantplus,gpm940b0.txt | 12 + + .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 - + .../display/panel/innolux,ee101ia-01d.yaml | 31 + + .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 + + .../devicetree/bindings/display/panel/lvds.yaml | 107 + + .../display/panel/mitsubishi,aa104xd12.txt | 47 - + .../display/panel/mitsubishi,aa104xd12.yaml | 75 + + .../display/panel/mitsubishi,aa121td01.txt | 47 - + .../display/panel/mitsubishi,aa121td01.yaml | 74 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 62 + + .../display/panel/ortustech,com37h3m05dtc.txt | 12 + + .../display/panel/ortustech,com37h3m99dtc.txt | 12 + + .../bindings/display/panel/panel-common.txt | 101 - + .../bindings/display/panel/panel-common.yaml | 149 + + .../bindings/display/panel/panel-lvds.txt | 121 - + .../devicetree/bindings/display/panel/panel.txt | 4 - + .../bindings/display/panel/pda,91-00156-a0.txt | 14 - + .../bindings/display/panel/pda,91-00156-a0.yaml | 31 + + .../panel/raspberrypi,7inch-touchscreen.txt | 49 - + .../panel/raspberrypi,7inch-touchscreen.yaml | 71 + + .../bindings/display/panel/raydium,rm67191.txt | 41 + + .../display/panel/rocktech,jh057n00900.txt | 5 + + .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 - + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 68 + + .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 + + .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 + + .../bindings/display/panel/sharp,ls020b1dd01d.txt | 12 + + .../bindings/display/panel/simple-panel.txt | 29 +- + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 - + .../display/panel/tfc,s9700rtwv43tr-01b.yaml | 33 + + .../bindings/display/panel/ti,nspire.yaml | 36 + + .../bindings/display/panel/tpo,tpg110.txt | 70 - + .../bindings/display/panel/tpo,tpg110.yaml | 101 + + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 23 +- + .../bindings/display/rockchip/rockchip-lvds.txt | 11 - + .../devicetree/bindings/display/ssd1307fb.txt | 10 + + .../devicetree/bindings/example-schema.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.txt | 92 - + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 116 + + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 119 - + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 168 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 124 - + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 168 + + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 95 + + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 65 - + .../bindings/input/touchscreen/ads7846.txt | 29 +- + .../bindings/input/touchscreen/bu21013.txt | 27 +- + .../allwinner,sun4i-a10-ic.yaml | 47 + + .../interrupt-controller/allwinner,sun4i-ic.txt | 20 - + .../allwinner,sun7i-a20-sc-nmi.yaml | 70 + + .../interrupt-controller/allwinner,sunxi-nmi.txt | 29 - + .../bindings/interrupt-controller/interrupts.txt | 8 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 52 + + .../devicetree/bindings/mailbox/meson-mhu.txt | 34 - + .../devicetree/bindings/mailbox/mtk-gce.txt | 23 +- + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 3 + + .../devicetree/bindings/media/i2c/nokia,smia.txt | 10 +- + .../devicetree/bindings/mfd/aspeed-scu.txt | 2 - + .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 2 - + Documentation/devicetree/bindings/pci/pci-msi.txt | 2 +- + .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 63 + + .../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 57 + + .../bindings/phy/meson-g12a-usb2-phy.txt | 22 - + .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 - + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 45 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 49 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 115 + + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 1 + + .../bindings/pinctrl/ingenic,pinctrl.txt | 17 +- + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 2 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 5 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 6 + + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 186 + + .../bindings/reset/amlogic,meson-reset.txt | 19 - + .../bindings/reset/amlogic,meson-reset.yaml | 37 + + .../bindings/reset/hisilicon,hi6220-reset.txt | 1 + + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 21 - + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 37 + + Documentation/devicetree/bindings/rng/mtk-rng.txt | 1 + + .../bindings/serial/amlogic,meson-uart.txt | 38 - + .../bindings/serial/amlogic,meson-uart.yaml | 73 + + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 67 + + .../bindings/spi/amlogic,meson6-spifc.yaml | 53 + + .../devicetree/bindings/spi/spi-meson.txt | 55 - + .../devicetree/bindings/vendor-prefixes.yaml | 7 + + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 37 + + .../bindings/watchdog/meson-gxbb-wdt.txt | 16 - + Documentation/devicetree/writing-schema.rst | 1 + + Documentation/driver-api/pinctl.rst | 6 +- + Documentation/filesystems/cifs/cifsroot.txt | 97 + + Documentation/gpu/drivers.rst | 1 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/drm-mm.rst | 40 +- + Documentation/gpu/i915.rst | 23 +- + Documentation/gpu/introduction.rst | 16 + + Documentation/gpu/tinydrm.rst | 30 - + Documentation/gpu/todo.rst | 81 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 107 + + Documentation/x86/x86_64/boot-options.rst | 2 +- + MAINTAINERS | 74 +- + Makefile | 6 +- + arch/Kconfig | 3 - + arch/alpha/kernel/pci_iommu.c | 2 + + arch/arc/mm/dma.c | 6 - + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/device.h | 3 - + arch/arm/include/asm/dma-mapping.h | 6 - + arch/arm/include/asm/pgtable-nommu.h | 1 - + arch/arm/include/asm/xen/page-coherent.h | 93 - + arch/arm/mm/dma-mapping-nommu.c | 5 +- + arch/arm/mm/dma-mapping.c | 84 +- + arch/arm/mm/mm.h | 3 - + arch/arm/xen/mm.c | 129 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/dma-mapping.h | 28 - + arch/arm64/include/asm/pgtable.h | 12 + + arch/arm64/include/asm/xen/page-coherent.h | 75 - + arch/arm64/mm/dma-mapping.c | 16 +- + arch/c6x/Kconfig | 1 - + arch/csky/mm/dma-mapping.c | 6 - + arch/ia64/hp/common/sba_iommu.c | 2 + + arch/ia64/kernel/setup.c | 2 +- + arch/m68k/Kconfig | 2 - + arch/m68k/include/asm/pgtable_mm.h | 3 + + arch/m68k/kernel/dma.c | 3 +- + arch/microblaze/Kconfig | 1 - + arch/mips/Kconfig | 9 +- + arch/mips/jazz/jazzdma.c | 2 + + arch/mips/mm/dma-noncoherent.c | 8 - + arch/nds32/kernel/dma.c | 6 - + arch/parisc/Kconfig | 1 - + arch/powerpc/kernel/dma-iommu.c | 2 + + arch/powerpc/platforms/ps3/system-bus.c | 11 +- + arch/powerpc/platforms/pseries/vio.c | 2 + + arch/s390/pci/pci_dma.c | 2 + + arch/sh/Kconfig | 1 - + arch/unicore32/include/asm/pgtable.h | 2 - + arch/x86/include/asm/xen/page-coherent.h | 14 - + arch/x86/kernel/amd_gart_64.c | 3 + + arch/x86/kernel/early-quirks.c | 1 + + arch/x86/kernel/pci-calgary_64.c | 2 + + arch/x86/kernel/pci-swiotlb.c | 1 - + arch/x86/kernel/setup.c | 2 +- + arch/x86/pci/sta2x11-fixup.c | 4 +- + arch/x86/xen/mmu_pv.c | 2 - + arch/xtensa/Kconfig | 1 - + arch/xtensa/kernel/pci-dma.c | 4 +- + block/blk-settings.c | 23 + + drivers/base/devtmpfs.c | 38 +- + drivers/char/ipmi/ipmi_dmi.c | 1 - + drivers/char/ipmi/ipmi_dmi.h | 1 + + drivers/char/ipmi/ipmi_msghandler.c | 121 +- + drivers/char/ipmi/ipmi_si.h | 57 +- + drivers/char/ipmi/ipmi_si_intf.c | 98 +- + drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- + drivers/char/ipmi/ipmi_si_pci.c | 2 +- + drivers/char/ipmi/ipmi_si_platform.c | 2 +- + drivers/char/ipmi/ipmi_si_port_io.c | 2 +- + drivers/char/ipmi/ipmi_si_sm.h | 54 +- + drivers/char/ipmi/ipmi_ssif.c | 79 +- + drivers/dma-buf/Kconfig | 5 + + drivers/dma-buf/Makefile | 8 +- + drivers/dma-buf/dma-buf.c | 28 +- + drivers/dma-buf/dma-fence-array.c | 32 +- + drivers/dma-buf/dma-fence-chain.c | 24 +- + drivers/dma-buf/dma-fence.c | 55 +- + drivers/dma-buf/{reservation.c => dma-resv.c} | 251 +- + drivers/dma-buf/selftest.c | 167 + + drivers/dma-buf/selftest.h | 30 + + drivers/dma-buf/selftests.h | 13 + + drivers/dma-buf/st-dma-fence.c | 574 + + drivers/dma-buf/sw_sync.c | 16 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 3 +- + drivers/gpio/gpiolib.c | 3 +- + drivers/gpu/drm/Kconfig | 6 +- + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 323 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 181 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 172 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 31 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 137 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 120 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 218 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 313 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 493 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 90 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 82 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 210 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 45 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 114 +- + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 59 + + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 103 + + drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 202 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 210 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1327 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 122 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 401 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 132 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 642 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 36 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 15 - + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 14 +- + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 53 + + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 21 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 127 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 11 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 565 + + .../intel_guc_fw.h => amd/amdgpu/psp_v12_0.h} | 25 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 678 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 60 +- + drivers/gpu/drm/amd/amdgpu/si.c | 13 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 724 + + .../intel_guc_ads.h => amd/amdgpu/smu_v11_0_i2c.h} | 28 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 252 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 255 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 51 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 116 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 275 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 38 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1414 + + .../amdgpu/vcn_v2_5.h} | 26 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 31 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 4 + + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 6 + + drivers/gpu/drm/amd/amdgpu/vi.c | 7 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1455 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1992 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 395 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 547 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 44 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 4 +- + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 242 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 231 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 67 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 24 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 51 +- + drivers/gpu/drm/amd/display/dc/Makefile | 3 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 3 +- + .../amd/display/dc/bios/command_table_helper2.c | 5 + + .../dc/bios/dce110/command_table_helper_dce110.c | 36 +- + .../dc/bios/dce112/command_table_helper2_dce112.c | 36 +- + .../dc/bios/dce112/command_table_helper_dce112.c | 36 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 35 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 12 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 9 + + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 17 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 170 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 590 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 39 + + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 200 + + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 40 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 175 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 249 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 689 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 204 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 305 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 27 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 57 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 24 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 61 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 21 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 34 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 36 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 17 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 168 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 61 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 6 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 113 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 10 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 6 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 14 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 81 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 72 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 53 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 416 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 72 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 14 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 59 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 22 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 31 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 26 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 21 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 130 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 99 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 26 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 772 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 105 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 727 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 16 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 40 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 95 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 7 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 861 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 39 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 10 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 595 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 132 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 244 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h | 133 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1680 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.h | 45 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 47 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 15 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 5136 ++ + .../display/dc/dml/dcn20/display_mode_vba_20v2.h | 32 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 + + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 6123 ++ + .../amd/display/dc/dml/dcn21/display_mode_vba_21.h | 32 + + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 1823 + + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h | 73 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 22 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 31 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 4 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 21 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 18 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 71 +- + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 388 - + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 9 +- + .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 18 +- + .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 14 +- + .../amd/display/dc/gpio/dce80/hw_factory_dce80.c | 14 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 52 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 51 +- + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +- + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 210 + + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 33 + + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 386 + + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 35 + + .../display/dc/gpio/diagnostics/hw_factory_diag.c | 10 +- + drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 74 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 117 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 26 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h | 5 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 8 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 51 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 138 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 50 + + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 31 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h | 5 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 8 + + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 19 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 132 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 13 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 - + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 20 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 51 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 28 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 374 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 34 + + .../display/dc/virtual/virtual_stream_encoder.c | 5 + + drivers/gpu/drm/amd/display/include/audio_types.h | 4 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 15 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../drm/amd/display/include/ddc_service_types.h | 10 +- + .../gpu/drm/amd/display/include/gpio_interface.h | 9 + + .../amd/display/include/gpio_service_interface.h | 18 +- + .../drm/amd/display/include/link_service_types.h | 17 +- + .../gpu/drm/amd/display/include/logger_interface.h | 2 + + drivers/gpu/drm/amd/display/include/logger_types.h | 7 + + .../drm/amd/display/modules/color/color_gamma.c | 367 +- + .../drm/amd/display/modules/color/color_gamma.h | 10 + + .../drm/amd/display/modules/freesync/freesync.c | 303 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 + + .../drm/amd/display/modules/inc/mod_info_packet.h | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 69 + + .../drm/amd/display/modules/power/power_helpers.c | 121 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/arct_ip_offset.h | 1650 + + .../amd/include/asic_reg/clk/clk_10_0_2_offset.h | 56 + + .../amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h | 73 + + .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 13862 +++++ + .../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h | 56638 +++++++++++++++++++ + .../amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h | 565 + + .../amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h | 3430 ++ + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 39 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 2 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 157 + + .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 21 + + .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 222 + + .../include/asic_reg/mmhub/mmhub_9_4_1_default.h | 3933 ++ + .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 7753 +++ + .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 44884 +++++++++++++++ + .../drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h | 336 + + .../amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h | 866 + + .../amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h | 30 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 6 + + .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 + + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h | 27 + + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h | 32 + + .../include/asic_reg/sdma0/sdma0_4_2_2_offset.h | 1051 + + .../include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h | 3002 + + .../include/asic_reg/sdma1/sdma1_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma2/sdma2_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma3/sdma3_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma4/sdma4_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma5/sdma5_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma6/sdma6_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/sdma7/sdma7_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h | 2956 + + .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 + + .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 231 + + .../amd/include/asic_reg/umc/umc_6_1_1_offset.h | 31 + + .../amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h | 91 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 979 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 3609 ++ + drivers/gpu/drm/amd/include/atomfirmware.h | 86 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + + drivers/gpu/drm/amd/include/navi12_ip_offset.h | 1119 + + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 1119 + + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 1364 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 11 +- + drivers/gpu/drm/amd/include/v9_structs.h | 8 +- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 51 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 375 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1938 + + drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 72 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 7 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 28 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 26 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 48 + + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 240 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 11 + + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 2 +- + .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 4 +- + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 891 + + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 29 +- + .../gpu/drm/amd/powerplay/inc/smu12_driver_if.h | 217 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 263 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 27 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 42 + + .../gpu/drm/amd/powerplay/inc/smu_v12_0_ppsmc.h | 106 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 346 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 195 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 28 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 323 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 412 + + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 4 + + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 5 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 10 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 2 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 259 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 5 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 42 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 89 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 4 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 19 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 6 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 13 +- + drivers/gpu/drm/arm/malidp_crtc.c | 11 +- + drivers/gpu/drm/arm/malidp_drv.c | 13 +- + drivers/gpu/drm/arm/malidp_drv.h | 7 +- + drivers/gpu/drm/arm/malidp_hw.c | 10 +- + drivers/gpu/drm/arm/malidp_mw.c | 5 +- + drivers/gpu/drm/arm/malidp_planes.c | 4 +- + drivers/gpu/drm/armada/armada_crtc.c | 10 +- + drivers/gpu/drm/armada/armada_debugfs.c | 8 +- + drivers/gpu/drm/armada/armada_drm.h | 5 +- + drivers/gpu/drm/armada/armada_drv.c | 11 +- + drivers/gpu/drm/armada/armada_fb.c | 3 + + drivers/gpu/drm/armada/armada_fbdev.c | 3 + + drivers/gpu/drm/armada/armada_gem.c | 12 +- + drivers/gpu/drm/armada/armada_gem.h | 3 +- + drivers/gpu/drm/armada/armada_overlay.c | 8 +- + drivers/gpu/drm/armada/armada_plane.c | 4 +- + drivers/gpu/drm/armada/armada_trace.h | 5 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/Makefile | 2 +- + drivers/gpu/drm/ast/ast_dp501.c | 5 +- + drivers/gpu/drm/ast/ast_drv.c | 22 +- + drivers/gpu/drm/ast/ast_drv.h | 46 +- + drivers/gpu/drm/ast/ast_fb.c | 346 - + drivers/gpu/drm/ast/ast_main.c | 77 +- + drivers/gpu/drm/ast/ast_mode.c | 60 +- + drivers/gpu/drm/ast/ast_post.c | 7 +- + drivers/gpu/drm/ast/ast_ttm.c | 7 +- + drivers/gpu/drm/ati_pcigart.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 12 +- + drivers/gpu/drm/bochs/bochs.h | 6 +- + drivers/gpu/drm/bochs/bochs_drv.c | 17 +- + drivers/gpu/drm/bochs/bochs_hw.c | 4 + + drivers/gpu/drm/bochs/bochs_kms.c | 8 +- + drivers/gpu/drm/bridge/Kconfig | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 295 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 13 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 - + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/bridge/sii902x.c | 44 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 20 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 1 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 60 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 134 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 + + drivers/gpu/drm/bridge/tc358767.c | 683 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 46 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- + drivers/gpu/drm/cirrus/cirrus.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 45 +- + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_client.c | 1 - + drivers/gpu/drm/drm_connector.c | 109 +- + drivers/gpu/drm/drm_crtc_helper.c | 32 - + drivers/gpu/drm/drm_debugfs_crc.c | 15 +- + drivers/gpu/drm/drm_dma.c | 2 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 18 +- + drivers/gpu/drm/drm_dp_helper.c | 31 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 142 +- + drivers/gpu/drm/drm_drv.c | 18 +- + drivers/gpu/drm/drm_file.c | 9 +- + drivers/gpu/drm/drm_gem.c | 37 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 74 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 71 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 94 +- + drivers/gpu/drm/drm_hdcp.c | 77 +- + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 139 +- + drivers/gpu/drm/drm_kms_helper_common.c | 2 +- + drivers/gpu/drm/drm_legacy_misc.c | 2 +- + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/drm_memory.c | 2 +- + .../gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} | 499 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 4 + + drivers/gpu/drm/drm_modes.c | 17 +- + drivers/gpu/drm/drm_panel.c | 102 +- + drivers/gpu/drm/drm_prime.c | 868 +- + drivers/gpu/drm/drm_scatter.c | 2 +- + drivers/gpu/drm/drm_syncobj.c | 109 +- + drivers/gpu/drm/drm_sysfs.c | 43 + + drivers/gpu/drm/drm_vblank.c | 25 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 93 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 58 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 96 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 27 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 65 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.h | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 78 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 59 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 158 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 167 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 20 - + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 284 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 326 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 114 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 48 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 29 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 11 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 29 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +- + drivers/gpu/drm/hisilicon/kirin/Makefile | 3 +- + drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 359 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 258 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 - + drivers/gpu/drm/i2c/sil164_drv.c | 3 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i810/i810_dma.c | 17 +- + drivers/gpu/drm/i810/i810_drv.c | 8 +- + drivers/gpu/drm/i810/i810_drv.h | 2 + + drivers/gpu/drm/i915/Kconfig.debug | 16 + + drivers/gpu/drm/i915/Makefile | 93 +- + drivers/gpu/drm/i915/Makefile.header-test | 22 - + drivers/gpu/drm/i915/display/Makefile | 6 +- + drivers/gpu/drm/i915/display/Makefile.header-test | 16 - + drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +- + drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 244 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 59 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 83 +- + drivers/gpu/drm/i915/display/intel_bios.c | 25 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 18 +- + drivers/gpu/drm/i915/display/intel_bw.h | 15 - + drivers/gpu/drm/i915/display/intel_cdclk.c | 106 +- + drivers/gpu/drm/i915/display/intel_color.c | 2 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 195 +- + drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 17 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 465 +- + drivers/gpu/drm/i915/display/intel_display.c | 1365 +- + drivers/gpu/drm/i915/display/intel_display.h | 239 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 779 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 73 +- + .../{intel_drv.h => display/intel_display_types.h} | 189 +- + drivers/gpu/drm/i915/display/intel_dp.c | 394 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 7 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 1 + + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 698 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 15 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 51 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 3 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 257 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 70 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 19 +- + drivers/gpu/drm/i915/display/intel_gmbus.h | 22 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 101 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 118 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 67 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 149 +- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 4 +- + drivers/gpu/drm/i915/display/intel_psr.c | 8 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 316 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 344 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 8 +- + drivers/gpu/drm/i915/display/intel_tc.c | 544 + + drivers/gpu/drm/i915/display/intel_tc.h | 30 + + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 6 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 16 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 88 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 16 +- + drivers/gpu/drm/i915/gem/Makefile | 6 +- + drivers/gpu/drm/i915/gem/Makefile.header-test | 16 - + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 127 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 60 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 231 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 8 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 49 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 343 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 159 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 376 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 8 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 101 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 31 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 35 + + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 24 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 31 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 187 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 42 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 13 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 274 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 66 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 141 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 141 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 16 + + drivers/gpu/drm/i915/gt/Makefile | 5 +- + drivers/gpu/drm/i915/gt/Makefile.header-test | 16 - + .../gen6_renderstate.c} | 0 + .../gen7_renderstate.c} | 0 + .../gen8_renderstate.c} | 0 + .../gen9_renderstate.c} | 0 + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 49 +- + drivers/gpu/drm/i915/gt/intel_context.c | 180 +- + drivers/gpu/drm/i915/gt/intel_context.h | 35 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 15 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 90 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 430 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 87 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 20 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.c | 177 + + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 34 + + drivers/gpu/drm/i915/gt/intel_engine_pool_types.h | 29 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 129 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 303 + + drivers/gpu/drm/i915/gt/intel_engine_user.h | 25 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 18 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 268 + + drivers/gpu/drm/i915/gt/intel_gt.h | 60 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 455 + + drivers/gpu/drm/i915/gt/intel_gt_irq.h | 44 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 84 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 41 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 109 + + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h | 22 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 102 + + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 71 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 1377 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 1 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 218 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 7 +- + .../intel_renderstate.c} | 17 +- + drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 633 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 75 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 50 + + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 339 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- + .../i915/{i915_timeline.c => gt/intel_timeline.c} | 304 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 94 + + .../intel_timeline_types.h} | 28 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 253 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 104 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 456 + + drivers/gpu/drm/i915/gt/selftest_engine.c | 28 + + drivers/gpu/drm/i915/gt/selftest_engine.h | 14 + + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 26 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 83 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 528 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 522 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 133 +- + .../i915_timeline.c => gt/selftest_timeline.c} | 135 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 186 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.c | 10 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.h | 6 +- + drivers/gpu/drm/i915/gt/uc/Makefile | 5 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c | 320 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 76 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c | 52 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 15 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c | 44 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h | 33 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 166 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 14 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 104 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 78 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h | 24 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h | 62 +- + .../drm/i915/{ => gt/uc}/intel_guc_submission.c | 590 +- + .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 28 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 112 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 54 + + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 58 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 627 + + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 67 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 616 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 241 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 82 + + .../intel_guc.c => gt/uc/selftest_guc.c} | 70 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 10 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 180 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 47 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.h | 13 +- + drivers/gpu/drm/i915/gvt/gvt.c | 4 +- + drivers/gpu/drm/i915/gvt/gvt.h | 8 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 15 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 57 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 83 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_active.c | 640 +- + drivers/gpu/drm/i915/i915_active.h | 61 +- + drivers/gpu/drm/i915/i915_active_types.h | 30 +- + drivers/gpu/drm/i915/i915_buddy.c | 428 + + drivers/gpu/drm/i915/i915_buddy.h | 128 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 493 +- + drivers/gpu/drm/i915/i915_drv.c | 919 +- + drivers/gpu/drm/i915/i915_drv.h | 766 +- + drivers/gpu/drm/i915/i915_fixed.h | 5 + + drivers/gpu/drm/i915/i915_gem.c | 586 +- + drivers/gpu/drm/i915/i915_gem.h | 2 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 140 - + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 26 - + drivers/gpu/drm/i915/i915_gem_evict.c | 9 - + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 140 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 5 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2180 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 206 +- + drivers/gpu/drm/i915/i915_getparam.c | 168 + + drivers/gpu/drm/i915/i915_globals.c | 1 + + drivers/gpu/drm/i915/i915_globals.h | 3 + + drivers/gpu/drm/i915/i915_gpu_error.c | 824 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 78 +- + drivers/gpu/drm/i915/i915_irq.c | 1598 +- + drivers/gpu/drm/i915/i915_irq.h | 110 +- + drivers/gpu/drm/i915/i915_memcpy.c | 2 +- + drivers/gpu/drm/i915/i915_memcpy.h | 32 + + drivers/gpu/drm/i915/i915_mm.c | 5 +- + drivers/gpu/drm/i915/i915_oa_bdw.h | 15 - + drivers/gpu/drm/i915/i915_oa_bxt.h | 15 - + drivers/gpu/drm/i915/i915_oa_cflgt2.h | 15 - + drivers/gpu/drm/i915/i915_oa_cflgt3.h | 15 - + drivers/gpu/drm/i915/i915_oa_chv.h | 15 - + drivers/gpu/drm/i915/i915_oa_cnl.h | 15 - + drivers/gpu/drm/i915/i915_oa_glk.h | 15 - + drivers/gpu/drm/i915/i915_oa_hsw.h | 15 - + drivers/gpu/drm/i915/i915_oa_icl.h | 15 - + drivers/gpu/drm/i915/i915_oa_kblgt2.h | 15 - + drivers/gpu/drm/i915/i915_oa_kblgt3.h | 15 - + drivers/gpu/drm/i915/i915_oa_sklgt2.h | 15 - + drivers/gpu/drm/i915/i915_oa_sklgt3.h | 15 - + drivers/gpu/drm/i915/i915_oa_sklgt4.h | 15 - + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 65 +- + drivers/gpu/drm/i915/i915_perf.c | 836 +- + drivers/gpu/drm/i915/i915_perf.h | 32 + + drivers/gpu/drm/i915/i915_pmu.c | 298 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 15 +- + drivers/gpu/drm/i915/i915_pvinfo.h | 7 +- + drivers/gpu/drm/i915/i915_query.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 356 +- + drivers/gpu/drm/i915/i915_request.c | 381 +- + drivers/gpu/drm/i915/i915_request.h | 29 +- + drivers/gpu/drm/i915/i915_scheduler.c | 7 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 29 +- + drivers/gpu/drm/i915/i915_suspend.c | 3 +- + drivers/gpu/drm/i915/i915_suspend.h | 14 + + drivers/gpu/drm/i915/i915_sw_fence.c | 31 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 11 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 95 + + drivers/gpu/drm/i915/i915_sw_fence_work.h | 44 + + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.h | 14 + + drivers/gpu/drm/i915/i915_timeline.h | 94 - + drivers/gpu/drm/i915/i915_trace.h | 24 +- + drivers/gpu/drm/i915/i915_utils.c | 78 + + drivers/gpu/drm/i915/i915_utils.h | 51 + + drivers/gpu/drm/i915/i915_vgpu.c | 65 +- + drivers/gpu/drm/i915/i915_vgpu.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 145 +- + drivers/gpu/drm/i915/i915_vma.h | 29 +- + drivers/gpu/drm/i915/intel_csr.c | 7 + + drivers/gpu/drm/i915/intel_device_info.c | 45 +- + drivers/gpu/drm/i915/intel_device_info.h | 6 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 308 - + drivers/gpu/drm/i915/intel_gvt.c | 7 +- + drivers/gpu/drm/i915/intel_gvt.h | 7 +- + drivers/gpu/drm/i915/intel_huc.h | 65 - + drivers/gpu/drm/i915/intel_huc_fw.c | 215 - + drivers/gpu/drm/i915/intel_pch.c | 201 + + drivers/gpu/drm/i915/intel_pch.h | 73 + + drivers/gpu/drm/i915/intel_pm.c | 460 +- + drivers/gpu/drm/i915/intel_pm.h | 4 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uc.c | 561 - + drivers/gpu/drm/i915/intel_uc.h | 64 - + drivers/gpu/drm/i915/intel_uc_fw.c | 357 - + drivers/gpu/drm/i915/intel_uc_fw.h | 155 - + drivers/gpu/drm/i915/intel_uncore.c | 558 +- + drivers/gpu/drm/i915/intel_uncore.h | 54 +- + drivers/gpu/drm/i915/intel_wakeref.c | 89 +- + drivers/gpu/drm/i915/intel_wakeref.h | 84 +- + drivers/gpu/drm/i915/intel_wopcm.c | 268 +- + drivers/gpu/drm/i915/intel_wopcm.h | 18 +- + drivers/gpu/drm/i915/oa/Makefile | 7 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_bdw.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_chv.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_glk.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_icl.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 16 + + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 16 + + drivers/gpu/drm/i915/selftests/i915_active.c | 127 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 720 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 22 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 6 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 3 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 89 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 67 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 10 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 38 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 10 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 34 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 9 +- + drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 - + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 1 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 19 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 + + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 4 +- + drivers/gpu/drm/i915/selftests/mock_uncore.c | 4 +- + drivers/gpu/drm/imx/Makefile | 1 - + drivers/gpu/drm/imx/dw_hdmi-imx.c | 16 +- + drivers/gpu/drm/imx/imx-drm-core.c | 13 +- + drivers/gpu/drm/imx/imx-ldb.c | 40 +- + drivers/gpu/drm/imx/imx-tve.c | 16 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 8 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 5 +- + drivers/gpu/drm/imx/parallel-display.c | 19 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 75 +- + drivers/gpu/drm/lima/lima_device.c | 41 +- + drivers/gpu/drm/lima/lima_drv.c | 20 +- + drivers/gpu/drm/lima/lima_gem.c | 10 +- + drivers/gpu/drm/lima/lima_gem_prime.c | 3 +- + drivers/gpu/drm/lima/lima_object.c | 9 +- + drivers/gpu/drm/lima/lima_object.h | 3 +- + drivers/gpu/drm/lima/lima_vm.h | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 10 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 70 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 18 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 34 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 35 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- + drivers/gpu/drm/meson/meson_crtc.c | 35 +- + drivers/gpu/drm/meson/meson_drv.c | 73 +- + drivers/gpu/drm/meson/meson_drv.h | 24 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +- + drivers/gpu/drm/meson/meson_dw_hdmi.h | 12 +- + drivers/gpu/drm/meson/meson_overlay.c | 15 +- + drivers/gpu/drm/meson/meson_plane.c | 28 +- + drivers/gpu/drm/meson/meson_registers.h | 138 +- + drivers/gpu/drm/meson/meson_vclk.c | 78 +- + drivers/gpu/drm/meson/meson_vclk.h | 4 + + drivers/gpu/drm/meson/meson_venc.c | 181 +- + drivers/gpu/drm/meson/meson_venc.h | 2 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 24 +- + drivers/gpu/drm/meson/meson_viu.c | 99 +- + drivers/gpu/drm/meson/meson_vpp.c | 42 +- + drivers/gpu/drm/meson/meson_vpp.h | 3 + + drivers/gpu/drm/mga/mga_dma.c | 13 +- + drivers/gpu/drm/mga/mga_drv.c | 7 +- + drivers/gpu/drm/mga/mga_drv.h | 27 +- + drivers/gpu/drm/mga/mga_ioc32.c | 3 +- + drivers/gpu/drm/mga/mga_irq.c | 12 +- + drivers/gpu/drm/mga/mga_state.c | 8 +- + drivers/gpu/drm/mga/mga_warp.c | 4 +- + drivers/gpu/drm/mgag200/Makefile | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 40 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 315 - + drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 96 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- + drivers/gpu/drm/msm/Kconfig | 2 +- + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 16 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 95 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 75 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 11 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 44 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 - + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h | 9 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 112 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 10 + + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 31 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 11 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 51 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 + + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 132 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 60 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + + drivers/gpu/drm/msm/disp/mdp_format.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 18 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 12 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 66 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 + + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 + + drivers/gpu/drm/msm/msm_atomic.c | 236 +- + drivers/gpu/drm/msm/msm_atomic_trace.h | 110 + + drivers/gpu/drm/msm/msm_atomic_tracepoints.c | 3 + + drivers/gpu/drm/msm/msm_debugfs.c | 5 + + drivers/gpu/drm/msm/msm_drv.c | 76 +- + drivers/gpu/drm/msm/msm_drv.h | 6 +- + drivers/gpu/drm/msm/msm_fb.c | 2 + + drivers/gpu/drm/msm/msm_fbdev.c | 4 + + drivers/gpu/drm/msm/msm_gem.c | 32 +- + drivers/gpu/drm/msm/msm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 6 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 10 +- + drivers/gpu/drm/msm/msm_gpu.c | 5 +- + drivers/gpu/drm/msm/msm_gpu_trace.h | 2 +- + drivers/gpu/drm/msm/msm_gpummu.c | 2 + + drivers/gpu/drm/msm/msm_kms.h | 108 +- + drivers/gpu/drm/msm/msm_perf.c | 3 + + drivers/gpu/drm/msm/msm_rd.c | 7 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 2 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 18 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 2 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 54 +- + drivers/gpu/drm/nouveau/dispnv04/cursor.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/dac.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 1 - + drivers/gpu/drm/nouveau/dispnv04/hw.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/hw.h | 1 - + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 1 - + drivers/gpu/drm/nouveau/dispnv50/atom.h | 14 + + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 26 +- + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 11 +- + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 65 + + drivers/gpu/drm/nouveau/dispnv50/base917c.c | 2 + + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 46 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 3 +- + drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 3 - + drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 13 +- + drivers/gpu/drm/nouveau/dispnv50/ovly917e.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 111 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 10 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 61 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 72 +- + .../drm/nouveau/include/nvkm/subdev/bios/extdev.h | 2 + + .../drm/nouveau/include/nvkm/subdev/bios/gpio.h | 5 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 - + drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 98 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 11 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 2 + + drivers/gpu/drm/nouveau/nouveau_debugfs.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 4 + + drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 1 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 51 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 2 - + drivers/gpu/drm/nouveau/nouveau_ioc32.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 1 - + drivers/gpu/drm/nouveau/nvif/mmu.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 188 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 6 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 26 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 27 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c | 13 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 32 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 18 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c | 3 + + drivers/gpu/drm/omapdrm/displays/Kconfig | 38 - + drivers/gpu/drm/omapdrm/displays/Makefile | 6 - + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 251 - + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 271 - + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 262 - + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 755 - + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 390 - + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 513 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 11 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 7 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 22 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 + + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 2 + + drivers/gpu/drm/omapdrm/omap_plane.c | 9 +- + drivers/gpu/drm/panel/Kconfig | 64 + + drivers/gpu/drm/panel/Makefile | 8 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 34 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 237 + + drivers/gpu/drm/panel/panel-lvds.c | 5 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 248 + + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 359 + + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 + + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 668 + + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 75 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 226 + + drivers/gpu/drm/panel/panel-simple.c | 407 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 701 + + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 399 + + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 509 + + drivers/gpu/drm/panfrost/Makefile | 1 + + drivers/gpu/drm/panfrost/TODO | 15 - + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 22 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 + + drivers/gpu/drm/panfrost/panfrost_device.c | 28 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 31 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 196 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 142 +- + drivers/gpu/drm/panfrost/panfrost_gem.h | 23 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 110 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 62 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 442 +- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 9 +- + drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +- + drivers/gpu/drm/pl111/pl111_display.c | 52 +- + drivers/gpu/drm/pl111/pl111_drm.h | 11 +- + drivers/gpu/drm/pl111/pl111_drv.c | 13 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 3 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 9 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 3 + + drivers/gpu/drm/pl111/pl111_vexpress.c | 1 + + drivers/gpu/drm/qxl/qxl_cmd.c | 6 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 10 +- + drivers/gpu/drm/qxl/qxl_display.c | 11 +- + drivers/gpu/drm/qxl/qxl_draw.c | 2 + + drivers/gpu/drm/qxl/qxl_drv.c | 21 +- + drivers/gpu/drm/qxl/qxl_drv.h | 13 +- + drivers/gpu/drm/qxl/qxl_gem.c | 3 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 3 + + drivers/gpu/drm/qxl/qxl_irq.c | 4 + + drivers/gpu/drm/qxl/qxl_kms.c | 9 +- + drivers/gpu/drm/qxl/qxl_object.c | 20 +- + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_release.c | 14 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 20 +- + drivers/gpu/drm/r128/r128_ioc32.c | 3 +- + drivers/gpu/drm/r128/r128_irq.c | 5 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/cik_sdma.c | 2 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 2 +- + drivers/gpu/drm/radeon/r200.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/r600_dma.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 12 +- + drivers/gpu/drm/radeon/radeon_asic.h | 18 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 6 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 6 +- + drivers/gpu/drm/radeon/radeon_device.c | 21 +- + drivers/gpu/drm/radeon/radeon_display.c | 6 +- + drivers/gpu/drm/radeon/radeon_drv.c | 31 +- + drivers/gpu/drm/radeon/radeon_gem.c | 8 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 28 +- + drivers/gpu/drm/radeon/radeon_object.h | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 20 +- + drivers/gpu/drm/radeon/radeon_sync.c | 10 +- + drivers/gpu/drm/radeon/radeon_test.c | 8 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 6 +- + drivers/gpu/drm/radeon/rv770_dma.c | 2 +- + drivers/gpu/drm/radeon/si_dma.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 +- + drivers/gpu/drm/rockchip/Makefile | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 116 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 29 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 282 - + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 22 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 117 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 - + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/scheduler/sched_fence.c | 6 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 - + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_dvo.c | 8 +- + drivers/gpu/drm/sti/sti_hdmi.c | 9 +- + drivers/gpu/drm/sti/sti_tvout.c | 16 +- + drivers/gpu/drm/stm/drv.c | 5 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +- + drivers/gpu/drm/stm/ltdc.c | 2 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 24 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +- + drivers/gpu/drm/sun4i/sun8i_csc.c | 157 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 57 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +- + drivers/gpu/drm/tegra/dc.c | 13 +- + drivers/gpu/drm/tegra/dpaux.c | 5 +- + drivers/gpu/drm/tegra/drm.c | 38 +- + drivers/gpu/drm/tegra/drm.h | 3 +- + drivers/gpu/drm/tegra/dsi.c | 8 +- + drivers/gpu/drm/tegra/fb.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 10 +- + drivers/gpu/drm/tegra/gem.h | 4 +- + drivers/gpu/drm/tegra/gr2d.c | 1 + + drivers/gpu/drm/tegra/hdmi.c | 5 + + drivers/gpu/drm/tegra/hub.c | 3 +- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/plane.c | 1 + + drivers/gpu/drm/tegra/sor.c | 3 + + drivers/gpu/drm/tegra/vic.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 46 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 33 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 89 +- + drivers/gpu/drm/tilcdc/tilcdc_external.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 17 +- + drivers/gpu/drm/{tinydrm => tiny}/Kconfig | 64 +- + drivers/gpu/drm/{tinydrm => tiny}/Makefile | 6 +- + drivers/gpu/drm/tiny/gm12u320.c | 804 + + drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c | 64 +- + drivers/gpu/drm/{tinydrm => tiny}/ili9225.c | 185 +- + drivers/gpu/drm/{tinydrm => tiny}/ili9341.c | 86 +- + drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c | 93 +- + drivers/gpu/drm/{tinydrm => tiny}/repaper.c | 61 +- + drivers/gpu/drm/{tinydrm => tiny}/st7586.c | 134 +- + drivers/gpu/drm/{tinydrm => tiny}/st7735r.c | 81 +- + drivers/gpu/drm/tinydrm/core/Makefile | 4 - + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 207 - + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 179 - + drivers/gpu/drm/ttm/ttm_bo.c | 158 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 22 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 8 +- + drivers/gpu/drm/tve200/tve200_drm.h | 15 +- + drivers/gpu/drm/tve200/tve200_drv.c | 8 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_connector.h | 2 + + drivers/gpu/drm/udl/udl_dmabuf.c | 11 +- + drivers/gpu/drm/udl/udl_drv.c | 9 +- + drivers/gpu/drm/udl/udl_drv.h | 11 +- + drivers/gpu/drm/udl/udl_encoder.c | 6 +- + drivers/gpu/drm/udl/udl_fb.c | 15 +- + drivers/gpu/drm/udl/udl_gem.c | 9 +- + drivers/gpu/drm/udl/udl_main.c | 6 +- + drivers/gpu/drm/udl/udl_modeset.c | 6 +- + drivers/gpu/drm/udl/udl_transfer.c | 4 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.h | 13 +- + drivers/gpu/drm/v3d/v3d_gem.c | 16 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 + + drivers/gpu/drm/vboxvideo/Makefile | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 15 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 12 - + drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_prime.c | 56 - + drivers/gpu/drm/vc4/vc4_bo.c | 7 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 11 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - + drivers/gpu/drm/vc4/vc4_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.h | 20 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- + drivers/gpu/drm/vc4/vc4_gem.c | 8 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- + drivers/gpu/drm/vc4/vc4_kms.c | 4 +- + drivers/gpu/drm/vc4/vc4_plane.c | 9 +- + drivers/gpu/drm/vc4/vc4_txp.c | 14 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 4 + + drivers/gpu/drm/vgem/vgem_drv.c | 21 +- + drivers/gpu/drm/vgem/vgem_drv.h | 1 - + drivers/gpu/drm/vgem/vgem_fence.c | 40 +- + drivers/gpu/drm/via/via_dma.c | 43 +- + drivers/gpu/drm/via/via_dmablit.c | 41 +- + drivers/gpu/drm/via/via_drv.c | 7 +- + drivers/gpu/drm/via/via_drv.h | 75 +- + drivers/gpu/drm/via/via_irq.c | 54 +- + drivers/gpu/drm/via/via_map.c | 6 +- + drivers/gpu/drm/via/via_mm.c | 7 +- + drivers/gpu/drm/via/via_verifier.c | 22 +- + drivers/gpu/drm/via/via_video.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 30 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + .../gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} | 169 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 100 +- + drivers/gpu/drm/vkms/vkms_drv.c | 50 +- + drivers/gpu/drm/vkms/vkms_drv.h | 44 +- + drivers/gpu/drm/vkms/vkms_gem.c | 1 + + drivers/gpu/drm/vkms/vkms_output.c | 6 +- + drivers/gpu/drm/vkms/vkms_plane.c | 46 +- + drivers/gpu/drm/vmwgfx/ttm_lock.c | 100 - + drivers/gpu/drm/vmwgfx/ttm_lock.h | 32 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 200 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 135 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 41 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 62 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 3 +- + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front.h | 11 +- + drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 9 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 8 +- + drivers/gpu/drm/zte/zx_hdmi.c | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 4 +- + drivers/gpu/drm/zte/zx_vga.c | 4 +- + drivers/gpu/drm/zte/zx_vou.c | 5 +- + drivers/gpu/ipu-v3/ipu-common.c | 16 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 26 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 230 +- + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-google-hammer.c | 4 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 3 +- + drivers/iio/common/cros_ec_sensors/Kconfig | 2 +- + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 3 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +- + drivers/iio/light/cros_ec_light_prox.c | 3 +- + drivers/iio/pressure/cros_ec_baro.c | 3 +- + drivers/input/Makefile | 2 +- + drivers/input/evdev.c | 35 +- + drivers/input/input-poller.c | 213 + + drivers/input/input-poller.h | 18 + + drivers/input/input.c | 83 +- + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 5 +- + drivers/input/joystick/fsia6b.c | 231 + + drivers/input/joystick/sidewinder.c | 2 +- + drivers/input/keyboard/Kconfig | 13 +- + drivers/input/keyboard/Makefile | 1 - + drivers/input/keyboard/applespi.c | 30 +- + drivers/input/keyboard/bcm-keypad.c | 4 +- + drivers/input/keyboard/cros_ec_keyb.c | 10 +- + drivers/input/keyboard/davinci_keyscan.c | 1 - + drivers/input/keyboard/gpio_keys.c | 13 +- + drivers/input/keyboard/imx_keypad.c | 4 +- + drivers/input/keyboard/lpc32xx-keys.c | 4 +- + drivers/input/keyboard/mpr121_touchkey.c | 3 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 4 +- + drivers/input/keyboard/nspire-keypad.c | 4 +- + drivers/input/keyboard/opencores-kbd.c | 4 +- + drivers/input/keyboard/pmic8xxx-keypad.c | 8 +- + drivers/input/keyboard/pxa27x_keypad.c | 4 +- + drivers/input/keyboard/pxa930_rotary.c | 4 +- + drivers/input/keyboard/sh_keysc.c | 4 +- + drivers/input/keyboard/snvs_pwrkey.c | 4 +- + drivers/input/keyboard/spear-keyboard.c | 4 +- + drivers/input/keyboard/st-keyscan.c | 4 +- + drivers/input/keyboard/tegra-kbc.c | 4 +- + drivers/input/keyboard/w90p910_keypad.c | 264 - + drivers/input/matrix-keymap.c | 2 +- + drivers/input/misc/88pm80x_onkey.c | 1 - + drivers/input/misc/88pm860x_onkey.c | 4 +- + drivers/input/misc/Kconfig | 6 +- + drivers/input/misc/ab8500-ponkey.c | 8 +- + drivers/input/misc/axp20x-pek.c | 25 +- + drivers/input/misc/da9055_onkey.c | 5 +- + drivers/input/misc/da9063_onkey.c | 7 +- + drivers/input/misc/e3x0-button.c | 10 +- + drivers/input/misc/hisi_powerkey.c | 8 +- + drivers/input/misc/max8925_onkey.c | 8 +- + drivers/input/misc/pm8941-pwrkey.c | 4 +- + drivers/input/misc/rk805-pwrkey.c | 8 +- + drivers/input/misc/soc_button_array.c | 127 +- + drivers/input/misc/stpmic1_onkey.c | 10 +- + drivers/input/misc/tps65218-pwrbutton.c | 4 +- + drivers/input/misc/twl6040-vibra.c | 4 +- + drivers/input/mouse/alps.h | 11 - + drivers/input/mouse/byd.h | 11 - + drivers/input/mouse/cyapa.c | 16 +- + drivers/input/mouse/cypress_ps2.h | 11 - + drivers/input/mouse/elan_i2c_core.c | 20 +- + drivers/input/mouse/elantech.h | 18 +- + drivers/input/mouse/hgpk.h | 13 +- + drivers/input/mouse/lifebook.h | 13 +- + drivers/input/mouse/logips2pp.h | 7 - + drivers/input/mouse/pxa930_trkball.c | 4 +- + drivers/input/mouse/sentelic.h | 11 - + drivers/input/mouse/synaptics.c | 2 +- + drivers/input/mouse/touchkit_ps2.h | 8 - + drivers/input/mouse/trackpoint.h | 8 - + drivers/input/mouse/vmmouse.h | 11 - + drivers/input/rmi4/rmi_2d_sensor.c | 1 - + drivers/input/serio/arc_ps2.c | 4 +- + drivers/input/serio/i8042.c | 25 +- + drivers/input/serio/ps2-gpio.c | 2 - + drivers/input/touchscreen/88pm860x-ts.c | 4 +- + drivers/input/touchscreen/Kconfig | 9 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/ads7846.c | 38 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 3 +- + drivers/input/touchscreen/bcm_iproc_tsc.c | 4 +- + drivers/input/touchscreen/bu21013_ts.c | 740 +- + drivers/input/touchscreen/edt-ft5x06.c | 2 - + drivers/input/touchscreen/fsl-imx25-tcq.c | 8 +- + drivers/input/touchscreen/hideep.c | 3 +- + drivers/input/touchscreen/imx6ul_tsc.c | 8 +- + drivers/input/touchscreen/lpc32xx_ts.c | 4 +- + drivers/input/touchscreen/mxs-lradc-ts.c | 10 +- + drivers/input/touchscreen/sun4i-ts.c | 3 +- + drivers/input/touchscreen/ts4800-ts.c | 4 +- + drivers/input/touchscreen/w90p910_ts.c | 331 - + drivers/input/touchscreen/wacom_w8001.c | 4 +- + drivers/iommu/amd_iommu.c | 2 + + drivers/iommu/arm-smmu.c | 2 +- + drivers/iommu/dma-iommu.c | 29 +- + drivers/iommu/intel-iommu.c | 2 + + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/mailbox/armada-37xx-rwtm-mailbox.c | 14 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 18 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 16 +- + drivers/media/platform/Kconfig | 3 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 5 +- + drivers/mfd/Kconfig | 26 +- + drivers/mfd/Makefile | 4 +- + drivers/mfd/cros_ec_dev.c | 463 +- + drivers/mmc/core/queue.c | 41 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- + drivers/mtd/mtdsuper.c | 189 - + drivers/of/base.c | 58 +- + drivers/of/unittest.c | 4 +- + drivers/parisc/ccio-dma.c | 1 + + drivers/parisc/sba_iommu.c | 1 + + drivers/pinctrl/aspeed/Kconfig | 8 + + drivers/pinctrl/aspeed/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1825 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1869 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2395 + + drivers/pinctrl/aspeed/pinmux-aspeed.h | 227 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 156 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 1 - + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 158 +- + drivers/pinctrl/cirrus/Kconfig | 6 + + drivers/pinctrl/cirrus/Makefile | 6 + + drivers/pinctrl/cirrus/pinctrl-cs47l15.c | 40 + + drivers/pinctrl/cirrus/pinctrl-cs47l92.c | 40 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 24 +- + drivers/pinctrl/cirrus/pinctrl-madera.h | 2 + + drivers/pinctrl/core.c | 28 + + drivers/pinctrl/devicetree.c | 6 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 13 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 12 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 67 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 4 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 2 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 53 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 2 + + drivers/pinctrl/intel/pinctrl-icelake.c | 2 + + drivers/pinctrl/intel/pinctrl-intel.c | 120 +- + drivers/pinctrl/intel/pinctrl-intel.h | 9 +- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 2 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 4 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 2 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 9 + + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.c | 1 + + drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 20 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 + + drivers/pinctrl/pinctrl-amd.c | 16 +- + drivers/pinctrl/pinctrl-falcon.c | 11 +- + drivers/pinctrl/pinctrl-ingenic.c | 755 +- + drivers/pinctrl/pinctrl-oxnas.c | 8 +- + drivers/pinctrl/pinctrl-pic32.c | 4 +- + drivers/pinctrl/pinctrl-rk805.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-rza1.c | 16 +- + drivers/pinctrl/pinctrl-rza2.c | 17 +- + drivers/pinctrl/pinctrl-rzn1.c | 12 +- + drivers/pinctrl/pinctrl-st.c | 12 +- + drivers/pinctrl/pinctrl-stmfx.c | 28 +- + drivers/pinctrl/pinctrl-xway.c | 4 +- + drivers/pinctrl/pinmux.c | 24 + + drivers/pinctrl/pinmux.h | 8 + + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 36 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 76 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 1146 + + drivers/pinctrl/qcom/pinctrl-sdm845.c | 8 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 + + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 5 +- + drivers/pinctrl/sh-pfc/gpio.c | 11 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 43 +- + drivers/pinctrl/spear/pinctrl-spear.c | 8 +- + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 1 - + drivers/pinctrl/sprd/pinctrl-sprd.c | 32 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 265 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 67 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 3 + + drivers/pinctrl/tegra/pinctrl-tegra210.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 20 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 17 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 10 +- + drivers/platform/chrome/Kconfig | 60 +- + drivers/platform/chrome/Makefile | 2 + + drivers/platform/chrome/chromeos_laptop.c | 10 +- + drivers/platform/chrome/chromeos_tbmc.c | 2 + + drivers/{mfd => platform/chrome}/cros_ec.c | 64 +- + drivers/platform/chrome/cros_ec_chardev.c | 419 + + drivers/platform/chrome/cros_ec_debugfs.c | 3 +- + drivers/platform/chrome/cros_ec_i2c.c | 12 +- + drivers/platform/chrome/cros_ec_ishtp.c | 5 +- + drivers/platform/chrome/cros_ec_lightbar.c | 3 +- + drivers/platform/chrome/cros_ec_lpc.c | 7 +- + drivers/platform/chrome/cros_ec_proto.c | 3 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 57 +- + drivers/platform/chrome/cros_ec_spi.c | 12 +- + drivers/platform/chrome/cros_ec_sysfs.c | 3 +- + drivers/platform/chrome/cros_ec_trace.c | 2 +- + drivers/platform/chrome/cros_ec_trace.h | 4 +- + drivers/platform/chrome/cros_ec_vbc.c | 3 +- + drivers/platform/chrome/cros_usbpd_logger.c | 8 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 64 +- + drivers/platform/x86/surfacepro3_button.c | 47 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 5 +- + drivers/pwm/Kconfig | 2 +- + drivers/pwm/pwm-cros-ec.c | 4 +- + drivers/remoteproc/Kconfig | 2 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-cros-ec.c | 3 +- + drivers/video/backlight/lcd.c | 8 - + drivers/video/fbdev/amba-clcd.c | 4 +- + drivers/video/fbdev/aty/aty128fb.c | 18 - + drivers/video/fbdev/aty/atyfb_base.c | 29 - + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/au1200fb.c | 5 +- + drivers/video/fbdev/core/fbmem.c | 14 +- + drivers/video/fbdev/core/fbmon.c | 96 - + drivers/video/fbdev/core/modedb.c | 57 - + drivers/video/fbdev/efifb.c | 27 +- + drivers/video/fbdev/mmp/core.c | 6 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 1 - + drivers/video/fbdev/nvidia/nv_backlight.c | 2 - + drivers/video/fbdev/nvidia/nv_setup.c | 24 - + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 5 + + drivers/video/fbdev/pvr2fb.c | 6 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 + + drivers/video/fbdev/sm712fb.c | 8 +- + drivers/video/fbdev/ssd1307fb.c | 131 +- + drivers/video/fbdev/udlfb.c | 2 +- + drivers/video/fbdev/via/via-core.c | 43 - + drivers/video/of_display_timing.c | 11 +- + drivers/xen/swiotlb-xen.c | 84 +- + fs/9p/vfs_super.c | 6 +- + fs/affs/amigaffs.c | 2 +- + fs/affs/amigaffs.h | 3 + + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 + + fs/attr.c | 21 +- + fs/autofs/autofs_i.h | 1 - + fs/autofs/expire.c | 103 +- + fs/autofs/root.c | 44 +- + fs/befs/linuxvfs.c | 2 + + fs/bfs/inode.c | 2 + + fs/ceph/super.c | 2 + + fs/cifs/Kconfig | 8 + + fs/cifs/Makefile | 2 + + fs/cifs/cifs_debug.c | 2 + + fs/cifs/cifs_debug.h | 67 + + fs/cifs/cifs_fs_sb.h | 2 + + fs/cifs/cifs_ioctl.h | 1 + + fs/cifs/cifsacl.c | 81 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsfs.c | 50 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 19 +- + fs/cifs/cifsproto.h | 5 + + fs/cifs/cifsroot.c | 94 + + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 152 +- + fs/cifs/dir.c | 2 +- + fs/cifs/file.c | 80 +- + fs/cifs/inode.c | 19 +- + fs/cifs/netmisc.c | 14 +- + fs/cifs/smb2inode.c | 155 +- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2ops.c | 201 +- + fs/cifs/smb2pdu.c | 287 +- + fs/cifs/smb2pdu.h | 2 + + fs/cifs/smb2proto.h | 4 + + fs/cifs/smb2transport.c | 62 +- + fs/cifs/trace.h | 38 + + fs/cifs/transport.c | 120 +- + fs/coda/inode.c | 3 + + fs/configfs/configfs_internal.h | 21 +- + fs/configfs/dir.c | 173 +- + fs/configfs/inode.c | 36 +- + fs/configfs/mount.c | 9 + + fs/configfs/symlink.c | 197 +- + fs/cramfs/inode.c | 71 +- + fs/efs/super.c | 2 + + fs/ext2/super.c | 2 + + fs/ext4/ext4.h | 8 +- + fs/ext4/super.c | 17 +- + fs/f2fs/file.c | 21 +- + fs/fat/inode.c | 12 + + fs/freevxfs/vxfs_super.c | 2 + + fs/fs_parser.c | 18 +- + fs/hpfs/hpfs_fn.h | 6 +- + fs/hpfs/super.c | 2 + + fs/inode.c | 33 +- + fs/isofs/inode.c | 7 + + fs/jffs2/fs.c | 24 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/super.c | 172 +- + fs/jfs/super.c | 2 + + fs/kernfs/inode.c | 7 +- + fs/minix/inode.c | 2 + + fs/namespace.c | 33 +- + fs/nfs/super.c | 20 +- + fs/ntfs/inode.c | 21 +- + fs/omfs/inode.c | 4 + + fs/orangefs/inode.c | 2 +- + fs/orangefs/namei.c | 2 +- + fs/pstore/ram.c | 2 + + fs/qnx4/inode.c | 2 + + fs/qnx6/inode.c | 2 + + fs/ramfs/inode.c | 99 +- + fs/reiserfs/super.c | 3 + + fs/romfs/super.c | 48 +- + fs/squashfs/super.c | 102 +- + fs/super.c | 37 +- + fs/sysv/super.c | 5 +- + fs/ubifs/file.c | 21 +- + fs/ufs/super.c | 7 + + fs/utimes.c | 6 +- + fs/xfs/xfs_super.c | 2 + + include/Kbuild | 2 +- + include/drm/amd_asic_type.h | 4 + + include/drm/bridge/analogix_dp.h | 4 - + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drmP.h | 2 +- + include/drm/drm_agpsupport.h | 14 - + include/drm/drm_connector.h | 32 +- + include/drm/drm_crtc.h | 4 + + include/drm/drm_dp_helper.h | 4 + + include/drm/drm_dp_mst_helper.h | 11 + + include/drm/drm_drv.h | 104 +- + include/drm/drm_gem.h | 26 +- + include/drm/drm_gem_framebuffer_helper.h | 7 - + include/drm/drm_gem_shmem_helper.h | 15 + + include/drm/drm_gem_vram_helper.h | 30 +- + include/drm/drm_hdcp.h | 9 +- + include/drm/drm_ioctl.h | 3 + + include/drm/drm_mipi_dbi.h | 188 + + include/drm/drm_mode_config.h | 6 + + include/drm/drm_panel.h | 184 +- + include/drm/drm_prime.h | 41 +- + include/drm/drm_sysfs.h | 5 +- + include/drm/drm_vblank.h | 1 - + include/drm/drm_vram_mm_helper.h | 2 + + include/drm/i915_component.h | 2 +- + include/drm/i915_drm.h | 13 +- + include/drm/i915_pciids.h | 18 +- + include/drm/tinydrm/mipi-dbi.h | 117 - + include/drm/tinydrm/tinydrm-helpers.h | 75 - + include/drm/ttm/ttm_bo_api.h | 41 +- + include/drm/ttm/ttm_bo_driver.h | 26 +- + include/dt-bindings/gce/mt8183-gce.h | 175 + + include/dt-bindings/reset/hisi,hi6220-resets.h | 7 + + include/linux/amba/clcd-regs.h | 1 + + include/linux/blkdev.h | 2 + + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence.h | 34 +- + include/linux/dma-mapping.h | 34 +- + include/linux/dma-noncoherent.h | 13 +- + include/linux/{reservation.h => dma-resv.h} | 186 +- + include/linux/fb.h | 7 - + include/linux/fs.h | 5 + + include/linux/fs_context.h | 4 + + include/linux/iio/common/cros_ec_sensors_core.h | 3 +- + include/linux/input.h | 26 + + include/linux/input/bu21013.h | 34 - + include/linux/lcd.h | 10 - + include/linux/mailbox/mtk-cmdq-mailbox.h | 3 + + include/linux/mfd/cros_ec.h | 292 - + include/linux/mmc/host.h | 2 + + include/linux/mtd/super.h | 3 - + include/linux/pinctrl/consumer.h | 6 + + .../linux/platform_data/cros_ec_chardev.h | 13 +- + .../{mfd => platform_data}/cros_ec_commands.h | 0 + include/linux/platform_data/cros_ec_proto.h | 319 + + include/linux/platform_data/keypad-w90p910.h | 16 - + include/linux/platform_data/pinctrl-single.h | 6 + + include/linux/ramfs.h | 6 +- + include/linux/root_dev.h | 1 + + include/linux/shmem_fs.h | 3 +- + include/linux/soc/amlogic/meson-canvas.h | 1 + + include/linux/soc/mediatek/mtk-cmdq.h | 3 - + include/linux/time64.h | 2 + + include/linux/vmalloc.h | 2 + + include/uapi/drm/amdgpu_drm.h | 4 + + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/etnaviv_drm.h | 10 +- + include/uapi/drm/i915_drm.h | 1 + + include/uapi/drm/panfrost_drm.h | 64 + + include/uapi/linux/media-bus-format.h | 3 +- + include/uapi/linux/serio.h | 1 + + include/xen/arm/hypervisor.h | 2 - + include/xen/arm/page-coherent.h | 24 +- + include/xen/swiotlb-xen.h | 5 + + init/do_mounts.c | 11 +- + kernel/dma/Kconfig | 12 +- + kernel/dma/coherent.c | 13 - + kernel/dma/mapping.c | 105 +- + kernel/dma/remap.c | 51 +- + mm/shmem.c | 385 +- + mm/vmalloc.c | 5 +- + sound/core/pcm_native.c | 13 +- + sound/soc/codecs/Kconfig | 4 +- + sound/soc/codecs/cros_ec_codec.c | 4 +- + sound/soc/qcom/Kconfig | 2 +- + 2107 files changed, 277633 insertions(+), 46221 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt + create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/realtek.txt + create mode 100644 Documentation/devicetree/bindings/arm/realtek.yaml + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt + create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt + delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt + create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpm940b0.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl8048hl11.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls020b1dd01d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ti,nspire.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml + create mode 100644 Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-a10-ic.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt + create mode 100644 Documentation/filesystems/cifs/cifsroot.txt + delete mode 100644 Documentation/gpu/tinydrm.rst + delete mode 100644 arch/arm64/include/asm/dma-mapping.h + rename drivers/dma-buf/{reservation.c => dma-resv.c} (68%) + create mode 100644 drivers/dma-buf/selftest.c + create mode 100644 drivers/dma-buf/selftest.h + create mode 100644 drivers/dma-buf/selftests.h + create mode 100644 drivers/dma-buf/st-dma-fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/arct_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c + rename drivers/gpu/drm/{i915/intel_guc_fw.h => amd/amdgpu/psp_v12_0.h} (53%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c + rename drivers/gpu/drm/{i915/intel_guc_ads.h => amd/amdgpu/smu_v11_0_i2c.h} (51%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c + rename drivers/gpu/drm/{i915/i915_gem_render_state.h => amd/amdgpu/vcn_v2_5.h} (52%) + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h + create mode 100644 drivers/gpu/drm/amd/include/arct_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/navi12_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/navi14_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/renoir_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu12_driver_if.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_types.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v12_0_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/renoir_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/renoir_ppt.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_v12_0.c + delete mode 100644 drivers/gpu/drm/ast/ast_fb.c + rename drivers/gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} (65%) + delete mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu.h + delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test + delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test + rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%) + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.h + delete mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h + delete mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test + rename drivers/gpu/drm/i915/{intel_renderstate_gen6.c => gt/gen6_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen7.c => gt/gen7_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen8.c => gt/gen8_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen9.c => gt/gen9_renderstate.c} (100%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h + rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (93%) + rename drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h (91%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_reset_types.h + rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (60%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h + rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (60%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_context.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_pm.c + rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (85%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (58%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c (72%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h (70%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c (75%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c (92%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h (65%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (83%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (89%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h (64%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h (68%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.c (65%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.h (63%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c (58%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (70%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h + rename drivers/gpu/drm/i915/{selftests/intel_guc.c => gt/uc/selftest_guc.c} (73%) + create mode 100644 drivers/gpu/drm/i915/i915_buddy.c + create mode 100644 drivers/gpu/drm/i915/i915_buddy.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h + create mode 100644 drivers/gpu/drm/i915/i915_getparam.c + create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_chv.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_glk.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_icl.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.h + delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.h + create mode 100644 drivers/gpu/drm/i915/i915_perf.h + create mode 100644 drivers/gpu/drm/i915/i915_suspend.h + create mode 100644 drivers/gpu/drm/i915/i915_sw_fence_work.c + create mode 100644 drivers/gpu/drm/i915/i915_sw_fence_work.h + create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h + delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h + create mode 100644 drivers/gpu/drm/i915/i915_utils.c + delete mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_huc.h + delete mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c + create mode 100644 drivers/gpu/drm/i915/intel_pch.c + create mode 100644 drivers/gpu/drm/i915/intel_pch.h + delete mode 100644 drivers/gpu/drm/i915/intel_uc.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc.h + delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h + create mode 100644 drivers/gpu/drm/i915/oa/Makefile + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (65%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (70%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (64%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (60%) + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c + delete mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c + create mode 100644 drivers/gpu/drm/msm/msm_atomic_trace.h + create mode 100644 drivers/gpu/drm/msm/msm_atomic_tracepoints.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c + create mode 100644 drivers/gpu/drm/panel/panel-lg-lb035q02.c + create mode 100644 drivers/gpu/drm/panel/panel-nec-nl8048hl11.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-acx565akm.c + create mode 100644 drivers/gpu/drm/panel/panel-tpo-td028ttec1.c + create mode 100644 drivers/gpu/drm/panel/panel-tpo-td043mtea1.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h + rename drivers/gpu/drm/{tinydrm => tiny}/Kconfig (64%) + rename drivers/gpu/drm/{tinydrm => tiny}/Makefile (76%) + create mode 100644 drivers/gpu/drm/tiny/gm12u320.c + rename drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c (78%) + rename drivers/gpu/drm/{tinydrm => tiny}/ili9225.c (64%) + rename drivers/gpu/drm/{tinydrm => tiny}/ili9341.c (69%) + rename drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c (70%) + rename drivers/gpu/drm/{tinydrm => tiny}/repaper.c (94%) + rename drivers/gpu/drm/{tinydrm => tiny}/st7586.c (74%) + rename drivers/gpu/drm/{tinydrm => tiny}/st7735r.c (69%) + delete mode 100644 drivers/gpu/drm/tinydrm/core/Makefile + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c + delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_prime.c + rename drivers/gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} (52%) + create mode 100644 drivers/input/input-poller.c + create mode 100644 drivers/input/input-poller.h + create mode 100644 drivers/input/joystick/fsia6b.c + delete mode 100644 drivers/input/keyboard/w90p910_keypad.c + delete mode 100644 drivers/input/touchscreen/w90p910_ts.c + create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l15.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l92.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7180.c + rename drivers/{mfd => platform/chrome}/cros_ec.c (84%) + create mode 100644 drivers/platform/chrome/cros_ec_chardev.c + create mode 100644 fs/cifs/cifsroot.c + create mode 100644 include/drm/drm_mipi_dbi.h + delete mode 100644 include/drm/tinydrm/mipi-dbi.h + delete mode 100644 include/drm/tinydrm/tinydrm-helpers.h + create mode 100644 include/dt-bindings/gce/mt8183-gce.h + rename include/linux/{reservation.h => dma-resv.h} (63%) + delete mode 100644 include/linux/input/bu21013.h + rename drivers/mfd/cros_ec_dev.h => include/linux/platform_data/cros_ec_chardev.h (75%) + rename include/linux/{mfd => platform_data}/cros_ec_commands.h (100%) + create mode 100644 include/linux/platform_data/cros_ec_proto.h + delete mode 100644 include/linux/platform_data/keypad-w90p910.h +Merging fixes/master (609488bc979f9 Linux 5.3-rc2) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (d45331b00ddb1 Linux 5.3-rc4) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (089cf7f6ecb26 Linux 5.3-rc7) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (5b3efa4f1479c ARM: 8901/1: add a criteria for pfn_valid of arm) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (b74d957f6317e ARM: aspeed: ast2500 is ARMv6K) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging arch/arm/mach-aspeed/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1144 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm/mach-aspeed/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging arm64-fixes/for-next/fixes (799c851052335 arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI) +$ git merge arm64-fixes/for-next/fixes +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/cmpxchg.h | 6 +++--- + arch/arm64/include/asm/syscall_wrapper.h | 15 ++++++++++++--- + tools/testing/selftests/arm64/Makefile | 1 + + 4 files changed, 17 insertions(+), 7 deletions(-) +Merging m68k-current/for-linus (0f1979b402df5 m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (a8318c13e79ba powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (d45331b00ddb1 Linux 5.3-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21b sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1178 and retry the command. +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d362 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (864668bfc374d selftests: Add test cases for `ip nexthop flush proto XX`) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/micrel-ksz90x1.txt | 32 ++++++- + drivers/net/ethernet/ibm/ibmvnic.c | 7 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 +- + drivers/net/usb/usbnet.c | 3 + + net/ncsi/internal.h | 7 +- + net/ncsi/ncsi-manage.c | 98 +++------------------- + tools/testing/selftests/net/fib_nexthops.sh | 14 ++++ + 7 files changed, 64 insertions(+), 99 deletions(-) +Merging bpf/master (733ef7f056a5e xsk: relax UMEM headroom alignment) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/uapi/linux/btf.h | 4 ++-- + kernel/bpf/btf.c | 5 ++--- + net/xdp/xdp_umem.c | 2 -- + tools/lib/bpf/xsk.c | 11 ----------- + 4 files changed, 4 insertions(+), 18 deletions(-) +Merging ipsec/master (00b368502d18f xen-netfront: do not assume sk_buff_head list is empty in error handling) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (864668bfc374d selftests: Add test cases for `ip nexthop flush proto XX`) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (58e8b37069ff2 Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2d88b2cf2f002 iwlwifi: mvm: fix build w/o CONFIG_THERMAL) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) +Merging mac80211/master (f794dc2304d83 sctp: fix the missing put_user when dumping transport thresholds) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (531a64e4c35bb RDMA/siw: Fix IPv6 addr_list locking) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (bd9c10bc663dd ALSA: hda/realtek - PCI quirk for Medion E4254) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/dice/dice-alesis.c | 2 +- + sound/pci/hda/hda_intel.c | 3 +-- + sound/pci/hda/patch_realtek.c | 28 ++++++++++++++++++++++++++++ + sound/usb/quirks.c | 1 + + 4 files changed, 31 insertions(+), 3 deletions(-) +$ git am -3 ../patches/0001-ASoC-Intel-boards-merge-fix-for-INTEL_FAM6_KABYLAKE_.patch +Applying: ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change +Using index info to reconstruct a base tree... +M sound/soc/intel/common/soc-intel-quirks.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging sound-asoc-fixes/for-linus (4f3ded8cc8890 Merge branch 'asoc-5.3' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1684 and retry the command. +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (0161b8716465a Merge branch 'regmap-5.3' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4d856f72c10ec Linux 5.3) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (6979d5d444d02 Merge branch 'spi-5.3' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1714 and retry the command. +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (7bafda88de20b Documentation PCI: Fix pciebus-howto.rst filename typo) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (4a56a478a525d usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51d usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2872 and retry the command. +Merge made by the 'recursive' strategy. +Merging phy/fixes (609488bc979f9 Linux 5.3-rc2) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (38c7a30a9d5ff Documentation/process: Volunteer as the ambassador for Intel) +$ git merge char-misc.current/char-misc-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1144 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/process/embargoed-hardware-issues.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (0898782247ae5 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (9575d1a5c0780 crypto: caam - Cast to long first before pointer conversion) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cbc ide: Use dev_get_drvdata where possible) +$ git merge ide/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1178 and retry the command. +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (5715c4dd66a31 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fbb01c52471c8 selftests/livepatch: push and pop dynamic debug config) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383fa module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (cf24aac38698b dmaengine: rcar-dmac: Fix DMACHCLR handling if iommu is mapped) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629c Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (dc9cfd2692225 mtd: hyperbus: fix dependency and build error) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b0 mfd: rk808: Make PM function declaration static) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (63ad05e36ec5a media: cec-notifier: clear cec_adap in cec_notifier_unregister) +$ git merge v4l-dvb-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1150 and retry the command. +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (a71dcd3757e29 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (74034a09267c1 MIPS: BCM63XX: Mark expected switch fall-through) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (a4c8723a162e6 bus: ti-sysc: Remove unpaired sysc_clkdm_deny_idle()) +$ git merge omap-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1178 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am3517-evm.dts | 23 ++--------- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 26 ++++++------ + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 37 +++-------------- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 4 +- + drivers/bus/ti-sysc.c | 52 +++++++++++++++++------- + 6 files changed, 64 insertions(+), 79 deletions(-) +Merging kvm-fixes/master (b60fe990c6b07 KVM: coalesced_mmio: add bounds checking) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (53936b5bf35e1 KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (98d1a3c245e4b hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct7904.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (274b924088e93 libnvdimm/pfn: Fix namespace creation on misaligned addresses) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (43271a33245c7 Merge branch 'misc-5.3' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1700 and retry the command. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (cdf88216f62fb Fix the locking in dcache_readdir() and friends) +$ git merge vfs-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1144 and retry the command. +Merge made by the 'recursive' strategy. + fs/libfs.c | 128 ++++++++++++++++++++++++------------------------ + include/linux/lockref.h | 6 +++ + lib/lockref.c | 16 ++++++ + 3 files changed, 86 insertions(+), 64 deletions(-) +Merging erofs-fixes () +$ git merge erofs-fixes +merge: erofs-fixes - not something we can merge +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +++ + fs/erofs/super.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git/ () +$ git merge git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git/ +merge: git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git/ - not something we can merge +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +++ + fs/erofs/super.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging dma-mapping-fixes/for-linus (33dcb37cef741 dma-mapping: fix page attributes for dma_mmap_*) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9b Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (83f82d7a42583 of: irq: fix a trivial typo in a doc comment) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (0622800d2ebcc scsi: lpfc: Raise config max for lpfc_fcp_mq_threshold variable) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (e6bb711600db2 Merge tag 'drm-misc-fixes-2019-09-12' 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 (e16a7cbced711 drm/amdgpu: flag navi12 and 14 as experimental for 5.4) +$ git merge amdgpu-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 ++-- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 10 +++- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 6 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 10 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 ++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 25 ++++++-- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 4 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 16 +++-- + .../drm/amd/display/dc/dce120/dce120_resource.c | 11 +++- + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 38 +++++++++++- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 3 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 7 ++- + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 ++- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 70 ++++++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 25 ++++++++ + drivers/gpu/drm/radeon/radeon_drv.c | 31 ++++++++++ + drivers/gpu/drm/radeon/radeon_kms.c | 25 -------- + 26 files changed, 262 insertions(+), 67 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (4d856f72c10ec Linux 5.3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (87b5d602a1cc7 mmc: tmio: Fixup runtime PM management during remove) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a4 Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (e395071a12f9d HID: hyperv: Use in-place iterator API in the channel callback) +$ git merge hyperv-fixes/hyperv-fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1144 and retry the command. +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 56 +++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 46 deletions(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7e soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (4c250fa8d9889 riscv: dts: sifive: Drop "clock-frequency" property of cpu nodes) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 22 +++++++++++++--- + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 8 ++++++ + arch/riscv/configs/defconfig | 11 ++++++++ + arch/riscv/configs/rv32_defconfig | 11 ++++++++ + arch/riscv/include/asm/entry.h | 29 ++++++++++++++++++++++ + arch/riscv/include/asm/head.h | 21 ++++++++++++++++ + arch/riscv/include/asm/irq.h | 6 +++++ + arch/riscv/include/asm/pgtable.h | 27 +++++++++++--------- + arch/riscv/include/asm/processor.h | 5 ++++ + arch/riscv/include/asm/ptrace.h | 2 ++ + arch/riscv/include/asm/smp.h | 2 ++ + arch/riscv/include/asm/switch_to.h | 1 + + arch/riscv/include/asm/syscall.h | 3 +++ + arch/riscv/include/asm/thread_info.h | 2 ++ + arch/riscv/kernel/cpufeature.c | 1 + + arch/riscv/kernel/head.S | 8 +++--- + arch/riscv/kernel/module-sections.c | 1 + + arch/riscv/kernel/process.c | 2 ++ + arch/riscv/kernel/reset.c | 1 + + arch/riscv/kernel/setup.c | 1 + + arch/riscv/kernel/signal.c | 1 + + arch/riscv/kernel/smp.c | 5 ++++ + arch/riscv/kernel/smpboot.c | 2 ++ + arch/riscv/kernel/stacktrace.c | 4 +-- + arch/riscv/kernel/syscall_table.c | 1 + + arch/riscv/kernel/time.c | 3 ++- + arch/riscv/kernel/traps.c | 1 + + arch/riscv/kernel/vdso.c | 3 ++- + arch/riscv/mm/context.c | 1 + + arch/riscv/mm/fault.c | 1 + + arch/riscv/mm/init.c | 16 ++++++------ + arch/riscv/mm/sifive_l2_cache.c | 2 +- + include/uapi/linux/kvm.h | 1 + + 33 files changed, 174 insertions(+), 31 deletions(-) + create mode 100644 arch/riscv/include/asm/entry.h + create mode 100644 arch/riscv/include/asm/head.h +Merging pidfd-fixes/fixes (28f59b04707df sched: Add __ASSEMBLY__ guards around struct clone_args) +$ git merge pidfd-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1146 and retry the command. +Merge made by the 'recursive' strategy. + include/uapi/linux/sched.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging fpga-fixes/fixes (dec43da46f63e fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (4d856f72c10ec Linux 5.3) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (21670bd78a250 drm/lima: fix lima_gem_wait() return value) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp-gustavo/for-next/kspp (609488bc979f9 Linux 5.3-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (77564a4829ef6 genksyms: convert to SPDX License Identifier for lex.l and parse.y) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Removing drivers/net/ethernet/netronome/nfp/nic/Makefile +Removing drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile +Removing drivers/net/ethernet/netronome/nfp/nfpcore/Makefile +Removing drivers/net/ethernet/netronome/nfp/flower/Makefile +Removing drivers/net/ethernet/netronome/nfp/bpf/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/en/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile +Removing drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile +Removing drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dsc/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dsc/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/calcs/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/calcs/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +Auto-merging arch/ia64/Makefile +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/Kconfig +Auto-merging Makefile +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1148 and retry the command. +Resolved 'drivers/gpu/drm/amd/display/dc/calcs/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dsc/Makefile' using previous resolution. +Resolved 'scripts/link-vmlinux.sh' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5bc98b946fc7c] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 2 +- + Documentation/kbuild/kbuild.rst | 28 +- + Documentation/kbuild/makefiles.rst | 67 ++--- + Kbuild | 7 - + Makefile | 296 +++++++++++---------- + arch/Kconfig | 7 + + arch/alpha/Kconfig | 1 + + arch/arc/Makefile | 8 - + arch/arc/configs/axs101_defconfig | 1 + + arch/arc/configs/axs103_defconfig | 1 + + arch/arc/configs/axs103_smp_defconfig | 1 + + arch/arc/configs/haps_hs_defconfig | 1 + + arch/arc/configs/haps_hs_smp_defconfig | 1 + + arch/arc/configs/hsdk_defconfig | 1 + + arch/arc/configs/nps_defconfig | 1 + + arch/arc/configs/nsim_700_defconfig | 1 + + arch/arc/configs/nsim_hs_defconfig | 1 + + arch/arc/configs/nsim_hs_smp_defconfig | 1 + + arch/arc/configs/nsimosci_defconfig | 1 + + arch/arc/configs/nsimosci_hs_defconfig | 1 + + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 + + arch/arc/configs/tb10x_defconfig | 1 + + arch/arc/configs/vdk_hs38_defconfig | 1 + + arch/arc/configs/vdk_hs38_smp_defconfig | 1 + + arch/arm/Makefile | 2 +- + arch/arm/kvm/Makefile | 5 +- + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 2 +- + arch/ia64/Kconfig | 1 + + arch/ia64/Makefile | 2 +- + arch/m68k/Kconfig | 1 + + arch/m68k/Makefile | 2 +- + arch/mips/Kconfig | 1 + + arch/mips/boot/Makefile | 2 +- + arch/parisc/Makefile | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Makefile | 2 +- + arch/powerpc/Makefile.postlink | 2 +- + arch/powerpc/kernel/prom_init_check.sh | 2 +- + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 2 +- + arch/s390/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/um/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 26 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 7 +- + drivers/gpu/drm/i915/Makefile | 2 +- + .../net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/accel/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/diag/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/en/Makefile | 2 - + .../ethernet/mellanox/mlx5/core/en/xsk/Makefile | 1 - + .../ethernet/mellanox/mlx5/core/en_accel/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/fpga/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/ipoib/Makefile | 2 - + .../net/ethernet/mellanox/mlx5/core/lib/Makefile | 2 - + drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 - + drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 - + .../net/ethernet/netronome/nfp/nfpcore/Makefile | 2 - + .../netronome/nfp/nfpcore/nfp6000/Makefile | 2 - + drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 - + include/linux/compiler_types.h | 20 +- + include/linux/export.h | 42 ++- + include/linux/vermagic.h | 2 + + init/Kconfig | 26 +- + init/Makefile | 5 +- + kernel/Makefile | 2 +- + scripts/Kconfig.include | 3 + + scripts/Makefile | 2 +- + scripts/Makefile.build | 73 ++--- + scripts/Makefile.clean | 31 +-- + scripts/Makefile.extrawarn | 121 +++++---- + scripts/Makefile.host | 39 ++- + scripts/Makefile.lib | 63 ++--- + scripts/Makefile.modfinal | 60 +++++ + scripts/Makefile.modpost | 80 +----- + scripts/{package/Makefile => Makefile.package} | 43 +-- + scripts/basic/Makefile | 14 +- + scripts/genksyms/Makefile | 11 +- + scripts/genksyms/keywords.c | 6 +- + scripts/genksyms/lex.l | 32 +-- + scripts/genksyms/parse.y | 32 +-- + scripts/headers_install.sh | 72 +++++ + scripts/kconfig/Makefile | 10 +- + scripts/kconfig/merge_config.sh | 12 +- + scripts/link-vmlinux.sh | 37 +-- + scripts/mkcompile_h | 4 +- + scripts/mkmakefile | 4 +- + scripts/mod/file2alias.c | 5 + + scripts/mod/modpost.c | 48 +++- + usr/include/Makefile | 4 +- + 95 files changed, 759 insertions(+), 684 deletions(-) + delete mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile + delete mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile + delete mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile + delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile + delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile + delete mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile + create mode 100644 scripts/Makefile.modfinal + rename scripts/{package/Makefile => Makefile.package} (92%) +Merging compiler-attributes/compiler-attributes (32ee8230b2b06 x86: bug.h: use asm_inline in _BUG_FLAGS definitions) +$ git merge compiler-attributes/compiler-attributes +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/compiler_types.h +Auto-merging drivers/staging/rtl8723bs/include/rtw_mlme.h +Auto-merging drivers/staging/rtl8723bs/include/drv_types.h +Auto-merging drivers/staging/rtl8723bs/core/rtw_wlan_util.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1147 and retry the command. +Resolved 'init/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d5ced188007d3] Merge remote-tracking branch 'compiler-attributes/compiler-attributes' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/alternative.h | 14 +++++++------- + arch/x86/include/asm/bug.h | 4 ++-- + include/linux/compiler_types.h | 17 ++++++++++++++++- + init/Kconfig | 3 +++ + lib/zstd/mem.h | 2 +- + 5 files changed, 29 insertions(+), 11 deletions(-) +Merging leaks/leaks-next (9e98c678c2d6a Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (c7d9eccb3c1e8 mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665db asm-generic: add unlikely to default BUG_ON(x)) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9b Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a6d5fc437605 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging drivers/edac/Makefile +Auto-merging drivers/edac/Kconfig +CONFLICT (modify/delete): arch/arm/mach-iop13xx/pci.c deleted in HEAD and modified in arm/for-next. Version arm/for-next of arch/arm/mach-iop13xx/pci.c left in tree. +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1148 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b7ada3ad9b38] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/l2c2x0.yaml | 4 + + MAINTAINERS | 6 + + arch/arm/Kconfig | 7 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/Makefile | 22 +- + arch/arm/boot/compressed/head.S | 14 +- + .../{mm => include/asm/hardware}/cache-aurora-l2.h | 50 +- + arch/arm/kernel/perf_event_v7.c | 6 +- + arch/arm/kernel/vdso.c | 1 - + arch/arm/lib/Makefile | 8 +- + arch/arm/lib/backtrace-clang.S | 217 +++++++ + arch/arm/mm/cache-l2x0.c | 18 +- + arch/arm/mm/fault.c | 4 +- + arch/arm/mm/fault.h | 1 + + arch/arm/mm/mmu.c | 19 + + drivers/amba/bus.c | 14 + + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/armada_xp_edac.c | 635 +++++++++++++++++++++ + drivers/edac/debugfs.c | 11 + + drivers/edac/edac_module.h | 4 + + 21 files changed, 1027 insertions(+), 24 deletions(-) + rename arch/arm/{mm => include/asm/hardware}/cache-aurora-l2.h (50%) + create mode 100644 arch/arm/lib/backtrace-clang.S + create mode 100644 drivers/edac/armada_xp_edac.c +Merging arm64/for-next/core (e376897f424a1 arm64: remove __iounmap) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (3724e186fead3 docs/perf: Add documentation for the i.MX8 DDR PMU) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (cc01ccf8045fa arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/bus/ti-sysc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/marvell/armada-37xx.txt | 8 + + MAINTAINERS | 2 + + arch/arm/arm-soc-for-next-contents.txt | 255 +++++ + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 4 +- + arch/arm/boot/dts/am3517.dtsi | 24 + + arch/arm/boot/dts/am437x-l4.dtsi | 6 +- + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 80 ++ + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 1154 ++++++++++++++++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 261 +++++ + arch/arm/boot/dts/dra7-l4.dtsi | 43 +- + arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 244 +++++ + arch/arm/boot/dts/mmp2.dtsi | 48 +- + arch/arm/boot/dts/omap34xx.dtsi | 26 + + arch/arm/boot/dts/omap36xx.dtsi | 28 + + arch/arm/boot/dts/omap4-l4-abe.dtsi | 1 - + arch/arm/boot/dts/omap4-l4.dtsi | 39 +- + arch/arm/boot/dts/omap4.dtsi | 1 - + arch/arm/boot/dts/omap5.dtsi | 23 + + arch/arm/boot/dts/omap54xx-clocks.dtsi | 14 + + arch/arm/mach-exynos/Kconfig | 1 + + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 3 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 6 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 50 - + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 9 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 168 --- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 475 -------- + arch/arm/plat-samsung/watchdog-reset.c | 1 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 840 ++++++++++++++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 5 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 52 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 69 ++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 160 ++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 40 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + drivers/bus/ti-sysc.c | 101 +- + drivers/clk/Makefile | 1 + + drivers/clk/clk-aspeed.c | 78 +- + drivers/clk/clk-aspeed.h | 82 ++ + drivers/clk/clk-ast2600.c | 704 ++++++++++++ + drivers/clk/ti/clk-54xx.c | 34 + + include/dt-bindings/bus/ti-sysc.h | 1 + + include/dt-bindings/clock/ast2600-clock.h | 113 ++ + include/dt-bindings/clock/omap5.h | 3 + + include/dt-bindings/pinctrl/k3.h | 3 + + include/linux/platform_data/ti-sysc.h | 8 +- + 52 files changed, 4352 insertions(+), 949 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-ast2600-evb.dts + create mode 100644 arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-g6.dtsi + create mode 100644 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts + create mode 100644 drivers/clk/clk-aspeed.h + create mode 100644 drivers/clk/clk-ast2600.c + create mode 100644 include/dt-bindings/clock/ast2600-clock.h +Merging actions/for-next (fb9c1c1deb5ec Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (83405c3ff5e14 Merge branch 'v5.4/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (ba0fdbb07d051 Merge branch 'dt-for-v5.4' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (1069a5a3f3d88 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (c165c01bb6f78 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (d26d83e3e1fc7 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1166 and retry the command. +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx7ulp.c | 31 ++++++++ + drivers/clk/imx/clk-imx8mm.c | 92 +++++++++++++--------- + drivers/clk/imx/clk-imx8mn.c | 54 +++++++++---- + drivers/clk/imx/clk-imx8mq.c | 131 +++++++++++++++++-------------- + drivers/clk/imx/clk.h | 25 ------ + include/dt-bindings/clock/imx8mn-clock.h | 3 +- + 6 files changed, 198 insertions(+), 138 deletions(-) +Merging keystone/next (78145dbeaea10 Merge branch 'for_5.3/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (4ae1ce88e9a01 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (153e97d3bdf35 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 (7d6340ab2965f Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1162 and retry the command. +Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1fa0f9b7d1ca1] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/Makefile | 1 - + 1 file changed, 1 deletion(-) +Merging qcom/for-next (63e5846442478 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (ae688e1720fd3 arm64: dts: renesas: hihope-common: Fix eMMC status) +$ git merge renesas/next +Already up to date. +Merging renesas-geert/next (e180e8bda8292 Merge remote-tracking branch 'origin/fixes-for-v5.3' into renesas-next) +$ git merge renesas-geert/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (2d94bccca49ff reset: uniphier-glue: Add Pro5 USB3 support) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt +Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1192 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +- + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 5 ++- + drivers/reset/core.c | 2 - + drivers/reset/reset-meson-audio-arb.c | 43 ++++++++++++++++-- + drivers/reset/reset-uniphier-glue.c | 4 ++ + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + 10 files changed, 145 insertions(+), 112 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml +Merging rockchip/for-next (155cb7cd4cd41 Merge branch 'v5.4-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/rockchip.yaml +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1190 and retry the command. +Resolved 'Documentation/devicetree/bindings/arm/rockchip.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cbaa9024f10bc] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/rockchip,rk3308-cru.txt | 60 ++ + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-rk3308.c | 955 +++++++++++++++++++++ + drivers/clk/rockchip/clk-rv1108.c | 1 - + drivers/clk/rockchip/clk.h | 13 + + include/dt-bindings/clock/rk3308-cru.h | 387 +++++++++ + 6 files changed, 1416 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.txt + create mode 100644 drivers/clk/rockchip/clk-rk3308.c + create mode 100644 include/dt-bindings/clock/rk3308-cru.h +Merging samsung-krzk/for-next (2f776c5a7270d Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/Kconfig.platforms +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1196 and retry the command. +Merge made by the 'recursive' strategy. + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 102 ++++++++++----------- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 23 +++-- + 4 files changed, 64 insertions(+), 65 deletions(-) +Merging scmi/for-linux-next (03791902740b0 Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/reset/reset-scmi.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging sunxi/sunxi/for-next (15ea63583bfb8 Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1192 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 250 ++++++++++++++++++++- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +- + include/dt-bindings/clock/sun8i-v3s-ccu.h | 4 + + include/dt-bindings/reset/sun8i-v3s-ccu.h | 3 + + 6 files changed, 260 insertions(+), 12 deletions(-) +Merging tegra/for-next (6290ae1fb7e26 Merge branch for-5.4/firmware into for-next) +$ git merge tegra/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1198 and retry the command. +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging clk/clk-next (ebd47c8434064 Merge branches 'clk-bulk-fix', 'clk-at91' and 'clk-sprd' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk.h +Auto-merging drivers/phy/ti/phy-am654-serdes.c +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Auto-merging drivers/clk/qcom/clk-rpmh.c +Auto-merging drivers/clk/mediatek/clk-mt8183.c +Auto-merging drivers/clk/clk.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1186 and retry the command. +Merge made by the 'recursive' strategy. + .../arm/marvell/ap806-system-controller.txt | 42 +- + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,camsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,ipesys.txt | 22 + + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,pericfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,vencsys.txt | 1 + + .../bindings/clock/brcm,bcm2835-cprman.txt | 4 +- + .../devicetree/bindings/clock/qcom,gcc.txt | 21 + + .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 7 +- + .../{emev2-clock.txt => renesas,emev2-smu.txt} | 0 + .../devicetree/bindings/clock/ti,cdce925.txt | 4 + + drivers/clk/Kconfig | 9 - + drivers/clk/actions/owl-common.c | 5 +- + drivers/clk/actions/owl-factor.c | 7 +- + drivers/clk/at91/clk-main.c | 12 +- + drivers/clk/at91/sama5d2.c | 2 +- + drivers/clk/bcm/clk-bcm2835.c | 138 +- + drivers/clk/bcm/clk-bcm63xx-gate.c | 4 +- + drivers/clk/clk-bulk.c | 5 +- + drivers/clk/clk-cdce925.c | 34 + + drivers/clk/clk-composite.c | 1 - + drivers/clk/clk-lochnagar.c | 2 +- + drivers/clk/clk-milbeaut.c | 2 +- + drivers/clk/clk-qoriq.c | 2 +- + drivers/clk/clk-si5341.c | 1 - + drivers/clk/clk.c | 169 +- + drivers/clk/davinci/pll.c | 5 +- + drivers/clk/imx/clk-imx8mm.c | 32 +- + drivers/clk/imx/clk-imx8mn.c | 32 +- + drivers/clk/imx/clk-pll14xx.c | 27 +- + drivers/clk/ingenic/jz4725b-cgu.c | 2 +- + drivers/clk/ingenic/jz4740-cgu.c | 11 +- + drivers/clk/ingenic/jz4770-cgu.c | 2 +- + drivers/clk/ingenic/jz4780-cgu.c | 2 +- + drivers/clk/mediatek/Kconfig | 56 + + drivers/clk/mediatek/Makefile | 9 + + drivers/clk/mediatek/clk-gate.c | 5 +- + drivers/clk/mediatek/clk-gate.h | 3 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 117 + + drivers/clk/mediatek/clk-mt6779-cam.c | 66 + + drivers/clk/mediatek/clk-mt6779-img.c | 58 + + drivers/clk/mediatek/clk-mt6779-ipe.c | 60 + + drivers/clk/mediatek/clk-mt6779-mfg.c | 55 + + drivers/clk/mediatek/clk-mt6779-mm.c | 113 + + drivers/clk/mediatek/clk-mt6779-vdec.c | 67 + + drivers/clk/mediatek/clk-mt6779-venc.c | 58 + + drivers/clk/mediatek/clk-mt6779.c | 1315 +++++++ + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 7 +- + drivers/clk/mediatek/clk-mt8183.c | 44 + + drivers/clk/mediatek/clk-mtk.c | 16 +- + drivers/clk/mediatek/clk-mtk.h | 8 + + drivers/clk/mediatek/reset.c | 56 +- + drivers/clk/meson/axg-audio.c | 114 +- + drivers/clk/meson/axg-audio.h | 1 + + drivers/clk/meson/g12a.c | 544 +++ + drivers/clk/meson/g12a.h | 24 +- + drivers/clk/mvebu/Kconfig | 8 + + drivers/clk/mvebu/Makefile | 2 + + drivers/clk/mvebu/ap-cpu-clk.c | 356 ++ + drivers/clk/mvebu/ap806-system-controller.c | 178 +- + drivers/clk/mvebu/armada_ap_cp_helper.c | 30 + + drivers/clk/mvebu/armada_ap_cp_helper.h | 11 + + drivers/clk/mvebu/cp110-system-controller.c | 32 +- + drivers/clk/qcom/Kconfig | 9 +- + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-alpha-pll.c | 236 +- + drivers/clk/qcom/clk-alpha-pll.h | 7 + + drivers/clk/qcom/clk-rcg2.c | 10 +- + drivers/clk/qcom/clk-rpmh.c | 42 +- + drivers/clk/qcom/common.c | 20 + + drivers/clk/qcom/common.h | 2 + + drivers/clk/qcom/gcc-ipq8074.c | 2 +- + drivers/clk/qcom/gcc-msm8998.c | 4 +- + drivers/clk/qcom/gcc-qcs404.c | 34 +- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/clk/qcom/gcc-sdm845.c | 4 +- + drivers/clk/qcom/gcc-sm8150.c | 3588 ++++++++++++++++++++ + drivers/clk/qcom/lpasscc-sdm845.c | 23 +- + drivers/clk/qcom/turingcc-qcs404.c | 2 +- + drivers/clk/renesas/clk-mstp.c | 3 +- + drivers/clk/renesas/r9a06g032-clocks.c | 3 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 4 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 3 +- + drivers/clk/sirf/clk-common.c | 12 +- + drivers/clk/socfpga/clk-gate.c | 24 +- + drivers/clk/socfpga/clk-periph-a10.c | 7 +- + drivers/clk/spear/spear1340_clock.c | 2 +- + drivers/clk/sprd/common.c | 5 +- + drivers/clk/sprd/pll.c | 2 + + drivers/clk/st/clk-flexgen.c | 1 + + drivers/clk/st/clkgen-fsyn.c | 1 - + drivers/clk/st/clkgen-pll.c | 13 - + drivers/clk/sunxi-ng/ccu_common.c | 5 +- + drivers/clk/ti/apll.c | 9 +- + drivers/clk/ti/clk-814x.c | 1 + + drivers/clk/ti/dpll.c | 13 +- + drivers/clk/versatile/clk-versatile.c | 1 + + drivers/clk/zte/clk-zx296718.c | 109 +- + drivers/phy/ti/phy-am654-serdes.c | 4 +- + drivers/rtc/rtc-sun6i.c | 2 +- + include/dt-bindings/clock/bcm2835.h | 2 + + include/dt-bindings/clock/mt6779-clk.h | 436 +++ + include/dt-bindings/clock/mt8183-clk.h | 4 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 3 + + include/dt-bindings/clock/qcom,gcc-sm8150.h | 243 ++ + .../dt-bindings/reset-controller/mt8183-resets.h | 81 + + include/linux/clk-provider.h | 3 +- + include/linux/clk.h | 17 +- + include/linux/clk/clk-conf.h | 5 + + 116 files changed, 8614 insertions(+), 420 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipesys.txt + rename Documentation/devicetree/bindings/clock/{emev2-clock.txt => renesas,emev2-smu.txt} (100%) + create mode 100644 drivers/clk/mediatek/clk-mt6779-aud.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-img.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt6779-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt6779.c + create mode 100644 drivers/clk/mvebu/ap-cpu-clk.c + create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.c + create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.h + create mode 100644 drivers/clk/qcom/gcc-sm8150.c + create mode 100644 include/dt-bindings/clock/mt6779-clk.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8150.h + create mode 100644 include/dt-bindings/reset-controller/mt8183-resets.h +Merging clk-samsung/for-next (a188339ca5a39 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8a Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (4ad35c1f56386 csky: Fixup 610 vipt cache flush mechanism) +$ git merge csky/linux-next +Auto-merging arch/csky/mm/dma-mapping.c +CONFLICT (content): Merge conflict in arch/csky/mm/dma-mapping.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1187 and retry the command. +Resolved 'arch/csky/mm/dma-mapping.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8d787315b1a95] Merge remote-tracking branch 'csky/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/csky/abiv1/alignment.c | 62 +++++++++++++++++++++-------- + arch/csky/abiv1/cacheflush.c | 70 ++++++++++++++++++++++----------- + arch/csky/abiv1/inc/abi/cacheflush.h | 45 ++++++++++++++------- + arch/csky/abiv1/inc/abi/page.h | 5 ++- + arch/csky/abiv1/mmap.c | 75 ++++++++++++++++++----------------- + arch/csky/include/asm/barrier.h | 15 ++++--- + arch/csky/include/asm/cache.h | 1 + + arch/csky/include/asm/io.h | 23 +++++------ + arch/csky/include/asm/pgtable.h | 10 +++++ + arch/csky/mm/cachev1.c | 7 +++- + arch/csky/mm/cachev2.c | 11 +++++- + arch/csky/mm/dma-mapping.c | 76 +++++++++++++----------------------- + arch/csky/mm/ioremap.c | 27 ++++++++----- + 13 files changed, 258 insertions(+), 169 deletions(-) +Merging h8300/h8300-next (a5de8865cb3ed h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2908 and retry the command. +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (0d3d343560bad genirq: remove the is_affinity_mask_valid hook) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (0f1979b402df5 m68k: Remove ioremap_fullcache()) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (372ea263b3d9c m68k: coldfire: Include the GPIO driver header) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (7cca9b8b7c5bc microblaze: Switch to standard restart handler) +$ git merge microblaze/next +Auto-merging arch/microblaze/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1183 and retry the command. +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 3 + + arch/microblaze/boot/dts/system.dts | 16 ++- + arch/microblaze/configs/mmu_defconfig | 22 ++-- + arch/microblaze/configs/nommu_defconfig | 25 ++-- + arch/microblaze/include/asm/io.h | 1 - + arch/microblaze/include/asm/uaccess.h | 42 ++---- + arch/microblaze/kernel/reset.c | 87 ++----------- + arch/microblaze/mm/consistent.c | 223 +++++--------------------------- + 8 files changed, 96 insertions(+), 323 deletions(-) +Merging mips/mips-next (c4d48cf5e2f08 MIPS: ralink: deactivate PCI support for SOC_MT7621) +$ git merge mips/mips-next +Removing sound/soc/jz4740/qi_lb60.c +Removing drivers/video/fbdev/jz4740_fb.c +Auto-merging drivers/video/fbdev/Makefile +CONFLICT (content): Merge conflict in drivers/video/fbdev/Makefile +Auto-merging drivers/video/fbdev/Kconfig +Removing drivers/power/supply/jz4740-battery.c +Auto-merging drivers/power/supply/Kconfig +Removing drivers/mtd/nand/raw/ingenic/jz4740_nand.c +Removing drivers/hwmon/jz4740-hwmon.c +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Removing drivers/dma/dma-jz4740.c +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clk/ingenic/jz4740-cgu.c +Removing arch/mips/mm/tlb-r8k.c +Removing arch/mips/jz4740/platform.c +Removing arch/mips/jz4740/board-qi_lb60.c +Auto-merging arch/mips/include/asm/vdso/vdso.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h +Removing arch/mips/include/asm/mach-jz4740/platform.h +Removing arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +Removing arch/mips/include/asm/mach-jz4740/jz4740_fb.h +Removing arch/mips/include/asm/mach-jz4740/gpio.h +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging Documentation/mips/index.rst +CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Removing Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt +Removing Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1216 and retry the command. +Resolved 'Documentation/index.rst' using previous resolution. +Resolved 'Documentation/mips/index.rst' using previous resolution. +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/include/asm/vdso/vdso.h' using previous resolution. +Resolved 'drivers/video/fbdev/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1ea35f44df8d0] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 22 - + .../devicetree/bindings/timer/ingenic,tcu.txt | 137 ++++ + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 17 - + Documentation/mips/index.rst | 8 +- + Documentation/mips/ingenic-tcu.rst | 71 +++ + arch/mips/Kconfig | 65 +- + arch/mips/Makefile | 4 - + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 10 + + arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +- + arch/mips/boot/dts/ingenic/ci20.dts | 7 + + arch/mips/boot/dts/ingenic/gcw0.dts | 10 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 127 +++- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 21 + + arch/mips/boot/dts/ingenic/jz4780.dtsi | 23 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 325 ++++++++++ + arch/mips/boot/dts/mscc/ocelot.dtsi | 7 +- + arch/mips/cavium-octeon/dma-octeon.c | 16 +- + arch/mips/cavium-octeon/setup.c | 3 +- + arch/mips/configs/qi_lb60_defconfig | 44 +- + arch/mips/fw/arc/memory.c | 24 +- + arch/mips/include/asm/addrspace.h | 9 - + arch/mips/include/asm/atomic.h | 19 +- + arch/mips/include/asm/barrier.h | 44 +- + arch/mips/include/asm/bitops.h | 47 +- + arch/mips/include/asm/bootinfo.h | 17 +- + arch/mips/include/asm/cmpxchg.h | 18 +- + arch/mips/include/asm/cpu-features.h | 19 +- + arch/mips/include/asm/cpu-type.h | 15 +- + arch/mips/include/asm/cpu.h | 19 +- + arch/mips/include/asm/io.h | 21 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 9 - + arch/mips/include/asm/mach-cavium-octeon/war.h | 1 - + .../include/asm/mach-dec/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-generic/war.h | 1 - + arch/mips/include/asm/mach-ip22/war.h | 1 - + arch/mips/include/asm/mach-ip27/war.h | 1 - + arch/mips/include/asm/mach-ip28/war.h | 1 - + arch/mips/include/asm/mach-ip32/war.h | 1 - + arch/mips/include/asm/mach-jz4740/gpio.h | 15 - + arch/mips/include/asm/mach-jz4740/jz4740_fb.h | 58 -- + arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 12 - + arch/mips/include/asm/mach-jz4740/platform.h | 26 - + .../asm/mach-loongson64/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-malta/war.h | 1 - + arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 1 - + arch/mips/include/asm/mach-rc32434/war.h | 1 - + arch/mips/include/asm/mach-rm/war.h | 1 - + arch/mips/include/asm/mach-sibyte/war.h | 1 - + arch/mips/include/asm/mach-tx49xx/war.h | 1 - + arch/mips/include/asm/mipsregs.h | 4 + + arch/mips/include/asm/module.h | 6 - + arch/mips/include/asm/octeon/octeon.h | 4 +- + arch/mips/include/asm/pgtable-32.h | 62 +- + arch/mips/include/asm/pgtable-bits.h | 22 +- + arch/mips/include/asm/pgtable.h | 20 +- + arch/mips/include/asm/syscall.h | 21 +- + arch/mips/include/asm/vdso.h | 78 +-- + arch/mips/include/asm/vdso/gettimeofday.h | 222 +++++++ + arch/mips/{ => include/asm}/vdso/vdso.h | 17 +- + arch/mips/include/asm/vdso/vsyscall.h | 43 ++ + arch/mips/include/asm/war.h | 13 - + arch/mips/jz4740/Makefile | 7 +- + arch/mips/jz4740/board-qi_lb60.c | 523 ---------------- + arch/mips/jz4740/platform.c | 250 -------- + arch/mips/jz4740/prom.c | 5 - + arch/mips/jz4740/setup.c | 7 +- + arch/mips/jz4740/time.c | 151 +---- + arch/mips/kernel/branch.c | 2 +- + arch/mips/kernel/cpu-probe.c | 53 +- + arch/mips/kernel/genex.S | 3 - + arch/mips/kernel/idle.c | 3 +- + arch/mips/kernel/proc.c | 4 + + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-n64.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/setup.c | 357 +++-------- + arch/mips/kernel/syscall.c | 1 + + arch/mips/kernel/syscalls/syscalltbl.sh | 4 +- + arch/mips/kernel/vdso.c | 37 +- + arch/mips/lantiq/xway/sysctrl.c | 16 +- + arch/mips/mm/Makefile | 6 +- + arch/mips/mm/c-r4k.c | 2 - + arch/mips/mm/init.c | 92 ++- + arch/mips/mm/pgtable-32.c | 20 + + arch/mips/mm/sc-mips.c | 27 +- + arch/mips/mm/tlb-r8k.c | 239 ------- + arch/mips/mm/tlbex.c | 63 +- + arch/mips/mti-malta/malta-memory.c | 11 - + arch/mips/netlogic/xlp/setup.c | 12 +- + arch/mips/pci/pci-xtalk-bridge.c | 167 ++--- + arch/mips/pmcs-msp71xx/msp_prom.c | 22 +- + arch/mips/ralink/Kconfig | 1 - + arch/mips/ralink/timer.c | 4 +- + arch/mips/sgi-ip22/ip28-berr.c | 20 +- + arch/mips/vdso/Makefile | 41 +- + arch/mips/vdso/config-n32-o32-env.c | 19 + + arch/mips/vdso/elf.S | 2 +- + arch/mips/vdso/sigreturn.S | 2 +- + arch/mips/vdso/vdso.lds.S | 4 + + arch/mips/vdso/vgettimeofday.c | 58 ++ + drivers/clk/ingenic/Kconfig | 10 +- + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/jz4740-cgu.c | 6 + + drivers/clk/ingenic/tcu.c | 474 ++++++++++++++ + drivers/clocksource/Kconfig | 11 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/ingenic-timer.c | 356 +++++++++++ + drivers/dma/Kconfig | 6 - + drivers/dma/Makefile | 1 - + drivers/dma/dma-jz4740.c | 623 ------------------- + drivers/firmware/broadcom/Kconfig | 2 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +- + drivers/hwmon/Kconfig | 10 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/jz4740-hwmon.c | 135 ---- + drivers/irqchip/Kconfig | 12 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-ingenic-tcu.c | 182 ++++++ + drivers/mfd/syscon.c | 46 +- + drivers/mtd/nand/raw/ingenic/Kconfig | 7 - + drivers/mtd/nand/raw/ingenic/Makefile | 1 - + drivers/mtd/nand/raw/ingenic/jz4740_nand.c | 536 ---------------- + drivers/power/supply/Kconfig | 11 - + drivers/power/supply/Makefile | 1 - + drivers/power/supply/jz4740-battery.c | 421 ------------- + drivers/video/fbdev/Kconfig | 9 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/jz4740_fb.c | 690 --------------------- + include/dt-bindings/clock/ingenic,tcu.h | 20 + + include/dt-bindings/clock/jz4740-cgu.h | 1 + + include/linux/mfd/syscon.h | 6 + + sound/soc/jz4740/Kconfig | 25 +- + sound/soc/jz4740/Makefile | 5 - + sound/soc/jz4740/qi_lb60.c | 106 ---- + 142 files changed, 2896 insertions(+), 4952 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt + create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt + create mode 100644 Documentation/mips/ingenic-tcu.rst + delete mode 100644 arch/mips/include/asm/mach-jz4740/gpio.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_fb.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/platform.h + create mode 100644 arch/mips/include/asm/vdso/gettimeofday.h + rename arch/mips/{ => include/asm}/vdso/vdso.h (76%) + create mode 100644 arch/mips/include/asm/vdso/vsyscall.h + delete mode 100644 arch/mips/jz4740/board-qi_lb60.c + delete mode 100644 arch/mips/jz4740/platform.c + delete mode 100644 arch/mips/mm/tlb-r8k.c + create mode 100644 arch/mips/vdso/config-n32-o32-env.c + create mode 100644 arch/mips/vdso/vgettimeofday.c + create mode 100644 drivers/clk/ingenic/tcu.c + create mode 100644 drivers/clocksource/ingenic-timer.c + delete mode 100644 drivers/dma/dma-jz4740.c + delete mode 100644 drivers/hwmon/jz4740-hwmon.c + create mode 100644 drivers/irqchip/irq-ingenic-tcu.c + delete mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_nand.c + delete mode 100644 drivers/power/supply/jz4740-battery.c + delete mode 100644 drivers/video/fbdev/jz4740_fb.c + create mode 100644 include/dt-bindings/clock/ingenic,tcu.h + delete mode 100644 sound/soc/jz4740/qi_lb60.c +Merging nds32/next (9322961205431 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (f017da5c7077b nios2: configs: Remove useless UEVENT_HELPER_PATH) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (f3b17320db25b openrisc: map as uncached in ioremap) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (4d856f72c10ec Linux 5.3) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (d9101bfa6adc8 powerpc/mm/mce: Keep irqs disabled during lockless page table walk) +$ git merge powerpc/next +Auto-merging kernel/dma/swiotlb.c +Auto-merging kernel/dma/mapping.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/sysdev/xive/native.c +Removing arch/powerpc/sysdev/scom.c +Auto-merging arch/powerpc/platforms/pseries/vio.c +Removing arch/powerpc/platforms/4xx/ocm.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c +CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_vio.c +CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/dma-iommu.c +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/include/asm/xive.h +Removing arch/powerpc/include/asm/scom.h +Removing arch/powerpc/include/asm/ppc4xx_ocm.h +Auto-merging arch/powerpc/include/asm/kvm_host.h +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1199 and retry the command. +Resolved 'arch/Kconfig' using previous resolution. +Resolved 'arch/powerpc/kvm/book3s_64_vio.c' using previous resolution. +Resolved 'arch/powerpc/kvm/book3s_64_vio_hv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 594c8c18fe37e] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 10 + + Documentation/admin-guide/kernel-parameters.txt | 28 + + Documentation/powerpc/elfnote.rst | 41 + + Documentation/powerpc/firmware-assisted-dump.rst | 220 ++- + Documentation/powerpc/index.rst | 2 + + Documentation/powerpc/ultravisor.rst | 1054 +++++++++++++ + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 43 +- + arch/powerpc/Makefile | 1 - + arch/powerpc/boot/main.c | 41 + + arch/powerpc/boot/ops.h | 2 + + arch/powerpc/boot/wrapper | 24 +- + arch/powerpc/boot/zImage.lds.S | 8 + + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 2 +- + arch/powerpc/configs/ppc40x_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/configs/pseries_defconfig | 1 + + arch/powerpc/configs/skiroot_defconfig | 1 + + arch/powerpc/include/asm/asm-prototypes.h | 14 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 18 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 4 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 8 +- + arch/powerpc/include/asm/book3s/64/radix.h | 3 - + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 12 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 9 + + arch/powerpc/include/asm/book3s/pgtable.h | 11 + + arch/powerpc/include/asm/bug.h | 8 - + arch/powerpc/include/asm/cputable.h | 20 +- + arch/powerpc/include/asm/current.h | 3 +- + arch/powerpc/include/asm/eeh.h | 40 +- + arch/powerpc/include/asm/elfnote.h | 24 + + arch/powerpc/include/asm/fadump-internal.h | 169 ++ + arch/powerpc/include/asm/fadump.h | 194 +-- + arch/powerpc/include/asm/firmware.h | 5 +- + arch/powerpc/include/asm/ftrace.h | 2 + + arch/powerpc/include/asm/futex.h | 3 +- + arch/powerpc/include/asm/head-64.h | 41 - + arch/powerpc/include/asm/hugetlb.h | 3 - + arch/powerpc/include/asm/io-workarounds.h | 20 + + arch/powerpc/include/asm/io.h | 16 +- + arch/powerpc/include/asm/iommu.h | 28 +- + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/include/asm/machdep.h | 7 - + arch/powerpc/include/asm/mce.h | 10 +- + arch/powerpc/include/asm/mem_encrypt.h | 26 + + arch/powerpc/include/asm/mmu.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 18 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + + arch/powerpc/include/asm/nohash/pgtable.h | 13 + + arch/powerpc/include/asm/opal-api.h | 45 +- + arch/powerpc/include/asm/opal.h | 7 +- + arch/powerpc/include/asm/page.h | 14 +- + arch/powerpc/include/asm/page_32.h | 4 + + arch/powerpc/include/asm/pci-bridge.h | 1 + + arch/powerpc/include/asm/pgtable.h | 14 +- + arch/powerpc/include/asm/plpar_wrappers.h | 6 + + arch/powerpc/include/asm/ppc-pci.h | 7 +- + arch/powerpc/include/asm/ppc4xx_ocm.h | 31 - + arch/powerpc/include/asm/ppc_asm.h | 80 +- + arch/powerpc/include/asm/ptrace.h | 6 +- + arch/powerpc/include/asm/reg.h | 3 + + arch/powerpc/include/asm/scom.h | 154 -- + arch/powerpc/include/asm/sections.h | 11 - + arch/powerpc/include/asm/setjmp.h | 4 +- + arch/powerpc/include/asm/spinlock.h | 62 +- + arch/powerpc/include/asm/string.h | 2 + + arch/powerpc/include/asm/svm.h | 31 + + arch/powerpc/include/asm/time.h | 6 +- + arch/powerpc/include/asm/timex.h | 34 +- + arch/powerpc/include/asm/uaccess.h | 14 + + arch/powerpc/include/asm/ultravisor-api.h | 33 + + arch/powerpc/include/asm/ultravisor.h | 49 + + arch/powerpc/include/asm/xive.h | 1 + + arch/powerpc/kernel/.gitignore | 1 + + arch/powerpc/kernel/Makefile | 23 +- + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/cputable.c | 6 +- + arch/powerpc/kernel/dma-iommu.c | 11 +- + arch/powerpc/kernel/eeh.c | 281 +++- + arch/powerpc/kernel/eeh_cache.c | 37 +- + arch/powerpc/kernel/eeh_dev.c | 2 + + arch/powerpc/kernel/eeh_driver.c | 280 +++- + arch/powerpc/kernel/eeh_event.c | 34 +- + arch/powerpc/kernel/eeh_pe.c | 145 +- + arch/powerpc/kernel/entry_32.S | 40 +- + arch/powerpc/kernel/entry_64.S | 21 +- + arch/powerpc/kernel/exceptions-64e.S | 22 +- + arch/powerpc/kernel/exceptions-64s.S | 1644 ++++++++++---------- + arch/powerpc/kernel/fadump.c | 1340 +++++++--------- + arch/powerpc/kernel/head_32.S | 55 +- + arch/powerpc/kernel/head_32.h | 21 +- + arch/powerpc/kernel/head_64.S | 8 +- + arch/powerpc/kernel/head_8xx.S | 28 +- + arch/powerpc/kernel/hw_breakpoint.c | 77 +- + arch/powerpc/kernel/io-workarounds.c | 13 +- + arch/powerpc/kernel/iommu.c | 97 +- + arch/powerpc/kernel/kvm.c | 58 +- + arch/powerpc/kernel/kvm_emul.S | 16 + + arch/powerpc/kernel/machine_kexec_64.c | 9 + + arch/powerpc/kernel/mce.c | 71 +- + arch/powerpc/kernel/mce_power.c | 50 +- + arch/powerpc/kernel/misc_32.S | 36 +- + arch/powerpc/kernel/note.S | 40 + + arch/powerpc/kernel/paca.c | 52 +- + arch/powerpc/kernel/pci-common.c | 4 - + arch/powerpc/kernel/pci-hotplug.c | 7 + + arch/powerpc/kernel/pci_32.c | 4 + + arch/powerpc/kernel/pci_64.c | 12 +- + arch/powerpc/kernel/pci_dn.c | 21 +- + arch/powerpc/kernel/pci_of_scan.c | 66 +- + arch/powerpc/kernel/process.c | 28 +- + arch/powerpc/kernel/prom.c | 8 +- + arch/powerpc/kernel/prom_init.c | 98 +- + arch/powerpc/kernel/rtas.c | 15 +- + arch/powerpc/kernel/security.c | 19 +- + arch/powerpc/kernel/setup-common.c | 8 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/powerpc/kernel/sysfs.c | 20 + + arch/powerpc/kernel/trace/ftrace.c | 5 +- + arch/powerpc/kernel/trace/ftrace_32.S | 1 + + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 1 + + arch/powerpc/kernel/trace/ftrace_64_pg.S | 1 + + arch/powerpc/kernel/traps.c | 1 + + arch/powerpc/kernel/ucall.S | 14 + + arch/powerpc/kernel/vdso.c | 22 - + arch/powerpc/kernel/vdso32/datapage.S | 2 + + arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- + arch/powerpc/kvm/book3s_64_vio.c | 29 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 38 +- + arch/powerpc/kvm/book3s_hv.c | 6 + + arch/powerpc/kvm/book3s_hv_nested.c | 4 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 39 +- + arch/powerpc/lib/Makefile | 4 +- + arch/powerpc/lib/locks.c | 6 +- + arch/powerpc/lib/memcpy_mcsafe_64.S | 242 +++ + arch/powerpc/mm/Makefile | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 60 +- + arch/powerpc/mm/book3s64/hash_utils.c | 88 +- + arch/powerpc/mm/book3s64/pgtable.c | 121 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 80 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 303 ++-- + arch/powerpc/mm/dma-noncoherent.c | 318 +--- + arch/powerpc/mm/ioremap.c | 99 ++ + arch/powerpc/mm/ioremap_32.c | 92 ++ + arch/powerpc/mm/ioremap_64.c | 113 ++ + arch/powerpc/mm/kasan/kasan_init_32.c | 23 +- + arch/powerpc/mm/mem.c | 66 +- + arch/powerpc/mm/mmu_decl.h | 7 +- + arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 16 +- + arch/powerpc/mm/nohash/tlb.c | 2 + + arch/powerpc/mm/pgtable_32.c | 155 +- + arch/powerpc/mm/pgtable_64.c | 203 +-- + arch/powerpc/mm/ptdump/bats.c | 2 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 24 +- + arch/powerpc/mm/ptdump/ptdump.c | 37 +- + arch/powerpc/perf/imc-pmu.c | 29 +- + arch/powerpc/platforms/44x/Kconfig | 8 - + arch/powerpc/platforms/4xx/Makefile | 1 - + arch/powerpc/platforms/4xx/ocm.c | 390 ----- + arch/powerpc/platforms/Kconfig | 3 +- + arch/powerpc/platforms/Kconfig.cputype | 16 +- + arch/powerpc/platforms/cell/iommu.c | 2 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 5 +- + arch/powerpc/platforms/powernv/Makefile | 6 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 97 +- + arch/powerpc/platforms/powernv/idle.c | 6 +- + arch/powerpc/platforms/powernv/npu-dma.c | 101 +- + arch/powerpc/platforms/powernv/opal-call.c | 5 +- + arch/powerpc/platforms/powernv/opal-core.c | 636 ++++++++ + arch/powerpc/platforms/powernv/opal-fadump.c | 716 +++++++++ + arch/powerpc/platforms/powernv/opal-fadump.h | 146 ++ + arch/powerpc/platforms/powernv/opal-imc.c | 12 +- + arch/powerpc/platforms/powernv/opal-msglog.c | 57 +- + arch/powerpc/platforms/powernv/opal-prd.c | 8 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 213 ++- + arch/powerpc/platforms/powernv/opal.c | 42 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 38 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 98 +- + arch/powerpc/platforms/powernv/pci.c | 3 +- + arch/powerpc/platforms/powernv/pci.h | 2 +- + arch/powerpc/platforms/powernv/powernv.h | 5 + + arch/powerpc/platforms/powernv/setup.c | 9 + + arch/powerpc/platforms/powernv/ultravisor.c | 69 + + arch/powerpc/platforms/ps3/spu.c | 10 +- + arch/powerpc/platforms/pseries/Kconfig | 14 + + arch/powerpc/platforms/pseries/Makefile | 2 + + arch/powerpc/platforms/pseries/eeh_pseries.c | 68 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 26 +- + arch/powerpc/platforms/pseries/iommu.c | 24 +- + arch/powerpc/platforms/pseries/lpar.c | 20 +- + arch/powerpc/platforms/pseries/mobility.c | 9 + + arch/powerpc/platforms/pseries/pci.c | 3 +- + arch/powerpc/platforms/pseries/ras.c | 460 +++--- + arch/powerpc/platforms/pseries/rtas-fadump.c | 550 +++++++ + arch/powerpc/platforms/pseries/rtas-fadump.h | 114 ++ + arch/powerpc/platforms/pseries/setup.c | 32 +- + arch/powerpc/platforms/pseries/smp.c | 3 +- + arch/powerpc/platforms/pseries/svm.c | 85 + + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/powerpc/sysdev/Kconfig | 7 - + arch/powerpc/sysdev/Makefile | 2 - + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/scom.c | 223 --- + arch/powerpc/sysdev/xive/common.c | 59 +- + arch/powerpc/sysdev/xive/native.c | 26 + + arch/powerpc/sysdev/xive/spapr.c | 57 +- + arch/powerpc/sysdev/xive/xive-internal.h | 2 + + arch/powerpc/xmon/xmon.c | 51 +- + arch/s390/Kconfig | 4 +- + arch/s390/include/asm/mem_encrypt.h | 5 +- + arch/s390/mm/init.c | 7 +- + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/mem_encrypt.h | 10 + + arch/x86/kernel/crash_dump_64.c | 5 + + arch/x86/mm/mem_encrypt.c | 2 - + drivers/misc/cxl/main.c | 4 + + drivers/misc/ocxl/main.c | 4 + + drivers/pci/hotplug/pnv_php.c | 59 +- + drivers/pci/hotplug/rpaphp_core.c | 18 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 18 +- + fs/proc/vmcore.c | 8 +- + include/linux/crash_dump.h | 14 + + include/linux/extable.h | 2 + + include/linux/mem_encrypt.h | 15 +- + kernel/dma/mapping.c | 8 - + kernel/dma/swiotlb.c | 3 +- + kernel/extable.c | 11 +- + kernel/trace/fgraph.c | 4 +- + tools/testing/selftests/powerpc/Makefile | 1 + + .../testing/selftests/powerpc/copyloops/.gitignore | 9 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 7 +- + .../selftests/powerpc/copyloops/asm/export.h | 1 + + .../selftests/powerpc/copyloops/memcpy_mcsafe_64.S | 1 + + tools/testing/selftests/powerpc/eeh/Makefile | 9 + + tools/testing/selftests/powerpc/eeh/eeh-basic.sh | 82 + + .../testing/selftests/powerpc/eeh/eeh-functions.sh | 76 + + tools/testing/selftests/powerpc/ptrace/.gitignore | 3 + + .../testing/selftests/powerpc/security/.gitignore | 1 + + .../selftests/powerpc/stringloops/.gitignore | 5 +- + .../powerpc/tm/tm-signal-context-chk-fpu.c | 49 +- + .../powerpc/tm/tm-signal-context-chk-gpr.c | 59 +- + .../powerpc/tm/tm-signal-context-chk-vmx.c | 74 +- + .../powerpc/tm/tm-signal-context-chk-vsx.c | 130 +- + tools/testing/selftests/powerpc/tm/tm.h | 3 +- + 247 files changed, 9742 insertions(+), 5448 deletions(-) + create mode 100644 Documentation/powerpc/elfnote.rst + create mode 100644 Documentation/powerpc/ultravisor.rst + create mode 100644 arch/powerpc/include/asm/elfnote.h + create mode 100644 arch/powerpc/include/asm/fadump-internal.h + create mode 100644 arch/powerpc/include/asm/mem_encrypt.h + delete mode 100644 arch/powerpc/include/asm/ppc4xx_ocm.h + delete mode 100644 arch/powerpc/include/asm/scom.h + create mode 100644 arch/powerpc/include/asm/svm.h + create mode 100644 arch/powerpc/include/asm/ultravisor-api.h + create mode 100644 arch/powerpc/include/asm/ultravisor.h + create mode 100644 arch/powerpc/kernel/note.S + create mode 100644 arch/powerpc/kernel/ucall.S + create mode 100644 arch/powerpc/lib/memcpy_mcsafe_64.S + create mode 100644 arch/powerpc/mm/ioremap.c + create mode 100644 arch/powerpc/mm/ioremap_32.c + create mode 100644 arch/powerpc/mm/ioremap_64.c + delete mode 100644 arch/powerpc/platforms/4xx/ocm.c + create mode 100644 arch/powerpc/platforms/powernv/opal-core.c + create mode 100644 arch/powerpc/platforms/powernv/opal-fadump.c + create mode 100644 arch/powerpc/platforms/powernv/opal-fadump.h + create mode 100644 arch/powerpc/platforms/powernv/ultravisor.c + create mode 100644 arch/powerpc/platforms/pseries/rtas-fadump.c + create mode 100644 arch/powerpc/platforms/pseries/rtas-fadump.h + create mode 100644 arch/powerpc/platforms/pseries/svm.c + delete mode 100644 arch/powerpc/sysdev/scom.c + create mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S + create mode 100644 tools/testing/selftests/powerpc/eeh/Makefile + create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-basic.sh + create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-functions.sh + create mode 100644 tools/testing/selftests/powerpc/security/.gitignore +$ git am -3 ../patches/0001-merge-fixes-for-dma-mapping-make-dma_atomic_pool_ini.patch +Applying: merge fixes for "dma-mapping: make dma_atomic_pool_init self-contained" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/microblaze/mm/consistent.c +M arch/powerpc/mm/dma-noncoherent.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master c3529a4a0585f] Merge remote-tracking branch 'powerpc/next' + Date: Fri Sep 20 12:30:35 2019 +0100 +Merging fsl/next (63d86876f3244 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (eadf0b17b43db bus: fsl-mc: remove explicit device_link_del) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (9ce06497c2722 irqchip/sifive-plic: set max threshold for ignored handlers) +$ git merge risc-v/for-next +Already up to date. +Merging sifive/for-next (467e050e9760f Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (93426cadc3399 s390/cpumf: Remove mixed white space) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cpu_mf.h | 10 +-- + arch/s390/include/asm/perf_event.h | 2 + + arch/s390/include/uapi/asm/zcrypt.h | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 165 +++++++++++++++++++++++++++--------- + drivers/s390/cio/device_ops.c | 23 +++-- + drivers/s390/crypto/ap_bus.c | 12 +-- + drivers/s390/crypto/ap_bus.h | 3 +- + drivers/s390/crypto/pkey_api.c | 113 ++++++++++++++++++++++++ + drivers/s390/crypto/vfio_ap_drv.c | 2 + + drivers/s390/crypto/zcrypt_api.h | 3 +- + drivers/s390/crypto/zcrypt_cex4.c | 72 +++++++++++----- + 11 files changed, 329 insertions(+), 80 deletions(-) +Merging sh/sh-next (baf58858e8b6d sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2946 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +arch/sh/include/uapi/asm/setup.h: needs merge +arch/sh/include/uapi/asm/types.h: needs merge +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master db0d73c23cb14] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +Merging sparc-next/master (b71acb0e37216 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (f2f4bf5aabadd um: Add SPDX headers for files in arch/um/include) +$ git merge uml/linux-next +Auto-merging init/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1219 and retry the command. +Merge made by the 'recursive' strategy. + arch/um/drivers/Kconfig | 7 + + arch/um/drivers/Makefile | 3 +- + arch/um/drivers/chan.h | 2 +- + arch/um/drivers/chan_kern.c | 2 +- + arch/um/drivers/chan_user.c | 2 +- + arch/um/drivers/chan_user.h | 2 +- + arch/um/drivers/cow_user.c | 2 +- + arch/um/drivers/daemon.h | 2 +- + arch/um/drivers/daemon_kern.c | 2 +- + arch/um/drivers/daemon_user.c | 2 +- + arch/um/drivers/fd.c | 2 +- + arch/um/drivers/harddog_user.c | 2 +- + arch/um/drivers/hostaudio_kern.c | 2 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/line.h | 2 +- + arch/um/drivers/mconsole.h | 2 +- + arch/um/drivers/mconsole_kern.c | 2 +- + arch/um/drivers/mconsole_kern.h | 2 +- + arch/um/drivers/mconsole_user.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/net_user.c | 2 +- + arch/um/drivers/null.c | 2 +- + arch/um/drivers/pcap_kern.c | 2 +- + arch/um/drivers/pcap_user.c | 2 +- + arch/um/drivers/pcap_user.h | 2 +- + arch/um/drivers/port.h | 2 +- + arch/um/drivers/port_kern.c | 2 +- + arch/um/drivers/port_user.c | 2 +- + arch/um/drivers/pty.c | 2 +- + arch/um/drivers/slip_kern.c | 2 +- + arch/um/drivers/slip_user.c | 2 +- + arch/um/drivers/slirp_kern.c | 2 +- + arch/um/drivers/slirp_user.c | 2 +- + arch/um/drivers/ssl.c | 2 +- + arch/um/drivers/stdio_console.c | 2 +- + arch/um/drivers/stdio_console.h | 2 +- + arch/um/drivers/tty.c | 2 +- + arch/um/drivers/ubd.h | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/um/drivers/ubd_user.c | 2 +- + arch/um/drivers/umcast.h | 2 +- + arch/um/drivers/umcast_kern.c | 2 +- + arch/um/drivers/umcast_user.c | 2 +- + arch/um/drivers/vde.h | 2 +- + arch/um/drivers/vde_kern.c | 2 +- + arch/um/drivers/vde_user.c | 2 +- + arch/um/drivers/vector_kern.c | 44 +- + arch/um/drivers/vector_kern.h | 3 +- + arch/um/drivers/vector_transports.c | 42 +- + arch/um/drivers/vector_user.c | 293 +++++--- + arch/um/drivers/vector_user.h | 9 +- + arch/um/drivers/vhost_user.h | 117 +++ + arch/um/drivers/virtio_uml.c | 1177 ++++++++++++++++++++++++++++++ + arch/um/drivers/xterm.c | 2 +- + arch/um/drivers/xterm.h | 2 +- + arch/um/drivers/xterm_kern.c | 2 +- + arch/um/include/asm/Kbuild | 1 - + arch/um/include/asm/common.lds.S | 2 +- + arch/um/include/asm/irq.h | 7 +- + arch/um/include/asm/irqflags.h | 1 - + arch/um/include/asm/kmap_types.h | 2 +- + arch/um/include/asm/mmu.h | 2 +- + arch/um/include/asm/mmu_context.h | 2 +- + arch/um/include/asm/page.h | 2 +- + arch/um/include/asm/pgalloc.h | 2 +- + arch/um/include/asm/pgtable-2level.h | 2 +- + arch/um/include/asm/pgtable-3level.h | 2 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/include/asm/ptrace-generic.h | 2 +- + arch/um/include/asm/thread_info.h | 2 +- + arch/um/include/asm/tlbflush.h | 2 +- + arch/um/include/asm/uaccess.h | 2 +- + arch/um/include/shared/arch.h | 2 +- + arch/um/include/shared/as-layout.h | 2 +- + arch/um/include/shared/elf_user.h | 2 +- + arch/um/include/shared/frame_kern.h | 2 +- + arch/um/include/shared/irq_kern.h | 2 +- + arch/um/include/shared/irq_user.h | 2 +- + arch/um/include/shared/kern.h | 2 +- + arch/um/include/shared/kern_util.h | 2 +- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/mem.h | 2 +- + arch/um/include/shared/net_kern.h | 2 +- + arch/um/include/shared/net_user.h | 2 +- + arch/um/include/shared/os.h | 14 +- + arch/um/include/shared/ptrace_user.h | 2 +- + arch/um/include/shared/registers.h | 2 +- + arch/um/include/shared/sigio.h | 2 +- + arch/um/include/shared/skas/mm_id.h | 2 +- + arch/um/include/shared/skas/skas.h | 2 +- + arch/um/include/shared/skas/stub-data.h | 2 +- + arch/um/include/shared/timer-internal.h | 11 +- + arch/um/include/shared/um_malloc.h | 2 +- + arch/um/include/shared/user.h | 2 +- + arch/um/kernel/Makefile | 3 +- + arch/um/kernel/config.c.in | 4 +- + arch/um/kernel/dyn.lds.S | 3 +- + arch/um/kernel/exec.c | 2 +- + arch/um/kernel/exitcode.c | 2 +- + arch/um/kernel/gmon_syms.c | 2 +- + arch/um/kernel/gprof_syms.c | 2 +- + arch/um/kernel/initrd.c | 2 +- + arch/um/kernel/irq.c | 2 +- + arch/um/kernel/ksyms.c | 4 +- + arch/um/kernel/mem.c | 3 +- + arch/um/kernel/physmem.c | 3 +- + arch/um/kernel/process.c | 18 +- + arch/um/kernel/ptrace.c | 2 +- + arch/um/kernel/reboot.c | 2 +- + arch/um/kernel/sigio.c | 2 +- + arch/um/kernel/signal.c | 30 +- + arch/um/kernel/skas/Makefile | 2 +- + arch/um/kernel/skas/clone.c | 2 +- + arch/um/kernel/skas/mmu.c | 6 +- + arch/um/kernel/skas/process.c | 4 +- + arch/um/kernel/skas/syscall.c | 2 +- + arch/um/kernel/skas/uaccess.c | 2 +- + arch/um/kernel/syscall.c | 2 +- + arch/um/kernel/time.c | 13 +- + arch/um/kernel/tlb.c | 2 +- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 3 +- + arch/um/kernel/umid.c | 2 +- + arch/um/kernel/uml.lds.S | 2 + + arch/um/os-Linux/Makefile | 2 +- + arch/um/os-Linux/drivers/Makefile | 2 +- + arch/um/os-Linux/drivers/etap.h | 2 +- + arch/um/os-Linux/drivers/ethertap_kern.c | 2 +- + arch/um/os-Linux/drivers/ethertap_user.c | 2 +- + arch/um/os-Linux/drivers/tuntap.h | 2 +- + arch/um/os-Linux/drivers/tuntap_kern.c | 2 +- + arch/um/os-Linux/drivers/tuntap_user.c | 2 +- + arch/um/os-Linux/file.c | 46 +- + arch/um/os-Linux/helper.c | 2 +- + arch/um/os-Linux/irq.c | 2 +- + arch/um/os-Linux/main.c | 4 +- + arch/um/os-Linux/mem.c | 2 +- + arch/um/os-Linux/process.c | 2 +- + arch/um/os-Linux/registers.c | 2 +- + arch/um/os-Linux/sigio.c | 8 +- + arch/um/os-Linux/signal.c | 52 +- + arch/um/os-Linux/skas/Makefile | 2 +- + arch/um/os-Linux/skas/mem.c | 2 +- + arch/um/os-Linux/skas/process.c | 14 +- + arch/um/os-Linux/start_up.c | 2 +- + arch/um/os-Linux/time.c | 2 +- + arch/um/os-Linux/tty.c | 2 +- + arch/um/os-Linux/umid.c | 2 +- + arch/um/os-Linux/util.c | 2 +- + arch/x86/um/asm/barrier.h | 12 +- + arch/x86/um/vdso/um_vdso.c | 2 +- + init/Kconfig | 1 - + kernel/gcov/Kconfig | 2 +- + 154 files changed, 1912 insertions(+), 290 deletions(-) + create mode 100644 arch/um/drivers/vhost_user.h + create mode 100644 arch/um/drivers/virtio_uml.c +Merging xtensa/xtensa-for-next (9c2ec7545cbd2 Merge branch 'xtensa-call0' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1222 and retry the command. +Merge made by the 'recursive' strategy. +Merging fscrypt/master (0642ea2409f3b ext4 crypto: fix to check feature status before get policy) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (a0753c29004f4 afs: Support RCU pathwalk) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/next (29dcea88779c8 Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (a406b66710ba8 Merge branch 'for-next-next-v5.3-20190828' into for-next-20190828) +$ git merge btrfs-kdave/for-next +Auto-merging include/uapi/linux/btrfs_tree.h +CONFLICT (content): Merge conflict in include/uapi/linux/btrfs_tree.h +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/space-info.c +CONFLICT (content): Merge conflict in fs/btrfs/space-info.c +Auto-merging fs/btrfs/send.c +CONFLICT (content): Merge conflict in fs/btrfs/send.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +CONFLICT (content): Merge conflict in fs/btrfs/ctree.h +Auto-merging fs/btrfs/ctree.c +Auto-merging fs/btrfs/compression.h +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/block-group.c +CONFLICT (add/add): Merge conflict in fs/btrfs/block-group.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1222 and retry the command. +Recorded preimage for 'fs/btrfs/block-group.c' +Recorded preimage for 'fs/btrfs/ctree.h' +Recorded preimage for 'fs/btrfs/extent-tree.c' +Recorded preimage for 'fs/btrfs/send.c' +Recorded preimage for 'fs/btrfs/space-info.c' +Recorded preimage for 'include/uapi/linux/btrfs_tree.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. +Merging ceph/master (3ee5a7015c8b7 ceph: call ceph_mdsc_destroy from destroy_fs_client) +$ git merge ceph/master +Auto-merging fs/ceph/super.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1221 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 14 +++ + drivers/block/rbd.c | 18 ++-- + fs/ceph/Makefile | 2 +- + fs/ceph/addr.c | 61 +++++++------ + fs/ceph/cache.c | 2 + + fs/ceph/caps.c | 173 +++++++++++++++++++------------------ + fs/ceph/debugfs.c | 1 - + fs/ceph/export.c | 60 ++++++------- + fs/ceph/file.c | 104 +++++++++++++--------- + fs/ceph/inode.c | 50 ++++++----- + fs/ceph/io.c | 163 ++++++++++++++++++++++++++++++++++ + fs/ceph/io.h | 12 +++ + fs/ceph/locks.c | 8 +- + fs/ceph/mds_client.c | 110 +++++++++++++++++------ + fs/ceph/mds_client.h | 8 +- + fs/ceph/super.c | 52 +++++++++-- + fs/ceph/super.h | 49 +++++++---- + fs/ceph/xattr.c | 76 ++-------------- + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/messenger.h | 1 + + include/linux/ceph/mon_client.h | 1 + + include/linux/ceph/osd_client.h | 2 + + net/ceph/ceph_common.c | 37 ++++++-- + net/ceph/messenger.c | 6 ++ + net/ceph/mon_client.c | 7 ++ + net/ceph/osd_client.c | 65 +++++++++++--- + net/ceph/osdmap.c | 69 +++++++++------ + 27 files changed, 767 insertions(+), 385 deletions(-) + create mode 100644 fs/ceph/io.c + create mode 100644 fs/ceph/io.h +Merging cifs/for-next (b9345b51f8407 cifs: mention if an interface has a channel connected to it) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1221 and retry the command. +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 6 +- + fs/cifs/cifs_ioctl.h | 9 ++ + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifsfs.c | 3 + + fs/cifs/cifsglob.h | 29 ++++++- + fs/cifs/cifsproto.h | 8 ++ + fs/cifs/connect.c | 83 +++++++++++++++---- + fs/cifs/ioctl.c | 29 +++++++ + fs/cifs/sess.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2misc.c | 37 ++++++--- + fs/cifs/smb2ops.c | 13 ++- + fs/cifs/smb2pdu.c | 106 ++++++++++++++---------- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 150 ++++++++++++++++++++++++--------- + fs/cifs/transport.c | 14 +++- + 15 files changed, 589 insertions(+), 119 deletions(-) +Merging configfs/for-next (e9c03af21cc7e configfs: calculate the symlink target only once) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cfe ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1224 and retry the command. +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging ext3/for_next (0f7dbaee76f40 Merge quota initialization check fix from Chao Yu.) +$ git merge ext3/for_next +Auto-merging fs/ext2/super.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1229 and retry the command. +Merge made by the 'recursive' strategy. + fs/ext2/balloc.c | 10 +- + fs/ext2/super.c | 3 +- + fs/ext2/xattr.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/quota/dquot.c | 4 +- + fs/udf/balloc.c | 11 ++ + fs/udf/ecma_167.h | 14 ++ + fs/udf/file.c | 3 + + fs/udf/ialloc.c | 3 + + fs/udf/inode.c | 55 +++++++- + fs/udf/super.c | 261 +++++++++++++++++++++---------------- + fs/udf/udf_i.h | 6 +- + fs/udf/udfdecl.h | 11 +- + include/linux/quotaops.h | 2 +- + 14 files changed, 250 insertions(+), 137 deletions(-) +Merging ext4/dev (040823b5372b4 Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ioctl.c +CONFLICT (content): Merge conflict in fs/ext4/ioctl.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging Documentation/filesystems/ext4/super.rst +Auto-merging Documentation/filesystems/ext4/inodes.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1225 and retry the command. +Resolved 'fs/ext4/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e6bede74b5d7b] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext4/bigalloc.rst | 32 +- + Documentation/filesystems/ext4/blockgroup.rst | 10 +- + Documentation/filesystems/ext4/blocks.rst | 4 +- + Documentation/filesystems/ext4/directory.rst | 2 +- + Documentation/filesystems/ext4/group_descr.rst | 9 +- + Documentation/filesystems/ext4/inodes.rst | 4 +- + Documentation/filesystems/ext4/super.rst | 20 +- + fs/ext4/block_validity.c | 189 ++++++--- + fs/ext4/dir.c | 7 +- + fs/ext4/ext4.h | 64 ++- + fs/ext4/extents.c | 98 ++++- + fs/ext4/extents_status.c | 521 +++++++++++++++++++------ + fs/ext4/extents_status.h | 8 +- + fs/ext4/file.c | 2 - + fs/ext4/hash.c | 2 +- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 103 ++--- + fs/ext4/ioctl.c | 98 +++++ + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 7 + + fs/jbd2/revoke.c | 4 +- + fs/jbd2/transaction.c | 3 + + fs/unicode/utf8-core.c | 2 +- + fs/unicode/utf8-selftest.c | 4 +- + 24 files changed, 890 insertions(+), 309 deletions(-) +Merging f2fs/dev (fbbf779989d2e f2fs: add a condition to detect overflow in f2fs_ioc_gc_range()) +$ git merge f2fs/dev +Auto-merging include/uapi/linux/fs.h +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/inode.c +CONFLICT (content): Merge conflict in fs/f2fs/inode.c +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1224 and retry the command. +Resolved 'fs/f2fs/file.c' using previous resolution. +Resolved 'fs/f2fs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4637907e7fdfc] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++ + Documentation/filesystems/f2fs.txt | 8 ++ + fs/f2fs/Kconfig | 5 +- + fs/f2fs/data.c | 104 ++++++++++++------ + fs/f2fs/debug.c | 4 +- + fs/f2fs/dir.c | 184 ++++++++++++++++++++++++++++++-- + fs/f2fs/f2fs.h | 47 ++++++-- + fs/f2fs/file.c | 160 +++++++++++++++++++++------ + fs/f2fs/gc.c | 27 ++++- + fs/f2fs/hash.c | 37 ++++++- + fs/f2fs/inline.c | 18 +++- + fs/f2fs/inode.c | 11 +- + fs/f2fs/namei.c | 54 ++++++---- + fs/f2fs/node.c | 57 +++++++++- + fs/f2fs/segment.c | 135 ++++++++++++----------- + fs/f2fs/segment.h | 12 ++- + fs/f2fs/super.c | 156 +++++++++++++++++++++++++-- + fs/f2fs/sysfs.c | 23 ++++ + fs/f2fs/xattr.c | 6 ++ + include/linux/f2fs_fs.h | 10 +- + include/uapi/linux/fs.h | 1 + + tools/include/uapi/linux/fs.h | 1 + + 22 files changed, 864 insertions(+), 203 deletions(-) +Merging fsverity/fsverity (95ae251fe8283 f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3a4807386a526 fuse: unexport fuse_put_request) +$ git merge fuse/for-next +Auto-merging include/linux/fs_context.h +Auto-merging fs/super.c +Auto-merging fs/namespace.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1224 and retry the command. +Resolved 'Documentation/filesystems/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e960a4cd5038d] Merge remote-tracking branch 'fuse/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/index.rst | 10 + + Documentation/filesystems/virtiofs.rst | 60 ++ + MAINTAINERS | 12 + + fs/fs_context.c | 14 - + fs/fuse/Kconfig | 11 + + fs/fuse/Makefile | 1 + + fs/fuse/cuse.c | 100 +-- + fs/fuse/dev.c | 654 ++++++++--------- + fs/fuse/dir.c | 283 ++++---- + fs/fuse/file.c | 1227 +++++++++++++++++--------------- + fs/fuse/fuse_i.h | 357 +++++----- + fs/fuse/inode.c | 557 ++++++++------- + fs/fuse/readdir.c | 68 +- + fs/fuse/virtio_fs.c | 1195 +++++++++++++++++++++++++++++++ + fs/fuse/xattr.c | 76 +- + fs/namespace.c | 2 - + fs/proc_namespace.c | 2 +- + fs/super.c | 5 - + include/linux/fs_context.h | 1 - + include/uapi/linux/fuse.h | 12 +- + include/uapi/linux/virtio_fs.h | 19 + + include/uapi/linux/virtio_ids.h | 1 + + 22 files changed, 3054 insertions(+), 1613 deletions(-) + create mode 100644 Documentation/filesystems/virtiofs.rst + create mode 100644 fs/fuse/virtio_fs.c + create mode 100644 include/uapi/linux/virtio_fs.h +Merging jfs/jfs-next (a5fdd713d2568 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (4d856f72c10ec Linux 5.3) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ac25ec92aa956 SUNRPC: RPC level errors should always set task->tk_rpc_status) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprt.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/sunrpc/sched.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1227 and retry the command. +Merge made by the 'recursive' strategy. + fs/nfs/nfs4_fs.h | 11 +- + fs/nfs/nfs4proc.c | 309 ++++++++++++++++++++++++-------------- + fs/nfs/nfs4state.c | 22 +-- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/pnfs.c | 71 ++++++++- + fs/nfs/pnfs.h | 17 ++- + include/linux/sunrpc/sched.h | 3 - + include/linux/sunrpc/xprt.h | 1 + + include/linux/sunrpc/xprtrdma.h | 4 +- + include/trace/events/rpcrdma.h | 88 +++++++++-- + net/sunrpc/clnt.c | 12 +- + net/sunrpc/sched.c | 32 +--- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprt.c | 54 ++++--- + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 166 +++++++++----------- + net/sunrpc/xprtrdma/rpc_rdma.c | 71 ++++++--- + net/sunrpc/xprtrdma/transport.c | 15 +- + net/sunrpc/xprtrdma/verbs.c | 263 +++++++++++++++----------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 59 ++++---- + net/sunrpc/xprtsock.c | 8 +- + 21 files changed, 695 insertions(+), 519 deletions(-) +Merging nfsd/nfsd-next (6ee95d1c89918 nfsd: add support for upcall version 2) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/locks.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1232 and retry the command. +Merge made by the 'recursive' strategy. + fs/file_table.c | 1 + + fs/locks.c | 62 ++ + fs/nfsd/Kconfig | 3 +- + fs/nfsd/Makefile | 3 +- + fs/nfsd/acl.h | 8 - + fs/nfsd/blocklayout.c | 3 +- + fs/nfsd/export.c | 13 + + fs/nfsd/filecache.c | 934 +++++++++++++++++++++++++++++++ + fs/nfsd/filecache.h | 61 ++ + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs3xdr.c | 13 +- + fs/nfsd/nfs4callback.c | 35 +- + fs/nfsd/nfs4layouts.c | 12 +- + fs/nfsd/nfs4proc.c | 97 ++-- + fs/nfsd/nfs4recover.c | 388 ++++++++++--- + fs/nfsd/nfs4state.c | 205 +++---- + fs/nfsd/nfs4xdr.c | 45 +- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfssvc.c | 48 +- + fs/nfsd/state.h | 13 +- + fs/nfsd/trace.h | 140 +++++ + fs/nfsd/vfs.c | 314 ++++------- + fs/nfsd/vfs.h | 9 +- + fs/nfsd/xdr4.h | 19 +- + fs/notify/fsnotify.h | 2 - + fs/notify/group.c | 2 + + fs/notify/mark.c | 6 + + include/linux/fs.h | 5 + + include/linux/fsnotify_backend.h | 2 + + include/linux/sunrpc/cache.h | 7 +- + include/linux/sunrpc/svc_rdma.h | 6 +- + include/uapi/linux/nfsd/cld.h | 41 +- + net/sunrpc/cache.c | 15 +- + net/sunrpc/xprtrdma/svc_rdma.c | 7 - + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +- + 36 files changed, 2014 insertions(+), 540 deletions(-) + create mode 100644 fs/nfsd/filecache.c + create mode 100644 fs/nfsd/filecache.h +Merging orangefs/for-next (e6b998ab62be2 orangefs: remove redundant assignment to err) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5c2e9f346b815 ovl: filter of trusted xattr results in audit) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (6a379f67454a3 jffs2: Fix memory leak in jffs2_scan_eraseblock() error path) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/super.c +Auto-merging fs/jffs2/os-linux.h +Auto-merging fs/jffs2/fs.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1228 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 43 +++++++++++++++++++++++++++++++++++-------- + drivers/mtd/ubi/fastmap-wl.c | 6 +++--- + drivers/mtd/ubi/wl.c | 6 ++++++ + fs/jffs2/fs.c | 27 --------------------------- + fs/jffs2/gc.c | 21 +++++++++++++-------- + fs/jffs2/nodelist.c | 2 +- + fs/jffs2/os-linux.h | 3 --- + fs/jffs2/scan.c | 5 ++++- + fs/ubifs/auth.c | 4 +++- + fs/ubifs/debug.c | 1 - + fs/ubifs/super.c | 4 +++- + fs/ubifs/tnc_misc.c | 1 + + 12 files changed, 69 insertions(+), 54 deletions(-) +Merging v9fs/9p-next (aafee43b72863 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Auto-merging fs/9p/vfs_super.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1228 and retry the command. +Merge made by the 'recursive' strategy. + fs/9p/cache.c | 2 ++ + fs/9p/vfs_file.c | 3 +++ + fs/9p/vfs_super.c | 4 ++-- + net/9p/client.c | 1 + + 4 files changed, 8 insertions(+), 2 deletions(-) +Merging xfs/for-next (14e15f1bcd738 xfs: push the grant head when the log head moves forward) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (838c4f3d7515e iomap: move the iomap_dio_rw ->end_io callback into a structure) +$ git merge iomap/iomap-for-next +Auto-merging fs/xfs/xfs_file.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1234 and retry the command. +Merge made by the 'recursive' strategy. + fs/iomap/direct-io.c | 24 ++++++++++-------------- + fs/xfs/xfs_file.c | 14 ++++++++++---- + include/linux/iomap.h | 10 +++++++--- + 3 files changed, 27 insertions(+), 21 deletions(-) +Merging djw-vfs/vfs-for-next (dc617f29dbe5e vfs: don't allow writes to swap files) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (3e501af8dd7b5 Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) +$ git merge vfs/for-next +Auto-merging fs/afs/internal.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1229 and retry the command. +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++++------ + arch/s390/hypfs/inode.c | 137 +++++---- + drivers/usb/gadget/function/f_fs.c | 233 +++++++------- + fs/afs/dynroot.c | 7 - + fs/afs/inode.c | 2 +- + fs/afs/internal.h | 1 - + fs/fhandle.c | 2 +- + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++++++++-------- + fs/gfs2/super.c | 333 +------------------- + fs/gfs2/super.h | 3 +- + kernel/bpf/inode.c | 92 ++++-- + 12 files changed, 751 insertions(+), 769 deletions(-) +$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch +Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/filesystems/vfs.rst +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master cdceb1d865507] Merge remote-tracking branch 'vfs/for-next' + Date: Fri Sep 20 13:15:32 2019 +0100 +Merging printk/for-next (c38822ab9bd62 Merge branch 'for-5.4' into for-next) +$ git merge printk/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2668 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/dev-kmsg | 15 +++++++-------- + kernel/printk/braille.c | 15 +++++++++++---- + kernel/printk/printk.c | 24 +++++++++++++++++------- + lib/test_printf.c | 5 +++++ + lib/vsprintf.c | 13 ++++++++++--- + 5 files changed, 50 insertions(+), 22 deletions(-) +Merging pci/next (42055e9cc44bd Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Removing include/linux/pci-aspm.h +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/hotplug/rpaphp_core.c +Auto-merging drivers/pci/controller/pci-hyperv.c +CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/pci/Kconfig +CONFLICT (content): Merge conflict in drivers/pci/Kconfig +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/jme.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pci/pci-armada8k.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1262 and retry the command. +Resolved 'drivers/pci/Kconfig' using previous resolution. +Resolved 'drivers/pci/controller/pci-hyperv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b9ce083da3b83] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + .../devicetree/bindings/pci/designware-pcie.txt | 6 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +- + .../devicetree/bindings/pci/mediatek-pcie.txt | 1 + + .../bindings/pci/nvidia,tegra194-pcie.txt | 171 ++ + .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- + Documentation/devicetree/bindings/pci/pci.txt | 5 + + Documentation/devicetree/bindings/pci/pcie-al.txt | 46 + + .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 + + MAINTAINERS | 4 +- + arch/arm/boot/dts/ls1021a.dtsi | 2 - + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 - + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 - + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 - + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 3 - + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 - + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 24 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 38 +- + arch/microblaze/include/asm/pci.h | 2 - + arch/mips/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pci.h | 2 - + arch/sparc/include/asm/pci.h | 2 - + drivers/acpi/pci_root.c | 1 - + drivers/char/xillybus/xillybus_pcie.c | 1 - + drivers/infiniband/core/rw.c | 6 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 - + drivers/net/ethernet/jme.c | 1 - + drivers/net/ethernet/realtek/r8169_main.c | 1 - + drivers/net/wireless/ath/ath5k/pci.c | 1 - + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 - + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 - + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 - + drivers/nvme/host/pci.c | 10 +- + drivers/pci/Kconfig | 6 +- + drivers/pci/access.c | 9 - + drivers/pci/bus.c | 2 - + drivers/pci/controller/dwc/Kconfig | 42 +- + drivers/pci/controller/dwc/Makefile | 4 +- + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 37 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + + drivers/pci/controller/dwc/pcie-al.c | 365 +++++ + drivers/pci/controller/dwc/pcie-armada8k.c | 7 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 45 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 30 +- + drivers/pci/controller/dwc/pcie-designware.c | 96 +- + drivers/pci/controller/dwc/pcie-designware.h | 12 + + drivers/pci/controller/dwc/pcie-histb.c | 4 +- + drivers/pci/controller/dwc/pcie-kirin.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 1731 ++++++++++++++++++++ + drivers/pci/controller/pci-host-common.c | 3 +- + drivers/pci/controller/pci-hyperv.c | 94 +- + drivers/pci/controller/pci-tegra.c | 22 +- + drivers/pci/controller/pcie-iproc-platform.c | 9 +- + drivers/pci/controller/pcie-mediatek.c | 20 +- + drivers/pci/controller/pcie-mobiveil.c | 10 +- + drivers/pci/controller/pcie-rockchip-host.c | 16 +- + drivers/pci/controller/vmd.c | 25 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 1 - + drivers/pci/hotplug/cpqphp_core.c | 1 - + drivers/pci/hotplug/cpqphp_ctrl.c | 4 - + drivers/pci/hotplug/cpqphp_nvram.h | 5 +- + drivers/pci/hotplug/ibmphp_res.c | 1 + + drivers/pci/hotplug/pciehp.h | 11 +- + drivers/pci/hotplug/pciehp_core.c | 9 +- + drivers/pci/hotplug/pciehp_ctrl.c | 39 +- + drivers/pci/hotplug/pciehp_hpc.c | 87 +- + drivers/pci/hotplug/rpadlpar_core.c | 1 - + drivers/pci/hotplug/rpaphp_core.c | 1 - + drivers/pci/iov.c | 171 +- + drivers/pci/of.c | 2 +- + drivers/pci/p2pdma.c | 374 +++-- + drivers/pci/pci-acpi.c | 410 ++++- + drivers/pci/pci-bridge-emul.c | 4 +- + drivers/pci/pci-sysfs.c | 223 +-- + drivers/pci/pci.c | 87 +- + drivers/pci/pci.h | 68 +- + drivers/pci/pcie/aspm.c | 9 +- + drivers/pci/pcie/err.c | 2 +- + drivers/pci/probe.c | 326 +--- + drivers/pci/quirks.c | 106 +- + drivers/pci/search.c | 1 - + drivers/pci/setup-bus.c | 8 +- + drivers/pci/vc.c | 5 +- + drivers/pci/vpd.c | 6 + + drivers/phy/tegra/Kconfig | 7 + + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/phy-tegra194-p2u.c | 120 ++ + drivers/scsi/aacraid/linit.c | 1 - + drivers/scsi/hpsa.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - + include/linux/memremap.h | 1 - + include/linux/pci-aspm.h | 36 - + include/linux/pci-p2pdma.h | 28 +- + include/linux/pci.h | 94 +- + include/linux/pci_hotplug.h | 100 -- + include/linux/pci_ids.h | 3 + + include/uapi/linux/pci_regs.h | 15 +- + 99 files changed, 4178 insertions(+), 1173 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/pcie-al.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt + create mode 100644 drivers/pci/controller/dwc/pcie-tegra194.c + create mode 100644 drivers/phy/tegra/phy-tegra194-p2u.c + delete mode 100644 include/linux/pci-aspm.h +Merging pstore/for-next/pstore (609488bc979f9 Linux 5.3-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (8c97be0a0aa08 Merge branch 'for-5.4/core' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1234 and retry the command. +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/hid/Kconfig | 9 ++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 49 +++--- + drivers/hid/hid-core.c | 4 +- + drivers/hid/hid-cougar.c | 6 +- + drivers/hid/hid-creative-sb0540.c | 268 ++++++++++++++++++++++++++++++++ + drivers/hid/hid-gfrm.c | 7 - + drivers/hid/hid-ids.h | 5 +- + drivers/hid/hid-lenovo.c | 2 - + drivers/hid/hid-lg.c | 10 +- + drivers/hid/hid-lg4ff.c | 1 - + drivers/hid/hid-logitech-dj.c | 32 ++-- + drivers/hid/hid-multitouch.c | 37 ++++- + drivers/hid/hid-picolcd_core.c | 7 +- + drivers/hid/hid-prodikeys.c | 12 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-sensor-hub.c | 1 - + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 4 +- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 95 ++++++----- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/hid/wacom_sys.c | 25 ++- + drivers/hid/wacom_wac.c | 76 ++++++++- + include/linux/hid.h | 43 ++--- + 28 files changed, 561 insertions(+), 151 deletions(-) + create mode 100644 drivers/hid/hid-creative-sb0540.c +Merging i2c/i2c/for-next (5ae7657f46b2b Merge branch 'i2c/for-5.4' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging include/linux/i2c.h +Auto-merging drivers/media/i2c/adv748x/adv748x-core.c +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/i2c/busses/i2c-taos-evm.c +Auto-merging drivers/i2c/busses/i2c-i801.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1234 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 4 +- + .../bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} | 0 + .../i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} | 0 + .../i2c/{i2c-sh_mobile.txt => renesas,iic.txt} | 0 + .../i2c/{i2c-riic.txt => renesas,riic.txt} | 0 + MAINTAINERS | 14 +- + drivers/acpi/acpi_apd.c | 7 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 18 +- + drivers/i2c/busses/Kconfig | 17 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-axxia.c | 152 +++++++++++++- + drivers/i2c/busses/i2c-bcm-iproc.c | 6 +- + drivers/i2c/busses/i2c-bcm2835.c | 11 +- + drivers/i2c/busses/i2c-cht-wc.c | 49 ++++- + drivers/i2c/busses/i2c-designware-master.c | 14 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 41 +++- + drivers/i2c/busses/i2c-designware-platdrv.c | 22 +- + drivers/i2c/busses/i2c-exynos5.c | 4 +- + drivers/i2c/busses/i2c-fsi.c | 4 +- + drivers/i2c/busses/i2c-hix5hd2.c | 3 +- + drivers/i2c/busses/i2c-i801.c | 145 ++++++++----- + drivers/i2c/busses/i2c-icy.c | 230 +++++++++++++++++++++ + drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- + drivers/i2c/busses/i2c-imx.c | 17 +- + drivers/i2c/busses/i2c-ismt.c | 2 - + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-ocores.c | 5 +- + drivers/i2c/busses/i2c-piix4.c | 34 ++- + drivers/i2c/busses/i2c-qcom-geni.c | 12 +- + drivers/i2c/busses/i2c-sprd.c | 25 +-- + drivers/i2c/busses/i2c-stm32f7.c | 2 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 56 +++-- + drivers/i2c/busses/i2c-uniphier-f.c | 26 +-- + drivers/i2c/busses/i2c-uniphier.c | 22 +- + drivers/i2c/i2c-core-base.c | 20 +- + drivers/i2c/i2c-slave-eeprom.c | 42 +++- + drivers/media/i2c/adv748x/adv748x-core.c | 6 +- + drivers/media/i2c/adv7604.c | 22 +- + drivers/misc/eeprom/at24.c | 1 - + drivers/watchdog/iTCO_wdt.c | 26 ++- + include/linux/i2c.h | 2 +- + 43 files changed, 803 insertions(+), 271 deletions(-) + rename Documentation/devicetree/bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-sh_mobile.txt => renesas,iic.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-riic.txt => renesas,riic.txt} (100%) + create mode 100644 drivers/i2c/busses/i2c-icy.c +Merging i3c/i3c/next (6030f42d20ced i3c: master: Use dev_to_i3cmaster()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52bc Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (4e19e72f45d36 hwmon: submitting-patches: Add note on comment style) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (fe013f8bc160d Documentation: kbuild: Add document about reproducible builds) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (6f51fdfd8229d media: videobuf-core.c: poll_wait needs a non-NULL buf pointer) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (5f9e832c13707 Linus 5.3-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc7 video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (315ea754a4c4b Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1725 and retry the command. +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (f75d2accca778 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (87ce243206944 cpupower: update German translation) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (071afa50609d4 Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (0ca7ab5b00929 Merge branch 'thermal-soc' into next) +$ git merge thermal/next +Auto-merging MAINTAINERS +CONFLICT (rename/delete): Documentation/thermal/x86_pkg_temperature_thermal.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst left in tree. +CONFLICT (rename/delete): Documentation/thermal/sysfs-api.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/sysfs-api.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/sysfs-api.rst left in tree. +CONFLICT (rename/delete): Documentation/thermal/index.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/index.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/index.rst left in tree. +Auto-merging Documentation/driver-api/index.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1236 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b628f64673eda] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/qoriq-thermal.txt | 1 + + Documentation/driver-api/thermal/index.rst | 2 - + MAINTAINERS | 1 + + drivers/thermal/armada_thermal.c | 5 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 6 -- + .../int340x_thermal/processor_thermal_device.c | 96 +++++++++++++++++++++- + drivers/thermal/intel/intel_pch_thermal.c | 6 +- + drivers/thermal/qcom/tsens-8960.c | 2 + + drivers/thermal/qcom/tsens-v0_1.c | 12 ++- + drivers/thermal/qcom/tsens-v1.c | 1 + + drivers/thermal/qcom/tsens.h | 1 + + drivers/thermal/qoriq_thermal.c | 45 ++++++---- + drivers/thermal/rcar_gen3_thermal.c | 3 +- + drivers/thermal/tegra/soctherm.c | 2 +- + drivers/thermal/thermal_core.c | 44 ++++++---- + drivers/thermal/thermal_hwmon.c | 8 +- + 16 files changed, 177 insertions(+), 58 deletions(-) +Merging thermal-soc/next (4cb9f043447eb thermal: thermal_mmio: remove some dead code) +$ git merge thermal-soc/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2962 and retry the command. +Merge made by the 'recursive' strategy. + drivers/thermal/thermal_mmio.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging ieee1394/for-next (812cd88749e09 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5374 and retry the command. +Merge made by the 'recursive' strategy. +Merging dlm/next (a48f9721e6db7 dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d2 xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2933 and retry the command. +Merge made by the 'recursive' strategy. +Merging rdma/for-next (3eca7fc2d8d12 RDMA: Fix double-free in srq creation error flow) +$ git merge rdma/for-next +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging include/linux/mlx5/device.h +Auto-merging include/Kbuild +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/flow.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1235 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/infiniband/core_locking.rst | 8 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/cache.c | 1 + + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/core/cma_configfs.c | 8 +- + drivers/infiniband/core/core_priv.h | 24 +- + drivers/infiniband/core/counters.c | 8 +- + drivers/infiniband/core/cq.c | 28 + + drivers/infiniband/core/device.c | 129 +++- + drivers/infiniband/core/fmr_pool.c | 13 - + drivers/infiniband/core/iwpm_msg.c | 17 +- + drivers/infiniband/core/iwpm_util.c | 15 +- + drivers/infiniband/core/netlink.c | 63 +- + drivers/infiniband/core/nldev.c | 20 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/infiniband/core/sysfs.c | 30 +- + drivers/infiniband/core/umem.c | 50 +- + drivers/infiniband/core/umem_odp.c | 437 ++++++----- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 5 +- + drivers/infiniband/core/uverbs_main.c | 4 + + drivers/infiniband/core/verbs.c | 1 + + drivers/infiniband/hw/bnxt_re/hw_counters.c | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 6 +- + drivers/infiniband/hw/bnxt_re/main.c | 1 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 45 +- + drivers/infiniband/hw/cxgb4/provider.c | 24 - + drivers/infiniband/hw/efa/efa.h | 3 + + drivers/infiniband/hw/efa/efa_com.c | 70 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 165 ++-- + drivers/infiniband/hw/efa/efa_com_cmd.h | 23 + + drivers/infiniband/hw/efa/efa_main.c | 2 + + drivers/infiniband/hw/efa/efa_verbs.c | 91 ++- + drivers/infiniband/hw/hfi1/chip.c | 2 + + drivers/infiniband/hw/hfi1/chip.h | 1 + + drivers/infiniband/hw/hfi1/mad.c | 45 +- + drivers/infiniband/hw/hfi1/rc.c | 15 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 8 + + drivers/infiniband/hw/hfi1/trace_tid.h | 38 + + drivers/infiniband/hw/hfi1/user_sdma.h | 6 - + drivers/infiniband/hw/hfi1/verbs.c | 17 +- + drivers/infiniband/hw/hns/Kconfig | 8 - + drivers/infiniband/hw/hns/hns_roce_ah.c | 23 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 186 +++-- + drivers/infiniband/hw/hns/hns_roce_device.h | 95 ++- + drivers/infiniband/hw/hns/hns_roce_hem.c | 252 +++--- + drivers/infiniband/hw/hns/hns_roce_hem.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 69 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1065 +++++++++++++++----------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 7 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 434 ++++++----- + drivers/infiniband/hw/hns/hns_roce_qp.c | 359 +++++---- + drivers/infiniband/hw/hns/hns_roce_srq.c | 296 +++---- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 11 - + drivers/infiniband/hw/mlx4/main.c | 3 +- + drivers/infiniband/hw/mlx4/mr.c | 7 +- + drivers/infiniband/hw/mlx4/qp.c | 242 ++++-- + drivers/infiniband/hw/mlx5/devx.c | 26 + + drivers/infiniband/hw/mlx5/flow.c | 13 +- + drivers/infiniband/hw/mlx5/main.c | 131 ++-- + drivers/infiniband/hw/mlx5/mem.c | 13 - + drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 + + drivers/infiniband/hw/mlx5/mr.c | 38 +- + drivers/infiniband/hw/mlx5/odp.c | 172 ++--- + drivers/infiniband/hw/mlx5/qp.c | 25 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/hw/qedr/qedr.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 7 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 3 +- + drivers/infiniband/hw/qib/qib_rc.c | 10 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 2 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 10 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 9 +- + drivers/infiniband/sw/rxe/rxe.h | 4 - + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 23 +- + drivers/infiniband/sw/siw/siw_verbs.c | 3 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 7 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 5 +- + fs/cifs/smbdirect.c | 10 +- + include/Kbuild | 6 - + include/linux/mlx5/device.h | 9 + + include/linux/qed/qed_rdma_if.h | 2 +- + include/rdma/ib.h | 2 + + include/rdma/ib_umem_odp.h | 48 +- + include/rdma/ib_verbs.h | 78 +- + include/rdma/iw_portmap.h | 3 + + include/rdma/opa_port_info.h | 2 + + include/rdma/rdma_netlink.h | 10 +- + include/rdma/rdma_vt.h | 1 + + include/rdma/rdmavt_cq.h | 1 + + include/rdma/rdmavt_qp.h | 35 + + include/rdma/signature.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + + net/9p/trans_rdma.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- + net/sunrpc/xprtrdma/verbs.c | 13 +- + 104 files changed, 3072 insertions(+), 2213 deletions(-) +Merging net-next/master (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge net-next/master +Already up to date. +$ git am -3 ../patches/0001-link-vmlinux.sh-is-now-a-bash-script.patch +Applying: link-vmlinux.sh is now a bash script +$ git reset HEAD^ +Unstaged changes after reset: +M Makefile +M scripts/link-vmlinux.sh +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e8491761a07be] Merge remote-tracking branch 'rdma/for-next' + Date: Fri Sep 20 13:48:12 2019 +0100 +Merging bpf-next/master (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (990925fad5c22 Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (fc603294267f8 net/mlx5: Set only stag for match untagged packets) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (67e80b99a5546 net: phylink: clarify where phylink should be used) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d52 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 9116 and retry the command. +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 31f7d777fe1a5] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd7469 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (aa2eaa8c272a3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (990925fad5c22 Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer') +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (c1d3ad84eae35 cfg80211: Purge frame registrations on iftype change) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f0b444b349e33 gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/incore.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1240 and retry the command. +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 4 +- + fs/gfs2/bmap.c | 193 +++++++++++++++++++-------------------------------- + fs/gfs2/dentry.c | 45 +++--------- + fs/gfs2/dir.c | 3 +- + fs/gfs2/dir.h | 3 +- + fs/gfs2/file.c | 9 ++- + fs/gfs2/glock.c | 115 +++++++++++++++++++++++++++--- + fs/gfs2/glock.h | 6 ++ + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 63 ++++++++++++----- + fs/gfs2/lock_dlm.c | 8 +-- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/quota.c | 2 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 14 ++-- + fs/gfs2/util.c | 2 +- + 16 files changed, 264 insertions(+), 207 deletions(-) +Merging mtd/mtd/next (2cfcfadb8e138 mtd: pmc551: Remove set but not used variable 'soff_lo') +$ git merge mtd/mtd/next +Removing drivers/mtd/nand/raw/nuc900_nand.c +Removing drivers/mtd/devices/m25p80.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1235 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/mxic-nand.txt | 36 + + drivers/mtd/Kconfig | 67 - + drivers/mtd/Makefile | 5 - + drivers/mtd/chips/cfi_cmdset_0002.c | 299 ++-- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 18 - + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/m25p80.c | 347 ---- + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/devices/pmc551.c | 9 +- + drivers/mtd/maps/pismo.c | 3 +- + drivers/mtd/maps/pxa2xx-flash.c | 3 +- + drivers/mtd/mtdcore.c | 86 +- + drivers/mtd/nand/onenand/onenand_base.c | 3 + + drivers/mtd/nand/raw/Kconfig | 14 +- + drivers/mtd/nand/raw/Makefile | 2 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 +- + drivers/mtd/nand/raw/meson_nand.c | 1 + + drivers/mtd/nand/raw/mxic_nand.c | 582 +++++++ + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/nand_bbt.c | 10 +- + drivers/mtd/nand/raw/nuc900_nand.c | 304 ---- + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/raw/oxnas_nand.c | 8 +- + drivers/mtd/nand/raw/r852.c | 4 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 90 +- + drivers/mtd/nand/raw/tango_nand.c | 1 + + drivers/mtd/nand/raw/vf610_nfc.c | 1 + + drivers/mtd/parsers/Kconfig | 68 + + drivers/mtd/parsers/Makefile | 5 + + drivers/mtd/{ => parsers}/ar7part.c | 0 + drivers/mtd/{ => parsers}/bcm47xxpart.c | 0 + drivers/mtd/{ => parsers}/bcm63xxpart.c | 0 + drivers/mtd/{ => parsers}/cmdlinepart.c | 0 + drivers/mtd/{ => parsers}/ofpart.c | 0 + drivers/mtd/sm_ftl.c | 5 +- + drivers/mtd/spi-nor/Kconfig | 2 + + drivers/mtd/spi-nor/aspeed-smc.c | 4 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 19 +- + drivers/mtd/spi-nor/hisi-sfc.c | 1 + + drivers/mtd/spi-nor/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/intel-spi.c | 2 + + drivers/mtd/spi-nor/spi-nor.c | 1712 +++++++++++++++----- + include/linux/mtd/mtd.h | 3 + + include/linux/mtd/nand.h | 2 +- + include/linux/mtd/sharpsl.h | 5 + + include/linux/mtd/spi-nor.h | 291 +++- + 48 files changed, 2531 insertions(+), 1501 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mxic-nand.txt + delete mode 100644 drivers/mtd/devices/m25p80.c + create mode 100644 drivers/mtd/nand/raw/mxic_nand.c + delete mode 100644 drivers/mtd/nand/raw/nuc900_nand.c + rename drivers/mtd/{ => parsers}/ar7part.c (100%) + rename drivers/mtd/{ => parsers}/bcm47xxpart.c (100%) + rename drivers/mtd/{ => parsers}/bcm63xxpart.c (100%) + rename drivers/mtd/{ => parsers}/cmdlinepart.c (100%) + rename drivers/mtd/{ => parsers}/ofpart.c (100%) +Merging nand/nand/next (f480b969448ee mtd: rawnand: omap2: Fix number of bitflips reporting with ELM) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9607af6f857ff mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9575d1a5c0780 crypto: caam - Cast to long first before pointer conversion) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (945b584c94f8c Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (9c9284f9cee90 drm/amdgpu: Move null pointer dereference check) +$ git merge amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (a95819a173788 drm/i915: Extend Haswell GT1 PSMI workaround to all) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 6 ++---- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 --- + drivers/gpu/drm/i915/gt/intel_lrc.c | 1 - + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++----- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ + drivers/gpu/drm/i915/i915_drv.c | 5 +++++ + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 ++++++ + 9 files changed, 21 insertions(+), 15 deletions(-) +Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb68 drm/tegra: Fix gpiod_get_from_of_node() regression) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (65e51e30d8625 drm/panfrost: Prevent race when handling page fault) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +--- + drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++- + drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 3 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 7 ++- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 73 ++++++++++++++++++++--- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 ++-- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +-- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 55 +++++++++++------ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 +- + include/drm/drm_crtc.h | 10 ++-- + include/drm/drm_self_refresh_helper.h | 6 +- + 16 files changed, 157 insertions(+), 73 deletions(-) +Merging drm-msm/msm-next (9f614197c7440 drm/msm: Use the correct dma_sync calls harder) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2bc drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (4cf643a39221a Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (4d24376370fbf gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (dbcc574a4bfad drm/etnaviv: fix missing unlock on error in etnaviv_iommuv1_context_alloc()) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (1bd4584626a97 Merge branch 'regmap-5.4' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (bd9c10bc663dd ALSA: hda/realtek - PCI quirk for Medion E4254) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (4f3ded8cc8890 Merge branch 'asoc-5.3' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (2e6fcfeb9df60 module: Remove leftover '#undef' from export header) +$ git merge modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging scripts/Makefile.modpost +CONFLICT (content): Merge conflict in scripts/Makefile.modpost +Auto-merging init/Kconfig +Auto-merging include/linux/export.h +CONFLICT (content): Merge conflict in include/linux/export.h +Auto-merging drivers/usb/storage/scsiglue.c +Auto-merging drivers/usb/storage/isd200.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging .gitignore +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1237 and retry the command. +Recorded preimage for 'include/linux/export.h' +Recorded preimage for 'scripts/Makefile.modpost' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +--- + drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++- + drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 3 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 7 ++- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 73 ++++++++++++++++++++--- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 ++-- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +-- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 55 +++++++++++------ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 +- + include/drm/drm_crtc.h | 10 ++-- + include/drm/drm_self_refresh_helper.h | 6 +- + 16 files changed, 157 insertions(+), 73 deletions(-) +Merging input/next (410f25de467ee Input: sidewinder - make array seq static const, makes object smaller) +$ git merge input/next +Already up to date. +Merging block/for-next (23846d01858b0 Merge branch 'for-5.4/post' into for-next) +$ git merge block/for-next +Auto-merging include/linux/blkdev.h +Merge made by the 'recursive' strategy. + block/bfq-iosched.c | 35 ++++++--- + block/blk-core.c | 7 ++ + block/blk-integrity.c | 11 +++ + block/blk-mq.c | 6 ++ + block/t10-pi.c | 164 +++++++++++++++++++++-------------------- + drivers/ata/libahci_platform.c | 9 ++- + drivers/block/nbd.c | 108 ++++++++++++++++++--------- + drivers/md/dm-integrity.c | 10 +++ + drivers/nvme/host/core.c | 9 --- + drivers/scsi/sd.c | 8 -- + fs/io_uring.c | 32 ++++---- + include/linux/blkdev.h | 4 + + include/linux/t10-pi.h | 14 ---- + 13 files changed, 248 insertions(+), 169 deletions(-) +Merging device-mapper/for-next (afa179eb60384 dm: introduce DM_GET_TARGET_VERSION) +$ git merge device-mapper/for-next +Auto-merging crypto/Makefile +Auto-merging crypto/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1239 and retry the command. +Merge made by the 'recursive' strategy. + .../admin-guide/device-mapper/dm-clone.rst | 333 +++ + Documentation/admin-guide/device-mapper/verity.rst | 7 + + crypto/Kconfig | 28 + + crypto/Makefile | 1 + + crypto/essiv.c | 663 ++++++ + drivers/md/Kconfig | 27 + + drivers/md/Makefile | 6 + + drivers/md/dm-bufio.c | 192 +- + drivers/md/dm-clone-metadata.c | 964 +++++++++ + drivers/md/dm-clone-metadata.h | 158 ++ + drivers/md/dm-clone-target.c | 2191 ++++++++++++++++++++ + drivers/md/dm-crypt.c | 341 +-- + drivers/md/dm-ioctl.c | 34 +- + drivers/md/dm-raid.c | 10 +- + drivers/md/dm-raid1.c | 7 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-table.c | 8 +- + drivers/md/dm-verity-target.c | 43 +- + drivers/md/dm-verity-verify-sig.c | 133 ++ + drivers/md/dm-verity-verify-sig.h | 60 + + drivers/md/dm-verity.h | 2 + + drivers/md/dm-writecache.c | 27 +- + drivers/md/dm-zoned-target.c | 2 - + drivers/md/dm.c | 8 +- + drivers/md/dm.h | 5 - + drivers/md/persistent-data/dm-space-map-common.c | 4 - + include/uapi/linux/dm-ioctl.h | 6 +- + 27 files changed, 4864 insertions(+), 398 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/dm-clone.rst + create mode 100644 crypto/essiv.c + create mode 100644 drivers/md/dm-clone-metadata.c + create mode 100644 drivers/md/dm-clone-metadata.h + create mode 100644 drivers/md/dm-clone-target.c + create mode 100644 drivers/md/dm-verity-verify-sig.c + create mode 100644 drivers/md/dm-verity-verify-sig.h +Merging pcmcia/pcmcia-next (95691e3eddc41 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (b461197967213 Merge branch 'fixes' into next) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e3506 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7404 and retry the command. +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eec734e9c753c] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99dd md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (8391c6cb2414d mfd: mt6323: Add MT6323 RTC and PWRC) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/da9063/pdata.h +Auto-merging include/Kbuild +Removing drivers/mfd/jz4740-adc.c +Auto-merging drivers/mfd/db8500-prcmu.c +Auto-merging drivers/mfd/ab8500-debugfs.c +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1278 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/mt6397.txt | 20 +- + Documentation/devicetree/bindings/mfd/rn5t618.txt | 5 + + .../bindings/power/reset/mt6323-poweroff.txt | 20 ++ + MAINTAINERS | 2 +- + drivers/mfd/88pm800.c | 12 +- + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/Kconfig | 20 +- + drivers/mfd/Makefile | 5 +- + drivers/mfd/ab3100-core.c | 6 +- + drivers/mfd/ab8500-debugfs.c | 8 +- + drivers/mfd/asic3.c | 2 +- + drivers/mfd/bcm590xx.c | 6 +- + drivers/mfd/da9150-core.c | 6 +- + drivers/mfd/davinci_voicecodec.c | 9 +- + drivers/mfd/db8500-prcmu.c | 44 ++- + drivers/mfd/ezx-pcap.c | 53 ++-- + drivers/mfd/fsl-imx25-tsadc.c | 4 +- + drivers/mfd/htc-i2cpld.c | 3 +- + drivers/mfd/intel-lpss-acpi.c | 26 ++ + drivers/mfd/intel-lpss-pci.c | 25 ++ + drivers/mfd/intel-lpss.c | 39 +-- + drivers/mfd/intel_soc_pmic_bxtwc.c | 4 +- + drivers/mfd/intel_soc_pmic_mrfld.c | 157 ++++++++++ + drivers/mfd/jz4740-adc.c | 324 --------------------- + drivers/mfd/max14577.c | 6 +- + drivers/mfd/max77620.c | 4 +- + drivers/mfd/max77693.c | 12 +- + drivers/mfd/max77843.c | 6 +- + drivers/mfd/max8907.c | 6 +- + drivers/mfd/max8925-i2c.c | 12 +- + drivers/mfd/max8997.c | 18 +- + drivers/mfd/max8998.c | 6 +- + drivers/mfd/mt6397-core.c | 192 ++---------- + drivers/mfd/mt6397-irq.c | 181 ++++++++++++ + drivers/mfd/palmas.c | 6 +- + drivers/mfd/qcom_rpm.c | 12 +- + drivers/mfd/sm501.c | 5 +- + drivers/mfd/timberdale.c | 3 +- + drivers/mfd/tps80031.c | 23 +- + drivers/mfd/twl-core.c | 6 +- + include/Kbuild | 1 - + include/linux/mfd/da9063/pdata.h | 60 ---- + include/linux/mfd/intel_soc_pmic_mrfld.h | 81 ++++++ + include/linux/mfd/mt6397/core.h | 11 + + include/linux/platform_data/cros_ec_commands.h | 12 + + 45 files changed, 742 insertions(+), 727 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt + create mode 100644 drivers/mfd/intel_soc_pmic_mrfld.c + delete mode 100644 drivers/mfd/jz4740-adc.c + create mode 100644 drivers/mfd/mt6397-irq.c + delete mode 100644 include/linux/mfd/da9063/pdata.h + create mode 100644 include/linux/mfd/intel_soc_pmic_mrfld.h +Merging backlight/for-backlight-next (c0b64faf0fe6c backlight: pwm_bl: Set scale type for brightness curves specified in the DT) +$ git merge backlight/for-backlight-next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1283 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-backlight | 26 ++++++++++++++++++ + MAINTAINERS | 2 ++ + drivers/video/backlight/Kconfig | 2 -- + drivers/video/backlight/backlight.c | 19 ++++++++++++++ + drivers/video/backlight/gpio_backlight.c | 24 ++++++++++++++--- + drivers/video/backlight/lm3630a_bl.c | 3 +-- + drivers/video/backlight/lms283gf05.c | 2 +- + drivers/video/backlight/pwm_bl.c | 35 ++++++++++++++++++++++++- + drivers/video/backlight/rave-sp-backlight.c | 10 +++++-- + drivers/video/backlight/tosa_lcd.c | 3 +-- + include/linux/backlight.h | 8 ++++++ + 11 files changed, 120 insertions(+), 14 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-backlight +Merging battery/for-next (7f7378618b410 power: supply: cpcap-charger: Enable vbus boost voltage) +$ git merge battery/for-next +Auto-merging drivers/power/supply/ab8500_charger.c +CONFLICT (content): Merge conflict in drivers/power/supply/ab8500_charger.c +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1284 and retry the command. +Resolved 'drivers/power/supply/ab8500_charger.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 35b5910629b99] Merge remote-tracking branch 'battery/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + drivers/phy/motorola/phy-cpcap-usb.c | 8 +- + drivers/power/reset/gpio-restart.c | 2 +- + drivers/power/reset/reboot-mode.c | 2 +- + drivers/power/supply/ab8500_charger.c | 9 +- + drivers/power/supply/axp288_fuel_gauge.c | 14 +- + drivers/power/supply/bq25890_charger.c | 12 +- + drivers/power/supply/cpcap-charger.c | 23 ++- + drivers/power/supply/isp1704_charger.c | 2 +- + drivers/power/supply/max17042_battery.c | 8 +- + drivers/power/supply/max77650-charger.c | 1 + + drivers/power/supply/power_supply_core.c | 10 +- + drivers/power/supply/power_supply_hwmon.c | 15 +- + drivers/power/supply/sbs-battery.c | 27 ++-- + drivers/power/supply/sc27xx_fuel_gauge.c | 223 ++++++++++++++++++++---------- + 15 files changed, 237 insertions(+), 120 deletions(-) +Merging regulator/for-next (4d856f72c10ec Linux 5.3) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (45893a0abee6b kexec: Fix file verification on S390) +$ git merge security/next-testing +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/Kconfig +CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig +Auto-merging security/Kconfig +Auto-merging kernel/trace/trace_kprobe.c +CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/module.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/ima.h +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/tracefs/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/debugfs/file.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/custom_method.c +Auto-merging arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/kexec-bzimage64.c +Auto-merging arch/x86/kernel/ima_arch.c +Auto-merging arch/x86/include/asm/x86_init.h +Auto-merging arch/x86/boot/compressed/acpi.c +Auto-merging arch/x86/Kconfig +CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree. +Auto-merging arch/s390/configs/defconfig +CONFLICT (content): Merge conflict in arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2928 and retry the command. +Resolved 'arch/s390/configs/debug_defconfig' using previous resolution. +Resolved 'arch/s390/configs/defconfig' using previous resolution. +Resolved 'kernel/trace/trace_kprobe.c' using previous resolution. +Resolved 'security/integrity/ima/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/s390/configs/performance_defconfig +arch/s390/configs/performance_defconfig: needs merge +rm 'arch/s390/configs/performance_defconfig' +$ git commit --no-edit -v -a +[master ff3f532397486] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 ++ + arch/arm64/Kconfig | 6 +- + arch/s390/Kconfig | 2 +- + arch/s390/kernel/kexec_elf.c | 4 +- + arch/s390/kernel/kexec_image.c | 4 +- + arch/s390/kernel/machine_kexec_file.c | 4 +- + arch/x86/Kconfig | 20 ++- + arch/x86/boot/compressed/acpi.c | 19 ++- + arch/x86/include/asm/acpi.h | 9 ++ + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/acpi/boot.c | 5 + + arch/x86/kernel/ima_arch.c | 4 +- + arch/x86/kernel/ioport.c | 7 +- + arch/x86/kernel/kexec-bzimage64.c | 1 + + arch/x86/kernel/msr.c | 8 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/testmmiotrace.c | 5 + + crypto/asymmetric_keys/verify_pefile.c | 4 +- + drivers/acpi/custom_method.c | 6 + + drivers/acpi/osl.c | 14 +- + drivers/acpi/tables.c | 6 + + drivers/char/mem.c | 7 +- + drivers/firmware/efi/efi.c | 6 + + drivers/pci/pci-sysfs.c | 16 ++ + drivers/pci/proc.c | 14 +- + drivers/pci/syscall.c | 4 +- + drivers/pcmcia/cistpl.c | 5 + + drivers/tty/serial/serial_core.c | 5 + + fs/debugfs/file.c | 30 ++++ + fs/debugfs/inode.c | 32 +++- + fs/proc/kcore.c | 6 + + fs/tracefs/inode.c | 42 +++++- + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/acpi.h | 6 + + include/linux/ima.h | 9 ++ + include/linux/kexec.h | 4 +- + include/linux/lsm_hooks.h | 13 ++ + include/linux/security.h | 59 ++++++++ + init/Kconfig | 5 + + init/main.c | 1 + + kernel/events/core.c | 7 + + kernel/kexec.c | 8 + + kernel/kexec_file.c | 68 +++++++-- + kernel/module.c | 37 ++++- + kernel/params.c | 21 ++- + kernel/power/hibernate.c | 3 +- + kernel/trace/bpf_trace.c | 10 ++ + kernel/trace/trace_kprobe.c | 5 + + security/Kconfig | 11 +- + security/Makefile | 2 + + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima.h | 2 + + security/integrity/ima/ima_main.c | 4 +- + security/integrity/ima/ima_policy.c | 50 +++++++ + security/lockdown/Kconfig | 47 ++++++ + security/lockdown/Makefile | 1 + + security/lockdown/lockdown.c | 191 ++++++++++++++++++++++++ + security/security.c | 56 ++++++- + 58 files changed, 861 insertions(+), 76 deletions(-) + create mode 100644 security/lockdown/Kconfig + create mode 100644 security/lockdown/Makefile + create mode 100644 security/lockdown/lockdown.c +Merging apparmor/apparmor-next (136db994852a9 apparmor: increase left match history buffer size) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/mount.c +Auto-merging security/apparmor/match.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4335 and retry the command. +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++-- + security/apparmor/domain.c | 46 ++++----- + security/apparmor/file.c | 26 +++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 49 +-------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 ++++++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- + 13 files changed, 477 insertions(+), 142 deletions(-) +Merging integrity/next-integrity (2a7f0e53daf29 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/Kconfig +Auto-merging scripts/Makefile +Auto-merging kernel/module.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging arch/s390/kernel/machine_kexec_file.c +CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c +Auto-merging arch/s390/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1259 and retry the command. +Resolved 'arch/s390/kernel/machine_kexec_file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b37bdda47743a] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 6 +- + Documentation/security/IMA-templates.rst | 3 + + arch/s390/Kconfig | 2 +- + arch/s390/kernel/machine_kexec_file.c | 24 +-- + certs/system_keyring.c | 61 +++++-- + crypto/asymmetric_keys/pkcs7_verify.c | 33 ++++ + include/crypto/pkcs7.h | 4 + + include/linux/module.h | 3 - + include/linux/module_signature.h | 46 +++++ + include/linux/verification.h | 10 ++ + init/Kconfig | 6 +- + kernel/Makefile | 1 + + kernel/module.c | 1 + + kernel/module_signature.c | 46 +++++ + kernel/module_signing.c | 56 +----- + scripts/Makefile | 2 +- + security/integrity/Kconfig | 2 +- + security/integrity/digsig.c | 43 ++++- + security/integrity/ima/Kconfig | 13 ++ + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 60 ++++++- + security/integrity/ima/ima_api.c | 27 ++- + security/integrity/ima/ima_appraise.c | 194 ++++++++++++++------- + security/integrity/ima/ima_crypto.c | 10 +- + security/integrity/ima/ima_main.c | 24 ++- + security/integrity/ima/ima_modsig.c | 168 ++++++++++++++++++ + security/integrity/ima/ima_policy.c | 71 ++++++-- + security/integrity/ima/ima_template.c | 31 +++- + security/integrity/ima/ima_template_lib.c | 64 ++++++- + security/integrity/ima/ima_template_lib.h | 4 + + security/integrity/integrity.h | 20 +++ + .../selftests/kexec/test_kexec_file_load.sh | 38 +++- + 32 files changed, 871 insertions(+), 203 deletions(-) + create mode 100644 include/linux/module_signature.h + create mode 100644 kernel/module_signature.c + create mode 100644 security/integrity/ima/ima_modsig.c +Merging keys/keys-next (1f96e0f129eb2 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/security.c +Auto-merging security/keys/request_key_auth.c +Auto-merging security/keys/request_key.c +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/digsig.c +Auto-merging net/wireless/reg.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/usb.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/ubifs/auth.c +Auto-merging fs/ecryptfs/keystore.c +CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/cifs/cifs_spnego.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/base/Kconfig +Auto-merging certs/system_keyring.c +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging Documentation/ioctl/ioctl-number.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1257 and retry the command. +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/crypto/keyinfo.c +fs/crypto/keyinfo.c: needs merge +rm 'fs/crypto/keyinfo.c' +$ git commit --no-edit -v -a +[master 2b39493672fa3] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.rst | 1 + + Documentation/security/keys/core.rst | 186 ++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/watch_queue.rst | 460 +++++++++++ + 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 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 124 +-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/security.h | 32 +- + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/keyctl.h | 68 ++ + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 8 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +- + security/keys/keyctl.c | 201 ++++- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 30 +- + security/smack/smack_lsm.c | 85 +- + 93 files changed, 3583 insertions(+), 354 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 608e2a650868a] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Sep 20 14:30:18 2019 +0100 +$ git am -3 ../patches/0001-fscrypt-merge-resolution-for-keys-Replace-uid-gid-pe.patch +Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/crypto/keyring.c +M fs/crypto/keysetup_v1.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 2fe1cb7a11e48] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Sep 20 14:30:18 2019 +0100 +$ git am -3 ../patches/0001-dm-verity-merge-fix-for-keys-Replace-uid-gid-perm-pe.patch +Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-verity-verify-sig.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master a99598ea9a48f] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Sep 20 14:30:18 2019 +0100 +Merging selinux/next (15322a0d90b6f lsm: remove current_security()) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/ss/policydb.h +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/netport.c +Auto-merging security/selinux/netnode.c +Auto-merging security/selinux/netif.c +Auto-merging security/selinux/include/objsec.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/cred.h +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/dnotify/dnotify.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3033 and retry the command. +Merge made by the 'recursive' strategy. + fs/notify/dnotify/dnotify.c | 15 +- + fs/notify/fanotify/fanotify_user.c | 19 +- + fs/notify/inotify/inotify_user.c | 14 +- + include/linux/cred.h | 1 - + include/linux/lsm_hooks.h | 9 +- + include/linux/security.h | 10 +- + security/security.c | 6 + + security/selinux/hooks.c | 49 ++++- + security/selinux/include/classmap.h | 5 +- + security/selinux/include/objsec.h | 20 +- + security/selinux/netif.c | 31 ++- + security/selinux/netnode.c | 30 ++- + security/selinux/netport.c | 24 +-- + security/selinux/ss/policydb.c | 402 ++++++++++++++++++------------------ + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 6 +- + security/selinux/ss/sidtab.c | 48 ++--- + security/selinux/ss/sidtab.h | 19 +- + 18 files changed, 403 insertions(+), 307 deletions(-) +Merging smack/for-next (92604e825304c smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2941 and retry the command. +Merge made by the 'recursive' strategy. + security/smack/smack_access.c | 6 +++--- + security/smack/smack_lsm.c | 40 ++++++++++++++++++++-------------------- + 2 files changed, 23 insertions(+), 23 deletions(-) +Merging tpmdd/next (1c2725a707561 MAINTAINERS: keys: Update path to trusted.h) +$ git merge tpmdd/next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1261 and retry the command. +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/char/tpm/tpm-interface.c | 14 +++++++++----- + security/keys/trusted.c | 5 +++++ + tools/testing/selftests/.gitignore | 2 ++ + tools/testing/selftests/tpm2/Makefile | 1 + + 5 files changed, 18 insertions(+), 6 deletions(-) +Merging watchdog/master (ca2fc5efffde5 watchdog: f71808e_wdt: Add F81803 support) +$ git merge watchdog/master +Removing drivers/watchdog/nuc900_wdt.c +Removing drivers/watchdog/ks8695_wdt.c +Auto-merging drivers/watchdog/Kconfig +Removing Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1297 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 34 ++ + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 58 ++++ + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + + .../bindings/watchdog/fsl-imx7ulp-wdt.txt | 22 ++ + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 22 -- + .../devicetree/bindings/watchdog/watchdog.yaml | 26 ++ + Documentation/watchdog/watchdog-parameters.rst | 19 -- + drivers/watchdog/Kconfig | 33 +- + drivers/watchdog/Makefile | 3 +- + drivers/watchdog/aspeed_wdt.c | 69 +++- + drivers/watchdog/ath79_wdt.c | 4 +- + drivers/watchdog/cpwd.c | 25 +- + drivers/watchdog/diag288_wdt.c | 3 - + drivers/watchdog/f71808e_wdt.c | 17 +- + drivers/watchdog/imx2_wdt.c | 4 +- + drivers/watchdog/imx7ulp_wdt.c | 243 ++++++++++++++ + drivers/watchdog/imx_sc_wdt.c | 9 +- + drivers/watchdog/jz4740_wdt.c | 1 - + drivers/watchdog/ks8695_wdt.c | 319 ------------------- + drivers/watchdog/nuc900_wdt.c | 302 ------------------ + drivers/watchdog/orion_wdt.c | 66 +++- + drivers/watchdog/qcom-wdt.c | 84 ++++- + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/ziirave_wdt.c | 351 ++++++++++----------- + 24 files changed, 789 insertions(+), 930 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml + create mode 100644 drivers/watchdog/imx7ulp_wdt.c + delete mode 100644 drivers/watchdog/ks8695_wdt.c + delete mode 100644 drivers/watchdog/nuc900_wdt.c +Merging iommu/next (e95adb9add75a Merge branches 'arm/omap', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/qcom', 'arm/renesas', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (e6c5d727db0a8 Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1268 and retry the command. +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 17 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 9 +- + drivers/vfio/vfio_iommu_type1.c | 518 +++++++++++++++++++++++++++++++++++- + include/uapi/linux/vfio.h | 71 +++-- + samples/vfio-mdev/mtty.c | 39 +-- + 5 files changed, 583 insertions(+), 71 deletions(-) +Merging audit/next (5f9e832c13707 Linus 5.3-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (59e9fcf8772bd of: restore old handling of cells_name=NULL in of_*_phandle_with_args()) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (556a0964e28c4 mailbox: qcom-apcs: fix max_register value) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (b83ced70fa09c Merge branch 'spi-5.3' into spi-linus) +$ git merge spi/for-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1714 and retry the command. +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (55cd259e59740 Merge branch 'sched/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/intel.c | 8 ++++---- + kernel/sched/fair.c | 16 ---------------- + 3 files changed, 5 insertions(+), 20 deletions(-) +Merging clockevents/clockevents/next (befd04abfbe4b clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated) +$ git merge clockevents/clockevents/next +Auto-merging kernel/time/posix-timers.c +CONFLICT (content): Merge conflict in kernel/time/posix-timers.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1301 and retry the command. +Resolved 'kernel/time/posix-timers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 460c065268063] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/edac-for-next (3e443eb353eda EDAC/amd64: Add PCI device IDs for family 17h, model 70h) +$ git merge edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (bb0fed1c60ccc irqchip/sifive-plic: Switch to fasteoi flow) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-sifive-plic.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1272 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/atmel,aic.txt | 7 ++++-- + drivers/irqchip/irq-al-fic.c | 12 +++++++++ + drivers/irqchip/irq-atmel-aic5.c | 10 ++++++++ + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 29 +++++++++++----------- + 5 files changed, 43 insertions(+), 17 deletions(-) +Merging ftrace/for-next (b78b94b821222 selftests/ftrace: Update kprobe event error testcase) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/kprobes.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1268 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/trace/kprobetrace.rst | 1 + + Documentation/trace/uprobetracer.rst | 1 + + arch/arm64/include/asm/ftrace.h | 13 + + kernel/kprobes.c | 56 +++- + kernel/trace/ftrace.c | 6 +- + kernel/trace/trace.c | 14 +- + kernel/trace/trace.h | 1 - + kernel/trace/trace_dynevent.c | 10 +- + kernel/trace/trace_dynevent.h | 7 +- + kernel/trace/trace_events_hist.c | 25 +- + kernel/trace/trace_kprobe.c | 268 +++++++++++++---- + kernel/trace/trace_output.c | 6 +- + kernel/trace/trace_probe.c | 178 ++++++++++-- + kernel/trace/trace_probe.h | 68 ++++- + kernel/trace/trace_stack.c | 112 +++++++ + kernel/trace/trace_uprobe.c | 299 +++++++++++++++---- + scripts/recordmcount.c | 321 ++++++++++----------- + scripts/recordmcount.h | 150 +++++++--- + tools/testing/selftests/ftrace/test.d/functions | 2 +- + .../ftrace/test.d/kprobe/kprobe_eventname.tc | 16 +- + .../ftrace/test.d/kprobe/kprobe_multiprobe.tc | 35 +++ + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 16 + + 22 files changed, 1199 insertions(+), 406 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc +Merging rcu/rcu/next (049b405029c00 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (fb3925d06c285 KVM: X86: Use IPI shorthands in kvm guest when support) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (aac60f1a86777 KVM: arm/arm64: vgic: Use the appropriate TRACE_INCLUDE_PATH) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/switch.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1270 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_hyp.h | 24 ------------------------ + arch/arm64/kvm/hyp/switch.c | 17 ++--------------- + arch/arm64/kvm/hyp/tlb.c | 36 ++++++++++++++++++++++-------------- + virt/kvm/arm/vgic/trace.h | 2 +- + 4 files changed, 25 insertions(+), 54 deletions(-) +Merging kvm-ppc/kvm-ppc-next (ff42df49e75f0 KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0af2889f89bbb KVM: s390: Remove unused parameter from __inject_sigp_restart()) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/interrupt.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1270 and retry the command. +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging xen-tip/linux-next (a4098bc6eed5e xen/pci: reserve MCFG areas earlier) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/swiotlb-xen.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1268 and retry the command. +Merge made by the 'recursive' strategy. + drivers/xen/pci.c | 21 +++++++++++++++------ + drivers/xen/swiotlb-xen.c | 5 ++--- + 2 files changed, 17 insertions(+), 9 deletions(-) +Merging percpu/for-next (69f98a60cdbb2 Merge branch 'for-5.4' into for-next) +$ git merge percpu/for-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1705 and retry the command. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (def98c84b6cdf workqueue: Fix spurious sanity check failures in destroy_workqueue()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) +Merging drivers-x86/for-next (b3abfd778bf1d tools/power/x86/intel-speed-select: Fix perf-profile command output) +$ git merge drivers-x86/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1302 and retry the command. +Merge made by the 'recursive' strategy. + drivers/platform/x86/Kconfig | 1 + + tools/power/x86/intel-speed-select/isst-config.c | 122 +++++++++++++++++++--- + tools/power/x86/intel-speed-select/isst-core.c | 25 +++++ + tools/power/x86/intel-speed-select/isst-display.c | 71 +++++++++++++ + tools/power/x86/intel-speed-select/isst.h | 10 +- + 5 files changed, 214 insertions(+), 15 deletions(-) +Merging chrome-platform/for-next (4c1fde5077dca platform/chrome: cros_usbpd_logger: null check create_singlethread_workqueue) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (c1030cd456198 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Auto-merging drivers/hsi/clients/ssi_protocol.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1302 and retry the command. +Merge made by the 'recursive' strategy. + drivers/hsi/clients/ssi_protocol.c | 7 ++++--- + drivers/hsi/controllers/omap_ssi_core.c | 4 +--- + drivers/hsi/controllers/omap_ssi_port.c | 4 +--- + 3 files changed, 6 insertions(+), 9 deletions(-) +Merging leds/for-next (6d4faf3b6b6eb leds: lm3532: Fix optional led-max-microamp prop error handling) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (c9acc3c4f8e42 ipmi_si_intf: Fix race in timer shutdown handling) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (18a93cd38be3e usb: gadget: net2280: Add workaround for AB chip Errata 11) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7a786b8479078 USB: serial: ftdi_sio: add support for FT232H CBUS gpios) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (ecd55e367f3d7 usb: chipidea: msm: Use device-managed registration API) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (5af67635c36ed phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (6cfae0c26b21d Merge tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (f25379de41238 extcon-intel-cht-wc: Don't reset USB data connection at probe) +$ git merge extcon/extcon-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1302 and retry the command. +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) +Merging soundwire/next (dfcff3f8a5f18 soundwire: stream: make stream name a const pointer) +$ git merge soundwire/next +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/Makefile +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1302 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/soundwire/soundwire-controller.yaml | 82 ++++++++ + drivers/soundwire/Makefile | 4 + + drivers/soundwire/bus.c | 20 +- + drivers/soundwire/bus.h | 24 ++- + drivers/soundwire/bus_type.c | 3 + + drivers/soundwire/cadence_master.c | 211 +++++++++++++++++---- + drivers/soundwire/cadence_master.h | 6 +- + drivers/soundwire/debugfs.c | 151 +++++++++++++++ + drivers/soundwire/intel.c | 211 +++++++++++++++++++-- + drivers/soundwire/intel_init.c | 11 ++ + drivers/soundwire/mipi_disco.c | 18 +- + drivers/soundwire/slave.c | 53 ++++++ + drivers/soundwire/stream.c | 105 ++++++---- + include/linux/soundwire/sdw.h | 20 +- + include/linux/soundwire/sdw_intel.h | 1 + + 15 files changed, 819 insertions(+), 101 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml + create mode 100644 drivers/soundwire/debugfs.c +Merging thunderbolt/next (dfda204198848 ACPI / property: Add two new Thunderbolt property GUIDs to the list) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05fb8284a4171 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3026 and retry the command. +Merge made by the 'recursive' strategy. +Merging icc/icc-next (6311b6521bcc8 drivers: qcom: Add BCM vote macro to header) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (c5c6faaee6e0c dmaengine: ti: edma: Use bitmap_set() instead of open coded edma_set_bits()) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (275278e1525a4 Merge branch 'for-5.3-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (9a119be2bb130 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1270 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 + + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 + + drivers/scsi/aic94xx/aic94xx_init.c | 9 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 - + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 16 - + drivers/scsi/bnx2fc/bnx2fc_io.c | 7 - + drivers/scsi/csiostor/csio_wr.c | 8 +- + drivers/scsi/cxlflash/main.c | 12 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + + drivers/scsi/esas2r/esas2r_init.c | 13 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 14 +- + drivers/scsi/fcoe/fcoe.c | 17 +- + drivers/scsi/fdomain.c | 6 +- + drivers/scsi/fdomain_isa.c | 5 +- + drivers/scsi/fnic/fnic_debugfs.c | 4 +- + drivers/scsi/fnic/fnic_fcs.c | 14 +- + drivers/scsi/fnic/fnic_isr.c | 4 +- + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 54 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 982 ++++++++++++++++----- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 48 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 92 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 307 +++++-- + drivers/scsi/ibmvscsi/ibmvfc.c | 3 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 + + drivers/scsi/lpfc/lpfc.h | 11 +- + drivers/scsi/lpfc/lpfc_attr.c | 76 +- + drivers/scsi/lpfc/lpfc_bsg.c | 29 +- + drivers/scsi/lpfc/lpfc_crtn.h | 13 +- + drivers/scsi/lpfc/lpfc_ct.c | 68 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 228 +---- + drivers/scsi/lpfc/lpfc_debugfs.h | 61 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 + + drivers/scsi/lpfc/lpfc_els.c | 116 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 181 ++-- + drivers/scsi/lpfc/lpfc_hw.h | 6 +- + drivers/scsi/lpfc/lpfc_hw4.h | 34 + + drivers/scsi/lpfc/lpfc_init.c | 926 +++++++++---------- + drivers/scsi/lpfc/lpfc_mem.c | 65 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 43 +- + drivers/scsi/lpfc/lpfc_nvme.c | 389 +++++--- + drivers/scsi/lpfc/lpfc_nvmet.c | 28 +- + drivers/scsi/lpfc/lpfc_scsi.c | 591 ++++++++----- + drivers/scsi/lpfc/lpfc_sli.c | 533 ++++++++--- + drivers/scsi/lpfc/lpfc_sli.h | 11 +- + drivers/scsi/lpfc/lpfc_sli4.h | 50 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 8 +- + drivers/scsi/megaraid/megaraid_sas.h | 1 + + drivers/scsi/megaraid/megaraid_sas_base.c | 112 ++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 10 +- + drivers/scsi/mpt3sas/mpi/mpi2_image.h | 39 +- + drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 13 +- + drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 13 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 175 +++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 30 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 178 +++- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 196 ++-- + drivers/scsi/ncr53c8xx.c | 4 + + drivers/scsi/pm8001/pm8001_sas.c | 13 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qedf/qedf.h | 1 + + drivers/scsi/qedf/qedf_debugfs.c | 16 +- + drivers/scsi/qedf/qedf_els.c | 38 +- + drivers/scsi/qedf/qedf_fip.c | 33 +- + drivers/scsi/qedf/qedf_io.c | 67 +- + drivers/scsi/qedf/qedf_main.c | 178 ++-- + drivers/scsi/qedf/qedf_version.h | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 12 +- + drivers/scsi/qla2xxx/qla_bsg.c | 23 +- + drivers/scsi/qla2xxx/qla_dbg.c | 3 +- + drivers/scsi/qla2xxx/qla_def.h | 132 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 9 +- + drivers/scsi/qla2xxx/qla_dsd.h | 2 + + drivers/scsi/qla2xxx/qla_fw.h | 8 +- + drivers/scsi/qla2xxx/qla_gbl.h | 33 +- + drivers/scsi/qla2xxx/qla_gs.c | 254 +++--- + drivers/scsi/qla2xxx/qla_init.c | 550 +++++------- + drivers/scsi/qla2xxx/qla_inline.h | 28 +- + drivers/scsi/qla2xxx/qla_iocb.c | 226 ++--- + drivers/scsi/qla2xxx/qla_isr.c | 29 +- + drivers/scsi/qla2xxx/qla_mbx.c | 26 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_mr.c | 67 +- + drivers/scsi/qla2xxx/qla_nvme.c | 32 +- + drivers/scsi/qla2xxx/qla_nvme.h | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 22 +- + drivers/scsi/qla2xxx/qla_nx.h | 14 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 237 +++-- + drivers/scsi/qla2xxx/qla_sup.c | 16 +- + drivers/scsi/qla2xxx/qla_target.c | 212 ++--- + drivers/scsi/qla2xxx/qla_target.h | 35 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 7 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 27 +- + drivers/scsi/qlogicpti.c | 10 + + drivers/scsi/scsi_debugfs.c | 5 +- + drivers/scsi/scsi_lib.c | 52 +- + drivers/scsi/scsi_logging.c | 48 +- + drivers/scsi/sd.c | 1 + + drivers/scsi/smartpqi/Kconfig | 2 + + drivers/scsi/smartpqi/smartpqi.h | 20 +- + drivers/scsi/smartpqi/smartpqi_init.c | 236 ++++- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 102 ++- + drivers/scsi/sun3_scsi.c | 2 + + drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 +- + drivers/scsi/ufs/cdns-pltfrm.c | 40 +- + drivers/scsi/ufs/ufs-hisi.c | 4 +- + drivers/scsi/ufs/ufs-qcom.c | 41 +- + drivers/scsi/ufs/ufs-qcom.h | 4 + + drivers/scsi/ufs/ufs-sysfs.c | 18 +- + drivers/scsi/ufs/ufs.h | 2 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 281 +++--- + drivers/scsi/ufs/ufshcd.h | 57 +- + drivers/scsi/virtio_scsi.c | 88 +- + drivers/scsi/wd33c93.c | 1 + + drivers/target/target_core_user.c | 20 + + include/linux/nvme-fc-driver.h | 2 + + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_dbg.h | 2 - + include/scsi/scsi_host.h | 16 +- + include/uapi/scsi/scsi_bsg_fc.h | 54 +- + include/uapi/scsi/scsi_netlink.h | 20 +- + include/uapi/scsi/scsi_netlink_fc.h | 17 +- + 130 files changed, 5755 insertions(+), 3679 deletions(-) +Merging scsi-mkp/for-next (16da6112047eb Merge branch '5.3/scsi-fixes' into 5.4/scsi-next) +$ git merge scsi-mkp/for-next +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/lpfc/lpfc_sli4.h +CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_sli4.h +Auto-merging drivers/md/dm-rq.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1304 and retry the command. +Resolved 'drivers/scsi/lpfc/lpfc_sli4.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 452eb2c1effc7] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/scsi_lib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging vhost/linux-next (0d4a3f2abbef7 Revert "vhost: block speculation of translated descriptors") +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (741dc0aa4122c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1304 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-remoteproc | 10 +++++++ + MAINTAINERS | 6 ++-- + drivers/remoteproc/da8xx_remoteproc.c | 4 +-- + drivers/remoteproc/keystone_remoteproc.c | 4 --- + drivers/remoteproc/qcom_common.c | 4 +-- + drivers/remoteproc/qcom_q6v5.c | 35 ++++-------------------- + drivers/remoteproc/qcom_q6v5_mss.c | 4 +-- + drivers/remoteproc/remoteproc_sysfs.c | 11 ++++++++ + drivers/remoteproc/stm32_rproc.c | 14 ++++++++++ + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_glink_smem.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 8 +++--- + drivers/rpmsg/rpmsg_internal.h | 5 ++-- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + samples/rpmsg/rpmsg_client_sample.c | 10 ++++--- + 15 files changed, 64 insertions(+), 57 deletions(-) +Merging gpio/for-next (367677d498390 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (b630cea7bee7c gpio: mxc: Only get the second IRQ when there is more than one IRQ) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mxc.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging gpio-intel/for-next (85af79659f455 MAINTAINERS: Remove stale record for gpio-intel-mid.c) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (cb0438e443608 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (55dac43747be9 pinctrl: intel: mark intel_pin_to_gpio __maybe_unused) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (10971e2ab6eb8 pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1304 and retry the command. +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (6cf9481b440da pwm: Fallback to the static lookup-list when acpi_pwm_get fails) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c3 signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (aecea57f84b05 ktest: Fix some typos in config-bisect.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c5306 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (ce54eab71e210 kunit: fix failure to build without printk) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/tpm2/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/tpm2/Makefile +Auto-merging kernel/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1271 and retry the command. +Resolved 'tools/testing/selftests/tpm2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5b64c6117cf83] Merge remote-tracking branch 'kselftest/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kunit/api/index.rst | 16 + + Documentation/dev-tools/kunit/api/test.rst | 11 + + Documentation/dev-tools/kunit/faq.rst | 62 + + Documentation/dev-tools/kunit/index.rst | 79 ++ + Documentation/dev-tools/kunit/start.rst | 180 +++ + Documentation/dev-tools/kunit/usage.rst | 576 ++++++++ + Kconfig | 2 + + MAINTAINERS | 13 + + Makefile | 2 + + arch/um/configs/kunit_defconfig | 3 + + include/kunit/assert.h | 356 +++++ + include/kunit/string-stream.h | 51 + + include/kunit/test.h | 1490 ++++++++++++++++++++ + include/kunit/try-catch.h | 75 + + kernel/Makefile | 2 + + kernel/sysctl-test.c | 392 +++++ + kunit/Kconfig | 38 + + kunit/Makefile | 9 + + kunit/assert.c | 141 ++ + kunit/example-test.c | 88 ++ + kunit/string-stream-test.c | 52 + + kunit/string-stream.c | 217 +++ + kunit/test-test.c | 331 +++++ + kunit/test.c | 478 +++++++ + kunit/try-catch.c | 118 ++ + lib/Kconfig.debug | 11 + + tools/objtool/check.c | 1 + + tools/testing/kunit/.gitignore | 3 + + tools/testing/kunit/configs/all_tests.config | 3 + + tools/testing/kunit/kunit.py | 136 ++ + tools/testing/kunit/kunit_config.py | 66 + + tools/testing/kunit/kunit_kernel.py | 149 ++ + tools/testing/kunit/kunit_parser.py | 310 ++++ + tools/testing/kunit/kunit_tool_test.py | 206 +++ + .../test_data/test_is_test_passed-all_passed.log | 32 + + .../kunit/test_data/test_is_test_passed-crash.log | 69 + + .../test_data/test_is_test_passed-failure.log | 36 + + .../test_data/test_is_test_passed-no_tests_run.log | 75 + + .../test_data/test_output_isolated_correctly.log | 106 ++ + .../kunit/test_data/test_read_from_file.kconfig | 17 + + tools/testing/selftests/Makefile | 22 +- + .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +- + tools/testing/selftests/livepatch/config | 2 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 5 + + tools/testing/selftests/tpm2/Makefile | 1 + + tools/testing/selftests/watchdog/watchdog-test.c | 41 +- + 47 files changed, 6051 insertions(+), 25 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/index.rst + create mode 100644 Documentation/dev-tools/kunit/api/test.rst + create mode 100644 Documentation/dev-tools/kunit/faq.rst + create mode 100644 Documentation/dev-tools/kunit/index.rst + create mode 100644 Documentation/dev-tools/kunit/start.rst + create mode 100644 Documentation/dev-tools/kunit/usage.rst + create mode 100644 arch/um/configs/kunit_defconfig + create mode 100644 include/kunit/assert.h + create mode 100644 include/kunit/string-stream.h + create mode 100644 include/kunit/test.h + create mode 100644 include/kunit/try-catch.h + create mode 100644 kernel/sysctl-test.c + create mode 100644 kunit/Kconfig + create mode 100644 kunit/Makefile + create mode 100644 kunit/assert.c + create mode 100644 kunit/example-test.c + create mode 100644 kunit/string-stream-test.c + create mode 100644 kunit/string-stream.c + create mode 100644 kunit/test-test.c + create mode 100644 kunit/test.c + create mode 100644 kunit/try-catch.c + create mode 100644 tools/testing/kunit/.gitignore + create mode 100644 tools/testing/kunit/configs/all_tests.config + create mode 100755 tools/testing/kunit/kunit.py + create mode 100644 tools/testing/kunit/kunit_config.py + create mode 100644 tools/testing/kunit/kunit_kernel.py + create mode 100644 tools/testing/kunit/kunit_parser.py + create mode 100755 tools/testing/kunit/kunit_tool_test.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log + create mode 100644 tools/testing/kunit/test_data/test_output_isolated_correctly.log + create mode 100644 tools/testing/kunit/test_data/test_read_from_file.kconfig +Merging y2038/y2038 (870e0167cd9cf Merge tag 'compat-ioctl-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/watchdog/f71808e_wdt.c +Auto-merging drivers/watchdog/ath79_wdt.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/vhost/vsock.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/class/usbtmc.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging drivers/rtc/rtc-ds1374.c +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/hwtracing/stm/core.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/dma-buf/sync_file.c +Auto-merging drivers/dma-buf/sw_sync.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/char/random.c +Auto-merging drivers/char/ppdev.c +Auto-merging drivers/android/binder.c +Auto-merging arch/um/drivers/hostaudio_kern.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1305 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/networking/ppp_generic.txt | 2 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + block/scsi_ioctl.c | 132 +++- + drivers/android/binder.c | 2 +- + drivers/block/pktcdvd.c | 25 + + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ppdev.c | 12 +- + drivers/char/random.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwtracing/stm/core.c | 12 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/isdn/capi/capi.c | 31 + + drivers/media/rc/lirc_dev.c | 4 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ppp/ppp_generic.c | 245 +++++--- + drivers/net/tap.c | 12 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rtc/dev.c | 13 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-vr41xx.c | 10 + + drivers/s390/char/tape_char.c | 41 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 28 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/sd.c | 14 +- + drivers/scsi/sg.c | 59 +- + drivers/scsi/st.c | 28 +- + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/pi433/pi433_if.c | 12 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/tty_io.c | 5 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 12 +- + drivers/vfio/vfio.c | 39 +- + drivers/vhost/net.c | 12 +- + drivers/vhost/scsi.c | 12 +- + drivers/vhost/test.c | 12 +- + drivers/vhost/vsock.c | 12 +- + drivers/video/fbdev/aty/atyfb_base.c | 12 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/watchdog/acquirewdt.c | 1 + + drivers/watchdog/advantechwdt.c | 1 + + drivers/watchdog/alim1535_wdt.c | 1 + + drivers/watchdog/alim7101_wdt.c | 1 + + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 1 + + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + drivers/watchdog/cpu5wdt.c | 1 + + drivers/watchdog/eurotechwdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 1 + + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/geodewdt.c | 1 + + drivers/watchdog/ib700wdt.c | 1 + + drivers/watchdog/ibmasr.c | 1 + + drivers/watchdog/indydog.c | 1 + + drivers/watchdog/intel_scu_watchdog.c | 1 + + drivers/watchdog/iop_wdt.c | 1 + + drivers/watchdog/it8712f_wdt.c | 1 + + drivers/watchdog/ixp4xx_wdt.c | 1 + + drivers/watchdog/m54xx_wdt.c | 1 + + drivers/watchdog/machzwd.c | 1 + + drivers/watchdog/mixcomwd.c | 1 + + drivers/watchdog/mtx-1_wdt.c | 1 + + drivers/watchdog/mv64x60_wdt.c | 1 + + drivers/watchdog/nv_tco.c | 1 + + drivers/watchdog/pc87413_wdt.c | 1 + + drivers/watchdog/pcwd.c | 1 + + drivers/watchdog/pcwd_pci.c | 1 + + drivers/watchdog/pcwd_usb.c | 1 + + drivers/watchdog/pika_wdt.c | 1 + + drivers/watchdog/pnx833x_wdt.c | 1 + + drivers/watchdog/rc32434_wdt.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/sa1100_wdt.c | 1 + + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/sbc60xxwdt.c | 1 + + drivers/watchdog/sbc7240_wdt.c | 1 + + drivers/watchdog/sbc_epx_c3.c | 1 + + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + + drivers/watchdog/sc1200wdt.c | 1 + + drivers/watchdog/sc520_wdt.c | 1 + + drivers/watchdog/sch311x_wdt.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/smsc37b787_wdt.c | 1 + + drivers/watchdog/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 1 + + drivers/watchdog/wdrtas.c | 1 + + drivers/watchdog/wdt.c | 1 + + drivers/watchdog/wdt285.c | 1 + + drivers/watchdog/wdt977.c | 1 + + drivers/watchdog/wdt_pci.c | 1 + + fs/btrfs/super.c | 2 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/ceph/super.h | 1 + + fs/compat_ioctl.c | 917 ++-------------------------- + fs/ecryptfs/file.c | 1 + + fs/ext4/ioctl.c | 1 + + fs/f2fs/file.c | 1 + + fs/fat/file.c | 13 +- + fs/fuse/dev.c | 2 +- + fs/gfs2/file.c | 30 + + fs/hpfs/dir.c | 1 + + fs/hpfs/file.c | 1 + + fs/ioctl.c | 80 ++- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/ioctl.c | 1 + + fs/userfaultfd.c | 2 +- + include/linux/blkdev.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 7 + + include/linux/mtio.h | 60 ++ + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 14 + + lib/iov_iter.c | 1 + + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/rfkill/core.c | 2 +- + net/socket.c | 3 + + net/unix/af_unix.c | 19 + + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + 155 files changed, 935 insertions(+), 1394 deletions(-) + create mode 100644 include/linux/mtio.h +Merging livepatching/for-next (1cfe141e17159 Merge branch 'for-5.4-core' into for-next) +$ git merge livepatching/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2366 and retry the command. +Merge made by the 'recursive' strategy. + kernel/livepatch/core.c | 1 + + 1 file changed, 1 insertion(+) +Merging coresight/next (c165d8947bc41 eeprom: Deprecate the legacy eeprom driver) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (b99a3120f9a30 rtc: meson: mark PM functions as __maybe_unused) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-sun6i.c +Removing drivers/rtc/rtc-nuc900.c +Auto-merging drivers/rtc/Kconfig +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1339 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 13 + + .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 4 +- + Documentation/devicetree/bindings/rtc/pcf8563.txt | 4 +- + .../devicetree/bindings/rtc/rtc-ds1307.txt | 1 + + .../devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt | 36 ++ + .../devicetree/bindings/rtc/rtc-meson-vrtc.txt | 22 ++ + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 - + MAINTAINERS | 1 + + drivers/rtc/Kconfig | 42 ++- + drivers/rtc/Makefile | 3 +- + drivers/rtc/class.c | 4 +- + drivers/rtc/rtc-88pm80x.c | 6 +- + drivers/rtc/rtc-88pm860x.c | 4 +- + drivers/rtc/rtc-ab-eoz9.c | 24 +- + drivers/rtc/rtc-ac100.c | 14 +- + drivers/rtc/rtc-armada38x.c | 12 +- + drivers/rtc/rtc-asm9260.c | 4 +- + drivers/rtc/rtc-aspeed.c | 7 +- + drivers/rtc/rtc-at91rm9200.c | 4 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-bd70528.c | 11 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 4 +- + drivers/rtc/rtc-cadence.c | 13 +- + drivers/rtc/rtc-davinci.c | 4 +- + drivers/rtc/rtc-ds1305.c | 7 +- + drivers/rtc/rtc-ds1672.c | 3 - + drivers/rtc/rtc-fsl-ftm-alarm.c | 337 ++++++++++++++++++ + drivers/rtc/rtc-imx-sc.c | 4 +- + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-isl12026.c | 6 +- + drivers/rtc/rtc-jz4740.c | 8 +- + drivers/rtc/rtc-max77686.c | 26 +- + drivers/rtc/rtc-meson-vrtc.c | 155 +++++++++ + drivers/rtc/rtc-mt6397.c | 4 +- + drivers/rtc/rtc-mt7622.c | 1 - + drivers/rtc/rtc-mxc.c | 5 +- + drivers/rtc/rtc-mxc_v2.c | 4 +- + drivers/rtc/rtc-nuc900.c | 271 --------------- + drivers/rtc/rtc-pcf2123.c | 136 ++++---- + drivers/rtc/rtc-pcf2127.c | 380 ++++++++++++++++++--- + drivers/rtc/rtc-pcf85363.c | 7 +- + drivers/rtc/rtc-pcf8563.c | 48 ++- + drivers/rtc/rtc-pic32.c | 4 +- + drivers/rtc/rtc-pm8xxx.c | 4 +- + drivers/rtc/rtc-puv3.c | 12 +- + drivers/rtc/rtc-pxa.c | 8 +- + drivers/rtc/rtc-rk808.c | 6 +- + drivers/rtc/rtc-rv3028.c | 3 +- + drivers/rtc/rtc-rv3029c2.c | 16 +- + drivers/rtc/rtc-rv8803.c | 3 +- + drivers/rtc/rtc-s35390a.c | 56 +-- + drivers/rtc/rtc-s3c.c | 8 +- + drivers/rtc/rtc-s5m.c | 6 +- + drivers/rtc/rtc-sc27xx.c | 7 +- + drivers/rtc/rtc-sd3078.c | 4 +- + drivers/rtc/rtc-snvs.c | 25 +- + drivers/rtc/rtc-spear.c | 4 +- + drivers/rtc/rtc-stm32.c | 1 - + drivers/rtc/rtc-sun6i.c | 74 +++- + drivers/rtc/rtc-sunxi.c | 14 +- + drivers/rtc/rtc-tegra.c | 8 +- + drivers/rtc/rtc-tps6586x.c | 5 +- + drivers/rtc/rtc-tps65910.c | 8 +- + drivers/rtc/rtc-vt8500.c | 4 +- + drivers/rtc/rtc-xgene.c | 4 +- + drivers/rtc/rtc-zynqmp.c | 8 +- + 66 files changed, 1214 insertions(+), 727 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt + create mode 100644 drivers/rtc/rtc-fsl-ftm-alarm.c + create mode 100644 drivers/rtc/rtc-meson-vrtc.c + delete mode 100644 drivers/rtc/rtc-nuc900.c +Merging nvdimm/libnvdimm-for-next (5a852248b320f libnvdimm/altmap: Track namespace boundaries in altmap) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/linux/memremap.h +Auto-merging drivers/nvdimm/security.c +Auto-merging drivers/nvdimm/pfn_devs.c +CONFLICT (content): Merge conflict in drivers/nvdimm/pfn_devs.c +Auto-merging drivers/nvdimm/bus.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1311 and retry the command. +Resolved 'drivers/nvdimm/pfn_devs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 73c75ea0d774e] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/mm/init_64.c | 17 +++- + drivers/acpi/nfit/intel.c | 59 ++++++------ + drivers/nvdimm/btt.c | 8 +- + drivers/nvdimm/bus.c | 10 +- + drivers/nvdimm/dimm_devs.c | 134 ++++++-------------------- + drivers/nvdimm/label.c | 5 - + drivers/nvdimm/namespace_devs.c | 47 ++++++--- + drivers/nvdimm/nd-core.h | 54 ++++------- + drivers/nvdimm/nd.h | 10 +- + drivers/nvdimm/of_pmem.c | 2 +- + drivers/nvdimm/pfn.h | 5 +- + drivers/nvdimm/pfn_devs.c | 112 +++++++++++++++++----- + drivers/nvdimm/pmem.c | 29 +++++- + drivers/nvdimm/region_devs.c | 83 ++++------------ + drivers/nvdimm/security.c | 199 ++++++++++++++++++++++++++------------- + include/linux/huge_mm.h | 7 +- + include/linux/libnvdimm.h | 9 +- + include/linux/memremap.h | 1 + + tools/testing/nvdimm/dimm_devs.c | 19 +--- + tools/testing/nvdimm/test/nfit.c | 3 +- + 20 files changed, 434 insertions(+), 379 deletions(-) +Merging at24/at24/for-next (10742fee98eb3 eeprom: at24: remove unneeded include) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (767202a1e247e NTB: ntb_transport: remove redundant assignment to rc) +$ git merge ntb/ntb-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1309 and retry the command. +Merge made by the 'recursive' strategy. + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (6f88ed285e675 Merge branch 'fixes/usercopy/highmem-fromlist' into for-next/kspp) +$ git merge kspp/for-next/kspp +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1309 and retry the command. +Merge made by the 'recursive' strategy. + mm/usercopy.c | 8 +++++++- + scripts/gcc-plugins/randomize_layout_plugin.c | 10 +++++----- + 2 files changed, 12 insertions(+), 6 deletions(-) +Merging cisco/for-next (9e98c678c2d6a Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a4 Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (799e064cc79e7 fsi: scom: Don't abort operations for minor errors) +$ git merge fsi/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1343 and retry the command. +Merge made by the 'recursive' strategy. +Merging siox/siox/next (1e4b044d22517 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (0a43bffb7e213 slimbus: fix slim_tid_txn()) +$ git merge slimbus/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1343 and retry the command. +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (ad732da57bded nvmem: core: fix nvmem_cell_write inline function) +$ git merge nvmem/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1343 and retry the command. +Merge made by the 'recursive' strategy. + include/linux/nvmem-consumer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xarray/xarray (91abab83839aa XArray: Fix xas_next() with a single entry at 0) +$ git merge xarray/xarray +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2988 and retry the command. +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 2 files changed, 28 insertions(+) +Merging hyperv/hyperv-next (d8bd2d442bb26 Drivers: hv: vmbus: Resume after fixing up old primary channels) +$ git merge hyperv/hyperv-next +Auto-merging include/linux/hyperv.h +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging drivers/hid/hid-hyperv.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1343 and retry the command. +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 4 +- + drivers/hv/channel_mgmt.c | 161 +++++++++++++++++++++++++--- + drivers/hv/connection.c | 8 +- + drivers/hv/hv.c | 66 +++++++----- + drivers/hv/hv_balloon.c | 143 ++++++++++++------------- + drivers/hv/hyperv_vmbus.h | 30 ++++++ + drivers/hv/vmbus_drv.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/hyperv.h | 16 ++- + tools/hv/Build | 3 + + tools/hv/Makefile | 51 +++++++-- + 10 files changed, 613 insertions(+), 134 deletions(-) + create mode 100644 tools/hv/Build +Merging auxdisplay/auxdisplay (4d856f72c10ec Linux 5.3) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (d8a050f5a3e82 kgdb: fix comment regarding static function) +$ git merge kgdb-dt/kgdb/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1311 and retry the command. +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 5 +---- + kernel/debug/kdb/kdb_main.c | 2 +- + 2 files changed, 2 insertions(+), 5 deletions(-) +Merging pidfd/for-next (590ef0128b427 waitid: Add support for waiting for the current process group) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/uapi/linux/sched.h +Auto-merging include/linux/sched/task.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1342 and retry the command. +Merge made by the 'recursive' strategy. + include/linux/pid.h | 2 +- + include/linux/sched/task.h | 1 + + include/uapi/linux/sched.h | 1 + + kernel/fork.c | 14 +- + kernel/pid.c | 37 +++- + tools/testing/selftests/clone3/.gitignore | 2 + + tools/testing/selftests/clone3/Makefile | 11 ++ + tools/testing/selftests/clone3/clone3.c | 231 ++++++++++++++++++++++++ + tools/testing/selftests/clone3/clone3_set_tid.c | 161 +++++++++++++++++ + 9 files changed, 450 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/clone3/.gitignore + create mode 100644 tools/testing/selftests/clone3/Makefile + create mode 100644 tools/testing/selftests/clone3/clone3.c + create mode 100644 tools/testing/selftests/clone3/clone3_set_tid.c +Merging devfreq/for-next (d2f5fccd1ac93 PM / devfreq: Make log message more explicit when devfreq device already exists) +$ git merge devfreq/for-next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1313 and retry the command. +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/devfreq/devfreq.c | 2 +- + include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h +Merging hmm/hmm (62974fc389b36 libnvdimm: Enable unit test infrastructure compile checks) +$ git merge hmm/hmm +Auto-merging mm/page_alloc.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/umem_odp.c +Auto-merging drivers/gpu/drm/radeon/radeon_mn.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging arch/s390/mm/gmap.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1316 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 73 +---- + arch/csky/include/asm/tlb.h | 8 +- + arch/openrisc/kernel/dma.c | 23 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 12 +- + arch/s390/mm/gmap.c | 35 +-- + drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 88 +++--- + drivers/gpu/drm/nouveau/Kconfig | 5 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 456 ++++++++++------------------ + drivers/gpu/drm/nouveau/nouveau_dmem.h | 11 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 + + drivers/gpu/drm/nouveau/nouveau_svm.c | 23 +- + drivers/gpu/drm/radeon/radeon.h | 3 - + drivers/gpu/drm/radeon/radeon_device.c | 2 - + drivers/gpu/drm/radeon/radeon_drv.c | 2 + + drivers/gpu/drm/radeon/radeon_mn.c | 156 +++------- + drivers/infiniband/core/umem.c | 4 +- + drivers/infiniband/core/umem_odp.c | 183 ++++-------- + drivers/infiniband/core/uverbs_cmd.c | 3 - + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/hw/mlx5/main.c | 5 - + drivers/misc/sgi-gru/grufile.c | 1 + + drivers/misc/sgi-gru/grutables.h | 2 - + drivers/misc/sgi-gru/grutlbpurge.c | 84 ++---- + drivers/nvdimm/Kconfig | 12 + + drivers/nvdimm/Makefile | 4 + + fs/proc/task_mmu.c | 80 ++--- + include/linux/hmm.h | 125 ++------ + include/linux/ioport.h | 2 + + include/linux/kernel.h | 23 +- + include/linux/memremap.h | 3 +- + include/linux/migrate.h | 120 ++------ + include/linux/mm.h | 46 --- + include/linux/mm_types.h | 6 - + include/linux/mmu_notifier.h | 59 +++- + include/linux/pagewalk.h | 66 +++++ + include/linux/sched.h | 4 + + include/rdma/ib_umem.h | 2 +- + include/rdma/ib_umem_odp.h | 10 +- + include/rdma/ib_verbs.h | 3 - + kernel/fork.c | 1 - + kernel/resource.c | 45 ++- + kernel/sched/core.c | 19 +- + mm/Kconfig | 20 +- + mm/hmm.c | 490 ++++++++++--------------------- + mm/madvise.c | 42 +-- + mm/memcontrol.c | 25 +- + mm/mempolicy.c | 17 +- + mm/memremap.c | 105 ++++--- + mm/migrate.c | 276 ++++++++--------- + mm/mincore.c | 17 +- + mm/mmu_notifier.c | 263 +++++++++++++---- + mm/mprotect.c | 26 +- + mm/page_alloc.c | 2 +- + mm/pagewalk.c | 126 ++++---- + tools/testing/nvdimm/test/iomap.c | 1 - + 60 files changed, 1369 insertions(+), 1909 deletions(-) + create mode 100644 include/linux/pagewalk.h +Merging fpga/for-next (e56476897448a fpga: Remove dev_err() usage after platform_get_irq()) +$ git merge fpga/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1349 and retry the command. +Merge made by the 'recursive' strategy. + drivers/fpga/zynq-fpga.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging akpm-current/current (f7dcf869ad39f ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xsk.c +Auto-merging net/xdp/xdp_umem.c +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Removing mm/quicklist.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/khugepaged.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/psi.c +Auto-merging kernel/sched/idle.c +Auto-merging kernel/resource.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Removing include/linux/quicklist.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +CONFLICT (content): Merge conflict in include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/asm-generic/bug.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/io_uring.c +Auto-merging fs/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/unicore32/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgalloc.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/pgtable_mm.h +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +Removing arch/hexagon/mm/pgalloc.c +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/xen/page-coherent.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page-coherent.h +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1317 and retry the command. +Resolved 'arch/arm/include/asm/xen/page-coherent.h' using previous resolution. +Resolved 'arch/arm64/include/asm/processor.h' using previous resolution. +Resolved 'arch/arm64/include/asm/xen/page-coherent.h' using previous resolution. +Resolved 'arch/riscv/Kconfig' using previous resolution. +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Resolved 'include/linux/memremap.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/riscv/include/asm/pgtable.h'. +[master 08d4afb6707d0] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-slab | 13 +- + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/filesystems/proc.txt | 4 +- + Documentation/process/deprecated.rst | 10 +- + arch/Kconfig | 11 + + arch/alpha/include/asm/pgalloc.h | 2 - + arch/alpha/include/asm/pgtable.h | 5 - + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 1 - + arch/arc/include/asm/pgtable.h | 5 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/pgalloc.h | 2 - + arch/arm/include/asm/pgtable-nommu.h | 5 - + arch/arm/include/asm/pgtable.h | 2 - + arch/arm/include/asm/processor.h | 2 - + arch/arm/kernel/process.c | 5 - + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/flush.c | 7 +- + arch/arm/mm/mmap.c | 52 ---- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 - + arch/arm64/include/asm/pgtable.h | 2 - + arch/arm64/include/asm/processor.h | 2 - + arch/arm64/kernel/process.c | 8 - + arch/arm64/mm/flush.c | 3 +- + arch/arm64/mm/mmap.c | 72 ----- + arch/arm64/mm/pgd.c | 2 +- + arch/c6x/include/asm/pgtable.h | 5 - + arch/csky/include/asm/pgalloc.h | 2 - + arch/csky/include/asm/pgtable.h | 5 - + arch/h8300/include/asm/pgtable.h | 6 - + arch/hexagon/include/asm/pgalloc.h | 2 - + arch/hexagon/include/asm/pgtable.h | 3 - + arch/hexagon/mm/Makefile | 2 +- + arch/hexagon/mm/pgalloc.c | 10 - + arch/ia64/Kconfig | 4 - + arch/ia64/include/asm/pgalloc.h | 52 +--- + arch/ia64/include/asm/pgtable.h | 5 - + arch/ia64/mm/init.c | 2 +- + arch/m68k/include/asm/pgtable_mm.h | 7 - + arch/m68k/include/asm/pgtable_no.h | 7 - + arch/microblaze/include/asm/pgalloc.h | 122 +------- + arch/microblaze/include/asm/pgtable.h | 7 - + arch/microblaze/mm/pgtable.c | 4 - + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgalloc.h | 2 - + arch/mips/include/asm/pgtable.h | 5 - + arch/mips/include/asm/processor.h | 5 - + arch/mips/include/uapi/asm/mman.h | 3 + + arch/mips/mm/mmap.c | 84 ------ + arch/nds32/include/asm/pgalloc.h | 2 - + arch/nds32/include/asm/pgtable.h | 2 - + arch/nios2/include/asm/pgalloc.h | 2 - + arch/nios2/include/asm/pgtable.h | 2 - + arch/openrisc/include/asm/pgalloc.h | 2 - + arch/openrisc/include/asm/pgtable.h | 5 - + arch/parisc/include/asm/pgalloc.h | 2 - + arch/parisc/include/asm/pgtable.h | 2 - + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/include/asm/pgalloc.h | 2 - + arch/powerpc/include/asm/pgtable.h | 1 - + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/riscv/Kconfig | 12 + + arch/riscv/include/asm/pgalloc.h | 4 - + arch/riscv/include/asm/pgtable.h | 5 - + arch/s390/include/asm/pgtable.h | 6 - + arch/sh/include/asm/pgalloc.h | 44 +-- + arch/sh/include/asm/pgtable.h | 5 - + arch/sh/mm/Kconfig | 3 - + arch/sh/mm/nommu.c | 4 - + arch/sparc/include/asm/pgalloc_32.h | 2 - + arch/sparc/include/asm/pgalloc_64.h | 2 - + arch/sparc/include/asm/pgtable_32.h | 5 - + arch/sparc/include/asm/pgtable_64.h | 1 - + arch/sparc/mm/init_32.c | 1 - + arch/um/include/asm/pgalloc.h | 2 - + arch/um/include/asm/pgtable.h | 2 - + arch/unicore32/include/asm/pgalloc.h | 2 - + arch/unicore32/include/asm/pgtable.h | 2 - + arch/x86/include/asm/pgtable_32.h | 2 - + arch/x86/include/asm/pgtable_64.h | 3 - + arch/x86/mm/pat_rbtree.c | 19 +- + arch/x86/mm/pgtable.c | 6 +- + arch/xtensa/include/asm/pgtable.h | 1 - + arch/xtensa/include/asm/tlbflush.h | 3 - + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/base/memory.c | 44 ++- + drivers/base/node.c | 55 ++-- + drivers/block/drbd/drbd_interval.c | 29 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 5 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- + drivers/infiniband/sw/siw/siw_mem.c | 10 +- + drivers/misc/sram-exec.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 3 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 8 +- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 20 -- + fs/buffer.c | 56 +++- + fs/f2fs/data.c | 1 + + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/inode.c | 3 + + fs/io_uring.c | 2 +- + fs/jbd2/journal.c | 2 - + fs/jbd2/transaction.c | 12 - + fs/ocfs2/alloc.c | 20 +- + fs/ocfs2/aops.c | 38 ++- + fs/ocfs2/blockcheck.c | 26 +- + fs/ocfs2/cluster/heartbeat.c | 103 ++----- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlm/dlmcommon.h | 1 - + fs/ocfs2/dlm/dlmdebug.c | 55 +--- + fs/ocfs2/dlm/dlmdebug.h | 16 +- + fs/ocfs2/dlm/dlmdomain.c | 7 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 20 +- + fs/ocfs2/file.c | 13 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.h | 42 +-- + fs/ocfs2/namei.c | 2 - + fs/ocfs2/ocfs2.h | 3 - + fs/ocfs2/super.c | 10 +- + fs/ocfs2/xattr.c | 56 ++-- + fs/open.c | 8 + + fs/proc/meminfo.c | 8 +- + fs/proc/page.c | 40 +-- + fs/proc/task_mmu.c | 6 +- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 15 +- + fs/reiserfs/fix_node.c | 6 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/lbalance.c | 3 +- + fs/reiserfs/objectid.c | 3 +- + fs/reiserfs/prints.c | 3 - + fs/reiserfs/stree.c | 4 - + include/asm-generic/bug.h | 53 ++-- + include/asm-generic/pgalloc.h | 5 - + include/asm-generic/pgtable.h | 7 +- + include/linux/compaction.h | 22 +- + include/linux/cpumask.h | 14 +- + include/linux/fs.h | 32 +++ + include/linux/genalloc.h | 2 +- + include/linux/huge_mm.h | 16 +- + include/linux/hugetlb.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/jbd2.h | 2 - + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/khugepaged.h | 12 + + include/linux/memcontrol.h | 49 +++- + include/linux/memory.h | 7 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 33 ++- + include/linux/mm_types.h | 4 +- + include/linux/mm_types_task.h | 4 + + include/linux/mmzone.h | 14 +- + include/linux/page_ext.h | 1 + + include/linux/pagemap.h | 10 + + include/linux/printk.h | 22 +- + include/linux/quicklist.h | 94 ------ + include/linux/rbtree_augmented.h | 88 ++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/shrinker.h | 7 +- + include/linux/slab.h | 66 +---- + include/linux/string.h | 50 +++- + include/linux/swap.h | 2 + + include/linux/vmalloc.h | 20 +- + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + include/trace/events/vmscan.h | 71 ++++- + include/trace/events/writeback.h | 38 +-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + init/main.c | 6 +- + ipc/mqueue.c | 22 +- + ipc/msg.c | 18 +- + kernel/debug/debug_core.c | 31 +- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/events/uprobes.c | 81 ++++-- + kernel/fork.c | 16 +- + kernel/hung_task.c | 94 +++++- + kernel/kexec_core.c | 2 + + kernel/panic.c | 42 ++- + kernel/resource.c | 4 +- + kernel/sched/idle.c | 1 - + kernel/sched/psi.c | 2 + + kernel/sysctl.c | 14 +- + lib/Kconfig.debug | 21 +- + lib/Kconfig.kasan | 8 + + lib/bug.c | 11 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/hexdump.c | 21 -- + lib/iov_iter.c | 2 +- + lib/math/rational.c | 63 +++- + lib/rbtree_test.c | 37 ++- + lib/show_mem.c | 5 - + lib/string.c | 12 +- + lib/test_kasan.c | 41 +++ + mm/Kconfig | 16 +- + mm/Kconfig.debug | 4 +- + mm/Makefile | 4 +- + mm/compaction.c | 50 ++-- + mm/filemap.c | 168 +++++------ + mm/gup.c | 125 ++++---- + mm/huge_memory.c | 136 +++++++-- + mm/hugetlb.c | 89 +++++- + mm/hugetlb_cgroup.c | 2 +- + mm/init-mm.c | 2 +- + mm/internal.h | 2 +- + mm/kasan/common.c | 32 ++- + mm/kasan/kasan.h | 14 +- + mm/kasan/report.c | 44 ++- + mm/kasan/tags_report.c | 24 ++ + mm/khugepaged.c | 366 ++++++++++++++++++++---- + mm/kmemleak.c | 326 ++++++--------------- + mm/ksm.c | 18 -- + mm/madvise.c | 326 ++++++++++++++++++--- + mm/memcontrol.c | 185 ++++++++++-- + mm/memfd.c | 2 + + mm/memory.c | 21 +- + mm/memory_hotplug.c | 101 +++---- + mm/mempolicy.c | 4 - + mm/memremap.c | 20 ++ + mm/migrate.c | 13 +- + mm/mmap.c | 84 ++++-- + mm/mmu_gather.c | 2 - + mm/nommu.c | 2 +- + mm/oom_kill.c | 87 +++--- + mm/page_alloc.c | 27 +- + mm/page_owner.c | 123 +++++--- + mm/page_poison.c | 2 +- + mm/page_vma_mapped.c | 3 +- + mm/quicklist.c | 103 ------- + mm/rmap.c | 29 +- + mm/shmem.c | 12 +- + mm/slab.h | 64 +++++ + mm/slab_common.c | 56 +++- + mm/slob.c | 64 +++-- + mm/slub.c | 34 ++- + mm/sparse.c | 18 +- + mm/swap.c | 58 +++- + mm/swap_state.c | 6 +- + mm/swapfile.c | 4 +- + mm/util.c | 122 +++++++- + mm/vmalloc.c | 81 ++++-- + mm/vmscan.c | 316 ++++++++++++-------- + mm/vmstat.c | 2 + + mm/zpool.c | 16 ++ + mm/zsmalloc.c | 19 +- + mm/zswap.c | 8 +- + net/xdp/xdp_umem.c | 9 +- + net/xdp/xsk.c | 2 +- + scripts/checkpatch.pl | 75 ++++- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 +++-- + tools/include/linux/rbtree_augmented.h | 119 +++++--- + tools/lib/rbtree.c | 37 +-- + usr/Makefile | 3 + + 275 files changed, 3842 insertions(+), 2978 deletions(-) + delete mode 100644 arch/hexagon/mm/pgalloc.c + delete mode 100644 include/linux/quicklist.h + delete mode 100644 mm/quicklist.c +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/madvise.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master cce1ef6426f5f] Merge branch 'akpm-current/current' + Date: Fri Sep 20 16:38:49 2019 +0100 +$ 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' +Branch 'akpm' set up to track remote branch 'akpm/master' from 'origin'. +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +warning: notes ref refs/notes/commits is invalid +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: lib: untag user pointers in strn*_user +Applying: mm: untag user pointers passed to memory syscalls +Applying: mm: untag user pointers in mm/gup.c +Applying: mm: untag user pointers in get_vaddr_frames +Applying: fs/namespace: untag user pointers in copy_mount_options +Applying: userfaultfd: untag user pointers +Applying: drm/amdgpu: untag user pointers +Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl +Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get +Applying: tee/shm: untag user pointers in tee_shm_register +Applying: vfio/type1: untag user pointers in vaddr_get_pfn +Applying: mm: untag user pointers in mmap/munmap/mremap/brk +Applying: hexagon: drop empty and unused free_initrd_mem +Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 6ecc5da5a44e5...793d439d9d5ec akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (793d439d9d5ec drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/vm/split_page_table_lock.rst | 10 +++++----- + arch/arc/include/asm/pgalloc.h | 4 ++-- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/mm/init.c | 13 ------------- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +++--- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +++--- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +++--- + arch/powerpc/mm/pgtable-frag.c | 6 +++--- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +++--- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/mm/init_64.c | 4 ++-- + arch/sparc/mm/srmmu.c | 4 ++-- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 ++ + drivers/gpu/drm/radeon/radeon_gem.c | 2 ++ + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +++++---- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tee/tee_shm.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 ++ + fs/namespace.c | 2 +- + fs/userfaultfd.c | 22 ++++++++++++---------- + include/asm-generic/pgalloc.h | 8 ++++---- + include/linux/mm.h | 4 ++-- + lib/strncpy_from_user.c | 3 ++- + lib/strnlen_user.c | 3 ++- + mm/frame_vector.c | 2 ++ + mm/gup.c | 4 ++++ + mm/madvise.c | 2 ++ + mm/mempolicy.c | 3 +++ + mm/migrate.c | 2 +- + mm/mincore.c | 2 ++ + mm/mlock.c | 4 ++++ + mm/mmap.c | 5 +++++ + mm/mprotect.c | 2 ++ + mm/mremap.c | 3 +++ + mm/msync.c | 2 ++ + 51 files changed, 112 insertions(+), 83 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6ac419d9392e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,12 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f5cb4414dc2d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190920 |