diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-15 14:45:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-15 14:45:01 +1000 |
| commit | e689ed79e479fb754a28957a7a58218893d57cb1 (patch) | |
| tree | c4d1fdb0876c647f147672d9ce5b82fa998dcf53 | |
| parent | ae26153cf8ed7bed88aeb2870ec9892e3a3e94e3 (diff) | |
| download | linux-e689ed79e479fb754a28957a7a58218893d57cb1.tar.gz linux-e689ed79e479fb754a28957a7a58218893d57cb1.tar.xz | |
Add linux-next specific files for 20190715next-20190715
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 300 | ||||
| -rw-r--r-- | Next/Trees | 302 | ||||
| -rw-r--r-- | Next/merge.log | 9406 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10011 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..08337a88497e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,300 @@ +Name SHA1 +---- ---- +origin 1d039859330b874d48080885eb31f4f129c246f1 +fixes 3ab4436f688c2d2f221793953cd05435ca84261c +kspp-gustavo d93512ef0f0efa17eded6b9edf8e88e8418f44bd +kbuild-current 964a4eacef67503a1154f7e0a75f52fbdce52022 +arc-current 24a20b0a443fd485852d51d08e98bbd9d212e0ec +arm-current c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d +arm-soc-fixes 2659dc8d225c956b91d8a8e4ef05d91b2e985c02 +arm64-fixes aa69fb62bea15126e744af2e02acc0d6cf3ed4da +m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +powerpc-fixes 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +s390-fixes 9a159190414d461fdac7ae5bb749c2d532b35419 +sparc 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 76104862cccaeaa84fdd23e39f2610a96296291c +bpf af3c24e0e2ed25177b03b60ada9117bb596e8d95 +ipsec 114a5c3240155fdb01bf821c9d326d7bb05bd464 +netfilter 1c5ec78272e3499a06ab24210297e8dbd478a65c +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 2a92b08b18553c101115423bd34963b1a59a45a3 +mac80211 d2ce8d6bfcfed014fd281e06c9b1d4638ddf3f1e +rdma-fixes 4b972a01a7da614b4796475f933094751a295a2f +sound-current 0dcb4efb1095d0a1f5f681c2b94e98b009cc5d77 +sound-asoc-fixes bd6fe4ae445e616f71b9714df77a7515d6a021c5 +regmap-fixes ea09b3e21f18a5e190b26388c6c5f51e174d845f +regulator-fixes 174bc9941d7d1e8fceadd8fb91fb4ccc7ad01750 +spi-fixes 70b5fa4cc32f614032155f94196ba587a8a0546a +pci-current 6dbbd053e6aea827abde89ac9b9d6855dab1a66b +driver-core.current 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +tty.current d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +usb.current d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +usb-gadget-fixes 42de8afc40c97002fceb500e2331f6a722be3c14 +usb-serial-fixes f8377eff548170e8ea8022c067a1fbdf9e1c46a8 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy ada28f7b3a97fa720864c86504a7c426ee6f91c1 +staging.current d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +char-misc.current 964a4eacef67503a1154f7e0a75f52fbdce52022 +soundwire-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +thunderbolt-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +input-current 597473720f4dc69749542bfcfed4a927a43d935e +crypto-current 20e833dc36355ed642d00067641a679c618303fa +ide 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes e2e88325f4bcaea51f454723971f7b5ee0e1aa80 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 0ecfebd2b52404ae0c54a878c872bb93363ada36 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes c7a87ceb17aee9222c069a97aee4647260c7b3a6 +mfd-fixes 63b2de12b7eeacfb2edbe005f5c3cff17a2a02e2 +v4l-dvb-fixes 22be8233b34f4f468934c5fefcbe6151766fb8f2 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes f2ff671f894151a611eae246a1f25b61d6c0354b +at91-fixes ba5e60c9b75dec92d4c695b928f69300b17d7686 +omap-fixes fb59ee37cfe20d10d19568899d1458a58361246c +kvm-fixes 964a4eacef67503a1154f7e0a75f52fbdce52022 +kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 +hwmon-fixes 5696e4aaabf2a6bae0fe8b4abf17fe17c2b03beb +nvdimm-fixes a4a357fd4477a0523aca5afac9c5369b16fdb963 +btrfs-fixes 02252ea054b8c529406655e2e2f4fc60da5b28c9 +vfs-fixes 75f2d86b20bf6aec0392d6dd2ae3ffff26d2ae0e +dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +samsung-krzk-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pinctrl-samsung-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +devicetree-fixes 852d095d16a6298834839f441593f59d58a31978 +scsi-fixes 484647088826f2f651acbda6bcf9536b8a466703 +drm-fixes a0b2cf792ac9db7bb73e599e516adfb9dca8e60b +amdgpu-fixes c08e56c647ba8e4964ffc9e43360f16c9740337e +drm-intel-fixes d7e8a19b38c8ac1a32b6b03af049e2c88d4155db +mmc-fixes 83293386bc95cf5e9f0c0175794455835bd1cb4a +rtc-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes 9be11356057af5baba25eb25061313f7476a6dcd +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 0db7f5cd4aeba4cc63d0068598b3350eba8bb4cd +drm-misc-fixes 2f040d27080ddfffecff2be1a77107c494d0e4f4 +kbuild 0cee22f4fe90ecc6162e8f19958593fab376bf34 +compiler-attributes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 5ddacd4b47c891f0d3ce24151e169c383c023837 +asm-generic 7f3a8dff1219fba3076fe207972d1d7893c099bb +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm b7a735f3a606ab25f055ed456559eb0d49062c92 +arm64 0c61efd322b75ed3143e3d130ebecbebf561adf5 +arm-perf d482e575fbf0f7ec9319bded951f21bbc84312bf +arm-soc 242af9ac5b328e2fb78bf5589bcf9a2c3e8ba0f5 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 11343d25a03b84fb522fc98a5dccf7f605eff912 +aspeed a1f5c11ddb7d072d20195bd5276c67850e637809 +at91 7eb505978425c76480ce3129937092329d9506e4 +bcm2835 08e3c41585386f5cefc91ede8835005742df4ba9 +imx-mxs 2a7f6c1a53763a49b2613e2981de0295b89acb30 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu e1b0b32a5ad6646b9c946398a534f3dd9df59ec2 +omap 7376d6a65730827e34695ebb8584af7d27201113 +qcom 07c1ef89403097efe4d5bde081ceca357d50ccec +renesas a16ecb14d0b0f69f97763cfa271e90ab97e88a19 +reset 6b251ea99242a701b6f8738f20991f3fe90f68ad +rockchip 13622a50d8dbbf34c542135d80f663c3dc089256 +samsung-krzk cf6664323e0fbef58eaec16e55d1e0484361e46a +scmi 0ecfebd2b52404ae0c54a878c872bb93363ada36 +sunxi 6c6b5d7650d96134721de15be59cbf49054ec65e +tegra 033de83170dd0cefa3a5db3a90f3bbba92412877 +clk b1511f7a48c3ab28ae10b7ea1e9eae1481525bbe +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 9f98b3142d22e0fdb253617373931d364c59a797 +h8300 38ef0515e1e89794ad1797ce5fadbface4bec216 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +m68knommu ad97f9df0fee4ddc9ef056dda4dcbc6630d9f972 +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips c9093486f283c3447439f234eb0124129e8e7834 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 0fbf351ddc32ed3ed64f495b98b1c36b4fd7d8b8 +powerpc f5a9e488d62360c91c5770bd55a0b40e419a71ce +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019 +risc-v 0f327f2aaad6a87356cbccfa390d4d3b64d0d3b6 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 499723d12063aab97dfe6b41c822e9c1c74eff3e +sh d3023897b4370bbf7f289806667a2380576d13dd +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml b482e48d29f1461fd0d059a17f32bcfa274127b3 +xtensa 6326b440055fd97acf620ad952aa50878aa8c3b6 +fscrypt 0564336329f0b03a78221ddf51e52af3665e5720 +afs fb2b827702ba02c3066a1291a3de614e7eec1c1d +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 80dfdbfd37d279beae211ba49dd2db84c853777a +ceph d31d07b97a5e76f41e00eb81dcca740e84aa7782 +cifs ce465bf94b70f03136171a62b607864f00093b19 +configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 +ecryptfs 7451c54abc9139585492605d9e91dec2d26c6457 +ext3 5450e8a316a64cddcbc15f90733ebc78aa736545 +ext4 96fcaf86c3cb9340015fb475d79ef0a6fcf858ed +f2fs 3d03243e4536c00d6fdc3ffc60e4bdddc6fdc31c +fuse 766741fcaa1fe5da2cb1e33ae458a5630ff7f667 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs a101b043c44dfcb63bed7f29a675e9fa0259005e +nfs-anna 68f461593f76bd5f17e87cdd0bea28f4278c7268 +nfsd b78fa45d4edb92fd7b882b2ec25b936cad412670 +orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15 +overlayfs 6dde1e42f497b2d4e22466f23019016775607947 +ubifs 8009ce956c3d28022af6b122e50213ad830fc902 +v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98 +xfs 488ca3d8d088ec4658c87aaec6a91e98acccdd54 +iomap eec9066e4a222686357a77314386070c4064038d +djw-vfs 7e328e5930ad85c4669ca12bd20e1828a62a391a +file-locks 5450e8a316a64cddcbc15f90733ebc78aa736545 +vfs 3fcb59f577e2293fe52ea88a0f306b1826bcd2b7 +printk ba174ef6d2241d6718b1df235932f44b675359ca +pci 7b4b0f6b34d893be569da81ffad865a9d3a7d014 +pstore 4c6d80e1144bdf48cae6b602ae30d41f3e5c76a9 +hid bf4945efabdf7c797d0a96f254083ae2eac5beb2 +i2c 9a74c745c68904c3a7ff2d3a7f385593090780a1 +i3c ede2001569c32e5bafd2203c7272bbd3249e942e +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 9f7546570bcb20debfaa97bcf720fa0fcb8fc05a +jc_docs 224d5fd43d250f850d64fb6d668114aff29d7022 +v4l-dvb 22be8233b34f4f468934c5fefcbe6151766fb8f2 +v4l-dvb-next 22be8233b34f4f468934c5fefcbe6151766fb8f2 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 255f790fa642c345638168995e383e123a796cd5 +cpufreq-arm f9020441dbc39133591ff72b420f21f51896afc5 +cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042 +opp 560d1bcad715c215e7ffe5d7cffe045974b623d0 +thermal ff9b011ad14319a3189efd033796410a48b23cde +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm 6051531997ed101e52b1d64cc726c8abc517547b +swiotlb dd853b2dfa65ec519f9281a43714a6f4a6662286 +rdma 0b043644c0ca601cb19943a81aa1f1455dbe9461 +net-next 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +bpf-next a131c2bf165684315f606fdd88cf80be22ba32f3 +ipsec-next c7b37c769d2a5e711106a3c793140a4f46768e04 +mlx5-next 1dd7382b1bb608e7ccae3672621eaceca355ae8b +netfilter-next 1ff2f0fa450ea4e4f87793d9ed513098ec6e12be +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next 5adcdab6ae1b0a53456e8a269b1856094dc20a59 +bluetooth 84b0ddef7fccdc7ff26943920aeb29a0fc76edca +mac80211-next 17c74d7c5f0d46f9a8ec42127f967ec385faf0f6 +gfs2 bb4cb25dd319fa5630cc304c5bfa926266736935 +mtd 46ce10df799fb0647a9c0e3f793e66463a8d6773 +nand bce9437a0a48dd5e19490f56e1cdc39a9be5563c +spi-nor 8d1336c241bdadf61a56e398d82d1e512dbff5f8 +crypto f3880a23564e3172437285ebcb5b8a124539fdae +drm f27b99a1cea7ce3a2a24b907c5a998f0ad5a0268 +amdgpu f445261d1564188d2140ac0f8f58703c260780f2 +drm-intel a8120bc23eeae8f09a49167e32fa79ce5336546e +drm-tegra eb7cf945a8dac8603e6d0759023e9b6cfed7a008 +drm-misc 7f3bbc0b817b51206948b743331c7441bf918c7f +drm-msm 4cf643a39221af24a151ad2cff4e3f95f12f368e +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm fee77829083ad70845bd650f3c84c5900c5abae1 +etnaviv 57bdd4057516fb913d42a7d502b2580bbb9966ee +regmap aaccf3863ce22108ae1d3bac82604eec9d8ae44c +sound b89b889a326a7abf1c9ceef7ddbe06dbaf8c2520 +sound-asoc f82b1d01deade89b9e2aa31614e5903b3d5c53e1 +modules 93651f80dcb616b8c9115cdafc8e57a781af22d0 +input e2c063c8970044033dac9cedc686db27008e4bb1 +block 5b9ddbdf2f362009b6278db421a72f0f21108fb0 +device-mapper bd293d071ffe65e645b4d8104f9d8fe15ea13862 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 59592cc1f5937ced72e11e681c3e358a0375f7ae +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 7efd105c27fd2323789b41b64763a0e33ed79c08 +backlight 73fbfc499448455f1e1c77717040e09e25f1d976 +battery caa2b557841c8cedc1d4862cd31cf76ee940d105 +regulator 097ba891307c26edda3aa7a904429c3091ed4ed9 +security 286e47a07799b95d541ef95c906a3f70958dea13 +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 650b29dbdf2caf7db27cdc8bfa8fc009b28a6ce3 +keys 20adf5593389dfb321caec6af96bf6ad7b841930 +selinux ea74a685ad819aeed316a9bae3d2a5bf762da82d +tpmdd 166a2809d65b282272c474835ec22c882a39ca1b +watchdog 053bc5764bb0a84ef0b26a8e4ddd3e2f4b4f8215 +iommu d95c3885865b71e56d8d60c8617f2ce1f0fa079d +vfio 1e4d09d2212d9e230b967f57bc8df463527dbd75 +audit 839d05e413856bd686a33b59294d4e8238169320 +devicetree f59d261180f3b66367962f1974090815ce710056 +mailbox 25777e5784a7b417967460d4fcf9660d05a0c320 +spi 2e77a18d0464513d0df462ec83b18cb4bf9e21d1 +tip 162b65ddbf2f00dfb8cdc120fb19912e62502143 +clockevents b0c74b96d177304b6d6f8981e90f37f1cd6afa58 +edac-amd b2572772d13e7719841d1711996b5a6564b3caa6 +irqchip 3dae67ce600caaa92c9af6e0cb6cad2db2632a0a +ftrace 730a95953b1f4816cc50793c2de1f339b4c2818c +rcu b989ff070574ad8b8621d866de0a8e9a65d42c80 +kvm a45ff5994c9cde41af627c46abb9f32beae68943 +kvm-arm 1e0cf16cdad1ba53e9eeee8746fe57de42f20c97 +kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30 +kvms390 8343ba2d4820b1738bbb7cb40ec18ea0a3b0b331 +xen-tip 3cd2700894851101a2bc0039da8c1722a8e0e1aa +percpu 03ed70fb0e5e94a645c3872f9a73662c789bf7d7 +workqueues be69d00d9769575e35d83367f465a58dbf82748c +drivers-x86 7d67c8ac25fbc66ee254aa3e33329d1c9bc152ce +chrome-platform 8c3166e17cf10161d2871dfb1d017287c7b79ff1 +hsi a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leds 2605085fba22792f3d4a6b856c7c5a05492d1fde +ipmi ac499fba98c3c65078fd84fa0a62cd6f6d5837ed +driver-core 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +usb d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +usb-gadget b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3 +usb-serial 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c +phy-next 5206026404190125436f81088eb3667076e56083 +tty d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +char-misc 964a4eacef67503a1154f7e0a75f52fbdce52022 +extcon 0937fbb7abeb165ef0ac6a56a3a6f041eca6dbde +soundwire 2aeac95d1a4cc85aae57ab842d5c3340df0f817f +thunderbolt 6fbc7275c7a9ba97877050335f290341a1fd8dbf +staging d7d170a8e357bd9926cc6bfea5c2385c2eac65b2 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma 5c274ca4cfb22a455e880f61536b1894fa29fd17 +cgroup 22a0b83583abc944b66970d3833b02e6477ac280 +scsi 8fdf518974b557be57191bc8f3e66d5ec5595aef +scsi-mkp 484647088826f2f651acbda6bcf9536b8a466703 +vhost 5e663f0410fa2f355042209154029842ba1abd43 +rpmsg ab1291acd4ab8c6171b1187b99110447dde23304 +gpio 9b3b623804a67d2274ee372c1587926ab0275833 +gpio-brgl f360dcd4ef7fbaec774a64c54b402b4c8a4cffb2 +pinctrl 4c105769bf6de29856bf80a4045e6725301c58ce +pinctrl-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pwm 3d25025ce9c2f364ea4ee76f1461c8714b9c0b6d +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest d20f6b41b7c2715b3d900f2da02029dbc14cd60a +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest ee8a84c60bcc1f1615bd9cb3edfe501e26cdc85b +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 28f28ea4343abe5d2b8f0ff0f49883ecad648cb6 +coresight 2f4281f4dce12440727ab770683cfb83eab62a26 +rtc f0162d21cc8025c828fafe56ee25801f770f41da +nvdimm 7c40cc44161a18fc76388190d88e826e89ffb042 +at24 dce91ba39c765b2b90d07c717683abcdd9891592 +ntb d9c53aa440b332059f7f0ce3f7868ff1dc58c62c +kspp 2dcbe7fe226502c81d578d895b1d718ab70bb496 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 371975b0b07520c85098652d561639837a60a905 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus a188339ca5a396acc588e5851ed7e19f66b0ebd9 +nvmem 341f8ae0f8202b3f6bbaf93a579d179fc9e3ec7d +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 765e33f5211ab620c117ff1ee0c4f38c10f7a973 +auxdisplay f4bb1f895aa07dfcb96169192ff7c9154620df87 +kgdb-dt ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 +pidfd 4382fc438ca5f22815e17e1d265447ce02e076f6 +devfreq 27c17be8e4889a2a0ff151617ab4653149b41ba3 +hmm cc5dfd59e375f4d0f2b64643723d16b38b2f2d78 +akpm-current ccad3bef8cfe78f9728dd1efa0229948411c7e06 +akpm 3f5a96b7bfeb0d44d0ceed00b5dfe2c07732deeb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b75adb14d9d7 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,302 @@ +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 +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +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 +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +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 +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 +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 +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-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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 +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..c5d690dc2e4c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9406 @@ +$ date -R +Mon, 15 Jul 2019 07:55:00 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 17a20acaf171 Merge tag 'usb-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb +Merging origin/master (1d039859330b Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 17a20acaf171..1d039859330b +Fast-forward + .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 2 +- + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 45 +- + Documentation/ABI/testing/debugfs-cros-ec | 56 + + Documentation/ABI/testing/debugfs-wilco-ec | 16 +- + Documentation/ABI/testing/procfs-smaps_rollup | 14 +- + Documentation/ABI/testing/pstore | 4 +- + .../testing/sysfs-bus-event_source-devices-format | 4 +- + .../ABI/testing/sysfs-bus-i2c-devices-hm6352 | 12 +- + .../ABI/testing/sysfs-bus-iio-distance-srf08 | 4 +- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- + .../ABI/testing/sysfs-bus-pci-devices-aer_stats | 24 +- + .../ABI/testing/sysfs-bus-pci-devices-cciss | 44 +- + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 22 +- + .../testing/sysfs-class-backlight-driver-lm3533 | 6 +- + Documentation/ABI/testing/sysfs-class-cxl | 6 +- + Documentation/ABI/testing/sysfs-class-devfreq | 2 +- + .../ABI/testing/sysfs-class-led-driver-lm3533 | 8 +- + Documentation/ABI/testing/sysfs-class-leds-gt683r | 4 +- + Documentation/ABI/testing/sysfs-class-powercap | 2 +- + Documentation/ABI/testing/sysfs-class-uwb_rc | 6 - + Documentation/ABI/testing/sysfs-driver-altera-cvp | 2 +- + Documentation/ABI/testing/sysfs-driver-hid | 12 +- + .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- + Documentation/ABI/testing/sysfs-driver-ppi | 2 +- + Documentation/ABI/testing/sysfs-driver-st | 2 +- + Documentation/ABI/testing/sysfs-driver-wacom | 2 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 8 + + Documentation/ABI/testing/sysfs-kernel-fscaps | 2 +- + Documentation/ABI/testing/sysfs-kernel-vmcoreinfo | 2 +- + Documentation/ABI/testing/sysfs-platform-wilco-ec | 40 + + Documentation/admin-guide/cgroup-v2.rst | 10 + + Documentation/admin-guide/kernel-parameters.txt | 30 +- + Documentation/arm64/booting.rst | 2 +- + Documentation/arm64/silicon-errata.rst | 2 + + Documentation/core-api/kernel-api.rst | 2 +- + Documentation/dev-tools/kmemleak.rst | 48 +- + Documentation/device-mapper/snapshot.rst | 18 +- + Documentation/devicetree/bindings/Makefile | 2 +- + .../devicetree/bindings/arm/al,alpine.txt | 16 - + .../devicetree/bindings/arm/al,alpine.yaml | 21 + + Documentation/devicetree/bindings/arm/arm-boards | 2 +- + Documentation/devicetree/bindings/arm/axxia.txt | 12 - + Documentation/devicetree/bindings/arm/axxia.yaml | 19 + + Documentation/devicetree/bindings/arm/cpus.yaml | 487 ++- + .../devicetree/bindings/arm/digicolor.txt | 6 - + .../devicetree/bindings/arm/digicolor.yaml | 16 + + .../devicetree/bindings/arm/idle-states.txt | 15 +- + Documentation/devicetree/bindings/arm/moxart.txt | 12 - + Documentation/devicetree/bindings/arm/moxart.yaml | 19 + + .../devicetree/bindings/arm/nxp/lpc32xx.txt | 8 - + .../devicetree/bindings/arm/nxp/lpc32xx.yaml | 25 + + Documentation/devicetree/bindings/arm/psci.txt | 111 - + Documentation/devicetree/bindings/arm/psci.yaml | 163 + + Documentation/devicetree/bindings/arm/qcom.yaml | 14 + + Documentation/devicetree/bindings/arm/rda.txt | 17 - + Documentation/devicetree/bindings/arm/rda.yaml | 20 + + .../devicetree/bindings/common-properties.txt | 17 +- + .../bindings/display/simple-framebuffer.yaml | 25 +- + .../devicetree/bindings/input/elan_i2c.txt | 11 + + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 2 +- + .../bindings/leds/backlight/lm3630a-backlight.yaml | 21 +- + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 98 + + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 374 ++ + Documentation/devicetree/bindings/mmc/mmc.txt | 178 +- + .../mmc/{tmio_mmc.txt => renesas,sdhi.txt} | 11 +- + .../devicetree/bindings/mmc/sdhci-am654.txt | 9 +- + .../devicetree/bindings/mmc/sdhci-sprd.txt | 26 + + .../devicetree/bindings/mmc/sunxi-mmc.txt | 52 - + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 1 - + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 5 +- + .../devicetree/bindings/mtd/cadence-quadspi.txt | 5 + + .../devicetree/bindings/mtd/cypress,hyperflash.txt | 13 + + .../devicetree/bindings/mtd/stm32-quadspi.txt | 43 - + .../devicetree/bindings/mtd/ti,am654-hbmc.txt | 51 + + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 56 + + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 70 + + .../bindings/net/allwinner,sun4i-emac.txt | 19 - + .../bindings/net/allwinner,sun4i-mdio.txt | 27 - + .../bindings/net/allwinner,sun7i-a20-gmac.txt | 27 - + .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 65 + + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 321 ++ + .../devicetree/bindings/net/dwmac-sun8i.txt | 201 -- + .../bindings/net/ethernet-controller.yaml | 206 ++ + .../devicetree/bindings/net/ethernet-phy.yaml | 177 + + Documentation/devicetree/bindings/net/ethernet.txt | 69 +- + .../devicetree/bindings/net/fixed-link.txt | 55 +- + Documentation/devicetree/bindings/net/mdio.txt | 38 +- + Documentation/devicetree/bindings/net/mdio.yaml | 74 + + Documentation/devicetree/bindings/net/phy.txt | 80 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 411 +++ + Documentation/devicetree/bindings/net/stmmac.txt | 179 +- + .../devicetree/bindings/pci/83xx-512x-pci.txt | 1 - + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 81 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 134 + + .../bindings/pinctrl/bitmain,bm1880-pinctrl.txt | 34 +- + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 3 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt | 2 +- + .../bindings/pinctrl/fsl,imx8mn-pinctrl.txt | 39 + + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 44 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 16 +- + .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 2 +- + .../bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt | 2 +- + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 107 + + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 172 - + .../bindings/pinctrl/pinctrl-bindings.txt | 3 + + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 16 +- + .../bindings/pinctrl/qcom,qcs404-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 8 +- + .../bindings/pinctrl/qcom,sm8150-pinctrl.txt | 190 + + .../bindings/pinctrl/st,stm32-pinctrl.txt | 208 -- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 264 ++ + .../devicetree/bindings/property-units.txt | 34 +- + .../devicetree/bindings/regulator/pv88060.txt | 2 +- + .../devicetree/bindings/serial/mtk-uart.txt | 13 +- + .../devicetree/bindings/serial/st,stm32-usart.txt | 1 + + .../devicetree/bindings/sound/cs42l73.txt | 2 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 3 +- + .../devicetree/bindings/vendor-prefixes.yaml | 76 +- + Documentation/driver-api/gpio/driver.rst | 2 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/ipmb.rst | 105 + + .../driver-model/{binding.txt => binding.rst} | 20 +- + Documentation/driver-model/{bus.txt => bus.rst} | 69 +- + .../driver-model/{class.txt => class.rst} | 74 +- + .../{design-patterns.txt => design-patterns.rst} | 106 +- + .../driver-model/{device.txt => device.rst} | 57 +- + .../driver-model/{devres.txt => devres.rst} | 50 +- + .../driver-model/{driver.txt => driver.rst} | 114 +- + Documentation/driver-model/index.rst | 26 + + .../driver-model/{overview.txt => overview.rst} | 37 +- + .../driver-model/{platform.txt => platform.rst} | 30 +- + .../driver-model/{porting.txt => porting.rst} | 335 +- + Documentation/eisa.txt | 4 +- + Documentation/filesystems/debugfs.txt | 2 +- + Documentation/filesystems/f2fs.txt | 133 +- + Documentation/filesystems/proc.txt | 41 +- + .../filesystems/xfs-self-describing-metadata.txt | 8 +- + Documentation/hwmon/submitting-patches.rst | 2 +- + Documentation/kbuild/headers_install.rst | 7 - + Documentation/kbuild/kbuild.rst | 9 + + Documentation/kbuild/makefiles.rst | 22 +- + Documentation/powerpc/vcpudispatch_stats.txt | 68 + + Documentation/translations/zh_CN/arm64/booting.txt | 2 +- + Documentation/virtual/index.rst | 18 + + Documentation/virtual/kvm/api.txt | 28 + + Documentation/virtual/kvm/arm/psci.txt | 31 + + Documentation/virtual/kvm/cpuid.rst | 107 + + Documentation/virtual/kvm/cpuid.txt | 83 - + Documentation/virtual/kvm/hypercalls.txt | 11 + + Documentation/virtual/kvm/index.rst | 11 + + Documentation/virtual/kvm/locking.txt | 4 +- + Documentation/virtual/kvm/msr.txt | 9 + + .../virtual/{paravirt_ops.txt => paravirt_ops.rst} | 19 +- + MAINTAINERS | 30 +- + Makefile | 117 +- + arch/Kconfig | 8 + + arch/alpha/Makefile | 2 - + arch/alpha/include/asm/pgalloc.h | 40 +- + arch/arc/Kconfig | 2 + + arch/arc/Makefile | 2 +- + arch/arc/configs/tb10x_defconfig | 1 + + arch/arc/mm/dma.c | 71 +- + arch/arm/Kconfig | 8 +- + arch/arm/include/asm/dma-mapping.h | 7 - + arch/arm/include/asm/kvm_emulate.h | 10 + + arch/arm/include/asm/kvm_host.h | 18 +- + arch/arm/include/asm/kvm_hyp.h | 13 +- + arch/arm/include/asm/pgalloc.h | 41 +- + arch/arm/include/asm/ptdump.h | 9 +- + arch/arm/include/uapi/asm/kvm.h | 12 + + arch/arm/kernel/efi.c | 3 +- + arch/arm/mach-omap1/clock.c | 64 +- + arch/arm/mach-omap1/pm.c | 7 +- + arch/arm/mach-omap2/pm-debug.c | 15 +- + arch/arm/mm/dma-mapping-nommu.c | 24 +- + arch/arm/mm/dma-mapping.c | 23 +- + arch/arm/mm/dump.c | 4 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/pageattr.c | 3 +- + arch/arm/mm/ptdump_debugfs.c | 8 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/Makefile | 2 - + arch/arm64/boot/dts/freescale/imx8mn-pinfunc.h | 646 ++++ + arch/arm64/include/asm/assembler.h | 4 + + arch/arm64/include/asm/cpufeature.h | 6 + + arch/arm64/include/asm/kvm_asm.h | 6 + + arch/arm64/include/asm/kvm_emulate.h | 30 +- + arch/arm64/include/asm/kvm_host.h | 23 +- + arch/arm64/include/asm/kvm_hyp.h | 50 +- + arch/arm64/include/asm/pgalloc.h | 47 +- + arch/arm64/include/asm/ptrace.h | 31 +- + arch/arm64/include/asm/sysreg.h | 35 +- + arch/arm64/include/uapi/asm/kvm.h | 10 + + arch/arm64/kernel/cpu_errata.c | 23 +- + arch/arm64/kernel/efi.c | 3 +- + arch/arm64/kernel/setup.c | 5 + + arch/arm64/kernel/smp.c | 5 - + arch/arm64/kernel/traps.c | 4 + + arch/arm64/kvm/hyp/entry.S | 36 +- + arch/arm64/kvm/hyp/hyp-entry.S | 30 +- + arch/arm64/kvm/hyp/switch.c | 14 +- + arch/arm64/kvm/hyp/sysreg-sr.c | 78 +- + arch/arm64/kvm/hyp/tlb.c | 12 +- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +- + arch/arm64/kvm/regmap.c | 4 +- + arch/arm64/kvm/sys_regs.c | 60 +- + arch/arm64/kvm/va_layout.c | 7 +- + arch/arm64/mm/mmu.c | 2 +- + arch/arm64/mm/pageattr.c | 3 +- + arch/arm64/mm/pgd.c | 6 +- + arch/csky/Makefile | 1 - + arch/csky/include/asm/pgalloc.h | 30 +- + arch/m68k/include/asm/sun3_pgalloc.h | 41 +- + arch/mips/Kconfig | 3 + + arch/mips/include/asm/page.h | 3 - + arch/mips/include/asm/pgalloc.h | 33 +- + arch/mips/include/asm/pgtable.h | 3 + + arch/mips/include/asm/ptrace.h | 5 - + arch/mips/jazz/jazzdma.c | 6 - + arch/mips/kvm/mips.c | 4 +- + arch/mips/mm/Makefile | 1 - + arch/mips/mm/cache.c | 2 - + arch/mips/mm/dma-noncoherent.c | 26 +- + arch/mips/mm/gup.c | 303 -- + arch/nds32/Kconfig | 2 + + arch/nds32/Makefile | 2 - + arch/nds32/configs/defconfig | 1 + + arch/nds32/include/asm/pgalloc.h | 31 +- + arch/nds32/kernel/dma.c | 325 +- + arch/nios2/Kconfig | 1 + + arch/nios2/Kconfig.debug | 3 - + arch/nios2/configs/10m50_defconfig | 1 - + arch/nios2/configs/3c120_defconfig | 1 - + arch/nios2/include/asm/page.h | 6 - + arch/nios2/include/asm/pgalloc.h | 37 +- + arch/nios2/mm/dma-mapping.c | 34 +- + arch/openrisc/kernel/dma.c | 22 +- + arch/parisc/Makefile | 12 +- + arch/parisc/configs/a500_defconfig | 1 + + arch/parisc/configs/b180_defconfig | 1 + + arch/parisc/configs/c3000_defconfig | 1 + + arch/parisc/configs/default_defconfig | 1 + + arch/parisc/include/asm/pgalloc.h | 33 +- + arch/parisc/kernel/pci-dma.c | 48 +- + arch/powerpc/Kconfig | 51 +- + arch/powerpc/boot/.gitignore | 2 - + arch/powerpc/boot/Makefile | 16 +- + arch/powerpc/boot/serial.c | 1 - + arch/powerpc/boot/wrapper | 19 +- + arch/powerpc/boot/xz_config.h | 20 + + arch/powerpc/configs/40x/acadia_defconfig | 1 - + arch/powerpc/configs/40x/ep405_defconfig | 1 - + arch/powerpc/configs/40x/kilauea_defconfig | 1 - + arch/powerpc/configs/40x/klondike_defconfig | 1 - + arch/powerpc/configs/40x/makalu_defconfig | 1 - + arch/powerpc/configs/40x/obs600_defconfig | 1 - + arch/powerpc/configs/40x/virtex_defconfig | 1 - + arch/powerpc/configs/40x/walnut_defconfig | 1 - + arch/powerpc/configs/44x/akebono_defconfig | 1 - + arch/powerpc/configs/44x/arches_defconfig | 1 - + arch/powerpc/configs/44x/bamboo_defconfig | 1 - + arch/powerpc/configs/44x/bluestone_defconfig | 1 - + arch/powerpc/configs/44x/canyonlands_defconfig | 1 - + arch/powerpc/configs/44x/currituck_defconfig | 1 - + arch/powerpc/configs/44x/ebony_defconfig | 1 - + arch/powerpc/configs/44x/eiger_defconfig | 1 - + arch/powerpc/configs/44x/fsp2_defconfig | 1 - + arch/powerpc/configs/44x/icon_defconfig | 1 - + arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - + arch/powerpc/configs/44x/katmai_defconfig | 1 - + arch/powerpc/configs/44x/rainier_defconfig | 1 - + arch/powerpc/configs/44x/redwood_defconfig | 1 - + arch/powerpc/configs/44x/sam440ep_defconfig | 1 - + arch/powerpc/configs/44x/sequoia_defconfig | 1 - + arch/powerpc/configs/44x/taishan_defconfig | 1 - + arch/powerpc/configs/44x/virtex5_defconfig | 1 - + arch/powerpc/configs/44x/warp_defconfig | 1 - + arch/powerpc/configs/52xx/cm5200_defconfig | 1 - + arch/powerpc/configs/52xx/lite5200b_defconfig | 1 - + arch/powerpc/configs/52xx/motionpro_defconfig | 1 - + arch/powerpc/configs/52xx/pcm030_defconfig | 1 - + arch/powerpc/configs/52xx/tqm5200_defconfig | 1 - + arch/powerpc/configs/83xx/asp8347_defconfig | 1 - + arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 - + arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 - + arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 1 - + arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 1 - + arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 1 - + arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 1 - + arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 1 - + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 1 - + arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 1 - + arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 1 - + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 1 - + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - + arch/powerpc/configs/85xx/ksi8560_defconfig | 1 - + arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 1 - + arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 1 - + arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 1 - + arch/powerpc/configs/85xx/sbc8548_defconfig | 1 - + arch/powerpc/configs/85xx/stx_gp3_defconfig | 1 - + arch/powerpc/configs/85xx/tqm8548_defconfig | 1 - + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1 - + arch/powerpc/configs/adder875_defconfig | 1 - + arch/powerpc/configs/amigaone_defconfig | 1 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/chrp32_defconfig | 1 - + arch/powerpc/configs/ep8248e_defconfig | 1 - + arch/powerpc/configs/ep88xc_defconfig | 1 - + arch/powerpc/configs/fsl-emb-nonhw.config | 1 - + arch/powerpc/configs/g5_defconfig | 2 - + arch/powerpc/configs/gamecube_defconfig | 2 - + arch/powerpc/configs/holly_defconfig | 1 - + arch/powerpc/configs/linkstation_defconfig | 1 - + arch/powerpc/configs/maple_defconfig | 2 - + arch/powerpc/configs/mgcoge_defconfig | 1 - + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc5200_defconfig | 1 - + arch/powerpc/configs/mpc7448_hpc2_defconfig | 1 - + arch/powerpc/configs/mpc8272_ads_defconfig | 1 - + arch/powerpc/configs/mpc83xx_defconfig | 1 - + arch/powerpc/configs/mpc885_ads_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 2 - + arch/powerpc/configs/powernv_defconfig | 2 - + arch/powerpc/configs/ppc40x_defconfig | 1 - + arch/powerpc/configs/ppc44x_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 4 +- + arch/powerpc/configs/ppc64e_defconfig | 2 - + arch/powerpc/configs/ppc6xx_defconfig | 3 +- + arch/powerpc/configs/pq2fads_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 2 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/configs/tqm8xx_defconfig | 1 - + arch/powerpc/configs/wii_defconfig | 2 - + arch/powerpc/include/asm/book3s/64/mmu.h | 2 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 30 +- + arch/powerpc/include/asm/book3s/64/radix.h | 3 + + arch/powerpc/include/asm/cache.h | 34 +- + arch/powerpc/include/asm/cacheflush.h | 46 +- + arch/powerpc/include/asm/exception-64s.h | 609 +--- + arch/powerpc/include/asm/head-64.h | 204 +- + arch/powerpc/include/asm/hw_breakpoint.h | 21 +- + arch/powerpc/include/asm/iommu.h | 8 - + arch/powerpc/include/asm/lppaca.h | 40 + + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/opal.h | 2 - + arch/powerpc/include/asm/paca.h | 2 + + arch/powerpc/include/asm/pgtable.h | 38 + + arch/powerpc/include/asm/pnv-ocxl.h | 2 +- + arch/powerpc/include/asm/pnv-pci.h | 6 - + arch/powerpc/include/asm/powernv.h | 22 - + arch/powerpc/include/asm/ppc-opcode.h | 20 +- + arch/powerpc/include/asm/ps3stor.h | 2 +- + arch/powerpc/include/asm/pte-walk.h | 28 +- + arch/powerpc/include/asm/ptrace.h | 29 +- + arch/powerpc/include/asm/topology.h | 6 + + arch/powerpc/include/asm/uaccess.h | 1 + + arch/powerpc/include/asm/vas.h | 10 - + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/asm-offsets.c | 2 + + arch/powerpc/kernel/cacheinfo.c | 21 + + arch/powerpc/kernel/cacheinfo.h | 4 + + arch/powerpc/kernel/dawr.c | 101 + + arch/powerpc/kernel/dma-iommu.c | 40 +- + arch/powerpc/kernel/eeh.c | 15 +- + arch/powerpc/kernel/eeh_cache.c | 3 + + arch/powerpc/kernel/exceptions-64s.S | 1437 +++++--- + arch/powerpc/kernel/head_64.S | 2 + + arch/powerpc/kernel/hw_breakpoint.c | 56 - + arch/powerpc/kernel/irq.c | 6 +- + arch/powerpc/kernel/mce_power.c | 3 +- + arch/powerpc/kernel/misc_64.S | 52 - + arch/powerpc/kernel/module_32.c | 24 +- + arch/powerpc/kernel/module_64.c | 62 +- + arch/powerpc/kernel/pci_of_scan.c | 14 +- + arch/powerpc/kernel/process.c | 28 - + arch/powerpc/kernel/prom_init.c | 29 +- + arch/powerpc/kernel/rtas.c | 7 +- + arch/powerpc/kernel/swsusp_32.S | 73 +- + arch/powerpc/kernel/tm.S | 4 +- + arch/powerpc/kernel/trace/ftrace.c | 4 - + arch/powerpc/kvm/Kconfig | 7 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 12 +- + arch/powerpc/kvm/book3s_hv.c | 13 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 6 +- + arch/powerpc/kvm/book3s_hv_tm.c | 6 +- + arch/powerpc/kvm/book3s_xics.c | 2 +- + arch/powerpc/kvm/powerpc.c | 4 +- + arch/powerpc/lib/Makefile | 3 +- + arch/powerpc/lib/ldstfp.S | 4 - + arch/powerpc/lib/pmem.c | 8 +- + arch/powerpc/mm/book3s64/Makefile | 1 - + arch/powerpc/mm/book3s64/hash_native.c | 6 +- + arch/powerpc/mm/book3s64/hash_utils.c | 6 +- + arch/powerpc/mm/book3s64/mmu_context.c | 1 - + arch/powerpc/mm/book3s64/pgtable.c | 23 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 149 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 40 +- + arch/powerpc/mm/book3s64/vphn.h | 16 - + arch/powerpc/mm/hugetlbpage.c | 97 +- + arch/powerpc/mm/init_64.c | 5 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/numa.c | 61 +- + arch/powerpc/mm/pgtable.c | 16 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/mm/pgtable_64.c | 39 +- + arch/powerpc/mm/ptdump/ptdump.c | 6 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 14 +- + arch/powerpc/platforms/40x/Kconfig | 7 +- + arch/powerpc/platforms/44x/Kconfig | 10 +- + arch/powerpc/platforms/4xx/uic.c | 1 + + arch/powerpc/platforms/85xx/Kconfig | 8 +- + arch/powerpc/platforms/86xx/Kconfig | 6 +- + arch/powerpc/platforms/8xx/Kconfig | 7 + + arch/powerpc/platforms/8xx/Makefile | 2 + + arch/powerpc/{sysdev => platforms/8xx}/cpm1.c | 24 +- + arch/powerpc/platforms/8xx/micropatch.c | 378 ++ + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/powerpc/platforms/maple/Kconfig | 2 +- + arch/powerpc/platforms/powermac/sleep.S | 68 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +- + arch/powerpc/platforms/powernv/idle.c | 8 +- + arch/powerpc/platforms/powernv/npu-dma.c | 571 +-- + arch/powerpc/platforms/powernv/opal-call.c | 1 - + arch/powerpc/platforms/powernv/opal-hmi.c | 40 + + arch/powerpc/platforms/powernv/opal.c | 23 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 14 +- + arch/powerpc/platforms/powernv/pci.c | 145 - + arch/powerpc/platforms/powernv/pci.h | 6 - + arch/powerpc/platforms/powernv/vas-window.c | 19 - + arch/powerpc/platforms/powernv/vas.h | 20 - + arch/powerpc/platforms/pseries/Kconfig | 19 +- + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 12 +- + arch/powerpc/platforms/pseries/dtl.c | 23 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 3 + + arch/powerpc/platforms/pseries/hvconsole.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/powerpc/platforms/pseries/lpar.c | 603 +++- + arch/powerpc/platforms/pseries/mobility.c | 19 + + arch/powerpc/platforms/pseries/papr_scm.c | 123 +- + arch/powerpc/platforms/pseries/setup.c | 39 +- + arch/powerpc/platforms/pseries/vio.c | 4 +- + .../{mm/book3s64 => platforms/pseries}/vphn.c | 20 +- + arch/powerpc/sysdev/Makefile | 2 - + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/micropatch.c | 749 ---- + arch/powerpc/sysdev/xics/Kconfig | 13 +- + arch/powerpc/sysdev/xive/spapr.c | 52 +- + arch/powerpc/xmon/xmon.c | 14 +- + arch/riscv/Makefile | 2 - + arch/riscv/include/asm/pgalloc.h | 29 +- + arch/s390/Kconfig | 5 +- + arch/s390/Makefile | 2 - + arch/s390/configs/debug_defconfig | 1 + + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/include/asm/pci_insn.h | 10 - + arch/s390/include/asm/pgtable.h | 8 +- + arch/s390/include/asm/sclp.h | 1 - + arch/s390/include/uapi/asm/dasd.h | 154 +- + arch/s390/kernel/early.c | 2 - + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/perf_cpum_cf_events.c | 2 + + arch/s390/kernel/unwind_bc.c | 2 +- + arch/s390/kvm/kvm-s390.c | 9 +- + arch/s390/pci/pci.c | 4 +- + arch/s390/pci/pci_sysfs.c | 10 + + arch/sh/Kconfig | 2 + + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/include/asm/io.h | 6 +- + arch/sh/include/asm/pgtable-3level.h | 3 + + arch/sh/include/asm/pgtable.h | 37 + + arch/sh/include/asm/ptrace.h | 29 +- + arch/sh/kernel/kdebugfs.c | 3 - + arch/sh/mm/Makefile | 2 +- + arch/sh/mm/asids-debugfs.c | 11 +- + arch/sh/mm/cache-debugfs.c | 20 +- + arch/sh/mm/gup.c | 277 -- + arch/sh/mm/pmb.c | 9 +- + arch/sh/mm/tlb-debugfs.c | 20 +- + arch/sparc/Kconfig | 4 +- + arch/sparc/configs/sparc32_defconfig | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/include/asm/pgtable_64.h | 43 + + arch/sparc/include/uapi/asm/openpromio.h | 3 +- + arch/sparc/lib/COPYING.LIB | 481 --- + arch/sparc/lib/NG4clear_page.S | 2 +- + arch/sparc/mm/Makefile | 2 +- + arch/sparc/mm/gup.c | 340 -- + arch/um/Makefile | 2 +- + arch/um/include/asm/pgalloc.h | 16 +- + arch/um/kernel/mem.c | 22 - + arch/unicore32/Makefile | 3 +- + .../configs/{unicore32_defconfig => defconfig} | 0 + arch/unicore32/include/asm/pgalloc.h | 36 +- + arch/unicore32/include/mach/regs-gpio.h | 2 +- + arch/x86/Kconfig | 5 +- + arch/x86/entry/vdso/Makefile | 12 +- + arch/x86/events/amd/uncore.c | 15 +- + arch/x86/events/intel/core.c | 8 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/bitops.h | 189 +- + arch/x86/include/asm/kvm_host.h | 11 +- + arch/x86/include/asm/mshyperv.h | 148 +- + arch/x86/include/asm/pgalloc.h | 19 +- + arch/x86/include/asm/pgtable-3level.h | 47 - + arch/x86/include/asm/pgtable_64.h | 8 +- + arch/x86/include/asm/ptrace.h | 30 +- + arch/x86/include/uapi/asm/kvm.h | 19 +- + arch/x86/include/uapi/asm/kvm_para.h | 3 + + arch/x86/include/uapi/asm/vmx.h | 1 - + arch/x86/kernel/kdebugfs.c | 60 +- + arch/x86/kernel/kvm.c | 21 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/cpuid.c | 247 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/irq.h | 1 - + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/lapic.c | 123 +- + arch/x86/kvm/lapic.h | 8 +- + arch/x86/kvm/mmu.c | 184 +- + arch/x86/kvm/mmutrace.h | 59 + + arch/x86/kvm/paging_tmpl.h | 42 +- + arch/x86/kvm/pmu.c | 63 + + arch/x86/kvm/pmu.h | 1 + + arch/x86/kvm/svm.c | 51 +- + arch/x86/kvm/trace.h | 2 +- + arch/x86/kvm/vmx/evmcs.c | 18 + + arch/x86/kvm/vmx/evmcs.h | 1 + + arch/x86/kvm/vmx/nested.c | 763 ++-- + arch/x86/kvm/vmx/nested.h | 4 +- + arch/x86/kvm/vmx/ops.h | 1 - + arch/x86/kvm/vmx/vmcs.h | 17 +- + arch/x86/kvm/vmx/vmcs12.h | 57 +- + arch/x86/kvm/vmx/vmcs_shadow_fields.h | 79 +- + arch/x86/kvm/vmx/vmx.c | 449 +-- + arch/x86/kvm/vmx/vmx.h | 124 +- + arch/x86/kvm/x86.c | 229 +- + arch/x86/kvm/x86.h | 10 + + arch/x86/mm/debug_pagetables.c | 35 +- + arch/x86/mm/pgtable.c | 33 +- + arch/x86/platform/atom/punit_atom_debug.c | 23 +- + arch/x86/platform/intel-quark/imr.c | 14 +- + arch/x86/platform/intel/iosf_mbi.c | 21 +- + arch/x86/platform/uv/tlb_uv.c | 15 +- + arch/x86/xen/debugfs.c | 7 +- + arch/x86/xen/mmu_pv.c | 3 +- + arch/x86/xen/p2m.c | 3 - + arch/xtensa/kernel/pci-dma.c | 8 +- + drivers/acpi/acpi_lpss.c | 4 +- + drivers/acpi/utils.c | 11 +- + drivers/amba/tegra-ahb.c | 4 +- + drivers/base/arch_topology.c | 5 +- + drivers/base/bus.c | 6 +- + drivers/base/cacheinfo.c | 3 +- + drivers/base/core.c | 6 + + drivers/base/dd.c | 55 +- + drivers/base/devcon.c | 2 +- + drivers/base/driver.c | 4 +- + drivers/base/firmware_loader/Kconfig | 18 + + drivers/base/firmware_loader/fallback.c | 65 +- + drivers/base/firmware_loader/firmware.h | 16 +- + drivers/base/firmware_loader/main.c | 224 +- + drivers/base/node.c | 5 +- + drivers/base/platform.c | 2 +- + drivers/char/ipmi/Kconfig | 9 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmb_dev_int.c | 364 ++ + drivers/char/ipmi/ipmi_msghandler.c | 8 +- + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/char/ipmi/ipmi_si_platform.c | 9 +- + drivers/char/ipmi/ipmi_ssif.c | 5 +- + drivers/clk/renesas/r8a77470-cpg-mssr.c | 2 +- + drivers/dma/mxs-dma.c | 25 +- + drivers/firmware/arm_scmi/common.h | 2 +- + drivers/firmware/efi/dev-path-parser.c | 4 +- + drivers/firmware/ti_sci.h | 2 +- + drivers/fpga/of-fpga-region.c | 7 +- + drivers/gpio/gpio-cs5535.c | 2 +- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/i915/.gitignore | 1 - + drivers/gpu/drm/i915/Makefile.header-test | 12 +- + drivers/gpu/drm/i915/i915_mm.c | 3 +- + drivers/gpu/drm/tegra/dc.c | 4 +- + drivers/hid/hid-quirks.c | 22 +- + drivers/hv/vmbus_drv.c | 1 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 15 +- + drivers/hwtracing/coresight/coresight-platform.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 +- + drivers/hwtracing/coresight/coresight.c | 6 +- + drivers/hwtracing/intel_th/core.c | 5 +- + drivers/i2c/busses/i2c-amd-mp2-pci.c | 2 +- + drivers/i2c/i2c-core-acpi.c | 4 +- + drivers/i2c/i2c-core-of.c | 4 +- + drivers/iio/common/cros_ec_sensors/Kconfig | 9 + + drivers/iio/common/cros_ec_sensors/Makefile | 1 + + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 139 + + drivers/iio/inkern.c | 2 +- + drivers/infiniband/core/uverbs_ioctl.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- + drivers/input/joydev.c | 24 +- + drivers/input/joystick/iforce/Kconfig | 8 +- + drivers/input/joystick/iforce/Makefile | 7 +- + drivers/input/joystick/iforce/iforce-ff.c | 18 +- + drivers/input/joystick/iforce/iforce-main.c | 178 +- + drivers/input/joystick/iforce/iforce-packets.c | 215 +- + drivers/input/joystick/iforce/iforce-serio.c | 161 +- + drivers/input/joystick/iforce/iforce-usb.c | 192 +- + drivers/input/joystick/iforce/iforce.h | 55 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 6 +- + drivers/input/keyboard/gpio_keys_polled.c | 10 +- + drivers/input/keyboard/imx_keypad.c | 4 +- + drivers/input/keyboard/tca8418_keypad.c | 3 +- + drivers/input/misc/da9063_onkey.c | 11 +- + drivers/input/misc/max77650-onkey.c | 1 + + drivers/input/mouse/elan_i2c_core.c | 122 +- + drivers/input/mouse/elantech.c | 322 +- + drivers/input/mouse/elantech.h | 8 + + drivers/input/mouse/synaptics.c | 1 + + drivers/input/rmi4/rmi_f12.c | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 23 +- + drivers/input/touchscreen/edt-ft5x06.c | 18 +- + drivers/input/touchscreen/eeti_ts.c | 71 +- + drivers/input/touchscreen/imx6ul_tsc.c | 8 +- + drivers/input/touchscreen/iqs5xx.c | 2 - + drivers/iommu/arm-smmu-v3.c | 2 +- + drivers/iommu/arm-smmu.c | 2 +- + drivers/iommu/dma-iommu.c | 14 +- + drivers/macintosh/smu.c | 4 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 28 +- + drivers/mailbox/bcm-pdc-mailbox.c | 8 +- + drivers/md/dm-bufio.c | 4 +- + drivers/md/dm-crypt.c | 101 +- + drivers/md/dm-integrity.c | 7 +- + drivers/md/dm-log-writes.c | 4 +- + drivers/md/dm-rq.c | 2 +- + drivers/md/dm-snap.c | 186 +- + drivers/md/dm-thin-metadata.c | 7 +- + drivers/memstick/core/memstick.c | 13 +- + drivers/mfd/altera-sysmgr.c | 4 +- + drivers/mfd/cros_ec.c | 6 +- + drivers/mfd/syscon.c | 21 - + drivers/misc/cxl/cxl.h | 15 +- + drivers/misc/cxl/debugfs.c | 36 +- + drivers/misc/genwqe/card_base.c | 5 - + drivers/misc/genwqe/card_base.h | 2 +- + drivers/misc/genwqe/card_debugfs.c | 165 +- + drivers/misc/genwqe/card_dev.c | 6 +- + drivers/misc/lkdtm/core.c | 20 +- + drivers/misc/lkdtm/heap.c | 72 + + drivers/misc/lkdtm/lkdtm.h | 5 + + drivers/misc/mei/debugfs.c | 47 +- + drivers/misc/mei/main.c | 8 +- + drivers/misc/mei/mei_dev.h | 7 +- + drivers/misc/mic/card/mic_debugfs.c | 18 +- + drivers/misc/mic/cosm/cosm_debugfs.c | 4 - + drivers/misc/mic/host/mic_debugfs.c | 4 - + drivers/misc/mic/scif/scif_debugfs.c | 5 - + drivers/misc/mic/vop/vop_debugfs.c | 4 - + drivers/misc/ocxl/config.c | 181 +- + drivers/misc/ocxl/pci.c | 2 +- + drivers/misc/ti-st/st_kim.c | 4 - + drivers/misc/vmw_balloon.c | 20 +- + drivers/mmc/core/debugfs.c | 56 +- + drivers/mmc/core/mmc_test.c | 10 +- + drivers/mmc/core/queue.c | 7 +- + drivers/mmc/core/sdio.c | 92 +- + drivers/mmc/core/sdio_irq.c | 3 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/alcor.c | 2 +- + drivers/mmc/host/android-goldfish.c | 31 +- + drivers/mmc/host/atmel-mci.c | 38 +- + drivers/mmc/host/dw_mmc.c | 36 +- + drivers/mmc/host/meson-gx-mmc.c | 70 +- + drivers/mmc/host/renesas_sdhi_core.c | 19 +- + drivers/mmc/host/s3cmci.c | 27 +- + drivers/mmc/host/s3cmci.h | 2 - + drivers/mmc/host/sdhci-msm.c | 9 +- + drivers/mmc/host/sdhci-of-esdhc.c | 17 +- + drivers/mmc/host/sdhci-pci-core.c | 4 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 12 +- + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-sprd.c | 249 +- + drivers/mmc/host/sdhci-tegra.c | 5 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdhci_am654.c | 293 +- + drivers/mmc/host/tmio_mmc.c | 5 + + drivers/mmc/host/tmio_mmc_core.c | 29 +- + drivers/mmc/host/uniphier-sd.c | 3 + + drivers/mtd/Kconfig | 2 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0002.c | 143 +- + drivers/mtd/hyperbus/Kconfig | 23 + + drivers/mtd/hyperbus/Makefile | 4 + + drivers/mtd/hyperbus/hbmc-am654.c | 147 + + drivers/mtd/hyperbus/hyperbus-core.c | 153 + + drivers/mtd/mtdconcat.c | 37 +- + drivers/mtd/mtdcore.c | 3 + + drivers/mtd/nand/onenand/onenand_base.c | 5 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 263 +- + drivers/mtd/nand/raw/fsmc_nand.c | 19 +- + drivers/mtd/nand/raw/gpmi-nand/Makefile | 1 - + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 934 ----- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 1709 ++++++--- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 64 +- + drivers/mtd/nand/raw/mtk_ecc.c | 4 +- + drivers/mtd/nand/raw/mtk_ecc.h | 2 +- + drivers/mtd/nand/raw/mtk_nand.c | 88 +- + drivers/mtd/nand/raw/nand_base.c | 80 +- + drivers/mtd/nand/raw/nand_bch.c | 3 +- + drivers/mtd/nand/raw/nand_macronix.c | 45 + + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 21 +- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 5 +- + drivers/mtd/nand/spi/gigadevice.c | 79 +- + drivers/mtd/nand/spi/paragon.c | 147 + + drivers/mtd/parsers/afs.c | 3 +- + drivers/mtd/spi-nor/Kconfig | 7 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/cadence-quadspi.c | 21 + + drivers/mtd/spi-nor/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/spi-nor.c | 37 +- + drivers/mtd/spi-nor/stm32-quadspi.c | 707 ---- + drivers/net/dsa/qca8k.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 19 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 7 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 7 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 10 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 - + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 23 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 28 +- + drivers/net/ethernet/stmicro/stmmac/descs.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 4 +- + drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 26 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 4 +- + drivers/net/phy/phy_device.c | 6 +- + drivers/net/ppp/ppp_mppe.c | 1 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/nvmem/core.c | 2 +- + drivers/of/fdt.c | 141 +- + drivers/of/of_mdio.c | 2 +- + drivers/of/of_reserved_mem.c | 3 + + drivers/of/platform.c | 5 +- + drivers/of/unittest.c | 2 +- + drivers/pci/probe.c | 2 +- + drivers/pci/search.c | 4 +- + drivers/pinctrl/aspeed/Makefile | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 94 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 127 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 246 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 542 +-- + drivers/pinctrl/aspeed/pinmux-aspeed.c | 96 + + drivers/pinctrl/aspeed/pinmux-aspeed.h | 735 ++++ + drivers/pinctrl/bcm/Kconfig | 6 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 + + drivers/pinctrl/cirrus/pinctrl-cs47l35.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-cs47l85.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-cs47l90.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-madera.h | 6 +- + drivers/pinctrl/core.c | 44 +- + drivers/pinctrl/devicetree.c | 7 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8mn.c | 348 ++ + drivers/pinctrl/intel/pinctrl-baytrail.c | 322 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 19 + + drivers/pinctrl/mediatek/pinctrl-paris.h | 2 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 36 +- + drivers/pinctrl/meson/pinctrl-meson.c | 350 +- + drivers/pinctrl/meson/pinctrl-meson.h | 18 +- + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 576 +-- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-bm1880.c | 733 +++- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-stmfx.c | 1 + + drivers/pinctrl/pinctrl-tb10x.c | 12 +- + drivers/pinctrl/qcom/Kconfig | 11 +- + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 43 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 1 + + drivers/pinctrl/qcom/pinctrl-sdm845.c | 46 +- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 1548 +++++++++ + drivers/pinctrl/sh-pfc/core.c | 60 +- + drivers/pinctrl/sh-pfc/pfc-emev2.c | 70 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 125 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 36 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 434 +-- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 414 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 414 ++- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 410 ++- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 26 +- + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 181 +- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 21 +- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 3 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 90 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 184 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 2 + + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 5 + + drivers/pinctrl/tegra/Kconfig | 4 + + drivers/pinctrl/tegra/Makefile | 1 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 26 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 12 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 170 + + drivers/pinctrl/tegra/pinctrl-tegra20.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 62 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 4 +- + drivers/platform/chrome/Kconfig | 42 +- + drivers/platform/chrome/Makefile | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 48 +- + drivers/platform/chrome/cros_ec_ishtp.c | 763 ++++ + drivers/platform/chrome/cros_ec_lightbar.c | 6 +- + drivers/platform/chrome/cros_ec_lpc.c | 165 +- + drivers/platform/chrome/cros_ec_lpc_mec.c | 14 +- + drivers/platform/chrome/cros_ec_lpc_reg.c | 101 - + drivers/platform/chrome/cros_ec_lpc_reg.h | 45 - + drivers/platform/chrome/cros_ec_spi.c | 68 +- + drivers/platform/chrome/cros_ec_sysfs.c | 2 +- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/Kconfig | 18 +- + drivers/platform/chrome/wilco_ec/Makefile | 6 +- + drivers/platform/chrome/wilco_ec/core.c | 26 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 12 +- + drivers/platform/chrome/wilco_ec/event.c | 581 ++++ + drivers/platform/chrome/wilco_ec/mailbox.c | 21 +- + drivers/platform/chrome/wilco_ec/properties.c | 132 + + drivers/platform/chrome/wilco_ec/sysfs.c | 156 + + drivers/platform/chrome/wilco_ec/telemetry.c | 450 +++ + drivers/s390/block/dasd.c | 233 +- + drivers/s390/block/dasd_devmap.c | 70 +- + drivers/s390/block/dasd_diag.c | 22 +- + drivers/s390/block/dasd_eckd.c | 966 +++++- + drivers/s390/block/dasd_eckd.h | 175 +- + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/block/dasd_fba.c | 45 +- + drivers/s390/block/dasd_fba.h | 5 + + drivers/s390/block/dasd_int.h | 33 +- + drivers/s390/block/dasd_ioctl.c | 56 + + drivers/s390/char/sclp_early.c | 1 - + drivers/s390/cio/ccwgroup.c | 6 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/css.c | 4 +- + drivers/s390/cio/device.c | 10 +- + drivers/s390/cio/scm.c | 4 +- + drivers/s390/crypto/ap_bus.c | 9 +- + drivers/s390/crypto/vfio_ap_ops.c | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/scsi_proc.c | 2 +- + drivers/spi/spi.c | 4 +- + drivers/staging/most/core.c | 9 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 2 - + drivers/thermal/intel/intel_powerclamp.c | 12 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 25 +- + drivers/thermal/tegra/soctherm.c | 14 +- + drivers/thunderbolt/switch.c | 4 +- + drivers/tty/hvc/hvc_vio.c | 16 +- + drivers/tty/serial/sunhv.c | 2 +- + drivers/usb/Kconfig | 1 + + drivers/usb/core/buffer.c | 17 +- + drivers/usb/core/devio.c | 4 +- + drivers/usb/core/hcd.c | 51 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 25 +- + drivers/usb/host/ohci-mem.c | 37 +- + drivers/usb/host/ohci-sm501.c | 50 +- + drivers/usb/host/ohci-tmio.c | 15 +- + drivers/usb/host/ohci.h | 2 + + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/phy/phy-am335x-control.c | 4 +- + drivers/usb/phy/phy-isp1301.c | 4 +- + drivers/video/fbdev/au1100fb.c | 24 +- + drivers/video/fbdev/au1100fb.h | 1 + + drivers/visorbus/visorbus_main.c | 4 +- + drivers/watchdog/bcm_kona_wdt.c | 14 +- + drivers/watchdog/mei_wdt.c | 30 +- + drivers/xen/gntdev.c | 6 +- + drivers/xen/privcmd.c | 6 +- + drivers/xen/xlate_mmu.c | 3 +- + fs/9p/vfs_addr.c | 6 +- + fs/aio.c | 9 +- + fs/btrfs/ioctl.c | 30 +- + fs/btrfs/sysfs.c | 18 +- + fs/ceph/debugfs.c | 24 +- + fs/ceph/super.c | 4 +- + fs/ceph/super.h | 2 +- + fs/debugfs/file.c | 14 +- + fs/debugfs/inode.c | 34 +- + fs/dlm/debug_fs.c | 21 +- + fs/dlm/dlm_internal.h | 8 +- + fs/dlm/lockspace.c | 3 +- + fs/dlm/lowcomms.c | 18 +- + fs/dlm/main.c | 5 +- + fs/efivarfs/file.c | 26 +- + fs/ext2/ioctl.c | 16 +- + fs/ext4/ioctl.c | 51 +- + fs/f2fs/checkpoint.c | 107 +- + fs/f2fs/data.c | 249 +- + fs/f2fs/debug.c | 7 + + fs/f2fs/dir.c | 16 +- + fs/f2fs/extent_cache.c | 7 +- + fs/f2fs/f2fs.h | 129 +- + fs/f2fs/file.c | 302 +- + fs/f2fs/gc.c | 196 +- + fs/f2fs/inline.c | 16 +- + fs/f2fs/inode.c | 78 +- + fs/f2fs/namei.c | 10 +- + fs/f2fs/node.c | 38 +- + fs/f2fs/recovery.c | 43 +- + fs/f2fs/segment.c | 170 +- + fs/f2fs/segment.h | 16 +- + fs/f2fs/super.c | 610 ++-- + fs/f2fs/sysfs.c | 28 +- + fs/f2fs/xattr.c | 10 +- + fs/gfs2/file.c | 42 +- + fs/gfs2/sys.c | 3 +- + fs/hfsplus/ioctl.c | 21 +- + fs/inode.c | 86 + + fs/io_uring.c | 338 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/jfs/ioctl.c | 22 +- + fs/nfsd/fault_inject.c | 12 +- + fs/nfsd/nfsctl.c | 5 +- + fs/nfsd/state.h | 4 +- + fs/nilfs2/ioctl.c | 9 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 8 +- + fs/ocfs2/alloc.c | 10 +- + fs/ocfs2/blockcheck.c | 56 +- + fs/ocfs2/blockcheck.h | 7 +- + fs/ocfs2/cluster/heartbeat.c | 102 +- + fs/ocfs2/cluster/heartbeat.h | 2 +- + fs/ocfs2/cluster/netdebug.c | 39 +- + fs/ocfs2/cluster/nodemanager.c | 4 +- + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/cluster/tcp.c | 5 +- + fs/ocfs2/cluster/tcp.h | 5 +- + fs/ocfs2/dlm/dlmdebug.c | 44 +- + fs/ocfs2/dlm/dlmdebug.h | 10 +- + fs/ocfs2/dlm/dlmdomain.c | 10 +- + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/dlm/dlmrecovery.c | 8 +- + fs/ocfs2/dlmglue.c | 96 +- + fs/ocfs2/ioctl.c | 13 +- + fs/ocfs2/localalloc.c | 6 +- + fs/ocfs2/ocfs2.h | 4 + + fs/ocfs2/super.c | 29 +- + fs/orangefs/file.c | 37 +- + fs/orangefs/orangefs-debugfs.c | 54 +- + fs/orangefs/orangefs-debugfs.h | 2 +- + fs/orangefs/orangefs-mod.c | 6 +- + fs/proc/base.c | 31 +- + fs/proc/meminfo.c | 2 +- + fs/proc/task_mmu.c | 115 +- + fs/proc/task_nommu.c | 6 +- + fs/reiserfs/ioctl.c | 10 +- + fs/splice.c | 8 +- + fs/ubifs/debug.c | 169 +- + fs/ubifs/debug.h | 4 +- + fs/ubifs/ioctl.c | 13 +- + fs/ubifs/super.c | 9 +- + fs/xfs/Makefile | 9 +- + fs/xfs/kmem.c | 5 - + fs/xfs/kmem.h | 8 + + fs/xfs/libxfs/xfs_ag.c | 100 +- + fs/xfs/libxfs/xfs_ag_resv.c | 8 - + fs/xfs/libxfs/xfs_alloc.c | 227 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 3 +- + fs/xfs/libxfs/xfs_attr.c | 5 - + fs/xfs/libxfs/xfs_attr.h | 8 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 15 +- + fs/xfs/libxfs/xfs_attr_remote.c | 14 +- + fs/xfs/libxfs/xfs_bit.c | 1 - + fs/xfs/libxfs/xfs_bmap.c | 19 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 5 +- + fs/xfs/libxfs/xfs_btree.c | 49 +- + fs/xfs/libxfs/xfs_btree.h | 14 +- + fs/xfs/libxfs/xfs_da_btree.c | 12 +- + fs/xfs/libxfs/xfs_da_format.c | 3 - + fs/xfs/libxfs/xfs_defer.c | 2 - + fs/xfs/libxfs/xfs_dir2.c | 6 +- + fs/xfs/libxfs/xfs_dir2_block.c | 11 +- + fs/xfs/libxfs/xfs_dir2_data.c | 14 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 11 +- + fs/xfs/libxfs/xfs_dir2_node.c | 10 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 5 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 10 +- + fs/xfs/libxfs/xfs_format.h | 2 +- + fs/xfs/libxfs/xfs_fs.h | 124 +- + fs/xfs/libxfs/xfs_health.h | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 245 +- + fs/xfs/libxfs/xfs_ialloc.h | 18 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 56 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 3 + + fs/xfs/libxfs/xfs_iext_tree.c | 6 +- + fs/xfs/libxfs/xfs_inode_buf.c | 9 +- + fs/xfs/libxfs/xfs_inode_fork.c | 4 +- + fs/xfs/libxfs/xfs_log_rlimit.c | 2 - + fs/xfs/libxfs/xfs_refcount.c | 2 - + fs/xfs/libxfs/xfs_refcount_btree.c | 4 +- + fs/xfs/libxfs/xfs_rmap.c | 7 - + fs/xfs/libxfs/xfs_rmap_btree.c | 6 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 8 - + fs/xfs/libxfs/xfs_sb.c | 39 +- + fs/xfs/libxfs/xfs_shared.h | 49 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 10 +- + fs/xfs/libxfs/xfs_trans_resv.c | 17 +- + fs/xfs/libxfs/xfs_trans_space.h | 7 +- + fs/xfs/libxfs/xfs_types.c | 13 +- + fs/xfs/scrub/agheader.c | 11 +- + fs/xfs/scrub/agheader_repair.c | 5 - + fs/xfs/scrub/alloc.c | 7 - + fs/xfs/scrub/attr.c | 122 +- + fs/xfs/scrub/attr.h | 71 + + fs/xfs/scrub/bitmap.c | 5 - + fs/xfs/scrub/bmap.c | 8 - + fs/xfs/scrub/btree.c | 7 - + fs/xfs/scrub/common.c | 8 - + fs/xfs/scrub/dabtree.c | 8 - + fs/xfs/scrub/dir.c | 10 - + fs/xfs/scrub/fscounters.c | 12 - + fs/xfs/scrub/health.c | 8 - + fs/xfs/scrub/ialloc.c | 28 +- + fs/xfs/scrub/inode.c | 10 - + fs/xfs/scrub/parent.c | 8 - + fs/xfs/scrub/quota.c | 13 +- + fs/xfs/scrub/refcount.c | 10 - + fs/xfs/scrub/repair.c | 14 +- + fs/xfs/scrub/rmap.c | 9 - + fs/xfs/scrub/rtbitmap.c | 7 - + fs/xfs/scrub/scrub.c | 20 - + fs/xfs/scrub/symlink.c | 8 - + fs/xfs/scrub/trace.c | 6 - + fs/xfs/xfs_acl.c | 4 +- + fs/xfs/xfs_aops.c | 121 +- + fs/xfs/xfs_aops.h | 1 - + fs/xfs/xfs_attr_inactive.c | 7 +- + fs/xfs/xfs_attr_list.c | 7 +- + fs/xfs/xfs_bio_io.c | 61 + + fs/xfs/xfs_bmap_item.c | 350 +- + fs/xfs/xfs_bmap_item.h | 2 - + fs/xfs/xfs_bmap_util.c | 11 +- + fs/xfs/xfs_buf.c | 171 +- + fs/xfs/xfs_buf.h | 53 +- + fs/xfs/xfs_buf_item.c | 40 +- + fs/xfs/xfs_buf_item.h | 6 +- + fs/xfs/xfs_dir2_readdir.c | 5 +- + fs/xfs/xfs_discard.c | 4 +- + fs/xfs/xfs_dquot.c | 6 +- + fs/xfs/xfs_dquot.h | 1 - + fs/xfs/xfs_dquot_item.c | 118 +- + fs/xfs/xfs_dquot_item.h | 4 +- + fs/xfs/xfs_error.c | 3 +- + fs/xfs/xfs_export.c | 4 +- + fs/xfs/xfs_extfree_item.c | 410 ++- + fs/xfs/xfs_extfree_item.h | 6 +- + fs/xfs/xfs_file.c | 23 +- + fs/xfs/xfs_filestream.c | 5 +- + fs/xfs/xfs_fsmap.c | 4 - + fs/xfs/xfs_fsops.c | 8 +- + fs/xfs/xfs_globals.c | 4 +- + fs/xfs/xfs_health.c | 6 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_icreate_item.c | 75 +- + fs/xfs/xfs_inode.c | 42 +- + fs/xfs/xfs_inode_item.c | 16 +- + fs/xfs/xfs_inode_item.h | 2 +- + fs/xfs/xfs_ioctl.c | 448 ++- + fs/xfs/xfs_ioctl.h | 8 + + fs/xfs/xfs_ioctl32.c | 161 +- + fs/xfs/xfs_ioctl32.h | 14 +- + fs/xfs/xfs_iomap.c | 5 +- + fs/xfs/xfs_iops.c | 10 - + fs/xfs/xfs_itable.c | 749 ++-- + fs/xfs/xfs_itable.h | 106 +- + fs/xfs/xfs_iwalk.c | 720 ++++ + fs/xfs/xfs_iwalk.h | 46 + + fs/xfs/xfs_linux.h | 5 +- + fs/xfs/xfs_log.c | 644 ++-- + fs/xfs/xfs_log.h | 17 +- + fs/xfs/xfs_log_cil.c | 51 +- + fs/xfs/xfs_log_priv.h | 36 +- + fs/xfs/xfs_log_recover.c | 463 +-- + fs/xfs/xfs_message.c | 2 +- + fs/xfs/xfs_mount.c | 102 +- + fs/xfs/xfs_mount.h | 22 +- + fs/xfs/xfs_ondisk.h | 5 + + fs/xfs/xfs_pnfs.c | 9 +- + fs/xfs/xfs_pwork.c | 136 + + fs/xfs/xfs_pwork.h | 61 + + fs/xfs/xfs_qm.c | 68 +- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 5 - + fs/xfs/xfs_quotaops.c | 3 +- + fs/xfs/xfs_refcount_item.c | 357 +- + fs/xfs/xfs_refcount_item.h | 2 - + fs/xfs/xfs_reflink.c | 15 +- + fs/xfs/xfs_rmap_item.c | 380 +- + fs/xfs/xfs_rmap_item.h | 2 - + fs/xfs/xfs_rtalloc.c | 6 - + fs/xfs/xfs_stats.c | 1 - + fs/xfs/xfs_super.c | 32 +- + fs/xfs/xfs_super.h | 14 + + fs/xfs/xfs_symlink.c | 9 - + fs/xfs/xfs_sysctl.c | 3 - + fs/xfs/xfs_sysctl.h | 3 + + fs/xfs/xfs_sysfs.c | 42 +- + fs/xfs/xfs_trace.c | 8 - + fs/xfs/xfs_trace.h | 61 +- + fs/xfs/xfs_trans.c | 43 +- + fs/xfs/xfs_trans.h | 70 +- + fs/xfs/xfs_trans_ail.c | 53 +- + fs/xfs/xfs_trans_bmap.c | 232 -- + fs/xfs/xfs_trans_buf.c | 11 +- + fs/xfs/xfs_trans_dquot.c | 11 - + fs/xfs/xfs_trans_extfree.c | 286 -- + fs/xfs/xfs_trans_inode.c | 3 - + fs/xfs/xfs_trans_priv.h | 4 +- + fs/xfs/xfs_trans_refcount.c | 240 -- + fs/xfs/xfs_trans_rmap.c | 257 -- + fs/xfs/xfs_xattr.c | 5 +- + include/Kbuild | 1270 +++++++ + include/asm-generic/bitops-instrumented.h | 263 ++ + include/asm-generic/mshyperv.h | 180 + + include/asm-generic/pgalloc.h | 107 +- + include/asm-generic/ptrace.h | 73 - + include/kvm/arm_pmu.h | 11 +- + include/linux/backing-dev-defs.h | 1 - + include/linux/ceph/debugfs.h | 4 +- + include/linux/cpuhotplug.h | 1 + + include/linux/debugfs.h | 12 +- + include/linux/device.h | 11 +- + include/linux/dma-contiguous.h | 19 + + include/linux/dma-mapping.h | 7 - + include/linux/dma-noncoherent.h | 19 + + include/linux/dma/mxs-dma.h | 24 + + include/linux/dmar.h | 14 +- + include/linux/fs.h | 12 + + include/linux/genalloc.h | 9 + + include/linux/gpio.h | 1 + + include/linux/gpio/driver.h | 2 + + include/linux/hugetlb.h | 120 +- + include/linux/ide.h | 272 +- + include/linux/input/elan-i2c-ids.h | 76 + + include/linux/kasan-checks.h | 43 +- + include/linux/kasan.h | 7 +- + include/linux/kvm_host.h | 5 +- + include/linux/memcontrol.h | 24 +- + include/linux/mfd/cros_ec.h | 1 + + include/linux/mfd/cros_ec_commands.h | 3650 ++++++++++++++++---- + include/linux/mfd/syscon.h | 6 - + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/mm.h | 57 +- + include/linux/mm_types.h | 2 + + include/linux/mmc/host.h | 1 - + include/linux/mtd/cfi.h | 7 + + include/linux/mtd/hyperbus.h | 84 + + include/linux/mtd/mtd.h | 6 + + include/linux/mtd/onenand_regs.h | 1 + + include/linux/mtd/rawnand.h | 36 + + include/linux/mtd/spinand.h | 35 +- + include/linux/of_fdt.h | 11 - + include/linux/oom.h | 1 - + include/linux/page-flags.h | 6 + + include/linux/page-isolation.h | 2 +- + include/linux/page_ext.h | 1 - + include/linux/pagemap.h | 6 +- + include/linux/perf_event.h | 5 + + include/linux/pfn_t.h | 7 - + include/linux/phy.h | 3 + + include/linux/pinctrl/pinconf-generic.h | 23 +- + include/linux/pinctrl/pinconf.h | 4 +- + include/linux/pinctrl/pinctrl-state.h | 5 + + include/linux/pinctrl/pinctrl.h | 19 +- + include/linux/pinctrl/pinmux.h | 4 - + include/linux/platform_data/wilco-ec.h | 94 +- + include/linux/slab.h | 16 +- + include/linux/socket.h | 7 + + include/linux/swap.h | 18 +- + include/linux/uio.h | 4 +- + include/linux/usb/hcd.h | 6 +- + include/linux/vmalloc.h | 2 + + include/linux/vmpressure.h | 2 +- + include/misc/ocxl.h | 5 +- + include/net/fib_rules.h | 4 +- + include/net/pkt_cls.h | 10 + + include/trace/events/f2fs.h | 11 +- + include/uapi/{linux => }/Kbuild | 6 +- + include/uapi/linux/io_uring.h | 4 + + include/uapi/linux/kvm.h | 7 +- + include/uapi/linux/kvm_para.h | 1 + + include/uapi/linux/nilfs2_ondisk.h | 24 +- + include/uapi/misc/ocxl.h | 14 +- + include/uapi/mtd/mtd-abi.h | 10 +- + init/Kconfig | 33 + + init/main.c | 24 + + kernel/dma/contiguous.c | 56 + + kernel/dma/direct.c | 55 +- + kernel/dma/mapping.c | 12 + + kernel/dma/remap.c | 16 +- + kernel/dma/swiotlb.c | 25 +- + kernel/events/core.c | 83 +- + kernel/fail_function.c | 23 +- + kernel/gcov/fs.c | 24 +- + kernel/gen_kheaders.sh | 51 +- + kernel/iomem.c | 2 +- + kernel/kprobes.c | 25 +- + kernel/locking/lockdep_proc.c | 5 +- + kernel/sched/core.c | 4 +- + kernel/trace/blktrace.c | 6 - + kernel/trace/trace.c | 4 - + lib/842/842_debugfs.h | 5 +- + lib/Kconfig.debug | 25 +- + lib/dynamic_debug.c | 12 +- + lib/fault-inject.c | 73 +- + lib/genalloc.c | 125 +- + lib/iov_iter.c | 15 +- + lib/kobject.c | 4 +- + lib/notifier-error-inject.c | 13 +- + lib/raid6/Makefile | 98 +- + lib/test_kasan.c | 98 +- + mm/Kconfig | 16 +- + mm/Kconfig.debug | 14 +- + mm/Makefile | 4 +- + mm/backing-dev.c | 24 +- + mm/cleancache.c | 3 +- + mm/dmapool.c | 4 +- + mm/failslab.c | 3 +- + mm/filemap.c | 19 +- + mm/gup.c | 674 ++-- + mm/hwpoison-inject.c | 67 +- + mm/kasan/common.c | 14 +- + mm/kasan/generic.c | 13 +- + mm/kasan/kasan.h | 15 +- + mm/kasan/report.c | 165 + + mm/kasan/tags.c | 12 +- + mm/kmemleak.c | 11 +- + mm/list_lru.c | 3 +- + mm/memcontrol.c | 461 +-- + mm/memory-failure.c | 2 +- + mm/memory.c | 15 +- + mm/mincore.c | 12 +- + mm/mmu_notifier.c | 2 +- + mm/nommu.c | 91 +- + mm/oom_kill.c | 131 +- + mm/page-writeback.c | 1 - + mm/page_alloc.c | 234 +- + mm/page_ext.c | 3 - + mm/page_io.c | 2 +- + mm/page_isolation.c | 3 +- + mm/slab.c | 79 +- + mm/slab.h | 199 +- + mm/slab_common.c | 269 +- + mm/slob.c | 4 +- + mm/slub.c | 86 +- + mm/swap_state.c | 49 +- + mm/swapfile.c | 291 +- + mm/util.c | 47 - + mm/vmalloc.c | 108 +- + mm/vmscan.c | 74 +- + mm/z3fold.c | 12 +- + mm/zsmalloc.c | 24 +- + mm/zswap.c | 2 - + net/9p/trans_virtio.c | 8 +- + net/9p/trans_xen.c | 8 +- + net/bpfilter/Kconfig | 2 +- + net/ceph/ceph_common.c | 5 +- + net/ceph/debugfs.c | 33 +- + net/compat.c | 3 +- + net/core/sock.c | 2 +- + net/hsr/hsr_device.c | 18 +- + net/hsr/hsr_device.h | 1 - + net/hsr/hsr_netlink.c | 7 - + net/ipv6/ah6.c | 4 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/ip6_flowlabel.c | 9 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/netfilter/ip6t_ah.c | 2 +- + net/ipv6/netfilter/ip6t_ipv6header.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/ipv6/tcp_ipv6.c | 7 +- + net/openvswitch/datapath.c | 39 +- + net/rds/connection.c | 1 + + net/rds/ib.h | 4 +- + net/rds/ib_cm.c | 9 +- + net/rds/ib_frmr.c | 11 +- + net/rds/ib_send.c | 29 +- + net/rds/rdma.c | 10 - + net/rds/rdma_transport.c | 11 +- + net/rds/rds.h | 1 - + net/rds/send.c | 4 +- + net/sched/cls_api.c | 2 +- + net/socket.c | 18 +- + net/sunrpc/debugfs.c | 66 +- + net/tipc/name_distr.c | 2 +- + samples/Kconfig | 14 +- + samples/Makefile | 4 +- + scripts/Kbuild.include | 28 +- + scripts/Makefile | 5 - + scripts/Makefile.build | 11 +- + scripts/Makefile.extrawarn | 3 - + scripts/Makefile.headersinst | 134 +- + scripts/Makefile.host | 2 +- + scripts/Makefile.lib | 26 +- + scripts/Makefile.modbuiltin | 2 +- + scripts/basic/fixdep.c | 51 +- + scripts/coccinelle/api/kstrdup.cocci | 8 +- + scripts/coccinelle/api/stream_open.cocci | 8 +- + scripts/coccinelle/free/devm_free.cocci | 2 +- + scripts/coccinelle/free/put_device.cocci | 11 +- + scripts/decode_stacktrace.sh | 4 +- + scripts/dtc/Makefile.dtc | 2 +- + scripts/dtc/checks.c | 55 +- + scripts/dtc/dtc-lexer.l | 17 +- + scripts/dtc/dtc-parser.y | 17 +- + scripts/dtc/dtc.h | 3 +- + scripts/dtc/flattree.c | 2 +- + scripts/dtc/libfdt/Makefile.libfdt | 4 +- + scripts/dtc/libfdt/fdt.c | 47 +- + scripts/dtc/libfdt/fdt.h | 47 +- + scripts/dtc/libfdt/fdt_addresses.c | 94 +- + scripts/dtc/libfdt/fdt_empty_tree.c | 47 +- + scripts/dtc/libfdt/fdt_overlay.c | 57 +- + scripts/dtc/libfdt/fdt_ro.c | 97 +- + scripts/dtc/libfdt/fdt_rw.c | 69 +- + scripts/dtc/libfdt/fdt_strerror.c | 47 +- + scripts/dtc/libfdt/fdt_sw.c | 125 +- + scripts/dtc/libfdt/fdt_wip.c | 47 +- + scripts/dtc/libfdt/libfdt.h | 205 +- + scripts/dtc/libfdt/libfdt_env.h | 48 +- + scripts/dtc/libfdt/libfdt_internal.h | 47 +- + scripts/dtc/livetree.c | 20 +- + scripts/dtc/util.h | 4 +- + scripts/dtc/version_gen.h | 2 +- + scripts/gdb/linux/Makefile | 2 +- + scripts/genksyms/keywords.c | 4 + + scripts/genksyms/parse.y | 2 + + scripts/get_abi.pl | 468 +++ + scripts/headers.sh | 29 - + scripts/headers_install.sh | 48 +- + scripts/kallsyms.c | 3 + + scripts/kconfig/Makefile | 8 +- + scripts/kconfig/conf.c | 10 +- + scripts/kconfig/confdata.c | 25 +- + scripts/kconfig/lkc.h | 1 - + scripts/kconfig/lkc_proto.h | 3 +- + scripts/kconfig/mconf.c | 10 +- + scripts/kconfig/nconf.c | 10 +- + scripts/kconfig/preprocess.c | 3 +- + scripts/kconfig/qconf.cc | 2 +- + scripts/kconfig/symbol.c | 2 +- + scripts/package/builddeb | 2 +- + scripts/package/mkspec | 2 +- + scripts/recordmcount.h | 3 +- + scripts/spelling.txt | 36 +- + scripts/tags.sh | 43 +- + security/Kconfig.hardening | 29 + + sound/soc/codecs/cros_ec_codec.c | 8 +- + sound/soc/rockchip/rk3399_gru_sound.c | 2 +- + tools/firmware/Makefile | 2 +- + tools/include/linux/zalloc.h | 12 + + tools/include/uapi/linux/kvm.h | 4 +- + tools/lib/zalloc.c | 15 + + tools/perf/MANIFEST | 1 + + tools/perf/arch/arm/annotate/instructions.c | 1 + + tools/perf/arch/arm/util/auxtrace.c | 1 + + tools/perf/arch/arm/util/cs-etm.c | 1 + + tools/perf/arch/arm64/util/arm-spe.c | 1 + + tools/perf/arch/common.c | 3 +- + tools/perf/arch/powerpc/util/perf_regs.c | 4 +- + tools/perf/arch/s390/util/auxtrace.c | 1 + + tools/perf/arch/s390/util/header.c | 3 +- + tools/perf/arch/x86/util/event.c | 2 +- + tools/perf/arch/x86/util/intel-bts.c | 2 +- + tools/perf/arch/x86/util/intel-pt.c | 2 +- + tools/perf/arch/x86/util/perf_regs.c | 2 +- + tools/perf/bench/futex-hash.c | 3 +- + tools/perf/bench/futex-lock-pi.c | 3 +- + tools/perf/bench/mem-functions.c | 2 +- + tools/perf/bench/numa.c | 2 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-bench.c | 2 +- + tools/perf/builtin-c2c.c | 2 +- + tools/perf/builtin-config.c | 1 + + tools/perf/builtin-diff.c | 2 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-help.c | 2 + + tools/perf/builtin-inject.c | 2 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-lock.c | 10 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 4 +- + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-sched.c | 2 +- + tools/perf/builtin-script.c | 5 +- + tools/perf/builtin-stat.c | 8 +- + tools/perf/builtin-timechart.c | 4 +- + tools/perf/builtin-top.c | 8 +- + tools/perf/builtin-trace.c | 7 +- + tools/perf/perf.c | 2 +- + tools/perf/pmu-events/jevents.c | 2 +- + tools/perf/scripts/python/export-to-postgresql.py | 2 +- + tools/perf/scripts/python/export-to-sqlite.py | 2 +- + tools/perf/tests/dwarf-unwind.c | 5 +- + tools/perf/tests/expr.c | 3 +- + tools/perf/tests/llvm.c | 1 + + tools/perf/tests/mem2node.c | 3 +- + tools/perf/tests/mmap-thread-lookup.c | 2 +- + tools/perf/tests/sample-parsing.c | 1 + + tools/perf/tests/switch-tracking.c | 3 +- + tools/perf/tests/thread-map.c | 3 +- + tools/perf/tests/vmlinux-kallsyms.c | 1 + + tools/perf/ui/browser.c | 2 +- + tools/perf/ui/browser.h | 1 + + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/ui/browsers/hists.c | 17 +- + tools/perf/ui/browsers/map.c | 1 + + tools/perf/ui/browsers/res_sample.c | 6 +- + tools/perf/ui/browsers/scripts.c | 4 +- + tools/perf/ui/gtk/annotate.c | 2 +- + tools/perf/ui/gtk/util.c | 3 +- + tools/perf/ui/stdio/hist.c | 2 +- + tools/perf/ui/tui/setup.c | 1 + + tools/perf/ui/tui/util.c | 2 +- + tools/perf/util/Build | 5 + + tools/perf/util/annotate.c | 13 +- + tools/perf/util/arm-spe.c | 2 +- + tools/perf/util/auxtrace.c | 11 +- + tools/perf/util/bpf-loader.c | 3 +- + tools/perf/util/build-id.c | 1 + + tools/perf/util/call-path.c | 5 +- + tools/perf/util/callchain.c | 12 +- + tools/perf/util/cgroup.c | 4 +- + tools/perf/util/comm.c | 2 +- + tools/perf/util/config.c | 3 +- + tools/perf/util/counts.c | 2 +- + tools/perf/util/cpumap.c | 2 +- + tools/perf/util/cputopo.c | 5 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 + + tools/perf/util/cs-etm.c | 8 +- + tools/perf/util/data-convert-bt.c | 4 +- + tools/perf/util/data.c | 3 +- + tools/perf/util/db-export.c | 7 +- + tools/perf/util/debug.c | 1 + + tools/perf/util/demangle-java.c | 3 +- + tools/perf/util/dso.c | 5 +- + tools/perf/util/dwarf-aux.c | 2 +- + tools/perf/util/env.c | 11 +- + tools/perf/util/event.c | 3 +- + tools/perf/util/evlist.c | 2 +- + tools/perf/util/evsel.c | 4 +- + tools/perf/util/get_current_dir_name.c | 6 +- + tools/perf/util/get_current_dir_name.h | 8 + + tools/perf/util/header.c | 8 +- + tools/perf/util/help-unknown-cmd.c | 2 + + tools/perf/util/hist.c | 20 +- + tools/perf/util/intel-bts.c | 7 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- + tools/perf/util/intel-pt.c | 15 +- + tools/perf/util/jitdump.c | 7 +- + tools/perf/util/llvm-utils.c | 4 +- + tools/perf/util/machine.c | 6 +- + tools/perf/util/map.c | 9 +- + tools/perf/util/mem2node.c | 2 +- + tools/perf/util/metricgroup.c | 10 +- + tools/perf/util/mmap.c | 1 + + tools/perf/util/namespaces.c | 3 +- + tools/perf/util/namespaces.h | 4 + + tools/perf/util/ordered-events.c | 6 +- + tools/perf/util/parse-branch-options.c | 2 +- + tools/perf/util/parse-events.c | 3 +- + tools/perf/util/parse-events.y | 2 - + tools/perf/util/parse-regs-options.c | 8 +- + tools/perf/util/pmu.c | 4 +- + tools/perf/util/probe-event.c | 55 +- + tools/perf/util/probe-file.c | 2 +- + tools/perf/util/probe-finder.c | 2 +- + tools/perf/util/pstack.c | 2 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/s390-cpumsf.c | 11 +- + tools/perf/util/session.c | 7 +- + tools/perf/util/setns.c | 4 +- + tools/perf/util/srccode.c | 11 +- + tools/perf/util/srcline.c | 2 +- + tools/perf/util/stat-shadow.c | 3 +- + tools/perf/util/stat.c | 3 +- + tools/perf/util/strbuf.c | 3 +- + tools/perf/util/strfilter.c | 3 +- + tools/perf/util/strlist.c | 2 +- + tools/perf/util/svghelper.c | 2 +- + tools/perf/util/symbol-elf.c | 18 +- + tools/perf/util/symbol-minimal.c | 3 +- + tools/perf/util/symbol.c | 1 + + tools/perf/util/syscalltbl.c | 2 +- + tools/perf/util/target.c | 2 +- + tools/perf/util/thread-stack.c | 3 +- + tools/perf/util/thread.c | 6 +- + tools/perf/util/thread_map.c | 4 +- + tools/perf/util/trace-event-info.c | 1 + + tools/perf/util/trace-event-scripting.c | 2 +- + tools/perf/util/unwind-libdw.c | 1 + + tools/perf/util/unwind-libunwind-local.c | 3 +- + tools/perf/util/usage.c | 3 + + tools/perf/util/util.h | 17 - + tools/perf/util/values.c | 2 +- + tools/perf/util/vdso.c | 1 + + tools/perf/util/xyarray.c | 2 +- + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/cgroup/test_freezer.c | 1 - + tools/testing/selftests/drivers/dma-buf/config | 1 + + tools/testing/selftests/firmware/fw_filesystem.sh | 73 +- + tools/testing/selftests/firmware/fw_lib.sh | 7 + + tools/testing/selftests/firmware/fw_run_tests.sh | 1 + + tools/testing/selftests/kvm/dirty_log_test.c | 3 +- + .../selftests/kvm/include/aarch64/processor.h | 4 + + tools/testing/selftests/kvm/include/kvm_util.h | 3 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 50 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 9 +- + .../testing/selftests/kvm/lib/kvm_util_internal.h | 2 - + tools/testing/selftests/kvm/lib/ucall.c | 19 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 5 +- + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 2 +- + .../selftests/kvm/x86_64/kvm_create_max_vcpus.c | 2 +- + tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- + tools/testing/selftests/kvm/x86_64/state_test.c | 2 +- + tools/testing/selftests/lib.mk | 4 +- + .../networking/timestamping/timestamping.c | 9 +- + tools/testing/selftests/powerpc/mm/.gitignore | 2 +- + .../selftests/powerpc/stringloops/asm/ppc_asm.h | 2 +- + tools/testing/selftests/powerpc/tm/tm-vmxcopy.c | 2 +- + tools/testing/selftests/powerpc/vphn/Makefile | 2 +- + tools/testing/selftests/powerpc/vphn/asm/lppaca.h | 1 + + tools/testing/selftests/powerpc/vphn/vphn.c | 2 +- + tools/testing/selftests/powerpc/vphn/vphn.h | 1 - + tools/testing/selftests/rseq/rseq-arm.h | 61 +- + .../tc-testing/tc-tests/actions/skbedit.json | 117 + + tools/vm/slabinfo.c | 118 +- + usr/.gitignore | 1 - + usr/Makefile | 2 + + usr/include/.gitignore | 3 + + usr/include/Makefile | 132 + + virt/kvm/arm/arch_timer.c | 24 +- + virt/kvm/arm/arm.c | 7 +- + virt/kvm/arm/mmu.c | 2 +- + virt/kvm/arm/pmu.c | 350 +- + virt/kvm/arm/psci.c | 149 +- + virt/kvm/irqchip.c | 4 +- + virt/kvm/kvm_main.c | 41 +- + 1604 files changed, 44840 insertions(+), 29245 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-cros-ec + create mode 100644 Documentation/ABI/testing/sysfs-platform-wilco-ec + delete mode 100644 Documentation/devicetree/bindings/arm/al,alpine.txt + create mode 100644 Documentation/devicetree/bindings/arm/al,alpine.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/axxia.txt + create mode 100644 Documentation/devicetree/bindings/arm/axxia.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/digicolor.txt + create mode 100644 Documentation/devicetree/bindings/arm/digicolor.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/moxart.txt + create mode 100644 Documentation/devicetree/bindings/arm/moxart.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/nxp/lpc32xx.txt + create mode 100644 Documentation/devicetree/bindings/arm/nxp/lpc32xx.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/psci.txt + create mode 100644 Documentation/devicetree/bindings/arm/psci.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/rda.txt + create mode 100644 Documentation/devicetree/bindings/arm/rda.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller.yaml + rename Documentation/devicetree/bindings/mmc/{tmio_mmc.txt => renesas,sdhi.txt} (87%) + delete mode 100644 Documentation/devicetree/bindings/mmc/sunxi-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-a10-mdio.yaml + delete mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt + delete mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt + delete mode 100644 Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt + create mode 100644 Documentation/devicetree/bindings/net/ethernet-controller.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml + create mode 100644 Documentation/devicetree/bindings/net/mdio.yaml + create mode 100644 Documentation/devicetree/bindings/net/snps,dwmac.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml + create mode 100644 Documentation/driver-api/ipmb.rst + rename Documentation/driver-model/{binding.txt => binding.rst} (92%) + rename Documentation/driver-model/{bus.txt => bus.rst} (76%) + rename Documentation/driver-model/{class.txt => class.rst} (75%) + rename Documentation/driver-model/{design-patterns.txt => design-patterns.rst} (59%) + rename Documentation/driver-model/{device.txt => device.rst} (71%) + rename Documentation/driver-model/{devres.txt => devres.rst} (93%) + rename Documentation/driver-model/{driver.txt => driver.rst} (75%) + create mode 100644 Documentation/driver-model/index.rst + rename Documentation/driver-model/{overview.txt => overview.rst} (90%) + rename Documentation/driver-model/{platform.txt => platform.rst} (95%) + rename Documentation/driver-model/{porting.txt => porting.rst} (62%) + create mode 100644 Documentation/powerpc/vcpudispatch_stats.txt + create mode 100644 Documentation/virtual/index.rst + create mode 100644 Documentation/virtual/kvm/cpuid.rst + delete mode 100644 Documentation/virtual/kvm/cpuid.txt + create mode 100644 Documentation/virtual/kvm/index.rst + rename Documentation/virtual/{paravirt_ops.txt => paravirt_ops.rst} (65%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-pinfunc.h + delete mode 100644 arch/mips/mm/gup.c + create mode 100644 arch/powerpc/kernel/dawr.c + delete mode 100644 arch/powerpc/mm/book3s64/vphn.h + rename arch/powerpc/{sysdev => platforms/8xx}/cpm1.c (97%) + create mode 100644 arch/powerpc/platforms/8xx/micropatch.c + rename arch/powerpc/{mm/book3s64 => platforms/pseries}/vphn.c (80%) + delete mode 100644 arch/powerpc/sysdev/micropatch.c + delete mode 100644 arch/sh/mm/gup.c + delete mode 100644 arch/sparc/lib/COPYING.LIB + delete mode 100644 arch/sparc/mm/gup.c + rename arch/unicore32/configs/{unicore32_defconfig => defconfig} (100%) + create mode 100644 drivers/char/ipmi/ipmb_dev_int.c + delete mode 100644 drivers/gpu/drm/i915/.gitignore + create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c + create mode 100644 drivers/mtd/hyperbus/Kconfig + create mode 100644 drivers/mtd/hyperbus/Makefile + create mode 100644 drivers/mtd/hyperbus/hbmc-am654.c + create mode 100644 drivers/mtd/hyperbus/hyperbus-core.c + delete mode 100644 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c + create mode 100644 drivers/mtd/nand/spi/paragon.c + delete mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c + create mode 100644 drivers/pinctrl/aspeed/pinmux-aspeed.c + create mode 100644 drivers/pinctrl/aspeed/pinmux-aspeed.h + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8mn.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8150.c + create mode 100644 drivers/pinctrl/tegra/pinctrl-tegra194.c + create mode 100644 drivers/platform/chrome/cros_ec_ishtp.c + delete mode 100644 drivers/platform/chrome/cros_ec_lpc_reg.c + delete mode 100644 drivers/platform/chrome/cros_ec_lpc_reg.h + create mode 100644 drivers/platform/chrome/wilco_ec/event.c + create mode 100644 drivers/platform/chrome/wilco_ec/properties.c + create mode 100644 drivers/platform/chrome/wilco_ec/sysfs.c + create mode 100644 drivers/platform/chrome/wilco_ec/telemetry.c + create mode 100644 fs/xfs/scrub/attr.h + create mode 100644 fs/xfs/xfs_bio_io.c + create mode 100644 fs/xfs/xfs_iwalk.c + create mode 100644 fs/xfs/xfs_iwalk.h + create mode 100644 fs/xfs/xfs_pwork.c + create mode 100644 fs/xfs/xfs_pwork.h + delete mode 100644 fs/xfs/xfs_trans_bmap.c + delete mode 100644 fs/xfs/xfs_trans_extfree.c + delete mode 100644 fs/xfs/xfs_trans_refcount.c + delete mode 100644 fs/xfs/xfs_trans_rmap.c + create mode 100644 include/Kbuild + create mode 100644 include/asm-generic/bitops-instrumented.h + create mode 100644 include/asm-generic/mshyperv.h + delete mode 100644 include/asm-generic/ptrace.h + create mode 100644 include/linux/dma/mxs-dma.h + create mode 100644 include/linux/input/elan-i2c-ids.h + create mode 100644 include/linux/mtd/hyperbus.h + rename include/uapi/{linux => }/Kbuild (77%) + create mode 100755 scripts/get_abi.pl + delete mode 100755 scripts/headers.sh + create mode 100644 tools/include/linux/zalloc.h + create mode 100644 tools/lib/zalloc.c + create mode 100644 tools/perf/util/get_current_dir_name.h + create mode 100644 tools/testing/selftests/drivers/dma-buf/config + create mode 120000 tools/testing/selftests/powerpc/vphn/asm/lppaca.h + delete mode 120000 tools/testing/selftests/powerpc/vphn/vphn.h + create mode 100644 usr/include/.gitignore + create mode 100644 usr/include/Makefile +Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) +$ git merge fixes/master +Already up to date. +Merging kspp-gustavo/for-next/kspp (d93512ef0f0e Makefile: Globally enable fall-through warning) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/afs/fsclient.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb.c +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging drivers/net/can/peak_canfd/peak_pciefd_main.c +Auto-merging drivers/net/can/at91_can.c +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/process/deprecated.rst | 14 +++++++ + Makefile | 3 ++ + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + drivers/net/can/at91_can.c | 6 ++- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 +- + drivers/net/can/spi/mcp251x.c | 3 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + drivers/platform/x86/acer-wmi.c | 4 ++ + fs/afs/fsclient.c | 51 ++++++++++++++++--------- + fs/afs/yfsclient.c | 54 +++++++++++++++++---------- + 12 files changed, 100 insertions(+), 44 deletions(-) +Merging kbuild-current/fixes (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig) +$ git merge arc-current/for-curr +Auto-merging arch/arc/mm/fault.c +CONFLICT (content): Merge conflict in arch/arc/mm/fault.c +Resolved 'arch/arc/mm/fault.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 06fd4253a8c9] Merge remote-tracking branch 'arc-current/for-curr' +$ git diff -M --stat --summary HEAD^.. + arch/arc/boot/dts/haps_hs.dts | 30 +++ + arch/arc/boot/dts/hsdk.dts | 14 ++ + arch/arc/configs/haps_hs_defconfig | 5 +- + arch/arc/configs/hsdk_defconfig | 5 + + arch/arc/include/asm/entry-arcv2.h | 361 ++++++++++++++++++----------------- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/linkage.h | 18 ++ + arch/arc/kernel/asm-offsets.c | 7 + + arch/arc/kernel/entry-arcv2.S | 62 ++---- + arch/arc/kernel/entry-compact.S | 2 +- + arch/arc/kernel/entry.S | 4 +- + arch/arc/kernel/unwind.c | 9 +- + arch/arc/mm/fault.c | 185 ++++++++---------- + arch/arc/mm/tlbex.S | 11 ++ + 14 files changed, 377 insertions(+), 340 deletions(-) +Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (2659dc8d225c Merge tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (aa69fb62bea1 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (9a159190414d s390/unwind: avoid int overflow in outside_of_stack) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (76104862ccca sky2: Disable MSI on P5W DH Deluxe) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/bonding.txt | 16 +++- + drivers/net/ethernet/google/gve/gve_main.c | 1 - + drivers/net/ethernet/marvell/sky2.c | 7 ++ + drivers/net/ethernet/realtek/r8169_main.c | 137 +++++++++++++++++++++++++++++ + drivers/net/ethernet/sis/sis900.c | 6 +- + net/ipv6/sit.c | 13 ++- + 6 files changed, 169 insertions(+), 11 deletions(-) +Merging bpf/master (af3c24e0e2ed selftests/bpf: fix compiling loop{1, 2, 3}.c on s390) +$ git merge bpf/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + kernel/bpf/verifier.c | 13 +++-- + net/xdp/xdp_umem.c | 16 +++--- + net/xdp/xsk.c | 13 +++-- + tools/bpf/bpftool/main.h | 1 + + tools/lib/bpf/libbpf.c | 4 +- + tools/testing/selftests/bpf/Makefile | 17 +++--- + tools/testing/selftests/bpf/bpf_helpers.h | 89 +++++++++++++++++++++---------- + tools/testing/selftests/bpf/progs/loop1.c | 2 +- + tools/testing/selftests/bpf/progs/loop2.c | 2 +- + tools/testing/selftests/bpf/progs/loop3.c | 2 +- + 11 files changed, 97 insertions(+), 64 deletions(-) +Merging ipsec/master (114a5c324015 Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (1c5ec78272e3 netfilter: nfnetlink: avoid deadlock due to synchronous request_module) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nfnetlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2a92b08b1855 mt76: usb: fix rx A-MSDU support) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (d2ce8d6bfcfe nl80211: Fix undefined behavior in bit shift) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (4b972a01a7da Linux 5.2-rc6) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (0dcb4efb1095 ALSA: firewire-lib: code refactoring for local variables) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (bd6fe4ae445e Merge branch 'asoc-5.2' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (ea09b3e21f18 Merge branch 'regmap-5.2' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (174bc9941d7d Merge branch 'regulator-5.2' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (70b5fa4cc32f Merge branch 'spi-5.2' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (6dbbd053e6ae PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (42de8afc40c9 usb: dwc2: Use generic PHY width in params setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f8377eff5481 USB: serial: ftdi_sio: add ID for isodebug v1) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (ada28f7b3a97 phy: tegra: xusb: Add Tegra210 PLL power supplies) +$ git merge phy/fixes +Auto-merging drivers/phy/tegra/xusb-tegra210.c +Auto-merging drivers/phy/tegra/xusb-tegra124.c +Auto-merging drivers/phy/broadcom/phy-brcm-usb.c +Merge made by the 'recursive' strategy. +Merging staging.current/staging-linus (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (597473720f4d Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (20e833dc3635 crypto: ccp - memset structure fields to zero before reuse) +$ git merge crypto-current/master +Auto-merging drivers/crypto/stm32/stm32-hash.c +Auto-merging drivers/crypto/ccp/ccp-ops.c +Auto-merging drivers/crypto/amcc/crypto4xx_trng.c +Merge made by the 'recursive' strategy. + drivers/crypto/amcc/crypto4xx_trng.c | 1 - + drivers/crypto/ccp/ccp-ops.c | 12 +++++++++++- + drivers/crypto/stm32/stm32-hash.c | 2 +- + 3 files changed, 12 insertions(+), 3 deletions(-) +Merging ide/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (0ecfebd2b524 Linux 5.2) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c7a87ceb17ae mtd: rawnand: sunxi: Add A23/A33 DMA support with extra MBUS configuration) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + include/uapi/linux/videodev2.h | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Auto-merging drivers/reset/core.c +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 3 --- + 1 file changed, 3 deletions(-) +Merging mips-fixes/mips-fixes (f2ff671f8941 MAINTAINERS: Correct path to moved files) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fb59ee37cfe2 ARM: dts: am57xx: Disable voltage switching for SD card) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revc.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +Auto-merging arch/arm/boot/dts/am572x-idk.dts +Auto-merging arch/arm/boot/dts/am571x-idk.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir5221.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir3220.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir2110.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 7 +------ + arch/arm/boot/dts/am572x-idk.dts | 7 +------ + arch/arm/boot/dts/am574x-idk.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +------ + 9 files changed, 9 insertions(+), 33 deletions(-) +Merging kvm-fixes/master (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (5696e4aaabf2 hwmon: (pwm-fan) Check return value from devm_add_action_or_reset) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (a4a357fd4477 Merge branch 'for-5.2/dax' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + drivers/base/core.c | 27 ++++++--- + drivers/nvdimm/bus.c | 138 +++++++++++++++++++++++++++++-------------- + drivers/nvdimm/nd-core.h | 3 +- + drivers/nvdimm/region.c | 22 +++---- + drivers/nvdimm/region_devs.c | 4 ++ + include/linux/device.h | 1 + + 6 files changed, 131 insertions(+), 64 deletions(-) +Merging btrfs-fixes/next-fixes (02252ea054b8 Merge branch 'misc-5.2' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (75f2d86b20bf fs: VALIDATE_FS_PARSER should default to n) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (9e0babf2c06c Linux 5.2-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (852d095d16a6 checkpatch.pl: Update DT vendor prefix check) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.h +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +Merge made by the 'recursive' strategy. + drivers/s390/scsi/zfcp_erp.c | 7 ++++ + drivers/s390/scsi/zfcp_fsf.c | 55 +++++++++++++++++++++++++++---- + drivers/scsi/libsas/sas_scsi_host.c | 1 - + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +-- + drivers/scsi/megaraid/megaraid_sas_base.c | 30 +++++++++++++---- + drivers/scsi/pm8001/pm8001_sas.c | 6 +++- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 2 ++ + drivers/scsi/scsi_devinfo.c | 2 ++ + drivers/scsi/scsi_lib.c | 2 +- + 11 files changed, 93 insertions(+), 20 deletions(-) +Merging drm-fixes/drm-fixes (a0b2cf792ac9 Merge tag 'imx-drm-fixes-2019-07-04' of git://git.pengutronix.de/git/pza/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2)) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (d7e8a19b38c8 drm/i915: Don't dereference request if it may have been retired when printing) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem_userptr.c | 10 ++++++- + drivers/gpu/drm/i915/i915_perf.c | 10 ++++--- + drivers/gpu/drm/i915/i915_reg.h | 7 +++++ + drivers/gpu/drm/i915/i915_request.c | 4 +-- + drivers/gpu/drm/i915/intel_context.c | 1 - + drivers/gpu/drm/i915/intel_context_types.h | 2 -- + drivers/gpu/drm/i915/intel_engine_cs.c | 17 +++++++----- + drivers/gpu/drm/i915/intel_engine_types.h | 2 ++ + drivers/gpu/drm/i915/intel_workarounds.c | 43 +++++++++++++++++++++++++++--- + 9 files changed, 77 insertions(+), 19 deletions(-) +Merging mmc-fixes/fixes (83293386bc95 mmc: core: Prevent processing SDIO IRQs when the card is suspended) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (9be11356057a PCI: pci-hyperv: fix build errors on non-SYSFS config) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 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 (0db7f5cd4aeb riscv: mm: Fix code comment) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (2f040d27080d drm/panfrost: Fix a double-free error) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (0cee22f4fe90 kbuild: get rid of misleading $(AS) from documents) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/kbuild/kbuild.rst | 5 ++--- + Documentation/kbuild/makefiles.rst | 12 ++++++------ + arch/riscv/Makefile | 2 -- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/confdata.c | 7 +++---- + scripts/kconfig/expr.h | 1 + + scripts/package/builddeb | 5 +++++ + scripts/package/mkdebian | 1 + + 8 files changed, 19 insertions(+), 16 deletions(-) +Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (5ddacd4b47c8 dma-direct: Force unencrypted DMA under SME for certain DMA masks) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + arch/x86/mm/mem_encrypt.c | 30 ++++++++++++++++++++++++++++++ + include/linux/dma-direct.h | 9 +++++++++ + kernel/dma/Kconfig | 3 +++ + kernel/dma/direct.c | 16 ++++------------ + 5 files changed, 47 insertions(+), 12 deletions(-) +Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next) +$ git merge arm/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c +Auto-merging drivers/gpu/drm/armada/armada_plane.c +Auto-merging drivers/gpu/drm/armada/armada_overlay.c +Auto-merging drivers/gpu/drm/armada/armada_hw.h +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/armada/armada_drm.h +Auto-merging drivers/gpu/drm/armada/armada_debugfs.c +Auto-merging drivers/gpu/drm/armada/armada_crtc.h +Auto-merging drivers/gpu/drm/armada/armada_crtc.c +Auto-merging drivers/gpu/drm/armada/armada_510.c +Auto-merging arch/arm/mach-sa1100/hackkit.c +Auto-merging arch/arm/mach-sa1100/h3xxx.c +Auto-merging arch/arm/mach-sa1100/badge4.c +Auto-merging arch/arm/mach-sa1100/assabet.c +Auto-merging arch/arm/mach-rpc/time.c +Auto-merging arch/arm/mach-rpc/include/mach/uncompress.h +Auto-merging arch/arm/mach-rpc/ecard.c +Auto-merging arch/arm/mach-rpc/dma.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/Kconfig | 3 +- + arch/arm/lib/Makefile | 1 - + arch/arm/mach-rpc/Makefile | 3 +- + arch/arm/mach-rpc/dma.c | 97 ++--- + arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0 + arch/arm/mach-rpc/ecard.c | 32 +- + arch/arm/{lib => mach-rpc}/floppydma.S | 0 + arch/arm/mach-rpc/include/mach/uncompress.h | 23 +- + arch/arm/{lib => mach-rpc}/io-acorn.S | 0 + arch/arm/mach-rpc/irq.c | 136 +++---- + arch/arm/mach-rpc/time.c | 38 +- + arch/arm/mach-sa1100/assabet.c | 91 ++--- + arch/arm/mach-sa1100/badge4.c | 2 - + arch/arm/mach-sa1100/clock.c | 220 +++++------ + arch/arm/mach-sa1100/h3xxx.c | 64 +-- + arch/arm/mach-sa1100/hackkit.c | 48 --- + arch/arm/mach-sa1100/neponset.c | 109 ++---- + drivers/gpu/drm/armada/armada_510.c | 130 +++++-- + drivers/gpu/drm/armada/armada_crtc.c | 214 +++++++++- + drivers/gpu/drm/armada/armada_crtc.h | 21 +- + drivers/gpu/drm/armada/armada_debugfs.c | 98 ++--- + drivers/gpu/drm/armada/armada_drm.h | 1 + + drivers/gpu/drm/armada/armada_drv.c | 38 +- + drivers/gpu/drm/armada/armada_hw.h | 29 +- + drivers/gpu/drm/armada/armada_overlay.c | 56 +-- + drivers/gpu/drm/armada/armada_plane.c | 124 ++++-- + drivers/gpu/drm/armada/armada_plane.h | 23 ++ + drivers/gpu/drm/i2c/tda998x_drv.c | 450 +++++++++++++++------- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/sa1100.c | 46 ++- + 31 files changed, 1190 insertions(+), 910 deletions(-) + rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%) + rename arch/arm/{lib => mach-rpc}/floppydma.S (100%) + rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%) +Merging arm64/for-next/core (0c61efd322b7 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (d482e575fbf0 perf: arm_spe: Enable ACPI/Platform automatic module loading) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (242af9ac5b32 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Removing include/linux/platform_data/video-clcd-versatile.h +Auto-merging drivers/soc/rockchip/pm_domains.c +Auto-merging drivers/soc/imx/soc-imx8.c +Auto-merging drivers/memory/tegra/tegra124.c +Auto-merging drivers/memory/jedec_ddr_data.c +Auto-merging drivers/memory/jedec_ddr.h +Auto-merging drivers/memory/emif.c +Auto-merging drivers/memory/brcmstb_dpfe.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/firmware/ti_sci.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/include/mach/lubbock.h +Auto-merging arch/arm/mach-omap2/sleep44xx.S +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/omap-smc.S +Auto-merging arch/arm/mach-omap2/omap-headsmp.S +Auto-merging arch/arm/mach-keystone/smc.S +Auto-merging arch/arm/mach-imx/mach-imx7d.c +Auto-merging arch/arm/mach-imx/cpuidle-imx6q.c +Auto-merging arch/arm/mach-highbank/smc.S +Auto-merging arch/arm/mach-bcm/bcm63xx_smp.c +CONFLICT (modify/delete): arch/arm/include/debug/netx.S deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/include/debug/netx.S left in tree. +Removing arch/arm/configs/netx_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi +Auto-merging arch/arm/boot/dts/imx7ulp.dtsi +Auto-merging arch/arm/boot/dts/hip04.dtsi +Auto-merging arch/arm/boot/dts/am335x-wega.dtsi +Auto-merging arch/arm/boot/dts/am335x-wega-rdk.dts +Auto-merging arch/arm/boot/dts/am335x-phycore-som.dtsi +Auto-merging arch/arm/boot/dts/am335x-phycore-rdk.dts +Auto-merging arch/arm/boot/dts/am335x-pcm-953.dtsi +Auto-merging arch/arm/boot/dts/am335x-baltos-ir5221.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir3220.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir2110.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/pwm/pwm-sun4i.txt +Removing Documentation/devicetree/bindings/bus/sunxi-rsb.txt +Removing Documentation/devicetree/bindings/arm/stm32/stm32.txt +Removing Documentation/devicetree/bindings/arm/mediatek.txt +Removing Documentation/devicetree/bindings/arm/emtrion.txt +Removing Documentation/devicetree/bindings/arm/atmel-at91.txt +Removing Documentation/devicetree/bindings/arm/amlogic.txt +Resolved 'arch/arm/configs/exynos_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/include/debug/netx.S +arch/arm/include/debug/netx.S: needs merge +rm 'arch/arm/include/debug/netx.S' +$ git commit -v -a +[master 200f51634359] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.txt | 142 -- + Documentation/devicetree/bindings/arm/amlogic.yaml | 144 ++ + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 + + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + .../devicetree/bindings/arm/atmel-at91.txt | 73 - + .../devicetree/bindings/arm/atmel-at91.yaml | 134 ++ + Documentation/devicetree/bindings/arm/emtrion.txt | 12 - + Documentation/devicetree/bindings/arm/fsl.yaml | 44 + + Documentation/devicetree/bindings/arm/mediatek.txt | 89 - + .../devicetree/bindings/arm/mediatek.yaml | 91 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + Documentation/devicetree/bindings/arm/renesas.yaml | 8 + + .../devicetree/bindings/arm/rockchip.yaml | 13 + + .../devicetree/bindings/arm/stm32/stm32.txt | 10 - + .../devicetree/bindings/arm/stm32/stm32.yaml | 31 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + Documentation/devicetree/bindings/arm/ti/k3.txt | 3 + + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 79 + + .../devicetree/bindings/bus/sunxi-rsb.txt | 47 - + .../bindings/display/bridge/renesas,dw-hdmi.txt | 4 +- + Documentation/devicetree/bindings/dma/fsl-qdma.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 1 + + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 1 + + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 + + .../devicetree/bindings/net/can/rcar_can.txt | 13 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 16 +- + .../devicetree/bindings/power/qcom,rpmpd.txt | 2 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 57 + + .../devicetree/bindings/pwm/pwm-sun4i.txt | 24 - + .../bindings/reset/bitmain,bm1880-reset.txt | 18 + + .../devicetree/bindings/reset/fsl,imx7-src.txt | 2 +- + .../devicetree/bindings/serial/omap_serial.txt | 1 + + .../bindings/soc/amlogic/amlogic,canvas.txt | 10 +- + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 81 + + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 6 +- + .../devicetree/bindings/timer/renesas,cmt.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + + MAINTAINERS | 11 +- + arch/arm/Kconfig | 11 - + arch/arm/Kconfig.debug | 7 - + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 207 +++ + arch/arm/boot/dts/Makefile | 10 + + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 12 + + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 12 + + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 11 + + arch/arm/boot/dts/am335x-pcm-953.dtsi | 22 +- + arch/arm/boot/dts/am335x-phycore-rdk.dts | 4 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 47 +- + arch/arm/boot/dts/am335x-regor-rdk.dts | 24 + + arch/arm/boot/dts/am335x-regor.dtsi | 223 +++ + arch/arm/boot/dts/am335x-wega-rdk.dts | 4 + + arch/arm/boot/dts/am335x-wega.dtsi | 16 +- + arch/arm/boot/dts/arm-realview-eb.dtsi | 6 + + arch/arm/boot/dts/arm-realview-pb1176.dts | 6 + + arch/arm/boot/dts/arm-realview-pb11mp.dts | 6 + + arch/arm/boot/dts/arm-realview-pbx.dtsi | 6 + + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 8 + + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 160 ++ + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 846 +++++++++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 566 ++++++ + arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 207 +++ + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 22 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 966 +++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 224 +++ + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 123 +- + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 5 + + arch/arm/boot/dts/aspeed-g4.dtsi | 8 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 11 +- + arch/arm/boot/dts/at91-wb50n.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 8 - + arch/arm/boot/dts/at91sam9g45.dtsi | 25 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 25 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 23 +- + arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 12 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 6 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 9 +- + arch/arm/boot/dts/bcm11351.dtsi | 12 +- + arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 10 +- + arch/arm/boot/dts/bcm23550-sparrow.dts | 2 +- + arch/arm/boot/dts/bcm23550.dtsi | 8 +- + arch/arm/boot/dts/bcm28155-ap.dts | 2 +- + arch/arm/boot/dts/bcm283x.dtsi | 2 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 - + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 4 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +- + arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 4 +- + arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +- + arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 4 +- + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 4 +- + arch/arm/boot/dts/bcm5301x.dtsi | 10 +- + arch/arm/boot/dts/bcm53573.dtsi | 2 +- + arch/arm/boot/dts/bcm63138.dtsi | 9 +- + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 2 +- + arch/arm/boot/dts/bcm7445.dtsi | 8 +- + arch/arm/boot/dts/bcm911360_entphn.dts | 2 - + arch/arm/boot/dts/bcm947189acdbmr.dts | 4 +- + arch/arm/boot/dts/bcm953012er.dts | 4 +- + arch/arm/boot/dts/bcm953012k.dts | 2 +- + arch/arm/boot/dts/bcm958522er.dts | 2 +- + arch/arm/boot/dts/bcm958525er.dts | 2 +- + arch/arm/boot/dts/bcm958525xmc.dts | 2 +- + arch/arm/boot/dts/bcm958622hr.dts | 2 +- + arch/arm/boot/dts/bcm958623hr.dts | 2 +- + arch/arm/boot/dts/bcm958625hr.dts | 2 +- + arch/arm/boot/dts/bcm958625k.dts | 2 +- + arch/arm/boot/dts/bcm963138dvt.dts | 2 +- + arch/arm/boot/dts/bcm988312hr.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 13 + + arch/arm/boot/dts/da850-lcdk.dts | 36 + + arch/arm/boot/dts/da850-lego-ev3.dts | 30 + + arch/arm/boot/dts/da850.dtsi | 50 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 5 + + arch/arm/boot/dts/exynos3250-monk.dts | 5 + + arch/arm/boot/dts/exynos3250-rinato.dts | 5 + + arch/arm/boot/dts/exynos3250.dtsi | 33 + + arch/arm/boot/dts/exynos4.dtsi | 16 +- + arch/arm/boot/dts/exynos4210-origen.dts | 5 + + arch/arm/boot/dts/exynos4210-trats.dts | 4 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 5 + + arch/arm/boot/dts/exynos4210.dtsi | 51 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 + + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 5 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 + + arch/arm/boot/dts/exynos4412-prime.dtsi | 7 + + arch/arm/boot/dts/exynos4412.dtsi | 49 + + arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 + + arch/arm/boot/dts/exynos5410.dtsi | 6 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 102 +- + arch/arm/boot/dts/exynos5420.dtsi | 234 ++- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 108 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 + + arch/arm/boot/dts/exynos54xx.dtsi | 9 + + arch/arm/boot/dts/hip04.dtsi | 18 +- + arch/arm/boot/dts/ibm-power9-dual.dtsi | 248 +++ + arch/arm/boot/dts/imx53-m53menlo.dts | 266 ++- + arch/arm/boot/dts/imx53-smd.dts | 73 + + arch/arm/boot/dts/imx53.dtsi | 12 + + arch/arm/boot/dts/imx6dl-kontron-samx6i.dtsi | 12 + + arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 36 + + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 815 +++++++++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 16 + + arch/arm/boot/dts/imx6qdl.dtsi | 11 +- + arch/arm/boot/dts/imx6sl-evk.dts | 12 + + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + arch/arm/boot/dts/imx6sll-evk.dts | 12 + + arch/arm/boot/dts/imx6sll.dtsi | 2 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 16 + + arch/arm/boot/dts/imx6sx-sdb.dts | 16 + + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 89 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 + + arch/arm/boot/dts/imx6ul-geam.dts | 2 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 14 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 6 + + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7d-meerkat96.dts | 375 ++++ + arch/arm/boot/dts/imx7d-sdb.dts | 16 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 16 +- + arch/arm/boot/dts/imx7d.dtsi | 16 +- + arch/arm/boot/dts/imx7s.dtsi | 11 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 55 + + arch/arm/boot/dts/imx7ulp.dtsi | 38 + + arch/arm/boot/dts/integrator.dtsi | 3 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 32 + + arch/arm/boot/dts/ls1021a-tsn.dts | 289 ++++ + arch/arm/boot/dts/meson.dtsi | 44 +- + arch/arm/boot/dts/meson6-atv1200.dts | 44 +- + arch/arm/boot/dts/meson6.dtsi | 44 +- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +- + arch/arm/boot/dts/meson8.dtsi | 64 +- + arch/arm/boot/dts/meson8b-ec100.dts | 9 +- + arch/arm/boot/dts/meson8b-mxq.dts | 182 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 51 +- + arch/arm/boot/dts/meson8b.dtsi | 64 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 17 +- + arch/arm/boot/dts/meson8m2.dtsi | 10 + + arch/arm/boot/dts/omap4-l4.dtsi | 9 - + arch/arm/boot/dts/pxa300-raumfeld-common.dtsi | 6 +- + arch/arm/boot/dts/pxa300-raumfeld-controller.dts | 21 +- + arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts | 3 + + arch/arm/boot/dts/pxa3xx.dtsi | 8 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 6 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 156 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 138 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 38 + + arch/arm/boot/dts/r7s72100.dtsi | 19 + + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 161 +- + arch/arm/boot/dts/r7s9210.dtsi | 286 +++ + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 4 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 9 +- + arch/arm/boot/dts/r8a7790-stout.dts | 9 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 9 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 9 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 34 + + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 85 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 29 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 207 +++ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 +++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 234 ++- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 256 ++- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 219 +++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 76 +- + arch/arm/boot/dts/rk3288.dtsi | 30 +- + arch/arm/boot/dts/sama5d3.dtsi | 27 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 21 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 19 + + arch/arm/boot/dts/stm32746g-eval.dts | 66 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 246 +++ + arch/arm/boot/dts/stm32mp157a-avenger96.dts | 321 ++++ + arch/arm/boot/dts/stm32mp157a-dk1.dts | 70 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 18 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 125 +- + arch/arm/boot/dts/stm32mp157c.dtsi | 180 ++ + arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi | 90 + + arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi | 62 + + arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi | 78 + + arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi | 62 + + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 8 + + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 29 + + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 + + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 7 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 123 ++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 3 +- + arch/arm/boot/dts/uniphier-ld4-ref.dts | 4 + + arch/arm/boot/dts/uniphier-ld4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 4 + + arch/arm/boot/dts/uniphier-pro4-ref.dts | 4 + + arch/arm/boot/dts/uniphier-pro4.dtsi | 2 + + arch/arm/boot/dts/uniphier-pro5.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 4 + + arch/arm/boot/dts/uniphier-sld8.dtsi | 4 +- + arch/arm/boot/dts/versatile-ab.dts | 3 + + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 5 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 3 + + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 13 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 52 +- + arch/arm/configs/acs5k_defconfig | 1 - + arch/arm/configs/acs5k_tiny_defconfig | 1 - + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/configs/aspeed_g4_defconfig | 11 +- + arch/arm/configs/aspeed_g5_defconfig | 15 +- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/cm_x2xx_defconfig | 2 - + arch/arm/configs/cm_x300_defconfig | 2 - + arch/arm/configs/cns3420vb_defconfig | 1 - + arch/arm/configs/colibri_pxa270_defconfig | 2 - + arch/arm/configs/colibri_pxa300_defconfig | 2 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 2 - + arch/arm/configs/davinci_all_defconfig | 1 + + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 2 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 2 - + arch/arm/configs/exynos_defconfig | 65 +- + arch/arm/configs/ezx_defconfig | 2 - + arch/arm/configs/gemini_defconfig | 1 - + arch/arm/configs/h3600_defconfig | 1 - + arch/arm/configs/h5000_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 2 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/configs/integrator_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 2 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lpc18xx_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 2 - + arch/arm/configs/magician_defconfig | 2 - + arch/arm/configs/mini2440_defconfig | 45 +- + arch/arm/configs/mmp2_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 11 +- + arch/arm/configs/multi_v7_defconfig | 4 +- + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/mvebu_v7_defconfig | 1 - + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/netx_defconfig | 80 - + arch/arm/configs/nhk8815_defconfig | 2 - + arch/arm/configs/nuc910_defconfig | 1 - + arch/arm/configs/nuc950_defconfig | 1 - + arch/arm/configs/nuc960_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/palmz72_defconfig | 2 - + arch/arm/configs/pcm027_defconfig | 1 - + arch/arm/configs/prima2_defconfig | 1 - + arch/arm/configs/pxa168_defconfig | 1 - + arch/arm/configs/pxa3xx_defconfig | 2 - + arch/arm/configs/pxa910_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 2 - + arch/arm/configs/qcom_defconfig | 7 +- + arch/arm/configs/realview_defconfig | 2 - + arch/arm/configs/s3c2410_defconfig | 25 +- + arch/arm/configs/s3c6400_defconfig | 13 +- + arch/arm/configs/s5pv210_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 2 - + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/configs/spear3xx_defconfig | 2 - + arch/arm/configs/spear6xx_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 2 - + arch/arm/configs/tango4_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + arch/arm/configs/u300_defconfig | 2 - + arch/arm/configs/u8500_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 2 - + arch/arm/configs/viper_defconfig | 2 - + arch/arm/configs/xcep_defconfig | 1 - + arch/arm/configs/zeus_defconfig | 2 - + arch/arm/configs/zx_defconfig | 1 - + arch/arm/include/debug/netx.S | 32 - + arch/arm/mach-at91/pm.c | 1 + + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-bcm/Makefile | 3 - + arch/arm/mach-bcm/bcm63xx_smp.c | 1 + + arch/arm/mach-bcm/bcm_kona_smc.c | 2 - + arch/arm/mach-bcm/board_bcm281xx.c | 1 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 7 +- + arch/arm/mach-davinci/board-da850-evm.c | 43 +- + arch/arm/mach-exynos/Kconfig | 7 +- + arch/arm/mach-exynos/Makefile | 6 +- + arch/arm/mach-exynos/exynos-smc.S | 3 +- + arch/arm/mach-exynos/sleep.S | 3 +- + arch/arm/mach-exynos/suspend.c | 8 +- + arch/arm/mach-highbank/Makefile | 3 - + arch/arm/mach-highbank/smc.S | 3 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 10 +- + arch/arm/mach-imx/mach-imx7d.c | 7 + + arch/arm/mach-keystone/Makefile | 3 - + arch/arm/mach-keystone/smc.S | 1 + + arch/arm/mach-omap2/Makefile | 13 - + arch/arm/mach-omap2/omap-headsmp.S | 2 + + arch/arm/mach-omap2/omap-smc.S | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 39 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 8 +- + arch/arm/mach-omap2/pdata-quirks.c | 60 + + arch/arm/mach-omap2/sleep33xx.S | 1 + + arch/arm/mach-omap2/sleep34xx.S | 2 + + arch/arm/mach-omap2/sleep43xx.S | 2 + + arch/arm/mach-omap2/sleep44xx.S | 3 + + arch/arm/mach-pxa/include/mach/lubbock.h | 4 - + arch/arm/mach-pxa/lubbock.c | 3 +- + arch/arm/mach-rockchip/platsmp.c | 12 +- + arch/arm/mach-rockchip/pm.c | 2 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 17 + + arch/arm/mach-tango/Makefile | 3 - + arch/arm/mach-tango/smc.S | 2 + + arch/arm/mach-versatile/versatile_dt.c | 164 +- + arch/arm64/Kconfig.platforms | 3 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 25 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 - + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 23 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 23 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 - + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 44 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 + + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 3 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 12 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 28 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 35 +- + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 401 ++++- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 122 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 257 +++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1825 +++++++++++++++++++- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 386 +++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 15 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 10 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 15 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 9 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 106 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 37 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 13 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 14 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 38 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 12 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 13 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 14 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 4 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 4 +- + .../boot/dts/broadcom/stingray/stingray-usb.dtsi | 72 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 108 ++ + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 5 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 51 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 5 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 11 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 136 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 190 ++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 151 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 4 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 809 +++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 62 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 134 +- + .../arm64/boot/dts/hisilicon/hi3660-coresight.dtsi | 456 +++++ + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 + + .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 6 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 18 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 28 + + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 7 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 5 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 118 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 140 ++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 447 +++++ + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 75 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 53 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 176 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 55 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 509 ++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 16 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 13 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 52 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 22 +- + arch/arm64/boot/dts/qcom/Makefile | 4 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 17 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 59 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 185 ++ + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pms405.dtsi | 20 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 43 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 636 ++++++- + arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts | 238 +++ + arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts | 238 +++ + arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts | 174 ++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 1326 ++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 557 ++++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 283 ++- + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 325 ++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 63 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 15 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 26 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 527 +++++- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 246 ++- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 93 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 71 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 45 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 9 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 10 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 49 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 4 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 733 ++++++++ + .../dts/rockchip/rk3399-khadas-edge-captain.dts | 27 + + .../boot/dts/rockchip/rk3399-khadas-edge-v.dts | 27 + + .../arm64/boot/dts/rockchip/rk3399-khadas-edge.dts | 13 + + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 804 +++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 101 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 49 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 18 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 23 +- + arch/arm64/boot/dts/rockchip/rk3399pro.dtsi | 22 + + .../boot/dts/socionext/uniphier-ld11-global.dts | 4 + + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 15 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 15 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 4 + + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 15 +- + arch/arm64/boot/dts/sprd/sc9836.dtsi | 2 +- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 8 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 35 + + arch/arm64/boot/dts/ti/Makefile | 2 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 201 +++ + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 28 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 51 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 50 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 243 +++ + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 90 + + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 29 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 177 ++ + arch/arm64/configs/defconfig | 45 +- + drivers/bus/brcmstb_gisb.c | 4 +- + drivers/bus/fsl-mc/dprc.c | 30 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 17 +- + drivers/bus/ti-sysc.c | 454 ++++- + drivers/clk/imx/clk-imx8mm.c | 10 + + drivers/clk/imx/clk-imx8mq.c | 5 + + drivers/firmware/arm_scmi/clock.c | 2 + + drivers/firmware/arm_scmi/sensors.c | 10 +- + drivers/firmware/psci/psci_checker.c | 10 +- + drivers/firmware/tegra/bpmp.c | 4 +- + drivers/firmware/ti_sci.c | 1143 ++++++++++-- + drivers/firmware/ti_sci.h | 810 +++++++++ + drivers/hwmon/scmi-hwmon.c | 48 + + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_dpfe.c | 317 +++- + drivers/memory/emif.c | 3 +- + {include => drivers}/memory/jedec_ddr.h | 6 +- + {lib => drivers/memory}/jedec_ddr_data.c | 5 +- + drivers/memory/of_memory.c | 3 +- + drivers/memory/tegra/tegra124.c | 44 +- + drivers/reset/Kconfig | 3 +- + drivers/reset/reset-simple.c | 2 + + drivers/soc/amlogic/meson-canvas.c | 14 +- + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 61 +- + drivers/soc/fsl/Kconfig | 10 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/dpaa2-console.c | 329 ++++ + drivers/soc/fsl/dpio/dpio-driver.c | 23 +- + drivers/soc/fsl/dpio/qbman-portal.c | 148 +- + drivers/soc/fsl/dpio/qbman-portal.h | 9 +- + drivers/soc/fsl/guts.c | 6 + + drivers/soc/fsl/qbman/bman_portal.c | 20 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 21 +- + drivers/soc/fsl/qbman/qman_priv.h | 9 +- + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/soc-imx-scu.c | 144 ++ + drivers/soc/imx/soc-imx8.c | 63 +- + drivers/soc/qcom/Kconfig | 12 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 76 +- + drivers/soc/qcom/qcom_aoss.c | 480 +++++ + drivers/soc/qcom/rpmpd.c | 134 +- + drivers/soc/renesas/Kconfig | 4 +- + drivers/soc/rockchip/pm_domains.c | 230 +-- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- + drivers/soc/tegra/pmc.c | 18 + + drivers/soc/ti/Kconfig | 5 + + drivers/soc/ti/pm33xx.c | 1 + + include/dt-bindings/clock/imx8mm-clock.h | 11 +- + include/dt-bindings/clock/imx8mq-clock.h | 5 +- + include/dt-bindings/clock/rk3228-cru.h | 1 + + include/dt-bindings/clock/rk3328-cru.h | 1 + + include/dt-bindings/gpio/tegra186-gpio.h | 41 - + include/dt-bindings/power/qcom-aoss-qmp.h | 14 + + include/dt-bindings/power/qcom-rpmpd.h | 34 + + include/dt-bindings/reset/bitmain,bm1880-reset.h | 51 + + include/linux/platform_data/ti-sysc.h | 12 + + include/linux/platform_data/video-clcd-versatile.h | 28 - + include/linux/scmi_protocol.h | 1 + + include/linux/soc/ti/ti_sci_protocol.h | 246 +++ + include/soc/fsl/bman.h | 8 + + include/soc/fsl/qman.h | 9 + + lib/Kconfig | 8 - + lib/Makefile | 2 - + 647 files changed, 31929 insertions(+), 3630 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic.yaml + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + delete mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.txt + create mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/emtrion.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32.txt + create mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32.yaml + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-sun4i.txt + create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-regor-rdk.dts + create mode 100644 arch/arm/boot/dts/am335x-regor.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-swift.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts + create mode 100644 arch/arm/boot/dts/ibm-power9-dual.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-meerkat96.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts + create mode 100644 arch/arm/boot/dts/ls1021a-tsn.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-avenger96.dts + create mode 100644 arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi + delete mode 100644 arch/arm/configs/netx_defconfig + delete mode 100644 arch/arm/include/debug/netx.S + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-db845c.dts + create mode 100644 arch/arm64/boot/dts/renesas/hihope-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e.dtsi + rename {include => drivers}/memory/jedec_ddr.h (97%) + rename {lib => drivers/memory}/jedec_ddr_data.c (98%) + create mode 100644 drivers/soc/fsl/dpaa2-console.c + create mode 100644 drivers/soc/imx/soc-imx-scu.c + create mode 100644 drivers/soc/qcom/qcom_aoss.c + create mode 100644 include/dt-bindings/power/qcom-aoss-qmp.h + create mode 100644 include/dt-bindings/reset/bitmain,bm1880-reset.h + delete mode 100644 include/linux/platform_data/video-clcd-versatile.h +Merging actions/for-next (fb9c1c1deb5e 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 (11343d25a03b Merge branch 'v5.3/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging aspeed/for-next (a1f5c11ddb7d Merge branches 'dt-for-v5.3', 'defconfig-for-v5.3' and 'soc-for-v5.3' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (7eb505978425 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 (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (2a7f6c1a5376 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/clk/imx/clk-pllv3.c +Auto-merging drivers/clk/imx/clk-pfd.c +Auto-merging drivers/clk/imx/clk-imx8mm.c +Auto-merging drivers/clk/imx/clk-imx7d.c +Auto-merging drivers/clk/imx/clk-imx6ul.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6sl.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging drivers/clk/imx/clk-gate2.c +Auto-merging drivers/clk/imx/clk-gate-exclusive.c +Auto-merging drivers/clk/imx/clk-fixup-mux.c +Auto-merging drivers/clk/imx/clk-fixup-div.c +Auto-merging drivers/clk/imx/clk-cpu.c +Auto-merging drivers/clk/imx/clk-busy.c +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-busy.c | 30 +- + drivers/clk/imx/clk-cpu.c | 14 +- + drivers/clk/imx/clk-fixup-div.c | 15 +- + drivers/clk/imx/clk-fixup-mux.c | 15 +- + drivers/clk/imx/clk-gate-exclusive.c | 17 +- + drivers/clk/imx/clk-gate2.c | 14 +- + drivers/clk/imx/clk-imx6q.c | 781 ++++++++++++++-------------- + drivers/clk/imx/clk-imx6sl.c | 409 ++++++++------- + drivers/clk/imx/clk-imx6sll.c | 433 +++++++-------- + drivers/clk/imx/clk-imx6sx.c | 661 +++++++++++------------ + drivers/clk/imx/clk-imx6ul.c | 579 +++++++++++---------- + drivers/clk/imx/clk-imx7d.c | 983 ++++++++++++++++++----------------- + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 8 +- + drivers/clk/imx/clk-imx8mq.c | 22 +- + drivers/clk/imx/clk-pfd.c | 14 +- + drivers/clk/imx/clk-pllv3.c | 14 +- + drivers/clk/imx/clk.c | 34 +- + drivers/clk/imx/clk.h | 143 +++-- + 19 files changed, 2196 insertions(+), 1992 deletions(-) +Merging keystone/next (78145dbeaea1 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 (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (e1b0b32a5ad6 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 (7376d6a65730 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (07c1ef894030 Merge tag 'qcom-dts-for-5.3-2' into initial-for-5.3) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (a16ecb14d0b0 Merge branches 'arm-dt-for-v5.3', 'arm-soc-for-v5.3', 'arm-defconfig-for-v5.3', 'arm64-defconfig-for-v5.3', 'arm64-dt-for-v5.3' and 'dt-bindings-for-v5.3' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (6b251ea99242 dt-bindings: reset: imx7: Fix the spelling of 'indices') +$ git merge reset/reset/next +Auto-merging drivers/reset/reset-simple.c +CONFLICT (content): Merge conflict in drivers/reset/reset-simple.c +Resolved 'drivers/reset/reset-simple.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec4222263165] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + drivers/reset/reset-simple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (13622a50d8db Merge branch 'v5.3-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/clk-mmc-phase.c | 14 ++++++-------- + drivers/clk/rockchip/clk-px30.c | 12 +++--------- + drivers/clk/rockchip/clk-rk3228.c | 3 ++- + drivers/clk/rockchip/clk-rk3288.c | 13 +++---------- + drivers/clk/rockchip/clk-rk3328.c | 3 +++ + drivers/clk/rockchip/clk-rk3368.c | 12 +++--------- + drivers/clk/rockchip/clk-rk3399.c | 12 +++--------- + drivers/clk/rockchip/clk.h | 4 ++++ + 8 files changed, 27 insertions(+), 46 deletions(-) +Merging samsung-krzk/for-next (cf6664323e0f Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (0ecfebd2b524 Linux 5.2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (6c6b5d7650d9 Merge branch 'sunxi/dt64-for-5.3' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/sunxi/clk-sunxi.c +Removing Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Merge made by the 'recursive' strategy. + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 141 +++++++++++++++++++++ + .../devicetree/bindings/clock/sunxi-ccu.txt | 62 --------- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 2 + + 4 files changed, 144 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Merging tegra/for-next (033de83170dd Merge branch for-5.3/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (b1511f7a48c3 Merge branches 'clk-bcm63xx', 'clk-silabs', 'clk-lochnagar' and 'clk-rockchip' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/soc/ti/ti_sci_protocol.h +Auto-merging include/linux/clk.h +Auto-merging drivers/firmware/ti_sci.h +Auto-merging drivers/firmware/ti_sci.c +Auto-merging drivers/clk/tegra/clk-tegra210.c +Auto-merging drivers/clk/sunxi-ng/ccu_gate.h +Auto-merging drivers/clk/sunxi-ng/ccu_common.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-r40.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-r.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-h3.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-a33.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-a23.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun6i-a31.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun5i.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun50i-a64.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun4i-a10.c +Auto-merging drivers/clk/socfpga/clk-s10.c +Auto-merging drivers/clk/samsung/clk-exynos5433.c +Auto-merging drivers/clk/samsung/clk-exynos5420.c +Auto-merging drivers/clk/samsung/clk-exynos4.c +Auto-merging drivers/clk/qcom/gdsc.c +Auto-merging drivers/clk/qcom/gcc-msm8996.c +Auto-merging drivers/clk/mediatek/Kconfig +Auto-merging drivers/clk/keystone/Kconfig +Auto-merging drivers/clk/ingenic/jz4780-cgu.c +Auto-merging drivers/clk/ingenic/jz4740-cgu.c +Auto-merging drivers/clk/ingenic/cgu.h +Auto-merging drivers/clk/ingenic/cgu.c +Auto-merging drivers/clk/ingenic/Makefile +CONFLICT (content): Merge conflict in drivers/clk/ingenic/Makefile +Auto-merging drivers/clk/imx/clk-imx7d.c +Auto-merging drivers/clk/imx/clk-imx6ul.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/clk-qoriq.c +Auto-merging drivers/clk/clk-pwm.c +Auto-merging drivers/clk/clk-cdce706.c +Auto-merging drivers/clk/bcm/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/bcm/Kconfig +Auto-merging drivers/clk/at91/sckc.c +Auto-merging arch/mips/jz4740/time.c +Auto-merging arch/mips/jz4740/pm.c +Auto-merging arch/mips/jz4740/platform.c +Auto-merging arch/mips/jz4740/board-qi_lb60.c +CONFLICT (modify/delete): arch/mips/include/asm/mach-jz4740/clock.h deleted in clk/clk-next and modified in HEAD. Version HEAD of arch/mips/include/asm/mach-jz4740/clock.h left in tree. +Auto-merging Documentation/driver-model/devres.rst +Resolved 'drivers/clk/bcm/Kconfig' using previous resolution. +Resolved 'drivers/clk/ingenic/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/include/asm/mach-jz4740/clock.h +arch/mips/include/asm/mach-jz4740/clock.h: needs merge +rm 'arch/mips/include/asm/mach-jz4740/clock.h' +$ git commit -v -a +[master ab1636715ea3] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 1 + + .../devicetree/bindings/clock/at91-clock.txt | 7 +- + .../bindings/clock/brcm,bcm63xx-clocks.txt | 22 + + .../devicetree/bindings/clock/cirrus,lochnagar.txt | 1 + + .../devicetree/bindings/clock/mvebu-core-clock.txt | 1 + + .../devicetree/bindings/clock/qcom,gpucc.txt | 4 +- + .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 7 +- + .../devicetree/bindings/clock/silabs,si5341.txt | 162 +++ + Documentation/driver-model/devres.rst | 4 + + arch/mips/include/asm/mach-jz4740/clock.h | 22 - + arch/mips/jz4740/board-qi_lb60.c | 2 - + arch/mips/jz4740/platform.c | 2 - + arch/mips/jz4740/pm.c | 8 - + arch/mips/jz4740/time.c | 3 - + drivers/clk/Kconfig | 13 +- + drivers/clk/Makefile | 1 + + drivers/clk/at91/sckc.c | 281 +++- + drivers/clk/bcm/Kconfig | 25 + + drivers/clk/bcm/Makefile | 6 +- + drivers/clk/bcm/clk-bcm2835.c | 28 +- + drivers/clk/bcm/clk-bcm63xx-gate.c | 238 ++++ + drivers/clk/bcm/clk-raspberrypi.c | 315 +++++ + drivers/clk/clk-bulk.c | 23 +- + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-devres.c | 22 +- + drivers/clk/clk-lochnagar.c | 205 ++- + drivers/clk/clk-pwm.c | 14 + + drivers/clk/clk-qoriq.c | 12 + + drivers/clk/clk-si5341.c | 1346 ++++++++++++++++++++ + drivers/clk/clk-si544.c | 102 +- + drivers/clk/clk.c | 63 +- + drivers/clk/clk.h | 4 - + drivers/clk/imx/clk-imx6q.c | 1 + + drivers/clk/imx/clk-imx6sll.c | 1 + + drivers/clk/imx/clk-imx6sx.c | 1 + + drivers/clk/imx/clk-imx6ul.c | 1 + + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/clk/imx/clk.c | 1 + + drivers/clk/ingenic/Makefile | 2 +- + drivers/clk/ingenic/cgu.c | 41 +- + drivers/clk/ingenic/cgu.h | 4 + + drivers/clk/ingenic/jz4725b-cgu.c | 41 +- + drivers/clk/ingenic/jz4740-cgu.c | 105 +- + drivers/clk/ingenic/jz4770-cgu.c | 67 +- + drivers/clk/ingenic/jz4780-cgu.c | 3 + + drivers/clk/ingenic/pm.c | 45 + + drivers/clk/ingenic/pm.h | 12 + + drivers/clk/keystone/Kconfig | 11 + + drivers/clk/keystone/sci-clk.c | 239 +++- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8183.c | 19 - + drivers/clk/mediatek/clk-mt8516-aud.c | 65 + + drivers/clk/mediatek/clk-mt8516.c | 5 - + drivers/clk/meson/axg.c | 10 +- + drivers/clk/meson/clk-mpll.c | 36 +- + drivers/clk/meson/clk-mpll.h | 3 + + drivers/clk/meson/g12a.c | 843 +++++++++++- + drivers/clk/meson/g12a.h | 41 +- + drivers/clk/meson/gxbb.c | 5 - + drivers/clk/meson/meson-eeclk.c | 3 + + drivers/clk/meson/meson-eeclk.h | 2 + + drivers/clk/meson/meson8b.c | 154 +++ + drivers/clk/meson/meson8b.h | 8 +- + drivers/clk/mmp/clk-frac.c | 3 +- + drivers/clk/mvebu/kirkwood.c | 17 + + drivers/clk/qcom/gcc-msm8996.c | 36 - + drivers/clk/qcom/gcc-qcs404.c | 7 + + drivers/clk/qcom/gdsc.c | 4 +- + drivers/clk/renesas/clk-div6.c | 19 +- + drivers/clk/renesas/clk-mstp.c | 20 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a06g032-clocks.c | 227 +++- + drivers/clk/renesas/renesas-cpg-mssr.c | 37 +- + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/samsung/clk-exynos5420.c | 78 +- + drivers/clk/samsung/clk-exynos5433.c | 4 +- + drivers/clk/socfpga/clk-s10.c | 6 +- + drivers/clk/sprd/common.c | 9 +- + drivers/clk/sprd/sc9860-clk.c | 5 +- + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 39 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 41 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 69 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 39 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 29 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 104 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 46 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 29 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 32 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 29 +- + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_gate.h | 53 + + drivers/clk/tegra/clk-tegra210.c | 20 +- + drivers/clk/ti/divider.c | 85 -- + drivers/clk/ti/gate.c | 30 - + drivers/clk/ti/mux.c | 31 - + drivers/firmware/raspberrypi.c | 10 + + drivers/firmware/ti_sci.c | 124 +- + drivers/firmware/ti_sci.h | 63 +- + include/dt-bindings/clock/exynos4.h | 1 + + include/dt-bindings/clock/exynos5420.h | 18 +- + include/dt-bindings/clock/g12a-clkc.h | 1 + + include/dt-bindings/clock/meson8b-clkc.h | 3 + + include/dt-bindings/clock/mt8516-clk.h | 17 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 7 + + include/dt-bindings/clock/qcom,gpucc-msm8998.h | 29 + + include/dt-bindings/clock/stratix10-clock.h | 4 +- + include/linux/clk-provider.h | 103 +- + include/linux/clk.h | 47 + + include/linux/soc/ti/ti_sci_protocol.h | 28 +- + 120 files changed, 5339 insertions(+), 1117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/silabs,si5341.txt + delete mode 100644 arch/mips/include/asm/mach-jz4740/clock.h + create mode 100644 drivers/clk/bcm/clk-bcm63xx-gate.c + create mode 100644 drivers/clk/bcm/clk-raspberrypi.c + create mode 100644 drivers/clk/clk-si5341.c + create mode 100644 drivers/clk/ingenic/pm.c + create mode 100644 drivers/clk/ingenic/pm.h + create mode 100644 drivers/clk/mediatek/clk-mt8516-aud.c + create mode 100644 include/dt-bindings/clock/qcom,gpucc-msm8998.h +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 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 (9f98b3142d22 csky: Improve string operations performance by glibc code) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/traps.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/csky/pmu.txt | 38 +++ + arch/csky/Kconfig | 4 + + arch/csky/abiv1/Makefile | 7 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 6 + + arch/csky/abiv1/inc/abi/string.h | 14 +- + arch/csky/abiv1/memcmp.c | 310 +++++++++++++++++++ + arch/csky/abiv1/memcopy.h | 179 +++++++++++ + arch/csky/abiv1/memmove.c | 93 ++++++ + arch/csky/abiv1/memset.c | 86 ++++-- + arch/csky/abiv1/strcpy.c | 17 + + arch/csky/abiv1/strksyms.c | 4 + + arch/csky/abiv1/strlen.c | 89 ++++++ + arch/csky/abiv1/wordcopy.c | 397 ++++++++++++++++++++++++ + arch/csky/abiv2/inc/abi/ckmmu.h | 10 + + arch/csky/include/asm/asid.h | 78 +++++ + arch/csky/include/asm/mmu.h | 2 +- + arch/csky/include/asm/mmu_context.h | 114 +------ + arch/csky/include/asm/pgtable.h | 2 - + arch/csky/kernel/perf_event.c | 410 ++++++++++++++++++++++--- + arch/csky/kernel/smp.c | 2 - + arch/csky/kernel/traps.c | 5 + + arch/csky/mm/Makefile | 2 + + arch/csky/mm/asid.c | 189 ++++++++++++ + arch/csky/mm/context.c | 46 +++ + arch/csky/mm/init.c | 2 - + arch/csky/mm/tlb.c | 238 ++++++-------- + 26 files changed, 2029 insertions(+), 315 deletions(-) + create mode 100644 Documentation/devicetree/bindings/csky/pmu.txt + create mode 100644 arch/csky/abiv1/memcmp.c + create mode 100644 arch/csky/abiv1/memcopy.h + create mode 100644 arch/csky/abiv1/memmove.c + create mode 100644 arch/csky/abiv1/strcpy.c + create mode 100644 arch/csky/abiv1/strlen.c + create mode 100644 arch/csky/abiv1/wordcopy.c + create mode 100644 arch/csky/include/asm/asid.h + create mode 100644 arch/csky/mm/asid.c + create mode 100644 arch/csky/mm/context.c +Merging h8300/h8300-next (38ef0515e1e8 H8300: remove unused barrier defines) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/bitops.h | 6 ------ + 1 file changed, 6 deletions(-) +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (ad97f9df0fee riscv: add binfmt_flat support) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (c9093486f283 mips/kprobes: Export kprobe_fault_handler()) +$ git merge mips/mips-next +Auto-merging drivers/memory/jz4780-nemc.c +Auto-merging drivers/memory/Kconfig +Auto-merging arch/mips/lantiq/irq.c +Auto-merging arch/mips/kernel/kprobes.c +Auto-merging arch/mips/jz4740/board-qi_lb60.c +Auto-merging arch/mips/include/asm/mach-ralink/pinmux.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-ralink/pinmux.h +Auto-merging arch/mips/include/asm/kprobes.h +Auto-merging arch/mips/configs/rb532_defconfig +Auto-merging arch/mips/configs/maltaup_xpa_defconfig +Auto-merging arch/mips/configs/malta_kvm_guest_defconfig +Auto-merging arch/mips/configs/malta_kvm_defconfig +Auto-merging arch/mips/configs/malta_defconfig +Auto-merging MAINTAINERS +Resolved 'arch/mips/include/asm/mach-ralink/pinmux.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8852690750a] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 27 +++++ + arch/mips/boot/dts/ralink/mt7628a.dtsi | 148 ++++++++++++++++++++++- + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/ath25_defconfig | 1 - + arch/mips/configs/ath79_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 - + arch/mips/configs/bmips_stb_defconfig | 1 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 2 - + arch/mips/configs/loongson1b_defconfig | 1 - + arch/mips/configs/loongson1c_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/mips_paravirt_defconfig | 1 - + arch/mips/configs/omega2p_defconfig | 1 - + arch/mips/configs/pistachio_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 2 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 1 - + arch/mips/configs/tb0226_defconfig | 1 - + arch/mips/configs/tb0287_defconfig | 1 - + arch/mips/configs/vocore2_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/include/asm/cpu.h | 125 ++++++++++---------- + arch/mips/include/asm/io.h | 11 ++ + arch/mips/include/asm/kprobes.h | 1 + + arch/mips/include/asm/mach-ralink/pinmux.h | 1 - + arch/mips/jz4740/board-qi_lb60.c | 16 +-- + arch/mips/kernel/ftrace.c | 23 ++-- + arch/mips/kernel/kprobes.c | 2 +- + arch/mips/lantiq/irq.c | 177 ++++++++++++++++++++-------- + drivers/memory/jz4780-nemc.c | 2 +- + drivers/net/fddi/defza.c | 1 + + 47 files changed, 395 insertions(+), 176 deletions(-) +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (0fbf351ddc32 parisc: Ensure userspace privilege for ptraced processes in regset functions) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/ptrace.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging powerpc/next (f5a9e488d623 powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) +$ git merge soc-fsl/next +Auto-merging drivers/soc/fsl/qe/qe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + drivers/soc/fsl/dpaa2-console.c | 2 +- + drivers/soc/fsl/qe/qe.c | 163 ++++++++------------- + 3 files changed, 78 insertions(+), 100 deletions(-) +Merging risc-v/for-next (0f327f2aaad6 RISC-V: Add an Image header that boot loader can parse.) +$ git merge risc-v/for-next +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c21097daeac5] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/riscv/boot-image-header.txt | 50 +++++ + MAINTAINERS | 4 +- + arch/Kconfig | 3 + + arch/arm64/Kconfig | 2 +- + arch/riscv/Kconfig | 10 + + arch/riscv/Kconfig.socs | 13 ++ + arch/riscv/boot/dts/sifive/Makefile | 2 +- + arch/riscv/configs/defconfig | 8 +- + arch/riscv/configs/rv32_defconfig | 2 + + arch/riscv/include/asm/fixmap.h | 5 + + arch/riscv/include/asm/hugetlb.h | 18 ++ + arch/riscv/include/asm/image.h | 65 ++++++ + arch/riscv/include/asm/page.h | 14 +- + arch/riscv/include/asm/pgtable-64.h | 5 + + arch/riscv/include/asm/pgtable.h | 16 +- + arch/riscv/kernel/head.S | 49 ++++- + arch/riscv/kernel/setup.c | 6 +- + arch/riscv/kernel/vdso.c | 19 -- + arch/riscv/mm/Makefile | 2 + + arch/riscv/mm/hugetlbpage.c | 44 ++++ + arch/riscv/mm/init.c | 326 ++++++++++++++++++++++++------ + arch/riscv/mm/sifive_l2_cache.c | 11 +- + arch/x86/Kconfig | 4 +- + 23 files changed, 561 insertions(+), 117 deletions(-) + create mode 100644 Documentation/riscv/boot-image-header.txt + create mode 100644 arch/riscv/Kconfig.socs + create mode 100644 arch/riscv/include/asm/hugetlb.h + create mode 100644 arch/riscv/include/asm/image.h + create mode 100644 arch/riscv/mm/hugetlbpage.c +Merging sifive/for-next (467e050e9760 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 (499723d12063 docs: s390: s390dbf: typos and formatting, update crash command) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (d3023897b437 arch/sh: Check for kprobe trap number before trying to handle a kprobe trap) +$ git merge sh/sh-next +Auto-merging arch/sh/configs/titan_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/titan_defconfig +Auto-merging arch/sh/configs/sh2007_defconfig +Auto-merging arch/sh/configs/se7721_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/se7721_defconfig +Auto-merging arch/sh/configs/se7712_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/se7712_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/configs/hp6xx_defconfig +Resolved 'arch/sh/configs/se7712_defconfig' using previous resolution. +Resolved 'arch/sh/configs/se7721_defconfig' using previous resolution. +Resolved 'arch/sh/configs/titan_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f07346e37782] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/boards/Kconfig | 14 +++----------- + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/apsh4a3a_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/cayman_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/kfr2r09-romimage_defconfig | 1 - + arch/sh/configs/kfr2r09_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/magicpanelr2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sh/configs/rsk7269_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/sh/kernel/kprobes.c | 3 ++- + 49 files changed, 5 insertions(+), 59 deletions(-) +Merging sparc-next/master (b71acb0e3721 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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT) +$ git merge uml/linux-next +Removing arch/um/drivers/ssl.h +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 12 +++ + arch/um/configs/i386_defconfig | 1 - + arch/um/configs/x86_64_defconfig | 1 - + arch/um/drivers/chan_kern.c | 52 +++++++++++-- + arch/um/drivers/ssl.c | 1 - + arch/um/drivers/ssl.h | 13 ---- + arch/um/include/asm/mmu_context.h | 2 +- + arch/um/include/shared/os.h | 10 +-- + arch/um/include/shared/timer-internal.h | 48 ++++++++++++ + arch/um/kernel/irq.c | 9 ++- + arch/um/kernel/process.c | 42 +++++++++- + arch/um/kernel/skas/Makefile | 2 + + arch/um/kernel/skas/syscall.c | 11 +++ + arch/um/kernel/time.c | 131 ++++++++++++++++++++++++++++++-- + arch/um/os-Linux/time.c | 127 +++++++------------------------ + 15 files changed, 320 insertions(+), 142 deletions(-) + delete mode 100644 arch/um/drivers/ssl.h +Merging xtensa/xtensa-for-next (6326b440055f Merge branch 'xtensa-5.3' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Removing arch/xtensa/include/asm/types.h +Merge made by the 'recursive' strategy. + arch/xtensa/boot/dts/virt.dts | 72 +++++++++++++++++++++ + arch/xtensa/configs/virt_defconfig | 113 +++++++++++++++++++++++++++++++++ + arch/xtensa/include/asm/asmmacro.h | 46 ++++++++++++++ + arch/xtensa/include/asm/platform.h | 10 --- + arch/xtensa/include/asm/types.h | 23 ------- + arch/xtensa/kernel/coprocessor.S | 7 ++- + arch/xtensa/kernel/entry.S | 11 ++-- + arch/xtensa/kernel/mcount.S | 11 ++-- + arch/xtensa/kernel/pci.c | 124 ------------------------------------- + arch/xtensa/kernel/platform.c | 2 - + arch/xtensa/kernel/setup.c | 4 -- + arch/xtensa/lib/checksum.S | 12 ++-- + arch/xtensa/lib/memcopy.S | 38 ++++++------ + arch/xtensa/lib/memset.S | 10 +-- + arch/xtensa/lib/strncpy_user.S | 16 ++--- + arch/xtensa/lib/strnlen_user.S | 14 ++--- + arch/xtensa/lib/usercopy.S | 12 ++-- + arch/xtensa/mm/init.c | 5 +- + arch/xtensa/mm/misc.S | 78 +++++++++++------------ + 19 files changed, 339 insertions(+), 269 deletions(-) + create mode 100644 arch/xtensa/boot/dts/virt.dts + create mode 100644 arch/xtensa/configs/virt_defconfig + delete mode 100644 arch/xtensa/include/asm/types.h +Merging fscrypt/master (0564336329f0 fscrypt: document testing with xfstests) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (fb2b827702ba afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()) +$ git merge afs/afs-next +Auto-merging fs/afs/vlclient.c +Auto-merging fs/afs/cmservice.c +Merge made by the 'recursive' strategy. + fs/afs/cmservice.c | 10 +++------- + fs/afs/vlclient.c | 11 ++++++----- + 2 files changed, 9 insertions(+), 12 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (80dfdbfd37d2 Merge branch 'for-next-current-v5.2-20190705' into for-next-20190705) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/sysfs.c +Auto-merging fs/btrfs/ioctl.c +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 3 +- + fs/btrfs/Makefile | 3 +- + fs/btrfs/backref.c | 17 +- + fs/btrfs/backref.h | 3 +- + fs/btrfs/block-rsv.c | 425 ++++++ + fs/btrfs/block-rsv.h | 101 ++ + fs/btrfs/btrfs_inode.h | 22 +- + fs/btrfs/check-integrity.c | 11 +- + fs/btrfs/compression.c | 65 +- + fs/btrfs/compression.h | 3 +- + fs/btrfs/ctree.h | 282 ++-- + fs/btrfs/delalloc-space.c | 494 +++++++ + fs/btrfs/delalloc-space.h | 23 + + fs/btrfs/delayed-ref.c | 181 ++- + fs/btrfs/delayed-ref.h | 10 + + fs/btrfs/dev-replace.c | 31 +- + fs/btrfs/disk-io.c | 166 ++- + fs/btrfs/disk-io.h | 2 - + fs/btrfs/extent-tree.c | 2755 ++++--------------------------------- + fs/btrfs/extent_io.c | 149 +- + fs/btrfs/extent_io.h | 10 +- + fs/btrfs/file-item.c | 43 +- + fs/btrfs/file.c | 28 +- + fs/btrfs/free-space-cache.c | 16 +- + fs/btrfs/inode-map.c | 1 + + fs/btrfs/inode.c | 109 +- + fs/btrfs/ioctl.c | 23 + + fs/btrfs/locking.c | 62 +- + fs/btrfs/ordered-data.c | 56 +- + fs/btrfs/ordered-data.h | 8 +- + fs/btrfs/print-tree.c | 6 +- + fs/btrfs/props.c | 8 +- + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/relocation.c | 1 + + fs/btrfs/root-tree.c | 56 + + fs/btrfs/scrub.c | 50 +- + fs/btrfs/send.c | 16 +- + fs/btrfs/space-info.c | 1094 +++++++++++++++ + fs/btrfs/space-info.h | 133 ++ + fs/btrfs/super.c | 30 +- + fs/btrfs/sysfs.c | 1 + + fs/btrfs/tests/extent-io-tests.c | 117 +- + fs/btrfs/tests/extent-map-tests.c | 22 + + fs/btrfs/transaction.c | 18 + + fs/btrfs/transaction.h | 1 + + fs/btrfs/tree-checker.c | 11 + + fs/btrfs/tree-log.c | 40 +- + fs/btrfs/volumes.c | 376 ++--- + fs/btrfs/volumes.h | 52 +- + include/trace/events/btrfs.h | 40 + + include/uapi/linux/btrfs_tree.h | 2 + + 52 files changed, 3954 insertions(+), 3250 deletions(-) + create mode 100644 fs/btrfs/block-rsv.c + create mode 100644 fs/btrfs/block-rsv.h + create mode 100644 fs/btrfs/delalloc-space.c + create mode 100644 fs/btrfs/delalloc-space.h + create mode 100644 fs/btrfs/space-info.c + create mode 100644 fs/btrfs/space-info.h +Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) +$ git merge ceph/master +Auto-merging net/ceph/messenger.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/debugfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/block/rbd.c | 2442 ++++++++++++++++++++++++---------- + drivers/block/rbd_types.h | 10 + + fs/ceph/Kconfig | 12 + + fs/ceph/acl.c | 22 +- + fs/ceph/addr.c | 2 + + fs/ceph/caps.c | 120 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 73 +- + fs/ceph/export.c | 2 +- + fs/ceph/file.c | 34 +- + fs/ceph/inode.c | 208 +-- + fs/ceph/mds_client.c | 120 +- + fs/ceph/mds_client.h | 4 +- + fs/ceph/mdsmap.c | 12 +- + fs/ceph/quota.c | 15 +- + fs/ceph/snap.c | 3 + + fs/ceph/super.c | 13 +- + fs/ceph/super.h | 67 +- + fs/ceph/xattr.c | 456 ++++--- + include/linux/ceph/ceph_features.h | 1 + + include/linux/ceph/ceph_fs.h | 2 +- + include/linux/ceph/cls_lock_client.h | 3 + + include/linux/ceph/decode.h | 13 +- + include/linux/ceph/libceph.h | 10 +- + include/linux/ceph/mon_client.h | 1 - + include/linux/ceph/osd_client.h | 12 +- + include/linux/ceph/striper.h | 2 + + include/linux/iversion.h | 24 + + net/ceph/Makefile | 2 +- + net/ceph/cls_lock_client.c | 54 +- + net/ceph/decode.c | 84 ++ + net/ceph/messenger.c | 14 +- + net/ceph/mon_client.c | 21 +- + net/ceph/osd_client.c | 42 +- + net/ceph/osdmap.c | 31 +- + net/ceph/pagevec.c | 33 - + net/ceph/striper.c | 17 + + 38 files changed, 2733 insertions(+), 1254 deletions(-) + create mode 100644 net/ceph/decode.c +$ git am -3 ../patches/0001-rbd-fix-up-for-lockdep_assert_held_exclusive-rename.patch +Applying: rbd: fix up for lockdep_assert_held_exclusive rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/rbd.c +$ git add -A . +$ git commit -v -a --amend +[master 58108ffec360] Merge remote-tracking branch 'ceph/master' + Date: Mon Jul 15 08:59:51 2019 +1000 +Merging cifs/for-next (ce465bf94b70 cifs: fix crash in cifs_dfs_do_automount) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/Kconfig +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 14 ++--- + fs/cifs/Makefile | 3 +- + fs/cifs/cifs_debug.c | 2 - + fs/cifs/cifs_fs_sb.h | 6 +++ + fs/cifs/cifsfs.c | 14 ++--- + fs/cifs/cifsglob.h | 7 +-- + fs/cifs/cifssmb.c | 16 ++---- + fs/cifs/connect.c | 61 +++++++++++++++++----- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/inode.c | 8 +-- + fs/cifs/misc.c | 1 + + fs/cifs/smb1ops.c | 3 +- + fs/cifs/smb2ops.c | 132 ++++++++++++++++++++++++++++++++---------------- + fs/cifs/smb2pdu.c | 96 ++++++++++++++++++++++++++++++----- + fs/cifs/smb2pdu.h | 36 ++++++++++--- + fs/cifs/smb2transport.c | 10 +++- + fs/cifs/transport.c | 46 +++++++++-------- + fs/cifs/xattr.c | 4 -- + 18 files changed, 311 insertions(+), 150 deletions(-) +Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (7451c54abc91 ecryptfs: Change return type of ecryptfs_process_flags) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/debug.c +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 42 +++++++++++++++++++++++++----------------- + fs/ecryptfs/debug.c | 22 +++------------------- + fs/ecryptfs/inode.c | 2 +- + fs/ecryptfs/keystore.c | 9 +++++---- + 4 files changed, 34 insertions(+), 41 deletions(-) +Merging ext3/for_next (5450e8a316a6 Merge tag 'pidfd-updates-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) +$ git merge ext3/for_next +Already up to date. +Merging ext4/dev (96fcaf86c3cb ext4: fix coverity warning on error path of filename setup) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (3d03243e4536 f2fs: allocate memory in batch in build_sit_info()) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/file.c | 63 ++++++++++++++++++++----------------------------------- + fs/f2fs/segment.c | 51 ++++++++++++++++++++------------------------ + fs/f2fs/segment.h | 1 + + 3 files changed, 47 insertions(+), 68 deletions(-) +Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity") +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (a101b043c44d SUNRPC: Fix transport accounting when caller specifies an rpc_xprt) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/debugfs.c +CONFLICT (content): Merge conflict in net/sunrpc/debugfs.c +Auto-merging fs/nfs/nfs4file.c +Resolved 'net/sunrpc/debugfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d273c46e9c82] Merge remote-tracking branch 'nfs/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/Makefile | 3 +- + fs/nfs/callback_proc.c | 28 ++- + fs/nfs/client.c | 24 ++- + fs/nfs/dir.c | 4 + + fs/nfs/inode.c | 30 ++- + fs/nfs/internal.h | 4 +- + fs/nfs/netns.h | 3 + + fs/nfs/nfs2xdr.c | 2 +- + fs/nfs/nfs3client.c | 3 + + fs/nfs/nfs3xdr.c | 2 +- + fs/nfs/nfs4client.c | 14 +- + fs/nfs/nfs4file.c | 8 +- + fs/nfs/nfs4proc.c | 50 +++-- + fs/nfs/nfs4trace.h | 207 +++++++++++------- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/nfstrace.h | 233 ++++++++++++++------ + fs/nfs/pagelist.c | 6 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 23 ++ + fs/nfs/sysfs.c | 187 +++++++++++++++++ + fs/nfs/sysfs.h | 25 +++ + fs/nfs/write.c | 7 +- + include/linux/nfs_fs.h | 2 + + include/linux/nfs_fs_sb.h | 1 + + include/linux/sunrpc/clnt.h | 3 + + include/linux/sunrpc/metrics.h | 7 +- + include/linux/sunrpc/sched.h | 4 +- + include/linux/sunrpc/xprt.h | 4 + + include/linux/sunrpc/xprtmultipath.h | 2 + + include/linux/sunrpc/xprtsock.h | 5 + + include/trace/events/rpcrdma.h | 90 ++++++-- + net/sunrpc/Kconfig | 2 +- + net/sunrpc/clnt.c | 79 ++++++- + net/sunrpc/debugfs.c | 46 ++-- + net/sunrpc/sched.c | 81 ++++--- + net/sunrpc/stats.c | 23 +- + net/sunrpc/xprt.c | 99 +++++---- + net/sunrpc/xprtmultipath.c | 23 +- + net/sunrpc/xprtrdma/frwr_ops.c | 327 +++++++++++++++++++---------- + net/sunrpc/xprtrdma/rpc_rdma.c | 152 ++++++-------- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- + net/sunrpc/xprtrdma/transport.c | 83 ++++++-- + net/sunrpc/xprtrdma/verbs.c | 115 +++++----- + net/sunrpc/xprtrdma/xprt_rdma.h | 44 ++-- + net/sunrpc/xprtsock.c | 124 +++++++---- + 46 files changed, 1514 insertions(+), 681 deletions(-) + create mode 100644 fs/nfs/sysfs.c + create mode 100644 fs/nfs/sysfs.h +Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (b78fa45d4edb nfsd: Make __get_nfsdfs_client() static) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) +$ git merge orangefs/for-next +Auto-merging fs/orangefs/file.c +Merge made by the 'recursive' strategy. + fs/orangefs/file.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging overlayfs/overlayfs-next (6dde1e42f497 ovl: make i_ino consistent with st_ino in more cases) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/super.c +Merge made by the 'recursive' strategy. + fs/ubifs/Kconfig | 13 ++++++- + fs/ubifs/auth.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/compress.c | 27 ++++++++++++++- + fs/ubifs/log.c | 5 +-- + fs/ubifs/master.c | 53 ++++++++++++++++++++++++---- + fs/ubifs/orphan.c | 94 +++++++++++++++++++++++++++++++------------------- + fs/ubifs/recovery.c | 2 +- + fs/ubifs/sb.c | 52 ++++++++++++++-------------- + fs/ubifs/super.c | 46 ++++++++++++++++++------ + fs/ubifs/tnc.c | 16 ++++++--- + fs/ubifs/ubifs-media.h | 30 +++++++++++++++- + fs/ubifs/ubifs.h | 6 ++-- + 12 files changed, 338 insertions(+), 92 deletions(-) +Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (488ca3d8d088 xfs: chain bios the right way around in xfs_rw_bdev) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (eec9066e4a22 iomap: move internal declarations into fs/iomap/) +$ git merge iomap/iomap-for-next +CONFLICT (modify/delete): fs/iomap.c deleted in iomap/iomap-for-next and modified in HEAD. Version HEAD of fs/iomap.c left in tree. +Auto-merging fs/dax.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/iomap.c +fs/iomap.c: needs merge +rm 'fs/iomap.c' +$ git commit -v -a +[master bb8b3b3ee32a] Merge remote-tracking branch 'iomap/iomap-for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + fs/Makefile | 2 +- + fs/dax.c | 2 +- + fs/internal.h | 10 - + fs/iomap.c | 2205 --------------------------------------------- + fs/iomap/Makefile | 21 + + fs/iomap/direct-io.c | 569 ++++++++++++ + fs/iomap/fiemap.c | 147 +++ + fs/iomap/iomap.c | 83 ++ + fs/iomap/iomap_internal.h | 27 + + fs/iomap/migrate.c | 39 + + fs/iomap/page.c | 177 ++++ + fs/iomap/read.c | 348 +++++++ + fs/iomap/seek.c | 214 +++++ + fs/iomap/swapfile.c | 180 ++++ + fs/iomap/write.c | 542 +++++++++++ + 16 files changed, 2350 insertions(+), 2217 deletions(-) + delete mode 100644 fs/iomap.c + create mode 100644 fs/iomap/Makefile + create mode 100644 fs/iomap/direct-io.c + create mode 100644 fs/iomap/fiemap.c + create mode 100644 fs/iomap/iomap.c + create mode 100644 fs/iomap/iomap_internal.h + create mode 100644 fs/iomap/migrate.c + create mode 100644 fs/iomap/page.c + create mode 100644 fs/iomap/read.c + create mode 100644 fs/iomap/seek.c + create mode 100644 fs/iomap/swapfile.c + create mode 100644 fs/iomap/write.c +$ git am -3 ../patches/0001-iomap-fix-for-block-changes-and-split-of-iomap.c.patch +Applying: iomap: fix for block changes and split of iomap.c +$ git reset HEAD^ +Unstaged changes after reset: +M fs/iomap/direct-io.c +M fs/iomap/read.c +$ git add -A . +$ git commit -v -a --amend +[master 42a3010e6608] Merge remote-tracking branch 'iomap/iomap-for-next' + Date: Mon Jul 15 09:13:48 2019 +1000 +Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) +$ git merge djw-vfs/vfs-for-next +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Merge made by the 'recursive' strategy. + fs/attr.c | 13 ++++++------- + mm/filemap.c | 3 +++ + mm/memory.c | 4 ++++ + mm/mmap.c | 8 ++++++-- + 4 files changed, 19 insertions(+), 9 deletions(-) +Merging file-locks/locks-next (5450e8a316a6 Merge tag 'pidfd-updates-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (3fcb59f577e2 Merge branches 'fixes' and 'work.adfs' into for-next) +$ git merge vfs/for-next +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/inode.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging net/socket.c +Auto-merging net/ceph/ceph_common.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/z3fold.c +Auto-merging mm/shmem.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/inode.c +Auto-merging init/main.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging fs/ubifs/super.c +CONFLICT (content): Merge conflict in fs/ubifs/super.c +Auto-merging fs/tracefs/inode.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/proc/root.c +Auto-merging fs/orangefs/orangefs-mod.c +Auto-merging fs/nfsd/nfsctl.c +CONFLICT (content): Merge conflict in fs/nfsd/nfsctl.c +Auto-merging fs/nfs/super.c +Auto-merging fs/jffs2/os-linux.h +Auto-merging fs/jffs2/fs.c +Auto-merging fs/internal.h +Auto-merging fs/gfs2/super.h +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/incore.h +Auto-merging fs/efivarfs/super.c +Auto-merging fs/devpts/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/dcache.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/block_dev.c +Auto-merging fs/aio.c +Auto-merging fs/adfs/super.c +Auto-merging fs/adfs/map.c +Auto-merging fs/adfs/inode.c +Auto-merging fs/adfs/dir_fplus.c +Auto-merging fs/adfs/dir_f.c +Auto-merging fs/adfs/dir.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/block/rbd.c +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/ia64/kernel/perfmon.c +CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. +Auto-merging Documentation/filesystems/porting +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/nfsd/nfsctl.c' using previous resolution. +Resolved 'fs/ubifs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/filesystems/vfs.txt +Documentation/filesystems/vfs.txt: needs merge +rm 'Documentation/filesystems/vfs.txt' +$ git commit -v -a +[master afba279337aa] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting | 15 +- + arch/ia64/kernel/perfmon.c | 17 +- + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- + arch/s390/hypfs/inode.c | 137 +++--- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 3 +- + drivers/android/binderfs.c | 160 +++---- + drivers/base/devtmpfs.c | 41 +- + drivers/block/rbd.c | 363 ++++++++-------- + drivers/dax/super.c | 23 +- + drivers/gpu/drm/drm_drv.c | 20 +- + drivers/infiniband/hw/qib/qib_fs.c | 26 +- + drivers/misc/cxl/api.c | 13 +- + drivers/misc/ibmasm/ibmasmfs.c | 21 +- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdsuper.c | 181 ++++---- + drivers/oprofile/oprofilefs.c | 20 +- + drivers/scsi/cxlflash/ocxl_hw.c | 23 +- + drivers/usb/gadget/function/f_fs.c | 233 +++++----- + drivers/usb/gadget/legacy/inode.c | 21 +- + drivers/virtio/virtio_balloon.c | 13 +- + drivers/xen/xenfs/super.c | 21 +- + fs/adfs/adfs.h | 70 +-- + fs/adfs/dir.c | 25 +- + fs/adfs/dir_f.c | 38 +- + fs/adfs/dir_fplus.c | 21 +- + fs/adfs/inode.c | 12 +- + fs/adfs/map.c | 15 +- + fs/adfs/super.c | 121 +++--- + fs/aio.c | 16 +- + fs/anon_inodes.c | 13 +- + fs/autofs/autofs_i.h | 13 +- + fs/autofs/init.c | 9 +- + fs/autofs/inode.c | 429 +++++++++--------- + fs/binfmt_misc.c | 20 +- + fs/block_dev.c | 17 +- + fs/btrfs/tests/btrfs-tests.c | 15 +- + fs/ceph/cache.c | 9 +- + fs/ceph/cache.h | 5 +- + fs/ceph/dir.c | 2 +- + fs/ceph/super.c | 694 +++++++++++++++--------------- + fs/ceph/super.h | 1 - + fs/coda/inode.c | 171 +++++--- + fs/configfs/mount.c | 20 +- + fs/cramfs/inode.c | 69 +-- + fs/d_path.c | 1 - + fs/dcache.c | 100 ++++- + fs/debugfs/inode.c | 185 ++++---- + fs/devpts/inode.c | 265 ++++++------ + fs/efivarfs/super.c | 25 +- + fs/fs_context.c | 18 +- + fs/fs_parser.c | 18 +- + fs/fs_pin.c | 10 +- + fs/fsopen.c | 2 + + fs/fuse/control.c | 2 +- + fs/fuse/inode.c | 291 +++++++------ + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- + fs/gfs2/super.c | 333 +------------- + fs/gfs2/super.h | 3 +- + fs/hugetlbfs/inode.c | 2 +- + fs/internal.h | 5 + + fs/jffs2/fs.c | 21 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/super.c | 172 ++++---- + fs/libfs.c | 82 ++-- + fs/mount.h | 8 +- + fs/namespace.c | 184 ++++---- + fs/nfs/super.c | 6 +- + fs/nfsd/nfsctl.c | 31 +- + fs/nsfs.c | 16 +- + fs/openpromfs/inode.c | 20 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/orangefs-mod.c | 3 +- + fs/orangefs/super.c | 192 +++++---- + fs/pipe.c | 15 +- + fs/proc/root.c | 7 +- + fs/pstore/inode.c | 108 +++-- + fs/ramfs/inode.c | 105 +++-- + fs/romfs/super.c | 46 +- + fs/squashfs/super.c | 100 +++-- + fs/super.c | 351 +++++++-------- + fs/sysfs/mount.c | 3 +- + fs/tracefs/inode.c | 179 ++++---- + fs/ubifs/super.c | 450 +++++++++---------- + include/linux/ceph/ceph_debug.h | 1 + + include/linux/ceph/libceph.h | 17 +- + include/linux/dcache.h | 1 - + include/linux/fs.h | 24 -- + include/linux/fs_context.h | 22 +- + include/linux/fs_pin.h | 1 - + include/linux/init.h | 5 +- + include/linux/mtd/super.h | 6 +- + include/linux/pseudo_fs.h | 16 + + include/linux/ramfs.h | 7 +- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 4 +- + include/uapi/linux/adfs_fs.h | 6 +- + include/uapi/linux/magic.h | 1 + + init/do_mounts.c | 35 +- + init/main.c | 1 - + ipc/mqueue.c | 9 +- + kernel/bpf/inode.c | 92 ++-- + kernel/cgroup/cgroup.c | 50 ++- + kernel/cgroup/cpuset.c | 61 +-- + kernel/events/core.c | 4 +- + mm/shmem.c | 395 +++++++++++------ + mm/z3fold.c | 14 +- + mm/zsmalloc.c | 12 +- + net/ceph/ceph_common.c | 410 ++++++++---------- + net/socket.c | 16 +- + net/sunrpc/rpc_pipe.c | 34 +- + security/apparmor/apparmorfs.c | 20 +- + security/inode.c | 21 +- + security/selinux/selinuxfs.c | 20 +- + security/smack/smackfs.c | 34 +- + 115 files changed, 4499 insertions(+), 4081 deletions(-) + create mode 100644 include/linux/pseudo_fs.h +$ 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 +[master 94650c872d2d] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Jul 15 09:18:21 2019 +1000 +$ git am -3 ../patches/0001-convert-vmwballoon-to-use-the-new-mount-API.patch +Applying: convert vmwballoon to use the new mount API +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/vmw_balloon.c +$ git add -A . +$ git commit -v -a --amend +[master afb05f87496b] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Jul 15 09:18:21 2019 +1000 +Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (7b4b0f6b34d8 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging tools/pci/pcitest.c +Auto-merging net/wireless/Kconfig +Auto-merging kernel/power/Kconfig +Auto-merging include/linux/pm.h +Auto-merging include/linux/pci.h +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/opp/Kconfig +Auto-merging drivers/acpi/pci_root.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/kernel/pci.c +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/zh_CN/process/submitting-drivers.rst +Auto-merging Documentation/scheduler/sched-energy.rst +Removing Documentation/power/swsusp.txt +Removing Documentation/power/regulator/regulator.txt +Removing Documentation/power/powercap/powercap.txt +Removing Documentation/power/power_supply_class.txt +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/ABI/testing/sysfs-class-powercap +Resolved 'Documentation/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a6736f219f6e] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-powercap | 2 +- + Documentation/PCI/{acpi-info.txt => acpi-info.rst} | 15 +- + Documentation/PCI/endpoint/index.rst | 13 + + .../{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} | 99 ++-- + .../{pci-endpoint.txt => pci-endpoint.rst} | 92 ++-- + ...pci-test-function.txt => pci-test-function.rst} | 84 +-- + .../{pci-test-howto.txt => pci-test-howto.rst} | 81 ++- + Documentation/PCI/index.rst | 18 + + Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} | 85 +-- + ...i-error-recovery.txt => pci-error-recovery.rst} | 287 +++++----- + .../PCI/{pci-iov-howto.txt => pci-iov-howto.rst} | 161 +++--- + Documentation/PCI/{pci.txt => pci.rst} | 356 ++++++------- + .../PCI/{pcieaer-howto.txt => pcieaer-howto.rst} | 156 ++++-- + .../PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} | 140 ++--- + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/cpu-freq/core.txt | 2 +- + .../devicetree/bindings/pci/mobiveil-pcie.txt | 2 + + .../bindings/pci/nvidia,tegra20-pcie.txt | 8 + + Documentation/devicetree/bindings/pci/pci.txt | 3 + + .../devicetree/bindings/pci/qcom,pcie.txt | 25 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 + + Documentation/driver-api/pm/devices.rst | 6 +- + Documentation/driver-api/usb/power-management.rst | 2 +- + Documentation/index.rst | 1 + + Documentation/power/{apm-acpi.txt => apm-acpi.rst} | 10 +- + ...sic-pm-debugging.txt => basic-pm-debugging.rst} | 79 +-- + .../{charger-manager.txt => charger-manager.rst} | 105 ++-- + .../{drivers-testing.txt => drivers-testing.rst} | 15 +- + .../power/{energy-model.txt => energy-model.rst} | 105 ++-- + ...freezing-of-tasks.txt => freezing-of-tasks.rst} | 91 ++-- + Documentation/power/index.rst | 46 ++ + .../power/{interface.txt => interface.rst} | 24 +- + Documentation/power/{opp.txt => opp.rst} | 175 +++--- + Documentation/power/{pci.txt => pci.rst} | 87 ++- + .../{pm_qos_interface.txt => pm_qos_interface.rst} | 127 +++-- + Documentation/power/power_supply_class.rst | 282 ++++++++++ + Documentation/power/power_supply_class.txt | 231 -------- + Documentation/power/powercap/powercap.rst | 257 +++++++++ + Documentation/power/powercap/powercap.txt | 236 --------- + .../power/regulator/{consumer.txt => consumer.rst} | 141 ++--- + .../power/regulator/{design.txt => design.rst} | 9 +- + .../power/regulator/{machine.txt => machine.rst} | 47 +- + .../power/regulator/{overview.txt => overview.rst} | 57 +- + Documentation/power/regulator/regulator.rst | 32 ++ + Documentation/power/regulator/regulator.txt | 30 -- + .../power/{runtime_pm.txt => runtime_pm.rst} | 234 ++++---- + Documentation/power/{s2ram.txt => s2ram.rst} | 20 +- + ...d-cpuhotplug.txt => suspend-and-cpuhotplug.rst} | 42 +- + ...d-interrupts.txt => suspend-and-interrupts.rst} | 2 + + ...nd-swap-files.txt => swsusp-and-swap-files.rst} | 17 +- + .../{swsusp-dmcrypt.txt => swsusp-dmcrypt.rst} | 122 ++--- + Documentation/power/swsusp.rst | 501 ++++++++++++++++++ + Documentation/power/swsusp.txt | 446 ---------------- + Documentation/power/{tricks.txt => tricks.rst} | 6 +- + .../{userland-swsusp.txt => userland-swsusp.rst} | 55 +- + Documentation/power/{video.txt => video.rst} | 156 +++--- + Documentation/process/submitting-drivers.rst | 2 +- + Documentation/scheduler/sched-energy.rst | 6 +- + Documentation/trace/coresight-cpu-debug.txt | 2 +- + .../zh_CN/process/submitting-drivers.rst | 2 +- + MAINTAINERS | 8 +- + arch/arm64/kernel/pci.c | 13 +- + arch/x86/Kconfig | 2 +- + drivers/acpi/pci_root.c | 12 + + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/opp/Kconfig | 2 +- + drivers/pci/ats.c | 2 +- + drivers/pci/controller/Kconfig | 4 +- + drivers/pci/controller/dwc/Kconfig | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 1 + + drivers/pci/controller/dwc/pcie-armada8k.c | 84 ++- + drivers/pci/controller/dwc/pcie-designware-host.c | 12 + + drivers/pci/controller/dwc/pcie-designware.c | 61 ++- + drivers/pci/controller/dwc/pcie-designware.h | 39 +- + drivers/pci/controller/dwc/pcie-kirin.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom.c | 115 ++-- + drivers/pci/controller/pci-aardvark.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 15 +- + drivers/pci/controller/pci-tegra.c | 589 ++++++++++++++++++--- + drivers/pci/controller/pcie-altera-msi.c | 10 + + drivers/pci/controller/pcie-altera.c | 69 ++- + drivers/pci/controller/pcie-iproc-platform.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 2 +- + drivers/pci/controller/pcie-mobiveil.c | 525 ++++++++++-------- + drivers/pci/controller/pcie-xilinx-nwl.c | 11 +- + drivers/pci/controller/vmd.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 35 +- + drivers/pci/endpoint/pci-epc-core.c | 3 +- + drivers/pci/iov.c | 2 - + drivers/pci/mmap.c | 2 +- + drivers/pci/msi.c | 43 +- + drivers/pci/p2pdma.c | 16 +- + drivers/pci/pci-bridge-emul.c | 2 +- + drivers/pci/pci-driver.c | 16 +- + drivers/pci/pci-pf-stub.c | 2 +- + drivers/pci/pci-sysfs.c | 5 +- + drivers/pci/pci.c | 6 +- + drivers/pci/pci.h | 1 - + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/probe.c | 28 +- + drivers/pci/proc.c | 2 +- + drivers/pci/quirks.c | 110 +++- + drivers/pci/setup-bus.c | 60 ++- + drivers/pci/slot.c | 1 + + drivers/power/supply/power_supply_core.c | 2 +- + drivers/soc/tegra/pmc.c | 1 + + include/linux/interrupt.h | 2 +- + include/linux/mod_devicetable.h | 29 +- + include/linux/pci-acpi.h | 7 +- + include/linux/pci.h | 53 +- + include/linux/pci_ids.h | 7 +- + include/linux/pm.h | 2 +- + include/uapi/linux/pci_regs.h | 4 + + kernel/power/Kconfig | 6 +- + net/wireless/Kconfig | 2 +- + tools/pci/Makefile | 5 +- + tools/pci/pcitest.c | 8 +- + 117 files changed, 4502 insertions(+), 2994 deletions(-) + rename Documentation/PCI/{acpi-info.txt => acpi-info.rst} (96%) + create mode 100644 Documentation/PCI/endpoint/index.rst + rename Documentation/PCI/endpoint/{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} (64%) + rename Documentation/PCI/endpoint/{pci-endpoint.txt => pci-endpoint.rst} (83%) + rename Documentation/PCI/endpoint/{pci-test-function.txt => pci-test-function.rst} (55%) + rename Documentation/PCI/endpoint/{pci-test-howto.txt => pci-test-howto.rst} (78%) + create mode 100644 Documentation/PCI/index.rst + rename Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} (88%) + rename Documentation/PCI/{pci-error-recovery.txt => pci-error-recovery.rst} (67%) + rename Documentation/PCI/{pci-iov-howto.txt => pci-iov-howto.rst} (63%) + rename Documentation/PCI/{pci.txt => pci.rst} (68%) + rename Documentation/PCI/{pcieaer-howto.txt => pcieaer-howto.rst} (72%) + rename Documentation/PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} (70%) + rename Documentation/power/{apm-acpi.txt => apm-acpi.rst} (87%) + rename Documentation/power/{basic-pm-debugging.txt => basic-pm-debugging.rst} (87%) + rename Documentation/power/{charger-manager.txt => charger-manager.rst} (78%) + rename Documentation/power/{drivers-testing.txt => drivers-testing.rst} (86%) + rename Documentation/power/{energy-model.txt => energy-model.rst} (74%) + rename Documentation/power/{freezing-of-tasks.txt => freezing-of-tasks.rst} (75%) + create mode 100644 Documentation/power/index.rst + rename Documentation/power/{interface.txt => interface.rst} (84%) + rename Documentation/power/{opp.txt => opp.rst} (78%) + rename Documentation/power/{pci.txt => pci.rst} (97%) + rename Documentation/power/{pm_qos_interface.txt => pm_qos_interface.rst} (62%) + create mode 100644 Documentation/power/power_supply_class.rst + delete mode 100644 Documentation/power/power_supply_class.txt + create mode 100644 Documentation/power/powercap/powercap.rst + delete mode 100644 Documentation/power/powercap/powercap.txt + rename Documentation/power/regulator/{consumer.txt => consumer.rst} (61%) + rename Documentation/power/regulator/{design.txt => design.rst} (86%) + rename Documentation/power/regulator/{machine.txt => machine.rst} (75%) + rename Documentation/power/regulator/{overview.txt => overview.rst} (79%) + create mode 100644 Documentation/power/regulator/regulator.rst + delete mode 100644 Documentation/power/regulator/regulator.txt + rename Documentation/power/{runtime_pm.txt => runtime_pm.rst} (89%) + rename Documentation/power/{s2ram.txt => s2ram.rst} (92%) + rename Documentation/power/{suspend-and-cpuhotplug.txt => suspend-and-cpuhotplug.rst} (90%) + rename Documentation/power/{suspend-and-interrupts.txt => suspend-and-interrupts.rst} (98%) + rename Documentation/power/{swsusp-and-swap-files.txt => swsusp-and-swap-files.rst} (83%) + rename Documentation/power/{swsusp-dmcrypt.txt => swsusp-dmcrypt.rst} (67%) + create mode 100644 Documentation/power/swsusp.rst + delete mode 100644 Documentation/power/swsusp.txt + rename Documentation/power/{tricks.txt => tricks.rst} (93%) + rename Documentation/power/{userland-swsusp.txt => userland-swsusp.rst} (85%) + rename Documentation/power/{video.txt => video.rst} (56%) +Merging pstore/for-next/pstore (4c6d80e1144b pstore: Fix double-free in pstore_mkfile() failure path) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (bf4945efabdf Merge branch 'for-5.3/wacom' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (9a74c745c689 Merge branch 'i2c/for-5.3' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging include/linux/i2c.h +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-i2c-demux-pinctrl | 4 +- + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 65 ++++ + .../devicetree/bindings/i2c/i2c-mt7621.txt | 25 ++ + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 64 ---- + .../devicetree/bindings/i2c/i2c-ocores.txt | 9 +- + Documentation/devicetree/bindings/i2c/i2c-omap.txt | 1 + + .../devicetree/bindings/i2c/i2c-stm32.txt | 2 + + .../devicetree/bindings/i2c/i2c-sun6i-p2wi.txt | 41 --- + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 124 +++++++ + Documentation/i2c/busses/i2c-i801 | 20 +- + MAINTAINERS | 7 + + arch/arm/include/asm/hardware/iop3xx.h | 2 + + arch/arm/mach-iop32x/em7210.c | 3 + + arch/arm/mach-iop32x/glantank.c | 3 + + arch/arm/mach-iop32x/iq31244.c | 3 + + arch/arm/mach-iop32x/iq80321.c | 3 + + arch/arm/mach-iop32x/n2100.c | 2 + + arch/arm/plat-iop/i2c.c | 24 ++ + drivers/gpio/gpio-iop.c | 1 + + drivers/i2c/busses/Kconfig | 13 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-bcm-iproc.c | 117 +++---- + drivers/i2c/busses/i2c-bcm2835.c | 135 ++++++-- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-fsi.c | 32 +- + drivers/i2c/busses/i2c-i801.c | 206 +++++++++++- + drivers/i2c/busses/i2c-imx.c | 11 +- + drivers/i2c/busses/i2c-iop3xx.c | 32 +- + drivers/i2c/busses/i2c-iop3xx.h | 2 + + drivers/i2c/busses/i2c-mt7621.c | 356 +++++++++++++++++++++ + drivers/i2c/busses/i2c-nvidia-gpu.c | 64 +++- + drivers/i2c/busses/i2c-ocores.c | 33 +- + drivers/i2c/busses/i2c-qcom-geni.c | 17 +- + drivers/i2c/busses/i2c-s3c2410.c | 47 +-- + drivers/i2c/busses/i2c-stm32f7.c | 32 +- + drivers/i2c/busses/i2c-tegra.c | 136 +++++--- + drivers/i2c/i2c-core-acpi.c | 58 +++- + drivers/i2c/i2c-core-base.c | 20 +- + drivers/i2c/i2c-core-of.c | 1 + + drivers/i2c/i2c-core.h | 9 + + drivers/i2c/i2c-mux.c | 4 +- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 79 ++--- + drivers/i2c/muxes/i2c-mux-gpio.c | 116 ++----- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 5 +- + drivers/misc/eeprom/at24.c | 86 ++--- + drivers/platform/x86/dell-smo8800.c | 1 + + drivers/usb/typec/ucsi/ucsi.c | 10 + + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 118 ++++++- + include/linux/i2c.h | 93 +++--- + include/linux/platform_data/i2c-mux-gpio.h | 7 - + 51 files changed, 1605 insertions(+), 644 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt7621.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt + create mode 100644 Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-mt7621.c +Merging i3c/i3c/next (ede2001569c3 i3c: master: Use struct_size() helper) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (9f7546570bcb hwmon: (ina3221) Add of_node_put() before return) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (224d5fd43d25 docs: driver-api: generic-counter: fix file path to ABI doc) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/generic-counter.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging v4l-dvb/master (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (255f790fa642 Merge branch 'acpi-misc' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Auto-merging Documentation/power/pm_qos_interface.rst +CONFLICT (content): Merge conflict in Documentation/power/pm_qos_interface.rst +Resolved 'Documentation/power/pm_qos_interface.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9f0552aa1369] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/pm_qos_interface.rst | 12 +- + MAINTAINERS | 1 + + drivers/acpi/acpica/exconfig.c | 18 +- + drivers/acpi/acpica/tbxfload.c | 10 +- + drivers/acpi/blacklist.c | 4 + + drivers/base/power/domain.c | 8 +- + drivers/base/power/domain_governor.c | 4 +- + drivers/base/power/qos.c | 135 +++- + drivers/base/power/runtime.c | 2 +- + drivers/cpufreq/cpufreq.c | 212 ++++-- + drivers/cpufreq/imx-cpufreq-dt.c | 3 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/cpuidle/governor.c | 2 +- + drivers/powercap/Kconfig | 11 +- + drivers/powercap/Makefile | 3 +- + .../powercap/{intel_rapl.c => intel_rapl_common.c} | 801 ++++++++------------- + drivers/powercap/intel_rapl_msr.c | 183 +++++ + drivers/thermal/intel/int340x_thermal/Kconfig | 6 + + .../int340x_thermal/processor_thermal_device.c | 173 ++++- + include/linux/cpufreq.h | 12 +- + include/linux/intel_rapl.h | 154 ++++ + include/linux/pm_qos.h | 48 +- + 22 files changed, 1164 insertions(+), 645 deletions(-) + rename drivers/powercap/{intel_rapl.c => intel_rapl_common.c} (64%) + create mode 100644 drivers/powercap/intel_rapl_msr.c + create mode 100644 include/linux/intel_rapl.h +$ git am -3 ../patches/0001-intel_rapl-need-linux-cpuhotplug.h-for-enum-cpuhp_st.patch +Applying: intel_rapl: need linux/cpuhotplug.h for enum cpuhp_state +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/intel_rapl.h +$ git add -A . +$ git commit -v -a --amend +[master 876b70afd13c] Merge remote-tracking branch 'pm/linux-next' + Date: Mon Jul 15 09:50:28 2019 +1000 +Merging cpufreq-arm/cpufreq/arm/linux-next (f9020441dbc3 cpufreq: s5pv210: Don't flood kernel log after cpufreq change) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (560d1bcad715 opp: Don't use IS_ERR on invalid supplies) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (ff9b011ad143 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Auto-merging MAINTAINERS +Removing Documentation/thermal/exynos_thermal_emulation +Merge made by the 'recursive' strategy. + .../{cpu-cooling-api.txt => cpu-cooling-api.rst} | 39 +- + .../thermal/{exynos_thermal => exynos_thermal.rst} | 47 +- + Documentation/thermal/exynos_thermal_emulation | 53 --- + Documentation/thermal/exynos_thermal_emulation.rst | 61 +++ + Documentation/thermal/index.rst | 18 + + .../{intel_powerclamp.txt => intel_powerclamp.rst} | 183 ++++---- + .../{nouveau_thermal => nouveau_thermal.rst} | 54 ++- + .../{power_allocator.txt => power_allocator.rst} | 144 +++--- + .../thermal/{sysfs-api.txt => sysfs-api.rst} | 488 ++++++++++++++------- + ...ure_thermal => x86_pkg_temperature_thermal.rst} | 28 +- + MAINTAINERS | 2 +- + drivers/thermal/fair_share.c | 12 +- + drivers/thermal/gov_bang_bang.c | 11 +- + .../int340x_thermal/processor_thermal_device.c | 14 + + drivers/thermal/power_allocator.c | 11 +- + drivers/thermal/step_wise.c | 11 +- + drivers/thermal/thermal_core.c | 52 ++- + drivers/thermal/thermal_core.h | 55 +-- + drivers/thermal/user_space.c | 12 +- + include/asm-generic/vmlinux.lds.h | 11 + + include/linux/thermal.h | 4 +- + 21 files changed, 767 insertions(+), 543 deletions(-) + rename Documentation/thermal/{cpu-cooling-api.txt => cpu-cooling-api.rst} (82%) + rename Documentation/thermal/{exynos_thermal => exynos_thermal.rst} (67%) + delete mode 100644 Documentation/thermal/exynos_thermal_emulation + create mode 100644 Documentation/thermal/exynos_thermal_emulation.rst + create mode 100644 Documentation/thermal/index.rst + rename Documentation/thermal/{intel_powerclamp.txt => intel_powerclamp.rst} (76%) + rename Documentation/thermal/{nouveau_thermal => nouveau_thermal.rst} (64%) + rename Documentation/thermal/{power_allocator.txt => power_allocator.rst} (74%) + rename Documentation/thermal/{sysfs-api.txt => sysfs-api.rst} (66%) + rename Documentation/thermal/{x86_pkg_temperature_thermal => x86_pkg_temperature_thermal.rst} (80%) +Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/thermal_mmio.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging ieee1394/for-next (812cd88749e0 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 +Merge made by the 'recursive' strategy. +Merging dlm/next (6051531997ed dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Auto-merging fs/dlm/lockspace.c +Merge made by the 'recursive' strategy. + fs/dlm/lockspace.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging swiotlb/linux-next (dd853b2dfa65 Merge branch 'stable/for-linus-5.2' into linux-next) +$ git merge swiotlb/linux-next +Auto-merging kernel/dma/swiotlb.c +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. + drivers/xen/swiotlb-xen.c | 34 +++++++++------------------------- + kernel/dma/swiotlb.c | 30 ++++++++++++++++-------------- + 2 files changed, 25 insertions(+), 39 deletions(-) +Merging rdma/for-next (0b043644c0ca RMDA/siw: Require a 64 bit arch) +$ git merge rdma/for-next +Auto-merging net/rds/ib_cm.c +Removing include/uapi/rdma/ib_user_cm.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/nvme/host/rdma.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/hw/usnic/usnic_ib_main.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Removing drivers/infiniband/hw/nes/nes_verbs.h +Removing drivers/infiniband/hw/nes/nes_verbs.c +Removing drivers/infiniband/hw/nes/nes_utils.c +Removing drivers/infiniband/hw/nes/nes_nic.c +Removing drivers/infiniband/hw/nes/nes_mgt.h +Removing drivers/infiniband/hw/nes/nes_mgt.c +Removing drivers/infiniband/hw/nes/nes_hw.h +Removing drivers/infiniband/hw/nes/nes_hw.c +Removing drivers/infiniband/hw/nes/nes_context.h +Removing drivers/infiniband/hw/nes/nes_cm.h +Removing drivers/infiniband/hw/nes/nes_cm.c +Removing drivers/infiniband/hw/nes/nes.h +CONFLICT (modify/delete): drivers/infiniband/hw/nes/nes.c deleted in rdma/for-next and modified in HEAD. Version HEAD of drivers/infiniband/hw/nes/nes.c left in tree. +Removing drivers/infiniband/hw/nes/Makefile +Removing drivers/infiniband/hw/nes/Kconfig +Auto-merging drivers/infiniband/hw/i40iw/i40iw_cm.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Removing drivers/infiniband/core/ucm.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Recorded preimage for 'drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/infiniband/hw/nes/nes.c +drivers/infiniband/hw/nes/nes.c: needs merge +rm 'drivers/infiniband/hw/nes/nes.c' +$ git commit -v -a +Recorded resolution for 'drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c'. +[master 28043b1f82a6] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-infiniband | 17 - + Documentation/index.rst | 1 + + .../{core_locking.txt => core_locking.rst} | 64 +- + Documentation/infiniband/index.rst | 23 + + Documentation/infiniband/{ipoib.txt => ipoib.rst} | 24 +- + .../infiniband/{opa_vnic.txt => opa_vnic.rst} | 110 +- + Documentation/infiniband/{sysfs.txt => sysfs.rst} | 4 +- + .../{tag_matching.txt => tag_matching.rst} | 5 + + .../infiniband/{user_mad.txt => user_mad.rst} | 33 +- + .../infiniband/{user_verbs.txt => user_verbs.rst} | 12 +- + MAINTAINERS | 15 +- + drivers/infiniband/Kconfig | 14 +- + drivers/infiniband/core/Makefile | 5 +- + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/core_priv.h | 10 + + drivers/infiniband/core/counters.c | 634 ++++ + drivers/infiniband/core/cq.c | 95 +- + drivers/infiniband/core/device.c | 150 +- + drivers/infiniband/core/mr_pool.c | 8 +- + drivers/infiniband/core/nldev.c | 800 +++- + drivers/infiniband/core/restrack.c | 49 +- + drivers/infiniband/core/restrack.h | 3 + + drivers/infiniband/core/rw.c | 201 +- + drivers/infiniband/core/sysfs.c | 16 +- + drivers/infiniband/core/ucm.c | 1350 ------- + drivers/infiniband/core/ucma.c | 114 +- + drivers/infiniband/core/umem.c | 13 +- + drivers/infiniband/core/umem_odp.c | 106 +- + drivers/infiniband/core/user_mad.c | 53 +- + drivers/infiniband/core/uverbs_cmd.c | 28 +- + drivers/infiniband/core/uverbs_main.c | 40 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 19 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 1 + + drivers/infiniband/core/uverbs_uapi.c | 4 +- + drivers/infiniband/core/verbs.c | 165 +- + drivers/infiniband/hw/Makefile | 1 - + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 66 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 9 +- + drivers/infiniband/hw/bnxt_re/main.c | 8 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 33 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 3 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 160 +- + drivers/infiniband/hw/cxgb4/cm.c | 21 +- + drivers/infiniband/hw/cxgb4/cq.c | 55 +- + drivers/infiniband/hw/cxgb4/device.c | 9 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 11 +- + drivers/infiniband/hw/cxgb4/mem.c | 8 +- + drivers/infiniband/hw/cxgb4/provider.c | 9 +- + drivers/infiniband/hw/cxgb4/qp.c | 95 +- + drivers/infiniband/hw/cxgb4/resource.c | 16 +- + drivers/infiniband/hw/efa/efa.h | 9 +- + drivers/infiniband/hw/efa/efa_com.c | 118 +- + drivers/infiniband/hw/efa/efa_com.h | 1 - + drivers/infiniband/hw/efa/efa_com_cmd.c | 8 +- + drivers/infiniband/hw/efa/efa_main.c | 10 +- + drivers/infiniband/hw/efa/efa_verbs.c | 248 +- + drivers/infiniband/hw/hfi1/Makefile | 1 + + drivers/infiniband/hw/hfi1/aspm.c | 270 ++ + drivers/infiniband/hw/hfi1/aspm.h | 262 +- + drivers/infiniband/hw/hfi1/debugfs.c | 5 +- + drivers/infiniband/hw/hfi1/mad.c | 9 +- + drivers/infiniband/hw/hfi1/pcie.c | 6 +- + drivers/infiniband/hw/hfi1/pio.c | 3 +- + drivers/infiniband/hw/hfi1/qp.c | 8 +- + drivers/infiniband/hw/hfi1/rc.c | 29 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 7 +- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 2 + + drivers/infiniband/hw/hfi1/uc.c | 3 +- + drivers/infiniband/hw/hfi1/ud.c | 36 +- + drivers/infiniband/hw/hfi1/user_pages.c | 11 +- + drivers/infiniband/hw/hfi1/verbs.c | 6 +- + drivers/infiniband/hw/hns/Kconfig | 15 +- + drivers/infiniband/hw/hns/Makefile | 15 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 101 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 81 +- + drivers/infiniband/hw/hns/hns_roce_db.c | 12 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 108 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 504 ++- + drivers/infiniband/hw/hns/hns_roce_hem.h | 16 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 79 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 280 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 23 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 31 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 166 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 220 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 40 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 56 +- + drivers/infiniband/hw/mlx4/cq.c | 43 +- + drivers/infiniband/hw/mlx4/main.c | 21 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 9 +- + drivers/infiniband/hw/mlx4/mr.c | 16 +- + drivers/infiniband/hw/mlx4/qp.c | 11 +- + drivers/infiniband/hw/mlx4/srq.c | 9 +- + drivers/infiniband/hw/mlx5/cq.c | 56 +- + drivers/infiniband/hw/mlx5/devx.c | 1053 +++++- + drivers/infiniband/hw/mlx5/mad.c | 60 +- + drivers/infiniband/hw/mlx5/main.c | 157 +- + drivers/infiniband/hw/mlx5/mem.c | 20 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 47 +- + drivers/infiniband/hw/mlx5/mr.c | 554 ++- + drivers/infiniband/hw/mlx5/odp.c | 23 +- + drivers/infiniband/hw/mlx5/qp.c | 312 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 2 - + drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 52 +- + drivers/infiniband/hw/nes/Kconfig | 16 - + drivers/infiniband/hw/nes/Makefile | 4 - + drivers/infiniband/hw/nes/nes.c | 1211 ------ + drivers/infiniband/hw/nes/nes.h | 574 --- + drivers/infiniband/hw/nes/nes_cm.c | 3992 -------------------- + drivers/infiniband/hw/nes/nes_cm.h | 470 --- + drivers/infiniband/hw/nes/nes_context.h | 193 - + drivers/infiniband/hw/nes/nes_hw.c | 3887 ------------------- + drivers/infiniband/hw/nes/nes_hw.h | 1380 ------- + drivers/infiniband/hw/nes/nes_mgt.c | 1155 ------ + drivers/infiniband/hw/nes/nes_mgt.h | 97 - + drivers/infiniband/hw/nes/nes_nic.c | 1870 --------- + drivers/infiniband/hw/nes/nes_utils.c | 916 ----- + drivers/infiniband/hw/nes/nes_verbs.c | 3759 ------------------ + drivers/infiniband/hw/nes/nes_verbs.h | 198 - + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 11 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 8 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 38 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +- + drivers/infiniband/hw/qedr/main.c | 8 +- + drivers/infiniband/hw/qedr/verbs.c | 82 +- + drivers/infiniband/hw/qedr/verbs.h | 7 +- + drivers/infiniband/hw/qib/qib_qp.c | 4 +- + drivers/infiniband/hw/qib/qib_rc.c | 29 +- + drivers/infiniband/hw/qib/qib_uc.c | 3 +- + drivers/infiniband/hw/qib/qib_ud.c | 28 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 11 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 11 +- + drivers/infiniband/hw/qib/qib_verbs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_ib.h | 4 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 8 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 22 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 7 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 46 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 8 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 16 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 7 +- + drivers/infiniband/sw/Makefile | 1 + + drivers/infiniband/sw/rdmavt/ah.c | 6 +- + drivers/infiniband/sw/rdmavt/cq.c | 250 +- + drivers/infiniband/sw/rdmavt/cq.h | 7 +- + drivers/infiniband/sw/rdmavt/mr.c | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 402 +- + drivers/infiniband/sw/rdmavt/qp.h | 2 + + drivers/infiniband/sw/rdmavt/rc.c | 41 +- + drivers/infiniband/sw/rdmavt/srq.c | 69 +- + drivers/infiniband/sw/rdmavt/trace_mr.h | 56 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +- + drivers/infiniband/sw/rdmavt/vt.h | 9 + + drivers/infiniband/sw/rxe/rxe_comp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 3 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 1 + + drivers/infiniband/sw/rxe/rxe_resp.c | 5 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 40 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 3 +- + drivers/infiniband/sw/siw/Kconfig | 18 + + drivers/infiniband/sw/siw/Makefile | 11 + + drivers/infiniband/sw/siw/iwarp.h | 380 ++ + drivers/infiniband/sw/siw/siw.h | 745 ++++ + drivers/infiniband/sw/siw/siw_cm.c | 2071 ++++++++++ + drivers/infiniband/sw/siw/siw_cm.h | 133 + + drivers/infiniband/sw/siw/siw_cq.c | 101 + + drivers/infiniband/sw/siw/siw_main.c | 685 ++++ + drivers/infiniband/sw/siw/siw_mem.c | 460 +++ + drivers/infiniband/sw/siw/siw_mem.h | 74 + + drivers/infiniband/sw/siw/siw_qp.c | 1322 +++++++ + drivers/infiniband/sw/siw/siw_qp_rx.c | 1458 +++++++ + drivers/infiniband/sw/siw/siw_qp_tx.c | 1269 +++++++ + drivers/infiniband/sw/siw/siw_verbs.c | 1760 +++++++++ + drivers/infiniband/sw/siw/siw_verbs.h | 91 + + drivers/infiniband/ulp/ipoib/Kconfig | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 34 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 12 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 64 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 12 +- + drivers/infiniband/ulp/iser/iser_memory.c | 121 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 156 +- + drivers/infiniband/ulp/isert/ib_isert.c | 19 +- + drivers/infiniband/ulp/srp/ib_srp.c | 21 +- + drivers/nvme/host/rdma.c | 2 +- + include/linux/dim.h | 23 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/mlx5/qp.h | 4 +- + include/rdma/ib_umem.h | 19 +- + include/rdma/ib_umem_odp.h | 20 + + include/rdma/ib_verbs.h | 247 +- + include/rdma/mr_pool.h | 2 +- + include/rdma/rdma_counter.h | 65 + + include/rdma/rdma_netlink.h | 8 + + include/rdma/rdma_vt.h | 5 +- + include/rdma/rdmavt_cq.h | 25 +- + include/rdma/rdmavt_qp.h | 312 +- + include/rdma/restrack.h | 9 +- + include/rdma/rw.h | 9 - + include/rdma/signature.h | 122 + + include/uapi/rdma/ib_user_cm.h | 326 -- + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 19 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 9 + + include/uapi/rdma/rdma_netlink.h | 86 +- + include/uapi/rdma/rdma_user_ioctl_cmds.h | 1 + + include/uapi/rdma/rvt-abi.h | 66 + + include/uapi/rdma/siw-abi.h | 185 + + lib/dim/Makefile | 6 +- + lib/dim/rdma_dim.c | 108 + + net/rds/ib_cm.c | 8 +- + 221 files changed, 18856 insertions(+), 24841 deletions(-) + rename Documentation/infiniband/{core_locking.txt => core_locking.rst} (78%) + create mode 100644 Documentation/infiniband/index.rst + rename Documentation/infiniband/{ipoib.txt => ipoib.rst} (90%) + rename Documentation/infiniband/{opa_vnic.txt => opa_vnic.rst} (63%) + rename Documentation/infiniband/{sysfs.txt => sysfs.rst} (69%) + rename Documentation/infiniband/{tag_matching.txt => tag_matching.rst} (98%) + rename Documentation/infiniband/{user_mad.txt => user_mad.rst} (90%) + rename Documentation/infiniband/{user_verbs.txt => user_verbs.rst} (93%) + create mode 100644 drivers/infiniband/core/counters.c + delete mode 100644 drivers/infiniband/core/ucm.c + create mode 100644 drivers/infiniband/hw/hfi1/aspm.c + delete mode 100644 drivers/infiniband/hw/nes/Kconfig + delete mode 100644 drivers/infiniband/hw/nes/Makefile + delete mode 100644 drivers/infiniband/hw/nes/nes.c + delete mode 100644 drivers/infiniband/hw/nes/nes.h + delete mode 100644 drivers/infiniband/hw/nes/nes_cm.c + delete mode 100644 drivers/infiniband/hw/nes/nes_cm.h + delete mode 100644 drivers/infiniband/hw/nes/nes_context.h + delete mode 100644 drivers/infiniband/hw/nes/nes_hw.c + delete mode 100644 drivers/infiniband/hw/nes/nes_hw.h + delete mode 100644 drivers/infiniband/hw/nes/nes_mgt.c + delete mode 100644 drivers/infiniband/hw/nes/nes_mgt.h + delete mode 100644 drivers/infiniband/hw/nes/nes_nic.c + delete mode 100644 drivers/infiniband/hw/nes/nes_utils.c + delete mode 100644 drivers/infiniband/hw/nes/nes_verbs.c + delete mode 100644 drivers/infiniband/hw/nes/nes_verbs.h + create mode 100644 drivers/infiniband/sw/siw/Kconfig + create mode 100644 drivers/infiniband/sw/siw/Makefile + create mode 100644 drivers/infiniband/sw/siw/iwarp.h + create mode 100644 drivers/infiniband/sw/siw/siw.h + create mode 100644 drivers/infiniband/sw/siw/siw_cm.c + create mode 100644 drivers/infiniband/sw/siw/siw_cm.h + create mode 100644 drivers/infiniband/sw/siw/siw_cq.c + create mode 100644 drivers/infiniband/sw/siw/siw_main.c + create mode 100644 drivers/infiniband/sw/siw/siw_mem.c + create mode 100644 drivers/infiniband/sw/siw/siw_mem.h + create mode 100644 drivers/infiniband/sw/siw/siw_qp.c + create mode 100644 drivers/infiniband/sw/siw/siw_qp_rx.c + create mode 100644 drivers/infiniband/sw/siw/siw_qp_tx.c + create mode 100644 drivers/infiniband/sw/siw/siw_verbs.c + create mode 100644 drivers/infiniband/sw/siw/siw_verbs.h + create mode 100644 include/rdma/rdma_counter.h + create mode 100644 include/rdma/signature.h + delete mode 100644 include/uapi/rdma/ib_user_cm.h + create mode 100644 include/uapi/rdma/rvt-abi.h + create mode 100644 include/uapi/rdma/siw-abi.h + create mode 100644 lib/dim/rdma_dim.c +$ git am -3 ../patches/0001-rdma-attempt-to-build-rdma_counter.h-stand-alone-aga.patch +Applying: rdma: attempt to build rdma_counter.h stand alone again +$ git reset HEAD^ +Unstaged changes after reset: +M include/Kbuild +$ git add -A . +$ git commit -v -a --amend +[master 78ec21360c16] Merge remote-tracking branch 'rdma/for-next' + Date: Mon Jul 15 10:14:04 2019 +1000 +$ git am -3 ../patches/0001-RDMA-fix-for-removal-of-for_ifa.patch +Applying: RDMA: fix for removal of for_ifa() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/sw/siw/siw_cm.c +$ git add -A . +$ git commit -v -a --amend +[master dae01e6de7ee] Merge remote-tracking branch 'rdma/for-next' + Date: Mon Jul 15 10:14:04 2019 +1000 +Merging net-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (a131c2bf1656 Merge tag 'acpi-5.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (1dd7382b1bb6 net/mlx5: Introduce VHCA tunnel device capability) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (1ff2f0fa450e net/mlx5e: Return in default case statement in tx_post_resync_params) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 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 +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 27 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (5adcdab6ae1b Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (84b0ddef7fcc Bluetooth: hci_qca: Send VS pre shutdown command.) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btqca.c | 26 +++++++++++++++++++++++++- + drivers/bluetooth/btqca.h | 7 +++++++ + drivers/bluetooth/btusb.c | 4 +++- + drivers/bluetooth/hci_qca.c | 5 ++++- + 4 files changed, 39 insertions(+), 3 deletions(-) +Merging mac80211-next/master (17c74d7c5f0d nl80211: fix VENDOR_CMD_RAW_DATA) +$ git merge mac80211-next/master +Auto-merging include/net/cfg80211.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c +Auto-merging drivers/net/wireless/ath/wil6210/cfg80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 ++++ + drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c | 1 + + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 3 +++ + include/net/cfg80211.h | 2 +- + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging gfs2/for-next (bb4cb25dd319 gfs2: Remove unused gfs2_iomap_alloc argument) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (46ce10df799f Merge tag 'spi-nor/for-5.3-v2' of gitolite.kernel.org:pub/scm/linux/kernel/git/mtd/linux into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (bce9437a0a48 mtd: rawnand: stm32_fmc2: increase DMA completion timeouts) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (8d1336c241bd mtd: spi-nor: cadence-quadspi: add reset control) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (f3880a23564e crypto: stm32/hash - remove interruptible condition for dma) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (f27b99a1cea7 Merge tag 'imx-drm-next-2019-07-05' of git://git.pengutronix.de/git/pza/linux into drm-next) +$ git merge drm/drm-next +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging include/uapi/linux/magic.h +CONFLICT (content): Merge conflict in include/uapi/linux/magic.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/dma-buf.h +Auto-merging drivers/staging/media/imx/imx7-media-csi.c +Auto-merging drivers/staging/media/imx/imx-media.h +Auto-merging drivers/staging/media/imx/imx-media-vdic.c +Auto-merging drivers/staging/media/imx/imx-media-utils.c +Auto-merging drivers/staging/media/imx/imx-media-csi.c +Auto-merging drivers/staging/media/imx/imx-ic-prpencvf.c +CONFLICT (content): Merge conflict in drivers/staging/media/imx/imx-ic-prpencvf.c +Auto-merging drivers/staging/media/imx/imx-ic-prp.c +Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c +Auto-merging drivers/gpu/ipu-v3/ipu-image-convert.c +Auto-merging drivers/gpu/drm/zte/zx_plane.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +Removing drivers/gpu/drm/virtio/virtgpu_fb.c +Auto-merging drivers/gpu/drm/vc4/vc4_v3d.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_debugfs.c +Auto-merging drivers/gpu/drm/vc4/vc4_bo.c +Auto-merging drivers/gpu/drm/tegra/output.c +Auto-merging drivers/gpu/drm/tegra/fb.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/tegra/dpaux.c +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_gem.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/panel/panel-sitronix-st7789v.c +Auto-merging drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +Auto-merging drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +Auto-merging drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +Auto-merging drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +Auto-merging drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +Auto-merging drivers/gpu/drm/panel/panel-samsung-ld9040.c +Auto-merging drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +Auto-merging drivers/gpu/drm/panel/panel-lg-lg4573.c +Auto-merging drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9322.c +Auto-merging drivers/gpu/drm/omapdrm/omap_irq.h +Auto-merging drivers/gpu/drm/omapdrm/omap_irq.c +Auto-merging drivers/gpu/drm/omapdrm/omap_fb.c +Auto-merging drivers/gpu/drm/omapdrm/omap_drv.h +Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c +Auto-merging drivers/gpu/drm/omapdrm/omap_crtc.h +Auto-merging drivers/gpu/drm/omapdrm/omap_crtc.c +Auto-merging drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +Auto-merging drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +Auto-merging drivers/gpu/drm/msm/msm_rd.c +Auto-merging drivers/gpu/drm/msm/msm_perf.c +Auto-merging drivers/gpu/drm/msm/msm_iommu.c +Auto-merging drivers/gpu/drm/msm/msm_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/msm_gem.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_fb.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.h +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_device.c +Auto-merging drivers/gpu/drm/msm/adreno/a3xx_gpu.c +Removing drivers/gpu/drm/i915/selftests/mock_dmabuf.h +Removing drivers/gpu/drm/i915/selftests/mock_context.h +Removing drivers/gpu/drm/i915/selftests/huge_gem_object.h +Removing drivers/gpu/drm/i915/intel_context.h +CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_context.c deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/intel_context.c left in tree. +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Removing drivers/gpu/drm/i915/i915_gem_object.h +Removing drivers/gpu/drm/i915/i915_gem_object.c +Removing drivers/gpu/drm/i915/i915_gem_clflush.h +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_types.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_context_types.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/Makefile.header-test +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile.header-test +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dpi.c +Auto-merging drivers/gpu/drm/drm_ioc32.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_bufs.c +Removing drivers/gpu/drm/cirrus/cirrus_ttm.c +Auto-merging drivers/gpu/drm/bridge/ti-tfp410.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +Auto-merging drivers/gpu/drm/armada/armada_fb.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/fb/modedb.rst +CONFLICT (content): Merge conflict in Documentation/fb/modedb.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +Removing Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt +Resolved 'Documentation/fb/modedb.rst' using previous resolution. +Resolved 'drivers/gpu/drm/i915/Makefile.header-test' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_engine_cs.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_engine_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_workarounds.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/staging/media/imx/imx-ic-prpencvf.c' using previous resolution. +Resolved 'include/uapi/linux/magic.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Resolved 'mm/memory.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/i915/intel_context.c +drivers/gpu/drm/i915/intel_context.c: needs merge +rm 'drivers/gpu/drm/i915/intel_context.c' +$ git commit -v -a +[master 1a40b11a5055] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 100 + + .../devicetree/bindings/display/arm,komeda.txt | 23 +- + .../bindings/display/bridge/renesas,lvds.txt | 19 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 42 +- + .../bindings/display/bridge/thine,thc63lvd1024.txt | 6 + + .../bindings/display/bridge/toshiba,tc358767.txt | 1 + + .../devicetree/bindings/display/ingenic,lcd.txt | 44 + + .../devicetree/bindings/display/msm/dpu.txt | 10 + + .../devicetree/bindings/display/msm/dsi.txt | 1 + + .../display/panel/armadeus,st0700-adapt.txt | 9 + + .../bindings/display/panel/edt,et-series.txt | 16 + + .../display/panel/evervision,vgg804821.txt | 12 + + .../bindings/display/panel/friendlyarm,hd702e.txt | 32 + + .../bindings/display/panel/koe,tx14d24vm1bpa.txt | 42 + + .../display/panel/osddisplays,osd101t2045-53ts.txt | 11 + + .../display/panel/osddisplays,osd101t2587-53ts.txt | 14 + + .../bindings/display/panel/samsung,s6e63m0.txt | 33 + + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 + + .../bindings/display/panel/vl050_8048nt_c01.txt | 12 + + .../devicetree/bindings/display/renesas,du.txt | 2 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 8 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 3 + + .../bindings/display/sunxi/sun6i-dsi.txt | 93 - + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 19 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 57 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/fb/modedb.rst | 14 + + Documentation/gpu/amdgpu.rst | 24 +- + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-client.rst | 3 + + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-mm.rst | 34 +- + Documentation/gpu/drm-uapi.rst | 19 +- + Documentation/gpu/i915.rst | 87 +- + Documentation/gpu/mcde.rst | 8 + + Documentation/gpu/todo.rst | 55 +- + MAINTAINERS | 10 +- + drivers/dma-buf/dma-buf.c | 176 +- + drivers/dma-buf/dma-fence.c | 21 +- + drivers/dma-buf/reservation.c | 4 + + drivers/dma-buf/sync_debug.c | 26 - + drivers/dma-buf/sync_debug.h | 1 - + drivers/gpu/drm/Kconfig | 11 + + drivers/gpu/drm/Makefile | 11 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 80 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 99 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 975 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 228 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 163 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 185 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 506 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 415 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- + .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} | 133 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 46 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 186 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 182 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 101 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 211 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 388 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 280 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 205 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 302 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 98 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_socbb.h | 82 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 314 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 68 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 197 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 94 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 101 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/atom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 16 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx10.h | 975 + + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 391 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 10 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5216 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 523 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 353 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 918 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 58 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 1 - + drivers/gpu/drm/amd/amdgpu/kv_smc.c | 1 - + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 366 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 444 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 18 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 486 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 68 + + drivers/gpu/drm/amd/amdgpu/navi10_sdma_pkt_open.h | 4806 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 334 + + .../{i915/i915_gemfs.h => amd/amdgpu/nbio_v2_3.h} | 25 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 823 + + drivers/gpu/drm/amd/amdgpu/nv.h | 33 + + drivers/gpu/drm/amd/amdgpu/nvd.h | 418 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 126 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 121 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 135 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1687 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 45 + + drivers/gpu/drm/amd/amdgpu/si.c | 20 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 110 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 20 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 68 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 108 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 150 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2261 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 95 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 17 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 3 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 782 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1124 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 13 - + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 63 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 36 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 105 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 664 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 18 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 88 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 1 + + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 348 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 90 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 134 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 498 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 155 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 143 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 101 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 30 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 21 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 428 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 23 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 473 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 110 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 11 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 4 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 299 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 1 - + drivers/gpu/drm/amd/display/dc/Makefile | 18 +- + drivers/gpu/drm/amd/display/dc/basics/vector.c | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 + + .../amd/display/dc/bios/command_table_helper2.c | 5 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h | 1 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 20 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.h | 3 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 75 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 87 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 143 + + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 471 + + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h | 59 + + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 276 + + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h | 44 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 239 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h | 39 + + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 153 + + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h | 34 + + .../dcn10/rv1_clk_mgr.c} | 198 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h | 31 + + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c | 79 + + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h | 29 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 126 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h | 32 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c | 43 + + .../dcn10/rv2_clk_mgr.h} | 13 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 391 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 48 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 515 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 31 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 293 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 227 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 144 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 148 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 260 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 75 + + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 93 +- + drivers/gpu/drm/amd/display/dc/dc.h | 144 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 127 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 62 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 122 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 11 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 75 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 118 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 15 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 7 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 10 + + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 2 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 87 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 42 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 97 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 10 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 127 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 109 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 30 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 2 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 16 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 9 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 75 +- + .../drm/amd/display/dc/dce100/dce100_resource.h | 5 + + .../drm/amd/display/dc/dce110/dce110_compressor.c | 3 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 200 +- + .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 2 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 69 +- + .../drm/amd/display/dc/dce110/dce110_resource.h | 5 + + .../display/dc/dce110/dce110_timing_generator.c | 5 + + .../display/dc/dce110/dce110_timing_generator.h | 5 + + .../display/dc/dce110/dce110_timing_generator_v.c | 5 + + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 2 + + .../drm/amd/display/dc/dce112/dce112_compressor.c | 3 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 33 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 39 +- + .../display/dc/dce120/dce120_timing_generator.c | 96 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 52 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 31 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 10 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 5 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 136 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 271 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 471 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 16 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 8 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 197 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 4 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 26 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 43 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 11 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 174 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 10 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 213 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 91 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 74 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 129 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 79 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 17 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 159 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 116 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 502 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 698 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 990 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 694 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 575 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 332 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.h | 458 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 877 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 592 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 107 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 700 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 277 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2008 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 103 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 460 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 173 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 323 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h | 544 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 526 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 285 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 355 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 158 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 542 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 116 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3177 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 133 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 610 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 107 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c | 59 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h | 90 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 7 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 142 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 14 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 5104 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.h | 32 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 1701 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 74 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 12 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 22 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 36 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 32 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 839 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 854 + + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 8 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 13 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 858 + + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 382 + + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 54 + + drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h | 706 + + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 258 + + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 85 + + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 147 + + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 11 + + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 212 + + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.h | 33 + + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 382 + + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.h | 35 + + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 53 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 18 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 13 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 11 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 93 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 31 +- + .../dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} | 220 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 58 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 70 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 101 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 180 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 50 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 28 + + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 105 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 52 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 29 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 66 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 60 +- + drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 58 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/vm_helper.h | 16 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 2 + + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 2 + + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 2 + + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 375 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 34 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 + + drivers/gpu/drm/amd/display/dc/os_types.h | 8 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 2 + + .../display/dc/virtual/virtual_stream_encoder.c | 17 + + .../drm/amd/display/include/bios_parser_types.h | 3 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 20 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 5 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 10 + + .../gpu/drm/amd/display/include/set_mode_types.h | 5 +- + .../drm/amd/display/modules/color/color_gamma.c | 62 +- + .../drm/amd/display/modules/color/color_gamma.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 2 + + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 60 + + drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h | 46 + + .../amd/display/modules/info_packet/info_packet.c | 4 +- + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 167 + + drivers/gpu/drm/amd/include/amd_shared.h | 11 +- + .../include/asic_reg/athub/athub_2_0_0_default.h | 272 + + .../include/asic_reg/athub/athub_2_0_0_offset.h | 514 + + .../include/asic_reg/athub/athub_2_0_0_sh_mask.h | 2264 + + .../amd/include/asic_reg/clk/clk_11_0_0_offset.h | 33 + + .../amd/include/asic_reg/clk/clk_11_0_0_sh_mask.h | 38 + + .../amd/include/asic_reg/dcn/dcn_2_0_0_offset.h | 17535 +++ + .../amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h | 68024 ++++++++++ + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 18 + + .../amd/include/asic_reg/gc/gc_10_1_0_default.h | 6028 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 11339 ++ + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 43963 +++++++ + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 31 + + .../amd/include/asic_reg/hdp/hdp_5_0_0_offset.h | 217 + + .../amd/include/asic_reg/hdp/hdp_5_0_0_sh_mask.h | 659 + + .../include/asic_reg/mmhub/mmhub_2_0_0_default.h | 927 + + .../include/asic_reg/mmhub/mmhub_2_0_0_offset.h | 1799 + + .../include/asic_reg/mmhub/mmhub_2_0_0_sh_mask.h | 7567 ++ + .../drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h | 429 + + .../amd/include/asic_reg/nbio/nbio_2_3_default.h | 18521 +++ + .../amd/include/asic_reg/nbio/nbio_2_3_offset.h | 14663 +++ + .../amd/include/asic_reg/nbio/nbio_2_3_sh_mask.h | 120339 ++++++++++++++++++ + .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 3 + + .../amd/include/asic_reg/oss/osssys_5_0_0_offset.h | 353 + + .../include/asic_reg/oss/osssys_5_0_0_sh_mask.h | 1305 + + .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 323 + + .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 689 + + .../amd/include/asic_reg/vcn/vcn_2_0_0_offset.h | 1008 + + .../amd/include/asic_reg/vcn/vcn_2_0_0_sh_mask.h | 3815 + + drivers/gpu/drm/amd/include/atomfirmware.h | 188 +- + drivers/gpu/drm/amd/include/cik_structs.h | 3 +- + drivers/gpu/drm/amd/include/discovery.h | 165 + + .../include/ivsrcid/{ => dcn}/irqsrcs_dcn_1_0.h | 0 + .../drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_10_1.h | 53 + + .../amd/include/ivsrcid/sdma0/irqsrcs_sdma0_5_0.h | 43 + + .../amd/include/ivsrcid/sdma1/irqsrcs_sdma1_5_0.h | 44 + + .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h | 32 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + + drivers/gpu/drm/amd/include/navi10_enum.h | 22764 ++++ + drivers/gpu/drm/amd/include/navi10_ip_offset.h | 855 + + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 4 +- + drivers/gpu/drm/amd/include/v10_structs.h | 1258 + + drivers/gpu/drm/amd/include/v9_structs.h | 3 +- + drivers/gpu/drm/amd/include/vi_structs.h | 3 +- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 425 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 157 +- + .../amd/powerplay/hwmgr/vega10_processpptables.c | 25 + + .../amd/powerplay/hwmgr/vega10_processpptables.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 123 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 84 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 361 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 7 + + drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h | 12 +- + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 1069 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 29 + + .../gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 39 +- + .../gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1579 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 28 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1232 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 4 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 + + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 3 + + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 3 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 22 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 3 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 1285 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 50 + + drivers/gpu/drm/arm/display/include/malidp_io.h | 7 + + drivers/gpu/drm/arm/display/include/malidp_utils.h | 5 +- + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 582 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 142 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 67 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 17 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 154 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 59 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 13 +- + .../drm/arm/display/komeda/komeda_format_caps.c | 58 + + .../drm/arm/display/komeda/komeda_format_caps.h | 24 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 175 +- + .../drm/arm/display/komeda/komeda_framebuffer.h | 13 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 130 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 71 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 66 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 111 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 679 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 191 +- + .../drm/arm/display/komeda/komeda_private_obj.c | 154 + + .../drm/arm/display/komeda/komeda_wb_connector.c | 199 + + drivers/gpu/drm/arm/malidp_crtc.c | 28 +- + drivers/gpu/drm/arm/malidp_drv.c | 11 +- + drivers/gpu/drm/arm/malidp_hw.c | 3 +- + drivers/gpu/drm/arm/malidp_mw.c | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 3 +- + drivers/gpu/drm/ast/Kconfig | 3 +- + drivers/gpu/drm/ast/ast_drv.c | 13 +- + drivers/gpu/drm/ast/ast_drv.h | 78 +- + drivers/gpu/drm/ast/ast_fb.c | 61 +- + drivers/gpu/drm/ast/ast_main.c | 77 +- + drivers/gpu/drm/ast/ast_mode.c | 157 +- + drivers/gpu/drm/ast/ast_ttm.c | 302 +- + drivers/gpu/drm/ati_pcigart.c | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 120 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 11 +- + drivers/gpu/drm/bochs/Kconfig | 2 +- + drivers/gpu/drm/bochs/bochs.h | 54 +- + drivers/gpu/drm/bochs/bochs_drv.c | 24 +- + drivers/gpu/drm/bochs/bochs_kms.c | 18 +- + drivers/gpu/drm/bochs/bochs_mm.c | 427 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 9 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 58 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 24 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 10 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 3 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 +- + drivers/gpu/drm/bridge/panel.c | 5 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 3 +- + drivers/gpu/drm/bridge/sii902x.c | 491 +- + drivers/gpu/drm/bridge/sii9234.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 193 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 17 +- + drivers/gpu/drm/bridge/tc358764.c | 14 +- + drivers/gpu/drm/bridge/tc358767.c | 593 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 64 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 14 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 337 - + drivers/gpu/drm/drm_agpsupport.c | 11 +- + drivers/gpu/drm/drm_atomic.c | 248 +- + drivers/gpu/drm/drm_atomic_helper.c | 232 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 70 +- + drivers/gpu/drm/drm_atomic_uapi.c | 23 +- + drivers/gpu/drm/drm_auth.c | 30 +- + drivers/gpu/drm/drm_blend.c | 9 +- + drivers/gpu/drm/drm_bridge.c | 110 + + drivers/gpu/drm/drm_bufs.c | 21 +- + drivers/gpu/drm/drm_client.c | 15 +- + drivers/gpu/drm/drm_client_modeset.c | 1125 + + drivers/gpu/drm/drm_color_mgmt.c | 8 +- + drivers/gpu/drm/drm_connector.c | 99 +- + drivers/gpu/drm/drm_context.c | 8 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 14 +- + drivers/gpu/drm/drm_crtc_internal.h | 31 +- + drivers/gpu/drm/drm_damage_helper.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 92 +- + drivers/gpu/drm/drm_debugfs_crc.c | 46 +- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 8 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 16 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 19 +- + drivers/gpu/drm/drm_drv.c | 14 +- + drivers/gpu/drm/drm_dumb_buffers.c | 4 +- + drivers/gpu/drm/drm_edid.c | 232 +- + drivers/gpu/drm/drm_edid_load.c | 9 +- + drivers/gpu/drm/drm_encoder.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 1408 +- + drivers/gpu/drm/drm_file.c | 133 +- + drivers/gpu/drm/drm_flip_work.c | 6 +- + drivers/gpu/drm/drm_format_helper.c | 4 +- + drivers/gpu/drm/drm_fourcc.c | 120 +- + drivers/gpu/drm/drm_framebuffer.c | 13 +- + drivers/gpu/drm/drm_gem.c | 40 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 11 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 641 + + drivers/gpu/drm/drm_hashtab.c | 10 +- + drivers/gpu/drm/drm_hdcp.c | 382 + + drivers/gpu/drm/drm_internal.h | 42 +- + drivers/gpu/drm/drm_ioc32.c | 9 +- + drivers/gpu/drm/drm_ioctl.c | 22 +- + drivers/gpu/drm/drm_irq.c | 13 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_lease.c | 15 +- + drivers/gpu/drm/drm_legacy.h | 6 + + drivers/gpu/drm/drm_legacy_misc.c | 27 +- + drivers/gpu/drm/drm_lock.c | 8 +- + drivers/gpu/drm/drm_memory.c | 9 +- + drivers/gpu/drm/drm_mm.c | 9 +- + drivers/gpu/drm/drm_mode_config.c | 6 +- + drivers/gpu/drm/drm_mode_object.c | 9 +- + drivers/gpu/drm/drm_modes.c | 480 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_of.c | 5 +- + drivers/gpu/drm/drm_pci.c | 11 +- + drivers/gpu/drm/drm_plane_helper.c | 9 +- + drivers/gpu/drm/drm_prime.c | 84 +- + drivers/gpu/drm/drm_print.c | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 16 +- + drivers/gpu/drm/drm_property.c | 7 +- + drivers/gpu/drm/drm_rect.c | 4 +- + drivers/gpu/drm/drm_scatter.c | 9 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 218 + + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/drm_syncobj.c | 13 +- + drivers/gpu/drm/drm_sysfs.c | 17 +- + drivers/gpu/drm/drm_trace.h | 2 + + drivers/gpu/drm/drm_trace_points.c | 3 +- + drivers/gpu/drm/drm_vblank.c | 22 +- + drivers/gpu/drm/drm_vm.c | 19 +- + drivers/gpu/drm/drm_vma_manager.c | 6 +- + drivers/gpu/drm/drm_vram_helper_common.c | 96 + + drivers/gpu/drm/drm_vram_mm_helper.c | 297 + + drivers/gpu/drm/drm_writeback.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 - + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/exynos/Kconfig | 6 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 7 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 13 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 8 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 21 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 13 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 9 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 41 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 31 +- + drivers/gpu/drm/gma500/accel_2d.c | 18 +- + drivers/gpu/drm/gma500/blitter.h | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 13 +- + drivers/gpu/drm/gma500/cdv_device.h | 4 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 26 +- + drivers/gpu/drm/gma500/framebuffer.h | 1 - + drivers/gpu/drm/gma500/gem.c | 5 +- + drivers/gpu/drm/gma500/gma_device.c | 1 - + drivers/gpu/drm/gma500/gma_device.h | 1 + + drivers/gpu/drm/gma500/gma_display.c | 12 +- + drivers/gpu/drm/gma500/gma_display.h | 3 + + drivers/gpu/drm/gma500/gtt.c | 5 +- + drivers/gpu/drm/gma500/gtt.h | 1 - + drivers/gpu/drm/gma500/intel_bios.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.h | 3 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 11 +- + drivers/gpu/drm/gma500/intel_i2c.c | 4 +- + drivers/gpu/drm/gma500/mdfld_device.c | 16 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 8 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 11 +- + drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 + + drivers/gpu/drm/gma500/mid_bios.c | 5 +- + drivers/gpu/drm/gma500/mid_bios.h | 1 + + drivers/gpu/drm/gma500/mmu.c | 6 +- + drivers/gpu/drm/gma500/oaktrail.h | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 20 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 11 +- + drivers/gpu/drm/gma500/power.h | 4 +- + drivers/gpu/drm/gma500/psb_device.c | 12 +- + drivers/gpu/drm/gma500/psb_drv.c | 33 +- + drivers/gpu/drm/gma500/psb_drv.h | 16 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 15 +- + drivers/gpu/drm/gma500/psb_irq.c | 9 +- + drivers/gpu/drm/gma500/psb_irq.h | 2 +- + drivers/gpu/drm/gma500/psb_lid.c | 6 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 13 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 19 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 14 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 37 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 341 +- + drivers/gpu/drm/i915/Kconfig | 35 +- + drivers/gpu/drm/i915/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Kconfig.profile | 27 + + drivers/gpu/drm/i915/Makefile | 201 +- + drivers/gpu/drm/i915/Makefile.header-test | 37 +- + drivers/gpu/drm/i915/display/Makefile | 2 + + drivers/gpu/drm/i915/display/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => display}/dvo_ch7017.c | 3 +- + drivers/gpu/drm/i915/{ => display}/dvo_ch7xxx.c | 3 +- + drivers/gpu/drm/i915/{ => display}/dvo_ivch.c | 3 +- + drivers/gpu/drm/i915/{ => display}/dvo_ns2501.c | 5 +- + drivers/gpu/drm/i915/{ => display}/dvo_sil164.c | 3 +- + drivers/gpu/drm/i915/{ => display}/dvo_tfp410.c | 3 +- + drivers/gpu/drm/i915/{ => display}/icl_dsi.c | 171 +- + drivers/gpu/drm/i915/{ => display}/intel_acpi.c | 3 + + drivers/gpu/drm/i915/display/intel_acpi.h | 17 + + drivers/gpu/drm/i915/{ => display}/intel_atomic.c | 35 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 49 + + .../drm/i915/{ => display}/intel_atomic_plane.c | 72 +- + .../drm/i915/{ => display}/intel_atomic_plane.h | 10 + + drivers/gpu/drm/i915/{ => display}/intel_audio.c | 61 +- + drivers/gpu/drm/i915/{ => display}/intel_audio.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_bios.c | 212 +- + drivers/gpu/drm/i915/{ => display}/intel_bios.h | 21 + + drivers/gpu/drm/i915/display/intel_bw.c | 421 + + drivers/gpu/drm/i915/display/intel_bw.h | 47 + + drivers/gpu/drm/i915/{ => display}/intel_cdclk.c | 296 +- + drivers/gpu/drm/i915/{ => display}/intel_cdclk.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_color.c | 248 +- + drivers/gpu/drm/i915/{ => display}/intel_color.h | 1 + + .../gpu/drm/i915/{ => display}/intel_combo_phy.c | 87 +- + drivers/gpu/drm/i915/display/intel_combo_phy.h | 20 + + .../gpu/drm/i915/{ => display}/intel_connector.c | 3 +- + .../gpu/drm/i915/{ => display}/intel_connector.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_crt.c | 44 +- + drivers/gpu/drm/i915/{ => display}/intel_crt.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_ddi.c | 93 +- + drivers/gpu/drm/i915/{ => display}/intel_ddi.h | 1 - + drivers/gpu/drm/i915/{ => display}/intel_display.c | 1876 +- + drivers/gpu/drm/i915/{ => display}/intel_display.h | 90 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 4618 + + drivers/gpu/drm/i915/display/intel_display_power.h | 288 + + drivers/gpu/drm/i915/{ => display}/intel_dp.c | 310 +- + drivers/gpu/drm/i915/{ => display}/intel_dp.h | 1 + + .../i915/{ => display}/intel_dp_aux_backlight.c | 1 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.h | 13 + + .../i915/{ => display}/intel_dp_link_training.c | 1 + + .../gpu/drm/i915/display/intel_dp_link_training.h | 14 + + drivers/gpu/drm/i915/{ => display}/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 14 + + .../gpu/drm/i915/{ => display}/intel_dpio_phy.c | 42 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 58 + + .../gpu/drm/i915/{ => display}/intel_dpll_mgr.c | 87 +- + .../gpu/drm/i915/{ => display}/intel_dpll_mgr.h | 12 +- + drivers/gpu/drm/i915/{ => display}/intel_dsi.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_dsi.h | 8 + + .../i915/{ => display}/intel_dsi_dcs_backlight.c | 8 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.h | 13 + + drivers/gpu/drm/i915/{ => display}/intel_dsi_vbt.c | 364 +- + drivers/gpu/drm/i915/{ => display}/intel_dvo.c | 8 +- + drivers/gpu/drm/i915/{ => display}/intel_dvo.h | 0 + .../drm/i915/{dvo.h => display/intel_dvo_dev.h} | 10 +- + drivers/gpu/drm/i915/{ => display}/intel_fbc.c | 4 + + drivers/gpu/drm/i915/{ => display}/intel_fbc.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_fbdev.c | 8 +- + drivers/gpu/drm/i915/{ => display}/intel_fbdev.h | 0 + .../drm/i915/{ => display}/intel_fifo_underrun.c | 1 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 27 + + .../gpu/drm/i915/{ => display}/intel_frontbuffer.c | 7 +- + .../gpu/drm/i915/{ => display}/intel_frontbuffer.h | 2 +- + .../i915/{intel_i2c.c => display/intel_gmbus.c} | 100 +- + drivers/gpu/drm/i915/display/intel_gmbus.h | 27 + + drivers/gpu/drm/i915/{ => display}/intel_hdcp.c | 55 +- + drivers/gpu/drm/i915/{ => display}/intel_hdcp.h | 1 + + drivers/gpu/drm/i915/{ => display}/intel_hdmi.c | 175 +- + drivers/gpu/drm/i915/{ => display}/intel_hdmi.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_hotplug.c | 5 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 30 + + .../gpu/drm/i915/{ => display}/intel_lpe_audio.c | 8 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.h | 22 + + drivers/gpu/drm/i915/{ => display}/intel_lspcon.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_lspcon.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_lvds.c | 2 + + drivers/gpu/drm/i915/{ => display}/intel_lvds.h | 0 + .../gpu/drm/i915/{ => display}/intel_opregion.c | 3 +- + .../gpu/drm/i915/{ => display}/intel_opregion.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_overlay.c | 40 +- + drivers/gpu/drm/i915/display/intel_overlay.h | 29 + + drivers/gpu/drm/i915/{ => display}/intel_panel.c | 4 +- + drivers/gpu/drm/i915/{ => display}/intel_panel.h | 0 + .../gpu/drm/i915/{ => display}/intel_pipe_crc.c | 14 +- + .../gpu/drm/i915/{ => display}/intel_pipe_crc.h | 3 + + drivers/gpu/drm/i915/{ => display}/intel_psr.c | 51 +- + drivers/gpu/drm/i915/{ => display}/intel_psr.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_quirks.c | 1 + + drivers/gpu/drm/i915/display/intel_quirks.h | 13 + + drivers/gpu/drm/i915/{ => display}/intel_sdvo.c | 34 +- + drivers/gpu/drm/i915/{ => display}/intel_sdvo.h | 0 + .../gpu/drm/i915/{ => display}/intel_sdvo_regs.h | 8 + + drivers/gpu/drm/i915/{ => display}/intel_sprite.c | 45 +- + drivers/gpu/drm/i915/{ => display}/intel_sprite.h | 12 +- + drivers/gpu/drm/i915/{ => display}/intel_tv.c | 9 +- + drivers/gpu/drm/i915/{ => display}/intel_tv.h | 0 + .../gpu/drm/i915/{ => display}/intel_vbt_defs.h | 633 +- + drivers/gpu/drm/i915/{ => display}/intel_vdsc.c | 2 + + drivers/gpu/drm/i915/display/intel_vdsc.h | 21 + + drivers/gpu/drm/i915/{ => display}/vlv_dsi.c | 230 +- + drivers/gpu/drm/i915/{ => display}/vlv_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/gem/Makefile | 1 + + drivers/gpu/drm/i915/gem/Makefile.header-test | 16 + + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 139 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.h | 20 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 304 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.h | 21 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c | 1200 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h | 106 +- + .../drm/i915/{ => gem}/i915_gem_context_types.h | 59 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 796 + + .../gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c | 359 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 96 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 52 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 508 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 398 + + drivers/gpu/drm/i915/gem/i915_gem_object.h | 430 + + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 107 + + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 24 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 262 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 544 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 212 + + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 294 + + drivers/gpu/drm/i915/gem/i915_gem_pm.h | 25 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 571 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c | 181 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 73 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c | 31 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c | 40 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 278 + + drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gemfs.h | 16 + + .../drm/i915/{ => gem}/selftests/huge_gem_object.c | 24 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.h | 27 + + .../gpu/drm/i915/{ => gem}/selftests/huge_pages.c | 105 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 127 + + .../i915/{ => gem}/selftests/i915_gem_coherency.c | 56 +- + .../i915/{ => gem}/selftests/i915_gem_context.c | 379 +- + .../drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c | 35 +- + .../selftests/i915_gem_mman.c} | 237 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 99 + + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 110 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 80 + + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 34 + + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 17 + + .../drm/i915/{ => gem}/selftests/mock_context.c | 45 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 24 + + .../gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c | 22 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 22 + + .../drm/i915/{ => gem}/selftests/mock_gem_object.h | 7 +- + drivers/gpu/drm/i915/gt/Makefile | 2 + + drivers/gpu/drm/i915/gt/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c | 19 + + drivers/gpu/drm/i915/gt/intel_context.c | 241 + + drivers/gpu/drm/i915/gt/intel_context.h | 134 + + .../gpu/drm/i915/{ => gt}/intel_context_types.h | 27 +- + .../i915/{intel_ringbuffer.h => gt/intel_engine.h} | 81 +- + drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c | 510 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 168 + + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 22 + + drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h | 58 +- + drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 143 + + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 27 + + drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c | 35 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.c | 1376 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.h | 34 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h | 2 +- + drivers/gpu/drm/i915/{ => gt}/intel_mocs.c | 12 +- + drivers/gpu/drm/i915/{ => gt}/intel_mocs.h | 4 +- + .../drm/i915/{i915_reset.c => gt/intel_reset.c} | 226 +- + .../drm/i915/{i915_reset.h => gt/intel_reset.h} | 5 +- + drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c | 468 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 159 + + drivers/gpu/drm/i915/gt/intel_sseu.h | 75 + + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c | 420 +- + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h | 10 +- + .../drm/i915/{ => gt}/intel_workarounds_types.h | 7 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.c | 67 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.h | 4 +- + .../intel_engine_cs.c => gt/selftest_engine_cs.c} | 0 + .../intel_hangcheck.c => gt/selftest_hangcheck.c} | 270 +- + .../{selftests/intel_lrc.c => gt/selftest_lrc.c} | 583 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 118 + + .../selftest_workarounds.c} | 497 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 24 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 27 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 4 +- + drivers/gpu/drm/i915/gvt/firmware.c | 5 +- + drivers/gpu/drm/i915/gvt/gvt.h | 10 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 4 +- + drivers/gpu/drm/i915/gvt/opregion.c | 2 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 190 +- + drivers/gpu/drm/i915/i915_active.c | 96 + + drivers/gpu/drm/i915/i915_active.h | 7 +- + drivers/gpu/drm/i915/i915_active_types.h | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 26 +- + drivers/gpu/drm/i915/i915_debugfs.c | 555 +- + drivers/gpu/drm/i915/i915_debugfs.h | 20 + + drivers/gpu/drm/i915/i915_drv.c | 161 +- + drivers/gpu/drm/i915/i915_drv.h | 1033 +- + drivers/gpu/drm/i915/i915_fixed.h | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 4284 +- + drivers/gpu/drm/i915/i915_gem.h | 8 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 3 +- + drivers/gpu/drm/i915/i915_gem_clflush.h | 36 - + drivers/gpu/drm/i915/i915_gem_evict.c | 49 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 207 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 19 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1014 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 167 +- + drivers/gpu/drm/i915/i915_gem_object.c | 90 - + drivers/gpu/drm/i915/i915_gem_object.h | 509 - + drivers/gpu/drm/i915/i915_gem_render_state.c | 8 +- + drivers/gpu/drm/i915/i915_globals.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 142 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 170 +- + drivers/gpu/drm/i915/i915_irq.h | 117 + + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 63 +- + drivers/gpu/drm/i915/i915_perf.c | 100 +- + drivers/gpu/drm/i915/i915_pmu.c | 28 +- + drivers/gpu/drm/i915/i915_query.c | 66 +- + drivers/gpu/drm/i915/i915_reg.h | 100 +- + drivers/gpu/drm/i915/i915_request.c | 544 +- + drivers/gpu/drm/i915/i915_request.h | 19 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 39 + + drivers/gpu/drm/i915/i915_scatterlist.h | 127 + + drivers/gpu/drm/i915/i915_scheduler.c | 91 +- + drivers/gpu/drm/i915/i915_scheduler.h | 18 + + drivers/gpu/drm/i915/i915_scheduler_types.h | 2 +- + drivers/gpu/drm/i915/i915_suspend.c | 6 +- + drivers/gpu/drm/i915/i915_sysfs.c | 65 +- + drivers/gpu/drm/i915/i915_timeline.c | 14 +- + drivers/gpu/drm/i915/i915_timeline.h | 19 - + drivers/gpu/drm/i915/i915_timeline_types.h | 3 - + drivers/gpu/drm/i915/i915_trace.h | 9 +- + drivers/gpu/drm/i915/i915_utils.h | 187 +- + drivers/gpu/drm/i915/i915_vma.c | 134 +- + drivers/gpu/drm/i915/i915_vma.h | 38 +- + drivers/gpu/drm/i915/intel_context.c | 269 - + drivers/gpu/drm/i915/intel_context.h | 87 - + drivers/gpu/drm/i915/intel_csr.c | 411 +- + drivers/gpu/drm/i915/intel_csr.h | 4 + + drivers/gpu/drm/i915/intel_device_info.c | 78 +- + drivers/gpu/drm/i915/intel_device_info.h | 90 +- + drivers/gpu/drm/i915/intel_drv.h | 447 +- + drivers/gpu/drm/i915/intel_guc.c | 196 +- + drivers/gpu/drm/i915/intel_guc.h | 20 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 167 +- + drivers/gpu/drm/i915/intel_guc_ads.h | 1 + + drivers/gpu/drm/i915/intel_guc_ct.c | 16 +- + drivers/gpu/drm/i915/intel_guc_ct.h | 5 + + drivers/gpu/drm/i915/intel_guc_fw.c | 117 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 201 +- + drivers/gpu/drm/i915/intel_guc_log.c | 23 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 25 + + drivers/gpu/drm/i915/intel_guc_submission.c | 62 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 3 +- + drivers/gpu/drm/i915/intel_huc.c | 102 +- + drivers/gpu/drm/i915/intel_huc.h | 13 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 73 +- + drivers/gpu/drm/i915/intel_pm.c | 567 +- + drivers/gpu/drm/i915/intel_pm.h | 19 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 4436 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 213 + + drivers/gpu/drm/i915/intel_sideband.c | 483 +- + drivers/gpu/drm/i915/intel_sideband.h | 141 + + drivers/gpu/drm/i915/intel_uc.c | 148 +- + drivers/gpu/drm/i915/intel_uc.h | 3 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 126 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 10 +- + drivers/gpu/drm/i915/intel_uncore.c | 55 +- + drivers/gpu/drm/i915/intel_uncore.h | 4 +- + drivers/gpu/drm/i915/intel_wakeref.c | 138 + + drivers/gpu/drm/i915/intel_wakeref.h | 164 + + drivers/gpu/drm/i915/intel_wopcm.c | 27 +- + drivers/gpu/drm/i915/intel_wopcm.h | 15 + + drivers/gpu/drm/i915/selftests/huge_gem_object.h | 45 - + drivers/gpu/drm/i915/selftests/i915_active.c | 14 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 35 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 34 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 5 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 86 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 30 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 258 +- + drivers/gpu/drm/i915/selftests/igt_atomic.h | 56 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 38 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 11 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 1 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 20 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 10 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 11 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 3 + + drivers/gpu/drm/i915/selftests/mock_context.h | 42 - + drivers/gpu/drm/i915/selftests/mock_dmabuf.h | 41 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 48 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 4 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_timeline.c | 1 - + drivers/gpu/drm/i915/selftests/scatterlist.c | 3 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 16 +- + drivers/gpu/drm/ingenic/Kconfig | 16 + + drivers/gpu/drm/ingenic/Makefile | 1 + + drivers/gpu/drm/ingenic/ingenic-drm.c | 818 + + drivers/gpu/drm/lima/lima_drv.c | 2 +- + drivers/gpu/drm/lima/lima_pp.c | 8 +- + drivers/gpu/drm/lima/lima_sched.c | 13 +- + drivers/gpu/drm/mcde/Kconfig | 18 + + drivers/gpu/drm/mcde/Makefile | 3 + + drivers/gpu/drm/mcde/mcde_display.c | 1142 + + drivers/gpu/drm/mcde/mcde_display_regs.h | 518 + + drivers/gpu/drm/mcde/mcde_drm.h | 44 + + drivers/gpu/drm/mcde/mcde_drv.c | 572 + + drivers/gpu/drm/mcde/mcde_dsi.c | 1044 + + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 385 + + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 + + drivers/gpu/drm/meson/Kconfig | 1 + + drivers/gpu/drm/meson/meson_overlay.c | 17 +- + drivers/gpu/drm/meson/meson_plane.c | 19 + + drivers/gpu/drm/mgag200/Kconfig | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 183 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 75 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 91 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 301 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +- + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 28 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 8 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 40 +- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 76 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 70 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 20 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 176 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 - + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 119 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 46 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 57 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 4 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 3 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 31 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 38 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 27 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 7 +- + drivers/gpu/drm/msm/dsi/dsi.c | 2 + + drivers/gpu/drm/msm/dsi/dsi.h | 7 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 21 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 19 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 149 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 30 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 106 +- + drivers/gpu/drm/msm/msm_drv.c | 34 +- + drivers/gpu/drm/msm/msm_drv.h | 1 + + drivers/gpu/drm/msm/msm_fb.c | 20 +- + drivers/gpu/drm/msm/msm_gem.c | 6 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 13 +- + drivers/gpu/drm/msm/msm_gpu.c | 5 +- + drivers/gpu/drm/msm/msm_iommu.c | 2 +- + drivers/gpu/drm/msm/msm_perf.c | 15 +- + drivers/gpu/drm/msm/msm_rd.c | 16 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c | 2 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 1 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 180 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 25 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 25 + + drivers/gpu/drm/omapdrm/omap_irq.h | 1 + + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 9 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 9 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 9 +- + drivers/gpu/drm/panel/panel-lvds.c | 7 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 8 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 254 + + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 7 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 3 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 14 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 514 + + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 12 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 10 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 7 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 7 +- + drivers/gpu/drm/panel/panel-simple.c | 276 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 6 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 10 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 13 +- + drivers/gpu/drm/panfrost/Makefile | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 30 + + drivers/gpu/drm/panfrost/panfrost_device.h | 11 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 15 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 329 + + drivers/gpu/drm/panfrost/panfrost_perfcnt.h | 18 + + drivers/gpu/drm/panfrost/panfrost_regs.h | 22 + + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/r128/r128_cce.c | 28 +- + drivers/gpu/drm/r128/r128_drv.c | 9 +- + drivers/gpu/drm/r128/r128_drv.h | 16 +- + drivers/gpu/drm/r128/r128_state.c | 25 +- + drivers/gpu/drm/radeon/atom.c | 2 + + drivers/gpu/drm/radeon/atom.h | 1 - + drivers/gpu/drm/radeon/atombios_crtc.c | 7 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 14 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- + drivers/gpu/drm/radeon/btc_dpm.c | 16 +- + drivers/gpu/drm/radeon/btc_dpm.h | 3 + + drivers/gpu/drm/radeon/ci_dpm.c | 14 +- + drivers/gpu/drm/radeon/ci_dpm.h | 1 + + drivers/gpu/drm/radeon/ci_smc.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 18 +- + drivers/gpu/drm/radeon/cik_sdma.c | 6 +- + drivers/gpu/drm/radeon/clearstate_cayman.h | 2 + + drivers/gpu/drm/radeon/clearstate_ci.h | 2 + + drivers/gpu/drm/radeon/clearstate_si.h | 2 + + drivers/gpu/drm/radeon/cypress_dpm.c | 11 +- + drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 16 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 10 +- + drivers/gpu/drm/radeon/kv_smc.c | 1 - + drivers/gpu/drm/radeon/ni.c | 17 +- + drivers/gpu/drm/radeon/ni_dma.c | 2 +- + drivers/gpu/drm/radeon/ni_dpm.c | 16 +- + drivers/gpu/drm/radeon/r100.c | 36 +- + drivers/gpu/drm/radeon/r100_track.h | 2 + + drivers/gpu/drm/radeon/r200.c | 2 +- + drivers/gpu/drm/radeon/r300.c | 18 +- + drivers/gpu/drm/radeon/r420.c | 16 +- + drivers/gpu/drm/radeon/r520.c | 4 +- + drivers/gpu/drm/radeon/r600.c | 18 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 +- + drivers/gpu/drm/radeon/r600_dma.c | 6 +- + drivers/gpu/drm/radeon/r600_dpm.c | 1 - + drivers/gpu/drm/radeon/r600_dpm.h | 2 + + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 13 +- + drivers/gpu/drm/radeon/radeon_agp.c | 8 +- + drivers/gpu/drm/radeon/radeon_asic.c | 10 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 5 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- + drivers/gpu/drm/radeon/radeon_bios.c | 12 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 9 +- + drivers/gpu/drm/radeon/radeon_combios.c | 5 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 10 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 4 +- + drivers/gpu/drm/radeon/radeon_device.c | 18 +- + drivers/gpu/drm/radeon/radeon_display.c | 21 +- + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 19 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 5 +- + drivers/gpu/drm/radeon/radeon_fb.c | 17 +- + drivers/gpu/drm/radeon/radeon_fence.c | 16 +- + drivers/gpu/drm/radeon/radeon_gart.c | 5 +- + drivers/gpu/drm/radeon/radeon_gem.c | 9 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 5 +- + drivers/gpu/drm/radeon/radeon_ib.c | 5 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +- + drivers/gpu/drm/radeon/radeon_kms.c | 17 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 9 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 11 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 11 +- + drivers/gpu/drm/radeon/radeon_pm.c | 17 +- + drivers/gpu/drm/radeon/radeon_prime.c | 8 +- + drivers/gpu/drm/radeon/radeon_ring.c | 6 +- + drivers/gpu/drm/radeon/radeon_sa.c | 2 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- + drivers/gpu/drm/radeon/radeon_sync.c | 1 - + drivers/gpu/drm/radeon/radeon_test.c | 2 +- + drivers/gpu/drm/radeon/radeon_trace.h | 4 +- + drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 47 +- + drivers/gpu/drm/radeon/radeon_ucode.c | 2 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vce.c | 4 +- + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/radeon/rs400.c | 11 +- + drivers/gpu/drm/radeon/rs600.c | 13 +- + drivers/gpu/drm/radeon/rs690.c | 6 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 12 +- + drivers/gpu/drm/radeon/rv515.c | 13 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 1 - + drivers/gpu/drm/radeon/rv730_dpm.c | 1 - + drivers/gpu/drm/radeon/rv740_dpm.c | 1 - + drivers/gpu/drm/radeon/rv770.c | 12 +- + drivers/gpu/drm/radeon/rv770_dma.c | 2 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 1 - + drivers/gpu/drm/radeon/rv770_dpm.h | 1 + + drivers/gpu/drm/radeon/rv770_smc.c | 2 +- + drivers/gpu/drm/radeon/si.c | 16 +- + drivers/gpu/drm/radeon/si_dma.c | 2 +- + drivers/gpu/drm/radeon/si_dpm.c | 14 +- + drivers/gpu/drm/radeon/si_smc.c | 2 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 1 - + drivers/gpu/drm/radeon/sumo_dpm.h | 1 + + drivers/gpu/drm/radeon/sumo_smc.c | 1 - + drivers/gpu/drm/radeon/trinity_dpm.c | 10 +- + drivers/gpu/drm/radeon/trinity_smc.c | 1 - + drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- + drivers/gpu/drm/radeon/uvd_v3_1.c | 1 - + drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- + drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 82 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 1 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 135 +- + drivers/gpu/drm/rcar-du/rcar_lvds.h | 5 + + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 4 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 67 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 30 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 42 +- + drivers/gpu/drm/savage/savage_bci.c | 25 +- + drivers/gpu/drm/savage/savage_drv.c | 9 +- + drivers/gpu/drm/savage/savage_drv.h | 10 +- + drivers/gpu/drm/savage/savage_state.c | 9 +- + drivers/gpu/drm/scheduler/sched_main.c | 179 +- + drivers/gpu/drm/selftests/Makefile | 2 +- + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 55 + + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 918 + + drivers/gpu/drm/sis/sis_drv.c | 8 +- + drivers/gpu/drm/sis/sis_drv.h | 10 +- + drivers/gpu/drm/sis/sis_mm.c | 7 +- + drivers/gpu/drm/sti/sti_awg_utils.c | 2 + + drivers/gpu/drm/sti/sti_awg_utils.h | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.h | 6 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 + + drivers/gpu/drm/sti/sti_cursor.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 21 +- + drivers/gpu/drm/sti/sti_drv.h | 5 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 4 + + drivers/gpu/drm/sti/sti_gdp.h | 5 + + drivers/gpu/drm/sti/sti_hda.c | 6 +- + drivers/gpu/drm/sti/sti_hdmi.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.h | 4 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 2 + + drivers/gpu/drm/sti/sti_hqvdp.c | 8 +- + drivers/gpu/drm/sti/sti_mixer.c | 4 + + drivers/gpu/drm/sti/sti_mixer.h | 7 +- + drivers/gpu/drm/sti/sti_plane.c | 4 +- + drivers/gpu/drm/sti/sti_plane.h | 1 - + drivers/gpu/drm/sti/sti_tvout.c | 6 +- + drivers/gpu/drm/sti/sti_vid.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.h | 1 + + drivers/gpu/drm/stm/drv.c | 44 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 105 +- + drivers/gpu/drm/stm/ltdc.c | 142 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 16 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1 + + drivers/gpu/drm/tegra/dc.c | 17 +- + drivers/gpu/drm/tegra/dpaux.c | 13 +- + drivers/gpu/drm/tegra/drm.h | 3 +- + drivers/gpu/drm/tegra/fb.c | 14 +- + drivers/gpu/drm/tegra/output.c | 52 +- + drivers/gpu/drm/ttm/ttm_bo.c | 271 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 169 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 35 +- + drivers/gpu/drm/v3d/v3d_drv.c | 17 +- + drivers/gpu/drm/v3d/v3d_drv.h | 106 +- + drivers/gpu/drm/v3d/v3d_fence.c | 2 + + drivers/gpu/drm/v3d/v3d_gem.c | 552 +- + drivers/gpu/drm/v3d/v3d_irq.c | 55 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 7 +- + drivers/gpu/drm/v3d/v3d_regs.h | 122 +- + drivers/gpu/drm/v3d/v3d_sched.c | 382 +- + drivers/gpu/drm/v3d/v3d_trace.h | 94 + + drivers/gpu/drm/vboxvideo/Kconfig | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 12 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 75 +- + drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 75 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 355 +- + drivers/gpu/drm/vc4/vc4_bo.c | 31 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 8 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 + + drivers/gpu/drm/vc4/vc4_drv.h | 14 + + drivers/gpu/drm/vc4/vc4_gem.c | 11 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 8 +- + drivers/gpu/drm/vc4/vc4_irq.c | 20 +- + drivers/gpu/drm/vc4/vc4_plane.c | 15 +- + drivers/gpu/drm/vc4/vc4_txp.c | 7 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 72 +- + drivers/gpu/drm/virtio/Makefile | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 20 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 10 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 150 - + drivers/gpu/drm/virtio/virtgpu_fence.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 38 +- + drivers/gpu/drm/virtio/virtgpu_trace.h | 52 + + drivers/gpu/drm/virtio/virtgpu_trace_points.c | 5 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 36 +- + drivers/gpu/drm/vkms/vkms_crc.c | 9 + + drivers/gpu/drm/vkms/vkms_crtc.c | 56 +- + drivers/gpu/drm/vkms/vkms_drv.h | 10 +- + drivers/gpu/drm/vkms/vkms_output.c | 10 - + drivers/gpu/drm/vkms/vkms_plane.c | 8 + + drivers/gpu/drm/vmwgfx/Kconfig | 1 + + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 233 +- + drivers/gpu/drm/vmwgfx/ttm_lock.c | 100 - + drivers/gpu/drm/vmwgfx/ttm_lock.h | 30 - + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 167 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 139 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 472 + + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 248 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 15 + + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 405 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 74 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 18 +- + drivers/gpu/drm/zte/zx_plane.c | 6 +- + drivers/gpu/host1x/bus.c | 35 +- + drivers/gpu/host1x/debug.c | 3 - + drivers/gpu/host1x/dev.c | 5 +- + drivers/gpu/ipu-v3/Makefile | 4 +- + drivers/gpu/ipu-v3/ipu-ic-csc.c | 409 + + drivers/gpu/ipu-v3/ipu-ic.c | 138 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 37 +- + drivers/gpu/vga/vga_switcheroo.c | 34 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/staging/media/imx/imx-ic-prp.c | 6 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 42 +- + drivers/staging/media/imx/imx-media-csi.c | 19 +- + drivers/staging/media/imx/imx-media-utils.c | 73 +- + drivers/staging/media/imx/imx-media-vdic.c | 5 +- + drivers/staging/media/imx/imx-media.h | 5 +- + drivers/staging/media/imx/imx7-media-csi.c | 8 +- + drivers/video/hdmi.c | 275 +- + include/drm/amd_asic_type.h | 1 + + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/bridge/dw_mipi_dsi.h | 10 + + include/drm/drm_atomic.h | 22 + + include/drm/drm_atomic_helper.h | 4 - + include/drm/drm_atomic_state_helper.h | 3 + + include/drm/drm_auth.h | 11 +- + include/drm/drm_bridge.h | 114 + + include/drm/drm_client.h | 46 + + include/drm/drm_connector.h | 189 +- + include/drm/drm_crtc.h | 20 + + include/drm/drm_debugfs.h | 2 + + include/drm/drm_device.h | 4 + + include/drm/drm_displayid.h | 10 + + include/drm/drm_dp_helper.h | 49 +- + include/drm/drm_edid.h | 37 +- + include/drm/drm_fb_helper.h | 102 +- + include/drm/drm_fourcc.h | 50 +- + include/drm/drm_framebuffer.h | 3 + + include/drm/drm_gem.h | 5 - + include/drm/drm_gem_vram_helper.h | 153 + + include/drm/drm_hdcp.h | 31 +- + include/drm/drm_legacy.h | 12 +- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_modeset_helper_vtables.h | 61 +- + include/drm/drm_plane.h | 2 +- + include/drm/drm_print.h | 2 + + include/drm/drm_self_refresh_helper.h | 20 + + include/drm/drm_vram_mm_helper.h | 102 + + include/drm/gpu_scheduler.h | 8 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 10 + + include/drm/ttm/ttm_bo_driver.h | 15 +- + include/drm/ttm/ttm_execbuf_util.h | 3 +- + include/linux/dma-buf.h | 52 +- + include/linux/hdmi.h | 67 + + include/linux/host1x.h | 2 + + include/linux/mm.h | 19 +- + include/linux/reservation.h | 8 +- + include/uapi/drm/amdgpu_drm.h | 4 + + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 117 + + include/uapi/drm/i915_drm.h | 209 +- + include/uapi/drm/panfrost_drm.h | 24 + + include/uapi/drm/v3d_drm.h | 28 + + include/uapi/drm/vmwgfx_drm.h | 4 +- + include/uapi/linux/dma-buf.h | 3 + + include/uapi/linux/kfd_ioctl.h | 35 +- + include/uapi/linux/magic.h | 1 + + include/video/imx-ipu-v3.h | 56 +- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/as_dirty_helpers.c | 300 + + mm/memory.c | 145 +- + 1581 files changed, 476970 insertions(+), 34625 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/ingenic,lcd.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2587-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt + delete mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml + create mode 100644 Documentation/gpu/mcde.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_socbb.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx10.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v10_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_sdma_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c + rename drivers/gpu/drm/{i915/i915_gemfs.h => amd/amdgpu/nbio_v2_3.h} (52%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/nv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nv.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nvd.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.c => clk_mgr/dcn10/rv1_clk_mgr.c} (59%) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.h => clk_mgr/dcn10/rv2_clk_mgr.h} (82%) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_translate_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_translate_dcn20.h + rename drivers/gpu/drm/amd/display/dc/{dce/dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} (51%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h + create mode 100644 drivers/gpu/drm/amd/display/modules/vmid/vmid.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_5_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_5_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/discovery.h + rename drivers/gpu/drm/amd/include/ivsrcid/{ => dcn}/irqsrcs_dcn_1_0.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_10_1.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma0/irqsrcs_sdma0_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma1/irqsrcs_sdma1_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h + create mode 100644 drivers/gpu/drm/amd/include/navi10_enum.h + create mode 100644 drivers/gpu/drm/amd/include/navi10_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/v10_structs.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h + create mode 100644 drivers/gpu/drm/amd/powerplay/navi10_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/navi10_ppt.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_ttm.c + create mode 100644 drivers/gpu/drm/drm_client_modeset.c + create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c + create mode 100644 drivers/gpu/drm/drm_hdcp.c + create mode 100644 drivers/gpu/drm/drm_self_refresh_helper.c + create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c + create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/i915/Kconfig.profile + create mode 100644 drivers/gpu/drm/i915/display/Makefile + create mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test + rename drivers/gpu/drm/i915/{ => display}/dvo_ch7017.c (99%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ch7xxx.c (99%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ivch.c (99%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ns2501.c (99%) + rename drivers/gpu/drm/i915/{ => display}/dvo_sil164.c (99%) + rename drivers/gpu/drm/i915/{ => display}/dvo_tfp410.c (99%) + rename drivers/gpu/drm/i915/{ => display}/icl_dsi.c (89%) + rename drivers/gpu/drm/i915/{ => display}/intel_acpi.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_acpi.h + rename drivers/gpu/drm/i915/{ => display}/intel_atomic.c (93%) + create mode 100644 drivers/gpu/drm/i915/display/intel_atomic.h + rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.c (88%) + rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.h (77%) + rename drivers/gpu/drm/i915/{ => display}/intel_audio.c (95%) + rename drivers/gpu/drm/i915/{ => display}/intel_audio.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_bios.c (94%) + rename drivers/gpu/drm/i915/{ => display}/intel_bios.h (83%) + create mode 100644 drivers/gpu/drm/i915/display/intel_bw.c + create mode 100644 drivers/gpu/drm/i915/display/intel_bw.h + rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.c (91%) + rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_color.c (85%) + rename drivers/gpu/drm/i915/{ => display}/intel_color.h (87%) + rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.c (77%) + create mode 100644 drivers/gpu/drm/i915/display/intel_combo_phy.h + rename drivers/gpu/drm/i915/{ => display}/intel_connector.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_connector.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_crt.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_crt.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_ddi.c (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_ddi.h (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_display.c (93%) + rename drivers/gpu/drm/i915/{ => display}/intel_display.h (79%) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power.h + rename drivers/gpu/drm/i915/{ => display}/intel_dp.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp.h (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_aux_backlight.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h + rename drivers/gpu/drm/i915/{ => display}/intel_dp_link_training.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_link_training.h + rename drivers/gpu/drm/i915/{ => display}/intel_dp_mst.c (98%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_mst.h + rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.c (98%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dpio_phy.h + rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.h (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi.h (95%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi_dcs_backlight.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.h + rename drivers/gpu/drm/i915/{ => display}/intel_dsi_vbt.c (70%) + rename drivers/gpu/drm/i915/{ => display}/intel_dvo.c (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_dvo.h (100%) + rename drivers/gpu/drm/i915/{dvo.h => display/intel_dvo_dev.h} (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbc.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbc.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.c (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_fifo_underrun.h + rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.h (99%) + rename drivers/gpu/drm/i915/{intel_i2c.c => display/intel_gmbus.c} (91%) + create mode 100644 drivers/gpu/drm/i915/display/intel_gmbus.h + rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.h (94%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.c (95%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_hotplug.h + rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_lpe_audio.h + rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lvds.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_lvds.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_opregion.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_opregion.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_overlay.c (98%) + create mode 100644 drivers/gpu/drm/i915/display/intel_overlay.h + rename drivers/gpu/drm/i915/{ => display}/intel_panel.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_panel.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.h (84%) + rename drivers/gpu/drm/i915/{ => display}/intel_psr.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_psr.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_quirks.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_quirks.h + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo_regs.h (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sprite.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sprite.h (89%) + rename drivers/gpu/drm/i915/{ => display}/intel_tv.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_tv.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_vbt_defs.h (71%) + rename drivers/gpu/drm/i915/{ => display}/intel_vdsc.c (99%) + create mode 100644 drivers/gpu/drm/i915/display/intel_vdsc.h + rename drivers/gpu/drm/i915/{ => display}/vlv_dsi.c (90%) + rename drivers/gpu/drm/i915/{ => display}/vlv_dsi_pll.c (98%) + create mode 100644 drivers/gpu/drm/i915/gem/Makefile + create mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_busy.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c (74%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_clflush.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c (63%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h (69%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context_types.h (75%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c (83%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c (93%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_fence.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c (79%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ioctls.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_types.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_pages.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_phys.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_pm.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_pm.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shmem.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c (75%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c (92%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_throttle.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c (90%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c (94%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_wait.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c (51%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_gem_object.c (70%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/huge_gem_object.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_pages.c (93%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_coherency.c (83%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_context.c (80%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c (85%) + rename drivers/gpu/drm/i915/{selftests/i915_gem_object.c => gem/selftests/i915_gem_mman.c} (67%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_context.c (54%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_context.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c (73%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_gem_object.h (65%) + create mode 100644 drivers/gpu/drm/i915/gt/Makefile + create mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test + rename drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c (95%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.h + rename drivers/gpu/drm/i915/{ => gt}/intel_context_types.h (71%) + rename drivers/gpu/drm/i915/{intel_ringbuffer.h => gt/intel_engine.h} (90%) + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c (82%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h (94%) + rename drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h (99%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c (93%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.c (74%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.h (85%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h (97%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.c (98%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.h (97%) + rename drivers/gpu/drm/i915/{i915_reset.c => gt/intel_reset.c} (91%) + rename drivers/gpu/drm/i915/{i915_reset.h => gt/intel_reset.h} (91%) + rename drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c (90%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.h + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c (81%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h (79%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds_types.h (88%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.c (87%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.h (95%) + rename drivers/gpu/drm/i915/{selftests/intel_engine_cs.c => gt/selftest_engine_cs.c} (100%) + rename drivers/gpu/drm/i915/{selftests/intel_hangcheck.c => gt/selftest_hangcheck.c} (88%) + rename drivers/gpu/drm/i915/{selftests/intel_lrc.c => gt/selftest_lrc.c} (68%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_reset.c + rename drivers/gpu/drm/i915/{selftests/intel_workarounds.c => gt/selftest_workarounds.c} (62%) + create mode 100644 drivers/gpu/drm/i915/i915_debugfs.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_object.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_object.h + create mode 100644 drivers/gpu/drm/i915/i915_irq.h + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.c + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.h + delete mode 100644 drivers/gpu/drm/i915/intel_context.c + delete mode 100644 drivers/gpu/drm/i915/intel_context.h + create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.h + create mode 100644 drivers/gpu/drm/i915/intel_sideband.h + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.c + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.h + delete mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_atomic.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_context.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.h + create mode 100644 drivers/gpu/drm/ingenic/Kconfig + create mode 100644 drivers/gpu/drm/ingenic/Makefile + create mode 100644 drivers/gpu/drm/ingenic/ingenic-drm.c + create mode 100644 drivers/gpu/drm/mcde/Kconfig + create mode 100644 drivers/gpu/drm/mcde/Makefile + create mode 100644 drivers/gpu/drm/mcde/mcde_display.c + create mode 100644 drivers/gpu/drm/mcde/mcde_display_regs.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drm.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drv.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_perfcnt.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_perfcnt.h + create mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_fb.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace_points.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c + create mode 100644 drivers/gpu/ipu-v3/ipu-ic-csc.c + create mode 100644 include/drm/drm_gem_vram_helper.h + create mode 100644 include/drm/drm_self_refresh_helper.h + create mode 100644 include/drm/drm_vram_mm_helper.h + create mode 100644 mm/as_dirty_helpers.c +$ git am -3 ../patches/0001-dma-buf-convert-to-new-mount-api.patch +Applying: dma-buf: convert to new mount api +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/dma-buf/dma-buf.c +$ git add -A . +$ git commit -v -a --amend +[master 975b09c1746e] Merge remote-tracking branch 'drm/drm-next' + Date: Mon Jul 15 10:24:33 2019 +1000 +$ git am -3 ../patches/0001-merge-fixup-for-mm-Add-an-apply_to_pfn_range-interfa.patch +Applying: merge fixup for "mm: Add an apply_to_pfn_range interface" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/mm.h +M mm/as_dirty_helpers.c +$ git add -A . +$ git commit -v -a --amend +[master 847aed75df91] Merge remote-tracking branch 'drm/drm-next' + Date: Mon Jul 15 10:24:33 2019 +1000 +$ git am -3 ../patches/0001-another-fixup-for-mm-Add-an-apply_to_pfn_range-inter.patch +Applying: another fixup for "mm: Add an apply_to_pfn_range interface" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 92048b36a7fc] Merge remote-tracking branch 'drm/drm-next' + Date: Mon Jul 15 10:24:33 2019 +1000 +Merging amdgpu/drm-next (f445261d1564 drm/amd/display: dccg, dchub ref clock is not initialized for raven family) +$ git merge amdgpu/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 3 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 52 ++++- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +- + drivers/gpu/drm/amd/display/Kconfig | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 222 +++++++++++++++++++++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 25 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 41 ++-- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 36 ++++ + drivers/gpu/drm/amd/include/amd_shared.h | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 12 +- + 21 files changed, 429 insertions(+), 52 deletions(-) +Merging drm-intel/for-linux-next (a8120bc23eea drm/i915/uc: kill <g,h>uc_to_i915) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h +Removing drivers/gpu/drm/i915/i915_timeline.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Removing drivers/gpu/drm/i915/i915_gem_render_state.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/Makefile.header-test +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_workarounds.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_workarounds.c'. +[master 5ea63514f61a] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig.debug | 14 + + drivers/gpu/drm/i915/Makefile | 79 +- + drivers/gpu/drm/i915/Makefile.header-test | 7 +- + drivers/gpu/drm/i915/display/Makefile | 3 + + drivers/gpu/drm/i915/display/icl_dsi.c | 181 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 56 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 81 +- + drivers/gpu/drm/i915/display/intel_bios.c | 28 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 17 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 84 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 193 +- + drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 323 ++-- + drivers/gpu/drm/i915/display/intel_display.c | 1243 ++++++++----- + drivers/gpu/drm/i915/display/intel_display.h | 50 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 651 ++++++- + drivers/gpu/drm/i915/display/intel_display_power.h | 35 +- + drivers/gpu/drm/i915/display/intel_dp.c | 272 +-- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 8 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 646 +++++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 12 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 20 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 36 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 306 +-- + drivers/gpu/drm/i915/display/intel_sprite.c | 332 +++- + drivers/gpu/drm/i915/display/intel_tc.c | 537 ++++++ + drivers/gpu/drm/i915/display/intel_tc.h | 35 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 14 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- + drivers/gpu/drm/i915/gem/Makefile | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 38 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 6 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 97 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 43 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 7 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 11 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 69 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 26 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 9 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 81 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 59 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 15 +- + drivers/gpu/drm/i915/gt/Makefile | 3 + + .../gen6_renderstate.c} | 0 + .../gen7_renderstate.c} | 0 + .../gen8_renderstate.c} | 0 + .../gen9_renderstate.c} | 0 + drivers/gpu/drm/i915/gt/intel_context.c | 100 +- + drivers/gpu/drm/i915/gt/intel_context.h | 14 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 5 + + drivers/gpu/drm/i915/gt/intel_engine.h | 75 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 138 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 31 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 18 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 85 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 7 + + drivers/gpu/drm/i915/gt/intel_gt.c | 250 +++ + drivers/gpu/drm/i915/gt/intel_gt.h | 60 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 71 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 96 + + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 71 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 949 +++++----- + drivers/gpu/drm/i915/gt/intel_mocs.c | 57 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 3 +- + .../intel_renderstate.c} | 11 +- + drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 610 +++--- + 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 | 125 +- + .../i915/{i915_timeline.c => gt/intel_timeline.c} | 230 +-- + drivers/gpu/drm/i915/gt/intel_timeline.h | 93 + + .../intel_timeline_types.h} | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 66 +- + 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 | 14 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 513 +++-- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 382 +++- + drivers/gpu/drm/i915/gt/selftest_reset.c | 134 +- + .../i915_timeline.c => gt/selftest_timeline.c} | 131 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 160 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.c | 8 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.h | 6 +- + drivers/gpu/drm/i915/gt/uc/Makefile | 5 + + drivers/gpu/drm/i915/gt/uc/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c | 144 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 24 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c | 29 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c | 22 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h | 11 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.c | 112 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 11 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 19 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h | 1 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h | 38 +- + .../drm/i915/{ => gt/uc}/intel_guc_submission.c | 494 +---- + .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 2 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 32 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h | 6 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.c | 12 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.c | 332 ++-- + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h | 39 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h | 32 +- + .../intel_guc.c => gt/uc/selftest_guc.c} | 45 +- + drivers/gpu/drm/i915/gvt/gtt.h | 13 +- + drivers/gpu/drm/i915/i915_active.c | 283 +-- + drivers/gpu/drm/i915/i915_active.h | 25 +- + drivers/gpu/drm/i915/i915_active_types.h | 10 +- + drivers/gpu/drm/i915/i915_debugfs.c | 169 +- + drivers/gpu/drm/i915/i915_drv.c | 173 +- + drivers/gpu/drm/i915/i915_drv.h | 227 +-- + drivers/gpu/drm/i915/i915_fixed.h | 5 + + drivers/gpu/drm/i915/i915_gem.c | 304 ++- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 42 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 32 + + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 3 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 1952 +++++++++----------- + drivers/gpu/drm/i915/i915_gem_gtt.h | 107 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 31 - + drivers/gpu/drm/i915/i915_globals.h | 2 + + drivers/gpu/drm/i915/i915_gpu_error.c | 37 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 54 +- + drivers/gpu/drm/i915/i915_irq.c | 786 ++++---- + drivers/gpu/drm/i915/i915_irq.h | 45 +- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 39 +- + drivers/gpu/drm/i915/i915_perf.c | 85 +- + drivers/gpu/drm/i915/i915_pmu.c | 4 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 10 + + drivers/gpu/drm/i915/i915_pvinfo.h | 7 +- + drivers/gpu/drm/i915/i915_reg.h | 216 ++- + drivers/gpu/drm/i915/i915_request.c | 126 +- + drivers/gpu/drm/i915/i915_request.h | 24 +- + drivers/gpu/drm/i915/i915_scheduler.c | 4 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 27 +- + drivers/gpu/drm/i915/i915_timeline.h | 94 - + drivers/gpu/drm/i915/i915_trace.h | 88 +- + drivers/gpu/drm/i915/i915_utils.h | 12 + + drivers/gpu/drm/i915/i915_vgpu.c | 63 +- + drivers/gpu/drm/i915/i915_vgpu.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 71 +- + drivers/gpu/drm/i915/intel_device_info.c | 40 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 + + drivers/gpu/drm/i915/intel_drv.h | 26 +- + drivers/gpu/drm/i915/intel_gvt.c | 7 +- + drivers/gpu/drm/i915/intel_gvt.h | 7 +- + drivers/gpu/drm/i915/intel_pm.c | 437 +++-- + drivers/gpu/drm/i915/intel_pm.h | 4 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 12 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 465 +++-- + drivers/gpu/drm/i915/intel_uncore.h | 24 +- + drivers/gpu/drm/i915/intel_wakeref.c | 9 +- + drivers/gpu/drm/i915/intel_wakeref.h | 26 +- + drivers/gpu/drm/i915/intel_wopcm.c | 38 +- + drivers/gpu/drm/i915/intel_wopcm.h | 4 +- + drivers/gpu/drm/i915/oa/Makefile | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 124 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 43 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 65 +- + 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 | 8 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 + + drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 18 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 + + drivers/gpu/drm/i915/selftests/mock_uncore.c | 4 +- + include/drm/i915_component.h | 2 +- + include/drm/i915_drm.h | 13 +- + include/drm/i915_pciids.h | 13 +- + include/uapi/drm/i915_drm.h | 1 + + 234 files changed, 10759 insertions(+), 8029 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.h + 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_gt.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.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} (95%) + 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} (69%) + 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} (92%) + rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile + create mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile.header-test + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c (78%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h (92%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c (93%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c (97%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h (93%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.c (74%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (98%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (96%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h (98%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h (87%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.c (68%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.h (98%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c (86%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h (92%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.c (95%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.c (57%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h (60%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.c (99%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h (81%) + rename drivers/gpu/drm/i915/{selftests/intel_guc.c => gt/uc/selftest_guc.c} (86%) + delete mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h + delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h + create mode 100644 drivers/gpu/drm/i915/oa/Makefile + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h (74%) + delete mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h +Merging drm-tegra/drm/tegra/for-next (eb7cf945a8da host1x: debugfs_create_dir() can never return NULL) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (7f3bbc0b817b drm/modes: Skip invalid cmdline mode) +$ git merge drm-misc/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 63 ---------- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 18 +-- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 15 ++- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 84 +------------ + .../drm/arm/display/komeda/komeda_wb_connector.c | 10 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_hw.c | 14 ++- + drivers/gpu/drm/bochs/bochs_kms.c | 3 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_connector.c | 2 +- + drivers/gpu/drm/drm_modes.c | 14 ++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++ + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 136 ++++++++------------- + include/drm/drm_modes.h | 2 +- + 16 files changed, 109 insertions(+), 276 deletions(-) +Merging drm-msm/msm-next (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b 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 (4cf643a39221 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 (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (57bdd4057516 drm/etnaviv: Use devm_platform_ioremap_resource()) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++++++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 9 ++++----- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 7 +++++-- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 5 +++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +++--- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 5 +++-- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 ++ + 10 files changed, 36 insertions(+), 12 deletions(-) +Merging regmap/for-next (aaccf3863ce2 Merge branch 'regmap-5.3' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (b89b889a326a Merge branch 'topic/hda-refresh-cleanup' into for-next) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (f82b1d01dead Merge branch 'asoc-5.3' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/sound/simple_card_utils.h | 4 ++++ + sound/soc/codecs/max98357a.c | 25 ++++--------------------- + sound/soc/codecs/pcm3060-i2c.c | 4 ++-- + sound/soc/codecs/pcm3060-spi.c | 4 ++-- + sound/soc/codecs/pcm3060.c | 4 ++-- + sound/soc/codecs/pcm3060.h | 2 +- + sound/soc/codecs/rt1011.c | 4 ++-- + sound/soc/codecs/rt1308.c | 0 + sound/soc/codecs/rt1308.h | 0 + sound/soc/generic/audio-graph-card.c | 30 ++++++++++++++++-------------- + sound/soc/generic/simple-card-utils.c | 7 +++++++ + sound/soc/generic/simple-card.c | 26 +++++++++++++------------- + 13 files changed, 54 insertions(+), 58 deletions(-) + mode change 100755 => 100644 sound/soc/codecs/rt1308.c + mode change 100755 => 100644 sound/soc/codecs/rt1308.h +Merging modules/modules-next (93651f80dcb6 modules: fix compile error if don't have strict module rwx) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging arch/arm/kernel/module.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/module.c | 7 ++++++ + include/linux/moduleloader.h | 5 ++++ + kernel/module.c | 60 ++++++++++++++++++++++++++++++-------------- + 3 files changed, 53 insertions(+), 19 deletions(-) +Merging input/next (e2c063c89700 Input: auo-pixcir-ts - switch to using devm_add_action_or_reset()) +$ git merge input/next +Auto-merging drivers/input/touchscreen/auo-pixcir-ts.c +Auto-merging drivers/input/mouse/synaptics.c +Auto-merging drivers/input/keyboard/sun4i-lradc-keys.c +Auto-merging drivers/input/keyboard/mtk-pmic-keys.c +Merge made by the 'recursive' strategy. + drivers/input/keyboard/mtk-pmic-keys.c | 9 +++++++-- + drivers/input/keyboard/sun4i-lradc-keys.c | 3 +++ + drivers/input/mouse/synaptics.c | 1 + + drivers/input/tablet/gtco.c | 20 +++++++++++++++++--- + drivers/input/touchscreen/auo-pixcir-ts.c | 3 +-- + 5 files changed, 29 insertions(+), 7 deletions(-) +Merging block/for-next (5b9ddbdf2f36 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Auto-merging include/linux/cgroup.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/nvme/host/fc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 2 +- + Documentation/block/biodoc.txt | 5 -- + MAINTAINERS | 13 ++++ + block/bio-integrity.c | 8 ++- + block/bio.c | 28 ++++++++- + block/blk-cgroup.c | 66 +++++++++++++++++-- + block/blk-core.c | 6 +- + block/blk-mq.c | 2 +- + block/blk-mq.h | 32 ++++++++++ + block/blk-throttle.c | 9 +-- + block/blk-zoned.c | 69 +++++++++++--------- + drivers/block/nbd.c | 59 +++++++++++++---- + drivers/block/null_blk.h | 5 +- + drivers/block/null_blk_zoned.c | 3 +- + drivers/md/dm-flakey.c | 5 +- + drivers/md/dm-linear.c | 5 +- + drivers/md/dm-zoned-metadata.c | 16 +++-- + drivers/md/dm.c | 6 +- + drivers/nvme/host/core.c | 43 +++++++++++-- + drivers/nvme/host/fc.c | 51 ++++++++++++++- + drivers/nvme/host/multipath.c | 18 ++++-- + drivers/nvme/host/nvme.h | 1 + + drivers/nvme/host/pci.c | 26 +++++--- + drivers/nvme/host/tcp.c | 9 ++- + drivers/nvme/host/trace.c | 28 ++++++++- + drivers/nvme/target/admin-cmd.c | 3 + + drivers/nvme/target/configfs.c | 4 +- + drivers/nvme/target/fcloop.c | 44 ++++++------- + drivers/nvme/target/io-cmd-bdev.c | 39 ++++++++++++ + drivers/nvme/target/nvmet.h | 8 +++ + drivers/nvme/target/trace.c | 2 +- + drivers/scsi/sd.h | 3 +- + drivers/scsi/sd_zbc.c | 108 ++++++++++++++++++++++---------- + fs/btrfs/extent_io.c | 4 +- + fs/buffer.c | 2 +- + fs/ext4/page-io.c | 2 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/super.c | 4 +- + fs/fs-writeback.c | 13 ++-- + fs/mpage.c | 2 +- + include/linux/backing-dev.h | 1 + + include/linux/blk-cgroup.h | 16 ++++- + include/linux/blk_types.h | 10 +++ + include/linux/blkdev.h | 14 +++-- + include/linux/cgroup.h | 1 + + include/linux/device-mapper.h | 3 +- + include/linux/elevator.h | 11 +--- + include/linux/nvme.h | 12 +++- + include/linux/writeback.h | 41 +++++++++--- + 49 files changed, 658 insertions(+), 208 deletions(-) +$ git am -3 ../patches/0001-xfs-fix-up-for-wbc_account_io-rename.patch +Applying: xfs: fix up for wbc_account_io rename +$ git reset HEAD^ +Unstaged changes after reset: +M fs/xfs/xfs_aops.c +$ git add -A . +$ git commit -v -a --amend +[master c0ce95eea2e8] Merge remote-tracking branch 'block/for-next' + Date: Mon Jul 15 11:07:06 2019 +1000 +$ git am -3 ../patches/0001-f2fs-fix-for-wbc_account_io-rename.patch +Applying: f2fs: fix for wbc_account_io rename +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +[master e020826292b4] Merge remote-tracking branch 'block/for-next' + Date: Mon Jul 15 11:07:06 2019 +1000 +Merging device-mapper/for-next (bd293d071ffe dm bufio: fix deadlock with loop device) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (59592cc1f593 mmc: sdhci_am654: Add dependency on MMC_SDHCI_AM654) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e350 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 +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97022ba66382] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (7efd105c27fd mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/rk808.h +Auto-merging include/linux/mfd/madera/pdata.h +Auto-merging include/linux/mfd/lp87565.h +Auto-merging include/linux/mfd/cros_ec.h +Auto-merging drivers/rtc/rtc-rk808.c +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/regulator/rk808-regulator.c +Auto-merging drivers/regulator/lp87565-regulator.c +Auto-merging drivers/regulator/bd718x7-regulator.c +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/mfd/rk808.c +Auto-merging drivers/mfd/mfd-core.c +Auto-merging drivers/mfd/menelaus.c +Auto-merging drivers/mfd/madera.h +Auto-merging drivers/mfd/lp87565.c +Auto-merging drivers/mfd/intel-lpss.c +Auto-merging drivers/mfd/intel-lpss-pci.c +Auto-merging drivers/mfd/hi655x-pmic.c +Auto-merging drivers/mfd/cs5535-mfd.c +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging drivers/mfd/arizona-core.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/gpio/Makefile +CONFLICT (content): Merge conflict in drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/clk/clk-rk808.c +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpio/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5defe0823aa5] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/cros-ec.txt | 5 +- + Documentation/devicetree/bindings/mfd/lp87565.txt | 36 + + Documentation/devicetree/bindings/mfd/madera.txt | 8 +- + Documentation/devicetree/bindings/mfd/rk808.txt | 44 + + .../devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 102 + + .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 10 + + MAINTAINERS | 2 +- + drivers/clk/Kconfig | 15 +- + drivers/clk/clk-bd718x7.c | 24 +- + drivers/clk/clk-rk808.c | 64 +- + drivers/gpio/Kconfig | 11 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd70528.c | 232 +++ + drivers/mfd/Kconfig | 37 +- + drivers/mfd/Makefile | 8 + + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/cros_ec_dev.c | 92 +- + drivers/mfd/cs47l15-tables.c | 1299 +++++++++++++ + drivers/mfd/cs47l35-tables.c | 60 +- + drivers/mfd/cs47l85-tables.c | 128 +- + drivers/mfd/cs47l90-tables.c | 82 +- + drivers/mfd/cs47l92-tables.c | 1947 ++++++++++++++++++++ + drivers/mfd/cs5535-mfd.c | 24 +- + drivers/mfd/hi655x-pmic.c | 2 + + drivers/mfd/intel-lpss-pci.c | 21 +- + drivers/mfd/intel-lpss.c | 1 + + drivers/mfd/lp87565.c | 4 + + drivers/mfd/madera-core.c | 129 +- + drivers/mfd/madera-i2c.c | 24 +- + drivers/mfd/madera-spi.c | 24 +- + drivers/mfd/madera.h | 13 + + drivers/mfd/menelaus.c | 2 - + drivers/mfd/mfd-core.c | 1 + + drivers/mfd/rk808.c | 257 ++- + drivers/mfd/rohm-bd70528.c | 316 ++++ + drivers/mfd/rohm-bd718x7.c | 80 +- + drivers/power/supply/Kconfig | 9 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/bd70528-charger.c | 743 ++++++++ + drivers/regulator/Kconfig | 4 +- + drivers/regulator/bd718x7-regulator.c | 25 +- + drivers/regulator/lp87565-regulator.c | 18 +- + drivers/regulator/rk808-regulator.c | 646 ++++++- + drivers/rtc/Kconfig | 12 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-bd70528.c | 500 +++++ + drivers/rtc/rtc-rk808.c | 68 +- + include/linux/mfd/cros_ec.h | 1 + + include/linux/mfd/lp87565.h | 2 + + include/linux/mfd/madera/core.h | 12 +- + include/linux/mfd/madera/pdata.h | 9 +- + include/linux/mfd/madera/registers.h | 286 ++- + include/linux/mfd/rk808.h | 177 ++ + include/linux/mfd/rohm-bd70528.h | 408 ++++ + include/linux/mfd/rohm-bd718x7.h | 22 +- + include/linux/mfd/rohm-generic.h | 20 + + include/linux/mfd/stmfx.h | 2 +- + 57 files changed, 7524 insertions(+), 549 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt + create mode 100644 drivers/gpio/gpio-bd70528.c + create mode 100644 drivers/mfd/cs47l15-tables.c + create mode 100644 drivers/mfd/cs47l92-tables.c + create mode 100644 drivers/mfd/rohm-bd70528.c + create mode 100644 drivers/power/supply/bd70528-charger.c + create mode 100644 drivers/rtc/rtc-bd70528.c + create mode 100644 include/linux/mfd/rohm-bd70528.h + create mode 100644 include/linux/mfd/rohm-generic.h +Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/pwm_bl.c +CONFLICT (content): Merge conflict in drivers/video/backlight/pwm_bl.c +Auto-merging drivers/video/backlight/gpio_backlight.c +Resolved 'drivers/video/backlight/pwm_bl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 07f870e1b4c4] Merge remote-tracking branch 'backlight/for-backlight-next' +$ git diff -M --stat --summary HEAD^.. + drivers/video/backlight/gpio_backlight.c | 23 +++++++++-------------- + drivers/video/backlight/pwm_bl.c | 32 +++++++++----------------------- + 2 files changed, 18 insertions(+), 37 deletions(-) +Merging battery/for-next (caa2b557841c power: reset: nvmem-reboot-mode: add CONFIG_OF dependency) +$ git merge battery/for-next +Auto-merging include/linux/power_supply.h +Auto-merging drivers/power/supply/sbs-manager.c +Auto-merging drivers/power/supply/rt9455_charger.c +Auto-merging drivers/power/supply/rt5033_battery.c +Auto-merging drivers/power/supply/power_supply_sysfs.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/power/supply/max14656_charger_detector.c +Auto-merging drivers/power/supply/bq25890_charger.c +Auto-merging drivers/power/supply/bq24257_charger.c +Auto-merging drivers/power/supply/bq24190_charger.c +Auto-merging drivers/power/supply/Makefile +CONFLICT (content): Merge conflict in drivers/power/supply/Makefile +Auto-merging drivers/power/supply/Kconfig +CONFLICT (content): Merge conflict in drivers/power/supply/Kconfig +Auto-merging drivers/power/reset/Kconfig +CONFLICT (modify/delete): Documentation/power/power_supply_class.txt deleted in HEAD and modified in battery/for-next. Version battery/for-next of Documentation/power/power_supply_class.txt left in tree. +Resolved 'drivers/power/supply/Kconfig' using previous resolution. +Resolved 'drivers/power/supply/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/power/power_supply_class.txt +Documentation/power/power_supply_class.txt: needs merge +rm 'Documentation/power/power_supply_class.txt' +$ git commit -v -a +[master 2d23ee9899d1] Merge remote-tracking branch 'battery/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-power | 32 ++ + Documentation/ABI/testing/sysfs-class-power-wilco | 30 ++ + .../bindings/power/reset/nvmem-reboot-mode.txt | 26 ++ + .../devicetree/bindings/power/reset/qcom,pon.txt | 1 + + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/nvmem-reboot-mode.c | 76 +++++ + drivers/power/reset/qcom-pon.c | 12 +- + drivers/power/supply/Kconfig | 23 ++ + drivers/power/supply/Makefile | 2 + + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 116 +++++++ + drivers/power/supply/max14656_charger_detector.c | 2 +- + drivers/power/supply/max17040_battery.c | 2 +- + drivers/power/supply/max17042_battery.c | 2 +- + drivers/power/supply/power_supply_core.c | 7 + + drivers/power/supply/power_supply_hwmon.c | 355 +++++++++++++++++++++ + drivers/power/supply/power_supply_sysfs.c | 2 + + drivers/power/supply/rt5033_battery.c | 2 +- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/sbs-manager.c | 2 +- + drivers/power/supply/ucs1002_power.c | 2 +- + drivers/power/supply/wilco-charger.c | 187 +++++++++++ + include/linux/power_supply.h | 15 + + 26 files changed, 902 insertions(+), 13 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-wilco + create mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt + create mode 100644 drivers/power/reset/nvmem-reboot-mode.c + create mode 100644 drivers/power/supply/power_supply_hwmon.c + create mode 100644 drivers/power/supply/wilco-charger.c +$ git am -3 ../patches/0001-power-supply-update-for-conversion-to-.rst.patch +Applying: power: supply: update for conversion to .rst +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/power/power_supply_class.rst +$ git add -A . +$ git commit -v -a --amend +[master e3d50383e73c] Merge remote-tracking branch 'battery/for-next' + Date: Mon Jul 15 11:19:47 2019 +1000 +Merging regulator/for-next (097ba891307c Merge branch 'regulator-5.3' into regulator-next) +$ git merge regulator/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging security/next-testing (286e47a07799 Merge branch 'next-lsm' into next-testing) +$ git merge security/next-testing +Auto-merging security/tomoyo/Kconfig +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (136db994852a 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 +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 (650b29dbdf2c integrity: Introduce struct evm_xattr) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (20adf5593389 Merge tag 'keys-acl-20190703' into keys-next) +$ git merge keys/keys-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging selinux/next (ea74a685ad81 selinux: format all invalid context as untrusted) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (166a2809d65b tpm: Don't duplicate events from the final event log in the TCG2 log) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (053bc5764bb0 watchdog: ie6xx_wdt: Use spinlock_t instead of struct spinlock) +$ git merge watchdog/master +Auto-merging drivers/watchdog/mei_wdt.c +Auto-merging drivers/watchdog/bcm_kona_wdt.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/watchdog/wdt.rst +Auto-merging Documentation/watchdog/watchdog-pm.rst +Auto-merging Documentation/watchdog/watchdog-parameters.rst +CONFLICT (add/add): Merge conflict in Documentation/watchdog/watchdog-parameters.rst +Auto-merging Documentation/watchdog/watchdog-kernel-api.rst +Auto-merging Documentation/watchdog/watchdog-api.rst +Auto-merging Documentation/watchdog/pcwd-watchdog.rst +Auto-merging Documentation/watchdog/mlx-wdt.rst +Auto-merging Documentation/watchdog/hpwdt.rst +CONFLICT (content): Merge conflict in Documentation/watchdog/hpwdt.rst +Auto-merging Documentation/watchdog/convert_drivers_to_kernel_api.rst +Removing Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt' using previous resolution. +Resolved 'Documentation/watchdog/hpwdt.rst' using previous resolution. +Resolved 'Documentation/watchdog/watchdog-parameters.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7b9b968e0608] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 15 +++ + .../bindings/watchdog/fsl-imx-sc-wdt.txt | 24 ---- + .../watchdog/{renesas-wdt.txt => renesas,wdt.txt} | 0 + Documentation/watchdog/hpwdt.rst | 6 +- + Documentation/watchdog/watchdog-parameters.rst | 11 ++ + drivers/watchdog/Kconfig | 10 ++ + drivers/watchdog/acquirewdt.c | 6 +- + drivers/watchdog/advantechwdt.c | 6 +- + drivers/watchdog/aspeed_wdt.c | 8 +- + drivers/watchdog/bcm2835_wdt.c | 5 +- + drivers/watchdog/bcm7038_wdt.c | 4 +- + drivers/watchdog/bcm_kona_wdt.c | 4 +- + drivers/watchdog/cadence_wdt.c | 4 +- + drivers/watchdog/da9052_wdt.c | 9 +- + drivers/watchdog/da9062_wdt.c | 5 +- + drivers/watchdog/davinci_wdt.c | 14 +-- + drivers/watchdog/digicolor_wdt.c | 8 +- + drivers/watchdog/ebc-c384_wdt.c | 9 -- + drivers/watchdog/eurotechwdt.c | 6 +- + drivers/watchdog/ftwdt010_wdt.c | 4 +- + drivers/watchdog/gpio_wdt.c | 7 ++ + drivers/watchdog/hpwdt.c | 59 +++++++--- + drivers/watchdog/i6300esb.c | 5 +- + drivers/watchdog/iTCO_vendor_support.c | 7 +- + drivers/watchdog/iTCO_wdt.c | 6 +- + drivers/watchdog/ib700wdt.c | 6 +- + drivers/watchdog/ie6xx_wdt.c | 8 +- + drivers/watchdog/imx2_wdt.c | 4 +- + drivers/watchdog/imx_sc_wdt.c | 123 +++++++++++++++++---- + drivers/watchdog/intel-mid_wdt.c | 4 +- + drivers/watchdog/jz4740_wdt.c | 57 +++++----- + drivers/watchdog/loongson1_wdt.c | 4 +- + drivers/watchdog/max77620_wdt.c | 8 +- + drivers/watchdog/mei_wdt.c | 4 +- + drivers/watchdog/mena21_wdt.c | 4 +- + drivers/watchdog/menf21bmc_wdt.c | 4 +- + drivers/watchdog/mpc8xxx_wdt.c | 5 +- + drivers/watchdog/mv64x60_wdt.c | 6 +- + drivers/watchdog/ni903x_wdt.c | 4 +- + drivers/watchdog/nic7018_wdt.c | 1 - + drivers/watchdog/npcm_wdt.c | 4 +- + drivers/watchdog/nv_tco.h | 6 +- + drivers/watchdog/octeon-wdt-main.c | 11 +- + drivers/watchdog/of_xilinx_wdt.c | 4 +- + drivers/watchdog/omap_wdt.c | 6 +- + drivers/watchdog/omap_wdt.h | 21 +--- + drivers/watchdog/pc87413_wdt.c | 6 +- + drivers/watchdog/pcwd_pci.c | 6 +- + drivers/watchdog/pcwd_usb.c | 6 +- + drivers/watchdog/pic32-dmt.c | 4 +- + drivers/watchdog/pic32-wdt.c | 4 +- + drivers/watchdog/pnx4008_wdt.c | 9 +- + drivers/watchdog/qcom-wdt.c | 4 +- + drivers/watchdog/rave-sp-wdt.c | 1 - + drivers/watchdog/renesas_wdt.c | 35 ++++-- + drivers/watchdog/retu_wdt.c | 10 +- + drivers/watchdog/s3c2410_wdt.c | 4 +- + drivers/watchdog/sa1100_wdt.c | 6 +- + drivers/watchdog/sama5d4_wdt.c | 29 +++-- + drivers/watchdog/sbc7240_wdt.c | 11 +- + drivers/watchdog/sbc8360.c | 6 +- + drivers/watchdog/sch311x_wdt.c | 6 +- + drivers/watchdog/softdog.c | 6 +- + drivers/watchdog/sp5100_tco.c | 4 +- + drivers/watchdog/sp805_wdt.c | 5 +- + drivers/watchdog/sprd_wdt.c | 1 - + drivers/watchdog/st_lpc_wdt.c | 4 +- + drivers/watchdog/stm32_iwdg.c | 4 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 4 +- + drivers/watchdog/tegra_wdt.c | 4 +- + drivers/watchdog/ts4800_wdt.c | 4 +- + drivers/watchdog/w83627hf_wdt.c | 6 +- + drivers/watchdog/wafer5823wdt.c | 6 +- + drivers/watchdog/watchdog_core.c | 22 ++-- + drivers/watchdog/watchdog_core.h | 6 +- + drivers/watchdog/watchdog_dev.c | 54 +++++++-- + drivers/watchdog/wd501p.h | 6 +- + drivers/watchdog/wdt.c | 6 +- + drivers/watchdog/wdt_pci.c | 6 +- + drivers/watchdog/wm831x_wdt.c | 9 +- + drivers/watchdog/xen_wdt.c | 4 +- + 81 files changed, 391 insertions(+), 453 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt + rename Documentation/devicetree/bindings/watchdog/{renesas-wdt.txt => renesas,wdt.txt} (100%) +Merging iommu/next (d95c3885865b Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/mdev/mdev_core.c | 9 +++++++ + drivers/vfio/pci/vfio_pci_nvlink2.c | 3 +-- + samples/vfio-mdev/mbochs.c | 3 --- + samples/vfio-mdev/mtty.c | 47 +++++++++++++++++++------------------ + 4 files changed, 34 insertions(+), 28 deletions(-) +Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (f59d261180f3 dt-bindings: vendor-prefixes: add Sipeed) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request) +$ git merge mailbox/mailbox-for-next +Auto-merging drivers/mailbox/bcm-flexrm-mailbox.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/omap-mailbox.txt | 59 ++++++++++++++++++---- + drivers/mailbox/Kconfig | 2 +- + drivers/mailbox/arm_mhu.c | 11 ++-- + drivers/mailbox/bcm-flexrm-mailbox.c | 6 +-- + drivers/mailbox/imx-mailbox.c | 4 +- + drivers/mailbox/mailbox.c | 6 ++- + drivers/mailbox/omap-mailbox.c | 43 +++++++++------- + drivers/mailbox/stm32-ipcc.c | 37 ++++++++++---- + drivers/mailbox/tegra-hsp.c | 20 ++++++-- + include/linux/omap-mailbox.h | 4 +- + 10 files changed, 134 insertions(+), 58 deletions(-) +Merging spi/for-next (2e77a18d0464 Merge branch 'spi-5.3' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-controller.yaml | 1 - + drivers/spi/spi-fsl-qspi.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging tip/auto-latest (162b65ddbf2f Merge branch 'x86/debug') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + include/linux/compiler.h | 5 +++++ + kernel/bpf/core.c | 3 +-- + tools/objtool/check.c | 27 ++++++++++++++++++++------- + 3 files changed, 26 insertions(+), 9 deletions(-) +Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac-amd/for-next (b2572772d13e EDAC: Make edac_debugfs_create_x*() return void) +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_module.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a44edec04f03] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (730a95953b1f tracing/kprobe: Check registered state using kprobe) +$ git merge ftrace/for-next +Auto-merging tools/perf/util/probe-finder.c +Auto-merging tools/perf/util/probe-file.c +Auto-merging tools/perf/util/probe-event.c +Auto-merging mm/maccess.c +Auto-merging kernel/tracepoint.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/kprobes.c +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging arch/Kconfig +Auto-merging Documentation/trace/uprobetracer.rst +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 + + Documentation/trace/kprobetrace.rst | 42 ++- + Documentation/trace/uprobetracer.rst | 10 +- + arch/Kconfig | 16 - + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/ftrace.c | 6 +- + include/linux/ftrace.h | 4 +- + include/linux/uaccess.h | 20 +- + kernel/kprobes.c | 3 +- + kernel/trace/Kconfig | 12 +- + kernel/trace/ftrace.c | 48 +-- + kernel/trace/ring_buffer.c | 17 +- + kernel/trace/trace.c | 9 +- + kernel/trace/trace_events.c | 2 +- + kernel/trace/trace_kprobe.c | 357 ++++++++++++--------- + kernel/trace/trace_probe.c | 142 +++++++- + kernel/trace/trace_probe.h | 77 ++++- + kernel/trace/trace_probe_tmpl.h | 36 ++- + kernel/trace/trace_uprobe.c | 180 ++++------- + kernel/tracepoint.c | 4 +- + mm/maccess.c | 122 ++++++- + tools/perf/Documentation/perf-probe.txt | 3 +- + tools/perf/util/probe-event.c | 11 + + tools/perf/util/probe-event.h | 2 + + tools/perf/util/probe-file.c | 7 + + tools/perf/util/probe-file.h | 1 + + tools/perf/util/probe-finder.c | 19 +- + .../ftrace/test.d/kprobe/kprobe_args_user.tc | 32 ++ + 28 files changed, 810 insertions(+), 389 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (a45ff5994c9c Merge tag 'kvm-arm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (1e0cf16cdad1 KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/emulate_loadstore.c +Auto-merging arch/powerpc/kvm/emulate.c +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/emulate.c | 1 + + arch/powerpc/kvm/emulate_loadstore.c | 6 ------ + 2 files changed, 1 insertion(+), 6 deletions(-) +Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390) +$ git merge kvms390/next +Auto-merging tools/testing/selftests/kvm/lib/x86_64/processor.c +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/lib/aarch64/processor.c +Auto-merging tools/testing/selftests/kvm/kvm_create_max_vcpus.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile +Auto-merging MAINTAINERS +Resolved 'tools/testing/selftests/kvm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2be2997ece4f] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + tools/testing/selftests/kvm/Makefile | 14 +- + tools/testing/selftests/kvm/include/kvm_util.h | 8 + + .../selftests/kvm/include/s390x/processor.h | 22 ++ + .../kvm/{x86_64 => }/kvm_create_max_vcpus.c | 2 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 23 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 286 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 151 +++++++++++ + 10 files changed, 502 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/s390x/processor.h + rename tools/testing/selftests/kvm/{x86_64 => }/kvm_create_max_vcpus.c (95%) + create mode 100644 tools/testing/selftests/kvm/lib/s390x/processor.c + create mode 100644 tools/testing/selftests/kvm/s390x/sync_regs_test.c +Merging xen-tip/linux-next (3cd270089485 Revert "x86/paravirt: Set up the virt_spin_lock_key after static keys get initialized") +$ git merge xen-tip/linux-next +Auto-merging arch/x86/kernel/smpboot.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/smpboot.c | 3 +-- + arch/x86/xen/spinlock.c | 6 ++---- + drivers/xen/events/events_base.c | 12 ++++++++++-- + drivers/xen/evtchn.c | 2 +- + include/xen/events.h | 3 ++- + 5 files changed, 16 insertions(+), 10 deletions(-) +Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Auto-merging fs/io_uring.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 3 ++- + fs/io_uring.c | 3 ++- + include/linux/percpu-refcount.h | 10 +++++++++- + lib/percpu-refcount.c | 13 +++++++++++-- + 4 files changed, 24 insertions(+), 5 deletions(-) +Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (7d67c8ac25fb platform/x86: Fix PCENGINES_APU2 Kconfig warning) +$ git merge drivers-x86/for-next +Auto-merging include/linux/wmi.h +Auto-merging include/linux/mod_devicetable.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/power/supply/olpc_battery.c +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/platform/x86/wmi-bmof.c +Auto-merging drivers/platform/x86/touchscreen_dmi.c +Auto-merging drivers/platform/x86/samsung-laptop.c +Auto-merging drivers/platform/x86/pmc_atom.c +Auto-merging drivers/platform/x86/mlx-platform.c +Auto-merging drivers/platform/x86/ideapad-laptop.c +Auto-merging drivers/platform/x86/hp_accel.c +Auto-merging drivers/platform/x86/dell-wmi.c +Auto-merging drivers/platform/x86/dell-wmi-descriptor.c +Auto-merging drivers/platform/x86/dell-smbios-wmi.c +Auto-merging drivers/platform/x86/dell-laptop.c +Auto-merging drivers/platform/x86/asus-wmi.h +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/asus-nb-wmi.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/olpc/olpc-ec.c +Auto-merging drivers/platform/olpc/Makefile +Auto-merging drivers/platform/Kconfig +Auto-merging drivers/hid/hid-asus.c +Auto-merging arch/x86/platform/olpc/olpc_dt.c +Auto-merging arch/x86/platform/olpc/olpc.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/stable/sysfs-driver-mlxreg-io +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 20 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 10 + + .../devicetree/bindings/misc/olpc,xo1.75-ec.txt | 23 + + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 8 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/olpc.h | 31 - + arch/x86/platform/olpc/olpc.c | 119 +- + arch/x86/platform/olpc/olpc_dt.c | 2 +- + drivers/hid/hid-asus.c | 2 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 2 +- + drivers/platform/olpc/Kconfig | 29 + + drivers/platform/olpc/Makefile | 3 +- + drivers/platform/olpc/olpc-ec.c | 174 ++- + drivers/platform/olpc/olpc-xo175-ec.c | 753 +++++++++ + drivers/platform/x86/Kconfig | 16 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/acer-wmi.c | 29 +- + drivers/platform/x86/asus-nb-wmi.c | 3 +- + drivers/platform/x86/asus-wmi.c | 477 ++++-- + drivers/platform/x86/dell-laptop.c | 5 +- + drivers/platform/x86/dell-smbios-wmi.c | 2 +- + drivers/platform/x86/dell-wmi-descriptor.c | 3 +- + drivers/platform/x86/dell-wmi.c | 2 +- + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/huawei-wmi.c | 2 +- + drivers/platform/x86/ideapad-laptop.c | 36 +- + drivers/platform/x86/intel-wmi-thunderbolt.c | 3 +- + drivers/platform/x86/intel_int0002_vgpio.c | 22 +- + drivers/platform/x86/intel_menlow.c | 8 +- + drivers/platform/x86/intel_pmc_core.c | 63 +- + drivers/platform/x86/intel_pmc_core_pltdrv.c | 62 + + drivers/platform/x86/intel_speed_select_if/Kconfig | 17 + + .../platform/x86/intel_speed_select_if/Makefile | 10 + + .../x86/intel_speed_select_if/isst_if_common.c | 672 ++++++++ + .../x86/intel_speed_select_if/isst_if_common.h | 69 + + .../x86/intel_speed_select_if/isst_if_mbox_msr.c | 216 +++ + .../x86/intel_speed_select_if/isst_if_mbox_pci.c | 214 +++ + .../x86/intel_speed_select_if/isst_if_mmio.c | 180 +++ + drivers/platform/x86/intel_telemetry_debugfs.c | 78 +- + drivers/platform/x86/mlx-platform.c | 216 ++- + drivers/platform/x86/pcengines-apuv2.c | 4 +- + drivers/platform/x86/pmc_atom.c | 51 +- + drivers/platform/x86/samsung-laptop.c | 89 +- + drivers/platform/x86/touchscreen_dmi.c | 28 +- + drivers/platform/x86/wmi-bmof.c | 2 +- + drivers/platform/x86/wmi.c | 44 +- + drivers/platform/x86/xiaomi-wmi.c | 92 ++ + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/olpc_battery.c | 1 - + include/linux/acpi.h | 1 + + include/linux/mod_devicetable.h | 1 + + include/linux/olpc-ec.h | 37 +- + include/linux/platform_data/x86/asus-wmi.h | 5 +- + include/linux/wmi.h | 2 +- + include/uapi/linux/isst_if.h | 172 +++ + tools/Makefile | 12 +- + tools/power/x86/intel-speed-select/.gitignore | 2 + + tools/power/x86/intel-speed-select/Build | 1 + + tools/power/x86/intel-speed-select/Makefile | 56 + + tools/power/x86/intel-speed-select/isst-config.c | 1607 ++++++++++++++++++++ + tools/power/x86/intel-speed-select/isst-core.c | 721 +++++++++ + tools/power/x86/intel-speed-select/isst-display.c | 479 ++++++ + tools/power/x86/intel-speed-select/isst.h | 231 +++ + 65 files changed, 6587 insertions(+), 643 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt + create mode 100644 drivers/platform/olpc/Kconfig + create mode 100644 drivers/platform/olpc/olpc-xo175-ec.c + create mode 100644 drivers/platform/x86/intel_pmc_core_pltdrv.c + create mode 100644 drivers/platform/x86/intel_speed_select_if/Kconfig + create mode 100644 drivers/platform/x86/intel_speed_select_if/Makefile + create mode 100644 drivers/platform/x86/intel_speed_select_if/isst_if_common.c + create mode 100644 drivers/platform/x86/intel_speed_select_if/isst_if_common.h + create mode 100644 drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c + create mode 100644 drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c + create mode 100644 drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c + create mode 100644 drivers/platform/x86/xiaomi-wmi.c + create mode 100644 include/uapi/linux/isst_if.h + create mode 100644 tools/power/x86/intel-speed-select/.gitignore + create mode 100644 tools/power/x86/intel-speed-select/Build + create mode 100644 tools/power/x86/intel-speed-select/Makefile + create mode 100644 tools/power/x86/intel-speed-select/isst-config.c + create mode 100644 tools/power/x86/intel-speed-select/isst-core.c + create mode 100644 tools/power/x86/intel-speed-select/isst-display.c + create mode 100644 tools/power/x86/intel-speed-select/isst.h +Merging chrome-platform/for-next (8c3166e17cf1 mfd / platform: cros_ec_debugfs: Expose resume result via debugfs) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (2605085fba22 dt: leds-lm36274.txt: fix a broken reference to ti-lmu.txt) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (ac499fba98c3 docs: ipmb: place it at driver-api and convert to ReST) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (9e0babf2c06c Linux 5.2-rc5) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource()) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (520602640419 phy: qcom-qmp: Raise qcom_qmp_phy_enable() polling delay) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (0937fbb7abeb extcon: fsa9480: Fix Kconfig warning and build errors) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (2aeac95d1a4c soundwire: add module_sdw_driver helper macro) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (d7d170a8e357 Merge tag 'tag-chrome-platform-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (5c274ca4cfb2 dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support") +$ git merge slave-dma/next +CONFLICT (modify/delete): include/linux/sudmac.h deleted in slave-dma/next and modified in HEAD. Version HEAD of include/linux/sudmac.h left in tree. +Auto-merging include/linux/platform_data/dma-imx.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/soc/tegra/fuse/fuse-tegra20.c +Auto-merging drivers/misc/pci_endpoint_test.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/virt-dma.h +Auto-merging drivers/dma/virt-dma.c +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/sun6i-dma.c +Auto-merging drivers/dma/stm32-dmamux.c +Auto-merging drivers/dma/stm32-dma.c +Removing drivers/dma/sh/sudmac.c +Auto-merging drivers/dma/qcom/hidma_dbg.c +Auto-merging drivers/dma/qcom/hidma.h +Auto-merging drivers/dma/pxa_dma.c +Auto-merging drivers/dma/pl330.c +Auto-merging drivers/dma/of-dma.c +Auto-merging drivers/dma/mxs-dma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/mic_x100_dma.c +Auto-merging drivers/dma/mediatek/Makefile +CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile +Auto-merging drivers/dma/mediatek/Kconfig +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/hsu/hsu.c +Auto-merging drivers/dma/fsl-qdma.c +Auto-merging drivers/dma/fsl-edma.c +Auto-merging drivers/dma/dmatest.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/dma-jz4780.c +CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c +Auto-merging drivers/dma/dma-axi-dmac.c +CONFLICT (content): Merge conflict in drivers/dma/dma-axi-dmac.c +Auto-merging drivers/dma/coh901318.c +Auto-merging drivers/dma/at_xdmac.c +Auto-merging drivers/dma/amba-pl08x.c +Auto-merging drivers/dma/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/dma/8250_mtk_dma.txt +Resolved 'drivers/dma/dma-axi-dmac.c' using previous resolution. +Resolved 'drivers/dma/dma-jz4780.c' using previous resolution. +Resolved 'drivers/dma/mediatek/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/linux/sudmac.h +include/linux/sudmac.h: needs merge +rm 'include/linux/sudmac.h' +$ git commit -v -a +[master a1efad4b8eb9] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/8250_mtk_dma.txt | 33 - + .../devicetree/bindings/dma/arm-pl330.txt | 3 + + Documentation/devicetree/bindings/dma/fsl-edma.txt | 44 +- + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 54 ++ + .../devicetree/bindings/dma/sun6i-dma.txt | 9 +- + Documentation/driver-api/dmaengine/dmatest.rst | 21 +- + MAINTAINERS | 7 + + drivers/dma/Kconfig | 5 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 5 +- + drivers/dma/at_xdmac.c | 11 +- + drivers/dma/bcm-sba-raid.c | 13 +- + drivers/dma/coh901318.c | 6 +- + drivers/dma/dma-axi-dmac.c | 203 ++++- + drivers/dma/dma-jz4780.c | 9 +- + drivers/dma/dmaengine.c | 14 +- + drivers/dma/dmatest.c | 6 +- + drivers/dma/dw-edma/Kconfig | 19 + + drivers/dma/dw-edma/Makefile | 7 + + drivers/dma/dw-edma/dw-edma-core.c | 937 +++++++++++++++++++++ + drivers/dma/dw-edma/dw-edma-core.h | 165 ++++ + drivers/dma/dw-edma/dw-edma-pcie.c | 229 +++++ + drivers/dma/dw-edma/dw-edma-v0-core.c | 354 ++++++++ + drivers/dma/dw-edma/dw-edma-v0-core.h | 28 + + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 310 +++++++ + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 27 + + drivers/dma/dw-edma/dw-edma-v0-regs.h | 158 ++++ + drivers/dma/dw/pci.c | 33 +- + drivers/dma/fsl-edma-common.c | 69 +- + drivers/dma/fsl-edma-common.h | 10 +- + drivers/dma/fsl-edma.c | 43 +- + drivers/dma/fsl-qdma.c | 18 +- + drivers/dma/hsu/hsu.c | 4 +- + drivers/dma/imx-sdma.c | 9 +- + drivers/dma/mcf-edma.c | 11 +- + drivers/dma/mediatek/Kconfig | 11 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-uart-apdma.c | 666 +++++++++++++++ + drivers/dma/mic_x100_dma.c | 6 +- + drivers/dma/mmp_tdma.c | 10 +- + drivers/dma/mxs-dma.c | 8 +- + drivers/dma/of-dma.c | 4 +- + drivers/dma/pl330.c | 40 + + drivers/dma/pxa_dma.c | 56 +- + drivers/dma/qcom/hidma.h | 5 +- + drivers/dma/qcom/hidma_dbg.c | 37 +- + drivers/dma/sh/Kconfig | 6 - + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-dmac.c | 8 +- + drivers/dma/sh/sudmac.c | 414 --------- + drivers/dma/sh/usb-dmac.c | 8 +- + drivers/dma/stm32-dma.c | 1 - + drivers/dma/stm32-dmamux.c | 6 +- + drivers/dma/sun6i-dma.c | 147 +++- + drivers/dma/tegra20-apb-dma.c | 12 +- + drivers/dma/virt-dma.c | 4 +- + drivers/dma/virt-dma.h | 4 + + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 2 +- + include/linux/dma/edma.h | 47 ++ + include/linux/dmaengine.h | 12 +- + include/linux/fpga/adi-axi-common.h | 19 + + include/linux/pci_ids.h | 1 + + include/linux/platform_data/dma-imx.h | 1 - + include/linux/sudmac.h | 49 -- + 66 files changed, 3670 insertions(+), 797 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/mtk-uart-apdma.txt + create mode 100644 drivers/dma/dw-edma/Kconfig + create mode 100644 drivers/dma/dw-edma/Makefile + create mode 100644 drivers/dma/dw-edma/dw-edma-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-pcie.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-regs.h + create mode 100644 drivers/dma/mediatek/mtk-uart-apdma.c + delete mode 100644 drivers/dma/sh/sudmac.c + create mode 100644 include/linux/dma/edma.h + create mode 100644 include/linux/fpga/adi-axi-common.h + delete mode 100644 include/linux/sudmac.h +Merging cgroup/for-next (22a0b83583ab Merge branch 'for-5.3' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (8fdf518974b5 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (5e663f0410fa virtio-mmio: add error check for platform_get_irq) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + MAINTAINERS | 7 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/of/base.c | 10 +- + drivers/pci/of.c | 8 + + drivers/scsi/virtio_scsi.c | 2 +- + drivers/vhost/net.c | 4 +- + drivers/vhost/vhost.c | 850 +++++++++++--- + drivers/vhost/vhost.h | 43 +- + drivers/virtio/virtio_mmio.c | 7 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 15 files changed, 2228 insertions(+), 131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 include/uapi/linux/virtio_iommu.h +$ git am -3 ../patches/0001-iommu-virtio-Constify-data-parameter-in-viommu_match.patch +Applying: iommu/virtio: Constify data parameter in viommu_match_node +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/virtio-iommu.c +$ git add -A . +$ git commit -v -a --amend +[master 38c42251ca42] Merge remote-tracking branch 'vhost/linux-next' + Date: Mon Jul 15 12:29:37 2019 +1000 +Merging rpmsg/for-next (ab1291acd4ab Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/soc/qcom/mdt_loader.c +Auto-merging drivers/remoteproc/remoteproc_internal.h +Auto-merging drivers/remoteproc/remoteproc_elf_loader.c +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Auto-merging drivers/remoteproc/imx_rproc.c +Auto-merging drivers/remoteproc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/mlahb.txt | 37 ++ + .../devicetree/bindings/hwlock/omap-hwspinlock.txt | 25 +- + .../{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} | 35 +- + .../devicetree/bindings/remoteproc/stm32-rproc.txt | 63 +++ + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 + + Documentation/hwspinlock.txt | 81 +++ + Documentation/remoteproc.txt | 14 +- + MAINTAINERS | 5 + + drivers/hwspinlock/Kconfig | 2 +- + drivers/hwspinlock/hwspinlock_core.c | 48 +- + drivers/hwspinlock/omap_hwspinlock.c | 4 + + drivers/hwspinlock/stm32_hwspinlock.c | 7 + + drivers/remoteproc/Kconfig | 18 +- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 8 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 73 ++- + drivers/remoteproc/qcom_q6v5_mss.c | 33 +- + drivers/remoteproc/remoteproc_core.c | 15 + + drivers/remoteproc/remoteproc_elf_loader.c | 3 +- + drivers/remoteproc/remoteproc_internal.h | 11 + + drivers/remoteproc/stm32_rproc.c | 628 +++++++++++++++++++++ + drivers/rpmsg/rpmsg_core.c | 3 +- + drivers/soc/qcom/mdt_loader.c | 88 ++- + include/linux/hwspinlock.h | 61 +- + include/linux/remoteproc.h | 32 +- + include/linux/soc/qcom/mdt_loader.h | 2 + + 26 files changed, 1222 insertions(+), 80 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/stm32/mlahb.txt + rename Documentation/devicetree/bindings/remoteproc/{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} (74%) + create mode 100644 Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt + create mode 100644 drivers/remoteproc/stm32_rproc.c +Merging gpio/for-next (9b3b623804a6 Revert "gpio: tegra: Clean-up debugfs initialisation") +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (f360dcd4ef7f gpio: mockup: no need to check return value of debugfs_create functions) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging pinctrl/for-next (4c105769bf6d pinctrl: aspeed: Strip moved macros and structs from private header) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3d25025ce9c2 pwm: fsl-ftm: Make sure to unlock mutex on failure) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c 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 (d20f6b41b7c2 ktest: update sample.conf for grub2bls) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (ee8a84c60bcc rseq/selftests: Fix Thumb mode build failure on arm32) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) +$ git merge y2038/y2038 +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (2f4281f4dce1 Merge tag 'soundwire-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (f0162d21cc80 rtc: wm831x: Add IRQF_ONESHOT flag) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-tps65910.c +Auto-merging drivers/rtc/rtc-sun6i.c +Auto-merging drivers/rtc/rtc-st-lpc.c +Auto-merging drivers/rtc/rtc-s35390a.c +Auto-merging drivers/rtc/rtc-rx8025.c +Auto-merging drivers/rtc/rtc-rx8010.c +Auto-merging drivers/rtc/rtc-pcf8563.c +Auto-merging drivers/rtc/rtc-pcf2123.c +Auto-merging drivers/rtc/rtc-m41t80.c +Auto-merging drivers/rtc/rtc-fm3130.c +Auto-merging drivers/rtc/rtc-ds1307.c +Auto-merging drivers/rtc/Kconfig +Removing Documentation/devicetree/bindings/rtc/sunxi-rtc.txt +Removing Documentation/devicetree/bindings/rtc/sun6i-rtc.txt +Merge made by the 'recursive' strategy. + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 43 +++ + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 134 ++++++++ + Documentation/devicetree/bindings/rtc/rtc.txt | 73 +---- + Documentation/devicetree/bindings/rtc/rtc.yaml | 50 +++ + .../devicetree/bindings/rtc/sun6i-rtc.txt | 46 --- + .../devicetree/bindings/rtc/sunxi-rtc.txt | 17 - + .../devicetree/bindings/rtc/trivial-rtc.yaml | 92 ++++++ + drivers/rtc/Kconfig | 3 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-ds1307.c | 129 ++++---- + drivers/rtc/rtc-ds2404.c | 5 +- + drivers/rtc/rtc-fm3130.c | 8 +- + drivers/rtc/rtc-imx-sc.c | 87 +++++ + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 354 ++++++++++----------- + drivers/rtc/rtc-pcf8563.c | 13 +- + drivers/rtc/rtc-rv8803.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-s35390a.c | 55 ++-- + drivers/rtc/rtc-st-lpc.c | 4 - + drivers/rtc/rtc-stm32.c | 6 +- + drivers/rtc/rtc-sun6i.c | 1 + + drivers/rtc/rtc-tegra.c | 253 +++++++-------- + drivers/rtc/rtc-test.c | 1 + + drivers/rtc/rtc-tps65910.c | 2 +- + drivers/rtc/rtc-wm831x.c | 3 +- + 27 files changed, 821 insertions(+), 568 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun4i-a10-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sun6i-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/sunxi-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/trivial-rtc.yaml +Merging nvdimm/libnvdimm-for-next (7c40cc44161a Merge branch 'for-5.3/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/uapi/linux/virtio_ids.h +CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/ext4/file.c +Auto-merging drivers/nvdimm/region_devs.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/dax/super.c +Resolved 'include/uapi/linux/virtio_ids.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f7f30c27e7b7] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/nfit/core.c | 4 +- + drivers/dax/bus.c | 21 ++++++- + drivers/dax/super.c | 19 +++++- + drivers/md/dm-table.c | 24 ++++++-- + drivers/md/dm.c | 5 +- + drivers/md/dm.h | 5 +- + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/claim.c | 6 +- + drivers/nvdimm/namespace_devs.c | 8 +-- + drivers/nvdimm/nd.h | 1 + + drivers/nvdimm/nd_virtio.c | 125 +++++++++++++++++++++++++++++++++++++++ + drivers/nvdimm/pmem.c | 18 ++++-- + drivers/nvdimm/region_devs.c | 33 ++++++++++- + drivers/nvdimm/virtio_pmem.c | 122 ++++++++++++++++++++++++++++++++++++++ + drivers/nvdimm/virtio_pmem.h | 55 +++++++++++++++++ + drivers/s390/block/dcssblk.c | 2 +- + drivers/virtio/Kconfig | 11 ++++ + fs/ext4/file.c | 10 ++-- + fs/xfs/xfs_file.c | 9 ++- + include/linux/dax.h | 41 ++++++++++++- + include/linux/libnvdimm.h | 10 +++- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_pmem.h | 34 +++++++++++ + 23 files changed, 527 insertions(+), 38 deletions(-) + create mode 100644 drivers/nvdimm/nd_virtio.c + create mode 100644 drivers/nvdimm/virtio_pmem.c + create mode 100644 drivers/nvdimm/virtio_pmem.h + create mode 100644 include/uapi/linux/virtio_pmem.h +Merging at24/at24/for-next (dce91ba39c76 eeprom: at24: modify a comment referring to platform data) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (d9c53aa440b3 NTB: Describe the ntb_msi_test client in the documentation.) +$ git merge ntb/ntb-next +Auto-merging tools/testing/selftests/ntb/ntb_test.sh +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/msi.c +Auto-merging drivers/ntb/test/Makefile +Auto-merging drivers/ntb/test/Kconfig +Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c +Auto-merging drivers/ntb/Makefile +Auto-merging drivers/ntb/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ntb.txt | 27 ++ + drivers/ntb/Kconfig | 11 + + drivers/ntb/Makefile | 3 + + drivers/ntb/{ntb.c => core.c} | 0 + drivers/ntb/hw/amd/ntb_hw_amd.c | 10 +- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 82 +++--- + drivers/ntb/msi.c | 415 ++++++++++++++++++++++++++++++ + drivers/ntb/ntb_transport.c | 170 ++++++++++++- + drivers/ntb/test/Kconfig | 9 + + drivers/ntb/test/Makefile | 1 + + drivers/ntb/test/ntb_msi_test.c | 433 ++++++++++++++++++++++++++++++++ + drivers/ntb/test/ntb_perf.c | 14 +- + drivers/pci/msi.c | 54 +++- + drivers/pci/switch/switchtec.c | 12 +- + include/linux/msi.h | 8 + + include/linux/ntb.h | 200 ++++++++++++++- + include/linux/pci.h | 9 + + tools/testing/selftests/ntb/ntb_test.sh | 54 +++- + 19 files changed, 1458 insertions(+), 60 deletions(-) + rename drivers/ntb/{ntb.c => core.c} (100%) + create mode 100644 drivers/ntb/msi.c + create mode 100644 drivers/ntb/test/ntb_msi_test.c +Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) +$ git merge kspp/for-next/kspp +Auto-merging lib/test_stackinit.c +Merge made by the 'recursive' strategy. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init) +$ git merge fsi/next +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (341f8ae0f820 dt-bindings: nvmem: SID: Fix the examples node names) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/meson-mx-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c +Auto-merging drivers/nvmem/meson-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c +Auto-merging drivers/nvmem/Kconfig +Auto-merging Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Resolved 'Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt' using previous resolution. +Resolved 'Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml' using previous resolution. +Resolved 'drivers/nvmem/meson-efuse.c' using previous resolution. +Resolved 'drivers/nvmem/meson-mx-efuse.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc1ccacf75db] Merge remote-tracking branch 'nvmem/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 4 +- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 45 +++++++++++ + Documentation/devicetree/bindings/nvmem/nvmem.txt | 81 +------------------ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 93 ++++++++++++++++++++++ + drivers/nvmem/meson-efuse.c | 2 +- + drivers/nvmem/meson-mx-efuse.c | 2 +- + 6 files changed, 143 insertions(+), 84 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem-consumer.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem.yaml +Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 2 files changed, 28 insertions(+) +Merging hyperv/hyperv-next (765e33f5211a Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (f4bb1f895aa0 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero()) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (4382fc438ca5 Merge branch 'clone' into for-next) +$ git merge pidfd/for-next +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8ddf7d17e28d] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging devfreq/for-next (27c17be8e488 PM / devfreq: tegra20: add COMMON_CLK dependency) +$ git merge devfreq/for-next +Merge made by the 'recursive' strategy. + drivers/devfreq/Kconfig | 19 +- + drivers/devfreq/Makefile | 3 +- + drivers/devfreq/devfreq.c | 10 +- + drivers/devfreq/event/exynos-ppmu.c | 6 + + drivers/devfreq/rk3399_dmc.c | 2 +- + drivers/devfreq/tegra20-devfreq.c | 212 ++++++++++++++ + .../devfreq/{tegra-devfreq.c => tegra30-devfreq.c} | 315 ++++++++++----------- + 7 files changed, 387 insertions(+), 180 deletions(-) + create mode 100644 drivers/devfreq/tegra20-devfreq.c + rename drivers/devfreq/{tegra-devfreq.c => tegra30-devfreq.c} (80%) +Merging hmm/hmm (cc5dfd59e375 Merge branch 'hmm-devmem-cleanup.4' into rdma.git hmm) +$ git merge hmm/hmm +Auto-merging mm/page_alloc.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/gup.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging kernel/fork.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/ioport.h +CONFLICT (content): Merge conflict in include/linux/ioport.h +Auto-merging fs/proc/task_mmu.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging arch/powerpc/mm/mem.c +Resolved 'include/linux/ioport.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2aef3b41a374] Merge remote-tracking branch 'hmm/hmm' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/hmm.rst | 166 ++++------ + arch/powerpc/mm/mem.c | 10 +- + arch/x86/mm/init_64.c | 8 +- + drivers/dax/dax-private.h | 4 - + drivers/dax/device.c | 41 +-- + drivers/dax/pmem/core.c | 2 +- + drivers/gpu/drm/nouveau/Kconfig | 6 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 103 +++--- + drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- + drivers/nvdimm/pfn_devs.c | 3 +- + drivers/nvdimm/pmem.c | 51 ++- + drivers/pci/p2pdma.c | 52 +-- + fs/proc/task_mmu.c | 2 +- + include/linux/hmm.h | 302 ++--------------- + include/linux/ioport.h | 5 +- + include/linux/memremap.h | 75 +++-- + include/linux/mm.h | 28 +- + include/linux/mm_types.h | 4 +- + include/linux/swapops.h | 15 - + kernel/fork.c | 1 - + kernel/memremap.c | 194 ++++++----- + kernel/resource.c | 39 +++ + mm/Kconfig | 50 +-- + mm/Makefile | 2 +- + mm/gup.c | 7 - + mm/hmm.c | 587 ++++++++------------------------- + mm/madvise.c | 2 +- + mm/memcontrol.c | 13 +- + mm/memory-failure.c | 6 +- + mm/memory.c | 49 +-- + mm/memory_hotplug.c | 6 +- + mm/mempolicy.c | 1 + + mm/migrate.c | 28 +- + mm/page_alloc.c | 13 +- + mm/swap.c | 13 +- + tools/testing/nvdimm/test/iomap.c | 57 +++- + 36 files changed, 620 insertions(+), 1327 deletions(-) +$ git am -3 ../patches/0001-mm-hmm-fixup-for-locking-lockdep-Rename-lockdep_asse.patch +Applying: mm/hmm: fixup for "locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/hmm.c +$ git add -A . +$ git commit -v -a --amend +[master 01657c8ea62d] Merge remote-tracking branch 'hmm/hmm' + Date: Mon Jul 15 12:52:42 2019 +1000 +$ git am -3 ../patches/drm_amdgpu-adopt-to-hmm_range_register-API-change.patch +Applying: drm/amdgpu: adopt to hmm_range_register API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +$ git add -A . +$ git commit -v -a --amend +[master 6b1e456f4fe3] Merge remote-tracking branch 'hmm/hmm' + Date: Mon Jul 15 12:52:42 2019 +1000 +Merging akpm-current/current (ccad3bef8cfe mm/slab_common.c: work around clang bug #42570) +$ git merge --no-ff akpm-current/current +Auto-merging mm/z3fold.c +Auto-merging mm/swap.c +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging lib/genalloc.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/resource.c +Auto-merging kernel/dma/remap.c +CONFLICT (content): Merge conflict in kernel/dma/remap.c +Auto-merging ipc/mqueue.c +Auto-merging init/Kconfig +Removing include/uapi/linux/coda_psdev.h +Auto-merging include/linux/swapops.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/genalloc.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/io_uring.c +Auto-merging fs/coda/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/aio.c +Auto-merging drivers/base/node.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/mips/include/asm/io.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging Documentation/process/deprecated.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/powerpc/mm/book3s64/radix_pgtable.c' using previous resolution. +Resolved 'kernel/dma/remap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7dd2b0d5df5d] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/core-api/genalloc.rst | 2 +- + .../devicetree/bindings/usb/s3c2410-usb.txt | 2 +- + Documentation/filesystems/coda.txt | 11 +- + Documentation/filesystems/proc.txt | 4 +- + Documentation/process/deprecated.rst | 6 +- + arch/alpha/include/asm/io.h | 5 - + arch/arc/include/asm/pgtable.h | 8 +- + arch/arc/plat-eznps/include/plat/ctop.h | 15 +- + arch/arm/include/asm/io.h | 1 - + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/fault.c | 24 +- + arch/arm64/include/asm/sysreg.h | 82 ++--- + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 22 ++ + arch/hexagon/include/asm/syscall.h | 14 + + arch/ia64/mm/fault.c | 24 +- + arch/ia64/mm/init.c | 2 - + arch/mips/include/asm/io.h | 2 - + arch/mips/include/asm/syscall.h | 6 + + arch/nds32/include/asm/syscall.h | 27 +- + arch/parisc/include/asm/syscall.h | 7 + + arch/powerpc/include/asm/syscall.h | 10 + + arch/powerpc/mm/book3s64/radix_pgtable.c | 5 + + arch/powerpc/mm/fault.c | 23 +- + arch/powerpc/mm/mem.c | 2 - + arch/s390/include/asm/ctl_reg.h | 42 +-- + arch/s390/include/asm/nmi.h | 20 +- + arch/s390/include/asm/processor.h | 20 +- + arch/s390/include/asm/ptrace.h | 10 +- + arch/s390/include/asm/setup.h | 40 +-- + arch/s390/include/asm/thread_info.h | 34 +- + arch/s390/mm/fault.c | 16 +- + arch/s390/mm/init.c | 18 +- + arch/sh/mm/fault.c | 18 +- + arch/sh/mm/init.c | 2 - + arch/sparc/mm/fault_64.c | 16 +- + arch/x86/include/asm/io.h | 1 - + arch/x86/mm/fault.c | 21 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 2 - + arch/x86/mm/ioremap.c | 5 + + arch/xtensa/include/uapi/asm/mman.h | 6 +- + drivers/base/memory.c | 146 +++++---- + drivers/base/node.c | 27 +- + drivers/misc/sram-exec.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- + drivers/pps/pps.c | 8 + + drivers/rapidio/devices/rio_mport_cdev.c | 2 + + fs/aio.c | 29 +- + fs/binfmt_elf.c | 1 - + fs/binfmt_flat.c | 2 - + fs/buffer.c | 56 +++- + fs/coda/Makefile | 3 +- + fs/coda/cache.c | 2 +- + fs/coda/cnode.c | 17 +- + fs/coda/coda_fs_i.h | 4 +- + fs/coda/coda_int.h | 10 + + fs/coda/coda_linux.c | 45 ++- + fs/coda/coda_linux.h | 16 - + {include/linux => fs/coda}/coda_psdev.h | 55 +++- + fs/coda/dir.c | 12 +- + fs/coda/file.c | 143 ++++++-- + fs/coda/inode.c | 3 +- + fs/coda/pioctl.c | 3 +- + fs/coda/psdev.c | 36 +- + fs/coda/symlink.c | 3 +- + fs/coda/sysctl.c | 11 - + fs/coda/upcall.c | 146 +++++++-- + fs/coredump.c | 44 ++- + fs/eventpoll.c | 12 +- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/hfsplus/xattr.c | 2 +- + fs/io_uring.c | 11 +- + fs/ocfs2/alloc.c | 15 + + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/proc/Kconfig | 3 +- + fs/proc/inode.c | 27 +- + fs/proc/proc_sysctl.c | 4 + + fs/proc/task_mmu.c | 3 +- + fs/proc/vmcore.c | 9 + + fs/ramfs/inode.c | 12 + + fs/reiserfs/journal.c | 6 +- + fs/select.c | 90 ++--- + fs/ufs/super.c | 2 - + include/asm-generic/bug.h | 6 +- + include/asm-generic/cacheflush.h | 74 ++++- + include/linux/bits.h | 17 +- + include/linux/coda.h | 3 +- + include/linux/compat.h | 3 +- + include/linux/genalloc.h | 2 +- + include/linux/huge_mm.h | 9 + + include/linux/io.h | 1 + + include/linux/kernel.h | 2 + + include/linux/kprobes.h | 19 ++ + include/linux/lz4.h | 18 +- + include/linux/memcontrol.h | 30 ++ + include/linux/memory.h | 6 +- + include/linux/memory_hotplug.h | 12 +- + include/linux/mm.h | 6 + + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 12 +- + include/linux/node.h | 7 +- + include/linux/pid.h | 5 +- + include/linux/poison.h | 2 +- + include/linux/rbtree.h | 70 ++-- + include/linux/rbtree_augmented.h | 27 +- + include/linux/sched.h | 8 + + include/linux/sched/signal.h | 16 +- + include/linux/shrinker.h | 3 +- + include/linux/signal.h | 4 - + include/linux/swapops.h | 5 +- + include/linux/tracehook.h | 9 +- + include/linux/wait.h | 15 +- + include/trace/events/vmscan.h | 71 +++- + include/uapi/asm-generic/mman-common.h | 8 +- + include/uapi/linux/coda.h | 56 +++- + include/uapi/linux/coda_psdev.h | 28 -- + include/uapi/linux/ptrace.h | 35 ++ + init/Kconfig | 4 +- + ipc/mqueue.c | 19 +- + ipc/msg.c | 18 +- + kernel/dma/remap.c | 2 +- + kernel/hung_task.c | 44 +++ + kernel/pid.c | 9 +- + kernel/ptrace.c | 101 +++++- + kernel/resource.c | 49 ++- + kernel/signal.c | 69 ++-- + kernel/sysctl.c | 18 +- + lib/Kconfig.debug | 14 + + lib/Makefile | 1 + + lib/genalloc.c | 5 +- + lib/ioremap.c | 11 + + lib/math/rational.c | 63 +++- + lib/rbtree.c | 40 +-- + lib/string.c | 11 +- + lib/string_helpers.c | 77 ++--- + lib/test_meminit.c | 364 +++++++++++++++++++++ + lib/test_overflow.c | 11 +- + lib/test_string.c | 83 ++++- + mm/cma.c | 13 + + mm/huge_memory.c | 109 ++++-- + mm/internal.h | 25 ++ + mm/memcontrol.c | 51 ++- + mm/memory.c | 15 +- + mm/memory_hotplug.c | 44 +-- + mm/mempolicy.c | 120 +++++-- + mm/mmap.c | 43 ++- + mm/nommu.c | 4 +- + mm/oom_kill.c | 5 +- + mm/page_alloc.c | 13 +- + mm/rmap.c | 1 + + mm/shmem.c | 3 + + mm/slab_common.c | 3 +- + mm/sparse.c | 27 +- + mm/swap.c | 2 +- + mm/swapfile.c | 4 +- + mm/vmscan.c | 183 ++++++++--- + mm/z3fold.c | 11 +- + scripts/checkpatch.pl | 35 +- + scripts/gdb/linux/device.py | 182 +++++++++++ + scripts/gdb/linux/genpd.py | 83 +++++ + scripts/gdb/vmlinux-gdb.py | 2 + + scripts/get_maintainer.pl | 14 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-pid-vm.c | 17 +- + tools/testing/selftests/proc/setns-sysvipc.c | 133 ++++++++ + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/ptrace/Makefile | 2 +- + tools/testing/selftests/ptrace/get_syscall_info.c | 271 +++++++++++++++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 13 +- + 177 files changed, 3429 insertions(+), 1341 deletions(-) + rename {include/linux => fs/coda}/coda_psdev.h (59%) + delete mode 100644 include/uapi/linux/coda_psdev.h + create mode 100644 lib/test_meminit.c + create mode 100644 scripts/gdb/linux/device.py + create mode 100644 scripts/gdb/linux/genpd.py + create mode 100644 tools/testing/selftests/proc/setns-sysvipc.c + create mode 100644 tools/testing/selftests/ptrace/get_syscall_info.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: device-dax: fix memory and resource leak if hotplug fails +Applying: mm/hotplug: make remove_memory() interface usable +Applying: device-dax: "Hotremove" persistent memory that is used like normal RAM +Applying: mm: move MAP_SYNC to asm-generic/mman-common.h +Applying: mm/mmap: move common defines to mman-common.h +Applying: mm: section numbers use the type "unsigned long" +Applying: mm-section-numbers-use-the-type-unsigned-long-fix +Applying: mm-section-numbers-use-the-type-unsigned-long-v3 +Applying: drivers/base/memory: Use "unsigned long" for block ids +Applying: mm: make register_mem_sect_under_node() static +Applying: mm/memory_hotplug: rename walk_memory_range() and pass start+size instead of pfns +Applying: mm/memory_hotplug: move and simplify walk_memory_blocks() +Applying: drivers/base/memory.c: Get rid of find_memory_block_hinted() +Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3 +Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3-fix +Applying: mm: clean up is_device_*_page() definitions +Applying: mm: introduce ARCH_HAS_PTE_DEVMAP +Applying: arm64: mm: implement pte_devmap support +Applying: arm64-mm-implement-pte_devmap-support-fix +Applying: mm/sparsemem: introduce struct mem_section_usage +Applying: mm/sparsemem: introduce a SECTION_IS_EARLY flag +Applying: mm/sparsemem: add helpers track active portions of a section at boot +Applying: mm/hotplug: prepare shrink_{zone, pgdat}_span for sub-section removal +Applying: mm/sparsemem: convert kmalloc_section_memmap() to populate_section_memmap() +Applying: mm/hotplug: kill is_dev_zone() usage in __remove_pages() +Applying: mm: kill is_dev_zone() helper +Applying: mm/sparsemem: prepare for sub-section ranges +Applying: mm/sparsemem: support sub-section hotplug +Applying: mm: document ZONE_DEVICE memory-model implications +Applying: docs/vm: update ZONE_DEVICE memory model documentation +Applying: mm/devm_memremap_pages: enable sub-section remap +Applying: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields +Applying: libnvdimm/pfn: stop padding pmem namespaces to section alignment +Applying: mm/sparsemem: cleanup 'section number' data types +Applying: mm-sparsemem-cleanup-section-number-data-types-fix +Applying: mm: migrate: remove unused mode argument +Applying: mm: migrate: fix for fs/iomap.c splitting +Applying: mm: add account_locked_vm utility function +Applying: mm-add-account_locked_vm-utility-function-v3 +Applying: mm-add-account_locked_vm-utility-function-v3-fix +Applying: proc/sysctl: add shared variables for range check +Applying: tipc: remove two unused variables +Applying: proc-sysctl-add-shared-variables-for-range-check-fix-2-fix +Applying: proc/sysctl: make firmware loader table conditional +Applying: proc-sysctl-add-shared-variables-for-range-check-fix-4 +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: fs/select.c: use struct_size() in kmalloc() +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 + + 3df4809b8f1b...3f5a96b7bfeb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3f5a96b7bfeb 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/memory-model.rst | 40 +++ + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 21 ++ + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/uapi/asm/mman.h | 6 +- + arch/powerpc/kvm/book3s_64_vio.c | 44 +--- + arch/powerpc/mm/book3s64/iommu_api.c | 41 +-- + arch/powerpc/platforms/powernv/memtrace.c | 23 +- + arch/s390/appldata/appldata_base.c | 15 +- + arch/s390/kernel/topology.c | 6 +- + arch/sparc/include/uapi/asm/mman.h | 6 - + arch/x86/Kconfig | 2 +- + arch/x86/entry/vdso/vdso32-setup.c | 7 +- + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/kernel/itmt.c | 6 +- + arch/x86/mm/init_64.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 19 +- + drivers/base/firmware_loader/fallback_table.c | 13 +- + drivers/base/memory.c | 123 +++++---- + drivers/base/node.c | 8 +- + drivers/dax/dax-private.h | 2 + + drivers/dax/kmem.c | 46 +++- + drivers/fpga/dfl-afu-dma-region.c | 53 +--- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/hv/vmbus_drv.c | 6 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/nvdimm/dax_devs.c | 2 +- + drivers/nvdimm/pfn.h | 15 +- + drivers/nvdimm/pfn_devs.c | 95 +++---- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/tty_ldisc.c | 6 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 54 +--- + drivers/vfio/vfio_iommu_type1.c | 17 +- + drivers/xen/balloon.c | 7 +- + fs/aio.c | 2 +- + fs/eventpoll.c | 4 +- + fs/f2fs/data.c | 2 +- + fs/iomap/migrate.c | 2 +- + fs/notify/inotify/inotify_user.c | 8 +- + fs/proc/proc_sysctl.c | 4 + + fs/select.c | 6 +- + fs/ubifs/file.c | 2 +- + include/linux/memory.h | 5 +- + include/linux/memory_hotplug.h | 17 +- + include/linux/migrate.h | 3 +- + include/linux/mm.h | 43 ++-- + include/linux/mmzone.h | 88 +++++-- + include/linux/node.h | 7 - + include/linux/pfn_t.h | 4 +- + include/linux/sysctl.h | 7 + + include/uapi/asm-generic/mman-common.h | 7 +- + include/uapi/asm-generic/mman.h | 10 +- + ipc/ipc_sysctl.c | 35 ++- + kernel/memremap.c | 57 ++--- + kernel/pid_namespace.c | 3 +- + kernel/sysctl.c | 197 +++++++-------- + kernel/ucount.c | 6 +- + mm/Kconfig | 5 +- + mm/gup.c | 2 +- + mm/memory_hotplug.c | 291 ++++++++++----------- + mm/migrate.c | 7 +- + mm/page_alloc.c | 16 +- + mm/sparse-vmemmap.c | 21 +- + mm/sparse.c | 347 ++++++++++++++++---------- + mm/util.c | 75 ++++++ + net/core/neighbour.c | 20 +- + net/core/sysctl_net_core.c | 34 ++- + net/dccp/sysctl.c | 16 +- + net/ipv4/sysctl_net_ipv4.c | 60 +++-- + net/ipv6/addrconf.c | 6 +- + net/ipv6/route.c | 7 +- + net/ipv6/sysctl_net_ipv6.c | 10 +- + net/mpls/af_mpls.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 +- + net/rxrpc/sysctl.c | 9 +- + net/sctp/sysctl.c | 35 ++- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/tipc/sysctl.c | 6 +- + security/keys/sysctl.c | 26 +- + security/loadpin/loadpin.c | 6 +- + security/yama/yama_lsm.c | 3 +- + 85 files changed, 1131 insertions(+), 1118 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +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..15c6e01320aa --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190715 |