diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-18 13:34:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-18 13:34:39 +1000 |
| commit | 6d21a41b7b1f46d5d5c3ddc26b55c5c4a6a826b9 (patch) | |
| tree | b6040f0a00a3b11437f4881a1057dab4f2e8253b | |
| parent | 545f6fc2aad2955f476943f210cb025d7bcc831b (diff) | |
| download | linux-next-next-20190718.tar.gz | |
Add linux-next specific files for 20190718next-20190718
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 300 | ||||
| -rw-r--r-- | Next/Trees | 302 | ||||
| -rw-r--r-- | Next/merge.log | 4469 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5074 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..af8a83954973 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,300 @@ +Name SHA1 +---- ---- +origin 22051d9c4a57d3b4a8b5a7407efc80c71c7bfb16 +fixes c309b6f24222246c18a8b65d3950e6e755440865 +kbuild-current 964a4eacef67503a1154f7e0a75f52fbdce52022 +arc-current 24a20b0a443fd485852d51d08e98bbd9d212e0ec +arm-current c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d +arm-soc-fixes 2659dc8d225c956b91d8a8e4ef05d91b2e985c02 +arm64-fixes aa69fb62bea15126e744af2e02acc0d6cf3ed4da +m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +powerpc-fixes 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +s390-fixes 9a159190414d461fdac7ae5bb749c2d532b35419 +sparc 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 4809bba7289b4594d93da4fa70fb9b5ef48b5cf4 +bpf 1cb59a6074e23c6f6513642f752a6d8d38327354 +ipsec 114a5c3240155fdb01bf821c9d326d7bb05bd464 +netfilter 28b1d6ef53e3303b90ca8924bb78f31fa527cafb +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 41a531ffa4c5aeb062f892227c00fabb3b4a9c91 +mac80211 d2ce8d6bfcfed014fd281e06c9b1d4638ddf3f1e +rdma-fixes 4b972a01a7da614b4796475f933094751a295a2f +sound-current 4914da2fb0c89205790503f20dfdde854f3afdd8 +sound-asoc-fixes 496017510d4ad55215ea8d65219f835c8782c859 +regmap-fixes ea09b3e21f18a5e190b26388c6c5f51e174d845f +regulator-fixes 9b955dd030c368fe2fa335f0b7c07f42081b20d0 +spi-fixes 5b84322c08aaba29f49dac33d8ecb3beec239074 +pci-current 6dbbd053e6aea827abde89ac9b9d6855dab1a66b +driver-core.current 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +tty.current 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +usb.current 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +usb-gadget-fixes 42de8afc40c97002fceb500e2331f6a722be3c14 +usb-serial-fixes f8377eff548170e8ea8022c067a1fbdf9e1c46a8 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy ada28f7b3a97fa720864c86504a7c426ee6f91c1 +staging.current 50950626414a982c8ed539128c7f69a3d328a970 +char-misc.current 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +soundwire-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +thunderbolt-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +input-current 597473720f4dc69749542bfcfed4a927a43d935e +crypto-current 20e833dc36355ed642d00067641a679c618303fa +ide 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes e2e88325f4bcaea51f454723971f7b5ee0e1aa80 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 0ecfebd2b52404ae0c54a878c872bb93363ada36 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes c7a87ceb17aee9222c069a97aee4647260c7b3a6 +mfd-fixes 63b2de12b7eeacfb2edbe005f5c3cff17a2a02e2 +v4l-dvb-fixes 22be8233b34f4f468934c5fefcbe6151766fb8f2 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 2cc80d809e1723b0c7137bb6d786df0ea465d313 +at91-fixes ba5e60c9b75dec92d4c695b928f69300b17d7686 +omap-fixes fb59ee37cfe20d10d19568899d1458a58361246c +kvm-fixes 964a4eacef67503a1154f7e0a75f52fbdce52022 +kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 +hwmon-fixes 5696e4aaabf2a6bae0fe8b4abf17fe17c2b03beb +nvdimm-fixes a4a357fd4477a0523aca5afac9c5369b16fdb963 +btrfs-fixes 5560015d753751dd7cab021d0d4b1db784372050 +vfs-fixes 75f2d86b20bf6aec0392d6dd2ae3ffff26d2ae0e +dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +samsung-krzk-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pinctrl-samsung-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +devicetree-fixes 3536e36ee97a5b3881d0bf966ae9f780f6d94616 +scsi-fixes 07d9aa14346489d6facae5777ceb267a1dcadbc5 +drm-fixes a0b2cf792ac9db7bb73e599e516adfb9dca8e60b +amdgpu-fixes c08e56c647ba8e4964ffc9e43360f16c9740337e +drm-intel-fixes d7e8a19b38c8ac1a32b6b03af049e2c88d4155db +mmc-fixes 83293386bc95cf5e9f0c0175794455835bd1cb4a +rtc-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes 9be11356057af5baba25eb25061313f7476a6dcd +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 0db7f5cd4aeba4cc63d0068598b3350eba8bb4cd +drm-misc-fixes 2f040d27080ddfffecff2be1a77107c494d0e4f4 +kspp-gustavo d93512ef0f0efa17eded6b9edf8e88e8418f44bd +kbuild 9b2802e2b3b9222cc7703b0a38ae340af79de521 +compiler-attributes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 7bb9bbcee8845af663a7a60df9e2cc24422b3de5 +asm-generic 7f3a8dff1219fba3076fe207972d1d7893c099bb +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm b7a735f3a606ab25f055ed456559eb0d49062c92 +arm64 0c61efd322b75ed3143e3d130ebecbebf561adf5 +arm-perf d482e575fbf0f7ec9319bded951f21bbc84312bf +arm-soc 879d1d31cdf06b980cfecbd1927628dbf03b0e55 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 11343d25a03b84fb522fc98a5dccf7f605eff912 +aspeed a1f5c11ddb7d072d20195bd5276c67850e637809 +at91 7eb505978425c76480ce3129937092329d9506e4 +bcm2835 08e3c41585386f5cefc91ede8835005742df4ba9 +imx-mxs 2a7f6c1a53763a49b2613e2981de0295b89acb30 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu e1b0b32a5ad6646b9c946398a534f3dd9df59ec2 +omap 7376d6a65730827e34695ebb8584af7d27201113 +qcom 07c1ef89403097efe4d5bde081ceca357d50ccec +renesas a16ecb14d0b0f69f97763cfa271e90ab97e88a19 +reset 6b251ea99242a701b6f8738f20991f3fe90f68ad +rockchip 13622a50d8dbbf34c542135d80f663c3dc089256 +samsung-krzk cf6664323e0fbef58eaec16e55d1e0484361e46a +scmi 0ecfebd2b52404ae0c54a878c872bb93363ada36 +sunxi 6c6b5d7650d96134721de15be59cbf49054ec65e +tegra 033de83170dd0cefa3a5db3a90f3bbba92412877 +clk b1511f7a48c3ab28ae10b7ea1e9eae1481525bbe +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 9f98b3142d22e0fdb253617373931d364c59a797 +h8300 f293d4d4649cc20068a312cfc5752ce6aab0126b +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +m68knommu ad97f9df0fee4ddc9ef056dda4dcbc6630d9f972 +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips e5793cd1b5fedb39337cfa62251a25030f526e56 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 45800fb45139284f0db4f5ac7fbbf5dad81e4172 +powerpc f5a9e488d62360c91c5770bd55a0b40e419a71ce +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019 +risc-v 0f327f2aaad6a87356cbccfa390d4d3b64d0d3b6 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 499723d12063aab97dfe6b41c822e9c1c74eff3e +sh d3023897b4370bbf7f289806667a2380576d13dd +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml b482e48d29f1461fd0d059a17f32bcfa274127b3 +xtensa 6326b440055fd97acf620ad952aa50878aa8c3b6 +fscrypt 0564336329f0b03a78221ddf51e52af3665e5720 +afs fb2b827702ba02c3066a1291a3de614e7eec1c1d +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 80dfdbfd37d279beae211ba49dd2db84c853777a +ceph d31d07b97a5e76f41e00eb81dcca740e84aa7782 +cifs 2fe8af7a45a454ea25d528b98aaf5a58590af3ab +configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 +ecryptfs 7451c54abc9139585492605d9e91dec2d26c6457 +ext3 5450e8a316a64cddcbc15f90733ebc78aa736545 +ext4 96fcaf86c3cb9340015fb475d79ef0a6fcf858ed +f2fs 3d03243e4536c00d6fdc3ffc60e4bdddc6fdc31c +fuse 766741fcaa1fe5da2cb1e33ae458a5630ff7f667 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 50c8000744463aa8534de0d739b50ed4f06f8275 +nfs-anna 68f461593f76bd5f17e87cdd0bea28f4278c7268 +nfsd b78fa45d4edb92fd7b882b2ec25b936cad412670 +orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15 +overlayfs 0be0bfd2de9dfdd2098a9c5b14bdd8f739c9165d +ubifs 8009ce956c3d28022af6b122e50213ad830fc902 +v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98 +xfs 89b408a68b9dd163b2705b6f73d8e3cc3579b457 +iomap 5d907307adc14cd5148b07629c2b4535acd06062 +djw-vfs 7e328e5930ad85c4669ca12bd20e1828a62a391a +file-locks 5450e8a316a64cddcbc15f90733ebc78aa736545 +vfs 38760c17cc962a077f40dc1b8a13273a426cb74c +printk ba174ef6d2241d6718b1df235932f44b675359ca +pci 7b4b0f6b34d893be569da81ffad865a9d3a7d014 +pstore 4c6d80e1144bdf48cae6b602ae30d41f3e5c76a9 +hid bf4945efabdf7c797d0a96f254083ae2eac5beb2 +i2c 9a74c745c68904c3a7ff2d3a7f385593090780a1 +i3c ede2001569c32e5bafd2203c7272bbd3249e942e +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 9f7546570bcb20debfaa97bcf720fa0fcb8fc05a +jc_docs 224d5fd43d250f850d64fb6d668114aff29d7022 +v4l-dvb 22be8233b34f4f468934c5fefcbe6151766fb8f2 +v4l-dvb-next 0a8ad0ffa4d80a544f6cbff703bf6394339afcdf +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm b5d0790132df3558532b3ffec9b25dcaf5dac4ba +cpufreq-arm f9020441dbc39133591ff72b420f21f51896afc5 +cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042 +opp 560d1bcad715c215e7ffe5d7cffe045974b623d0 +thermal 6c395f66e98c895cf3ebf87c0b2fc63b6a57a196 +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb dd853b2dfa65ec519f9281a43714a6f4a6662286 +rdma 0b043644c0ca601cb19943a81aa1f1455dbe9461 +net-next 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +bpf-next 192f0f8e9db7efe4ac98d47f5fa4334e43c1204d +ipsec-next c7b37c769d2a5e711106a3c793140a4f46768e04 +mlx5-next 1dd7382b1bb608e7ccae3672621eaceca355ae8b +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 8d1336c241bdadf61a56e398d82d1e512dbff5f8 +crypto f3880a23564e3172437285ebcb5b8a124539fdae +drm 3729fe2bc2a01f4cc1aa88be8f64af06084c87d6 +amdgpu 07fc09fb0ae46822b17ec39320ca92a0e6d5296e +drm-intel c30d5dc653cbc78f9b634b7b72e25057a68c527c +drm-tegra eb7cf945a8dac8603e6d0759023e9b6cfed7a008 +drm-misc 7aaddd96d5febcf5b24357a326b3038d49a20532 +drm-msm 4cf643a39221af24a151ad2cff4e3f95f12f368e +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm fee77829083ad70845bd650f3c84c5900c5abae1 +etnaviv 57bdd4057516fb913d42a7d502b2580bbb9966ee +regmap aaccf3863ce22108ae1d3bac82604eec9d8ae44c +sound 4914da2fb0c89205790503f20dfdde854f3afdd8 +sound-asoc ca4aacd92c71a3e3281344c435e4a2c7034b617f +modules 93651f80dcb616b8c9115cdafc8e57a781af22d0 +input 5a4cee7b28ed3ce4ce5980503926d5bc23c9c8d1 +block 5b9ddbdf2f362009b6278db421a72f0f21108fb0 +device-mapper 733232f8c852bcc2ad6fc1db7f4c43eb01c7c217 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 59592cc1f5937ced72e11e681c3e358a0375f7ae +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 7efd105c27fd2323789b41b64763a0e33ed79c08 +backlight 73fbfc499448455f1e1c77717040e09e25f1d976 +battery caa2b557841c8cedc1d4862cd31cf76ee940d105 +regulator e571e17488d4ae77d17e372912bc15418726ddb2 +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 67e50426ffcb3ae389c81044994757d3c1adf38f +tip 162b65ddbf2f00dfb8cdc120fb19912e62502143 +clockevents b0c74b96d177304b6d6f8981e90f37f1cd6afa58 +edac-amd b2572772d13e7719841d1711996b5a6564b3caa6 +irqchip 3dae67ce600caaa92c9af6e0cb6cad2db2632a0a +ftrace 0aeb1def44169cbe7119f26cf10b974a2046142e +rcu b989ff070574ad8b8621d866de0a8e9a65d42c80 +kvm 6694e48012826351036fd10fc506ca880023e25f +kvm-arm 1e0cf16cdad1ba53e9eeee8746fe57de42f20c97 +kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30 +kvms390 8343ba2d4820b1738bbb7cb40ec18ea0a3b0b331 +xen-tip b23e5844dfe78a80ba672793187d3f52e4b528d7 +percpu 03ed70fb0e5e94a645c3872f9a73662c789bf7d7 +workqueues be69d00d9769575e35d83367f465a58dbf82748c +drivers-x86 7d67c8ac25fbc66ee254aa3e33329d1c9bc152ce +chrome-platform 8c3166e17cf10161d2871dfb1d017287c7b79ff1 +hsi a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leds 2605085fba22792f3d4a6b856c7c5a05492d1fde +ipmi fec88ab0af9706b2201e5daf377c5031c62d11f7 +driver-core 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +usb 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +usb-gadget b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3 +usb-serial 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c +phy-next 5206026404190125436f81088eb3667076e56083 +tty 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +char-misc 9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +extcon 0937fbb7abeb165ef0ac6a56a3a6f041eca6dbde +soundwire 2aeac95d1a4cc85aae57ab842d5c3340df0f817f +thunderbolt 6fbc7275c7a9ba97877050335f290341a1fd8dbf +staging 50950626414a982c8ed539128c7f69a3d328a970 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma 5c274ca4cfb22a455e880f61536b1894fa29fd17 +cgroup 22a0b83583abc944b66970d3833b02e6477ac280 +scsi 484647088826f2f651acbda6bcf9536b8a466703 +scsi-mkp 07d9aa14346489d6facae5777ceb267a1dcadbc5 +vhost 5e663f0410fa2f355042209154029842ba1abd43 +rpmsg ab1291acd4ab8c6171b1187b99110447dde23304 +gpio 88785b7fa74ae2dc52f879140b976984b5374c79 +gpio-brgl f360dcd4ef7fbaec774a64c54b402b4c8a4cffb2 +pinctrl 4c105769bf6de29856bf80a4045e6725301c58ce +pinctrl-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pwm 3d25025ce9c2f364ea4ee76f1461c8714b9c0b6d +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest d20f6b41b7c2715b3d900f2da02029dbc14cd60a +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest ee8a84c60bcc1f1615bd9cb3edfe501e26cdc85b +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 28f28ea4343abe5d2b8f0ff0f49883ecad648cb6 +coresight fec88ab0af9706b2201e5daf377c5031c62d11f7 +rtc f0162d21cc8025c828fafe56ee25801f770f41da +nvdimm cb3110f7452d96382153722ec788a4ade022eeb9 +at24 dce91ba39c765b2b90d07c717683abcdd9891592 +ntb d9c53aa440b332059f7f0ce3f7868ff1dc58c62c +kspp 2dcbe7fe226502c81d578d895b1d718ab70bb496 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 371975b0b07520c85098652d561639837a60a905 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus a188339ca5a396acc588e5851ed7e19f66b0ebd9 +nvmem 341f8ae0f8202b3f6bbaf93a579d179fc9e3ec7d +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 765e33f5211ab620c117ff1ee0c4f38c10f7a973 +auxdisplay f4bb1f895aa07dfcb96169192ff7c9154620df87 +kgdb-dt ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 +pidfd 4382fc438ca5f22815e17e1d265447ce02e076f6 +devfreq 27c17be8e4889a2a0ff151617ab4653149b41ba3 +hmm cc5dfd59e375f4d0f2b64643723d16b38b2f2d78 +akpm-current ea4ab8723cf978e4ee4c8ac39e95af31115a7520 +akpm 948c51a0b487f44c117ad8f1704c0dacda823c7e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..337ba9aaae16 --- /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 000000000000..50a7f7de5ebf --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4469 @@ +$ date -R +Thu, 18 Jul 2019 07:57:17 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media +Merging origin/master (22051d9c4a57 Merge tag 'platform-drivers-x86-v5.3-2' of git://git.infradead.org/linux-platform-drivers-x86) +$ git merge origin/master +Updating c309b6f24222..22051d9c4a57 +Fast-forward + Documentation/ABI/testing/sysfs-platform-asus-wmi | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 11 + + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../devicetree/bindings/arm/stm32/mlahb.txt | 37 + + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 141 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 1 + + .../devicetree/bindings/clock/at91-clock.txt | 7 +- + .../bindings/clock/brcm,bcm63xx-clocks.txt | 22 + + .../devicetree/bindings/clock/cirrus,lochnagar.txt | 1 + + .../devicetree/bindings/clock/mvebu-core-clock.txt | 1 + + .../devicetree/bindings/clock/qcom,gpucc.txt | 4 +- + .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 7 +- + .../devicetree/bindings/clock/silabs,si5341.txt | 162 ++ + .../devicetree/bindings/clock/sunxi-ccu.txt | 62 - + .../devicetree/bindings/dma/8250_mtk_dma.txt | 33 - + .../devicetree/bindings/dma/arm-pl330.txt | 3 + + Documentation/devicetree/bindings/dma/fsl-edma.txt | 44 +- + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 54 + + .../devicetree/bindings/dma/sun6i-dma.txt | 9 +- + .../devicetree/bindings/hwlock/omap-hwspinlock.txt | 25 +- + .../{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} | 35 +- + .../devicetree/bindings/remoteproc/stm32-rproc.txt | 63 + + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 43 + + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 134 + + Documentation/devicetree/bindings/rtc/rtc.txt | 73 +- + Documentation/devicetree/bindings/rtc/rtc.yaml | 50 + + .../devicetree/bindings/rtc/sun6i-rtc.txt | 46 - + .../devicetree/bindings/rtc/sunxi-rtc.txt | 17 - + .../devicetree/bindings/rtc/trivial-rtc.yaml | 92 + + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 + + .../devicetree/bindings/usb/s3c2410-usb.txt | 2 +- + Documentation/devicetree/bindings/virtio/iommu.txt | 66 + + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + Documentation/driver-api/dmaengine/dmatest.rst | 21 +- + Documentation/driver-api/driver-model/devres.rst | 4 + + Documentation/filesystems/coda.txt | 11 +- + Documentation/hwspinlock.txt | 81 + + Documentation/remoteproc.txt | 14 +- + .../{cpu-cooling-api.txt => cpu-cooling-api.rst} | 39 +- + .../thermal/{exynos_thermal => exynos_thermal.rst} | 47 +- + Documentation/thermal/exynos_thermal_emulation | 53 - + Documentation/thermal/exynos_thermal_emulation.rst | 61 + + Documentation/thermal/index.rst | 18 + + .../{intel_powerclamp.txt => intel_powerclamp.rst} | 183 +- + .../{nouveau_thermal => nouveau_thermal.rst} | 54 +- + .../{power_allocator.txt => power_allocator.rst} | 144 +- + .../thermal/{sysfs-api.txt => sysfs-api.rst} | 488 ++-- + ...ure_thermal => x86_pkg_temperature_thermal.rst} | 28 +- + MAINTAINERS | 48 +- + arch/alpha/include/asm/io.h | 5 - + arch/arc/boot/dts/haps_hs.dts | 30 + + arch/arc/boot/dts/hsdk.dts | 14 + + arch/arc/configs/haps_hs_defconfig | 5 +- + arch/arc/configs/hsdk_defconfig | 5 + + arch/arc/include/asm/entry-arcv2.h | 361 +-- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/linkage.h | 18 + + arch/arc/include/asm/pgtable.h | 8 +- + arch/arc/kernel/asm-offsets.c | 7 + + arch/arc/kernel/entry-arcv2.S | 62 +- + arch/arc/kernel/entry-compact.S | 2 +- + arch/arc/kernel/entry.S | 4 +- + arch/arc/kernel/unwind.c | 9 +- + arch/arc/mm/fault.c | 185 +- + arch/arc/mm/tlbex.S | 11 + + arch/arc/plat-eznps/include/plat/ctop.h | 15 +- + arch/arm/include/asm/io.h | 1 - + arch/arm/mm/fault.c | 24 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 21 + + arch/arm64/include/asm/sysreg.h | 82 +- + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 5 + + arch/h8300/include/asm/bitops.h | 6 - + arch/hexagon/include/asm/syscall.h | 14 + + arch/ia64/mm/fault.c | 24 +- + arch/mips/ar7/setup.c | 1 + + arch/mips/ath79/setup.c | 2 +- + arch/mips/bcm63xx/dev-flash.c | 1 + + arch/mips/boot/dts/ralink/mt7628a.dtsi | 148 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/ath25_defconfig | 1 - + arch/mips/configs/ath79_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 - + arch/mips/configs/bmips_stb_defconfig | 1 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 2 - + arch/mips/configs/loongson1b_defconfig | 1 - + arch/mips/configs/loongson1c_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/mips_paravirt_defconfig | 1 - + arch/mips/configs/omega2p_defconfig | 1 - + arch/mips/configs/pistachio_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 2 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 1 - + arch/mips/configs/tb0226_defconfig | 1 - + arch/mips/configs/tb0287_defconfig | 1 - + arch/mips/configs/vocore2_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/include/asm/cpu.h | 125 +- + arch/mips/include/asm/io.h | 13 +- + arch/mips/include/asm/kprobes.h | 1 + + arch/mips/include/asm/mach-jz4740/clock.h | 22 - + arch/mips/include/asm/mach-ralink/pinmux.h | 1 - + arch/mips/include/asm/syscall.h | 6 + + arch/mips/jz4740/board-qi_lb60.c | 18 +- + arch/mips/jz4740/platform.c | 2 - + arch/mips/jz4740/pm.c | 8 - + arch/mips/jz4740/time.c | 3 - + arch/mips/kernel/ftrace.c | 23 +- + arch/mips/kernel/kprobes.c | 2 +- + arch/mips/kernel/perf_event_mipsxx.c | 30 +- + arch/mips/lantiq/irq.c | 177 +- + arch/nds32/include/asm/syscall.h | 27 +- + arch/parisc/include/asm/syscall.h | 7 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/asm/syscall.h | 10 + + arch/powerpc/include/uapi/asm/mman.h | 6 +- + arch/powerpc/kvm/book3s_64_vio.c | 44 +- + arch/powerpc/mm/book3s64/iommu_api.c | 41 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 5 + + arch/powerpc/mm/fault.c | 23 +- + arch/s390/include/asm/ctl_reg.h | 42 +- + arch/s390/include/asm/nmi.h | 20 +- + arch/s390/include/asm/processor.h | 20 +- + arch/s390/include/asm/ptrace.h | 10 +- + arch/s390/include/asm/setup.h | 40 +- + arch/s390/include/asm/thread_info.h | 34 +- + arch/s390/mm/fault.c | 16 +- + arch/sh/boards/Kconfig | 14 +- + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/apsh4a3a_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/cayman_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/kfr2r09-romimage_defconfig | 1 - + arch/sh/configs/kfr2r09_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/magicpanelr2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sh/configs/rsk7269_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/sh/kernel/kprobes.c | 3 +- + arch/sh/mm/fault.c | 18 +- + arch/sparc/include/uapi/asm/mman.h | 6 - + arch/sparc/mm/fault_64.c | 16 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/io.h | 1 - + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/mm/fault.c | 21 +- + arch/x86/mm/ioremap.c | 5 + + arch/xtensa/include/uapi/asm/mman.h | 6 +- + drivers/clk/Kconfig | 13 +- + drivers/clk/Makefile | 1 + + drivers/clk/at91/sckc.c | 281 +- + drivers/clk/bcm/Kconfig | 24 + + drivers/clk/bcm/Makefile | 6 +- + drivers/clk/bcm/clk-bcm2835.c | 28 +- + drivers/clk/bcm/clk-bcm63xx-gate.c | 238 ++ + drivers/clk/bcm/clk-raspberrypi.c | 315 +++ + drivers/clk/clk-bulk.c | 23 +- + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-devres.c | 22 +- + drivers/clk/clk-lochnagar.c | 205 +- + drivers/clk/clk-pwm.c | 14 + + drivers/clk/clk-qoriq.c | 12 + + drivers/clk/clk-si5341.c | 1346 ++++++++++ + drivers/clk/clk-si544.c | 102 +- + drivers/clk/clk.c | 63 +- + drivers/clk/clk.h | 4 - + drivers/clk/imx/clk-busy.c | 30 +- + drivers/clk/imx/clk-cpu.c | 14 +- + drivers/clk/imx/clk-fixup-div.c | 15 +- + drivers/clk/imx/clk-fixup-mux.c | 15 +- + drivers/clk/imx/clk-gate-exclusive.c | 17 +- + drivers/clk/imx/clk-gate2.c | 14 +- + drivers/clk/imx/clk-imx6q.c | 782 +++--- + drivers/clk/imx/clk-imx6sl.c | 409 +-- + drivers/clk/imx/clk-imx6sll.c | 434 +-- + drivers/clk/imx/clk-imx6sx.c | 662 ++--- + drivers/clk/imx/clk-imx6ul.c | 580 +++-- + drivers/clk/imx/clk-imx7d.c | 984 +++---- + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 18 +- + drivers/clk/imx/clk-imx8mq.c | 27 +- + drivers/clk/imx/clk-pfd.c | 14 +- + drivers/clk/imx/clk-pllv3.c | 14 +- + drivers/clk/imx/clk.c | 35 +- + drivers/clk/imx/clk.h | 143 +- + drivers/clk/ingenic/Makefile | 2 +- + drivers/clk/ingenic/cgu.c | 41 +- + drivers/clk/ingenic/cgu.h | 4 + + drivers/clk/ingenic/jz4725b-cgu.c | 41 +- + drivers/clk/ingenic/jz4740-cgu.c | 105 +- + drivers/clk/ingenic/jz4770-cgu.c | 67 +- + drivers/clk/ingenic/jz4780-cgu.c | 3 + + drivers/clk/ingenic/pm.c | 45 + + drivers/clk/ingenic/pm.h | 12 + + drivers/clk/keystone/Kconfig | 11 + + drivers/clk/keystone/sci-clk.c | 239 +- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8183.c | 19 - + drivers/clk/mediatek/clk-mt8516-aud.c | 65 + + drivers/clk/mediatek/clk-mt8516.c | 5 - + drivers/clk/meson/axg.c | 10 +- + drivers/clk/meson/clk-mpll.c | 36 +- + drivers/clk/meson/clk-mpll.h | 3 + + drivers/clk/meson/g12a.c | 843 +++++- + drivers/clk/meson/g12a.h | 41 +- + drivers/clk/meson/gxbb.c | 5 - + drivers/clk/meson/meson-eeclk.c | 3 + + drivers/clk/meson/meson-eeclk.h | 2 + + drivers/clk/meson/meson8b.c | 154 ++ + drivers/clk/meson/meson8b.h | 8 +- + drivers/clk/mmp/clk-frac.c | 3 +- + drivers/clk/mvebu/kirkwood.c | 17 + + drivers/clk/qcom/gcc-msm8996.c | 36 - + drivers/clk/qcom/gcc-qcs404.c | 7 + + drivers/clk/qcom/gdsc.c | 4 +- + drivers/clk/renesas/clk-div6.c | 19 +- + drivers/clk/renesas/clk-mstp.c | 20 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a06g032-clocks.c | 227 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 37 +- + drivers/clk/rockchip/clk-mmc-phase.c | 14 +- + drivers/clk/rockchip/clk-px30.c | 12 +- + drivers/clk/rockchip/clk-rk3228.c | 3 +- + drivers/clk/rockchip/clk-rk3288.c | 13 +- + drivers/clk/rockchip/clk-rk3328.c | 3 + + drivers/clk/rockchip/clk-rk3368.c | 12 +- + drivers/clk/rockchip/clk-rk3399.c | 12 +- + drivers/clk/rockchip/clk.h | 4 + + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/samsung/clk-exynos5420.c | 78 +- + drivers/clk/samsung/clk-exynos5433.c | 4 +- + drivers/clk/socfpga/clk-s10.c | 6 +- + drivers/clk/sprd/common.c | 9 +- + drivers/clk/sprd/sc9860-clk.c | 5 +- + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 39 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 41 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 69 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 39 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 34 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 29 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 104 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 46 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 29 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 32 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 29 +- + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_gate.h | 53 + + drivers/clk/sunxi/clk-sunxi.c | 2 + + drivers/clk/tegra/clk-tegra210.c | 20 +- + drivers/clk/ti/divider.c | 85 - + drivers/clk/ti/gate.c | 30 - + drivers/clk/ti/mux.c | 31 - + drivers/dax/dax-private.h | 2 + + drivers/dax/kmem.c | 46 +- + drivers/dma/Kconfig | 5 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 5 +- + drivers/dma/at_xdmac.c | 11 +- + drivers/dma/bcm-sba-raid.c | 13 +- + drivers/dma/coh901318.c | 6 +- + drivers/dma/dma-axi-dmac.c | 201 +- + drivers/dma/dma-jz4780.c | 7 +- + drivers/dma/dmaengine.c | 14 +- + drivers/dma/dmatest.c | 6 +- + drivers/dma/dw-edma/Kconfig | 19 + + drivers/dma/dw-edma/Makefile | 7 + + drivers/dma/dw-edma/dw-edma-core.c | 937 +++++++ + drivers/dma/dw-edma/dw-edma-core.h | 165 ++ + drivers/dma/dw-edma/dw-edma-pcie.c | 229 ++ + drivers/dma/dw-edma/dw-edma-v0-core.c | 354 +++ + drivers/dma/dw-edma/dw-edma-v0-core.h | 28 + + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 310 +++ + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 27 + + drivers/dma/dw-edma/dw-edma-v0-regs.h | 158 ++ + drivers/dma/dw/pci.c | 33 +- + drivers/dma/fsl-edma-common.c | 69 +- + drivers/dma/fsl-edma-common.h | 10 +- + drivers/dma/fsl-edma.c | 43 +- + drivers/dma/fsl-qdma.c | 18 +- + drivers/dma/hsu/hsu.c | 4 +- + drivers/dma/imx-sdma.c | 9 +- + drivers/dma/mcf-edma.c | 11 +- + drivers/dma/mediatek/Kconfig | 11 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-uart-apdma.c | 666 +++++ + drivers/dma/mic_x100_dma.c | 6 +- + drivers/dma/mmp_tdma.c | 10 +- + drivers/dma/mxs-dma.c | 8 +- + drivers/dma/of-dma.c | 4 +- + drivers/dma/pl330.c | 40 + + drivers/dma/pxa_dma.c | 56 +- + drivers/dma/qcom/hidma.h | 5 +- + drivers/dma/qcom/hidma_dbg.c | 37 +- + drivers/dma/sh/Kconfig | 6 - + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-dmac.c | 8 +- + drivers/dma/sh/sudmac.c | 414 --- + drivers/dma/sh/usb-dmac.c | 8 +- + drivers/dma/stm32-dma.c | 1 - + drivers/dma/stm32-dmamux.c | 6 +- + drivers/dma/sun6i-dma.c | 147 +- + drivers/dma/tegra20-apb-dma.c | 12 +- + drivers/dma/virt-dma.c | 4 +- + drivers/dma/virt-dma.h | 4 + + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/firmware/raspberrypi.c | 10 + + drivers/firmware/ti_sci.c | 124 +- + drivers/firmware/ti_sci.h | 63 +- + drivers/fpga/dfl-afu-dma-region.c | 53 +- + drivers/gpio/gpio-davinci.c | 5 +- + drivers/gpio/gpio-em.c | 33 +- + drivers/gpio/gpiolib-of.c | 10 +- + drivers/hwspinlock/Kconfig | 2 +- + drivers/hwspinlock/hwspinlock_core.c | 48 +- + drivers/hwspinlock/omap_hwspinlock.c | 4 + + drivers/hwspinlock/stm32_hwspinlock.c | 7 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++ + drivers/memory/jz4780-nemc.c | 2 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/net/fddi/defza.c | 1 + + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- + drivers/of/base.c | 10 +- + drivers/pci/of.c | 8 + + drivers/platform/x86/asus-wmi.c | 118 +- + drivers/pps/pps.c | 8 + + drivers/rapidio/devices/rio_mport_cdev.c | 2 + + drivers/remoteproc/Kconfig | 18 +- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 8 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 73 +- + drivers/remoteproc/qcom_q6v5_mss.c | 33 +- + drivers/remoteproc/remoteproc_core.c | 15 + + drivers/remoteproc/remoteproc_elf_loader.c | 3 +- + drivers/remoteproc/remoteproc_internal.h | 11 + + drivers/remoteproc/stm32_rproc.c | 628 +++++ + drivers/rpmsg/rpmsg_core.c | 3 +- + drivers/rtc/Kconfig | 3 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-ds1307.c | 129 +- + drivers/rtc/rtc-ds2404.c | 5 +- + drivers/rtc/rtc-fm3130.c | 8 +- + drivers/rtc/rtc-imx-sc.c | 87 + + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 354 ++- + drivers/rtc/rtc-pcf8563.c | 13 +- + drivers/rtc/rtc-rv8803.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-s35390a.c | 55 +- + drivers/rtc/rtc-st-lpc.c | 4 - + drivers/rtc/rtc-stm32.c | 6 +- + drivers/rtc/rtc-sun6i.c | 1 + + drivers/rtc/rtc-tegra.c | 253 +- + drivers/rtc/rtc-test.c | 1 + + drivers/rtc/rtc-tps65910.c | 2 +- + drivers/rtc/rtc-wm831x.c | 3 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/soc/qcom/mdt_loader.c | 88 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 2 +- + drivers/thermal/fair_share.c | 12 +- + drivers/thermal/gov_bang_bang.c | 11 +- + .../int340x_thermal/processor_thermal_device.c | 18 + + drivers/thermal/power_allocator.c | 11 +- + drivers/thermal/step_wise.c | 11 +- + drivers/thermal/thermal_core.c | 52 +- + drivers/thermal/thermal_core.h | 55 +- + drivers/thermal/user_space.c | 12 +- + drivers/vfio/mdev/mdev_core.c | 9 + + drivers/vfio/pci/vfio_pci_nvlink2.c | 3 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 54 +- + drivers/vfio/vfio_iommu_type1.c | 17 +- + drivers/vhost/net.c | 4 +- + drivers/vhost/vhost.c | 850 +++++- + drivers/vhost/vhost.h | 43 +- + drivers/virtio/virtio_mmio.c | 7 +- + fs/aio.c | 20 +- + fs/binfmt_elf.c | 1 - + fs/binfmt_flat.c | 2 - + fs/btrfs/Kconfig | 3 +- + fs/btrfs/Makefile | 3 +- + fs/btrfs/backref.c | 17 +- + fs/btrfs/backref.h | 3 +- + fs/btrfs/block-rsv.c | 425 +++ + fs/btrfs/block-rsv.h | 101 + + fs/btrfs/btrfs_inode.h | 22 +- + fs/btrfs/check-integrity.c | 11 +- + fs/btrfs/compression.c | 65 +- + fs/btrfs/compression.h | 3 +- + fs/btrfs/ctree.h | 282 +- + fs/btrfs/delalloc-space.c | 494 ++++ + fs/btrfs/delalloc-space.h | 23 + + fs/btrfs/delayed-ref.c | 181 +- + fs/btrfs/delayed-ref.h | 10 + + fs/btrfs/dev-replace.c | 31 +- + fs/btrfs/disk-io.c | 166 +- + fs/btrfs/disk-io.h | 2 - + fs/btrfs/extent-tree.c | 2755 ++------------------ + fs/btrfs/extent_io.c | 149 +- + fs/btrfs/extent_io.h | 10 +- + fs/btrfs/file-item.c | 43 +- + fs/btrfs/file.c | 28 +- + fs/btrfs/free-space-cache.c | 16 +- + fs/btrfs/inode-map.c | 1 + + fs/btrfs/inode.c | 109 +- + fs/btrfs/ioctl.c | 23 + + fs/btrfs/locking.c | 62 +- + fs/btrfs/ordered-data.c | 56 +- + fs/btrfs/ordered-data.h | 8 +- + fs/btrfs/print-tree.c | 6 +- + fs/btrfs/props.c | 8 +- + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/relocation.c | 1 + + fs/btrfs/root-tree.c | 56 + + fs/btrfs/scrub.c | 50 +- + fs/btrfs/send.c | 16 +- + fs/btrfs/space-info.c | 1094 ++++++++ + fs/btrfs/space-info.h | 133 + + fs/btrfs/super.c | 30 +- + fs/btrfs/sysfs.c | 1 + + fs/btrfs/tests/extent-io-tests.c | 117 +- + fs/btrfs/tests/extent-map-tests.c | 22 + + fs/btrfs/transaction.c | 18 + + fs/btrfs/transaction.h | 1 + + fs/btrfs/tree-checker.c | 11 + + fs/btrfs/tree-log.c | 40 +- + fs/btrfs/volumes.c | 376 +-- + fs/btrfs/volumes.h | 52 +- + fs/coda/Makefile | 3 +- + fs/coda/cache.c | 2 +- + fs/coda/cnode.c | 17 +- + fs/coda/coda_fs_i.h | 4 +- + fs/coda/coda_int.h | 10 + + fs/coda/coda_linux.c | 45 +- + fs/coda/coda_linux.h | 16 - + {include/linux => fs/coda}/coda_psdev.h | 55 +- + fs/coda/dir.c | 12 +- + fs/coda/file.c | 143 +- + fs/coda/inode.c | 3 +- + fs/coda/pioctl.c | 3 +- + fs/coda/psdev.c | 36 +- + fs/coda/symlink.c | 3 +- + fs/coda/sysctl.c | 11 - + fs/coda/upcall.c | 146 +- + fs/eventpoll.c | 12 +- + fs/hfsplus/xattr.c | 2 +- + fs/io_uring.c | 11 +- + fs/orangefs/file.c | 4 +- + fs/proc/Kconfig | 3 +- + fs/proc/inode.c | 27 +- + fs/proc/proc_sysctl.c | 4 + + fs/proc/vmcore.c | 9 + + fs/reiserfs/journal.c | 6 +- + fs/select.c | 96 +- + fs/ufs/super.c | 2 - + include/asm-generic/bug.h | 6 +- + include/asm-generic/cacheflush.h | 74 +- + include/asm-generic/vmlinux.lds.h | 11 + + include/dt-bindings/clock/exynos4.h | 1 + + include/dt-bindings/clock/exynos5420.h | 18 +- + include/dt-bindings/clock/g12a-clkc.h | 1 + + include/dt-bindings/clock/imx8mm-clock.h | 11 +- + include/dt-bindings/clock/imx8mq-clock.h | 5 +- + include/dt-bindings/clock/meson8b-clkc.h | 3 + + include/dt-bindings/clock/mt8516-clk.h | 17 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 7 + + include/dt-bindings/clock/qcom,gpucc-msm8998.h | 29 + + include/dt-bindings/clock/rk3228-cru.h | 1 + + include/dt-bindings/clock/rk3328-cru.h | 1 + + include/dt-bindings/clock/stratix10-clock.h | 4 +- + include/linux/bits.h | 17 +- + include/linux/clk-provider.h | 103 +- + include/linux/clk.h | 47 + + include/linux/coda.h | 3 +- + include/linux/compat.h | 3 +- + include/linux/dma/edma.h | 47 + + include/linux/dmaengine.h | 12 +- + include/linux/fpga/adi-axi-common.h | 19 + + include/linux/hwspinlock.h | 61 +- + include/linux/io.h | 1 + + include/linux/kernel.h | 2 + + include/linux/kprobes.h | 19 + + include/linux/lz4.h | 18 +- + include/linux/memory_hotplug.h | 8 +- + include/linux/mm.h | 45 +- + include/linux/pci_ids.h | 1 + + include/linux/pfn_t.h | 4 +- + include/linux/pid.h | 5 +- + include/linux/platform_data/dma-imx.h | 1 - + include/linux/platform_data/x86/asus-wmi.h | 2 +- + include/linux/poison.h | 2 +- + include/linux/rbtree.h | 70 +- + include/linux/rbtree_augmented.h | 27 +- + include/linux/remoteproc.h | 32 +- + include/linux/sched/signal.h | 16 +- + include/linux/signal.h | 4 - + include/linux/soc/qcom/mdt_loader.h | 2 + + include/linux/soc/ti/ti_sci_protocol.h | 28 +- + include/linux/sudmac.h | 49 - + include/linux/swapops.h | 5 +- + include/linux/thermal.h | 4 +- + include/linux/tracehook.h | 9 +- + include/trace/events/btrfs.h | 40 + + include/uapi/asm-generic/mman-common.h | 15 +- + include/uapi/asm-generic/mman.h | 10 +- + include/uapi/linux/btrfs_tree.h | 2 + + include/uapi/linux/coda.h | 56 +- + include/uapi/linux/coda_psdev.h | 28 - + include/uapi/linux/ptrace.h | 35 + + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 ++ + init/Kconfig | 4 +- + ipc/mqueue.c | 19 +- + kernel/pid.c | 9 +- + kernel/ptrace.c | 101 +- + kernel/signal.c | 69 +- + kernel/sysctl.c | 18 +- + lib/Kconfig.debug | 8 + + lib/Makefile | 1 + + lib/ioremap.c | 11 + + lib/mpi/longlong.h | 16 +- + lib/rbtree.c | 40 +- + lib/string.c | 11 +- + lib/string_helpers.c | 77 +- + lib/test_meminit.c | 364 +++ + lib/test_overflow.c | 11 +- + lib/test_string.c | 83 +- + mm/Kconfig | 5 +- + mm/cma.c | 15 +- + mm/gup.c | 2 +- + mm/memcontrol.c | 22 +- + mm/memory_hotplug.c | 64 +- + mm/nommu.c | 4 +- + mm/page_alloc.c | 4 - + mm/shmem.c | 4 +- + mm/slab_common.c | 3 +- + mm/util.c | 75 + + mm/vmscan.c | 44 +- + mm/z3fold.c | 29 +- + samples/vfio-mdev/mbochs.c | 3 - + samples/vfio-mdev/mtty.c | 47 +- + scripts/checkpatch.pl | 6 + + scripts/gdb/linux/device.py | 182 ++ + scripts/gdb/linux/genpd.py | 83 + + scripts/gdb/vmlinux-gdb.py | 2 + + scripts/get_maintainer.pl | 14 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-pid-vm.c | 17 +- + tools/testing/selftests/proc/setns-sysvipc.c | 133 + + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/ptrace/Makefile | 2 +- + tools/testing/selftests/ptrace/get_syscall_info.c | 271 ++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 13 +- + 625 files changed, 23989 insertions(+), 10528 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/stm32/mlahb.txt + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/silabs,si5341.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sunxi-ccu.txt + delete mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/mtk-uart-apdma.txt + rename Documentation/devicetree/bindings/remoteproc/{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} (74%) + create mode 100644 Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun4i-a10-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sun6i-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/sunxi-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/trivial-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + rename Documentation/thermal/{cpu-cooling-api.txt => cpu-cooling-api.rst} (82%) + rename Documentation/thermal/{exynos_thermal => exynos_thermal.rst} (67%) + delete mode 100644 Documentation/thermal/exynos_thermal_emulation + create mode 100644 Documentation/thermal/exynos_thermal_emulation.rst + create mode 100644 Documentation/thermal/index.rst + rename Documentation/thermal/{intel_powerclamp.txt => intel_powerclamp.rst} (76%) + rename Documentation/thermal/{nouveau_thermal => nouveau_thermal.rst} (64%) + rename Documentation/thermal/{power_allocator.txt => power_allocator.rst} (74%) + rename Documentation/thermal/{sysfs-api.txt => sysfs-api.rst} (66%) + rename Documentation/thermal/{x86_pkg_temperature_thermal => x86_pkg_temperature_thermal.rst} (80%) + delete mode 100644 arch/mips/include/asm/mach-jz4740/clock.h + create mode 100644 drivers/clk/bcm/clk-bcm63xx-gate.c + create mode 100644 drivers/clk/bcm/clk-raspberrypi.c + create mode 100644 drivers/clk/clk-si5341.c + create mode 100644 drivers/clk/ingenic/pm.c + create mode 100644 drivers/clk/ingenic/pm.h + create mode 100644 drivers/clk/mediatek/clk-mt8516-aud.c + create mode 100644 drivers/dma/dw-edma/Kconfig + create mode 100644 drivers/dma/dw-edma/Makefile + create mode 100644 drivers/dma/dw-edma/dw-edma-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-pcie.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-regs.h + create mode 100644 drivers/dma/mediatek/mtk-uart-apdma.c + delete mode 100644 drivers/dma/sh/sudmac.c + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 drivers/remoteproc/stm32_rproc.c + create mode 100644 fs/btrfs/block-rsv.c + create mode 100644 fs/btrfs/block-rsv.h + create mode 100644 fs/btrfs/delalloc-space.c + create mode 100644 fs/btrfs/delalloc-space.h + create mode 100644 fs/btrfs/space-info.c + create mode 100644 fs/btrfs/space-info.h + rename {include/linux => fs/coda}/coda_psdev.h (59%) + create mode 100644 include/dt-bindings/clock/qcom,gpucc-msm8998.h + create mode 100644 include/linux/dma/edma.h + create mode 100644 include/linux/fpga/adi-axi-common.h + delete mode 100644 include/linux/sudmac.h + delete mode 100644 include/uapi/linux/coda_psdev.h + create mode 100644 include/uapi/linux/virtio_iommu.h + create mode 100644 lib/test_meminit.c + create mode 100644 scripts/gdb/linux/device.py + create mode 100644 scripts/gdb/linux/genpd.py + create mode 100644 tools/testing/selftests/proc/setns-sysvipc.c + create mode 100644 tools/testing/selftests/ptrace/get_syscall_info.c +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 (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig) +$ git merge arc-current/for-curr +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 (2659dc8d225c Merge tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (aa69fb62bea1 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (9a159190414d s390/unwind: avoid int overflow in outside_of_stack) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (4809bba7289b Merge branch 'net-rds-RDMA-fixes') +$ git merge net/master +Auto-merging net/rds/ib_cm.c +Merge made by the 'recursive' strategy. + Documentation/networking/bonding.txt | 16 ++- + drivers/atm/idt77252.c | 1 - + drivers/isdn/hardware/mISDN/hfcsusb.c | 3 + + drivers/net/caif/caif_hsi.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 - + drivers/net/ethernet/atheros/atlx/atl2.c | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - + drivers/net/ethernet/chelsio/cxgb4/sched.c | 1 - + drivers/net/ethernet/emulex/benet/be_main.c | 6 +- + drivers/net/ethernet/freescale/fec_main.c | 2 - + drivers/net/ethernet/google/gve/gve_main.c | 1 - + drivers/net/ethernet/jme.c | 5 - + drivers/net/ethernet/marvell/skge.c | 2 - + drivers/net/ethernet/marvell/sky2.c | 7 ++ + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 - + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 - + drivers/net/ethernet/mellanox/mlxsw/pci.c | 1 - + drivers/net/ethernet/mscc/ocelot_board.c | 5 +- + drivers/net/ethernet/neterion/s2io.c | 1 - + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 3 - + drivers/net/ethernet/realtek/r8169_main.c | 137 +++++++++++++++++++++ + drivers/net/ethernet/sis/sis900.c | 6 +- + drivers/net/ethernet/ti/cpsw.c | 26 ++-- + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/hippi/rrunner.c | 2 - + drivers/net/vmxnet3/vmxnet3_drv.c | 1 - + include/uapi/linux/pkt_sched.h | 2 +- + net/core/neighbour.c | 2 + + net/core/skbuff.c | 2 +- + net/ipv6/sit.c | 13 +- + net/rds/ib.h | 1 + + net/rds/ib_cm.c | 9 +- + net/rds/ib_frmr.c | 84 +++++++++++-- + net/rds/ib_mr.h | 4 + + net/rds/ib_rdma.c | 60 +++------ + net/sched/Kconfig | 2 +- + net/sched/sch_taprio.c | 6 +- + net/sctp/sm_make_chunk.c | 12 +- + 41 files changed, 331 insertions(+), 123 deletions(-) +Merging bpf/master (1cb59a6074e2 selftests/bpf: fix perf_buffer on s390) +$ git merge bpf/master +Removing tools/testing/selftests/bpf/verifier/wide_store.c +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging include/uapi/linux/bpf.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/linux/filter.h | 2 +- + include/uapi/linux/bpf.h | 4 +- + kernel/bpf/btf.c | 19 +++-- + kernel/bpf/verifier.c | 13 ++-- + net/core/filter.c | 24 ++++-- + net/xdp/xdp_umem.c | 16 ++-- + net/xdp/xsk.c | 13 ++-- + samples/bpf/Makefile | 2 +- + tools/bpf/bpftool/main.h | 1 + + tools/include/uapi/linux/bpf.h | 4 +- + tools/lib/bpf/libbpf.c | 4 +- + tools/lib/bpf/xsk.c | 3 +- + tools/testing/selftests/bpf/Makefile | 64 ++++++++-------- + tools/testing/selftests/bpf/bpf_helpers.h | 89 +++++++++++++++------- + .../selftests/bpf/prog_tests/attach_probe.c | 10 +-- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 8 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 33 +++++++- + tools/testing/selftests/bpf/progs/loop1.c | 2 +- + tools/testing/selftests/bpf/progs/loop2.c | 2 +- + tools/testing/selftests/bpf/progs/loop3.c | 2 +- + .../selftests/bpf/progs/test_get_stack_rawtp.c | 3 +- + .../selftests/bpf/progs/test_stacktrace_build_id.c | 3 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 2 +- + tools/testing/selftests/bpf/test_btf.c | 88 +++++++++++++++++++++ + tools/testing/selftests/bpf/test_progs.h | 8 ++ + tools/testing/selftests/bpf/test_verifier.c | 35 ++++----- + .../selftests/bpf/verifier/value_ptr_arith.c | 2 +- + tools/testing/selftests/bpf/verifier/wide_access.c | 73 ++++++++++++++++++ + tools/testing/selftests/bpf/verifier/wide_store.c | 36 --------- + 30 files changed, 381 insertions(+), 186 deletions(-) + create mode 100644 tools/testing/selftests/bpf/verifier/wide_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/wide_store.c +Merging ipsec/master (114a5c324015 Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (28b1d6ef53e3 netfilter: nft_hash: fix symhash with modulus one) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/nf_conntrack_h323_asn1.h | 3 +-- + include/net/netfilter/nf_conntrack_expect.h | 12 ++++++++--- + include/net/netfilter/nf_conntrack_synproxy.h | 1 + + 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/ipv6/netfilter/ip6t_SYNPROXY.c | 2 ++ + net/ipv6/netfilter/ip6t_rpfilter.c | 8 ++++++-- + 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 | 4 ++-- + net/netfilter/nf_tables_api.c | 2 ++ + net/netfilter/nfnetlink.c | 2 +- + net/netfilter/nft_ct.c | 2 +- + net/netfilter/nft_hash.c | 2 +- + net/netfilter/nft_redir.c | 2 +- + net/netfilter/nft_synproxy.c | 2 ++ + 40 files changed, 107 insertions(+), 75 deletions(-) +Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (41a531ffa4c5 rt2x00usb: fix rx queue hang) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 53 +++++++++++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 ++++ + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 2 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 23 +++++++++++ + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 12 +++--- + 6 files changed, 93 insertions(+), 6 deletions(-) +Merging mac80211/master (d2ce8d6bfcfe nl80211: Fix undefined behavior in bit shift) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (4b972a01a7da Linux 5.2-rc6) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (4914da2fb0c8 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/hda_codec.h | 2 ++ + sound/core/seq/seq_clientmgr.c | 11 ++++++++++- + sound/pci/au88x0/au88x0_a3d.c | 15 +++++++-------- + sound/pci/emu10k1/emu10k1x.c | 3 +-- + sound/pci/hda/hda_codec.c | 8 ++++++-- + sound/pci/hda/patch_hdmi.c | 31 ++++++++++++++++++++++++------- + sound/pci/hda/patch_realtek.c | 10 +++++++++- + sound/pci/lx6464es/lx6464es.c | 3 +-- + sound/pci/rme9652/rme9652.c | 3 +-- + sound/ppc/snd_ps3.c | 3 +-- + 10 files changed, 62 insertions(+), 27 deletions(-) +Merging sound-asoc-fixes/for-linus (496017510d4a Merge branch 'asoc-5.2' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (ea09b3e21f18 Merge branch 'regmap-5.2' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (9b955dd030c3 Merge branch 'regulator-5.2' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (5b84322c08aa Merge branch 'spi-5.2' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (6dbbd053e6ae PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ 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 (50950626414a Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (597473720f4d Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (20e833dc3635 crypto: ccp - memset structure fields to zero before reuse) +$ git merge crypto-current/master +Auto-merging drivers/crypto/stm32/stm32-hash.c +Auto-merging drivers/crypto/ccp/ccp-ops.c +Auto-merging drivers/crypto/amcc/crypto4xx_trng.c +Merge made by the 'recursive' strategy. + drivers/crypto/amcc/crypto4xx_trng.c | 1 - + drivers/crypto/ccp/ccp-ops.c | 12 +++++++++++- + drivers/crypto/stm32/stm32-hash.c | 2 +- + 3 files changed, 12 insertions(+), 3 deletions(-) +Merging ide/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (0ecfebd2b524 Linux 5.2) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c7a87ceb17ae mtd: rawnand: sunxi: Add A23/A33 DMA support with extra MBUS configuration) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + include/uapi/linux/videodev2.h | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Auto-merging drivers/reset/core.c +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 3 --- + 1 file changed, 3 deletions(-) +Merging mips-fixes/mips-fixes (2cc80d809e17 mips: fix cacheinfo) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/kernel/cacheinfo.c | 2 ++ + arch/mips/kernel/i8253.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fb59ee37cfe2 ARM: dts: am57xx: Disable voltage switching for SD card) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revc.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +Auto-merging arch/arm/boot/dts/am572x-idk.dts +Auto-merging arch/arm/boot/dts/am571x-idk.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir5221.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir3220.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir2110.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 7 +------ + arch/arm/boot/dts/am572x-idk.dts | 7 +------ + arch/arm/boot/dts/am574x-idk.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +------ + 9 files changed, 9 insertions(+), 33 deletions(-) +Merging kvm-fixes/master (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (5696e4aaabf2 hwmon: (pwm-fan) Check return value from devm_add_action_or_reset) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (a4a357fd4477 Merge branch 'for-5.2/dax' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + drivers/base/core.c | 27 ++++++--- + drivers/nvdimm/bus.c | 138 +++++++++++++++++++++++++++++-------------- + drivers/nvdimm/nd-core.h | 3 +- + drivers/nvdimm/region.c | 22 +++---- + drivers/nvdimm/region_devs.c | 4 ++ + include/linux/device.h | 1 + + 6 files changed, 131 insertions(+), 64 deletions(-) +Merging btrfs-fixes/next-fixes (5560015d7537 Merge branch 'misc-5.3' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/disk-io.c | 1 + + fs/btrfs/inode.c | 24 +++++++++++++++++++++++- + fs/btrfs/volumes.c | 10 +++++++--- + 4 files changed, 32 insertions(+), 4 deletions(-) +Merging vfs-fixes/fixes (75f2d86b20bf fs: VALIDATE_FS_PARSER should default to n) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (9e0babf2c06c Linux 5.2-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (3536e36ee97a dt-bindings: pinctrl: aspeed: Fix AST2500 example errors) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 4 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 9 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 143 +++++++++------------ + 3 files changed, 68 insertions(+), 88 deletions(-) +Merging scsi-fixes/fixes (07d9aa143464 scsi: megaraid_sas: set an unlimited max_segment_size) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.h +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +Auto-merging drivers/scsi/libfc/fc_exch.c +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/iser/iscsi_iser.c | 35 ++++---------------- + drivers/infiniband/ulp/srp/ib_srp.c | 18 ++-------- + drivers/s390/scsi/zfcp_erp.c | 7 ++++ + drivers/s390/scsi/zfcp_fsf.c | 55 +++++++++++++++++++++++++++---- + drivers/scsi/hosts.c | 3 ++ + drivers/scsi/libfc/fc_exch.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 1 - + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +-- + drivers/scsi/megaraid/megaraid_sas_base.c | 31 +++++++++++++---- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 + + drivers/scsi/pm8001/pm8001_sas.c | 6 +++- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 2 ++ + drivers/scsi/scsi_devinfo.c | 2 ++ + drivers/scsi/scsi_lib.c | 13 +++++--- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/storvsc_drv.c | 5 ++- + drivers/scsi/ufs/ufshcd.c | 3 +- + include/scsi/scsi_host.h | 3 ++ + 20 files changed, 123 insertions(+), 74 deletions(-) +Merging drm-fixes/drm-fixes (a0b2cf792ac9 Merge tag 'imx-drm-fixes-2019-07-04' of git://git.pengutronix.de/git/pza/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2)) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (d7e8a19b38c8 drm/i915: Don't dereference request if it may have been retired when printing) +$ git merge drm-intel-fixes/for-linux-next-fixes +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 e24085675caf] 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 (83293386bc95 mmc: core: Prevent processing SDIO IRQs when the card is suspended) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (9be11356057a PCI: pci-hyperv: fix build errors on non-SYSFS config) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (0db7f5cd4aeb riscv: mm: Fix code comment) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (2f040d27080d drm/panfrost: Fix a double-free error) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp-gustavo/for-next/kspp (d93512ef0f0e Makefile: Globally enable fall-through warning) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/afs/fsclient.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb.c +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging drivers/net/can/peak_canfd/peak_pciefd_main.c +Auto-merging drivers/net/can/at91_can.c +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/process/deprecated.rst | 14 +++++++ + Makefile | 3 ++ + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + drivers/net/can/at91_can.c | 6 ++- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 +- + drivers/net/can/spi/mcp251x.c | 3 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + fs/afs/fsclient.c | 51 ++++++++++++++++--------- + fs/afs/yfsclient.c | 54 +++++++++++++++++---------- + 11 files changed, 96 insertions(+), 44 deletions(-) +Merging kbuild/for-next (9b2802e2b3b9 kbuild: add -fcf-protection=none when using retpoline flags) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging Makefile +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/kbuild/kbuild.rst +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/dontdiff | 1 + + Documentation/kbuild/kbuild.rst | 5 +- + Documentation/kbuild/makefiles.rst | 12 ++--- + Makefile | 61 ++++++++++------------ + arch/arm/vdso/Makefile | 3 +- + arch/arm64/kernel/vdso32/Makefile | 4 +- + arch/riscv/Makefile | 2 - + arch/sparc/vdso/Makefile | 3 +- + arch/x86/entry/vdso/Makefile | 5 +- + drivers/memory/.gitignore | 1 + + drivers/memory/Makefile | 5 +- + drivers/memory/ti-emif-sram-pm.S | 2 +- + drivers/scsi/Makefile | 2 +- + include/Kbuild | 13 ++--- + lib/Kconfig.debug | 12 +---- + scripts/Kbuild.include | 5 -- + scripts/Makefile.build | 42 ++++++--------- + scripts/Makefile.lib | 2 +- + scripts/Makefile.modbuiltin | 2 +- + scripts/Makefile.modinst | 5 +- + scripts/Makefile.modpost | 19 ++++--- + scripts/Makefile.modsign | 3 +- + scripts/adjust_autoksyms.sh | 14 ++--- + .../api/devm_platform_ioremap_resource.cocci | 60 +++++++++++++++++++++ + scripts/export_report.pl | 11 ++-- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/confdata.c | 7 ++- + scripts/kconfig/expr.h | 1 + + scripts/mod/sumversion.c | 23 ++------ + scripts/modules-check.sh | 2 +- + scripts/package/builddeb | 5 ++ + scripts/package/mkdebian | 1 + + scripts/package/mkspec | 2 +- + tools/power/cpupower/debug/kernel/Makefile | 4 +- + usr/include/Makefile | 8 --- + 36 files changed, 177 insertions(+), 173 deletions(-) + create mode 100644 drivers/memory/.gitignore + create mode 100644 scripts/coccinelle/api/devm_platform_ioremap_resource.cocci +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 (7bb9bbcee884 dma-direct: Force unencrypted DMA under SME for certain DMA masks) +$ git merge dma-mapping/for-next +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/mm/init.c | 7 ++++++- + arch/x86/Kconfig | 1 + + arch/x86/mm/mem_encrypt.c | 30 ++++++++++++++++++++++++++++++ + include/linux/dma-direct.h | 9 +++++++++ + kernel/dma/Kconfig | 3 +++ + kernel/dma/direct.c | 16 ++++------------ + 7 files changed, 54 insertions(+), 13 deletions(-) +Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next) +$ git merge arm/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging arch/arm/mach-sa1100/hackkit.c +Auto-merging arch/arm/mach-sa1100/h3xxx.c +Auto-merging arch/arm/mach-sa1100/badge4.c +Auto-merging arch/arm/mach-sa1100/assabet.c +Auto-merging arch/arm/mach-rpc/time.c +Auto-merging arch/arm/mach-rpc/include/mach/uncompress.h +Auto-merging arch/arm/mach-rpc/ecard.c +Auto-merging arch/arm/mach-rpc/dma.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/Kconfig | 3 +- + arch/arm/lib/Makefile | 1 - + arch/arm/mach-rpc/Makefile | 3 +- + arch/arm/mach-rpc/dma.c | 97 +++++----- + arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0 + arch/arm/mach-rpc/ecard.c | 32 +++- + arch/arm/{lib => mach-rpc}/floppydma.S | 0 + arch/arm/mach-rpc/include/mach/uncompress.h | 23 +-- + arch/arm/{lib => mach-rpc}/io-acorn.S | 0 + arch/arm/mach-rpc/irq.c | 136 +++++-------- + arch/arm/mach-rpc/time.c | 38 ++-- + arch/arm/mach-sa1100/assabet.c | 91 +++------ + arch/arm/mach-sa1100/badge4.c | 2 - + arch/arm/mach-sa1100/clock.c | 220 +++++++++------------- + arch/arm/mach-sa1100/h3xxx.c | 64 ++----- + arch/arm/mach-sa1100/hackkit.c | 48 ----- + arch/arm/mach-sa1100/neponset.c | 109 +++-------- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/sa1100.c | 46 ++++- + 20 files changed, 366 insertions(+), 550 deletions(-) + rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%) + rename arch/arm/{lib => mach-rpc}/floppydma.S (100%) + rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%) +Merging arm64/for-next/core (0c61efd322b7 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (d482e575fbf0 perf: arm_spe: Enable ACPI/Platform automatic module loading) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (879d1d31cdf0 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging include/linux/soc/ti/ti_sci_protocol.h +Removing include/linux/platform_data/video-clcd-versatile.h +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/soc/rockchip/pm_domains.c +Auto-merging drivers/soc/imx/soc-imx8.c +Auto-merging drivers/memory/tegra/tegra124.c +Auto-merging drivers/memory/jedec_ddr_data.c +Auto-merging drivers/memory/jedec_ddr.h +Auto-merging drivers/memory/emif.c +Auto-merging drivers/memory/brcmstb_dpfe.c +Auto-merging drivers/memory/Makefile +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/firmware/ti_sci.h +Auto-merging drivers/firmware/ti_sci.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging arch/arm/mach-stm32/Kconfig +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/include/mach/lubbock.h +Auto-merging arch/arm/mach-omap2/sleep44xx.S +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/omap-smc.S +Auto-merging arch/arm/mach-omap2/omap-headsmp.S +Auto-merging arch/arm/mach-keystone/smc.S +Auto-merging arch/arm/mach-imx/mach-imx7d.c +Auto-merging arch/arm/mach-imx/cpuidle-imx6q.c +Auto-merging arch/arm/mach-highbank/smc.S +Auto-merging arch/arm/mach-bcm/bcm63xx_smp.c +CONFLICT (modify/delete): arch/arm/include/debug/netx.S deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/include/debug/netx.S left in tree. +Removing arch/arm/configs/netx_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi +Auto-merging arch/arm/boot/dts/imx7ulp.dtsi +Auto-merging arch/arm/boot/dts/hip04.dtsi +Auto-merging arch/arm/boot/dts/am335x-wega.dtsi +Auto-merging arch/arm/boot/dts/am335x-wega-rdk.dts +Auto-merging arch/arm/boot/dts/am335x-phycore-som.dtsi +Auto-merging arch/arm/boot/dts/am335x-phycore-rdk.dts +Auto-merging arch/arm/boot/dts/am335x-pcm-953.dtsi +Auto-merging arch/arm/boot/dts/am335x-baltos-ir5221.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir3220.dts +Auto-merging arch/arm/boot/dts/am335x-baltos-ir2110.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/pwm/pwm-sun4i.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +Removing Documentation/devicetree/bindings/bus/sunxi-rsb.txt +Removing Documentation/devicetree/bindings/arm/stm32/stm32.txt +Removing Documentation/devicetree/bindings/arm/mediatek.txt +Removing Documentation/devicetree/bindings/arm/emtrion.txt +Removing Documentation/devicetree/bindings/arm/atmel-at91.txt +Removing Documentation/devicetree/bindings/arm/amlogic.txt +Resolved 'arch/arm/configs/exynos_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/include/debug/netx.S +arch/arm/include/debug/netx.S: needs merge +rm 'arch/arm/include/debug/netx.S' +$ git commit -v -a +[master e2b9da9d078c] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.txt | 142 -- + Documentation/devicetree/bindings/arm/amlogic.yaml | 144 ++ + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 + + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + .../devicetree/bindings/arm/atmel-at91.txt | 73 - + .../devicetree/bindings/arm/atmel-at91.yaml | 134 ++ + Documentation/devicetree/bindings/arm/emtrion.txt | 12 - + Documentation/devicetree/bindings/arm/fsl.yaml | 44 + + Documentation/devicetree/bindings/arm/mediatek.txt | 89 - + .../devicetree/bindings/arm/mediatek.yaml | 91 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + Documentation/devicetree/bindings/arm/renesas.yaml | 8 + + .../devicetree/bindings/arm/rockchip.yaml | 13 + + .../devicetree/bindings/arm/stm32/stm32.txt | 10 - + .../devicetree/bindings/arm/stm32/stm32.yaml | 31 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + Documentation/devicetree/bindings/arm/ti/k3.txt | 3 + + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 79 + + .../devicetree/bindings/bus/sunxi-rsb.txt | 47 - + .../bindings/display/bridge/renesas,dw-hdmi.txt | 4 +- + Documentation/devicetree/bindings/dma/fsl-qdma.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 1 + + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 1 + + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 + + .../devicetree/bindings/net/can/rcar_can.txt | 13 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 16 +- + .../devicetree/bindings/power/qcom,rpmpd.txt | 2 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 57 + + .../devicetree/bindings/pwm/pwm-sun4i.txt | 24 - + .../bindings/reset/bitmain,bm1880-reset.txt | 18 + + .../devicetree/bindings/reset/fsl,imx7-src.txt | 2 +- + .../devicetree/bindings/serial/omap_serial.txt | 1 + + .../bindings/soc/amlogic/amlogic,canvas.txt | 10 +- + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 81 + + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 6 +- + .../devicetree/bindings/timer/renesas,cmt.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + + MAINTAINERS | 11 +- + arch/arm/Kconfig | 11 - + arch/arm/Kconfig.debug | 7 - + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 213 +++ + arch/arm/boot/dts/Makefile | 10 + + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 12 + + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 12 + + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 11 + + arch/arm/boot/dts/am335x-pcm-953.dtsi | 22 +- + arch/arm/boot/dts/am335x-phycore-rdk.dts | 4 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 47 +- + arch/arm/boot/dts/am335x-regor-rdk.dts | 24 + + arch/arm/boot/dts/am335x-regor.dtsi | 223 +++ + arch/arm/boot/dts/am335x-wega-rdk.dts | 4 + + arch/arm/boot/dts/am335x-wega.dtsi | 16 +- + arch/arm/boot/dts/arm-realview-eb.dtsi | 6 + + arch/arm/boot/dts/arm-realview-pb1176.dts | 6 + + arch/arm/boot/dts/arm-realview-pb11mp.dts | 6 + + arch/arm/boot/dts/arm-realview-pbx.dtsi | 6 + + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 8 + + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 160 ++ + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 846 +++++++++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 566 ++++++ + arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 207 +++ + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 22 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 966 +++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 224 +++ + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 123 +- + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 5 + + arch/arm/boot/dts/aspeed-g4.dtsi | 8 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 11 +- + arch/arm/boot/dts/at91-wb50n.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 8 - + arch/arm/boot/dts/at91sam9g45.dtsi | 25 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 25 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 23 +- + arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 12 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 6 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 9 +- + arch/arm/boot/dts/bcm11351.dtsi | 12 +- + arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 10 +- + arch/arm/boot/dts/bcm23550-sparrow.dts | 2 +- + arch/arm/boot/dts/bcm23550.dtsi | 8 +- + arch/arm/boot/dts/bcm28155-ap.dts | 2 +- + arch/arm/boot/dts/bcm283x.dtsi | 2 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 - + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 4 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +- + arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 4 +- + arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +- + arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 4 +- + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 4 +- + arch/arm/boot/dts/bcm5301x.dtsi | 10 +- + arch/arm/boot/dts/bcm53573.dtsi | 2 +- + arch/arm/boot/dts/bcm63138.dtsi | 9 +- + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 2 +- + arch/arm/boot/dts/bcm7445.dtsi | 8 +- + arch/arm/boot/dts/bcm911360_entphn.dts | 2 - + arch/arm/boot/dts/bcm947189acdbmr.dts | 4 +- + arch/arm/boot/dts/bcm953012er.dts | 4 +- + arch/arm/boot/dts/bcm953012k.dts | 2 +- + arch/arm/boot/dts/bcm958522er.dts | 2 +- + arch/arm/boot/dts/bcm958525er.dts | 2 +- + arch/arm/boot/dts/bcm958525xmc.dts | 2 +- + arch/arm/boot/dts/bcm958622hr.dts | 2 +- + arch/arm/boot/dts/bcm958623hr.dts | 2 +- + arch/arm/boot/dts/bcm958625hr.dts | 2 +- + arch/arm/boot/dts/bcm958625k.dts | 2 +- + arch/arm/boot/dts/bcm963138dvt.dts | 2 +- + arch/arm/boot/dts/bcm988312hr.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 13 + + arch/arm/boot/dts/da850-lcdk.dts | 36 + + arch/arm/boot/dts/da850-lego-ev3.dts | 30 + + arch/arm/boot/dts/da850.dtsi | 50 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 5 + + arch/arm/boot/dts/exynos3250-monk.dts | 5 + + arch/arm/boot/dts/exynos3250-rinato.dts | 5 + + arch/arm/boot/dts/exynos3250.dtsi | 33 + + arch/arm/boot/dts/exynos4.dtsi | 16 +- + arch/arm/boot/dts/exynos4210-origen.dts | 5 + + arch/arm/boot/dts/exynos4210-trats.dts | 4 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 5 + + arch/arm/boot/dts/exynos4210.dtsi | 51 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 + + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 5 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 + + arch/arm/boot/dts/exynos4412-prime.dtsi | 7 + + arch/arm/boot/dts/exynos4412.dtsi | 49 + + arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 + + arch/arm/boot/dts/exynos5410.dtsi | 6 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 102 +- + arch/arm/boot/dts/exynos5420.dtsi | 234 ++- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 108 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 + + arch/arm/boot/dts/exynos54xx.dtsi | 9 + + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +- + arch/arm/boot/dts/hip04.dtsi | 18 +- + arch/arm/boot/dts/ibm-power9-dual.dtsi | 248 +++ + arch/arm/boot/dts/imx53-m53menlo.dts | 266 ++- + arch/arm/boot/dts/imx53-smd.dts | 73 + + arch/arm/boot/dts/imx53.dtsi | 12 + + arch/arm/boot/dts/imx6dl-kontron-samx6i.dtsi | 12 + + arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 36 + + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 815 +++++++++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 16 + + arch/arm/boot/dts/imx6qdl.dtsi | 11 +- + arch/arm/boot/dts/imx6sl-evk.dts | 12 + + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + arch/arm/boot/dts/imx6sll-evk.dts | 12 + + arch/arm/boot/dts/imx6sll.dtsi | 2 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 16 + + arch/arm/boot/dts/imx6sx-sdb.dts | 16 + + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 89 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 + + arch/arm/boot/dts/imx6ul-geam.dts | 2 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 14 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 6 + + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7d-meerkat96.dts | 375 ++++ + arch/arm/boot/dts/imx7d-sdb.dts | 16 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 16 +- + arch/arm/boot/dts/imx7d.dtsi | 16 +- + arch/arm/boot/dts/imx7s.dtsi | 11 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 55 + + arch/arm/boot/dts/imx7ulp.dtsi | 38 + + arch/arm/boot/dts/integrator.dtsi | 3 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 32 + + arch/arm/boot/dts/ls1021a-tsn.dts | 289 ++++ + arch/arm/boot/dts/meson.dtsi | 44 +- + arch/arm/boot/dts/meson6-atv1200.dts | 44 +- + arch/arm/boot/dts/meson6.dtsi | 44 +- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +- + arch/arm/boot/dts/meson8.dtsi | 64 +- + arch/arm/boot/dts/meson8b-ec100.dts | 9 +- + arch/arm/boot/dts/meson8b-mxq.dts | 182 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 51 +- + arch/arm/boot/dts/meson8b.dtsi | 64 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 17 +- + arch/arm/boot/dts/meson8m2.dtsi | 10 + + arch/arm/boot/dts/omap4-l4.dtsi | 9 - + arch/arm/boot/dts/pxa300-raumfeld-common.dtsi | 6 +- + arch/arm/boot/dts/pxa300-raumfeld-controller.dts | 21 +- + arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts | 3 + + arch/arm/boot/dts/pxa3xx.dtsi | 8 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 6 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 156 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 138 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 38 + + arch/arm/boot/dts/r7s72100.dtsi | 19 + + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 161 +- + arch/arm/boot/dts/r7s9210.dtsi | 286 +++ + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 4 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 9 +- + arch/arm/boot/dts/r8a7790-stout.dts | 9 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 9 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 9 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 34 + + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 85 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 29 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 207 +++ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 +++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 234 ++- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 256 ++- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 219 +++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 76 +- + arch/arm/boot/dts/rk3288.dtsi | 30 +- + arch/arm/boot/dts/sama5d3.dtsi | 27 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 21 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 19 + + arch/arm/boot/dts/stm32746g-eval.dts | 66 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 246 +++ + arch/arm/boot/dts/stm32mp157a-avenger96.dts | 321 ++++ + arch/arm/boot/dts/stm32mp157a-dk1.dts | 70 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 18 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 125 +- + arch/arm/boot/dts/stm32mp157c.dtsi | 180 ++ + arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi | 90 + + arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi | 62 + + arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi | 78 + + arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi | 62 + + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 8 + + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 29 + + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 + + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 7 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 123 ++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 3 +- + arch/arm/boot/dts/uniphier-ld4-ref.dts | 4 + + arch/arm/boot/dts/uniphier-ld4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 4 + + arch/arm/boot/dts/uniphier-pro4-ref.dts | 4 + + arch/arm/boot/dts/uniphier-pro4.dtsi | 2 + + arch/arm/boot/dts/uniphier-pro5.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 4 + + arch/arm/boot/dts/uniphier-sld8.dtsi | 4 +- + arch/arm/boot/dts/versatile-ab.dts | 3 + + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 5 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 3 + + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 13 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 52 +- + arch/arm/configs/acs5k_defconfig | 1 - + arch/arm/configs/acs5k_tiny_defconfig | 1 - + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/configs/aspeed_g4_defconfig | 11 +- + arch/arm/configs/aspeed_g5_defconfig | 15 +- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/cm_x2xx_defconfig | 2 - + arch/arm/configs/cm_x300_defconfig | 2 - + arch/arm/configs/cns3420vb_defconfig | 1 - + arch/arm/configs/colibri_pxa270_defconfig | 2 - + arch/arm/configs/colibri_pxa300_defconfig | 2 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 2 - + arch/arm/configs/davinci_all_defconfig | 1 + + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 2 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 2 - + arch/arm/configs/exynos_defconfig | 65 +- + arch/arm/configs/ezx_defconfig | 2 - + arch/arm/configs/gemini_defconfig | 1 - + arch/arm/configs/h3600_defconfig | 1 - + arch/arm/configs/h5000_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 2 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/configs/integrator_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 2 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lpc18xx_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 2 - + arch/arm/configs/magician_defconfig | 2 - + arch/arm/configs/mini2440_defconfig | 45 +- + arch/arm/configs/mmp2_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 11 +- + arch/arm/configs/multi_v7_defconfig | 4 +- + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/mvebu_v7_defconfig | 1 - + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/netx_defconfig | 80 - + arch/arm/configs/nhk8815_defconfig | 2 - + arch/arm/configs/nuc910_defconfig | 1 - + arch/arm/configs/nuc950_defconfig | 1 - + arch/arm/configs/nuc960_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/palmz72_defconfig | 2 - + arch/arm/configs/pcm027_defconfig | 1 - + arch/arm/configs/prima2_defconfig | 1 - + arch/arm/configs/pxa168_defconfig | 1 - + arch/arm/configs/pxa3xx_defconfig | 2 - + arch/arm/configs/pxa910_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 2 - + arch/arm/configs/qcom_defconfig | 7 +- + arch/arm/configs/realview_defconfig | 2 - + arch/arm/configs/s3c2410_defconfig | 25 +- + arch/arm/configs/s3c6400_defconfig | 13 +- + arch/arm/configs/s5pv210_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 2 - + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/configs/spear3xx_defconfig | 2 - + arch/arm/configs/spear6xx_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 2 - + arch/arm/configs/tango4_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + arch/arm/configs/u300_defconfig | 2 - + arch/arm/configs/u8500_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 2 - + arch/arm/configs/viper_defconfig | 2 - + arch/arm/configs/xcep_defconfig | 1 - + arch/arm/configs/zeus_defconfig | 2 - + arch/arm/configs/zx_defconfig | 1 - + arch/arm/include/debug/netx.S | 32 - + arch/arm/mach-at91/pm.c | 1 + + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-bcm/Makefile | 3 - + arch/arm/mach-bcm/bcm63xx_smp.c | 1 + + arch/arm/mach-bcm/bcm_kona_smc.c | 2 - + arch/arm/mach-bcm/board_bcm281xx.c | 1 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 7 +- + arch/arm/mach-davinci/board-da850-evm.c | 43 +- + arch/arm/mach-exynos/Kconfig | 7 +- + arch/arm/mach-exynos/Makefile | 6 +- + arch/arm/mach-exynos/exynos-smc.S | 3 +- + arch/arm/mach-exynos/sleep.S | 3 +- + arch/arm/mach-exynos/suspend.c | 8 +- + arch/arm/mach-highbank/Makefile | 3 - + arch/arm/mach-highbank/smc.S | 3 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 10 +- + arch/arm/mach-imx/mach-imx7d.c | 7 + + arch/arm/mach-keystone/Makefile | 3 - + arch/arm/mach-keystone/smc.S | 1 + + arch/arm/mach-omap2/Makefile | 13 - + arch/arm/mach-omap2/omap-headsmp.S | 2 + + arch/arm/mach-omap2/omap-smc.S | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 39 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 8 +- + arch/arm/mach-omap2/pdata-quirks.c | 60 + + arch/arm/mach-omap2/sleep33xx.S | 1 + + arch/arm/mach-omap2/sleep34xx.S | 2 + + arch/arm/mach-omap2/sleep43xx.S | 2 + + arch/arm/mach-omap2/sleep44xx.S | 3 + + arch/arm/mach-pxa/include/mach/lubbock.h | 4 - + arch/arm/mach-pxa/lubbock.c | 3 +- + arch/arm/mach-rockchip/platsmp.c | 12 +- + arch/arm/mach-rockchip/pm.c | 2 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 17 + + arch/arm/mach-stm32/Kconfig | 3 +- + arch/arm/mach-tango/Makefile | 3 - + arch/arm/mach-tango/smc.S | 2 + + arch/arm/mach-versatile/versatile_dt.c | 164 +- + arch/arm64/Kconfig.platforms | 3 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 25 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 - + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 23 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 23 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 - + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 44 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 + + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 3 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 12 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 28 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 35 +- + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 401 ++++- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 122 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 257 +++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1825 +++++++++++++++++++- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 386 +++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 15 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 10 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 15 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 9 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 106 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 37 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 13 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 14 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 38 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 12 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 13 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 14 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 4 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 4 +- + .../boot/dts/broadcom/stingray/stingray-usb.dtsi | 72 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 108 ++ + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 5 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 51 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 5 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 11 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 136 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 190 ++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 151 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 4 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 809 +++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 62 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 134 +- + .../arm64/boot/dts/hisilicon/hi3660-coresight.dtsi | 456 +++++ + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 + + .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 6 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 18 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 28 + + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 7 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 5 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 118 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 140 ++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 447 +++++ + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 75 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 53 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 176 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 55 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 509 ++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 16 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 13 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 52 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 22 +- + arch/arm64/boot/dts/qcom/Makefile | 4 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 17 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 59 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 185 ++ + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pms405.dtsi | 20 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 43 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 636 ++++++- + arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts | 238 +++ + arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts | 238 +++ + arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts | 174 ++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 1326 ++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 557 ++++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 283 ++- + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 325 ++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 63 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 15 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 26 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 527 +++++- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 246 ++- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 93 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 71 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 45 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 9 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 10 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 49 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 4 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 733 ++++++++ + .../dts/rockchip/rk3399-khadas-edge-captain.dts | 27 + + .../boot/dts/rockchip/rk3399-khadas-edge-v.dts | 27 + + .../arm64/boot/dts/rockchip/rk3399-khadas-edge.dts | 13 + + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 804 +++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 101 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 49 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 18 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 23 +- + arch/arm64/boot/dts/rockchip/rk3399pro.dtsi | 22 + + .../boot/dts/socionext/uniphier-ld11-global.dts | 4 + + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 15 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 15 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 4 + + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 15 +- + arch/arm64/boot/dts/sprd/sc9836.dtsi | 2 +- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 8 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 35 + + arch/arm64/boot/dts/ti/Makefile | 2 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 201 +++ + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 28 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 51 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 50 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 243 +++ + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 90 + + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 29 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 177 ++ + arch/arm64/configs/defconfig | 45 +- + drivers/bus/brcmstb_gisb.c | 4 +- + drivers/bus/fsl-mc/dprc.c | 30 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 17 +- + drivers/bus/ti-sysc.c | 454 ++++- + drivers/firmware/arm_scmi/clock.c | 2 + + drivers/firmware/arm_scmi/sensors.c | 10 +- + drivers/firmware/psci/psci_checker.c | 10 +- + drivers/firmware/tegra/bpmp.c | 4 +- + drivers/firmware/ti_sci.c | 1143 ++++++++++-- + drivers/firmware/ti_sci.h | 810 +++++++++ + drivers/hwmon/scmi-hwmon.c | 48 + + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_dpfe.c | 317 +++- + drivers/memory/emif.c | 3 +- + {include => drivers}/memory/jedec_ddr.h | 6 +- + {lib => drivers/memory}/jedec_ddr_data.c | 5 +- + drivers/memory/of_memory.c | 3 +- + drivers/memory/tegra/tegra124.c | 44 +- + drivers/reset/Kconfig | 3 +- + drivers/reset/reset-simple.c | 2 + + drivers/soc/amlogic/meson-canvas.c | 14 +- + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 61 +- + drivers/soc/fsl/Kconfig | 10 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/dpaa2-console.c | 329 ++++ + drivers/soc/fsl/dpio/dpio-driver.c | 23 +- + drivers/soc/fsl/dpio/qbman-portal.c | 148 +- + drivers/soc/fsl/dpio/qbman-portal.h | 9 +- + drivers/soc/fsl/guts.c | 6 + + drivers/soc/fsl/qbman/bman_portal.c | 20 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 21 +- + drivers/soc/fsl/qbman/qman_priv.h | 9 +- + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/soc-imx-scu.c | 144 ++ + drivers/soc/imx/soc-imx8.c | 63 +- + drivers/soc/qcom/Kconfig | 12 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 76 +- + drivers/soc/qcom/qcom_aoss.c | 480 +++++ + drivers/soc/qcom/rpmpd.c | 134 +- + drivers/soc/renesas/Kconfig | 4 +- + drivers/soc/rockchip/pm_domains.c | 230 +-- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- + drivers/soc/tegra/pmc.c | 18 + + drivers/soc/ti/Kconfig | 5 + + drivers/soc/ti/pm33xx.c | 1 + + include/dt-bindings/gpio/tegra186-gpio.h | 41 - + include/dt-bindings/power/qcom-aoss-qmp.h | 14 + + include/dt-bindings/power/qcom-rpmpd.h | 34 + + include/dt-bindings/reset/bitmain,bm1880-reset.h | 51 + + include/linux/platform_data/ti-sysc.h | 12 + + include/linux/platform_data/video-clcd-versatile.h | 28 - + include/linux/scmi_protocol.h | 1 + + include/linux/soc/ti/ti_sci_protocol.h | 246 +++ + include/soc/fsl/bman.h | 8 + + include/soc/fsl/qman.h | 9 + + lib/Kconfig | 8 - + lib/Makefile | 2 - + 643 files changed, 31907 insertions(+), 3630 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic.yaml + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + delete mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.txt + create mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/emtrion.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32.txt + create mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32.yaml + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-sun4i.txt + create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-regor-rdk.dts + create mode 100644 arch/arm/boot/dts/am335x-regor.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-swift.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts + create mode 100644 arch/arm/boot/dts/ibm-power9-dual.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-meerkat96.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts + create mode 100644 arch/arm/boot/dts/ls1021a-tsn.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-avenger96.dts + create mode 100644 arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi + delete mode 100644 arch/arm/configs/netx_defconfig + delete mode 100644 arch/arm/include/debug/netx.S + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-db845c.dts + create mode 100644 arch/arm64/boot/dts/renesas/hihope-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e.dtsi + rename {include => drivers}/memory/jedec_ddr.h (97%) + rename {lib => drivers/memory}/jedec_ddr_data.c (98%) + create mode 100644 drivers/soc/fsl/dpaa2-console.c + create mode 100644 drivers/soc/imx/soc-imx-scu.c + create mode 100644 drivers/soc/qcom/qcom_aoss.c + create mode 100644 include/dt-bindings/power/qcom-aoss-qmp.h + create mode 100644 include/dt-bindings/reset/bitmain,bm1880-reset.h + delete mode 100644 include/linux/platform_data/video-clcd-versatile.h +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (11343d25a03b Merge branch 'v5.3/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging aspeed/for-next (a1f5c11ddb7d Merge branches 'dt-for-v5.3', 'defconfig-for-v5.3' and 'soc-for-v5.3' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (7eb505978425 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (2a7f6c1a5376 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +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 ae9d062713b0] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + drivers/reset/reset-simple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (13622a50d8db Merge branch 'v5.3-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (cf6664323e0f Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (0ecfebd2b524 Linux 5.2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (6c6b5d7650d9 Merge branch 'sunxi/dt64-for-5.3' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (033de83170dd Merge branch for-5.3/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (b1511f7a48c3 Merge branches 'clk-bcm63xx', 'clk-silabs', 'clk-lochnagar' and 'clk-rockchip' into clk-next) +$ git merge clk/clk-next +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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/csky/pmu.txt | 38 +++ + arch/csky/Kconfig | 4 + + arch/csky/abiv1/Makefile | 7 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 6 + + arch/csky/abiv1/inc/abi/string.h | 14 +- + arch/csky/abiv1/memcmp.c | 310 +++++++++++++++++++ + arch/csky/abiv1/memcopy.h | 179 +++++++++++ + arch/csky/abiv1/memmove.c | 93 ++++++ + arch/csky/abiv1/memset.c | 86 ++++-- + arch/csky/abiv1/strcpy.c | 17 + + arch/csky/abiv1/strksyms.c | 4 + + arch/csky/abiv1/strlen.c | 89 ++++++ + arch/csky/abiv1/wordcopy.c | 397 ++++++++++++++++++++++++ + arch/csky/abiv2/inc/abi/ckmmu.h | 10 + + arch/csky/include/asm/asid.h | 78 +++++ + arch/csky/include/asm/mmu.h | 2 +- + arch/csky/include/asm/mmu_context.h | 114 +------ + arch/csky/include/asm/pgtable.h | 2 - + arch/csky/kernel/perf_event.c | 410 ++++++++++++++++++++++--- + arch/csky/kernel/smp.c | 2 - + arch/csky/kernel/traps.c | 5 + + arch/csky/mm/Makefile | 2 + + arch/csky/mm/asid.c | 189 ++++++++++++ + arch/csky/mm/context.c | 46 +++ + arch/csky/mm/init.c | 2 - + arch/csky/mm/tlb.c | 238 ++++++-------- + 26 files changed, 2029 insertions(+), 315 deletions(-) + create mode 100644 Documentation/devicetree/bindings/csky/pmu.txt + create mode 100644 arch/csky/abiv1/memcmp.c + create mode 100644 arch/csky/abiv1/memcopy.h + create mode 100644 arch/csky/abiv1/memmove.c + create mode 100644 arch/csky/abiv1/strcpy.c + create mode 100644 arch/csky/abiv1/strlen.c + create mode 100644 arch/csky/abiv1/wordcopy.c + create mode 100644 arch/csky/include/asm/asid.h + create mode 100644 arch/csky/mm/asid.c + create mode 100644 arch/csky/mm/context.c +Merging h8300/h8300-next (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 (ad97f9df0fee riscv: add binfmt_flat support) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (e5793cd1b5fe MIPS: fix some more fall through errors in arch/mips) +$ git merge mips/mips-next +Already up to date. +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 (45800fb45139 parisc: Wire up clone3 syscall) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/unistd.h | 1 + + arch/parisc/kernel/entry.S | 1 + + arch/parisc/kernel/kprobes.c | 3 +++ + arch/parisc/kernel/ptrace.c | 31 ++++++++++++++++++++----------- + arch/parisc/kernel/syscalls/syscall.tbl | 2 +- + 5 files changed, 26 insertions(+), 12 deletions(-) +Merging powerpc/next (f5a9e488d623 powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) +$ git merge soc-fsl/next +Auto-merging drivers/soc/fsl/qe/qe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + drivers/soc/fsl/dpaa2-console.c | 2 +- + drivers/soc/fsl/qe/qe.c | 163 ++++++++------------- + 3 files changed, 78 insertions(+), 100 deletions(-) +Merging risc-v/for-next (0f327f2aaad6 RISC-V: Add an Image header that boot loader can parse.) +$ git merge risc-v/for-next +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f74c7b3e1874] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/riscv/boot-image-header.txt | 50 +++++ + MAINTAINERS | 4 +- + arch/Kconfig | 3 + + arch/arm64/Kconfig | 2 +- + arch/riscv/Kconfig | 10 + + arch/riscv/Kconfig.socs | 13 ++ + arch/riscv/boot/dts/sifive/Makefile | 2 +- + arch/riscv/configs/defconfig | 8 +- + arch/riscv/configs/rv32_defconfig | 2 + + arch/riscv/include/asm/fixmap.h | 5 + + arch/riscv/include/asm/hugetlb.h | 18 ++ + arch/riscv/include/asm/image.h | 65 ++++++ + arch/riscv/include/asm/page.h | 14 +- + arch/riscv/include/asm/pgtable-64.h | 5 + + arch/riscv/include/asm/pgtable.h | 16 +- + arch/riscv/kernel/head.S | 49 ++++- + arch/riscv/kernel/setup.c | 6 +- + arch/riscv/kernel/vdso.c | 19 -- + arch/riscv/mm/Makefile | 2 + + arch/riscv/mm/hugetlbpage.c | 44 ++++ + arch/riscv/mm/init.c | 326 ++++++++++++++++++++++++------ + arch/riscv/mm/sifive_l2_cache.c | 11 +- + arch/x86/Kconfig | 4 +- + 23 files changed, 561 insertions(+), 117 deletions(-) + create mode 100644 Documentation/riscv/boot-image-header.txt + create mode 100644 arch/riscv/Kconfig.socs + create mode 100644 arch/riscv/include/asm/hugetlb.h + create mode 100644 arch/riscv/include/asm/image.h + create mode 100644 arch/riscv/mm/hugetlbpage.c +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (499723d12063 docs: s390: s390dbf: typos and formatting, update crash command) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (d3023897b437 arch/sh: Check for kprobe trap number before trying to handle a kprobe trap) +$ git merge sh/sh-next +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 +Auto-merging net/ceph/messenger.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/debugfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/block/rbd.c | 2442 ++++++++++++++++++++++++---------- + drivers/block/rbd_types.h | 10 + + fs/ceph/Kconfig | 12 + + fs/ceph/acl.c | 22 +- + fs/ceph/addr.c | 2 + + fs/ceph/caps.c | 120 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 73 +- + fs/ceph/export.c | 2 +- + fs/ceph/file.c | 34 +- + fs/ceph/inode.c | 208 +-- + fs/ceph/mds_client.c | 120 +- + fs/ceph/mds_client.h | 4 +- + fs/ceph/mdsmap.c | 12 +- + fs/ceph/quota.c | 15 +- + fs/ceph/snap.c | 3 + + fs/ceph/super.c | 13 +- + fs/ceph/super.h | 67 +- + fs/ceph/xattr.c | 456 ++++--- + include/linux/ceph/ceph_features.h | 1 + + include/linux/ceph/ceph_fs.h | 2 +- + include/linux/ceph/cls_lock_client.h | 3 + + include/linux/ceph/decode.h | 13 +- + include/linux/ceph/libceph.h | 10 +- + include/linux/ceph/mon_client.h | 1 - + include/linux/ceph/osd_client.h | 12 +- + include/linux/ceph/striper.h | 2 + + include/linux/iversion.h | 24 + + net/ceph/Makefile | 2 +- + net/ceph/cls_lock_client.c | 54 +- + net/ceph/decode.c | 84 ++ + net/ceph/messenger.c | 14 +- + net/ceph/mon_client.c | 21 +- + net/ceph/osd_client.c | 42 +- + net/ceph/osdmap.c | 31 +- + net/ceph/pagevec.c | 33 - + net/ceph/striper.c | 17 + + 38 files changed, 2733 insertions(+), 1254 deletions(-) + create mode 100644 net/ceph/decode.c +$ git am -3 ../patches/0001-rbd-fix-up-for-lockdep_assert_held_exclusive-rename.patch +Applying: rbd: fix up for lockdep_assert_held_exclusive rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/rbd.c +$ git add -A . +$ git commit -v -a --amend +[master 1014bfe367e3] Merge remote-tracking branch 'ceph/master' + Date: Thu Jul 18 09:08:39 2019 +1000 +Merging cifs/for-next (2fe8af7a45a4 smb3: add mount option to encode xattr names as hexadecimal) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/Kconfig +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 18 ++--- + fs/cifs/Makefile | 3 +- + fs/cifs/cifs_debug.c | 2 - + fs/cifs/cifs_fs_sb.h | 7 ++ + fs/cifs/cifsfs.c | 20 +++-- + fs/cifs/cifsfs.h | 1 + + fs/cifs/cifsglob.h | 9 ++- + fs/cifs/cifssmb.c | 16 +--- + fs/cifs/connect.c | 67 ++++++++++++---- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/file.c | 52 ++++++++++++- + fs/cifs/inode.c | 8 +- + fs/cifs/misc.c | 1 + + fs/cifs/smb1ops.c | 3 +- + fs/cifs/smb2inode.c | 30 +++++++- + fs/cifs/smb2ops.c | 199 ++++++++++++++++++++++++++++++++++-------------- + fs/cifs/smb2pdu.c | 154 +++++++++++++++++++++++++++++-------- + fs/cifs/smb2pdu.h | 36 +++++++-- + fs/cifs/smb2proto.h | 4 + + fs/cifs/smb2transport.c | 10 ++- + fs/cifs/transport.c | 46 +++++------ + fs/cifs/xattr.c | 4 - + 22 files changed, 507 insertions(+), 185 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 (3d03243e4536 f2fs: allocate memory in batch in build_sit_info()) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/file.c | 63 ++++++++++++++++++++----------------------------------- + fs/f2fs/segment.c | 51 ++++++++++++++++++++------------------------ + fs/f2fs/segment.h | 1 + + 3 files changed, 47 insertions(+), 68 deletions(-) +Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity") +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (50c800074446 NFSv4: Validate the stateid before applying it to state recovery) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/debugfs.c +CONFLICT (content): Merge conflict in net/sunrpc/debugfs.c +Auto-merging fs/nfs/nfs4file.c +Resolved 'net/sunrpc/debugfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 238ae514b690] Merge remote-tracking branch 'nfs/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/Makefile | 3 +- + fs/nfs/callback_proc.c | 28 ++- + fs/nfs/client.c | 24 ++- + fs/nfs/dir.c | 94 +-------- + fs/nfs/inode.c | 30 ++- + fs/nfs/internal.h | 7 +- + fs/nfs/netns.h | 3 + + fs/nfs/nfs2xdr.c | 2 +- + fs/nfs/nfs3client.c | 3 + + fs/nfs/nfs3xdr.c | 2 +- + fs/nfs/nfs4_fs.h | 4 +- + fs/nfs/nfs4client.c | 14 +- + fs/nfs/nfs4file.c | 8 +- + fs/nfs/nfs4proc.c | 77 +++++-- + fs/nfs/nfs4state.c | 46 ++-- + fs/nfs/nfs4trace.h | 207 +++++++++++------- + fs/nfs/nfs4xdr.c | 16 +- + fs/nfs/nfstrace.h | 233 ++++++++++++++------ + fs/nfs/pagelist.c | 6 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 57 +++-- + fs/nfs/sysfs.c | 187 +++++++++++++++++ + fs/nfs/sysfs.h | 25 +++ + fs/nfs/write.c | 7 +- + include/linux/nfs_fs.h | 2 + + include/linux/nfs_fs_sb.h | 1 + + include/linux/sunrpc/clnt.h | 3 + + include/linux/sunrpc/metrics.h | 7 +- + include/linux/sunrpc/sched.h | 4 +- + include/linux/sunrpc/xprt.h | 4 + + include/linux/sunrpc/xprtmultipath.h | 2 + + include/linux/sunrpc/xprtsock.h | 5 + + include/trace/events/rpcrdma.h | 90 ++++++-- + net/sunrpc/Kconfig | 2 +- + net/sunrpc/clnt.c | 79 ++++++- + net/sunrpc/debugfs.c | 46 ++-- + net/sunrpc/sched.c | 81 ++++--- + net/sunrpc/stats.c | 23 +- + net/sunrpc/xprt.c | 99 +++++---- + net/sunrpc/xprtmultipath.c | 23 +- + net/sunrpc/xprtrdma/frwr_ops.c | 327 +++++++++++++++++++---------- + net/sunrpc/xprtrdma/rpc_rdma.c | 152 ++++++-------- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- + net/sunrpc/xprtrdma/transport.c | 83 ++++++-- + net/sunrpc/xprtrdma/verbs.c | 115 +++++----- + net/sunrpc/xprtrdma/xprt_rdma.h | 44 ++-- + net/sunrpc/xprtsock.c | 124 +++++++---- + 48 files changed, 1599 insertions(+), 814 deletions(-) + create mode 100644 fs/nfs/sysfs.c + create mode 100644 fs/nfs/sysfs.h +Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (b78fa45d4edb nfsd: Make __get_nfsdfs_client() static) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) +$ git merge orangefs/for-next +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 +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/index.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst +Resolved 'Documentation/admin-guide/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fb4917bc613f] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/index.rst | 1 + + .../{filesystems/xfs.txt => admin-guide/xfs.rst} | 132 ++++++++++----------- + Documentation/filesystems/dax.txt | 2 +- + MAINTAINERS | 3 +- + fs/xfs/Makefile | 4 +- + fs/xfs/{ => libxfs}/xfs_trans_inode.c | 4 + + 6 files changed, 73 insertions(+), 73 deletions(-) + rename Documentation/{filesystems/xfs.txt => admin-guide/xfs.rst} (80%) + rename fs/xfs/{ => libxfs}/xfs_trans_inode.c (96%) +Merging iomap/iomap-for-next (5d907307adc1 iomap: move internal declarations into fs/iomap/) +$ git merge iomap/iomap-for-next +Removing fs/iomap.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/Makefile | 2 +- + fs/dax.c | 1 - + fs/internal.h | 10 - + fs/iomap.c | 2205 ------------------------------------------------ + fs/iomap/Makefile | 15 + + fs/iomap/apply.c | 74 ++ + fs/iomap/buffered-io.c | 1073 +++++++++++++++++++++++ + fs/iomap/direct-io.c | 562 ++++++++++++ + fs/iomap/fiemap.c | 144 ++++ + fs/iomap/seek.c | 212 +++++ + fs/iomap/swapfile.c | 178 ++++ + include/linux/iomap.h | 17 + + 13 files changed, 2277 insertions(+), 2217 deletions(-) + delete mode 100644 fs/iomap.c + create mode 100644 fs/iomap/Makefile + create mode 100644 fs/iomap/apply.c + create mode 100644 fs/iomap/buffered-io.c + create mode 100644 fs/iomap/direct-io.c + create mode 100644 fs/iomap/fiemap.c + create mode 100644 fs/iomap/seek.c + create mode 100644 fs/iomap/swapfile.c +Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) +$ git merge djw-vfs/vfs-for-next +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Merge made by the 'recursive' strategy. + fs/attr.c | 13 ++++++------- + mm/filemap.c | 3 +++ + mm/memory.c | 4 ++++ + mm/mmap.c | 8 ++++++-- + 4 files changed, 19 insertions(+), 9 deletions(-) +Merging file-locks/locks-next (5450e8a316a6 Merge tag 'pidfd-updates-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (38760c17cc96 Merge branch 'work.dcache' into for-next) +$ git merge vfs/for-next +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/inode.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging net/socket.c +Auto-merging net/ceph/ceph_common.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/z3fold.c +Auto-merging mm/shmem.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/inode.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/uapi/linux/magic.h +CONFLICT (content): Merge conflict in include/uapi/linux/magic.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging fs/ubifs/super.c +CONFLICT (content): Merge conflict in fs/ubifs/super.c +Auto-merging fs/tracefs/inode.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/proc/root.c +Auto-merging fs/orangefs/orangefs-mod.c +Auto-merging fs/nfsd/nfsctl.c +CONFLICT (content): Merge conflict in fs/nfsd/nfsctl.c +Auto-merging fs/nfs/super.c +Auto-merging fs/jffs2/os-linux.h +Auto-merging fs/jffs2/fs.c +Auto-merging fs/internal.h +Auto-merging fs/gfs2/super.h +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/incore.h +Auto-merging fs/efivarfs/super.c +Auto-merging fs/devpts/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/dcache.c +Auto-merging fs/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 fs/ceph/dir.c +Auto-merging fs/block_dev.c +Auto-merging fs/aio.c +Auto-merging fs/adfs/super.c +Auto-merging fs/adfs/map.c +Auto-merging fs/adfs/inode.c +Auto-merging fs/adfs/dir_fplus.c +Auto-merging fs/adfs/dir_f.c +Auto-merging fs/adfs/dir.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/block/rbd.c +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/ia64/kernel/perfmon.c +CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. +Auto-merging Documentation/filesystems/porting +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/nfsd/nfsctl.c' using previous resolution. +Resolved 'fs/ubifs/super.c' using previous resolution. +Resolved 'include/uapi/linux/magic.h' 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 8c0760d99183] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting | 15 +- + arch/ia64/kernel/perfmon.c | 17 +- + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- + arch/s390/hypfs/inode.c | 137 +++--- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 3 +- + drivers/android/binderfs.c | 160 +++---- + drivers/base/devtmpfs.c | 41 +- + drivers/block/rbd.c | 363 ++++++++-------- + drivers/dax/super.c | 23 +- + drivers/gpu/drm/drm_drv.c | 20 +- + drivers/infiniband/hw/qib/qib_fs.c | 26 +- + drivers/misc/cxl/api.c | 13 +- + drivers/misc/ibmasm/ibmasmfs.c | 21 +- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdsuper.c | 181 ++++---- + drivers/oprofile/oprofilefs.c | 20 +- + drivers/scsi/cxlflash/ocxl_hw.c | 23 +- + drivers/usb/gadget/function/f_fs.c | 233 +++++----- + drivers/usb/gadget/legacy/inode.c | 21 +- + drivers/virtio/virtio_balloon.c | 13 +- + drivers/xen/xenfs/super.c | 21 +- + fs/adfs/adfs.h | 70 +-- + fs/adfs/dir.c | 25 +- + fs/adfs/dir_f.c | 38 +- + fs/adfs/dir_fplus.c | 21 +- + fs/adfs/inode.c | 12 +- + fs/adfs/map.c | 15 +- + fs/adfs/super.c | 121 +++--- + fs/aio.c | 16 +- + fs/anon_inodes.c | 13 +- + fs/autofs/autofs_i.h | 13 +- + fs/autofs/init.c | 9 +- + fs/autofs/inode.c | 429 +++++++++--------- + fs/binfmt_misc.c | 20 +- + fs/block_dev.c | 17 +- + fs/btrfs/tests/btrfs-tests.c | 15 +- + fs/ceph/cache.c | 9 +- + fs/ceph/cache.h | 5 +- + fs/ceph/dir.c | 2 +- + fs/ceph/super.c | 694 +++++++++++++++--------------- + fs/ceph/super.h | 1 - + fs/coda/inode.c | 171 +++++--- + fs/configfs/mount.c | 20 +- + fs/cramfs/inode.c | 69 +-- + fs/d_path.c | 1 - + fs/dcache.c | 100 ++++- + fs/debugfs/inode.c | 185 ++++---- + fs/devpts/inode.c | 265 ++++++------ + fs/efivarfs/super.c | 25 +- + fs/fs_context.c | 18 +- + fs/fs_parser.c | 18 +- + fs/fs_pin.c | 10 +- + fs/fsopen.c | 2 + + fs/fuse/control.c | 2 +- + fs/fuse/inode.c | 291 +++++++------ + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- + fs/gfs2/super.c | 333 +------------- + fs/gfs2/super.h | 3 +- + fs/hugetlbfs/inode.c | 2 +- + fs/internal.h | 5 + + fs/jffs2/fs.c | 21 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/super.c | 172 ++++---- + fs/libfs.c | 82 ++-- + fs/mount.h | 8 +- + fs/namespace.c | 174 ++++---- + fs/nfs/super.c | 6 +- + fs/nfsd/nfsctl.c | 31 +- + fs/nsfs.c | 16 +- + fs/openpromfs/inode.c | 20 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/orangefs-mod.c | 3 +- + fs/orangefs/super.c | 192 +++++---- + fs/pipe.c | 15 +- + fs/proc/root.c | 7 +- + fs/pstore/inode.c | 108 +++-- + fs/ramfs/inode.c | 105 +++-- + fs/romfs/super.c | 46 +- + fs/squashfs/super.c | 100 +++-- + fs/super.c | 351 +++++++-------- + fs/sysfs/mount.c | 3 +- + fs/tracefs/inode.c | 179 ++++---- + fs/ubifs/super.c | 450 +++++++++---------- + include/linux/ceph/ceph_debug.h | 1 + + include/linux/ceph/libceph.h | 17 +- + include/linux/dcache.h | 1 - + include/linux/fs.h | 24 -- + include/linux/fs_context.h | 22 +- + include/linux/fs_pin.h | 1 - + include/linux/init.h | 5 +- + include/linux/mtd/super.h | 6 +- + include/linux/pseudo_fs.h | 16 + + include/linux/ramfs.h | 7 +- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 4 +- + include/uapi/linux/adfs_fs.h | 6 +- + include/uapi/linux/magic.h | 1 + + init/do_mounts.c | 35 +- + init/main.c | 1 - + ipc/mqueue.c | 9 +- + kernel/bpf/inode.c | 92 ++-- + kernel/cgroup/cgroup.c | 50 ++- + kernel/cgroup/cpuset.c | 61 +-- + kernel/events/core.c | 4 +- + mm/shmem.c | 395 +++++++++++------ + mm/z3fold.c | 14 +- + mm/zsmalloc.c | 12 +- + net/ceph/ceph_common.c | 410 ++++++++---------- + net/socket.c | 16 +- + net/sunrpc/rpc_pipe.c | 34 +- + security/apparmor/apparmorfs.c | 20 +- + security/inode.c | 21 +- + security/selinux/selinuxfs.c | 20 +- + security/smack/smackfs.c | 34 +- + 115 files changed, 4498 insertions(+), 4072 deletions(-) + create mode 100644 include/linux/pseudo_fs.h +$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch +Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/filesystems/vfs.rst +$ git add -A . +$ git commit -v -a --amend +[master 5b146f93b4a0] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Jul 18 09:25:47 2019 +1000 +$ git am -3 ../patches/0001-convert-vmwballoon-to-use-the-new-mount-API.patch +Applying: convert vmwballoon to use the new mount API +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/vmw_balloon.c +$ git add -A . +$ git commit -v -a --amend +[master 62692e089c10] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Jul 18 09:25:47 2019 +1000 +$ git am -3 ../patches/0001-dma-buf-convert-to-new-mount-api.patch +Applying: dma-buf: convert to new mount api +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/dma-buf/dma-buf.c +$ git add -A . +$ git commit -v -a --amend +[master e4ece72a1301] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Jul 18 09:25:47 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 (9f7546570bcb hwmon: (ina3221) Add of_node_put() before return) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (224d5fd43d25 docs: driver-api: generic-counter: fix file path to ABI doc) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/generic-counter.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging v4l-dvb/master (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (0a8ad0ffa4d8 Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) +$ 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 (b5d0790132df Merge branch 'acpi-video' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/power/pm_qos_interface.rst +CONFLICT (content): Merge conflict in Documentation/power/pm_qos_interface.rst +Resolved 'Documentation/power/pm_qos_interface.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 07c40ecfd19f] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/pm_qos_interface.rst | 12 +- + MAINTAINERS | 1 + + drivers/acpi/acpi_video.c | 37 + + drivers/acpi/acpica/exconfig.c | 18 +- + drivers/acpi/acpica/tbxfload.c | 10 +- + drivers/acpi/blacklist.c | 4 + + drivers/base/power/domain.c | 8 +- + drivers/base/power/domain_governor.c | 4 +- + drivers/base/power/qos.c | 135 +++- + drivers/base/power/runtime.c | 2 +- + drivers/cpufreq/bmips-cpufreq.c | 17 +- + drivers/cpufreq/cpufreq.c | 216 ++++-- + drivers/cpufreq/davinci-cpufreq.c | 3 +- + drivers/cpufreq/imx-cpufreq-dt.c | 3 +- + drivers/cpufreq/imx6q-cpufreq.c | 6 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/cpufreq/kirkwood-cpufreq.c | 3 +- + drivers/cpufreq/loongson1-cpufreq.c | 8 +- + drivers/cpufreq/loongson2_cpufreq.c | 3 +- + drivers/cpufreq/maple-cpufreq.c | 3 +- + drivers/cpufreq/omap-cpufreq.c | 15 +- + drivers/cpufreq/pasemi-cpufreq.c | 3 +- + drivers/cpufreq/pmac32-cpufreq.c | 3 +- + drivers/cpufreq/pmac64-cpufreq.c | 3 +- + drivers/cpufreq/s3c2416-cpufreq.c | 9 +- + drivers/cpufreq/s3c64xx-cpufreq.c | 15 +- + drivers/cpufreq/s5pv210-cpufreq.c | 3 +- + drivers/cpufreq/sa1100-cpufreq.c | 3 +- + drivers/cpufreq/sa1110-cpufreq.c | 3 +- + drivers/cpufreq/spear-cpufreq.c | 3 +- + drivers/cpufreq/tegra20-cpufreq.c | 8 +- + drivers/cpuidle/governor.c | 2 +- + drivers/powercap/Kconfig | 11 +- + drivers/powercap/Makefile | 3 +- + .../powercap/{intel_rapl.c => intel_rapl_common.c} | 801 ++++++++------------- + drivers/powercap/intel_rapl_msr.c | 183 +++++ + drivers/thermal/intel/int340x_thermal/Kconfig | 6 + + .../int340x_thermal/processor_thermal_device.c | 173 ++++- + include/linux/acpi.h | 5 +- + include/linux/cpufreq.h | 14 +- + include/linux/intel_rapl.h | 155 ++++ + include/linux/pm_qos.h | 48 +- + 42 files changed, 1252 insertions(+), 717 deletions(-) + rename drivers/powercap/{intel_rapl.c => intel_rapl_common.c} (64%) + create mode 100644 drivers/powercap/intel_rapl_msr.c + create mode 100644 include/linux/intel_rapl.h +Merging cpufreq-arm/cpufreq/arm/linux-next (f9020441dbc3 cpufreq: s5pv210: Don't flood kernel log after cpufreq change) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (560d1bcad715 opp: Don't use IS_ERR on invalid supplies) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (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 kernel/dma/swiotlb.c +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. + drivers/xen/swiotlb-xen.c | 34 +++++++++------------------------- + kernel/dma/swiotlb.c | 30 ++++++++++++++++-------------- + 2 files changed, 25 insertions(+), 39 deletions(-) +Merging rdma/for-next (0b043644c0ca RMDA/siw: Require a 64 bit arch) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (1dd7382b1bb6 net/mlx5: Introduce VHCA tunnel device capability) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (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. + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 ++++ + drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c | 1 + + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 3 +++ + include/net/cfg80211.h | 2 +- + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging gfs2/for-next (bb4cb25dd319 gfs2: Remove unused gfs2_iomap_alloc argument) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (46ce10df799f Merge tag 'spi-nor/for-5.3-v2' of gitolite.kernel.org:pub/scm/linux/kernel/git/mtd/linux into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (bce9437a0a48 mtd: rawnand: stm32_fmc2: increase DMA completion timeouts) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (8d1336c241bd mtd: spi-nor: cadence-quadspi: add reset control) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (f3880a23564e crypto: stm32/hash - remove interruptible condition for dma) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (3729fe2bc2a0 Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next") +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (07fc09fb0ae4 drm/amd/display: Force uclk to max for every state) +$ git merge amdgpu/drm-next +Removing drivers/gpu/drm/amd/amdgpu/vi_dpm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 51 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 34 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 2 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 52 ++++- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 1 - + drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 32 --- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 3 + + drivers/gpu/drm/amd/display/Kconfig | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 222 +++++++++++++++++++++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 25 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 9 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 41 ++-- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 8 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 36 ++++ + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 12 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 16 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 75 ++++--- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 2 - + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +- + .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 6 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 62 +++--- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 16 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 - + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 - + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 - + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 41 ++-- + include/uapi/drm/amdgpu_drm.h | 7 +- + 54 files changed, 677 insertions(+), 245 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/vi_dpm.h +Merging drm-intel/for-linux-next (c30d5dc653cb drm/i915/gt: Push engine stopping into reset-prepare) +$ 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 +Removing drivers/gpu/drm/i915/i915_gem_render_state.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/Makefile.header-test +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 +[master a9974c84782b] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig.debug | 14 + + drivers/gpu/drm/i915/Makefile | 79 +- + drivers/gpu/drm/i915/Makefile.header-test | 7 +- + drivers/gpu/drm/i915/display/Makefile | 3 + + drivers/gpu/drm/i915/display/icl_dsi.c | 181 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 56 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 81 +- + drivers/gpu/drm/i915/display/intel_bios.c | 28 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 17 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 84 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 193 +- + drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 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 | 291 +-- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 8 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 646 +++++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 12 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 20 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 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 | 332 +++- + drivers/gpu/drm/i915/display/intel_tc.c | 537 ++++++ + drivers/gpu/drm/i915/display/intel_tc.h | 35 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 14 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- + drivers/gpu/drm/i915/gem/Makefile | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 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 | 17 +- + 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 | 153 +- + 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 | 986 ++++++---- + 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 | 165 +- + .../i915/{i915_timeline.c => gt/intel_timeline.c} | 230 +-- + drivers/gpu/drm/i915/gt/intel_timeline.h | 93 + + .../intel_timeline_types.h} | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 66 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 513 +++-- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 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 | 173 +- + drivers/gpu/drm/i915/i915_drv.h | 230 +-- + drivers/gpu/drm/i915/i915_fixed.h | 5 + + drivers/gpu/drm/i915/i915_gem.c | 304 +-- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 42 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 32 + + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 3 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 2007 ++++++++------------ + 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 | 43 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 54 +- + drivers/gpu/drm/i915/i915_irq.c | 786 ++++---- + drivers/gpu/drm/i915/i915_irq.h | 45 +- + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + 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 | 216 ++- + drivers/gpu/drm/i915/i915_request.c | 126 +- + drivers/gpu/drm/i915/i915_request.h | 24 +- + drivers/gpu/drm/i915/i915_scheduler.c | 4 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 27 +- + drivers/gpu/drm/i915/i915_timeline.h | 94 - + drivers/gpu/drm/i915/i915_trace.h | 88 +- + drivers/gpu/drm/i915/i915_utils.h | 12 + + drivers/gpu/drm/i915/i915_vgpu.c | 63 +- + drivers/gpu/drm/i915/i915_vgpu.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 71 +- + drivers/gpu/drm/i915/intel_device_info.c | 40 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 + + drivers/gpu/drm/i915/intel_drv.h | 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 + + 236 files changed, 11183 insertions(+), 8382 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 (7aaddd96d5fe drm/modes: Don't apply cmdline's rotation if it wasn't specified) +$ git merge drm-misc/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 63 ---------- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 18 +-- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 15 ++- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 84 +------------ + .../drm/arm/display/komeda/komeda_wb_connector.c | 10 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_hw.c | 14 ++- + drivers/gpu/drm/bochs/bochs_kms.c | 3 +- + drivers/gpu/drm/drm_client_modeset.c | 5 +- + drivers/gpu/drm/drm_connector.c | 2 +- + drivers/gpu/drm/drm_modes.c | 14 ++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++ + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 136 ++++++++------------- + include/drm/drm_modes.h | 2 +- + 16 files changed, 110 insertions(+), 277 deletions(-) +Merging drm-msm/msm-next (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (57bdd4057516 drm/etnaviv: Use devm_platform_ioremap_resource()) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++++++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 9 ++++----- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 7 +++++-- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 5 +++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +++--- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 5 +++-- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 ++ + 10 files changed, 36 insertions(+), 12 deletions(-) +Merging regmap/for-next (aaccf3863ce2 Merge branch 'regmap-5.3' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (4914da2fb0c8 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (ca4aacd92c71 Merge branch 'asoc-5.3' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/sound/simple_card_utils.h | 4 ++++ + sound/soc/codecs/max98357a.c | 25 ++++--------------------- + sound/soc/codecs/pcm3060-i2c.c | 4 ++-- + sound/soc/codecs/pcm3060-spi.c | 4 ++-- + sound/soc/codecs/pcm3060.c | 4 ++-- + sound/soc/codecs/pcm3060.h | 2 +- + sound/soc/codecs/rt1011.c | 4 ++-- + sound/soc/codecs/rt1308.c | 0 + sound/soc/codecs/rt1308.h | 0 + sound/soc/generic/audio-graph-card.c | 30 ++++++++++++++++-------------- + sound/soc/generic/simple-card-utils.c | 7 +++++++ + sound/soc/generic/simple-card.c | 26 +++++++++++++------------- + sound/soc/intel/boards/bytcht_es8316.c | 8 ++++++++ + sound/soc/samsung/odroid.c | 8 +++++--- + 15 files changed, 67 insertions(+), 61 deletions(-) + mode change 100755 => 100644 sound/soc/codecs/rt1308.c + mode change 100755 => 100644 sound/soc/codecs/rt1308.h +Merging modules/modules-next (93651f80dcb6 modules: fix compile error if don't have strict module rwx) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging arch/arm/kernel/module.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/module.c | 7 ++++++ + include/linux/moduleloader.h | 5 ++++ + kernel/module.c | 60 ++++++++++++++++++++++++++++++-------------- + 3 files changed, 53 insertions(+), 19 deletions(-) +Merging input/next (5a4cee7b28ed Input: psmouse - fix build error of multiple definition) +$ git merge input/next +Auto-merging drivers/input/mouse/synaptics.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/Kconfig | 3 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 10 +- + drivers/input/joystick/iforce/iforce-ff.c | 3 - + drivers/input/joystick/iforce/iforce-main.c | 3 - + drivers/input/joystick/iforce/iforce-packets.c | 3 - + drivers/input/joystick/iforce/iforce-serio.c | 3 - + drivers/input/joystick/iforce/iforce-usb.c | 3 - + drivers/input/joystick/iforce/iforce.h | 3 - + drivers/input/keyboard/Kconfig | 15 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5589-keys.c | 1 + + drivers/input/keyboard/applespi.c | 1977 ++++++++++++++++++++++++ + drivers/input/keyboard/applespi.h | 29 + + drivers/input/keyboard/applespi_trace.h | 93 ++ + drivers/input/keyboard/mtk-pmic-keys.c | 9 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 3 + + drivers/input/mouse/alps.c | 32 + + drivers/input/mouse/synaptics.c | 3 +- + drivers/input/mouse/trackpoint.h | 3 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/input/tablet/gtco.c | 20 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 3 +- + 22 files changed, 2190 insertions(+), 34 deletions(-) + create mode 100644 drivers/input/keyboard/applespi.c + create mode 100644 drivers/input/keyboard/applespi.h + create mode 100644 drivers/input/keyboard/applespi_trace.h +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 +Auto-merging include/linux/device-mapper.h +Auto-merging drivers/md/dm-zoned-metadata.c +Merge made by the 'recursive' strategy. + drivers/md/dm-kcopyd.c | 34 ++++++++++++++++++++++++++++------ + drivers/md/dm-snap.c | 10 ++++++++++ + drivers/md/dm-zoned-metadata.c | 24 ------------------------ + drivers/md/dm-zoned.h | 28 ++++++++++++++++++++++++---- + include/linux/device-mapper.h | 17 ++++------------- + 5 files changed, 66 insertions(+), 47 deletions(-) +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (59592cc1f593 mmc: sdhci_am654: Add dependency on MMC_SDHCI_AM654) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 282a21bc1bd9] 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 (e571e17488d4 Merge branch 'regulator-5.3' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 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 +Auto-merging drivers/watchdog/mei_wdt.c +Auto-merging drivers/watchdog/bcm_kona_wdt.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/watchdog/wdt.rst +Auto-merging Documentation/watchdog/watchdog-pm.rst +Auto-merging Documentation/watchdog/watchdog-parameters.rst +CONFLICT (add/add): Merge conflict in Documentation/watchdog/watchdog-parameters.rst +Auto-merging Documentation/watchdog/watchdog-kernel-api.rst +Auto-merging Documentation/watchdog/watchdog-api.rst +Auto-merging Documentation/watchdog/pcwd-watchdog.rst +Auto-merging Documentation/watchdog/mlx-wdt.rst +Auto-merging Documentation/watchdog/index.rst +CONFLICT (add/add): Merge conflict in Documentation/watchdog/index.rst +Auto-merging Documentation/watchdog/hpwdt.rst +CONFLICT (content): Merge conflict in Documentation/watchdog/hpwdt.rst +Auto-merging Documentation/watchdog/convert_drivers_to_kernel_api.rst +Removing Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Auto-merging Documentation/admin-guide/kernel-per-CPU-kthreads.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt' using previous resolution. +Resolved 'Documentation/watchdog/hpwdt.rst' using previous resolution. +Resolved 'Documentation/watchdog/index.rst' using previous resolution. +Resolved 'Documentation/watchdog/watchdog-parameters.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 723a166e4e46] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 15 +++ + .../bindings/watchdog/fsl-imx-sc-wdt.txt | 24 ---- + .../watchdog/{renesas-wdt.txt => renesas,wdt.txt} | 0 + Documentation/watchdog/hpwdt.rst | 6 +- + Documentation/watchdog/watchdog-parameters.rst | 11 ++ + drivers/watchdog/Kconfig | 10 ++ + drivers/watchdog/acquirewdt.c | 6 +- + drivers/watchdog/advantechwdt.c | 6 +- + drivers/watchdog/aspeed_wdt.c | 8 +- + drivers/watchdog/bcm2835_wdt.c | 5 +- + drivers/watchdog/bcm7038_wdt.c | 4 +- + drivers/watchdog/bcm_kona_wdt.c | 4 +- + drivers/watchdog/cadence_wdt.c | 4 +- + drivers/watchdog/da9052_wdt.c | 9 +- + drivers/watchdog/da9062_wdt.c | 5 +- + drivers/watchdog/davinci_wdt.c | 14 +-- + drivers/watchdog/digicolor_wdt.c | 9 +- + drivers/watchdog/ebc-c384_wdt.c | 9 -- + drivers/watchdog/eurotechwdt.c | 6 +- + drivers/watchdog/ftwdt010_wdt.c | 4 +- + drivers/watchdog/gpio_wdt.c | 7 ++ + drivers/watchdog/hpwdt.c | 59 +++++++--- + drivers/watchdog/i6300esb.c | 5 +- + drivers/watchdog/iTCO_vendor_support.c | 7 +- + drivers/watchdog/iTCO_wdt.c | 6 +- + drivers/watchdog/ib700wdt.c | 6 +- + drivers/watchdog/ie6xx_wdt.c | 8 +- + drivers/watchdog/imx2_wdt.c | 4 +- + drivers/watchdog/imx_sc_wdt.c | 123 +++++++++++++++++---- + drivers/watchdog/intel-mid_wdt.c | 4 +- + drivers/watchdog/jz4740_wdt.c | 57 +++++----- + drivers/watchdog/loongson1_wdt.c | 4 +- + drivers/watchdog/max77620_wdt.c | 8 +- + drivers/watchdog/mei_wdt.c | 4 +- + drivers/watchdog/mena21_wdt.c | 4 +- + drivers/watchdog/menf21bmc_wdt.c | 4 +- + drivers/watchdog/mpc8xxx_wdt.c | 5 +- + drivers/watchdog/mv64x60_wdt.c | 6 +- + drivers/watchdog/ni903x_wdt.c | 4 +- + drivers/watchdog/nic7018_wdt.c | 1 - + drivers/watchdog/npcm_wdt.c | 4 +- + drivers/watchdog/nv_tco.h | 6 +- + drivers/watchdog/octeon-wdt-main.c | 11 +- + drivers/watchdog/of_xilinx_wdt.c | 4 +- + drivers/watchdog/omap_wdt.c | 6 +- + drivers/watchdog/omap_wdt.h | 21 +--- + drivers/watchdog/pc87413_wdt.c | 6 +- + drivers/watchdog/pcwd_pci.c | 6 +- + drivers/watchdog/pcwd_usb.c | 6 +- + drivers/watchdog/pic32-dmt.c | 4 +- + drivers/watchdog/pic32-wdt.c | 4 +- + drivers/watchdog/pnx4008_wdt.c | 9 +- + drivers/watchdog/qcom-wdt.c | 4 +- + drivers/watchdog/rave-sp-wdt.c | 1 - + drivers/watchdog/renesas_wdt.c | 35 ++++-- + drivers/watchdog/retu_wdt.c | 10 +- + drivers/watchdog/s3c2410_wdt.c | 4 +- + drivers/watchdog/sa1100_wdt.c | 6 +- + drivers/watchdog/sama5d4_wdt.c | 29 +++-- + drivers/watchdog/sbc7240_wdt.c | 11 +- + drivers/watchdog/sbc8360.c | 6 +- + drivers/watchdog/sch311x_wdt.c | 6 +- + drivers/watchdog/softdog.c | 6 +- + drivers/watchdog/sp5100_tco.c | 4 +- + drivers/watchdog/sp805_wdt.c | 5 +- + drivers/watchdog/sprd_wdt.c | 1 - + drivers/watchdog/st_lpc_wdt.c | 4 +- + drivers/watchdog/stm32_iwdg.c | 4 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 4 +- + drivers/watchdog/tegra_wdt.c | 4 +- + drivers/watchdog/ts4800_wdt.c | 4 +- + drivers/watchdog/w83627hf_wdt.c | 6 +- + drivers/watchdog/wafer5823wdt.c | 6 +- + drivers/watchdog/watchdog_core.c | 22 ++-- + drivers/watchdog/watchdog_core.h | 6 +- + drivers/watchdog/watchdog_dev.c | 54 +++++++-- + drivers/watchdog/wd501p.h | 6 +- + drivers/watchdog/wdt.c | 6 +- + drivers/watchdog/wdt_pci.c | 6 +- + drivers/watchdog/wm831x_wdt.c | 9 +- + drivers/watchdog/xen_wdt.c | 4 +- + 81 files changed, 391 insertions(+), 454 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt + rename Documentation/devicetree/bindings/watchdog/{renesas-wdt.txt => renesas,wdt.txt} (100%) +Merging iommu/next (d95c3885865b Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) +$ git merge vfio/next +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 (67e50426ffcb Merge branch 'spi-5.3' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-controller.yaml | 1 - + drivers/spi/spi-fsl-qspi.c | 2 +- + drivers/spi/spi-gpio.c | 6 ++++++ + 3 files changed, 7 insertions(+), 2 deletions(-) +Merging tip/auto-latest (162b65ddbf2f Merge branch 'x86/debug') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + include/linux/compiler.h | 5 +++++ + kernel/bpf/core.c | 3 +-- + tools/objtool/check.c | 27 ++++++++++++++++++++------- + 3 files changed, 26 insertions(+), 9 deletions(-) +Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac-amd/for-next (b2572772d13e EDAC: Make edac_debugfs_create_x*() return void) +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_module.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 88a56365b447] 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 (0aeb1def4416 tracing: Make trace_get_fields() global) +$ git merge ftrace/for-next +Auto-merging tools/testing/selftests/ftrace/ftracetest +Auto-merging tools/perf/util/probe-finder.c +Auto-merging tools/perf/util/probe-file.c +Auto-merging tools/perf/util/probe-event.c +Auto-merging mm/maccess.c +Auto-merging kernel/tracepoint.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_events_filter.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/kprobes.c +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging arch/Kconfig +Auto-merging Documentation/trace/uprobetracer.rst +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 + + Documentation/trace/kprobetrace.rst | 42 ++- + Documentation/trace/uprobetracer.rst | 10 +- + arch/Kconfig | 16 - + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/ftrace.c | 6 +- + include/linux/ftrace.h | 4 +- + include/linux/trace_events.h | 9 + + include/linux/uaccess.h | 20 +- + kernel/kprobes.c | 3 +- + kernel/trace/Kconfig | 12 +- + kernel/trace/ftrace.c | 48 +-- + kernel/trace/ring_buffer.c | 17 +- + kernel/trace/trace.c | 17 +- + kernel/trace/trace_event_perf.c | 3 +- + kernel/trace/trace_events.c | 10 +- + kernel/trace/trace_events_filter.c | 3 + + kernel/trace/trace_kprobe.c | 357 ++++++++++++--------- + kernel/trace/trace_probe.c | 142 +++++++- + kernel/trace/trace_probe.h | 77 ++++- + kernel/trace/trace_probe_tmpl.h | 36 ++- + kernel/trace/trace_uprobe.c | 180 ++++------- + kernel/tracepoint.c | 4 +- + mm/maccess.c | 122 ++++++- + tools/perf/Documentation/perf-probe.txt | 3 +- + tools/perf/util/probe-event.c | 11 + + tools/perf/util/probe-event.h | 2 + + tools/perf/util/probe-file.c | 7 + + tools/perf/util/probe-file.h | 1 + + tools/perf/util/probe-finder.c | 19 +- + tools/testing/selftests/ftrace/ftracetest | 38 ++- + tools/testing/selftests/ftrace/test.d/functions | 4 +- + .../ftrace/test.d/kprobe/kprobe_args_user.tc | 32 ++ + 33 files changed, 861 insertions(+), 411 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (6694e4801282 KVM: nVMX: Ignore segment base for VMX memory operand when segment not FS or GS) +$ git merge kvm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/x86/kvm/cpuid.c | 12 +- + arch/x86/kvm/hyperv.c | 20 +- + arch/x86/kvm/ioapic.c | 15 -- + arch/x86/kvm/lapic.c | 95 +------ + arch/x86/kvm/mmu.c | 6 +- + arch/x86/kvm/vmx/nested.c | 5 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/kvm/x86.c | 8 - + tools/testing/selftests/kvm/Makefile | 14 +- + tools/testing/selftests/kvm/include/kvm_util.h | 8 + + .../selftests/kvm/include/s390x/processor.h | 22 ++ + .../kvm/{x86_64 => }/kvm_create_max_vcpus.c | 2 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 23 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 278 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 151 +++++++++++ + 18 files changed, 531 insertions(+), 136 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/s390x/processor.h + rename tools/testing/selftests/kvm/{x86_64 => }/kvm_create_max_vcpus.c (95%) + create mode 100644 tools/testing/selftests/kvm/lib/s390x/processor.c + create mode 100644 tools/testing/selftests/kvm/s390x/sync_regs_test.c +Merging 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 (b23e5844dfe7 xen/pv: Fix a boot up hang revealed by int3 self test) +$ git merge xen-tip/linux-next +Removing include/xen/tmem.h +Removing drivers/xen/xen-selfballoon.c +Removing drivers/xen/tmem.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 28 +- + arch/x86/entry/entry_64.S | 1 - + arch/x86/include/asm/hypervisor.h | 12 + + arch/x86/include/asm/traps.h | 2 +- + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/include/asm/xen/hypervisor.h | 6 +- + arch/x86/kernel/cpu/hypervisor.c | 19 +- + arch/x86/kernel/jailhouse.c | 1 + + arch/x86/kernel/smpboot.c | 3 +- + arch/x86/kernel/x86_init.c | 4 +- + arch/x86/xen/enlighten_hvm.c | 58 ++- + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/spinlock.c | 6 +- + arch/x86/xen/xen-asm_64.S | 1 - + drivers/xen/Kconfig | 23 - + drivers/xen/Makefile | 2 - + drivers/xen/events/events_base.c | 12 +- + drivers/xen/evtchn.c | 2 +- + drivers/xen/tmem.c | 419 ----------------- + drivers/xen/xen-balloon.c | 2 - + drivers/xen/xen-selfballoon.c | 579 ------------------------ + include/xen/balloon.h | 10 - + include/xen/events.h | 3 +- + include/xen/tmem.h | 18 - + 24 files changed, 99 insertions(+), 1117 deletions(-) + delete mode 100644 drivers/xen/tmem.c + delete mode 100644 drivers/xen/xen-selfballoon.c + delete mode 100644 include/xen/tmem.h +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 (7d67c8ac25fb platform/x86: Fix PCENGINES_APU2 Kconfig warning) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (8c3166e17cf1 mfd / platform: cros_ec_debugfs: Expose resume result via debugfs) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (2605085fba22 dt: leds-lm36274.txt: fix a broken reference to ti-lmu.txt) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (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 (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ 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 (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (0937fbb7abeb extcon: fsa9480: Fix Kconfig warning and build errors) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (2aeac95d1a4c soundwire: add module_sdw_driver helper macro) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (50950626414a Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (5c274ca4cfb2 dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support") +$ git merge slave-dma/next +Already up to date. +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 (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) +$ git merge scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (07d9aa143464 scsi: megaraid_sas: set an unlimited max_segment_size) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (5e663f0410fa virtio-mmio: add error check for platform_get_irq) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ab1291acd4ab Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (f360dcd4ef7f gpio: mockup: no need to check return value of debugfs_create functions) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging pinctrl/for-next (4c105769bf6d pinctrl: aspeed: Strip moved macros and structs from private header) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3d25025ce9c2 pwm: fsl-ftm: Make sure to unlock mutex on failure) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (ee8a84c60bcc rseq/selftests: Fix Thumb mode build failure on arm32) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) +$ git merge y2038/y2038 +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (fec88ab0af97 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (f0162d21cc80 rtc: wm831x: Add IRQF_ONESHOT flag) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/uapi/linux/virtio_ids.h +CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/ext4/file.c +Auto-merging fs/dax.c +Auto-merging drivers/nvdimm/region_devs.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/dax/super.c +Resolved 'include/uapi/linux/virtio_ids.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3179830e3da3] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/nfit/core.c | 4 +- + drivers/dax/bus.c | 21 ++++++- + drivers/dax/super.c | 19 +++++- + drivers/md/dm-table.c | 24 ++++++-- + drivers/md/dm.c | 5 +- + drivers/md/dm.h | 5 +- + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/claim.c | 6 +- + drivers/nvdimm/namespace_devs.c | 8 +-- + drivers/nvdimm/nd.h | 1 + + drivers/nvdimm/nd_virtio.c | 125 +++++++++++++++++++++++++++++++++++++++ + drivers/nvdimm/pmem.c | 18 ++++-- + drivers/nvdimm/region_devs.c | 33 ++++++++++- + drivers/nvdimm/virtio_pmem.c | 122 ++++++++++++++++++++++++++++++++++++++ + drivers/nvdimm/virtio_pmem.h | 55 +++++++++++++++++ + drivers/s390/block/dcssblk.c | 2 +- + drivers/virtio/Kconfig | 11 ++++ + fs/dax.c | 53 ++++++++++------- + fs/ext4/file.c | 10 ++-- + fs/xfs/xfs_file.c | 9 ++- + include/linux/dax.h | 41 ++++++++++++- + include/linux/libnvdimm.h | 10 +++- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_pmem.h | 34 +++++++++++ + 24 files changed, 560 insertions(+), 58 deletions(-) + create mode 100644 drivers/nvdimm/nd_virtio.c + create mode 100644 drivers/nvdimm/virtio_pmem.c + create mode 100644 drivers/nvdimm/virtio_pmem.h + create mode 100644 include/uapi/linux/virtio_pmem.h +Merging at24/at24/for-next (dce91ba39c76 eeprom: at24: modify a comment referring to platform data) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (d9c53aa440b3 NTB: Describe the ntb_msi_test client in the documentation.) +$ git merge ntb/ntb-next +Auto-merging tools/testing/selftests/ntb/ntb_test.sh +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/msi.c +Auto-merging drivers/ntb/test/Makefile +Auto-merging drivers/ntb/test/Kconfig +Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c +Auto-merging drivers/ntb/Makefile +Auto-merging drivers/ntb/Kconfig +Merge made by the 'recursive' strategy. + Documentation/driver-api/ntb.rst | 27 ++ + drivers/ntb/Kconfig | 11 + + drivers/ntb/Makefile | 3 + + drivers/ntb/{ntb.c => core.c} | 0 + drivers/ntb/hw/amd/ntb_hw_amd.c | 10 +- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 82 +++--- + drivers/ntb/msi.c | 415 ++++++++++++++++++++++++++++++ + drivers/ntb/ntb_transport.c | 170 ++++++++++++- + drivers/ntb/test/Kconfig | 9 + + drivers/ntb/test/Makefile | 1 + + drivers/ntb/test/ntb_msi_test.c | 433 ++++++++++++++++++++++++++++++++ + drivers/ntb/test/ntb_perf.c | 14 +- + drivers/pci/msi.c | 54 +++- + drivers/pci/switch/switchtec.c | 12 +- + include/linux/msi.h | 8 + + include/linux/ntb.h | 200 ++++++++++++++- + include/linux/pci.h | 9 + + tools/testing/selftests/ntb/ntb_test.sh | 54 +++- + 19 files changed, 1458 insertions(+), 60 deletions(-) + rename drivers/ntb/{ntb.c => core.c} (100%) + create mode 100644 drivers/ntb/msi.c + create mode 100644 drivers/ntb/test/ntb_msi_test.c +Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) +$ git merge kspp/for-next/kspp +Auto-merging lib/test_stackinit.c +Merge made by the 'recursive' strategy. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init) +$ git merge fsi/next +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (341f8ae0f820 dt-bindings: nvmem: SID: Fix the examples node names) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/meson-mx-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c +Auto-merging drivers/nvmem/meson-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c +Auto-merging drivers/nvmem/Kconfig +Auto-merging Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Resolved 'Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt' using previous resolution. +Resolved 'Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml' using previous resolution. +Resolved 'drivers/nvmem/meson-efuse.c' using previous resolution. +Resolved 'drivers/nvmem/meson-mx-efuse.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e72cf0050f9a] 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 aa20204a570a] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging devfreq/for-next (27c17be8e488 PM / devfreq: tegra20: add COMMON_CLK dependency) +$ git merge devfreq/for-next +Merge made by the 'recursive' strategy. + drivers/devfreq/Kconfig | 19 +- + drivers/devfreq/Makefile | 3 +- + drivers/devfreq/devfreq.c | 10 +- + drivers/devfreq/event/exynos-ppmu.c | 6 + + drivers/devfreq/rk3399_dmc.c | 2 +- + drivers/devfreq/tegra20-devfreq.c | 212 ++++++++++++++ + .../devfreq/{tegra-devfreq.c => tegra30-devfreq.c} | 315 ++++++++++----------- + 7 files changed, 387 insertions(+), 180 deletions(-) + create mode 100644 drivers/devfreq/tegra20-devfreq.c + rename drivers/devfreq/{tegra-devfreq.c => tegra30-devfreq.c} (80%) +Merging hmm/hmm (cc5dfd59e375 Merge branch 'hmm-devmem-cleanup.4' into rdma.git hmm) +$ git merge hmm/hmm +Already up to date. +Merging akpm-current/current (ea4ab8723cf9 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging mm/shmem.c +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 arch/s390/mm/init.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/filesystems/proc.txt | 4 +- + Documentation/process/deprecated.rst | 6 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/mm/mmu.c | 17 ++++ + arch/ia64/mm/init.c | 2 - + arch/powerpc/mm/mem.c | 2 - + arch/s390/mm/init.c | 18 ++-- + arch/sh/mm/init.c | 2 - + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 2 - + drivers/base/memory.c | 146 ++++++++++++++++++-------------- + drivers/base/node.c | 27 +++--- + 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/proc/task_mmu.c | 3 +- + fs/ramfs/inode.c | 12 +++ + include/linux/genalloc.h | 2 +- + include/linux/huge_mm.h | 23 +++++ + include/linux/memcontrol.h | 26 ++++++ + include/linux/memory.h | 6 +- + include/linux/memory_hotplug.h | 12 +-- + include/linux/mm.h | 34 ++++---- + include/linux/node.h | 7 +- + 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/resource.c | 49 +++++++---- + kernel/signal.c | 2 +- + lib/Kconfig.debug | 6 ++ + lib/genalloc.c | 5 +- + lib/math/rational.c | 63 +++++++++++--- + mm/huge_memory.c | 11 ++- + mm/kmemleak.c | 2 +- + mm/memcontrol.c | 5 ++ + mm/memory.c | 15 +--- + mm/memory_hotplug.c | 44 ++++------ + mm/mempolicy.c | 120 +++++++++++++++++++------- + mm/mmap.c | 43 +++++++--- + mm/oom_kill.c | 5 +- + mm/rmap.c | 1 + + mm/shmem.c | 3 + + mm/sparse.c | 27 +++--- + mm/swapfile.c | 4 +- + mm/vmscan.c | 105 ++++++++++++++++++----- + scripts/checkpatch.pl | 29 ++++--- + 59 files changed, 893 insertions(+), 375 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: mm: section numbers use the type "unsigned long" +Applying: mm-section-numbers-use-the-type-unsigned-long-fix +Applying: mm-section-numbers-use-the-type-unsigned-long-v3 +Applying: drivers/base/memory: Use "unsigned long" for block ids +Applying: mm: make register_mem_sect_under_node() static +Applying: mm/memory_hotplug: rename walk_memory_range() and pass start+size instead of pfns +Applying: mm/memory_hotplug: move and simplify walk_memory_blocks() +Applying: drivers/base/memory.c: Get rid of find_memory_block_hinted() +Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3 +Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3-fix +Applying: mm/sparsemem: introduce struct mem_section_usage +Applying: mm/sparsemem: introduce a SECTION_IS_EARLY flag +Applying: mm/sparsemem: add helpers track active portions of a section at boot +Applying: mm/hotplug: prepare shrink_{zone, pgdat}_span for sub-section removal +Applying: mm,memory_hotplug: fix shrink_{zone,node}_span +Applying: mm/sparsemem: convert kmalloc_section_memmap() to populate_section_memmap() +Applying: mm/hotplug: kill is_dev_zone() usage in __remove_pages() +Applying: mm: kill is_dev_zone() helper +Applying: mm/sparsemem: prepare for sub-section ranges +Applying: mm/sparsemem: support sub-section hotplug +Applying: mm,sparse: fix deactivate_section for early sections +Applying: mm,memory_hotplug: Fix shrink_{zone,node}_span +Applying: mm: document ZONE_DEVICE memory-model implications +Applying: docs/vm: update ZONE_DEVICE memory model documentation +Applying: mm/devm_memremap_pages: enable sub-section remap +Applying: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields +Applying: libnvdimm/pfn: stop padding pmem namespaces to section alignment +Applying: mm/sparsemem: cleanup 'section number' data types +Applying: mm-sparsemem-cleanup-section-number-data-types-fix +Applying: mm: migrate: remove unused mode argument +Using index info to reconstruct a base tree... +A fs/iomap/migrate.c +Falling back to patching base and 3-way merge... +CONFLICT (modify/delete): fs/iomap/migrate.c deleted in HEAD and modified in mm: migrate: remove unused mode argument. Version mm: migrate: remove unused mode argument of fs/iomap/migrate.c left in tree. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0031 mm: migrate: remove unused mode argument + +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". + +Applying: proc/sysctl: add shared variables for range check +Applying: tipc: remove two unused variables +Applying: proc-sysctl-add-shared-variables-for-range-check-fix-2-fix +Applying: proc/sysctl: make firmware loader table conditional +Applying: proc-sysctl-add-shared-variables-for-range-check-fix-4 +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: 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 + + 1dd5f443ae7b...948c51a0b487 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (948c51a0b487 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/vm/memory-model.rst | 40 +++ + arch/powerpc/platforms/powernv/memtrace.c | 23 +- + arch/s390/appldata/appldata_base.c | 15 +- + arch/s390/kernel/topology.c | 6 +- + arch/x86/entry/vdso/vdso32-setup.c | 7 +- + arch/x86/kernel/itmt.c | 6 +- + arch/x86/mm/init_64.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 19 +- + drivers/base/firmware_loader/fallback_table.c | 13 +- + drivers/base/memory.c | 123 +++++---- + drivers/base/node.c | 8 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/hv/vmbus_drv.c | 6 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/nvdimm/dax_devs.c | 2 +- + drivers/nvdimm/pfn.h | 15 +- + drivers/nvdimm/pfn_devs.c | 95 ++----- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/tty_ldisc.c | 6 +- + drivers/xen/balloon.c | 7 +- + fs/aio.c | 2 +- + fs/eventpoll.c | 4 +- + fs/f2fs/data.c | 2 +- + fs/iomap/buffered-io.c | 2 +- + fs/notify/inotify/inotify_user.c | 8 +- + fs/proc/proc_sysctl.c | 4 + + fs/ubifs/file.c | 2 +- + include/linux/memory.h | 5 +- + include/linux/memory_hotplug.h | 12 +- + include/linux/migrate.h | 3 +- + include/linux/mm.h | 4 +- + include/linux/mmzone.h | 88 ++++-- + include/linux/node.h | 7 - + include/linux/sysctl.h | 7 + + ipc/ipc_sysctl.c | 35 ++- + kernel/memremap.c | 57 ++-- + kernel/pid_namespace.c | 3 +- + kernel/sysctl.c | 197 +++++++------- + kernel/ucount.c | 6 +- + mm/memory_hotplug.c | 243 +++++++---------- + mm/migrate.c | 7 +- + mm/page_alloc.c | 16 +- + mm/sparse-vmemmap.c | 21 +- + mm/sparse.c | 373 +++++++++++++++++--------- + net/core/neighbour.c | 20 +- + net/core/sysctl_net_core.c | 34 ++- + net/dccp/sysctl.c | 16 +- + net/ipv4/sysctl_net_ipv4.c | 60 ++--- + net/ipv6/addrconf.c | 6 +- + net/ipv6/route.c | 7 +- + net/ipv6/sysctl_net_ipv6.c | 10 +- + net/mpls/af_mpls.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 +- + net/rxrpc/sysctl.c | 9 +- + net/sctp/sysctl.c | 35 ++- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/tipc/sysctl.c | 6 +- + security/keys/sysctl.c | 26 +- + security/loadpin/loadpin.c | 6 +- + security/yama/yama_lsm.c | 3 +- + 61 files changed, 924 insertions(+), 848 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3d3461d9fe2a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190718 |