Add linux-next specific files for 20190723
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..a5b8eda
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,300 @@
+Name SHA1
+---- ----
+origin 7b5cf701ea9c395c792e2a7e3b7caf4c68b87721
+fixes c309b6f24222246c18a8b65d3950e6e755440865
+kbuild-current 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+arc-current 24a20b0a443fd485852d51d08e98bbd9d212e0ec
+arm-current c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d
+arm-soc-fixes ae00fcc51e714ce0fc72382332147ffffcf9a883
+arm64-fixes 40ca0ce56d4bb889dc43b455c55398468115569a
+m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0
+powerpc-fixes f16d80b75a096c52354c6e0a574993f3b0dfbdfe
+s390-fixes 9a159190414d461fdac7ae5bb749c2d532b35419
+sparc 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d
+fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215
+net 12185dfe44360f814ac4ead9d22ad2af7511b2e9
+bpf c8eee4135a456bc031d67cadc454e76880d1afd8
+ipsec 22d6552f827ef76ade3edf6bbb3f05048a0a7d8b
+netfilter 15a78ba1844a8e052c1226f930133de4cef4e7ad
+ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa
+wireless-drivers 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+mac80211 d2b3fe42bc629c2d4002f652b3abdfb2e72991c7
+rdma-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+sound-current e4091bdd2fd957793a10449a8682c767578b0430
+sound-asoc-fixes 5ee3c836a2ad5420f9bcfdc8d11f61ca26995435
+regmap-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+regulator-fixes b9131a51dc491be94295c0782672c2faf16f8f0d
+spi-fixes 29a603af8bc6a696c1011130fd54e773a13e1bf7
+pci-current 6dbbd053e6aea827abde89ac9b9d6855dab1a66b
+driver-core.current 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+tty.current 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+usb.current 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+usb-gadget-fixes 42de8afc40c97002fceb500e2331f6a722be3c14
+usb-serial-fixes f8377eff548170e8ea8022c067a1fbdf9e1c46a8
+usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f
+phy ada28f7b3a97fa720864c86504a7c426ee6f91c1
+staging.current 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+char-misc.current c8917b8ff09e8a4d6ef77e32ce0052f7158baa1f
+soundwire-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+thunderbolt-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+input-current a7cd67e2b76edd46fbd2517078eeba369f933575
+crypto-current cf144f81a99d1a3928f90b0936accfd3f45c9a0a
+ide 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d
+vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009
+kselftest-fixes e2e88325f4bcaea51f454723971f7b5ee0e1aa80
+modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0
+slave-dma-fixes 5d6fb560729a5d5554e23db8d00eb57cd0021083
+backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd
+mtd-fixes c7a87ceb17aee9222c069a97aee4647260c7b3a6
+mfd-fixes 63b2de12b7eeacfb2edbe005f5c3cff17a2a02e2
+v4l-dvb-fixes 22be8233b34f4f468934c5fefcbe6151766fb8f2
+reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345
+mips-fixes 2a15d6481741a418837a22df3a440d5bd8b9c412
+at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+omap-fixes fb59ee37cfe20d10d19568899d1458a58361246c
+kvm-fixes 30cd8604323dbaf20a80e797fe7057f5b02e394d
+kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317
+hwmon-fixes 223b2b5030f370f219c23c2c4678b419a72434d9
+nvdimm-fixes a4a357fd4477a0523aca5afac9c5369b16fdb963
+btrfs-fixes 5560015d753751dd7cab021d0d4b1db784372050
+vfs-fixes 75f2d86b20bf6aec0392d6dd2ae3ffff26d2ae0e
+dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5
+i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+samsung-krzk-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9
+pinctrl-samsung-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9
+devicetree-fixes e2297f7c3ab3b68dda2ac732b1767212019d3bdf
+scsi-fixes 985eaf99eb180a9a194ef2787cc03682c7ad615b
+drm-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+amdgpu-fixes 1bcff32679f60fe2387f63f22b8b35375052bcb0
+drm-intel-fixes d7e8a19b38c8ac1a32b6b03af049e2c88d4155db
+mmc-fixes 3a6ffb3c8c3274a39dc8f2514526e645c5d21753
+rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a
+hyperv-fixes 9be11356057af5baba25eb25061313f7476a6dcd
+soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27
+risc-v-fixes 0db7f5cd4aeba4cc63d0068598b3350eba8bb4cd
+drm-misc-fixes bbb6fc43f131f77fcb7ae8081f6d7c51396a2120
+kspp-gustavo bc512fd704a92e1be700c941c137d73c0f222eed
+kbuild 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+compiler-attributes a188339ca5a396acc588e5851ed7e19f66b0ebd9
+leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping 449fa54d6815be8c2c1f68fa9dbbae9384a7c03e
+asm-generic 7f3a8dff1219fba3076fe207972d1d7893c099bb
+arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+arm b7a735f3a606ab25f055ed456559eb0d49062c92
+arm64 0c61efd322b75ed3143e3d130ebecbebf561adf5
+arm-perf d482e575fbf0f7ec9319bded951f21bbc84312bf
+arm-soc f1698cc9dde0a1c4503e3c772c1090f9df56498e
+actions fb9c1c1deb5ece57810afdbd743358d02e632d2c
+amlogic 11343d25a03b84fb522fc98a5dccf7f605eff912
+aspeed a1f5c11ddb7d072d20195bd5276c67850e637809
+at91 90fbe456b5f0fa72706a8a4b5bf6c26ba1d2b84a
+bcm2835 08e3c41585386f5cefc91ede8835005742df4ba9
+imx-mxs 2a7f6c1a53763a49b2613e2981de0295b89acb30
+keystone 78145dbeaea103586940696d4acbf2b1d62cf14e
+mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9
+mvebu e1b0b32a5ad6646b9c946398a534f3dd9df59ec2
+omap 7376d6a65730827e34695ebb8584af7d27201113
+qcom 07c1ef89403097efe4d5bde081ceca357d50ccec
+renesas a16ecb14d0b0f69f97763cfa271e90ab97e88a19
+reset 6b251ea99242a701b6f8738f20991f3fe90f68ad
+rockchip 6cb9edc169e3eaf60dc90e43ab1be05b4e314c98
+samsung-krzk cf6664323e0fbef58eaec16e55d1e0484361e46a
+scmi 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+sunxi 630f3100e19db24b59de2ccb829f3af530b54173
+tegra 033de83170dd0cefa3a5db3a90f3bbba92412877
+clk 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky 9f98b3142d22e0fdb253617373931d364c59a797
+h8300 f293d4d4649cc20068a312cfc5752ce6aab0126b
+ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5
+m68k f28a1f16135c9c6366f3d3f20f2e58aefc99afa0
+m68knommu 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+microblaze 226a893bbb1f4495d7139fd57143475ada0de61d
+mips f23478f6ea2ed6c8dccc6f7b902c2362ebc197ef
+nds32 932296120543149e3397af252e7daee7af37eb05
+nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175
+openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff
+parisc-hd 69245c97560b40f88c609b078f4b51c5be81d88b
+powerpc 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7
+soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019
+risc-v f51edcec5288556069d27ab7040a4ce8ca55b74e
+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 02845e9936f05671a8dc2cf31939aa84914546d0
+configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781
+ecryptfs 7451c54abc9139585492605d9e91dec2d26c6457
+ext3 5450e8a316a64cddcbc15f90733ebc78aa736545
+ext4 96fcaf86c3cb9340015fb475d79ef0a6fcf858ed
+f2fs e3110f4526c7df62bd26fea9886095043590e494
+fuse 766741fcaa1fe5da2cb1e33ae458a5630ff7f667
+jfs a5fdd713d256887b5f012608701149fa939e5645
+nfs d5b9216fd5114be4ed98ca9c1ecc5f164cd8cf5e
+nfs-anna 68f461593f76bd5f17e87cdd0bea28f4278c7268
+nfsd b78fa45d4edb92fd7b882b2ec25b936cad412670
+orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15
+overlayfs 0be0bfd2de9dfdd2098a9c5b14bdd8f739c9165d
+ubifs 8009ce956c3d28022af6b122e50213ad830fc902
+v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98
+xfs 89b408a68b9dd163b2705b6f73d8e3cc3579b457
+iomap 5d907307adc14cd5148b07629c2b4535acd06062
+djw-vfs 7e328e5930ad85c4669ca12bd20e1828a62a391a
+file-locks 6b0e42771795334bd24d089402d04d93bac048d3
+vfs 38760c17cc962a077f40dc1b8a13273a426cb74c
+printk ba174ef6d2241d6718b1df235932f44b675359ca
+pci 7b4b0f6b34d893be569da81ffad865a9d3a7d014
+pstore 4c6d80e1144bdf48cae6b602ae30d41f3e5c76a9
+hid bf4945efabdf7c797d0a96f254083ae2eac5beb2
+i2c 9a74c745c68904c3a7ff2d3a7f385593090780a1
+i3c ede2001569c32e5bafd2203c7272bbd3249e942e
+dmi 57361846b52bc686112da6ca5368d11210796804
+hwmon-staging 9cbd0d64180c71069d1b1afb5fd1d4dd790e05f8
+jc_docs 143134ba498327e3d389e10f55f56e9c37257c7c
+v4l-dvb 66193b24514c91aeda88da744554b2665471aeae
+v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm f76cb066edd1eef84edc85e5dd93c8aee71992da
+cpufreq-arm 3355c91b79394593ebbb197c8e930a91826f4ff3
+cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042
+opp 560d1bcad715c215e7ffe5d7cffe045974b623d0
+thermal 6c395f66e98c895cf3ebf87c0b2fc63b6a57a196
+thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae
+ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195
+dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78
+swiotlb dd853b2dfa65ec519f9281a43714a6f4a6662286
+rdma 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+net-next 66b5f1c439843bcbab01cc7f3854ae2742f3d1e3
+bpf-next 66b5f1c439843bcbab01cc7f3854ae2742f3d1e3
+ipsec-next c7b37c769d2a5e711106a3c793140a4f46768e04
+mlx5-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+netfilter-next 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d
+nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382
+ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8
+wireless-drivers-next 5adcdab6ae1b0a53456e8a269b1856094dc20a59
+bluetooth 0ed8a186eaff7c8e1eef8e3a5f03671920f66d58
+mac80211-next 17c74d7c5f0d46f9a8ec42127f967ec385faf0f6
+gfs2 bb4cb25dd319fa5630cc304c5bfa926266736935
+mtd 46ce10df799fb0647a9c0e3f793e66463a8d6773
+nand bce9437a0a48dd5e19490f56e1cdc39a9be5563c
+spi-nor 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+crypto f3880a23564e3172437285ebcb5b8a124539fdae
+drm 8ee795625665208589a97972b01790bb04ea83e3
+amdgpu 0e738e03472a1def4503b011f9dd30a68edc5798
+drm-intel 3bdd4f8485310687affe117f1b1a6e9012e897f6
+drm-tegra eb7cf945a8dac8603e6d0759023e9b6cfed7a008
+drm-misc d808097627e51d53cf9b1aa13239b5c4a6adaefb
+drm-msm 4cf643a39221af24a151ad2cff4e3f95f12f368e
+hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120
+mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e
+imx-drm fee77829083ad70845bd650f3c84c5900c5abae1
+etnaviv 57bdd4057516fb913d42a7d502b2580bbb9966ee
+regmap 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+sound d2d5a6b0253d30ef04d513447cdd00df4fa627c3
+sound-asoc b6319b061ba279577fd7030a9848fbd6a17151e3
+modules 93651f80dcb616b8c9115cdafc8e57a781af22d0
+input 5d4b45a1dd7b00feab57624035dcdbc1bab2e0f8
+block 5b9ddbdf2f362009b6278db421a72f0f21108fb0
+device-mapper 733232f8c852bcc2ad6fc1db7f4c43eb01c7c217
+pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc
+mmc 248979babbd8513d3b663d579728fdfad09b0454
+kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd 7efd105c27fd2323789b41b64763a0e33ed79c08
+backlight 73fbfc499448455f1e1c77717040e09e25f1d976
+battery caa2b557841c8cedc1d4862cd31cf76ee940d105
+regulator bf8211f7493558fe9bb271004c07d9bac14c8add
+security 286e47a07799b95d541ef95c906a3f70958dea13
+apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee
+integrity 650b29dbdf2caf7db27cdc8bfa8fc009b28a6ce3
+keys 20adf5593389dfb321caec6af96bf6ad7b841930
+selinux ea74a685ad819aeed316a9bae3d2a5bf762da82d
+tpmdd 166a2809d65b282272c474835ec22c882a39ca1b
+watchdog 7fb832ae72949c883da52d6316ff08f03c75d300
+iommu d95c3885865b71e56d8d60c8617f2ce1f0fa079d
+vfio 1e4d09d2212d9e230b967f57bc8df463527dbd75
+audit 839d05e413856bd686a33b59294d4e8238169320
+devicetree f59d261180f3b66367962f1974090815ce710056
+mailbox 25777e5784a7b417967460d4fcf9660d05a0c320
+spi 87ce8c22d3b5384caff3519393ab73b0262a945a
+tip 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+clockevents b0c74b96d177304b6d6f8981e90f37f1cd6afa58
+edac-amd b2572772d13e7719841d1711996b5a6564b3caa6
+irqchip 3dae67ce600caaa92c9af6e0cb6cad2db2632a0a
+ftrace 6d54ceb539aacc3df65c89500e8b045924f3ef81
+rcu b989ff070574ad8b8621d866de0a8e9a65d42c80
+kvm 30cd8604323dbaf20a80e797fe7057f5b02e394d
+kvm-arm 1e0cf16cdad1ba53e9eeee8746fe57de42f20c97
+kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30
+kvms390 8343ba2d4820b1738bbb7cb40ec18ea0a3b0b331
+xen-tip a1078e821b605813b63bf6bca414a85f804d5c66
+percpu 03ed70fb0e5e94a645c3872f9a73662c789bf7d7
+workqueues be69d00d9769575e35d83367f465a58dbf82748c
+drivers-x86 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+chrome-platform 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+hsi a188339ca5a396acc588e5851ed7e19f66b0ebd9
+leds 60439711b69b893e84d5bab56de66f9433e68a30
+ipmi fec88ab0af9706b2201e5daf377c5031c62d11f7
+driver-core 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+usb 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+usb-gadget b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3
+usb-serial 9e0babf2c06c73cda2c0cd37a1653d823adb40ec
+usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c
+phy-next 5206026404190125436f81088eb3667076e56083
+tty 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+char-misc 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+extcon 0937fbb7abeb165ef0ac6a56a3a6f041eca6dbde
+soundwire 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+thunderbolt 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+staging 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+mux 05fb8284a41719d5f827af2f383dd7592d8dcfda
+icc 83fdb2dfb0c2925f253449677830ed11461ac5c8
+slave-dma 72503b25ee363827aafffc3e8d872e6a92a7e422
+cgroup 22a0b83583abc944b66970d3833b02e6477ac280
+scsi 07d9aa14346489d6facae5777ceb267a1dcadbc5
+scsi-mkp 838c1efc6a0adbf44d16e4714f43443db598cdb5
+vhost 842aa64eddacd23adc6ecdbc69cb2030bec47122
+rpmsg 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+gpio 88785b7fa74ae2dc52f879140b976984b5374c79
+gpio-brgl 66ad66293edeb2bcc27a329f35018b18601da452
+pinctrl 4c105769bf6de29856bf80a4045e6725301c58ce
+pinctrl-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9
+pwm 3d25025ce9c2f364ea4ee76f1461c8714b9c0b6d
+userns 318759b4737c3b3789e2fd64d539f437d52386f5
+ktest d20f6b41b7c2715b3d900f2da02029dbc14cd60a
+random 58be0106c5306b939b07b4b8bf00669a20593f4b
+kselftest ee8a84c60bcc1f1615bd9cb3edfe501e26cdc85b
+y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc
+livepatching 28f28ea4343abe5d2b8f0ff0f49883ecad648cb6
+coresight 70d4c349268a00a693487f38ea1d65217b5a2a32
+rtc 06c8e550a84ec32a2eb3a6b1734585cd852851b0
+nvdimm cb3110f7452d96382153722ec788a4ade022eeb9
+at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd
+ntb 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+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 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+akpm-current eb5b38e7b49481036befe67d4098a344f6106201
+akpm c504c313f8eced50c7383164e14e4856dd2c555f
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..337ba9a
--- /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
+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
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-next
+bcm2835 git git://github.com/anholt/linux.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu git git://git.infradead.org/linux-mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+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 0000000..5d7909d
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,3224 @@
+$ date -R
+Tue, 23 Jul 2019 07:56:52 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 5f9e832c1370 Linus 5.3-rc1
+Merging origin/master (7b5cf701ea9c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge origin/master
+Updating 5f9e832c1370..7b5cf701ea9c
+Fast-forward
+ drivers/connector/connector.c | 6 +--
+ drivers/media/v4l2-core/v4l2-subdev.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 ++
+ drivers/net/ethernet/chelsio/cxgb/my3126.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 6 +--
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 9 ++--
+ drivers/net/ethernet/emulex/benet/be_main.c | 5 ++
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 12 ++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 15 +++---
+ drivers/net/ethernet/mscc/ocelot_flower.c | 11 ++--
+ drivers/net/ethernet/mscc/ocelot_tc.c | 6 +--
+ .../net/ethernet/netronome/nfp/flower/offload.c | 11 ++--
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 5 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 4 +-
+ drivers/net/hyperv/netvsc_drv.c | 1 -
+ drivers/net/phy/sfp.c | 2 +-
+ drivers/net/vrf.c | 58 +++++++++++++---------
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 4 ++
+ .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 1 +
+ drivers/net/wireless/ti/wlcore/vendor_cmd.c | 3 ++
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/disk-io.c | 1 +
+ fs/btrfs/inode.c | 24 ++++++++-
+ fs/btrfs/volumes.c | 10 ++--
+ include/linux/connector.h | 1 -
+ include/linux/netfilter/nf_conntrack_h323_asn1.h | 3 +-
+ include/net/cfg80211.h | 2 +-
+ include/net/flow_offload.h | 30 ++++++++---
+ include/net/netfilter/nf_conntrack_expect.h | 12 +++--
+ include/net/netfilter/nf_conntrack_synproxy.h | 1 +
+ include/net/netfilter/nf_tables.h | 5 +-
+ include/net/pkt_cls.h | 5 +-
+ include/net/sch_generic.h | 8 ++-
+ include/net/tcp.h | 5 ++
+ include/uapi/linux/nl80211.h | 2 +-
+ include/uapi/linux/videodev2.h | 8 ++-
+ kernel/Kconfig.preempt | 8 +--
+ kernel/exit.c | 1 +
+ net/bridge/netfilter/Kconfig | 6 +--
+ net/core/flow_offload.c | 22 ++++----
+ net/dsa/slave.c | 6 +--
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +-
+ net/ipv4/netfilter/ipt_SYNPROXY.c | 2 +
+ net/ipv4/netfilter/ipt_rpfilter.c | 1 +
+ net/ipv4/netfilter/nf_nat_h323.c | 12 ++---
+ net/ipv4/tcp_output.c | 13 ++++-
+ net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +
+ net/ipv6/netfilter/ip6t_rpfilter.c | 8 ++-
+ net/mac80211/cfg.c | 8 ++-
+ net/mac80211/driver-ops.c | 13 +++--
+ net/netfilter/Kconfig | 6 +--
+ net/netfilter/ipvs/ip_vs_nfct.c | 2 +-
+ net/netfilter/nf_conntrack_amanda.c | 2 +-
+ net/netfilter/nf_conntrack_broadcast.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 4 +-
+ net/netfilter/nf_conntrack_expect.c | 26 +++++++---
+ net/netfilter/nf_conntrack_ftp.c | 2 +-
+ net/netfilter/nf_conntrack_h323_asn1.c | 5 +-
+ net/netfilter/nf_conntrack_h323_main.c | 18 +++----
+ net/netfilter/nf_conntrack_irc.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 4 +-
+ net/netfilter/nf_conntrack_pptp.c | 4 +-
+ net/netfilter/nf_conntrack_proto_gre.c | 2 -
+ net/netfilter/nf_conntrack_proto_icmp.c | 2 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 8 +--
+ net/netfilter/nf_conntrack_sane.c | 2 +-
+ net/netfilter/nf_conntrack_sip.c | 10 ++--
+ net/netfilter/nf_conntrack_tftp.c | 2 +-
+ net/netfilter/nf_nat_amanda.c | 2 +-
+ net/netfilter/nf_nat_core.c | 2 +-
+ net/netfilter/nf_nat_ftp.c | 2 +-
+ net/netfilter/nf_nat_irc.c | 2 +-
+ net/netfilter/nf_nat_sip.c | 8 +--
+ net/netfilter/nf_nat_tftp.c | 2 +-
+ net/netfilter/nf_synproxy_core.c | 8 +--
+ net/netfilter/nf_tables_api.c | 4 +-
+ net/netfilter/nf_tables_offload.c | 5 +-
+ net/netfilter/nfnetlink.c | 2 +-
+ net/netfilter/nft_chain_filter.c | 2 +-
+ net/netfilter/nft_chain_nat.c | 3 ++
+ net/netfilter/nft_ct.c | 2 +-
+ net/netfilter/nft_hash.c | 2 +-
+ net/netfilter/nft_meta.c | 2 +-
+ net/netfilter/nft_redir.c | 2 +-
+ net/netfilter/nft_synproxy.c | 2 +
+ net/openvswitch/flow.c | 8 +--
+ net/openvswitch/flow.h | 4 +-
+ net/openvswitch/flow_table.c | 8 +--
+ net/sched/cls_api.c | 16 ++++--
+ net/sched/cls_bpf.c | 2 +-
+ net/sched/cls_flower.c | 2 +-
+ net/sched/cls_matchall.c | 2 +-
+ net/sched/cls_u32.c | 6 +--
+ net/tipc/topsrv.c | 2 +-
+ 99 files changed, 367 insertions(+), 246 deletions(-)
+Merging fixes/master (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
+$ git merge fixes/master
+Already up to date.
+Merging kbuild-current/fixes (5f9e832c1370 Linus 5.3-rc1)
+$ 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
+Already up to date.
+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 (ae00fcc51e71 ARM: Delete netx a second time)
+$ git merge arm-soc-fixes/arm/fixes
+Removing arch/arm/mach-netx/xc.c
+Removing arch/arm/mach-netx/time.c
+Removing arch/arm/mach-netx/pfifo.c
+Removing arch/arm/mach-netx/nxeb500hmi.c
+Removing arch/arm/mach-netx/nxdkn.c
+Removing arch/arm/mach-netx/nxdb500.c
+Removing arch/arm/mach-netx/include/mach/xc.h
+Removing arch/arm/mach-netx/include/mach/uncompress.h
+Removing arch/arm/mach-netx/include/mach/pfifo.h
+Removing arch/arm/mach-netx/include/mach/netx-regs.h
+Removing arch/arm/mach-netx/include/mach/irqs.h
+Removing arch/arm/mach-netx/include/mach/hardware.h
+Removing arch/arm/mach-netx/generic.h
+Removing arch/arm/mach-netx/generic.c
+Removing arch/arm/mach-netx/fb.h
+Removing arch/arm/mach-netx/fb.c
+Removing arch/arm/mach-netx/Makefile.boot
+Removing arch/arm/mach-netx/Makefile
+Removing arch/arm/mach-netx/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig.debug | 5 -
+ arch/arm/mach-netx/Kconfig | 22 --
+ arch/arm/mach-netx/Makefile | 13 -
+ arch/arm/mach-netx/Makefile.boot | 3 -
+ arch/arm/mach-netx/fb.c | 65 -----
+ arch/arm/mach-netx/fb.h | 12 -
+ arch/arm/mach-netx/generic.c | 182 ------------
+ arch/arm/mach-netx/generic.h | 14 -
+ arch/arm/mach-netx/include/mach/hardware.h | 27 --
+ arch/arm/mach-netx/include/mach/irqs.h | 58 ----
+ arch/arm/mach-netx/include/mach/netx-regs.h | 420 ---------------------------
+ arch/arm/mach-netx/include/mach/pfifo.h | 42 ---
+ arch/arm/mach-netx/include/mach/uncompress.h | 63 ----
+ arch/arm/mach-netx/include/mach/xc.h | 30 --
+ arch/arm/mach-netx/nxdb500.c | 197 -------------
+ arch/arm/mach-netx/nxdkn.c | 90 ------
+ arch/arm/mach-netx/nxeb500hmi.c | 174 -----------
+ arch/arm/mach-netx/pfifo.c | 56 ----
+ arch/arm/mach-netx/time.c | 141 ---------
+ arch/arm/mach-netx/xc.c | 246 ----------------
+ 20 files changed, 1860 deletions(-)
+ delete mode 100644 arch/arm/mach-netx/Kconfig
+ delete mode 100644 arch/arm/mach-netx/Makefile
+ delete mode 100644 arch/arm/mach-netx/Makefile.boot
+ delete mode 100644 arch/arm/mach-netx/fb.c
+ delete mode 100644 arch/arm/mach-netx/fb.h
+ delete mode 100644 arch/arm/mach-netx/generic.c
+ delete mode 100644 arch/arm/mach-netx/generic.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/netx-regs.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/pfifo.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/xc.h
+ delete mode 100644 arch/arm/mach-netx/nxdb500.c
+ delete mode 100644 arch/arm/mach-netx/nxdkn.c
+ delete mode 100644 arch/arm/mach-netx/nxeb500hmi.c
+ delete mode 100644 arch/arm/mach-netx/pfifo.c
+ delete mode 100644 arch/arm/mach-netx/time.c
+ delete mode 100644 arch/arm/mach-netx/xc.c
+Merging arm64-fixes/for-next/fixes (40ca0ce56d4b arm64: entry: SP Alignment Fault doesn't write to FAR_EL1)
+$ git merge arm64-fixes/for-next/fixes
+Merge made by the 'recursive' strategy.
+ .mailmap | 3 ++
+ MAINTAINERS | 14 +++----
+ arch/arm64/include/asm/elf.h | 2 +-
+ arch/arm64/include/asm/pgtable.h | 1 -
+ arch/arm64/include/asm/processor.h | 14 ++++++-
+ arch/arm64/include/asm/stacktrace.h | 78 ++++++++++++++++++++++++++++++-------
+ arch/arm64/kernel/entry.S | 22 ++++++-----
+ arch/arm64/kernel/fpsimd.c | 29 +++++++-------
+ arch/arm64/kernel/perf_callchain.c | 7 +---
+ arch/arm64/kernel/process.c | 36 ++++++++++++++---
+ arch/arm64/kernel/return_address.c | 9 ++---
+ arch/arm64/kernel/stacktrace.c | 59 +++++++++++++++++++++-------
+ arch/arm64/kernel/time.c | 7 +---
+ arch/arm64/kernel/traps.c | 13 +++----
+ arch/arm64/kernel/vdso/Makefile | 13 +++----
+ arch/arm64/kernel/vdso32/Makefile | 14 ++++---
+ 16 files changed, 217 insertions(+), 104 deletions(-)
+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 (f16d80b75a09 powerpc/tm: Fix oops on sigreturn on systems without TM)
+$ git merge powerpc-fixes/fixes
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/pmc.h | 5 ++---
+ arch/powerpc/kernel/Makefile | 3 ++-
+ arch/powerpc/kernel/dma-common.c | 17 +++++++++++++++++
+ arch/powerpc/kernel/signal_32.c | 3 +++
+ arch/powerpc/kernel/signal_64.c | 5 +++++
+ arch/powerpc/kvm/book3s_hv.c | 13 +++++++++++++
+ arch/powerpc/kvm/book3s_xive.c | 4 +---
+ arch/powerpc/kvm/book3s_xive_native.c | 4 ++--
+ arch/powerpc/mm/book3s64/hash_utils.c | 9 +++++++++
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/sysdev/xive/common.c | 7 +++----
+ 12 files changed, 59 insertions(+), 14 deletions(-)
+ create mode 100644 arch/powerpc/kernel/dma-common.c
+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 (12185dfe4436 bonding: Force slave speed check after link state recovery for 802.3ad)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/bonding/bond_main.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+Merging bpf/master (c8eee4135a45 selftests/bpf: fix sendmsg6_prog on s390)
+$ git merge bpf/master
+Auto-merging include/net/tcp.h
+Merge made by the 'recursive' strategy.
+ Documentation/networking/tls-offload.rst | 6 +
+ include/linux/skmsg.h | 8 +-
+ include/net/tcp.h | 3 +
+ include/net/tls.h | 15 +-
+ net/core/skmsg.c | 4 +-
+ net/core/sock_map.c | 19 ++-
+ net/ipv4/tcp_ulp.c | 13 ++
+ net/tls/tls_main.c | 142 ++++++++++++----
+ net/tls/tls_sw.c | 83 ++++++---
+ tools/lib/bpf/btf.c | 5 +-
+ tools/lib/bpf/libbpf.c | 34 ++--
+ tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +-
+ tools/testing/selftests/net/tls.c | 194 ++++++++++++++++++++++
+ 13 files changed, 446 insertions(+), 83 deletions(-)
+Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 2 --
+ net/xfrm/xfrm_interface.c | 56 +++++++++++++++++++++--------------------------
+ 2 files changed, 25 insertions(+), 33 deletions(-)
+Merging netfilter/master (15a78ba1844a netfilter: ebtables: fix a memory leak bug in compat)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ net/bridge/netfilter/ebtables.c | 4 +++-
+ 1 file changed, 3 insertions(+), 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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (d2b3fe42bc62 mac80211: don't warn about CW params when not using them)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (5f9e832c1370 Linus 5.3-rc1)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (e4091bdd2fd9 ALSA: line6: Fix a typo)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/pcm_native.c | 9 +++++----
+ sound/pci/hda/hda_codec.c | 2 +-
+ sound/usb/line6/podhd.c | 2 +-
+ sound/usb/line6/variax.c | 2 +-
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+Merging sound-asoc-fixes/for-linus (5ee3c836a2ad Merge branch 'asoc-5.3' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ include/sound/simple_card_utils.h | 4 ++
+ include/uapi/sound/sof/fw.h | 16 +++--
+ include/uapi/sound/sof/header.h | 14 ++--
+ sound/soc/codecs/cs42xx8.c | 116 +++++++++++++++++++++++++++------
+ 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 ++++----
+ sound/soc/intel/boards/bytcht_es8316.c | 8 +++
+ sound/soc/rockchip/rockchip_max98090.c | 32 +++++++++
+ sound/soc/samsung/odroid.c | 8 ++-
+ sound/soc/soc-dapm.c | 8 +--
+ 20 files changed, 217 insertions(+), 97 deletions(-)
+ mode change 100755 => 100644 sound/soc/codecs/rt1308.c
+ mode change 100755 => 100644 sound/soc/codecs/rt1308.h
+Merging regmap-fixes/for-linus (5f9e832c1370 Linus 5.3-rc1)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (b9131a51dc49 Merge branch 'regulator-5.3' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/axp20x-regulator.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging spi-fixes/for-linus (29a603af8bc6 Merge branch 'spi-5.3' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/spi-controller.yaml | 1 -
+ drivers/spi/spi-fsl-qspi.c | 2 +-
+ drivers/spi/spi-gpio.c | 6 ++++++
+ drivers/spi/spi-pxa2xx.c | 6 ++++--
+ 4 files changed, 11 insertions(+), 4 deletions(-)
+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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (5f9e832c1370 Linus 5.3-rc1)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (c8917b8ff09e firmware: fix build errors in paged buffer handling code)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/base/firmware_loader/firmware.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging soundwire-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (a7cd67e2b76e Input: applespi - fix warnings detected by sparse)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/applespi.c | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+Merging crypto-current/master (cf144f81a99d padata: use smp_mb in padata_reorder to avoid orphaned padata jobs)
+$ git merge crypto-current/master
+Already up to date.
+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 (5d6fb560729a dmaengine: ste_dma40: fix unneeded variable warning)
+$ git merge slave-dma-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/dma/dw-edma/dw-edma-core.h | 2 +-
+ drivers/dma/dw-edma/dw-edma-pcie.c | 18 ++++++++---------
+ drivers/dma/dw-edma/dw-edma-v0-core.c | 34 ++++++++++++++------------------
+ drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 29 ++++++++++++++-------------
+ drivers/dma/ste_dma40.c | 4 ++--
+ 5 files changed, 42 insertions(+), 45 deletions(-)
+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
+Already up to date.
+Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (2a15d6481741 MIPS: Annotate fall-through in Cavium Octeon code)
+$ git merge mips-fixes/mips-fixes
+Auto-merging arch/mips/kernel/cacheinfo.c
+Merge made by the 'recursive' strategy.
+ arch/mips/cavium-octeon/octeon-usb.c | 1 +
+ arch/mips/kernel/cacheinfo.c | 2 ++
+ arch/mips/kernel/i8253.c | 3 ++-
+ arch/mips/kvm/emulate.c | 1 +
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1)
+$ 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
+Merge made by the 'recursive' strategy.
+ 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 +------
+ 6 files changed, 6 insertions(+), 30 deletions(-)
+Merging kvm-fixes/master (30cd8604323d KVM: x86: Add fixed counters to PMU filter)
+$ 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 (223b2b5030f3 hwmon: (k8temp) documentation: update URL of datasheet)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/k8temp.rst | 2 +-
+ drivers/hwmon/nct6775.c | 3 ++-
+ drivers/hwmon/occ/common.c | 6 ++++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+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/nvdimm/region_devs.c
+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 (5560015d7537 Merge branch 'misc-5.3' 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 (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (e2297f7c3ab3 dt-bindings: pinctrl: stm32: Fix missing 'clocks' property in examples)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (985eaf99eb18 scsi: target: cxgbit: add support for IEEE_8021QAZ_APP_SEL_STREAM selector)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 8 +++++---
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 3 ++-
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+Merging drm-fixes/drm-fixes (5f9e832c1370 Linus 5.3-rc1)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (1bcff32679f6 drm/amdgpu/smu: move fan rpm query into the asic specific code)
+$ git merge amdgpu-fixes/drm-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 19 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 ++
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 9 ++
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 9 ++
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 ++
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 -
+ .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 4 +-
+ .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 +-
+ .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 4 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 30 ++++--
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 39 +++++--
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 11 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 20 +++-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 21 ++--
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 18 ++--
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 22 +++-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c | 37 +++++++
+ drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 6 ++
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 2 +-
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 100 ++++++++++++------
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 10 +-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 114 +++++++++++++++++++--
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 4 +
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 18 ----
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 20 +++-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 +-
+ 38 files changed, 435 insertions(+), 150 deletions(-)
+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
+CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_context.c deleted in HEAD and modified in drm-intel-fixes/for-linux-next-fixes. Version drm-intel-fixes/for-linux-next-fixes 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
+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_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
+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.
+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 935c9c0111aa] Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 +++++++-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 38 ++++++++++++++++++++++++++---
+ drivers/gpu/drm/i915/i915_perf.c | 10 +++++---
+ 3 files changed, 51 insertions(+), 7 deletions(-)
+Merging mmc-fixes/fixes (3a6ffb3c8c32 mmc: mmc_spi: Enable stable writes)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/core/queue.c | 5 +++++
+ drivers/mmc/host/dw_mmc.c | 3 +--
+ drivers/mmc/host/meson-mx-sdio.c | 2 +-
+ drivers/mmc/host/sdhci-sprd.c | 1 +
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-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 (bbb6fc43f131 drm: silence variable 'conn' set but not used)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_client_modeset.c | 2 +-
+ drivers/gpu/drm/drm_framebuffer.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +--
+ drivers/gpu/drm/msm/msm_drv.c | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 4 ++--
+ 5 files changed, 6 insertions(+), 7 deletions(-)
+Merging kspp-gustavo/for-next/kspp (bc512fd704a9 Makefile: Globally enable fall-through warning)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Merge made by the 'recursive' strategy.
+ Documentation/process/deprecated.rst | 14 ++++++
+ Makefile | 3 ++
+ arch/x86/events/intel/core.c | 2 +
+ drivers/firewire/core-device.c | 2 +-
+ drivers/firewire/core-iso.c | 2 +-
+ drivers/firewire/core-topology.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 -
+ drivers/gpu/drm/i915/Makefile | 1 -
+ drivers/gpu/drm/i915/display/intel_display.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
+ drivers/mtd/nand/onenand/onenand_base.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 +-
+ fs/afs/fsclient.c | 51 ++++++++++++++--------
+ fs/afs/yfsclient.c | 54 +++++++++++++++---------
+ 22 files changed, 106 insertions(+), 49 deletions(-)
+Merging kbuild/for-next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge kbuild/for-next
+Already up to date.
+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 (449fa54d6815 dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device)
+$ git merge dma-mapping/for-next
+Already up to date.
+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
+Already up to date!
+Merge made by the 'recursive' strategy.
+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 (f1698cc9dde0 ARM: Document merges)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +-
+ arch/arm/arm-soc-for-next-contents.txt | 16 ++
+ drivers/soc/fsl/dpaa2-console.c | 2 +-
+ drivers/soc/fsl/qe/qe.c | 163 ++++++++-------------
+ 4 files changed, 94 insertions(+), 100 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+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 (90fbe456b5f0 Merge branch 'at91-dt' into at91-next)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/at91sam9261ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9263ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9rlek.dts | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+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
+Already up to date!
+Merge made by the 'recursive' strategy.
+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 2c8930a9fe2c] 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 (6cb9edc169e3 Merge branch 'v5.4-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 14 ++++++++++++++
+ arch/arm/boot/dts/rk3288-veyron-minnie.dts | 14 ++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 ++++++++++++++
+ 3 files changed, 42 insertions(+)
+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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (630f3100e19d Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 +
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +-
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +-
+ arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 8 ++++----
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 8 ++++----
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 11 +++++------
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 10 +++++-----
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +-
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 8 ++++----
+ arch/arm/boot/dts/sun8i-r40.dtsi | 8 ++++----
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 8 ++++----
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 8 ++++----
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 8 ++++----
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++++++----
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 ++++--
+ 50 files changed, 96 insertions(+), 83 deletions(-)
+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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge clk/clk-next
+Already up to date.
+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
+Auto-merging arch/csky/abiv1/strksyms.c
+CONFLICT (content): Merge conflict in arch/csky/abiv1/strksyms.c
+CONFLICT (modify/delete): arch/csky/abiv1/memset.c deleted in HEAD and modified in csky/linux-next. Version csky/linux-next of arch/csky/abiv1/memset.c left in tree.
+Auto-merging arch/csky/abiv1/inc/abi/string.h
+CONFLICT (content): Merge conflict in arch/csky/abiv1/inc/abi/string.h
+Auto-merging arch/csky/abiv1/Makefile
+Resolved 'arch/csky/abiv1/inc/abi/string.h' using previous resolution.
+Resolved 'arch/csky/abiv1/strksyms.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master afec981ed747] Merge remote-tracking branch 'csky/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/csky/abiv1/Makefile | 6 +
+ arch/csky/abiv1/inc/abi/string.h | 15 ++
+ arch/csky/abiv1/memcmp.c | 310 ++++++++++++++++++++++++++++++
+ arch/csky/abiv1/memcopy.h | 179 ++++++++++++++++++
+ arch/csky/abiv1/memmove.c | 93 +++++++++
+ arch/csky/abiv1/memset.c | 71 +++++++
+ arch/csky/abiv1/strcpy.c | 17 ++
+ arch/csky/abiv1/strksyms.c | 5 +
+ arch/csky/abiv1/strlen.c | 89 +++++++++
+ arch/csky/abiv1/wordcopy.c | 397 +++++++++++++++++++++++++++++++++++++++
+ 10 files changed, 1182 insertions(+)
+ 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/memset.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
+Merging h8300/h8300-next (f293d4d4649c h8300: Add missing symbol "BOOT_LINK_OFFSET")
+$ git merge h8300/h8300-next
+Auto-merging arch/h8300/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig | 3 +++
+ arch/h8300/lib/memset.S | 17 ++++++++++-------
+ 2 files changed, 13 insertions(+), 7 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 (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (f23478f6ea2e MIPS: qi_lb60: Move MMC configuration to devicetree)
+$ git merge mips/mips-next
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 7 ++--
+ arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +++++--
+ arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +++++--
+ arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 ++++
+ arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +++++--
+ arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +++++--
+ arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +++++--
+ arch/mips/boot/dts/ingenic/jz4740.dtsi | 21 ++++++++++--
+ arch/mips/boot/dts/ingenic/qi_lb60.dts | 33 +++++++++++++++++++
+ arch/mips/include/asm/cpu-type.h | 2 +-
+ arch/mips/include/asm/cpu.h | 4 +--
+ arch/mips/include/asm/pgtable-32.h | 58 ++++++++++++++++++++++++++++++----
+ arch/mips/include/asm/pgtable-bits.h | 9 ++++--
+ arch/mips/include/asm/pgtable.h | 16 ++++++++--
+ arch/mips/jz4740/board-qi_lb60.c | 32 -------------------
+ arch/mips/kernel/cpu-probe.c | 14 ++++++--
+ arch/mips/kernel/idle.c | 2 +-
+ arch/mips/mm/pgtable-32.c | 20 ++++++++++++
+ arch/mips/mm/sc-mips.c | 2 +-
+ arch/mips/mm/tlbex.c | 2 +-
+ 20 files changed, 217 insertions(+), 71 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 (69245c97560b parisc: Flush ITLB in flush_tlb_all_local() only on split TLB machines)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/kprobes.h | 4 ++++
+ arch/parisc/kernel/pacache.S | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+Merging powerpc/next (5f9e832c1370 Linus 5.3-rc1)
+$ 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
+Already up to date.
+Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology)
+$ git merge risc-v/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../{arm/topology.txt => cpu/cpu-topology.txt} | 256 +++++++++++------
+ MAINTAINERS | 7 +
+ arch/arm/include/asm/topology.h | 20 --
+ arch/arm/kernel/topology.c | 60 +---
+ arch/arm64/include/asm/topology.h | 23 --
+ arch/arm64/kernel/topology.c | 303 +--------------------
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/kernel/smpboot.c | 3 +
+ drivers/base/Kconfig | 2 +-
+ drivers/base/arch_topology.c | 298 ++++++++++++++++++++
+ include/linux/arch_topology.h | 26 ++
+ include/linux/topology.h | 1 +
+ 12 files changed, 514 insertions(+), 486 deletions(-)
+ rename Documentation/devicetree/bindings/{arm/topology.txt => cpu/cpu-topology.txt} (66%)
+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
+Already up to date.
+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
+Already up to date.
+Merging xtensa/xtensa-for-next (6326b440055f Merge branch 'xtensa-5.3' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+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
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call)
+$ git merge ceph/master
+Already up to date.
+Merging cifs/for-next (02845e9936f0 cifs: allow chmod to set mode bits using special sid)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsacl.c | 79 ++++++++++++++++++++++++++++++++++++++++++-----------
+ fs/cifs/cifsproto.h | 1 +
+ fs/cifs/inode.c | 19 ++++++++++---
+ 3 files changed, 79 insertions(+), 20 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
+Already up to date.
+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 (e3110f4526c7 f2fs: fix to read source block before invalidating it)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/file.c | 63 ++++++++++++++++++++-----------------------------------
+ fs/f2fs/gc.c | 57 ++++++++++++++++++++++++++-----------------------
+ fs/f2fs/segment.c | 51 ++++++++++++++++++++------------------------
+ fs/f2fs/segment.h | 1 +
+ 4 files changed, 78 insertions(+), 94 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 (d5b9216fd511 pnfs/flexfiles: Add tracepoints for detecting pnfs fallback to MDS)
+$ git merge nfs/linux-next
+Already up to date.
+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
+Already up to date.
+Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection)
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.txt | 2 +-
+ fs/overlayfs/ovl_entry.h | 1 +
+ fs/overlayfs/super.c | 73 +++++++++++++++++++++------------
+ 3 files changed, 49 insertions(+), 27 deletions(-)
+Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit)
+$ git merge ubifs/linux-next
+Already up to date.
+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 (89b408a68b9d Documentation: filesystem: Convert xfs.txt to ReST)
+$ git merge xfs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (5d907307adc1 iomap: move internal declarations into fs/iomap/)
+$ git merge iomap/iomap-for-next
+Already up to date.
+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 (6b0e42771795 locks: revise generic_add_lease tracepoint)
+$ git merge file-locks/locks-next
+Merge made by the 'recursive' strategy.
+ include/trace/events/filelock.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+Merging vfs/for-next (38760c17cc96 Merge branch 'work.dcache' into for-next)
+$ git merge vfs/for-next
+Auto-merging net/ceph/ceph_common.c
+Auto-merging mm/shmem.c
+Auto-merging kernel/bpf/inode.c
+Auto-merging include/linux/fs_context.h
+Auto-merging include/linux/fs.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/orangefs/orangefs-mod.c
+Auto-merging fs/namespace.c
+CONFLICT (content): Merge conflict in fs/namespace.c
+Auto-merging fs/jffs2/os-linux.h
+Auto-merging fs/jffs2/fs.c
+Auto-merging fs/internal.h
+CONFLICT (content): Merge conflict in 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/devpts/inode.c
+Auto-merging fs/debugfs/inode.c
+Auto-merging fs/coda/inode.c
+Auto-merging fs/ceph/super.h
+Auto-merging fs/ceph/super.c
+CONFLICT (content): Merge conflict in fs/ceph/super.c
+Auto-merging drivers/usb/gadget/function/f_fs.c
+Auto-merging drivers/block/rbd.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.
+Resolved 'fs/ceph/super.c' using previous resolution.
+Resolved 'fs/gfs2/super.c' using previous resolution.
+Resolved 'fs/internal.h' using previous resolution.
+Resolved 'fs/namespace.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 c88e60ac4ade] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++----
+ arch/s390/hypfs/inode.c | 137 +++---
+ drivers/android/binderfs.c | 160 +++----
+ drivers/base/devtmpfs.c | 38 +-
+ drivers/block/rbd.c | 363 ++++++++--------
+ drivers/mtd/mtdcore.h | 1 +
+ drivers/mtd/mtdsuper.c | 181 ++++----
+ drivers/usb/gadget/function/f_fs.c | 233 +++++-----
+ fs/autofs/autofs_i.h | 13 +-
+ fs/autofs/init.c | 9 +-
+ fs/autofs/inode.c | 429 +++++++++---------
+ fs/ceph/cache.c | 9 +-
+ fs/ceph/cache.h | 5 +-
+ fs/ceph/super.c | 694 +++++++++++++++---------------
+ fs/ceph/super.h | 1 -
+ fs/coda/inode.c | 171 +++++---
+ fs/cramfs/inode.c | 69 +--
+ fs/debugfs/inode.c | 185 ++++----
+ fs/devpts/inode.c | 265 ++++++------
+ fs/fs_context.c | 18 +-
+ fs/fs_parser.c | 17 +-
+ 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/jffs2/fs.c | 21 +-
+ fs/jffs2/os-linux.h | 4 +-
+ fs/jffs2/super.c | 172 ++++----
+ fs/orangefs/orangefs-kernel.h | 8 +-
+ fs/orangefs/orangefs-mod.c | 3 +-
+ fs/orangefs/super.c | 192 +++++----
+ fs/pstore/inode.c | 108 +++--
+ fs/ramfs/inode.c | 99 +++--
+ fs/romfs/super.c | 46 +-
+ fs/squashfs/super.c | 100 +++--
+ fs/super.c | 203 ++++++---
+ 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/fs.h | 3 -
+ include/linux/fs_context.h | 15 +-
+ include/linux/mtd/super.h | 6 +-
+ include/linux/ramfs.h | 6 +-
+ include/linux/shmem_fs.h | 3 +-
+ init/do_mounts.c | 11 +-
+ kernel/bpf/inode.c | 92 ++--
+ mm/shmem.c | 391 +++++++++++------
+ net/ceph/ceph_common.c | 410 ++++++++----------
+ 50 files changed, 3584 insertions(+), 3291 deletions(-)
+$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch
+Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()"
+$ git reset HEAD^
+Unstaged changes after reset:
+M Documentation/filesystems/vfs.rst
+$ git add -A .
+$ git commit -v -a --amend
+[master 43a8220e7fbc] Merge remote-tracking branch 'vfs/for-next'
+ Date: Tue Jul 23 09:41:57 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
+Already up to date.
+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
+Merge made by the 'recursive' strategy.
+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 (9cbd0d64180c hwmon: (adt7475) Convert to use hwmon_device_register_with_groups())
+$ git merge hwmon-staging/hwmon-next
+Removing drivers/hwmon/ads1015.c
+Auto-merging MAINTAINERS
+Removing Documentation/hwmon/ads1015.rst
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hwmon/lm75.txt | 1 +
+ .../bindings/{hwmon => iio/adc}/ads1015.txt | 0
+ Documentation/hwmon/ads1015.rst | 90 ------
+ Documentation/hwmon/index.rst | 2 +-
+ Documentation/hwmon/lm75.rst | 6 +-
+ Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 ++-
+ MAINTAINERS | 8 -
+ arch/x86/kernel/amd_nb.c | 3 +
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/ads1015.c | 324 ---------------------
+ drivers/hwmon/adt7475.c | 146 ++++------
+ drivers/hwmon/asb100.c | 12 +-
+ drivers/hwmon/k10temp.c | 1 +
+ drivers/hwmon/k8temp.c | 233 +++++----------
+ drivers/hwmon/lm75.c | 10 +
+ drivers/hwmon/pmbus/max31785.c | 2 -
+ drivers/hwmon/smm665.c | 6 +-
+ drivers/hwmon/w83781d.c | 6 +-
+ drivers/iio/adc/Kconfig | 2 +-
+ include/linux/pci_ids.h | 1 +
+ 21 files changed, 178 insertions(+), 719 deletions(-)
+ rename Documentation/devicetree/bindings/{hwmon => iio/adc}/ads1015.txt (100%)
+ delete mode 100644 Documentation/hwmon/ads1015.rst
+ rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%)
+ delete mode 100644 drivers/hwmon/ads1015.c
+Merging jc_docs/docs-next (143134ba4983 doc:it_IT: rephrase statement)
+$ git merge jc_docs/docs-next
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/generic-counter.rst | 4 ++--
+ .../translations/it_IT/doc-guide/sphinx.rst | 19 +++++++++-------
+ .../it_IT/process/maintainer-pgp-guide.rst | 25 ++++++++++++++--------
+ 3 files changed, 29 insertions(+), 19 deletions(-)
+Merging v4l-dvb/master (66193b24514c media: dvbsky: add support for Mygica T230C v2)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/media/rockchip-vpu.txt | 18 +-
+ Documentation/media/uapi/v4l/biblio.rst | 10 +
+ Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 323 +++++++++++++
+ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 20 +
+ drivers/media/common/saa7146/saa7146_video.c | 16 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 3 -
+ drivers/media/dvb-frontends/si2168.c | 11 +
+ drivers/media/dvb-frontends/si2168.h | 1 +
+ drivers/media/pci/bt8xx/bttv-driver.c | 19 -
+ drivers/media/pci/bt8xx/bttv-risc.c | 8 +-
+ drivers/media/pci/bt8xx/bttvp.h | 1 -
+ drivers/media/pci/cobalt/cobalt-v4l2.c | 5 -
+ drivers/media/pci/cx23885/cx23885-417.c | 1 -
+ drivers/media/pci/cx23885/cx23885-video.c | 7 +-
+ drivers/media/pci/cx23885/cx23885.h | 1 -
+ drivers/media/pci/cx25821/cx25821-video.c | 7 +-
+ drivers/media/pci/cx25821/cx25821.h | 1 -
+ drivers/media/pci/cx88/cx88-blackbird.c | 2 -
+ drivers/media/pci/cx88/cx88-video.c | 17 +-
+ drivers/media/pci/cx88/cx88.h | 1 -
+ drivers/media/pci/dt3155/dt3155.c | 1 -
+ drivers/media/pci/meye/meye.c | 3 -
+ drivers/media/pci/saa7134/saa7134-empress.c | 2 -
+ drivers/media/pci/saa7134/saa7134-video.c | 28 +-
+ drivers/media/pci/saa7134/saa7134.h | 1 -
+ drivers/media/pci/saa7164/saa7164-encoder.c | 1 -
+ drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 7 -
+ drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 -
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 2 -
+ drivers/media/pci/tw68/tw68-video.c | 13 -
+ drivers/media/pci/tw68/tw68.h | 1 -
+ drivers/media/platform/am437x/am437x-vpfe.c | 24 +-
+ drivers/media/platform/coda/coda-common.c | 4 +-
+ drivers/media/platform/davinci/vpbe_display.c | 17 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 3 +-
+ drivers/media/platform/davinci/vpif_capture.c | 14 +-
+ drivers/media/platform/davinci/vpif_display.c | 7 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 22 -
+ drivers/media/platform/exynos-gsc/gsc-core.h | 2 -
+ drivers/media/platform/exynos4-is/fimc-capture.c | 3 -
+ drivers/media/platform/exynos4-is/fimc-core.c | 20 -
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 -
+ drivers/media/platform/exynos4-is/fimc-isp.c | 3 -
+ drivers/media/platform/exynos4-is/fimc-lite.c | 8 -
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 1 -
+ drivers/media/platform/fsl-viu.c | 7 +-
+ drivers/media/platform/m2m-deinterlace.c | 14 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 15 +-
+ drivers/media/platform/mx2_emmaprp.c | 7 +-
+ drivers/media/platform/omap/omap_vout.c | 13 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 11 +-
+ drivers/media/platform/pxa_camera.c | 3 -
+ drivers/media/platform/s3c-camif/camif-capture.c | 16 +-
+ drivers/media/platform/s3c-camif/camif-core.c | 6 -
+ drivers/media/platform/s3c-camif/camif-core.h | 1 -
+ drivers/media/platform/s5p-g2d/g2d.c | 13 +-
+ drivers/media/platform/s5p-g2d/g2d.h | 1 -
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 31 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 -
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 -
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 14 +-
+ drivers/media/platform/sh_veu.c | 23 +-
+ drivers/media/platform/sh_vou.c | 17 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +-
+ drivers/media/platform/ti-vpe/cal.c | 5 +-
+ drivers/media/platform/ti-vpe/vpe.c | 12 -
+ drivers/media/platform/via-camera.c | 9 +-
+ drivers/media/platform/vsp1/vsp1_histo.c | 3 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 10 +-
+ drivers/media/platform/xilinx/xilinx-dma.c | 18 +-
+ drivers/media/platform/xilinx/xilinx-vip.c | 16 +-
+ drivers/media/platform/xilinx/xilinx-vip.h | 2 -
+ drivers/media/rc/mceusb.c | 67 ++-
+ drivers/media/rc/mtk-cir.c | 10 +-
+ drivers/media/usb/airspy/airspy.c | 3 -
+ drivers/media/usb/au0828/au0828-video.c | 4 -
+ drivers/media/usb/cpia2/cpia2_v4l.c | 23 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 1 -
+ drivers/media/usb/cx231xx/cx231xx-video.c | 2 -
+ drivers/media/usb/cx231xx/cx231xx.h | 1 -
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 5 +
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 22 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 8 -
+ drivers/media/usb/em28xx/em28xx.h | 2 -
+ drivers/media/usb/go7007/go7007-v4l2.c | 11 -
+ drivers/media/usb/gspca/gspca.c | 9 -
+ drivers/media/usb/hdpvr/hdpvr-video.c | 3 -
+ drivers/media/usb/msi2500/msi2500.c | 8 -
+ drivers/media/usb/pwc/pwc-v4l.c | 5 -
+ drivers/media/usb/s2255/s2255drv.c | 8 -
+ drivers/media/usb/stk1160/stk1160-v4l.c | 2 -
+ drivers/media/usb/stk1160/stk1160.h | 1 -
+ drivers/media/usb/stkwebcam/stk-webcam.c | 5 -
+ drivers/media/usb/tm6000/tm6000-video.c | 4 -
+ drivers/media/usb/tm6000/tm6000.h | 1 -
+ drivers/media/usb/usbtv/usbtv-video.c | 2 -
+ drivers/media/usb/usbvision/usbvision-video.c | 18 +-
+ drivers/media/usb/usbvision/usbvision.h | 1 -
+ drivers/media/usb/zr364xx/zr364xx.c | 7 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 157 +++---
+ drivers/media/v4l2-core/v4l2-ioctl.c | 30 +-
+ drivers/staging/media/hantro/Kconfig | 2 +-
+ drivers/staging/media/hantro/Makefile | 4 +-
+ drivers/staging/media/hantro/hantro.h | 27 ++
+ drivers/staging/media/hantro/hantro_drv.c | 7 +
+ drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 526 +++++++++++++++++++++
+ drivers/staging/media/hantro/hantro_hw.h | 17 +
+ drivers/staging/media/hantro/hantro_v4l2.c | 1 +
+ drivers/staging/media/hantro/hantro_vp8.c | 188 ++++++++
+ drivers/staging/media/hantro/rk3288_vpu_hw.c | 22 +-
+ drivers/staging/media/hantro/rk3399_vpu_hw.c | 17 +
+ drivers/staging/media/omap4iss/iss_video.c | 40 +-
+ drivers/staging/media/omap4iss/iss_video.h | 2 -
+ drivers/staging/media/soc_camera/soc_camera.c | 2 -
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 29 --
+ .../vc04_services/bcm2835-camera/mmal-common.h | 1 -
+ include/media/drv-intf/exynos-fimc.h | 2 -
+ include/media/drv-intf/saa7146_vv.h | 1 -
+ include/media/drv-intf/soc_mediabus.h | 2 -
+ include/media/dvb-usb-ids.h | 1 +
+ include/media/rc-map.h | 16 -
+ include/media/v4l2-ctrls.h | 3 +
+ include/media/vp8-ctrls.h | 110 +++++
+ 125 files changed, 1640 insertions(+), 765 deletions(-)
+ create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+ create mode 100644 drivers/staging/media/hantro/hantro_vp8.c
+ create mode 100644 include/media/vp8-ctrls.h
+$ git am -3 ../patches/0001-media-uapi-new-files-needs-types.h.patch
+Applying: media: uapi: new file needs types.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/media/vp8-ctrls.h
+$ git add -A .
+$ git commit -v -a --amend
+[master c26f86a30d9d] Merge remote-tracking branch 'v4l-dvb/master'
+ Date: Tue Jul 23 10:02:00 2019 +1000
+Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (f76cb066edd1 powercap: Invoke powercap_init() and rapl_init() earlier)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/powercap/intel_rapl_common.c | 2 +-
+ drivers/powercap/powercap_sys.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (3355c91b7939 cpufreq: ap806: Add NULL check after kcalloc)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/opp/sun50i-nvmem-cpufreq.txt | 167 +++++++++++++++
+ MAINTAINERS | 7 +
+ drivers/cpufreq/Kconfig.arm | 12 ++
+ drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/armada-8k-cpufreq.c | 2 +
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +
+ drivers/cpufreq/sun50i-cpufreq-nvmem.c | 226 +++++++++++++++++++++
+ 7 files changed, 417 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
+ create mode 100644 drivers/cpufreq/sun50i-cpufreq-nvmem.c
+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 (6c395f66e98c drivers: thermal: processor_thermal_device: Fix build warning)
+$ git merge thermal/next
+Already up to date.
+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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (dd853b2dfa65 Merge branch 'stable/for-linus-5.2' into linux-next)
+$ git merge swiotlb/linux-next
+Auto-merging drivers/xen/swiotlb-xen.c
+Merge made by the 'recursive' strategy.
+ drivers/xen/swiotlb-xen.c | 32 ++++++++------------------------
+ 1 file changed, 8 insertions(+), 24 deletions(-)
+Merging rdma/for-next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge rdma/for-next
+Already up to date.
+Merging net-next/master (66b5f1c43984 net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier)
+$ git merge net-next/master
+Merge made by the 'recursive' strategy.
+ include/net/ndisc.h | 1 +
+ net/ipv6/ndisc.c | 1 +
+ 2 files changed, 2 insertions(+)
+Merging bpf-next/master (66b5f1c43984 net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier)
+$ 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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
+$ 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 (0ed8a186eaff Bluetooth: hidp: Let hidp_send_message return number of queued bytes)
+$ 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 ++++-
+ include/net/bluetooth/hci_core.h | 2 ++
+ net/bluetooth/hci_request.c | 29 ++++++++++++++++++++++-------
+ net/bluetooth/hidp/core.c | 9 +++++++--
+ 7 files changed, 70 insertions(+), 12 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.
+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 (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (8ee795625665 Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-next)
+$ git merge drm/drm-next
+Already up to date.
+Merging amdgpu/drm-next (0e738e03472a drm/amdkfd/kfd_mqd_manager_v10: Avoid fall-through warning)
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
+Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Recorded preimage for 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c'
+Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc_stream.c'
+Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c'
+Recorded preimage for 'drivers/gpu/drm/amd/powerplay/navi10_ppt.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c'.
+Recorded resolution for 'drivers/gpu/drm/amd/display/dc/core/dc_stream.c'.
+Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c'.
+Recorded resolution for 'drivers/gpu/drm/amd/powerplay/navi10_ppt.c'.
+[master f92195bf77d8] Merge remote-tracking branch 'amdgpu/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/amd/amdgpu/Makefile | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 324 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 190 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 34 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 76 +-
+ drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 57 +
+ drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 375 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 112 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 517 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 33 +
+ drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 66 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 24 +
+ drivers/gpu/drm/amd/amdgpu/nv.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 331 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 116 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 265 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 38 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1417 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 4 +
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 485 +
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 83 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 59 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 24 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 68 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 16 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 139 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 61 +
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 36 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 90 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 71 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 355 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 +
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 27 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 44 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 21 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 56 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 11 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 14 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 28 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 7 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 30 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 50 +-
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 70 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 27 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 64 +-
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 33 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 16 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 688 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 62 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 176 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 34 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 365 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 +
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 5109 +++
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.h | 32 +
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 +
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 1 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 73 +-
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +-
+ .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 42 +-
+ .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 41 +-
+ .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +-
+ .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 +
+ drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 68 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 3 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 134 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 46 +
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 +
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 +
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 +-
+ drivers/gpu/drm/amd/display/include/audio_types.h | 4 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 8 +
+ .../amd/display/include/gpio_service_interface.h | 18 +-
+ .../drm/amd/display/include/link_service_types.h | 17 +-
+ .../drm/amd/display/modules/color/color_gamma.c | 163 +-
+ .../drm/amd/display/modules/color/color_gamma.h | 9 +
+ drivers/gpu/drm/amd/include/arct_ip_offset.h | 1654 +
+ .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 4 +
+ .../include/asic_reg/mmhub/mmhub_9_4_1_default.h | 3933 ++
+ .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 7753 ++++
+ .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 44884 +++++++++++++++++++
+ .../include/asic_reg/sdma0/sdma0_4_2_2_offset.h | 1051 +
+ .../include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h | 3002 ++
+ .../include/asic_reg/sdma1/sdma1_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma2/sdma2_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma3/sdma3_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma4/sdma4_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma5/sdma5_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma6/sdma6_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h | 2956 ++
+ .../include/asic_reg/sdma7/sdma7_4_2_2_offset.h | 1043 +
+ .../include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h | 2956 ++
+ .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 979 +
+ .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 3609 ++
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 +
+ drivers/gpu/drm/amd/include/navi14_ip_offset.h | 1119 +
+ drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 11 +-
+ drivers/gpu/drm/amd/powerplay/Makefile | 2 +-
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 31 +-
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 126 +
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 28 +
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 11 +
+ drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 +
+ .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 878 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 15 +-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 81 +-
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 54 +-
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 80 +-
+ include/drm/amd_asic_type.h | 2 +
+ 192 files changed, 111868 insertions(+), 1516 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/arct_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h
+ create mode 100644 drivers/gpu/drm/amd/include/arct_ip_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/navi14_ip_offset.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h
+Merging drm-intel/for-linux-next (3bdd4f848531 drm/i915: Rely on spinlock protection for GPU error capture)
+$ git merge drm-intel/for-linux-next
+Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.h
+Removing drivers/gpu/drm/i915/i915_timeline.h
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_gpu_error.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/gem/i915_gem_mman.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/Makefile.header-test
+Auto-merging drivers/gpu/drm/i915/Makefile
+Recorded preimage for 'drivers/gpu/drm/i915/display/intel_dp.c'
+Resolved 'drivers/gpu/drm/i915/gt/intel_workarounds.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/display/intel_dp.c'.
+[master 77c395ac72be] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/kernel/early-quirks.c | 1 +
+ 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 | 185 +-
+ 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 | 30 +-
+ 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 | 95 +-
+ 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 | 356 ++--
+ 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 | 292 +--
+ 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 | 652 +++++--
+ 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 | 75 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +-
+ 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 | 314 +--
+ drivers/gpu/drm/i915/display/intel_sprite.c | 335 +++-
+ 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 | 9 +-
+ 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 | 61 +-
+ 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 | 125 +-
+ drivers/gpu/drm/i915/gt/intel_context.h | 18 +-
+ 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 | 209 +-
+ 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 | 1001 ++++++----
+ 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 | 660 +++----
+ 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 | 166 +-
+ .../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 | 227 ++-
+ 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 | 15 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 513 +++--
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 391 +++-
+ 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 | 171 +-
+ drivers/gpu/drm/i915/i915_drv.c | 188 +-
+ drivers/gpu/drm/i915/i915_drv.h | 232 +--
+ drivers/gpu/drm/i915/i915_fixed.h | 5 +
+ drivers/gpu/drm/i915/i915_gem.c | 312 ++-
+ 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 | 2014 ++++++++------------
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 197 +-
+ 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 | 522 ++---
+ drivers/gpu/drm/i915/i915_gpu_error.h | 71 +-
+ drivers/gpu/drm/i915/i915_irq.c | 801 ++++----
+ drivers/gpu/drm/i915/i915_irq.h | 45 +-
+ drivers/gpu/drm/i915/i915_params.c | 5 +-
+ drivers/gpu/drm/i915/i915_params.h | 2 +-
+ drivers/gpu/drm/i915/i915_pci.c | 39 +-
+ drivers/gpu/drm/i915/i915_perf.c | 328 +++-
+ 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 | 219 ++-
+ 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 | 37 +-
+ 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 +
+ 237 files changed, 11542 insertions(+), 8834 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 (d808097627e5 drm/i915: Fix up broken merge)
+$ git merge drm-misc/for-linux-next
+Removing drivers/gpu/drm/vboxvideo/vbox_prime.c
+Auto-merging drivers/gpu/drm/msm/msm_gem.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Removing drivers/gpu/drm/mgag200/mgag200_fb.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Removing drivers/gpu/drm/ast/ast_fb.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
+Removing Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt
+Removing Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt
+Removing Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt
+Removing Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt
+Removing Documentation/devicetree/bindings/display/panel/panel.txt
+Removing Documentation/devicetree/bindings/display/panel/panel-lvds.txt
+Removing Documentation/devicetree/bindings/display/panel/panel-common.txt
+Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt
+Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt
+Removing Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt
+Removing Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt
+Removing Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt
+Removing Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt
+Merge made by the 'recursive' strategy.
+ .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 -
+ .../display/panel/ampire,am-480272h3tmqw-t01h.yaml | 42 +
+ .../display/panel/arm,versatile-tft-panel.txt | 2 +-
+ .../display/panel/armadeus,st0700-adapt.txt | 9 -
+ .../display/panel/armadeus,st0700-adapt.yaml | 33 +
+ .../display/panel/bananapi,s070wv20-ct16.txt | 12 -
+ .../display/panel/bananapi,s070wv20-ct16.yaml | 31 +
+ .../bindings/display/panel/boe,himax8279d.txt | 24 +
+ .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 -
+ .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 31 +
+ .../bindings/display/panel/edt,et-series.txt | 2 +-
+ .../bindings/display/panel/giantplus,gpm940b0.txt | 12 +
+ .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 -
+ .../display/panel/innolux,ee101ia-01d.yaml | 31 +
+ .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 +
+ .../devicetree/bindings/display/panel/lvds.yaml | 107 +++
+ .../display/panel/mitsubishi,aa104xd12.txt | 47 --
+ .../display/panel/mitsubishi,aa104xd12.yaml | 75 ++
+ .../display/panel/mitsubishi,aa121td01.txt | 47 --
+ .../display/panel/mitsubishi,aa121td01.yaml | 74 ++
+ .../display/panel/ortustech,com37h3m05dtc.txt | 12 +
+ .../display/panel/ortustech,com37h3m99dtc.txt | 12 +
+ .../bindings/display/panel/panel-common.txt | 101 ---
+ .../bindings/display/panel/panel-common.yaml | 149 ++++
+ .../bindings/display/panel/panel-lvds.txt | 121 ---
+ .../devicetree/bindings/display/panel/panel.txt | 4 -
+ .../bindings/display/panel/pda,91-00156-a0.txt | 14 -
+ .../bindings/display/panel/pda,91-00156-a0.yaml | 31 +
+ .../panel/raspberrypi,7inch-touchscreen.txt | 49 --
+ .../panel/raspberrypi,7inch-touchscreen.yaml | 71 ++
+ .../bindings/display/panel/raydium,rm67191.txt | 41 +
+ .../display/panel/rocktech,jh057n00900.txt | 5 +
+ .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 -
+ .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 68 ++
+ .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 +
+ .../bindings/display/panel/sharp,ls020b1dd01d.txt | 12 +
+ .../bindings/display/panel/simple-panel.txt | 29 +-
+ .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 -
+ .../display/panel/tfc,s9700rtwv43tr-01b.yaml | 33 +
+ .../bindings/display/panel/tpo,tpg110.txt | 70 --
+ .../bindings/display/panel/tpo,tpg110.yaml | 101 +++
+ .../bindings/display/rockchip/rockchip-lvds.txt | 11 -
+ Documentation/gpu/drm-mm.rst | 40 +-
+ Documentation/gpu/introduction.rst | 16 +
+ Documentation/gpu/todo.rst | 56 +-
+ Documentation/media/uapi/v4l/subdev-formats.rst | 107 +++
+ MAINTAINERS | 19 +-
+ drivers/dma-buf/reservation.c | 65 +-
+ drivers/gpu/drm/Kconfig | 2 +
+ drivers/gpu/drm/Makefile | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 5 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 6 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 5 +-
+ drivers/gpu/drm/armada/armada_drv.c | 3 +-
+ drivers/gpu/drm/armada/armada_gem.c | 5 +-
+ drivers/gpu/drm/armada/armada_gem.h | 3 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +-
+ drivers/gpu/drm/ast/Makefile | 2 +-
+ drivers/gpu/drm/ast/ast_dp501.c | 5 +-
+ drivers/gpu/drm/ast/ast_drv.c | 22 +-
+ drivers/gpu/drm/ast/ast_drv.h | 46 +-
+ drivers/gpu/drm/ast/ast_fb.c | 346 --------
+ drivers/gpu/drm/ast/ast_main.c | 75 +-
+ drivers/gpu/drm/ast/ast_mode.c | 47 +-
+ drivers/gpu/drm/ast/ast_post.c | 7 +-
+ drivers/gpu/drm/ast/ast_ttm.c | 7 +-
+ drivers/gpu/drm/ati_pcigart.c | 10 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 18 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 12 +-
+ drivers/gpu/drm/bochs/bochs.h | 6 +-
+ drivers/gpu/drm/bochs/bochs_drv.c | 11 +-
+ drivers/gpu/drm/bochs/bochs_hw.c | 4 +
+ drivers/gpu/drm/bochs/bochs_kms.c | 9 +-
+ drivers/gpu/drm/bridge/Kconfig | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +-
+ drivers/gpu/drm/bridge/sii902x.c | 3 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 ++
+ drivers/gpu/drm/bridge/tc358767.c | 673 +++++++++-------
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 46 +-
+ drivers/gpu/drm/cirrus/cirrus.c | 2 +-
+ drivers/gpu/drm/drm_agpsupport.c | 45 +-
+ drivers/gpu/drm/drm_client.c | 61 +-
+ drivers/gpu/drm/drm_connector.c | 3 +-
+ drivers/gpu/drm/drm_dma.c | 2 +-
+ drivers/gpu/drm/drm_dp_helper.c | 31 +-
+ drivers/gpu/drm/drm_drv.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 51 +-
+ drivers/gpu/drm/drm_file.c | 9 +-
+ drivers/gpu/drm/drm_gem.c | 4 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 72 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 1 +
+ drivers/gpu/drm/drm_gem_vram_helper.c | 78 +-
+ drivers/gpu/drm/drm_ioc32.c | 13 +-
+ drivers/gpu/drm/drm_ioctl.c | 139 ++--
+ drivers/gpu/drm/drm_legacy_misc.c | 2 +-
+ drivers/gpu/drm/drm_lock.c | 2 +-
+ drivers/gpu/drm/drm_memory.c | 2 +-
+ drivers/gpu/drm/drm_mm.c | 2 +-
+ drivers/gpu/drm/drm_mode_object.c | 4 +
+ drivers/gpu/drm/drm_modes.c | 17 +-
+ drivers/gpu/drm/drm_prime.c | 867 +++++++++++----------
+ drivers/gpu/drm/drm_scatter.c | 2 +-
+ drivers/gpu/drm/drm_syncobj.c | 1 +
+ drivers/gpu/drm/drm_vm.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 28 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 14 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 -
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 -
+ drivers/gpu/drm/gm12u320/Kconfig | 9 +
+ drivers/gpu/drm/gm12u320/Makefile | 2 +
+ drivers/gpu/drm/gm12u320/gm12u320.c | 814 +++++++++++++++++++
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 10 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 6 +
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 10 +-
+ drivers/gpu/drm/i2c/ch7006_priv.h | 1 -
+ drivers/gpu/drm/i2c/sil164_drv.c | 3 +-
+ drivers/gpu/drm/i810/i810_dma.c | 17 +-
+ drivers/gpu/drm/i810/i810_drv.c | 8 +-
+ drivers/gpu/drm/i810/i810_drv.h | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.c | 8 +-
+ drivers/gpu/drm/i915/i915_drv.h | 3 +-
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 13 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 22 +-
+ drivers/gpu/drm/imx/imx-tve.c | 10 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 8 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 5 +-
+ drivers/gpu/drm/imx/parallel-display.c | 8 +-
+ drivers/gpu/drm/ingenic/ingenic-drm.c | 75 +-
+ drivers/gpu/drm/lima/lima_device.c | 41 +-
+ drivers/gpu/drm/lima/lima_drv.c | 20 +-
+ drivers/gpu/drm/lima/lima_gem.c | 2 +-
+ drivers/gpu/drm/lima/lima_gem_prime.c | 3 +-
+ drivers/gpu/drm/lima/lima_object.c | 9 +-
+ drivers/gpu/drm/lima/lima_object.h | 3 +-
+ drivers/gpu/drm/lima/lima_vm.h | 4 +-
+ drivers/gpu/drm/mcde/mcde_drv.c | 10 +-
+ drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 18 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +-
+ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 35 +-
+ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 -
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +-
+ drivers/gpu/drm/meson/meson_crtc.c | 16 +-
+ drivers/gpu/drm/meson/meson_drv.c | 33 +-
+ drivers/gpu/drm/meson/meson_drv.h | 11 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +-
+ drivers/gpu/drm/meson/meson_overlay.c | 13 +-
+ drivers/gpu/drm/meson/meson_plane.c | 16 +-
+ drivers/gpu/drm/meson/meson_registers.h | 2 +
+ drivers/gpu/drm/meson/meson_vclk.c | 7 +-
+ drivers/gpu/drm/meson/meson_vclk.h | 4 +
+ drivers/gpu/drm/meson/meson_venc.c | 10 +-
+ drivers/gpu/drm/meson/meson_venc.h | 2 +
+ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +-
+ drivers/gpu/drm/meson/meson_viu.c | 7 +-
+ drivers/gpu/drm/meson/meson_vpp.c | 7 +-
+ drivers/gpu/drm/meson/meson_vpp.h | 3 +
+ drivers/gpu/drm/mga/mga_dma.c | 13 +-
+ drivers/gpu/drm/mga/mga_drv.c | 7 +-
+ drivers/gpu/drm/mga/mga_drv.h | 27 +-
+ drivers/gpu/drm/mga/mga_ioc32.c | 3 +-
+ drivers/gpu/drm/mga/mga_irq.c | 12 +-
+ drivers/gpu/drm/mga/mga_state.c | 8 +-
+ drivers/gpu/drm/mga/mga_warp.c | 4 +-
+ drivers/gpu/drm/mgag200/Makefile | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_cursor.c | 6 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 40 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 315 --------
+ drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 96 +--
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 46 +-
+ drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 8 +-
+ drivers/gpu/drm/msm/msm_drv.c | 25 +-
+ drivers/gpu/drm/msm/msm_gem.c | 8 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 16 +-
+ drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 6 -
+ drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 -
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 32 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +
+ drivers/gpu/drm/omapdrm/omap_drv.c | 22 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h | 5 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 2 +
+ drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +-
+ drivers/gpu/drm/omapdrm/omap_irq.c | 2 +
+ drivers/gpu/drm/panel/Kconfig | 18 +
+ drivers/gpu/drm/panel/Makefile | 2 +
+ drivers/gpu/drm/panel/panel-novatek-nt39016.c | 359 +++++++++
+ drivers/gpu/drm/panel/panel-raydium-rm67191.c | 668 ++++++++++++++++
+ drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 44 +-
+ drivers/gpu/drm/panel/panel-simple.c | 314 +++++++-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +-
+ drivers/gpu/drm/panfrost/panfrost_gem.c | 2 -
+ drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +-
+ drivers/gpu/drm/pl111/pl111_display.c | 6 +-
+ drivers/gpu/drm/pl111/pl111_drm.h | 11 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 13 +-
+ drivers/gpu/drm/pl111/pl111_nomadik.h | 3 +-
+ drivers/gpu/drm/pl111/pl111_versatile.c | 9 +-
+ drivers/gpu/drm/pl111/pl111_versatile.h | 3 +
+ drivers/gpu/drm/pl111/pl111_vexpress.c | 1 +
+ drivers/gpu/drm/qxl/qxl_cmd.c | 2 +
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 3 +
+ drivers/gpu/drm/qxl/qxl_draw.c | 2 +
+ drivers/gpu/drm/qxl/qxl_drv.c | 15 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 7 +-
+ drivers/gpu/drm/qxl/qxl_gem.c | 1 -
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +
+ drivers/gpu/drm/qxl/qxl_irq.c | 4 +
+ drivers/gpu/drm/qxl/qxl_kms.c | 9 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 6 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 16 +-
+ drivers/gpu/drm/r128/r128_ioc32.c | 3 +-
+ drivers/gpu/drm/r128/r128_irq.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_prime.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 1 -
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +-
+ drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 -
+ drivers/gpu/drm/scheduler/sched_entity.c | 3 +
+ drivers/gpu/drm/scheduler/sched_fence.c | 6 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 3 +-
+ drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 4 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 -
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.h | 1 +
+ drivers/gpu/drm/shmobile/shmob_drm_regs.h | 3 +
+ drivers/gpu/drm/sti/sti_drv.c | 6 +-
+ drivers/gpu/drm/sti/sti_tvout.c | 16 +-
+ drivers/gpu/drm/stm/drv.c | 5 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +-
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 -
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +-
+ drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 +-
+ drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +-
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +-
+ drivers/gpu/drm/sun4i/sun8i_csc.c | 157 +++-
+ drivers/gpu/drm/sun4i/sun8i_csc.h | 6 +-
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +-
+ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 +-
+ drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +-
+ drivers/gpu/drm/tegra/drm.c | 30 +-
+ drivers/gpu/drm/tegra/gem.c | 7 +-
+ drivers/gpu/drm/tegra/gem.h | 3 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 24 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 +
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +-
+ drivers/gpu/drm/tinydrm/hx8357d.c | 2 +-
+ drivers/gpu/drm/tinydrm/ili9225.c | 3 +-
+ drivers/gpu/drm/tinydrm/ili9341.c | 2 +-
+ drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +-
+ drivers/gpu/drm/tinydrm/repaper.c | 3 +-
+ drivers/gpu/drm/tinydrm/st7586.c | 3 +-
+ drivers/gpu/drm/tinydrm/st7735r.c | 3 +-
+ drivers/gpu/drm/tve200/tve200_display.c | 8 +-
+ drivers/gpu/drm/tve200/tve200_drm.h | 15 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 8 +-
+ drivers/gpu/drm/udl/udl_connector.c | 4 +-
+ drivers/gpu/drm/udl/udl_connector.h | 2 +
+ drivers/gpu/drm/udl/udl_dmabuf.c | 11 +-
+ drivers/gpu/drm/udl/udl_drv.c | 9 +-
+ drivers/gpu/drm/udl/udl_drv.h | 11 +-
+ drivers/gpu/drm/udl/udl_encoder.c | 6 +-
+ drivers/gpu/drm/udl/udl_fb.c | 15 +-
+ drivers/gpu/drm/udl/udl_gem.c | 9 +-
+ drivers/gpu/drm/udl/udl_main.c | 6 +-
+ drivers/gpu/drm/udl/udl_modeset.c | 6 +-
+ drivers/gpu/drm/udl/udl_transfer.c | 4 -
+ drivers/gpu/drm/v3d/v3d_debugfs.c | 3 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 6 +-
+ drivers/gpu/drm/v3d/v3d_drv.h | 13 +-
+ drivers/gpu/drm/v3d/v3d_gem.c | 12 +-
+ drivers/gpu/drm/v3d/v3d_irq.c | 2 +
+ drivers/gpu/drm/vboxvideo/Makefile | 2 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 13 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.h | 12 -
+ drivers/gpu/drm/vboxvideo/vbox_prime.c | 56 --
+ drivers/gpu/drm/vc4/vc4_bo.c | 7 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 11 +-
+ drivers/gpu/drm/vc4/vc4_debugfs.c | 1 -
+ drivers/gpu/drm/vc4/vc4_drv.c | 9 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 20 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c | 17 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 2 +
+ drivers/gpu/drm/vc4/vc4_hvs.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 4 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 9 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 14 +-
+ drivers/gpu/drm/vc4/vc4_v3d.c | 4 +
+ drivers/gpu/drm/vgem/vgem_drv.c | 21 +-
+ drivers/gpu/drm/vgem/vgem_drv.h | 1 -
+ drivers/gpu/drm/vgem/vgem_fence.c | 24 +-
+ drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 7 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +-
+ drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 26 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 6 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +-
+ drivers/gpu/drm/vkms/Makefile | 2 +-
+ .../gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} | 169 ++--
+ drivers/gpu/drm/vkms/vkms_crtc.c | 100 ++-
+ drivers/gpu/drm/vkms/vkms_drv.c | 50 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 44 +-
+ drivers/gpu/drm/vkms/vkms_gem.c | 1 +
+ drivers/gpu/drm/vkms/vkms_output.c | 6 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 46 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 -
+ drivers/gpu/drm/xen/xen_drm_front.c | 16 +-
+ drivers/gpu/drm/xen/xen_drm_front.h | 11 +-
+ drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +-
+ drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 +
+ drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +-
+ drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +-
+ drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 +-
+ drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 +-
+ drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 8 +-
+ drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
+ drivers/gpu/drm/zte/zx_plane.c | 2 +-
+ drivers/gpu/drm/zte/zx_tvenc.c | 4 +-
+ drivers/gpu/drm/zte/zx_vga.c | 4 +-
+ drivers/gpu/drm/zte/zx_vou.c | 5 +-
+ include/drm/drm_agpsupport.h | 14 -
+ include/drm/drm_client.h | 2 +
+ include/drm/drm_connector.h | 3 +
+ include/drm/drm_drv.h | 114 ++-
+ include/drm/drm_gem.h | 18 +-
+ include/drm/drm_gem_framebuffer_helper.h | 7 -
+ include/drm/drm_gem_vram_helper.h | 27 +-
+ include/drm/drm_ioctl.h | 3 +
+ include/drm/drm_mode_config.h | 7 +
+ include/drm/drm_panel.h | 1 +
+ include/drm/drm_prime.h | 41 +-
+ include/drm/drm_vblank.h | 1 -
+ include/drm/drm_vram_mm_helper.h | 2 +
+ include/linux/reservation.h | 46 +-
+ include/linux/soc/amlogic/meson-canvas.h | 1 +
+ include/uapi/linux/media-bus-format.h | 3 +-
+ 417 files changed, 6617 insertions(+), 4289 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpm940b0.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/lvds.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls020b1dd01d.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml
+ delete mode 100644 drivers/gpu/drm/ast/ast_fb.c
+ create mode 100644 drivers/gpu/drm/gm12u320/Kconfig
+ create mode 100644 drivers/gpu/drm/gm12u320/Makefile
+ create mode 100644 drivers/gpu/drm/gm12u320/gm12u320.c
+ delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c
+ create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c
+ delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_prime.c
+ rename drivers/gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} (52%)
+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
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge regmap/for-next
+Already up to date.
+Merging sound/for-next (d2d5a6b0253d ALSA: firewire-motu: more code refactoring for MOTU data block processing layer)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/firewire/amdtp-am824.c | 134 ++++++++------
+ sound/firewire/amdtp-stream-trace.h | 6 +-
+ sound/firewire/amdtp-stream.c | 264 ++++++++++++++++-----------
+ sound/firewire/amdtp-stream.h | 27 ++-
+ sound/firewire/digi00x/amdtp-dot.c | 112 +++++++-----
+ sound/firewire/fireface/amdtp-ff.c | 105 ++++++-----
+ sound/firewire/fireworks/fireworks_stream.c | 2 +-
+ sound/firewire/motu/amdtp-motu.c | 155 ++++++++++------
+ sound/firewire/tascam/amdtp-tascam.c | 115 +++++++-----
+ sound/hda/hdac_controller.c | 2 +
+ sound/pci/hda/hda_intel.c | 2 +-
+ sound/pci/hda/patch_hdmi.c | 265 ++++++++++++++++++++++++----
+ 12 files changed, 802 insertions(+), 387 deletions(-)
+Merging sound-asoc/for-next (b6319b061ba2 ASoC: sgtl5000: Fix charge pump source assignment)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/rockchip/rockchip_max98090.c
+Auto-merging sound/pci/hda/hda_codec.c
+Merge made by the 'recursive' strategy.
+ include/sound/soc-dapm.h | 2 +
+ sound/pci/hda/hda_codec.c | 8 +-
+ sound/soc/bcm/cygnus-pcm.c | 6 +-
+ sound/soc/codecs/ad193x.c | 19 +-
+ sound/soc/codecs/cs47l35.c | 2 +-
+ sound/soc/codecs/max98373.c | 34 ++-
+ sound/soc/codecs/max98373.h | 1 +
+ sound/soc/codecs/mt6358.c | 6 +-
+ sound/soc/codecs/rt1308.c | 31 +--
+ sound/soc/codecs/rt5677.c | 1 -
+ sound/soc/codecs/sgtl5000.c | 248 +++++++++++++++++----
+ sound/soc/codecs/sgtl5000.h | 2 +-
+ sound/soc/codecs/tlv320aic31xx.c | 7 +-
+ sound/soc/codecs/wcd-clsh-v2.c | 2 +-
+ sound/soc/codecs/wcd9335.c | 3 +-
+ sound/soc/fsl/fsl_esai.c | 188 ++++++++++------
+ sound/soc/fsl/fsl_sai.c | 27 ++-
+ sound/soc/fsl/fsl_sai.h | 7 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 +-
+ sound/soc/rockchip/rockchip_max98090.c | 1 -
+ sound/soc/sof/intel/hda-codec.c | 6 +-
+ 21 files changed, 418 insertions(+), 192 deletions(-)
+Merging modules/modules-next (93651f80dcb6 modules: fix compile error if don't have strict module rwx)
+$ git merge modules/modules-next
+Already up to date.
+Merging input/next (5d4b45a1dd7b Input: add support for the FlySky FS-iA6B RC receiver)
+$ git merge input/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ++
+ drivers/input/joystick/Kconfig | 10 ++
+ drivers/input/joystick/Makefile | 5 +-
+ drivers/input/joystick/fsia6b.c | 231 ++++++++++++++++++++++++++++++++++++++++
+ include/uapi/linux/serio.h | 1 +
+ 5 files changed, 251 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/input/joystick/fsia6b.c
+Merging block/for-next (5b9ddbdf2f36 Merge branch 'for-linus' into for-next)
+$ git merge block/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging device-mapper/for-next (733232f8c852 dm: use printk ratelimiting functions)
+$ 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 (248979babbd8 Merge branch 'fixes' into next)
+$ git merge mmc/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 14 ++++++++++----
+ MAINTAINERS | 1 +
+ drivers/mmc/host/mxs-mmc.c | 4 +---
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+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 9ae8fadb3f53] 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
+Already up to date.
+Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels)
+$ git merge backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (caa2b557841c power: reset: nvmem-reboot-mode: add CONFIG_OF dependency)
+$ git merge battery/for-next
+Already up to date.
+Merging regulator/for-next (bf8211f74935 Merge branch 'regulator-5.4' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/regulator/lm363x-regulator.c | 10 +++++-----
+ drivers/regulator/rk808-regulator.c | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+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 (7fb832ae7294 watchdog: digicolor_wdt: Remove unused variable in dc_wdt_probe)
+$ git merge watchdog/master
+Already up to date.
+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
+Already up to date.
+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
+Already up to date.
+Merging spi/for-next (87ce8c22d3b5 Merge branch 'spi-5.4' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-dw-mmio.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging tip/auto-latest (5f9e832c1370 Linus 5.3-rc1)
+$ git merge tip/auto-latest
+Already up to date.
+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 64fcb167cc71] 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 (6d54ceb539aa tracing: Fix user stack trace "??" output)
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits)
+$ git merge rcu/rcu/next
+Already up to date.
+Merging kvm/linux-next (30cd8604323d KVM: x86: Add fixed counters to PMU filter)
+$ 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
+Already up to date.
+Merging xen-tip/linux-next (a1078e821b60 xen: let alloc_xenballooned_pages() fail if not enough memory free)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next)
+$ git merge percpu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (60439711b69b leds: apu: add pr_fmt prefix for better log output)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/Kconfig | 5 +-
+ drivers/leds/leds-an30259a.c | 4 +-
+ drivers/leds/leds-apu.c | 157 ++++---------------------------------------
+ drivers/leds/leds-as3645a.c | 2 +-
+ drivers/leds/leds-ktd2692.c | 4 +-
+ drivers/leds/leds-lp5562.c | 6 +-
+ drivers/leds/leds-max77650.c | 22 ++++--
+ drivers/leds/leds-ns2.c | 21 ++++--
+ 8 files changed, 57 insertions(+), 164 deletions(-)
+Merging ipmi/for-next (fec88ab0af97 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma)
+$ git merge ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (5f9e832c1370 Linus 5.3-rc1)
+$ 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 (72503b25ee36 dmaengine: bcm2835: Print error in case setting DMA mask fails)
+$ git merge slave-dma/next
+Removing include/linux/omap-dmaengine.h
+Removing include/linux/edma.h
+Merge made by the 'recursive' strategy.
+ drivers/dma/bcm2835-dma.c | 4 +++-
+ drivers/dma/ti/edma.c | 5 +++--
+ drivers/dma/ti/omap-dma.c | 3 ++-
+ include/linux/edma.h | 29 -----------------------------
+ include/linux/omap-dma.h | 2 --
+ include/linux/omap-dmaengine.h | 18 ------------------
+ 6 files changed, 8 insertions(+), 53 deletions(-)
+ delete mode 100644 include/linux/edma.h
+ delete mode 100644 include/linux/omap-dmaengine.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 (07d9aa143464 scsi: megaraid_sas: set an unlimited max_segment_size)
+$ git merge scsi/for-next
+Already up to date.
+Merging scsi-mkp/for-next (838c1efc6a0a scsi: ufs: change msleep to usleep_range)
+$ git merge scsi-mkp/for-next
+Merge made by the 'recursive' strategy.
+ drivers/scsi/lpfc/lpfc_bsg.c | 4 +-
+ drivers/scsi/scsi_lib.c | 37 ++++++++++++--
+ drivers/scsi/ufs/ufshcd.c | 105 ++++++++++++++++++++++-----------------
+ drivers/scsi/ufs/ufshcd.h | 42 ++++++++++++----
+ drivers/scsi/virtio_scsi.c | 55 ++++++++++++++------
+ include/scsi/scsi_cmnd.h | 1 +
+ include/scsi/scsi_host.h | 16 +++++-
+ include/uapi/scsi/scsi_bsg_ufs.h | 2 +-
+ 8 files changed, 183 insertions(+), 79 deletions(-)
+Merging vhost/linux-next (842aa64eddac vhost: fix WARNING in __mmdrop)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/virtio-iommu.c | 40 ++++++++----
+ drivers/vhost/vhost.c | 129 ++++++++++----------------------------
+ drivers/vhost/vhost.h | 3 +-
+ include/uapi/linux/virtio_iommu.h | 32 +++++-----
+ mm/balloon_compaction.c | 69 +++++++++++---------
+ 5 files changed, 123 insertions(+), 150 deletions(-)
+Merging rpmsg/for-next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge rpmsg/for-next
+Already up to date.
+Merging gpio/for-next (88785b7fa74a Merge tag 'gpio-v5.3-rc1-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes)
+$ git merge gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (66ad66293ede gpio: em: use a helper variable for &pdev->dev)
+$ git merge gpio-brgl/gpio/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-em.c | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+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 (70d4c349268a coresight: cpu-debug: Add support for Qualcomm Kryo)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++++-----------
+ .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +++------
+ drivers/hwtracing/coresight/coresight-etm4x.c | 14 +++++----
+ drivers/hwtracing/coresight/coresight-priv.h | 10 +++----
+ 4 files changed, 34 insertions(+), 36 deletions(-)
+Merging rtc/rtc-next (06c8e550a84e rtc: s5m: convert to i2c_new_dummy_device)
+$ git merge rtc/rtc-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/rtc/trivial-rtc.yaml | 2 --
+ drivers/rtc/rtc-imxdi.c | 4 +---
+ drivers/rtc/rtc-isl12026.c | 6 +++---
+ drivers/rtc/rtc-max77686.c | 8 ++++----
+ drivers/rtc/rtc-mxc_v2.c | 4 +---
+ drivers/rtc/rtc-s35390a.c | 8 ++++----
+ drivers/rtc/rtc-s5m.c | 6 +++---
+ 7 files changed, 16 insertions(+), 22 deletions(-)
+Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include)
+$ git merge at24/at24/for-next
+Merge made by the 'recursive' strategy.
+ drivers/misc/eeprom/at24.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge ntb/ntb-next
+Already up to date.
+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 66ef49c6cadc] 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 d7c08bfd2ccd] 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 (5f9e832c1370 Linus 5.3-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging akpm-current/current (eb5b38e7b494 ipc/msg.c: consolidate all xxxctl_down() functions)
+$ git merge --no-ff akpm-current/current
+Auto-merging mm/mmap.c
+Auto-merging mm/memory.c
+Auto-merging lib/Kconfig.debug
+Auto-merging fs/ramfs/inode.c
+Auto-merging fs/aio.c
+Auto-merging Documentation/process/deprecated.rst
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 20 ++++--
+ Documentation/core-api/genalloc.rst | 2 +-
+ Documentation/process/deprecated.rst | 6 +-
+ arch/arm/mm/dma-mapping.c | 2 +-
+ drivers/misc/sram-exec.c | 2 +-
+ fs/aio.c | 9 +--
+ fs/buffer.c | 56 ++++++++++++++-
+ fs/coredump.c | 44 ++++++++++--
+ fs/fat/fat.h | 1 +
+ fs/fat/file.c | 8 ++-
+ fs/fat/inode.c | 22 ++++--
+ fs/ocfs2/alloc.c | 15 ++++
+ fs/ocfs2/aops.c | 22 +++++-
+ fs/ocfs2/dlm/dlmunlock.c | 23 ++++--
+ fs/ocfs2/xattr.c | 3 -
+ fs/ramfs/inode.c | 12 ++++
+ include/linux/genalloc.h | 2 +-
+ include/linux/memcontrol.h | 26 +++++++
+ include/linux/sched.h | 8 +++
+ include/linux/wait.h | 4 +-
+ include/trace/events/vmscan.h | 71 +++++++++++++++----
+ ipc/msg.c | 18 ++---
+ kernel/dma/remap.c | 2 +-
+ kernel/hung_task.c | 44 ++++++++++++
+ kernel/signal.c | 2 +-
+ lib/Kconfig.debug | 6 ++
+ lib/genalloc.c | 5 +-
+ lib/math/rational.c | 63 +++++++++++++----
+ mm/compaction.c | 11 +--
+ mm/kmemleak.c | 2 +-
+ mm/memcontrol.c | 5 ++
+ mm/memory.c | 2 +-
+ mm/mempolicy.c | 120 +++++++++++++++++++++++---------
+ mm/migrate.c | 4 +-
+ mm/mmap.c | 43 ++++++++----
+ mm/oom_kill.c | 5 +-
+ mm/rmap.c | 1 +
+ mm/sparse.c | 16 ++++-
+ mm/swapfile.c | 4 +-
+ mm/vmscan.c | 114 ++++++++++++++++++++++++------
+ scripts/checkpatch.pl | 29 +++++---
+ 41 files changed, 679 insertions(+), 175 deletions(-)
+$ 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: drivers/tty/serial/sh-sci.c: suppress warning
+Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + bd4d55c761a8...c504c313f8ec akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (c504c313f8ec drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ drivers/media/platform/sti/delta/delta-ipc.c | 4 ++--
+ drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 +
+ drivers/tty/serial/sh-sci.c | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..ebc034a
--- /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 0000000..5e683ae
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20190723
