diff options
| -rw-r--r-- | Next/SHA1s | 302 | ||||
| -rw-r--r-- | Next/Trees | 304 | ||||
| -rw-r--r-- | Next/merge.log | 5156 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5765 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8ce9810a7a16 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,302 @@ +Name SHA1 +---- ---- +origin 2a11c76e5301dddefcb618dac04f74e6314df6bc +fixes c309b6f24222246c18a8b65d3950e6e755440865 +kbuild-current 609488bc979f99f805f34e9a32c1e3b71179d10b +arc-current 24a20b0a443fd485852d51d08e98bbd9d212e0ec +arm-current c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d +arm-soc-fixes 7bd9d465140a93c0a21ba2d2f426451c78bfcc7d +arm64-fixes eca92a53a6ab9f27f1b61dcb3e16ebef75f0d5bb +m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +powerpc-fixes 609488bc979f99f805f34e9a32c1e3b71179d10b +s390-fixes 8480657280ee769ad23101297e1e6be0f8d205ec +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 7bd6ba4ef4b29db7464da496963081f5fdc88300 +bpf 5d01ab7bac467edfc530e6ccf953921def935c62 +ipsec 22d6552f827ef76ade3edf6bbb3f05048a0a7d8b +netfilter 91826ba13855f73e252fef68369b3b0e1ed25253 +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 5f9e832c137075045d15cd6899ab0505cfb2ca4b +mac80211 b55f3b841099e641bdb2701d361a4c304e2dbd6f +rdma-fixes b7165bd0d6cbb93732559be6ea8774653b204480 +sound-current 37151a41df800493cfcbbef4f7208ffe04feb959 +sound-asoc-fixes 3a03327120de8024e3f1e9fded7f46137080e2a4 +regmap-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +regulator-fixes a853c0a0b013af3fee0f028cff3c44e275ce9abd +spi-fixes d24f33303ad12b356752ffcafb55fcceade89b2c +pci-current 5f9e832c137075045d15cd6899ab0505cfb2ca4b +driver-core.current 5f9e832c137075045d15cd6899ab0505cfb2ca4b +tty.current 61d51456f35760a09e8aa1e6ddd247f1547015d3 +usb.current 609488bc979f99f805f34e9a32c1e3b71179d10b +usb-gadget-fixes 42de8afc40c97002fceb500e2331f6a722be3c14 +usb-serial-fixes f8377eff548170e8ea8022c067a1fbdf9e1c46a8 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy ada28f7b3a97fa720864c86504a7c426ee6f91c1 +staging.current 09f6109ff4f8003af3370dfee0f73fcf6d20087a +char-misc.current 609488bc979f99f805f34e9a32c1e3b71179d10b +soundwire-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +thunderbolt-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +input-current 25f8c834e2a6871920cc1ca113f02fb301d007c3 +crypto-current cf144f81a99d1a3928f90b0936accfd3f45c9a0a +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes 527d37e9e575bc0e9024de9b499385e7bb31f1ad +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes d105ef8120dd522c3233a1395ee0b318ed0929e8 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +mfd-fixes 63b2de12b7eeacfb2edbe005f5c3cff17a2a02e2 +v4l-dvb-fixes 22be8233b34f4f468934c5fefcbe6151766fb8f2 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 2a15d6481741a418837a22df3a440d5bd8b9c412 +at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +omap-fixes fb59ee37cfe20d10d19568899d1458a58361246c +kvm-fixes 30cd8604323dbaf20a80e797fe7057f5b02e394d +kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 +hwmon-fixes 4c3c79f79e5ccaa8641bab2da995f0fb43c4f4d3 +nvdimm-fixes 61c30c98ef17e5a330d7bb8494b78b3d6dffe9b8 +btrfs-fixes af5a46b43a56fd23c31fc487da7f5cf952dc38c0 +vfs-fixes a53abf2c5bd0d3612a575e2b7a8f545ed829a614 +dma-mapping-fixes f46cc0152501e46d1b3aa5e7eade61145070eab0 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes f14312a93b34b9350dc33ff0b4215c24f4c82617 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes e1ff7390f58e609aa113a2452a953f669abce6cc +scsi-fixes 20122994e38aef0ae50555884d287adde6641c94 +drm-fixes 4d5308e7852741318e4d40fb8d43d9311b3984ae +amdgpu-fixes 92e6475ae0a0383b012eb21c1aaf0e5456b1a3d9 +drm-intel-fixes 89f5752307cf53010d97503ac501b2ca1b089922 +mmc-fixes 3a6ffb3c8c3274a39dc8f2514526e645c5d21753 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes 9be11356057af5baba25eb25061313f7476a6dcd +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 2f0f80fd9227c1c90abf92925f9c5b5d8e8e2c32 +drm-misc-fixes bbb6fc43f131f77fcb7ae8081f6d7c51396a2120 +kspp-gustavo 89fdcc431074c1987dc1f572a7b077de7fc6b055 +kbuild 1a288d0d920dfb9747bbefc8d601a971885f470f +compiler-attributes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping ad3c7b18c5b362be5dbd0f2c0bcf1fd5fd659315 +asm-generic 7f3a8dff1219fba3076fe207972d1d7893c099bb +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm b7a735f3a606ab25f055ed456559eb0d49062c92 +arm64 0c61efd322b75ed3143e3d130ebecbebf561adf5 +arm-perf ca786b8db751c0dd980fccf2d65acb77a296f629 +arm-soc 1439dbf17e9e486cfe760f52ad9238748a661258 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 7671b33bcaa8c29633b86c6e0a4c24ea69c4f025 +aspeed caec3f63d83fd723460c96237101337da4f366cb +at91 90fbe456b5f0fa72706a8a4b5bf6c26ba1d2b84a +bcm2835 f83e5000db15ac13952171d576e1d39d3465fa9e +imx-mxs 1596861583cbaa0bd3161f829b84edea4cfc4510 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu e1b0b32a5ad6646b9c946398a534f3dd9df59ec2 +omap 7376d6a65730827e34695ebb8584af7d27201113 +qcom 9f407b8ad1812cead352b0608c263ecec51420a6 +renesas a16ecb14d0b0f69f97763cfa271e90ab97e88a19 +reset 6b251ea99242a701b6f8738f20991f3fe90f68ad +rockchip 55d674eec75be6526f4f1e46aa9982374a89fa4f +samsung-krzk 5f9e832c137075045d15cd6899ab0505cfb2ca4b +scmi 609488bc979f99f805f34e9a32c1e3b71179d10b +sunxi b184e1e79e6dba19a87ee7984de32c787e1ba6ac +tegra 033de83170dd0cefa3a5db3a90f3bbba92412877 +clk 03d7036efa4aa4a2ffbfd196fe716d8e1c532646 +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 9f98b3142d22e0fdb253617373931d364c59a797 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +m68knommu 609488bc979f99f805f34e9a32c1e3b71179d10b +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips cdab7e2c73d5b499f2e33e87423707dc28929850 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 989c786e3f186ab5dd23810011ddfaec8080b7d4 +powerpc 5f9e832c137075045d15cd6899ab0505cfb2ca4b +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019 +risc-v f51edcec5288556069d27ab7040a4ce8ca55b74e +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 019a09a26310b2cb2b81aa89d6d944daf125429c +sh cd10afbc932dd0dc556378f892479647b131e2c9 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml b482e48d29f1461fd0d059a17f32bcfa274127b3 +xtensa 1386dcaa92268b19e0a370c3a83bfea632a46260 +fscrypt 0564336329f0b03a78221ddf51e52af3665e5720 +afs 579cb95f6d3a8f7db0ee361d6e8ed0c448c7a244 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 80dfdbfd37d279beae211ba49dd2db84c853777a +ceph d31d07b97a5e76f41e00eb81dcca740e84aa7782 +cifs ee7340d63f98f53698b3f46b658667bc5de2e567 +configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 +ecryptfs 7451c54abc9139585492605d9e91dec2d26c6457 +ext3 5450e8a316a64cddcbc15f90733ebc78aa736545 +ext4 96fcaf86c3cb9340015fb475d79ef0a6fcf858ed +f2fs 38fb6d0ea34299d97b031ed64fe994158b6f8eb3 +fsverity 60d7bf0f790f97715d76cce711b5c251fc1d3386 +fuse 766741fcaa1fe5da2cb1e33ae458a5630ff7f667 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs d5b9216fd5114be4ed98ca9c1ecc5f164cd8cf5e +nfs-anna 68f461593f76bd5f17e87cdd0bea28f4278c7268 +nfsd b78fa45d4edb92fd7b882b2ec25b936cad412670 +orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15 +overlayfs 0be0bfd2de9dfdd2098a9c5b14bdd8f739c9165d +ubifs 8009ce956c3d28022af6b122e50213ad830fc902 +v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98 +xfs 89b408a68b9dd163b2705b6f73d8e3cc3579b457 +iomap 5d907307adc14cd5148b07629c2b4535acd06062 +djw-vfs 7e328e5930ad85c4669ca12bd20e1828a62a391a +file-locks 43e4cb942e88e756b41ea4d30249a47973880508 +vfs dad5ea4bac6216809d4697b73adbb4e95edfbdc3 +printk ba174ef6d2241d6718b1df235932f44b675359ca +pci 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pstore 4c6d80e1144bdf48cae6b602ae30d41f3e5c76a9 +hid bf4945efabdf7c797d0a96f254083ae2eac5beb2 +i2c 9a74c745c68904c3a7ff2d3a7f385593090780a1 +i3c 934d24a5e1508e73c0001afb54a3916e4270428f +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 64fa93a74102c97b022ce14458482d91260c8863 +jc_docs 32630d526b9faaec02fa1d26582d91c01f6d476c +v4l-dvb a8f910ec66583bfb61558c3f333195b3960d832d +v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 9fc1a62f0a74c6066bc1666151e8ce1e3d2c2aa3 +cpufreq-arm fc7d8233c794e7fb3a9eb417173405df895eddc7 +cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042 +opp 0203c0343a1f3fc35e40616ff47da9e532695bdf +thermal d093f91ff7d0363c53af2b2c8d0718e62cda2fb9 +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 5f9e832c137075045d15cd6899ab0505cfb2ca4b +net-next 85fd8011475e86265beff7b7617c493c247f5356 +bpf-next d3406913561c322323ec2898cc58f55e79786be7 +ipsec-next c7b37c769d2a5e711106a3c793140a4f46768e04 +mlx5-next 0470e5e38c9d97e7ce1e804cd54cf59accdf3ac2 +netfilter-next dda91bd7abb09771e872b7b117f6f8af594bbb3f +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next 15e830e90fde81b32c96490fb9ff1a26097609eb +bluetooth fa9ccaf84f5d166bf856b2c80e36d19a1de6e254 +mac80211-next 2ab45876756fb6c132ae801b0939e0474f84c426 +gfs2 5d69e57fa9cc039d0cbf13bbc32c897a68140cbe +mtd 5f9e832c137075045d15cd6899ab0505cfb2ca4b +nand 1670e678a8a72e8b09774e21986d1d77d4610f96 +spi-nor 5f9e832c137075045d15cd6899ab0505cfb2ca4b +crypto 8dfa20fcfbeb245642dfe3a43f8a3735d9aed42a +drm 5f9e832c137075045d15cd6899ab0505cfb2ca4b +amdgpu 0e738e03472a1def4503b011f9dd30a68edc5798 +drm-intel 301efe96f777c0197502b9399694ae83779579b3 +drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 +drm-misc 63b87c310a8326c2d0721ab6c981493d590aa542 +drm-msm 4cf643a39221af24a151ad2cff4e3f95f12f368e +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm fee77829083ad70845bd650f3c84c5900c5abae1 +etnaviv 57bdd4057516fb913d42a7d502b2580bbb9966ee +regmap 5f9e832c137075045d15cd6899ab0505cfb2ca4b +sound f474808acb3c4b30552d9c59b181244e0300d218 +sound-asoc 33854feb1faa5ee0160cb49d9c118fdb90d73a0a +modules 5f9e832c137075045d15cd6899ab0505cfb2ca4b +input c394159310d02defcfe63c617f13b0c2974725c5 +block 5b9ddbdf2f362009b6278db421a72f0f21108fb0 +device-mapper 733232f8c852bcc2ad6fc1db7f4c43eb01c7c217 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 979f97f2771b3470b658f9360c546a76dd44d4f3 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd b5e29aa880be84c271be8d0726cec4018bfbfd74 +backlight 73fbfc499448455f1e1c77717040e09e25f1d976 +battery caa2b557841c8cedc1d4862cd31cf76ee940d105 +regulator 43b84b2883b156fd668a6baafe3638d049dd58d5 +security 286e47a07799b95d541ef95c906a3f70958dea13 +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 650b29dbdf2caf7db27cdc8bfa8fc009b28a6ce3 +keys 8cf8684e0d249c507c258aa3992d984c713d690c +selinux 5f9e832c137075045d15cd6899ab0505cfb2ca4b +tpmdd 166a2809d65b282272c474835ec22c882a39ca1b +watchdog a18670f4617d41829ce88ab3e47bbc406e4dc5e8 +iommu 66929812955bbec808c94d7a3916f41638a98a0a +vfio 1e4d09d2212d9e230b967f57bc8df463527dbd75 +audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree 470062c40eaa110031a84a3e49c50cfbe9a94702 +mailbox 25777e5784a7b417967460d4fcf9660d05a0c320 +spi 1bda625684d2937b83104b446c6911e1dbe7c310 +tip 397d428ddd0fb3ef169b4b41615b3225dddeb090 +clockevents b0c74b96d177304b6d6f8981e90f37f1cd6afa58 +edac 3123c5c4ca157edc518102ee5385f60cb90f93f5 +irqchip 3dae67ce600caaa92c9af6e0cb6cad2db2632a0a +ftrace 6d54ceb539aacc3df65c89500e8b045924f3ef81 +rcu b989ff070574ad8b8621d866de0a8e9a65d42c80 +kvm 30cd8604323dbaf20a80e797fe7057f5b02e394d +kvm-arm 1e0cf16cdad1ba53e9eeee8746fe57de42f20c97 +kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30 +kvms390 8343ba2d4820b1738bbb7cb40ec18ea0a3b0b331 +xen-tip a1078e821b605813b63bf6bca414a85f804d5c66 +percpu 03ed70fb0e5e94a645c3872f9a73662c789bf7d7 +workqueues be69d00d9769575e35d83367f465a58dbf82748c +drivers-x86 f14312a93b34b9350dc33ff0b4215c24f4c82617 +chrome-platform 5f9e832c137075045d15cd6899ab0505cfb2ca4b +hsi a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leds af7b65054952a9898534d966f2e548d7692b7016 +ipmi fec88ab0af9706b2201e5daf377c5031c62d11f7 +driver-core bbe70e4e421116db0af3acf84cbce3c3f6cac53e +usb 2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7 +usb-gadget b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3 +usb-serial 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c +phy-next 609488bc979f99f805f34e9a32c1e3b71179d10b +tty 67de843e315845bb9f9bede75ca8cbb04a57c417 +char-misc 6de465a50a900b29793aaba67f41f98f0e5354a0 +extcon 21be848ebc5f3cb714b23c2528fbe73f69073c32 +soundwire 5f9e832c137075045d15cd6899ab0505cfb2ca4b +thunderbolt 6fbc7275c7a9ba97877050335f290341a1fd8dbf +staging e59fc52529118aaad9aa666f25530dde6e2180e9 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma f4c255f1a747497a21748619d909cadabcfa060e +cgroup a581563f1bef035e4c8d634a1df26dae9140b115 +scsi 20122994e38aef0ae50555884d287adde6641c94 +scsi-mkp 838c1efc6a0adbf44d16e4714f43443db598cdb5 +vhost 73f628ec9e6bcc45b77c53fe6d0c0ec55eaf82af +rpmsg 7f1345e9efcc601c041f4a82b7ce79ef6388a287 +gpio d2a561ae19613c14bfbc437bc9dbdb2c9d1d1b95 +gpio-brgl 66ad66293edeb2bcc27a329f35018b18601da452 +pinctrl 87cdf194fbfb42351ba7c06dfd7b20c31c3f94ea +pinctrl-samsung 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pwm 3d25025ce9c2f364ea4ee76f1461c8714b9c0b6d +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 5f9e832c137075045d15cd6899ab0505cfb2ca4b +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 28f28ea4343abe5d2b8f0ff0f49883ecad648cb6 +coresight 8f1f98572c69350eb0c0f517679fae440ea5dfb7 +rtc 06c8e550a84ec32a2eb3a6b1734585cd852851b0 +nvdimm cb3110f7452d96382153722ec788a4ade022eeb9 +at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd +ntb 5f9e832c137075045d15cd6899ab0505cfb2ca4b +kspp 2dcbe7fe226502c81d578d895b1d718ab70bb496 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 371975b0b07520c85098652d561639837a60a905 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus a188339ca5a396acc588e5851ed7e19f66b0ebd9 +nvmem 341f8ae0f8202b3f6bbaf93a579d179fc9e3ec7d +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 765e33f5211ab620c117ff1ee0c4f38c10f7a973 +auxdisplay f4bb1f895aa07dfcb96169192ff7c9154620df87 +kgdb-dt ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 +pidfd 2a9321337b74db3fb8f52bc85252663b235e093d +devfreq 27c17be8e4889a2a0ff151617ab4653149b41ba3 +hmm cc374377a19d2a49d693997b62dc3a6f5fac6d61 +fpga 7d62460b40608be1c17075db89d1798a64d4a93e +akpm-current 2d8c3d2fb959be3e865debb929df909a9c1d6339 +akpm 3d4291c43c1657cfcfbbb873659e72dff94421fb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..45c635459889 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,304 @@ +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 +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..9db42abae46e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5156 @@ +$ date -R +Tue, 30 Jul 2019 07:41:27 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 609488bc979f Linux 5.3-rc2 +Merging origin/master (2a11c76e5301 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge origin/master +Updating 609488bc979f..2a11c76e5301 +Fast-forward + drivers/iommu/virtio-iommu.c | 40 ++++++++++++++------ + drivers/platform/olpc/olpc-xo175-ec.c | 6 +++ + drivers/platform/x86/intel_pmc_core.c | 1 + + drivers/platform/x86/pcengines-apuv2.c | 6 +-- + drivers/vhost/vhost.h | 2 +- + include/linux/mod_devicetable.h | 1 + + include/uapi/linux/virtio_iommu.h | 32 +++++++++------- + mm/balloon_compaction.c | 69 ++++++++++++++++++++-------------- + 8 files changed, 99 insertions(+), 58 deletions(-) +Merging fixes/master (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (609488bc979f Linux 5.3-rc2) +$ 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 (7bd9d465140a Merge tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (eca92a53a6ab arm64: module: Mark expected switch fall-through) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kernel/hw_breakpoint.c | 11 ++++++++--- + arch/arm64/kernel/module.c | 4 ++++ + arch/arm64/kernel/smp.c | 2 +- + drivers/perf/arm_pmu.c | 2 +- + 4 files changed, 14 insertions(+), 5 deletions(-) +Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (609488bc979f Linux 5.3-rc2) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (8480657280ee vfio-ccw: make vfio_ccw_async_region_ops static) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/boot/boot.h | 1 + + arch/s390/boot/kaslr.c | 1 + + arch/s390/configs/debug_defconfig | 330 ++++++++++++++++++++------------- + arch/s390/configs/defconfig | 233 ++++++++++++++--------- + arch/s390/configs/zfcpdump_defconfig | 31 ++-- + arch/s390/include/asm/qdio.h | 10 +- + arch/s390/include/asm/setup.h | 1 + + arch/s390/kernel/machine_kexec_reloc.c | 1 + + arch/s390/kernel/perf_cpum_cf_diag.c | 2 +- + arch/s390/lib/xor.c | 1 + + arch/s390/mm/fault.c | 3 + + arch/s390/mm/gmap.c | 4 +- + drivers/s390/char/con3215.c | 1 + + drivers/s390/char/tape_core.c | 3 + + drivers/s390/cio/vfio_ccw_async.c | 2 +- + 15 files changed, 387 insertions(+), 237 deletions(-) +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (7bd6ba4ef4b2 net: hamradio: baycom_epp: Mark expected switch fall-through) +$ git merge net/master +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/tls-offload.rst | 29 ++- + MAINTAINERS | 9 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 1 + + drivers/net/arcnet/arc-rimi.c | 3 + + drivers/net/arcnet/com20020-isa.c | 6 + + drivers/net/arcnet/com90io.c | 2 + + drivers/net/arcnet/com90xx.c | 3 + + drivers/net/bonding/bond_main.c | 9 + + drivers/net/can/dev.c | 2 + + drivers/net/can/flexcan.c | 39 ++++- + drivers/net/can/rcar/rcar_canfd.c | 9 +- + drivers/net/can/spi/mcp251x.c | 49 +++--- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 8 +- + drivers/net/dsa/mv88e6xxx/chip.c | 1 + + drivers/net/dsa/sja1105/sja1105_main.c | 3 + + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 18 +- + drivers/net/ethernet/freescale/fman/fman.c | 3 - + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 82 ++++----- + drivers/net/ethernet/marvell/sky2.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 12 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 27 ++- + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 69 +++++--- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 36 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 5 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 7 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 1 + + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 76 ++++++-- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 17 ++ + drivers/net/ethernet/mscc/ocelot.c | 1 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 13 +- + drivers/net/ethernet/realtek/r8169_main.c | 14 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 32 ++-- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 + + drivers/net/ethernet/toshiba/spider_net.c | 1 + + drivers/net/hamradio/baycom_epp.c | 3 +- + drivers/net/phy/mscc.c | 16 +- + drivers/net/phy/phylink.c | 10 +- + drivers/net/tun.c | 9 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/wan/sdla.c | 1 + + drivers/nfc/st-nci/se.c | 2 + + drivers/nfc/st21nfca/se.c | 2 + + include/linux/dim.h | 56 ------ + include/linux/filter.h | 13 ++ + include/linux/if_rmnet.h | 4 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/skmsg.h | 8 +- + include/net/tcp.h | 3 + + include/net/tls.h | 15 +- + kernel/bpf/verifier.c | 4 +- + lib/dim/dim.c | 4 +- + lib/dim/net_dim.c | 56 ++++++ + net/bridge/br_vlan.c | 5 + + net/can/gw.c | 48 +++-- + net/core/dev.c | 2 + + net/core/filter.c | 6 +- + net/core/skmsg.c | 4 +- + net/core/sock_map.c | 19 +- + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ipip.c | 3 + + net/ipv4/tcp_ulp.c | 13 ++ + net/ipv6/ip6_gre.c | 3 +- + net/ipv6/ip6_tunnel.c | 6 +- + net/iucv/af_iucv.c | 14 +- + net/netrom/af_netrom.c | 1 + + net/openvswitch/datapath.c | 15 +- + net/rds/rdma_transport.c | 5 +- + net/sched/act_ife.c | 5 + + net/sched/sch_codel.c | 6 +- + net/sctp/socket.c | 4 +- + net/tls/tls_main.c | 142 +++++++++++---- + net/tls/tls_sw.c | 83 ++++++--- + tools/lib/bpf/btf.c | 5 +- + tools/lib/bpf/libbpf.c | 34 ++-- + tools/lib/bpf/xsk.c | 11 +- + tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +- + tools/testing/selftests/bpf/verifier/ctx_skb.c | 11 ++ + tools/testing/selftests/net/.gitignore | 4 +- + .../selftests/net/forwarding/gre_multipath.sh | 28 +-- + tools/testing/selftests/net/tls.c | 194 +++++++++++++++++++++ + 102 files changed, 1081 insertions(+), 476 deletions(-) +Merging bpf/master (5d01ab7bac46 libbpf: fix erroneous multi-closing of BTF FD) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/lib/bpf/libbpf.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) +Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 -- + net/xfrm/xfrm_interface.c | 56 +++++++++++++++++++++-------------------------- + 2 files changed, 25 insertions(+), 33 deletions(-) +Merging netfilter/master (91826ba13855 netfilter: add include guard to xt_connlabel.h) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/uapi/linux/netfilter/xt_connlabel.h | 6 ++++++ + net/bridge/netfilter/ebtables.c | 4 +++- + net/bridge/netfilter/nft_meta_bridge.c | 10 ++-------- + net/netfilter/nft_meta.c | 16 ++++------------ + 4 files changed, 15 insertions(+), 21 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 (5f9e832c1370 Linus 5.3-rc1) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (b55f3b841099 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl()) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 8 +++++--- + include/net/cfg80211.h | 15 +++++++++++++++ + net/mac80211/mlme.c | 10 ++++++++++ + net/mac80211/util.c | 7 +++---- + net/wireless/core.c | 6 ++---- + net/wireless/nl80211.c | 4 +--- + net/wireless/util.c | 27 +++++++++++++++++++++++++-- + 7 files changed, 61 insertions(+), 16 deletions(-) +Merging rdma-fixes/for-rc (b7165bd0d6cb IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/counters.c | 11 +++++--- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 7 +++-- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 13 +++++++--- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 14 ++++++---- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 7 ++++- + drivers/infiniband/hw/hfi1/chip.c | 11 ++++++-- + drivers/infiniband/hw/hfi1/rc.c | 2 -- + drivers/infiniband/hw/hfi1/tid_rdma.c | 43 ++----------------------------- + drivers/infiniband/hw/hns/hns_roce_db.c | 15 ++++++----- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + + drivers/infiniband/hw/mlx5/mr.c | 23 ++++++++++------- + drivers/infiniband/hw/mlx5/odp.c | 7 ++--- + drivers/infiniband/hw/mlx5/qp.c | 13 ++++++---- + drivers/infiniband/sw/siw/siw_cm.c | 3 +-- + drivers/infiniband/sw/siw/siw_main.c | 1 + + include/rdma/rdmavt_qp.h | 9 +++---- + 17 files changed, 89 insertions(+), 93 deletions(-) +Merging sound-current/for-linus (37151a41df80 ALSA: pcm: fix lost wakeup event scenarios in snd_pcm_drain) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_native.c | 3 ++- + sound/hda/hdac_i915.c | 10 ++++++---- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging sound-asoc-fixes/for-linus (3a03327120de Merge branch 'asoc-5.3' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/sound/simple_card_utils.h | 4 + + include/uapi/sound/sof/fw.h | 16 +-- + include/uapi/sound/sof/header.h | 14 +-- + sound/soc/codecs/cs42xx8.c | 116 +++++++++++++++++---- + sound/soc/codecs/max98357a.c | 25 +---- + sound/soc/codecs/pcm3060-i2c.c | 4 +- + sound/soc/codecs/pcm3060-spi.c | 4 +- + sound/soc/codecs/pcm3060.c | 4 +- + sound/soc/codecs/pcm3060.h | 2 +- + sound/soc/codecs/rt1011.c | 4 +- + sound/soc/codecs/rt1308.c | 0 + sound/soc/codecs/rt1308.h | 0 + sound/soc/generic/audio-graph-card.c | 30 +++--- + sound/soc/generic/simple-card-utils.c | 7 ++ + sound/soc/generic/simple-card.c | 26 ++--- + sound/soc/intel/boards/bytcht_es8316.c | 8 ++ + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +- + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 +- + sound/soc/qcom/apq8016_sbc.c | 16 +-- + sound/soc/rockchip/rockchip_i2s.c | 5 +- + sound/soc/rockchip/rockchip_max98090.c | 32 ++++++ + sound/soc/samsung/odroid.c | 8 +- + sound/soc/soc-core.c | 7 +- + sound/soc/soc-dapm.c | 10 +- + sound/soc/sof/intel/cnl.c | 4 +- + sound/soc/sof/intel/hda-ipc.c | 4 +- + sound/soc/ti/davinci-mcasp.c | 46 ++++++-- + 36 files changed, 284 insertions(+), 134 deletions(-) + mode change 100755 => 100644 sound/soc/codecs/rt1308.c + mode change 100755 => 100644 sound/soc/codecs/rt1308.h +Merging regmap-fixes/for-linus (5f9e832c1370 Linus 5.3-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (a853c0a0b013 regulator: lp87565: Fix probe failure for "ti,lp87565") +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 10 +++++----- + drivers/regulator/lp87565-regulator.c | 8 ++++---- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging spi-fixes/for-linus (d24f33303ad1 Merge branch 'spi-5.3' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-controller.yaml | 1 - + drivers/spi/spi-bcm2835.c | 3 ++- + drivers/spi/spi-fsl-qspi.c | 2 +- + drivers/spi/spi-gpio.c | 6 ++++++ + drivers/spi/spi-pxa2xx.c | 6 ++++-- + 5 files changed, 13 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (5f9e832c1370 Linus 5.3-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (61d51456f357 vt: Grab console_lock around con_is_bound in show_bind) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (609488bc979f Linux 5.3-rc2) +$ 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 (09f6109ff4f8 Merge tag 'iio-fixes-for-5.3a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/cros_ec_accel_legacy.c | 1 - + drivers/iio/adc/ingenic-adc.c | 54 +++++++++++++++++++++++ + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/adc/rcar-gyroadc.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++ + drivers/staging/android/ion/ion_page_pool.c | 3 ++ + drivers/staging/fbtft/fb_bd663474.c | 2 +- + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9325.c | 2 +- + drivers/staging/fbtft/fb_s6d1121.c | 2 +- + drivers/staging/fbtft/fb_ssd1289.c | 2 +- + drivers/staging/fbtft/fb_ssd1331.c | 4 +- + drivers/staging/fbtft/fb_upd161704.c | 2 +- + drivers/staging/fbtft/fbtft-bus.c | 2 +- + drivers/staging/fbtft/fbtft-core.c | 47 +++++++++----------- + drivers/staging/gasket/apex_driver.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 3 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1 + + 18 files changed, 138 insertions(+), 40 deletions(-) +Merging char-misc.current/char-misc-linus (609488bc979f Linux 5.3-rc2) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (25f8c834e2a6 Input: synaptics - enable RMI mode for HP Spectre X360) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 1 + + drivers/input/keyboard/applespi.c | 26 ++++++++++-------- + drivers/input/mouse/elantech.c | 55 ++++++++++++++++++--------------------- + drivers/input/mouse/synaptics.c | 1 + + 4 files changed, 43 insertions(+), 40 deletions(-) +Merging crypto-current/master (cf144f81a99d padata: use smp_mb in padata_reorder to avoid orphaned padata jobs) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (527d37e9e575 selftests/livepatch: add test skip handling) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 4 ++-- + tools/testing/selftests/kmod/kmod.sh | 6 +++--- + tools/testing/selftests/livepatch/functions.sh | 20 ++++++++++++++++++++ + tools/testing/selftests/x86/test_vsyscall.c | 2 +- + 4 files changed, 26 insertions(+), 6 deletions(-) +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 (d105ef8120dd dmaengine: tegra210-adma: Fix unused function warnings) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dw-edma/dw-edma-core.h | 2 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 18 ++++++++--------- + drivers/dma/dw-edma/dw-edma-v0-core.c | 34 ++++++++++++++------------------ + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 29 ++++++++++++++------------- + drivers/dma/ste_dma40.c | 4 ++-- + drivers/dma/tegra210-adma.c | 4 ++-- + 6 files changed, 44 insertions(+), 47 deletions(-) +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (2a15d6481741 MIPS: Annotate fall-through in Cavium Octeon code) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/kernel/cacheinfo.c +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/octeon-usb.c | 1 + + arch/mips/kernel/cacheinfo.c | 2 ++ + arch/mips/kernel/i8253.c | 3 ++- + arch/mips/kvm/emulate.c | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) +Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fb59ee37cfe2 ARM: dts: am57xx: Disable voltage switching for SD card) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revc.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +Auto-merging arch/arm/boot/dts/am572x-idk.dts +Auto-merging arch/arm/boot/dts/am571x-idk.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am571x-idk.dts | 7 +------ + arch/arm/boot/dts/am572x-idk.dts | 7 +------ + arch/arm/boot/dts/am574x-idk.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +------ + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +------ + 6 files changed, 6 insertions(+), 30 deletions(-) +Merging kvm-fixes/master (30cd8604323d KVM: x86: Add fixed counters to PMU filter) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (4c3c79f79e5c hwmon: (nct7802) Fix wrong detection of in4 presence) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct7802.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (61c30c98ef17 dax: Fix missed wakeup in put_unlocked_entry()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + fs/dax.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging btrfs-fixes/next-fixes (af5a46b43a56 Merge branch 'misc-5.3' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (a53abf2c5bd0 Unbreak mount_capable()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/super.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging dma-mapping-fixes/for-linus (f46cc0152501 dma-contiguous: page-align the size in dma_free_contiguous()) +$ git merge dma-mapping-fixes/for-linus +Merge made by the 'recursive' strategy. + kernel/dma/contiguous.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (f14312a93b34 platform/x86: pcengines-apuv2: use KEY_RESTART for front button) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (e1ff7390f58e dt-bindings: Fix more $id value mismatches filenames) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (20122994e38a scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (4d5308e78527 Merge tag 'drm-fixes-5.3-2019-07-24' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (92e6475ae0a0 drm/amd/display: Set enabled to false at start of audio disable) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (89f5752307cf drm/i915: Fix the TBT AUX power well enabling) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_bios.c | 2 +- + drivers/gpu/drm/i915/display/intel_bw.c | 15 +++-- + drivers/gpu/drm/i915/display/intel_cdclk.c | 11 ++++ + drivers/gpu/drm/i915/display/intel_display.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 11 +++- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 ++- + drivers/gpu/drm/i915/gt/intel_context.c | 27 +++++--- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 20 +++--- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 ++++ + drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +-- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 31 +++++---- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 38 ++++++++++- + drivers/gpu/drm/i915/gt/mock_engine.c | 1 + + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 5 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/i915_perf.c | 67 ++++++++++++------- + drivers/gpu/drm/i915/i915_trace.h | 76 ++++++++++------------ + drivers/gpu/drm/i915/intel_runtime_pm.c | 10 ++- + 21 files changed, 243 insertions(+), 134 deletions(-) +Merging mmc-fixes/fixes (3a6ffb3c8c32 mmc: mmc_spi: Enable stable writes) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/queue.c | 5 +++++ + drivers/mmc/host/dw_mmc.c | 3 +-- + drivers/mmc/host/meson-mx-sdio.c | 2 +- + drivers/mmc/host/sdhci-sprd.c | 1 + + 4 files changed, 8 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (9be11356057a PCI: pci-hyperv: fix build errors on non-SYSFS config) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (2f0f80fd9227 riscv: defconfig: align RV64 defconfig to the output of "make savedefconfig") +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 1 - + arch/riscv/configs/defconfig | 10 +++++----- + arch/riscv/kernel/vdso/Makefile | 2 +- + 3 files changed, 6 insertions(+), 7 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (bbb6fc43f131 drm: silence variable 'conn' set but not used) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp-gustavo/for-next/kspp (89fdcc431074 ataflop: Mark expected switch fall-through) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + arch/arm/kernel/hw_breakpoint.c | 5 +++++ + arch/arm/kernel/signal.c | 1 + + arch/arm/mach-tegra/reset.c | 2 +- + arch/arm/mm/alignment.c | 4 +++- + arch/arm/plat-omap/dma.c | 14 +++++--------- + drivers/block/ataflop.c | 1 + + drivers/i2c/busses/i2c-s3c2410.c | 1 + + drivers/mfd/db8500-prcmu.c | 2 ++ + drivers/mfd/omap-usb-host.c | 4 ++-- + drivers/mmc/host/atmel-mci.c | 4 ++++ + drivers/mmc/host/sdhci-s3c.c | 1 + + drivers/scsi/cxlflash/main.c | 12 ++++++++++-- + drivers/scsi/ibmvscsi/ibmvfc.c | 3 +++ + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++ + drivers/scsi/qlogicpti.c | 10 ++++++++++ + drivers/scsi/sun3_scsi.c | 2 ++ + drivers/scsi/wd33c93.c | 1 + + drivers/usb/phy/phy-ab8500-usb.c | 6 ++++++ + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/pcwd.c | 2 +- + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/wdt.c | 2 +- + sound/oss/dmasound/dmasound_atari.c | 16 ++++++++-------- + 24 files changed, 74 insertions(+), 25 deletions(-) +Merging kbuild/for-next (1a288d0d920d modpost: check for static EXPORT_SYMBOL* functions) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + include/linux/vermagic.h | 2 ++ + init/Makefile | 5 +++-- + scripts/Kconfig.include | 3 +++ + scripts/Makefile.build | 4 ++-- + scripts/Makefile.host | 17 +++++++++++++++++ + scripts/Makefile.lib | 39 +++++---------------------------------- + scripts/Makefile.modpost | 2 +- + scripts/genksyms/Makefile | 9 +-------- + scripts/headers_install.sh | 6 ++++++ + scripts/mkcompile_h | 4 +++- + scripts/mod/modpost.c | 32 ++++++++++++++++++++++++++++++++ + 11 files changed, 75 insertions(+), 48 deletions(-) +Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (ad3c7b18c5b3 arm: use swiotlb for bounce buffering on LPAE configs) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 4 ++- + arch/arm/mm/Kconfig | 5 ++++ + arch/arm/mm/dma-mapping.c | 61 ++++++++++++++++++++++++++++++++++++++ + arch/arm/mm/init.c | 5 ++++ + kernel/dma/mapping.c | 13 ++++++-- + 5 files changed, 85 insertions(+), 3 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (0c61efd322b7 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (ca786b8db751 arm64: perf: Remove unused macro) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm64/kernel/perf_event.c | 1 - + 1 file changed, 1 deletion(-) +Merging arm-soc/for-next (1439dbf17e9e Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging drivers/soc/fsl/qe/qe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + arch/arm/arm-soc-for-next-contents.txt | 16 ++ + drivers/soc/fsl/dpaa2-console.c | 2 +- + drivers/soc/fsl/qe/qe.c | 163 ++++++++------------- + 4 files changed, 94 insertions(+), 100 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (7671b33bcaa8 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-sei510.dts | 6 ++++++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 1 + + 3 files changed, 8 insertions(+) +Merging aspeed/for-next (caec3f63d83f Merge branches 'dt-for-v5.4' and 'defconfig-for-v5.4' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 429 +++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 36 ++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 663 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/configs/aspeed_g4_defconfig | 50 +- + arch/arm/configs/aspeed_g5_defconfig | 57 +- + 7 files changed, 1183 insertions(+), 59 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts +Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- + arch/arm/boot/dts/at91sam9rlek.dts | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging bcm2835/for-next (f83e5000db15 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm283x.dtsi | 6 +++--- + arch/arm/configs/bcm2835_defconfig | 9 +++++++++ + arch/arm/configs/multi_v7_defconfig | 2 ++ + arch/arm64/configs/defconfig | 2 ++ + 4 files changed, 16 insertions(+), 3 deletions(-) +Merging imx-mxs/for-next (1596861583cb Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 4 + + .../devicetree/bindings/clock/imx8mn-clock.yaml | 112 ++++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/imx6sl.dtsi | 18 +- + arch/arm/boot/dts/imx6sll.dtsi | 20 +- + arch/arm/boot/dts/imx6sx.dtsi | 18 +- + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 37 +- + ...-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} | 51 +- + ...ull.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} | 42 +- + ...1.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} | 16 +- + ...hyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} | 31 +- + arch/arm/boot/dts/imx6ul.dtsi | 32 +- + arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi | 24 + + .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 93 +++ + .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 93 +++ + .../boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts | 45 ++ + .../boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi | 19 + + arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 38 ++ + arch/arm/boot/dts/imx7-colibri.dtsi | 4 - + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 357 ++++++++++++ + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 4 - + arch/arm/boot/dts/imx7ulp.dtsi | 28 + + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 7 - + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 155 +++++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 5 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 68 ++- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 40 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 413 +++++++++++++ + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 46 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 39 +- + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 249 ++++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 23 +- + arch/arm64/configs/defconfig | 6 + + drivers/clk/imx/Kconfig | 6 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-imx8mm.c | 37 +- + drivers/clk/imx/clk-imx8mn.c | 636 +++++++++++++++++++++ + drivers/clk/imx/clk-imx8mq.c | 6 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 5 + + drivers/clk/imx/clk.c | 8 + + drivers/clk/imx/clk.h | 42 +- + drivers/firmware/imx/scu-pd.c | 4 +- + drivers/soc/imx/soc-imx8.c | 45 ++ + include/dt-bindings/clock/imx8-clock.h | 6 +- + include/dt-bindings/clock/imx8mn-clock.h | 215 +++++++ + 54 files changed, 2953 insertions(+), 237 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx8mn-clock.yaml + rename arch/arm/boot/dts/{imx6ul-phytec-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} (72%) + rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin-full.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} (51%) + rename arch/arm/boot/dts/{imx6ul-phytec-peb-eval-01.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} (84%) + rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} (91%) + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-zii-rmu2.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts + create mode 100644 drivers/clk/imx/clk-imx8mn.c + create mode 100644 include/dt-bindings/clock/imx8mn-clock.h +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 (9f407b8ad181 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/Makefile | 3 + + .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts | 47 ++++ + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 240 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts | 30 +++ + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 30 +++ + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 96 +++++---- + drivers/firmware/qcom_scm.c | 47 ++-- + include/linux/qcom_scm.h | 9 +- + 10 files changed, 445 insertions(+), 69 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts +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 --no-edit -v -a +[master 4734b7bd9029] 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 (55d674eec75b Merge branch 'v5.4-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 30 +++ + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 12 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 101 +------ + arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 173 ++++++++++++ + arch/arm/boot/dts/rk3288-veyron-fievel.dts | 298 +++++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 55 ---- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 ++++++++++---- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 66 +---- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 17 ++ + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 58 ---- + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 125 +++++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 11 + + drivers/clk/rockchip/clk-rv1108.c | 1 - + 17 files changed, 842 insertions(+), 332 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-edp.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-fievel.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-tiger.dts +Merging samsung-krzk/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge samsung-krzk/for-next +Already up to date. +Merging scmi/for-linux-next (609488bc979f Linux 5.3-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (b184e1e79e6d Merge branches 'sunxi/config64-for-5.4' and 'sunxi/dt-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 2 ++ + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 + + MAINTAINERS | 10 ++++---- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- + .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +- + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 8 +++---- + arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 8 +++---- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 11 ++++----- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 10 ++++---- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 12 +++++----- + arch/arm/boot/dts/sun8i-r40.dtsi | 10 ++++---- + arch/arm/boot/dts/sun8i-v3s.dtsi | 8 +++---- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 +++++----- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 ++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 28 ++++++++++++++++++---- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 ++++ + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 ++++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 23 ++++++++++++++++-- + arch/arm64/configs/defconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++---- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +++-- + 61 files changed, 168 insertions(+), 99 deletions(-) +Merging tegra/for-next (033de83170dd Merge branch for-5.3/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (03d7036efa4a Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/clk-generated.c | 2 ++ + drivers/clk/mediatek/clk-mt8183.c | 46 +++++++++++++++++++++++++--------- + drivers/clk/renesas/renesas-cpg-mssr.c | 16 ++---------- + drivers/clk/sprd/Kconfig | 1 + + include/linux/clk.h | 1 + + 5 files changed, 40 insertions(+), 26 deletions(-) +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (9f98b3142d22 csky: Improve string operations performance by glibc code) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/traps.c +Auto-merging arch/csky/abiv1/strksyms.c +CONFLICT (content): Merge conflict in arch/csky/abiv1/strksyms.c +CONFLICT (modify/delete): arch/csky/abiv1/memset.c deleted in HEAD and modified in csky/linux-next. Version csky/linux-next of arch/csky/abiv1/memset.c left in tree. +Auto-merging arch/csky/abiv1/inc/abi/string.h +CONFLICT (content): Merge conflict in arch/csky/abiv1/inc/abi/string.h +Auto-merging arch/csky/abiv1/Makefile +Resolved 'arch/csky/abiv1/inc/abi/string.h' using previous resolution. +Resolved 'arch/csky/abiv1/strksyms.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 97be517c379c] Merge remote-tracking branch 'csky/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/csky/abiv1/Makefile | 6 + + arch/csky/abiv1/inc/abi/string.h | 15 ++ + arch/csky/abiv1/memcmp.c | 310 ++++++++++++++++++++++++++++++ + arch/csky/abiv1/memcopy.h | 179 ++++++++++++++++++ + arch/csky/abiv1/memmove.c | 93 +++++++++ + arch/csky/abiv1/memset.c | 71 +++++++ + arch/csky/abiv1/strcpy.c | 17 ++ + arch/csky/abiv1/strksyms.c | 5 + + arch/csky/abiv1/strlen.c | 89 +++++++++ + arch/csky/abiv1/wordcopy.c | 397 +++++++++++++++++++++++++++++++++++++++ + 10 files changed, 1182 insertions(+) + create mode 100644 arch/csky/abiv1/memcmp.c + create mode 100644 arch/csky/abiv1/memcopy.h + create mode 100644 arch/csky/abiv1/memmove.c + create mode 100644 arch/csky/abiv1/memset.c + create mode 100644 arch/csky/abiv1/strcpy.c + create mode 100644 arch/csky/abiv1/strlen.c + create mode 100644 arch/csky/abiv1/wordcopy.c +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (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 (609488bc979f Linux 5.3-rc2) +$ 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 (cdab7e2c73d5 mips: vdso: Fix flip/flop vdso building bug) +$ git merge mips/mips-next +Removing arch/mips/mm/tlb-r8k.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 56 ++--- + arch/mips/Makefile | 4 - + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 10 + + arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 21 +- + arch/mips/boot/dts/ingenic/qi_lb60.dts | 33 +++ + arch/mips/include/asm/addrspace.h | 9 - + arch/mips/include/asm/cpu-type.h | 15 +- + arch/mips/include/asm/cpu.h | 13 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-cavium-octeon/war.h | 1 - + arch/mips/include/asm/mach-generic/war.h | 1 - + arch/mips/include/asm/mach-ip22/war.h | 1 - + arch/mips/include/asm/mach-ip27/war.h | 1 - + arch/mips/include/asm/mach-ip28/war.h | 1 - + arch/mips/include/asm/mach-ip32/war.h | 1 - + arch/mips/include/asm/mach-malta/war.h | 1 - + arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 1 - + arch/mips/include/asm/mach-rc32434/war.h | 1 - + arch/mips/include/asm/mach-rm/war.h | 1 - + arch/mips/include/asm/mach-sibyte/war.h | 1 - + arch/mips/include/asm/mach-tx49xx/war.h | 1 - + arch/mips/include/asm/module.h | 6 - + arch/mips/include/asm/pgtable-32.h | 58 ++++- + arch/mips/include/asm/pgtable-bits.h | 9 +- + arch/mips/include/asm/pgtable.h | 16 +- + arch/mips/include/asm/vdso.h | 78 +------ + arch/mips/include/asm/vdso/gettimeofday.h | 177 +++++++++++++++ + arch/mips/{ => include/asm}/vdso/vdso.h | 6 +- + arch/mips/include/asm/vdso/vsyscall.h | 43 ++++ + arch/mips/include/asm/war.h | 13 -- + arch/mips/jz4740/board-qi_lb60.c | 32 --- + arch/mips/kernel/cpu-probe.c | 40 +--- + arch/mips/kernel/genex.S | 3 - + arch/mips/kernel/idle.c | 3 +- + arch/mips/kernel/vdso.c | 37 +--- + arch/mips/mm/Makefile | 1 - + arch/mips/mm/c-r4k.c | 2 - + arch/mips/mm/pgtable-32.c | 20 ++ + arch/mips/mm/sc-mips.c | 2 +- + arch/mips/mm/tlb-r8k.c | 239 --------------------- + arch/mips/mm/tlbex.c | 8 +- + arch/mips/vdso/Makefile | 41 +++- + arch/mips/vdso/config-n32-o32-env.c | 17 ++ + arch/mips/vdso/elf.S | 2 +- + arch/mips/vdso/sigreturn.S | 2 +- + arch/mips/vdso/vdso.lds.S | 4 + + arch/mips/vdso/vgettimeofday.c | 58 +++++ + 54 files changed, 584 insertions(+), 574 deletions(-) + create mode 100644 arch/mips/include/asm/vdso/gettimeofday.h + rename arch/mips/{ => include/asm}/vdso/vdso.h (89%) + create mode 100644 arch/mips/include/asm/vdso/vsyscall.h + delete mode 100644 arch/mips/mm/tlb-r8k.c + create mode 100644 arch/mips/vdso/config-n32-o32-env.c + create mode 100644 arch/mips/vdso/vgettimeofday.c +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 (989c786e3f18 parisc: rename default_defconfig to defconfig) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + .../features/core/jump-labels/arch-support.txt | 2 +- + .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- + arch/parisc/Kconfig | 2 + + arch/parisc/Makefile | 2 - + .../configs/{default_defconfig => defconfig} | 0 + arch/parisc/include/asm/ftrace.h | 1 + + arch/parisc/kernel/entry.S | 99 ++++++++++++++++++++++ + arch/parisc/kernel/ftrace.c | 67 +++++++++++++-- + 8 files changed, 166 insertions(+), 9 deletions(-) + rename arch/parisc/configs/{default_defconfig => defconfig} (100%) +Merging powerpc/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology) +$ git merge risc-v/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{arm/topology.txt => cpu/cpu-topology.txt} | 256 +++++++++++------ + MAINTAINERS | 7 + + arch/arm/include/asm/topology.h | 20 -- + arch/arm/kernel/topology.c | 60 +--- + arch/arm64/include/asm/topology.h | 23 -- + arch/arm64/kernel/topology.c | 303 +-------------------- + arch/riscv/Kconfig | 1 + + arch/riscv/kernel/smpboot.c | 3 + + drivers/base/Kconfig | 2 +- + drivers/base/arch_topology.c | 298 ++++++++++++++++++++ + include/linux/arch_topology.h | 26 ++ + include/linux/topology.h | 1 + + 12 files changed, 514 insertions(+), 486 deletions(-) + rename Documentation/devicetree/bindings/{arm/topology.txt => cpu/cpu-topology.txt} (66%) +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (019a09a26310 Documentation/s390: remove outdated debugging390 documentation) +$ git merge s390/features +Auto-merging arch/s390/include/asm/qdio.h +Removing Documentation/s390/debugging390.rst +Removing Documentation/s390/dasd.rst +Merge made by the 'recursive' strategy. + Documentation/s390/dasd.rst | 84 -- + Documentation/s390/debugging390.rst | 2613 ---------------------------------- + Documentation/s390/index.rst | 2 - + arch/s390/include/asm/qdio.h | 5 +- + drivers/s390/cio/qdio.h | 3 +- + drivers/s390/cio/qdio_main.c | 75 +- + drivers/s390/cio/qdio_setup.c | 2 +- + drivers/s390/crypto/Makefile | 2 +- + drivers/s390/crypto/pkey_api.c | 967 +------------ + drivers/s390/crypto/zcrypt_api.c | 2 + + drivers/s390/crypto/zcrypt_ccamisc.c | 927 ++++++++++++ + drivers/s390/crypto/zcrypt_ccamisc.h | 111 ++ + drivers/s390/crypto/zcrypt_cex4.c | 106 +- + 13 files changed, 1240 insertions(+), 3659 deletions(-) + delete mode 100644 Documentation/s390/dasd.rst + delete mode 100644 Documentation/s390/debugging390.rst + create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.c + create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.h +Merging sh/sh-next (cd10afbc932d sh: remove unneeded uapi asm-generic wrappers) +$ git merge sh/sh-next +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +arch/sh/include/uapi/asm/setup.h: needs merge +arch/sh/include/uapi/asm/types.h: needs merge +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master 316f9a053c39] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + 3 files changed, 3 insertions(+), 9 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +Merging sparc-next/master (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 (1386dcaa9226 Merge branch 'xtensa-5.3' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/coprocessor.S | 1 + + arch/xtensa/kernel/setup.c | 9 +++------ + arch/xtensa/mm/init.c | 10 ---------- + 3 files changed, 4 insertions(+), 16 deletions(-) +Merging fscrypt/master (0564336329f0 fscrypt: document testing with xfstests) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (579cb95f6d3a afs: Support RCU pathwalk) +$ git merge afs/afs-next +Merge made by the 'recursive' strategy. + fs/afs/cmservice.c | 10 ++--- + fs/afs/dir.c | 54 +++++++++++++++++++++++++- + fs/afs/file.c | 12 +++--- + fs/afs/internal.h | 1 + + fs/afs/security.c | 108 +++++++++++++++++++++++++++++++++++++++++++--------- + fs/afs/vlclient.c | 11 +++--- + include/linux/key.h | 14 ++++++- + 7 files changed, 173 insertions(+), 37 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (80dfdbfd37d2 Merge branch 'for-next-current-v5.2-20190705' into for-next-20190705) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (ee7340d63f98 smb3: add missing flag definitions) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_ioctl.h | 1 + + fs/cifs/cifsacl.c | 79 +++++++++++++++++++++++++++++++++++++++++----------- + fs/cifs/cifsproto.h | 1 + + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 3 +- + fs/cifs/inode.c | 19 ++++++++++--- + fs/cifs/smb2ops.c | 58 +++++++++++++++++++++++++++----------- + fs/cifs/smb2pdu.c | 65 +++++++++++++++++++++++++++++------------- + fs/cifs/smb2pdu.h | 2 ++ + fs/cifs/smb2proto.h | 4 +++ + 10 files changed, 177 insertions(+), 57 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 (38fb6d0ea342 f2fs: use EINVAL for superblock with invalid magic) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + fs/f2fs/file.c | 63 +++++++++++++++++++-------------------------------- + fs/f2fs/gc.c | 70 ++++++++++++++++++++++++++++----------------------------- + fs/f2fs/super.c | 48 +++++++++++++++++++-------------------- + 3 files changed, 81 insertions(+), 100 deletions(-) +Merging fsverity/fsverity (60d7bf0f790f f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext4/inodes.rst | 6 +- + Documentation/filesystems/ext4/overview.rst | 1 + + Documentation/filesystems/ext4/super.rst | 2 + + Documentation/filesystems/ext4/verity.rst | 41 ++ + Documentation/filesystems/fsverity.rst | 726 ++++++++++++++++++++++++++++ + Documentation/filesystems/index.rst | 1 + + Documentation/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 12 + + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 23 +- + fs/ext4/file.c | 4 + + fs/ext4/inode.c | 48 +- + fs/ext4/ioctl.c | 13 + + fs/ext4/readpage.c | 208 ++++++-- + fs/ext4/super.c | 18 +- + fs/ext4/sysfs.c | 6 + + fs/ext4/verity.c | 367 ++++++++++++++ + fs/f2fs/Makefile | 1 + + fs/f2fs/data.c | 72 ++- + fs/f2fs/f2fs.h | 20 +- + fs/f2fs/file.c | 43 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/super.c | 3 + + fs/f2fs/sysfs.c | 11 + + fs/f2fs/verity.c | 247 ++++++++++ + fs/f2fs/xattr.h | 2 + + fs/verity/Kconfig | 55 +++ + fs/verity/Makefile | 10 + + fs/verity/enable.c | 369 ++++++++++++++ + fs/verity/fsverity_private.h | 185 +++++++ + fs/verity/hash_algs.c | 280 +++++++++++ + fs/verity/init.c | 61 +++ + fs/verity/measure.c | 57 +++ + fs/verity/open.c | 356 ++++++++++++++ + fs/verity/signature.c | 157 ++++++ + fs/verity/verify.c | 281 +++++++++++ + include/linux/fs.h | 11 + + include/linux/fsverity.h | 211 ++++++++ + include/uapi/linux/fs.h | 1 + + include/uapi/linux/fsverity.h | 40 ++ + 42 files changed, 3898 insertions(+), 61 deletions(-) + create mode 100644 Documentation/filesystems/ext4/verity.rst + create mode 100644 Documentation/filesystems/fsverity.rst + create mode 100644 fs/ext4/verity.c + create mode 100644 fs/f2fs/verity.c + create mode 100644 fs/verity/Kconfig + create mode 100644 fs/verity/Makefile + create mode 100644 fs/verity/enable.c + create mode 100644 fs/verity/fsverity_private.h + create mode 100644 fs/verity/hash_algs.c + create mode 100644 fs/verity/init.c + create mode 100644 fs/verity/measure.c + create mode 100644 fs/verity/open.c + create mode 100644 fs/verity/signature.c + create mode 100644 fs/verity/verify.c + create mode 100644 include/linux/fsverity.h + create mode 100644 include/uapi/linux/fsverity.h +Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity") +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (d5b9216fd511 pnfs/flexfiles: Add tracepoints for detecting pnfs fallback to MDS) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (b78fa45d4edb nfsd: Make __get_nfsdfs_client() static) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 2 +- + fs/overlayfs/ovl_entry.h | 1 + + fs/overlayfs/super.c | 73 +++++++++++++++++++++------------ + 3 files changed, 49 insertions(+), 27 deletions(-) +Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (89b408a68b9d Documentation: filesystem: Convert xfs.txt to ReST) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (5d907307adc1 iomap: move internal declarations into fs/iomap/) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) +$ git merge djw-vfs/vfs-for-next +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Merge made by the 'recursive' strategy. + fs/attr.c | 13 ++++++------- + mm/filemap.c | 3 +++ + mm/memory.c | 4 ++++ + mm/mmap.c | 8 ++++++-- + 4 files changed, 19 insertions(+), 9 deletions(-) +Merging file-locks/locks-next (43e4cb942e88 locks: Fix procfs output for file leases) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/locks.c | 8 ++++---- + include/trace/events/filelock.h | 14 +++++++------- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization) +$ git merge vfs/for-next +Auto-merging net/ceph/ceph_common.c +Auto-merging mm/shmem.c +Auto-merging kernel/bpf/inode.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mtd/super.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging fs/ubifs/super.c +CONFLICT (content): Merge conflict in fs/ubifs/super.c +Auto-merging fs/tracefs/inode.c +Auto-merging fs/super.c +Auto-merging fs/squashfs/super.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/orangefs/orangefs-mod.c +Auto-merging fs/jffs2/os-linux.h +Auto-merging fs/jffs2/fs.c +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/fs_parser.c +Auto-merging fs/fs_context.c +Auto-merging fs/devpts/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/coda/inode.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/cache.h +Auto-merging fs/ceph/cache.c +Auto-merging fs/autofs/inode.c +Auto-merging fs/autofs/init.c +Auto-merging fs/autofs/autofs_i.h +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/mtd/mtdsuper.c +Auto-merging drivers/block/rbd.c +Auto-merging arch/powerpc/platforms/cell/spufs/inode.c +CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/ubifs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/filesystems/vfs.txt +Documentation/filesystems/vfs.txt: needs merge +rm 'Documentation/filesystems/vfs.txt' +$ git commit --no-edit -v -a +[master 967092c1d42e] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- + arch/s390/hypfs/inode.c | 137 +++--- + drivers/android/binderfs.c | 160 +++---- + drivers/base/devtmpfs.c | 38 +- + drivers/block/rbd.c | 363 ++++++++-------- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdsuper.c | 181 ++++---- + drivers/usb/gadget/function/f_fs.c | 233 +++++----- + fs/autofs/autofs_i.h | 13 +- + fs/autofs/init.c | 9 +- + fs/autofs/inode.c | 429 +++++++++--------- + fs/ceph/cache.c | 9 +- + fs/ceph/cache.h | 5 +- + fs/ceph/super.c | 694 +++++++++++++++--------------- + fs/ceph/super.h | 1 - + fs/coda/inode.c | 171 +++++--- + fs/cramfs/inode.c | 69 +-- + fs/debugfs/inode.c | 185 ++++---- + fs/devpts/inode.c | 265 ++++++------ + fs/fs_context.c | 18 +- + fs/fs_parser.c | 17 +- + fs/fuse/inode.c | 291 +++++++------ + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- + fs/gfs2/super.c | 333 +------------- + fs/gfs2/super.h | 3 +- + fs/jffs2/fs.c | 21 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/super.c | 172 ++++---- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/orangefs-mod.c | 3 +- + fs/orangefs/super.c | 192 +++++---- + fs/pstore/inode.c | 108 +++-- + fs/ramfs/inode.c | 99 +++-- + fs/romfs/super.c | 46 +- + fs/squashfs/super.c | 100 +++-- + fs/super.c | 203 ++++++--- + fs/tracefs/inode.c | 179 ++++---- + fs/ubifs/super.c | 450 +++++++++---------- + include/linux/ceph/ceph_debug.h | 1 + + include/linux/ceph/libceph.h | 17 +- + include/linux/fs.h | 3 - + include/linux/fs_context.h | 15 +- + include/linux/mtd/super.h | 6 +- + include/linux/ramfs.h | 6 +- + include/linux/shmem_fs.h | 3 +- + init/do_mounts.c | 11 +- + kernel/bpf/inode.c | 92 ++-- + mm/shmem.c | 391 +++++++++++------ + net/ceph/ceph_common.c | 410 ++++++++---------- + 50 files changed, 3584 insertions(+), 3291 deletions(-) +$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch +Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/filesystems/vfs.rst +$ git add -A . +$ git commit -v -a --amend +[master 6cdf8d1a7ed4] Merge remote-tracking branch 'vfs/for-next' + Date: Tue Jul 30 09:32:09 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 (5f9e832c1370 Linus 5.3-rc1) +$ 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 (934d24a5e150 i3c: move i3c_device_match_id to device.c and export it) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/i3c/master.c | 45 --------------------------------------- + include/linux/i3c/device.h | 4 ++++ + 3 files changed, 57 insertions(+), 45 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (64fa93a74102 hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap') +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/ads1015.c +Auto-merging MAINTAINERS +Removing Documentation/hwmon/ads1015.rst +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/lm75.txt | 1 + + .../bindings/{hwmon => iio/adc}/ads1015.txt | 0 + Documentation/hwmon/ads1015.rst | 90 ------ + Documentation/hwmon/index.rst | 2 +- + Documentation/hwmon/lm75.rst | 6 +- + Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 ++- + MAINTAINERS | 8 - + arch/x86/kernel/amd_nb.c | 3 + + drivers/hwmon/Kconfig | 10 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/acpi_power_meter.c | 4 +- + drivers/hwmon/ads1015.c | 324 --------------------- + drivers/hwmon/adt7475.c | 146 ++++------ + drivers/hwmon/asb100.c | 12 +- + drivers/hwmon/k10temp.c | 1 + + drivers/hwmon/k8temp.c | 233 +++++---------- + drivers/hwmon/lm75.c | 10 + + drivers/hwmon/nct6775.c | 180 +++++++++++- + drivers/hwmon/pmbus/max31785.c | 2 - + drivers/hwmon/smm665.c | 6 +- + drivers/hwmon/w83781d.c | 6 +- + drivers/iio/adc/Kconfig | 2 +- + include/linux/pci_ids.h | 1 + + 23 files changed, 354 insertions(+), 727 deletions(-) + rename Documentation/devicetree/bindings/{hwmon => iio/adc}/ads1015.txt (100%) + delete mode 100644 Documentation/hwmon/ads1015.rst + rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%) + delete mode 100644 drivers/hwmon/ads1015.c +Merging jc_docs/docs-next (32630d526b9f MAINTAINERS: add entries for some documentation scripts) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging v4l-dvb/master (a8f910ec6658 media: v4l2-core: Cleanup Makefile) +$ git merge v4l-dvb/master +Removing drivers/staging/media/davinci_vpfe/vpfe_video.h +Removing drivers/staging/media/davinci_vpfe/vpfe_video.c +Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h +Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +Removing drivers/staging/media/davinci_vpfe/vpfe.h +Removing drivers/staging/media/davinci_vpfe/dm365_resizer.h +Removing drivers/staging/media/davinci_vpfe/dm365_resizer.c +Removing drivers/staging/media/davinci_vpfe/dm365_isif_regs.h +Removing drivers/staging/media/davinci_vpfe/dm365_isif.h +Removing drivers/staging/media/davinci_vpfe/dm365_isif.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.c +Removing drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h +Removing drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt +Removing drivers/staging/media/davinci_vpfe/TODO +Removing drivers/staging/media/davinci_vpfe/Makefile +Removing drivers/staging/media/davinci_vpfe/Kconfig +Removing drivers/staging/media/bcm2048/radio-bcm2048.h +Removing drivers/staging/media/bcm2048/radio-bcm2048.c +Removing drivers/staging/media/bcm2048/TODO +Removing drivers/staging/media/bcm2048/Makefile +Removing drivers/staging/media/bcm2048/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/cdns,csi2tx.txt | 3 +- + .../devicetree/bindings/media/meson-ao-cec.txt | 8 +- + .../devicetree/bindings/media/nvidia,tegra-vde.txt | 2 + + .../devicetree/bindings/media/rockchip-vpu.txt | 18 +- + Documentation/media/kapi/v4l2-dev.rst | 1 + + Documentation/media/uapi/v4l/biblio.rst | 10 + + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 323 +++ + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 20 + + Documentation/media/v4l-drivers/vimc.rst | 13 +- + drivers/input/touchscreen/sur40.c | 4 +- + drivers/media/Kconfig | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 16 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 23 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 8 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 3 - + drivers/media/dvb-frontends/si2168.c | 11 + + drivers/media/dvb-frontends/si2168.h | 1 + + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/ov2640.c | 2 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov2680.c | 9 +- + drivers/media/i2c/ov5640.c | 7 +- + drivers/media/i2c/ov5645.c | 120 +- + drivers/media/i2c/ov5695.c | 5 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/ov7740.c | 8 +- + drivers/media/pci/bt8xx/bttv-driver.c | 19 - + drivers/media/pci/bt8xx/bttv-risc.c | 8 +- + drivers/media/pci/bt8xx/bttvp.h | 1 - + drivers/media/pci/cobalt/cobalt-driver.c | 38 +- + drivers/media/pci/cobalt/cobalt-flash.c | 2 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 6 - + drivers/media/pci/cx23885/cx23885-417.c | 1 - + drivers/media/pci/cx23885/cx23885-video.c | 7 +- + drivers/media/pci/cx23885/cx23885.h | 1 - + drivers/media/pci/cx25821/cx25821-video.c | 7 +- + drivers/media/pci/cx25821/cx25821.h | 1 - + drivers/media/pci/cx88/cx88-blackbird.c | 2 - + drivers/media/pci/cx88/cx88-video.c | 17 +- + drivers/media/pci/cx88/cx88.h | 1 - + drivers/media/pci/dt3155/dt3155.c | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 100 +- + drivers/media/pci/meye/meye.c | 3 - + drivers/media/pci/pt1/pt1.c | 6 +- + drivers/media/pci/pt3/pt3.c | 6 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 - + drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 - + drivers/media/pci/saa7134/saa7134-video.c | 28 +- + drivers/media/pci/saa7134/saa7134.h | 1 - + drivers/media/pci/saa7164/saa7164-encoder.c | 1 - + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 9 - + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 - + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 - + drivers/media/pci/tw68/tw68-video.c | 14 - + drivers/media/pci/tw68/tw68.h | 1 - + drivers/media/platform/am437x/am437x-vpfe.c | 29 +- + drivers/media/platform/am437x/am437x-vpfe.h | 6 - + drivers/media/platform/cadence/cdns-csi2tx.c | 155 +- + drivers/media/platform/coda/coda-common.c | 4 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 69 +- + drivers/media/platform/davinci/vpbe_display.c | 21 +- + drivers/media/platform/davinci/vpbe_osd.c | 5 - + drivers/media/platform/davinci/vpbe_venc.c | 5 - + drivers/media/platform/davinci/vpfe_capture.c | 54 +- + drivers/media/platform/davinci/vpif_capture.c | 33 +- + drivers/media/platform/davinci/vpif_display.c | 7 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 22 - + drivers/media/platform/exynos-gsc/gsc-core.h | 2 - + drivers/media/platform/exynos4-is/fimc-capture.c | 3 - + drivers/media/platform/exynos4-is/fimc-core.c | 20 - + drivers/media/platform/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 - + drivers/media/platform/exynos4-is/fimc-isp.c | 3 - + drivers/media/platform/exynos4-is/fimc-lite.c | 8 - + drivers/media/platform/exynos4-is/fimc-m2m.c | 1 - + drivers/media/platform/exynos4-is/media-dev.c | 2 + + drivers/media/platform/fsl-viu.c | 7 +- + drivers/media/platform/m2m-deinterlace.c | 140 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 15 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + + drivers/media/platform/meson/ao-cec-g12a.c | 84 +- + drivers/media/platform/meson/ao-cec.c | 44 +- + drivers/media/platform/mx2_emmaprp.c | 139 +- + drivers/media/platform/omap/omap_vout.c | 66 +- + drivers/media/platform/omap3isp/isp.c | 331 ++- + drivers/media/platform/omap3isp/ispvideo.c | 15 +- + drivers/media/platform/pxa_camera.c | 3 - + drivers/media/platform/qcom/camss/camss.c | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 55 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 46 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 63 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 9 +- + drivers/media/platform/s3c-camif/camif-capture.c | 16 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 - + drivers/media/platform/s3c-camif/camif-core.h | 1 - + drivers/media/platform/s5p-cec/s5p_cec.c | 23 +- + drivers/media/platform/s5p-g2d/g2d.c | 13 +- + drivers/media/platform/s5p-g2d/g2d.h | 1 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 31 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 - + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 - + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 14 +- + drivers/media/platform/seco-cec/seco-cec.c | 55 +- + drivers/media/platform/sh_veu.c | 28 +- + drivers/media/platform/sh_vou.c | 17 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +- + drivers/media/platform/sti/cec/stih-cec.c | 32 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 35 +- + drivers/media/platform/ti-vpe/cal.c | 6 +- + drivers/media/platform/ti-vpe/vpe.c | 12 - + drivers/media/platform/via-camera.c | 103 +- + drivers/media/platform/vimc/vimc-streamer.c | 38 +- + drivers/media/platform/vimc/vimc-streamer.h | 18 +- + drivers/media/platform/vivid/vivid-core.c | 4 +- + drivers/media/platform/vivid/vivid-ctrls.c | 26 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 9 +- + drivers/media/platform/vsp1/vsp1_histo.c | 3 +- + drivers/media/platform/vsp1/vsp1_video.c | 10 +- + drivers/media/platform/xilinx/xilinx-dma.c | 18 +- + drivers/media/platform/xilinx/xilinx-vip.c | 16 +- + drivers/media/platform/xilinx/xilinx-vip.h | 2 - + drivers/media/platform/xilinx/xilinx-vipp.c | 2 +- + drivers/media/rc/mceusb.c | 67 +- + drivers/media/rc/mtk-cir.c | 10 +- + drivers/media/usb/airspy/airspy.c | 3 - + drivers/media/usb/au0828/au0828-video.c | 6 - + drivers/media/usb/cpia2/cpia2_v4l.c | 25 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 1 - + drivers/media/usb/cx231xx/cx231xx-video.c | 2 - + drivers/media/usb/cx231xx/cx231xx.h | 1 - + drivers/media/usb/dvb-usb-v2/dvbsky.c | 5 + + drivers/media/usb/dvb-usb/dib0700_devices.c | 8 + + drivers/media/usb/dvb-usb/technisat-usb2.c | 22 +- + drivers/media/usb/em28xx/em28xx-video.c | 9 - + drivers/media/usb/em28xx/em28xx.h | 2 - + drivers/media/usb/go7007/go7007-v4l2.c | 11 - + drivers/media/usb/go7007/snd-go7007.c | 2 +- + drivers/media/usb/gspca/gspca.c | 37 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 12 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 3 - + drivers/media/usb/msi2500/msi2500.c | 8 - + drivers/media/usb/pwc/pwc-v4l.c | 5 - + drivers/media/usb/s2255/s2255drv.c | 10 - + drivers/media/usb/stk1160/stk1160-v4l.c | 2 - + drivers/media/usb/stk1160/stk1160.h | 1 - + drivers/media/usb/stkwebcam/stk-webcam.c | 5 - + drivers/media/usb/tm6000/tm6000-video.c | 4 - + drivers/media/usb/tm6000/tm6000.h | 1 - + drivers/media/usb/usbtv/usbtv-video.c | 2 - + drivers/media/usb/usbvision/usbvision-video.c | 18 +- + drivers/media/usb/usbvision/usbvision.h | 1 - + drivers/media/usb/uvc/uvc_v4l2.c | 2 - + drivers/media/usb/zr364xx/zr364xx.c | 7 +- + drivers/media/v4l2-core/Makefile | 10 +- + drivers/media/v4l2-core/v4l2-async.c | 28 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 283 +- + drivers/media/v4l2-core/v4l2-dev.c | 3 + + drivers/media/v4l2-core/v4l2-fwnode.c | 31 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 68 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 47 +- + drivers/media/v4l2-core/v4l2-subdev.c | 6 +- + drivers/staging/media/Kconfig | 4 - + drivers/staging/media/Makefile | 2 - + drivers/staging/media/bcm2048/Kconfig | 14 - + drivers/staging/media/bcm2048/Makefile | 2 - + drivers/staging/media/bcm2048/TODO | 24 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 2689 -------------------- + drivers/staging/media/bcm2048/radio-bcm2048.h | 26 - + drivers/staging/media/davinci_vpfe/Kconfig | 13 - + drivers/staging/media/davinci_vpfe/Makefile | 11 - + drivers/staging/media/davinci_vpfe/TODO | 38 - + .../staging/media/davinci_vpfe/davinci-vpfe-mc.txt | 154 -- + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 1287 ---------- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 1852 -------------- + drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 174 -- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 1038 -------- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 556 ---- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 1070 -------- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 228 -- + .../media/davinci_vpfe/dm365_ipipeif_user.h | 90 - + drivers/staging/media/davinci_vpfe/dm365_isif.c | 2097 --------------- + drivers/staging/media/davinci_vpfe/dm365_isif.h | 200 -- + .../staging/media/davinci_vpfe/dm365_isif_regs.h | 291 --- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1995 --------------- + drivers/staging/media/davinci_vpfe/dm365_resizer.h | 241 -- + drivers/staging/media/davinci_vpfe/vpfe.h | 83 - + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 716 ------ + .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 90 - + drivers/staging/media/davinci_vpfe/vpfe_video.c | 1646 ------------ + drivers/staging/media/davinci_vpfe/vpfe_video.h | 150 -- + drivers/staging/media/hantro/Kconfig | 2 +- + drivers/staging/media/hantro/Makefile | 5 +- + drivers/staging/media/hantro/hantro.h | 42 +- + drivers/staging/media/hantro/hantro_drv.c | 56 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 14 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 503 ++++ + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 11 +- + drivers/staging/media/hantro/hantro_hw.h | 24 + + drivers/staging/media/hantro/hantro_v4l2.c | 1 + + drivers/staging/media/hantro/hantro_vp8.c | 201 ++ + drivers/staging/media/hantro/rk3288_vpu_hw.c | 22 +- + drivers/staging/media/hantro/rk3399_vpu_hw.c | 39 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 12 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 14 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 595 +++++ + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/staging/media/ipu3/ipu3.c | 3 +- + drivers/staging/media/omap4iss/iss_video.c | 40 +- + drivers/staging/media/omap4iss/iss_video.h | 2 - + drivers/staging/media/soc_camera/soc_camera.c | 2 - + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 29 - + .../vc04_services/bcm2835-camera/mmal-common.h | 1 - + include/media/davinci/vpfe_capture.h | 2 +- + include/media/drv-intf/exynos-fimc.h | 2 - + include/media/drv-intf/saa7146_vv.h | 1 - + include/media/drv-intf/soc_mediabus.h | 2 - + include/media/dvb-usb-ids.h | 1 + + include/media/rc-map.h | 16 - + include/media/v4l2-async.h | 30 +- + include/media/v4l2-ctrls.h | 12 +- + include/media/v4l2-ioctl.h | 2 + + include/media/vp8-ctrls.h | 112 + + 224 files changed, 3634 insertions(+), 18674 deletions(-) + delete mode 100644 drivers/staging/media/bcm2048/Kconfig + delete mode 100644 drivers/staging/media/bcm2048/Makefile + delete mode 100644 drivers/staging/media/bcm2048/TODO + delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c + delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h + delete mode 100644 drivers/staging/media/davinci_vpfe/Kconfig + delete mode 100644 drivers/staging/media/davinci_vpfe/Makefile + delete mode 100644 drivers/staging/media/davinci_vpfe/TODO + delete mode 100644 drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt + delete mode 100644 drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif_regs.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.c + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.h + create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c + create mode 100644 drivers/staging/media/hantro/hantro_vp8.c + create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c + create mode 100644 include/media/vp8-ctrls.h +Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (9fc1a62f0a74 Merge branch 'pm-s2idle-rework' into pm-sleep) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpica/evxfgpe.c | 6 ++--- + drivers/acpi/ec.c | 11 ++++++--- + drivers/acpi/internal.h | 2 +- + drivers/acpi/sleep.c | 53 +++++++++++++++++++++++-------------------- + drivers/base/power/main.c | 35 ++++++++++------------------ + drivers/base/power/wakeup.c | 2 +- + include/acpi/acpixf.h | 8 ++++++- + include/linux/interrupt.h | 1 + + include/linux/pm.h | 4 ---- + include/linux/suspend.h | 1 - + kernel/irq/pm.c | 20 ++++++++++++++++ + kernel/power/suspend.c | 52 ++++++++++++++---------------------------- + 12 files changed, 99 insertions(+), 96 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (fc7d8233c794 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Removing drivers/cpufreq/qcom-cpufreq-kryo.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} | 125 +++++++- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 19 ++ + .../bindings/opp/sun50i-nvmem-cpufreq.txt | 167 ++++++++++ + MAINTAINERS | 11 +- + drivers/cpufreq/Kconfig.arm | 16 +- + drivers/cpufreq/Makefile | 3 +- + drivers/cpufreq/armada-8k-cpufreq.c | 2 + + drivers/cpufreq/cpufreq-dt-platdev.c | 3 + + drivers/cpufreq/qcom-cpufreq-kryo.c | 249 --------------- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 352 +++++++++++++++++++++ + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 226 +++++++++++++ + drivers/opp/core.c | 68 +++- + include/linux/pm_opp.h | 12 +- + 13 files changed, 982 insertions(+), 271 deletions(-) + rename Documentation/devicetree/bindings/opp/{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} (87%) + create mode 100644 Documentation/devicetree/bindings/opp/qcom-opp.txt + create mode 100644 Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt + delete mode 100644 drivers/cpufreq/qcom-cpufreq-kryo.c + create mode 100644 drivers/cpufreq/qcom-cpufreq-nvmem.c + create mode 100644 drivers/cpufreq/sun50i-cpufreq-nvmem.c +Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 4 ++-- + Documentation/power/opp.rst | 2 +- + drivers/opp/core.c | 17 ++++++++++++--- + drivers/opp/of.c | 30 +++++++++------------------ + 4 files changed, 27 insertions(+), 26 deletions(-) +Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/index.rst | 1 + + .../driver-api/thermal/cpu-cooling-api.rst | 107 +++ + .../driver-api/thermal/exynos_thermal.rst | 90 +++ + .../thermal/exynos_thermal_emulation.rst | 61 ++ + Documentation/driver-api/thermal/index.rst | 16 + + .../driver-api/thermal/intel_powerclamp.rst | 320 +++++++++ + .../driver-api/thermal/nouveau_thermal.rst | 96 +++ + .../driver-api/thermal/power_allocator.rst | 271 +++++++ + Documentation/driver-api/thermal/sysfs-api.rst | 798 +++++++++++++++++++++ + .../thermal/x86_pkg_temperature_thermal.rst | 55 ++ + MAINTAINERS | 2 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 6 - + .../int340x_thermal/processor_thermal_device.c | 91 ++- + drivers/thermal/thermal_core.c | 19 +- + include/linux/thermal.h | 4 +- + 15 files changed, 1919 insertions(+), 18 deletions(-) + create mode 100644 Documentation/driver-api/thermal/cpu-cooling-api.rst + create mode 100644 Documentation/driver-api/thermal/exynos_thermal.rst + create mode 100644 Documentation/driver-api/thermal/exynos_thermal_emulation.rst + create mode 100644 Documentation/driver-api/thermal/index.rst + create mode 100644 Documentation/driver-api/thermal/intel_powerclamp.rst + create mode 100644 Documentation/driver-api/thermal/nouveau_thermal.rst + create mode 100644 Documentation/driver-api/thermal/power_allocator.rst + create mode 100644 Documentation/driver-api/thermal/sysfs-api.rst + create mode 100644 Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst +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 (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Merge made by the 'recursive' strategy. + drivers/xen/swiotlb-xen.c | 34 ++++++++++------------------------ + include/linux/page-flags.h | 4 ++++ + 2 files changed, 14 insertions(+), 24 deletions(-) +Merging rdma/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (85fd8011475e Merge branch 'bnxt_en-TPA-57500') +$ git merge net-next/master +Auto-merging net/can/gw.c +Removing include/linux/platform_data/nxp-nci.h +Auto-merging drivers/staging/unisys/visornic/visornic_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.h +Auto-merging drivers/net/ethernet/marvell/sky2.c +Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging drivers/net/can/flexcan.c +CONFLICT (content): Merge conflict in drivers/net/can/flexcan.c +Auto-merging MAINTAINERS +Auto-merging Documentation/PCI/pci-error-recovery.rst +CONFLICT (content): Merge conflict in Documentation/PCI/pci-error-recovery.rst +Resolved 'Documentation/PCI/pci-error-recovery.rst' using previous resolution. +Resolved 'drivers/net/can/flexcan.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c25108c279c] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/pci-error-recovery.rst | 1 - + .../devicetree/bindings/net/can/fsl-flexcan.txt | 10 + + .../devicetree/bindings/net/can/tcan4x5x.txt | 37 + + MAINTAINERS | 8 +- + drivers/atm/he.c | 7 +- + drivers/atm/solos-pci.c | 9 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 6 +- + drivers/hsi/clients/ssi_protocol.c | 3 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 2 +- + drivers/net/can/Kconfig | 13 + + drivers/net/can/Makefile | 1 + + drivers/net/can/flexcan.c | 136 +- + drivers/net/can/kvaser_pciefd.c | 1912 ++++++++++++++++++++ + drivers/net/can/m_can/Kconfig | 22 +- + drivers/net/can/m_can/Makefile | 2 + + drivers/net/can/m_can/m_can.c | 1079 +++++------ + drivers/net/can/m_can/m_can.h | 110 ++ + drivers/net/can/m_can/m_can_platform.c | 202 +++ + drivers/net/can/m_can/tcan4x5x.c | 532 ++++++ + drivers/net/can/sja1000/Kconfig | 79 +- + drivers/net/can/sja1000/Makefile | 11 +- + drivers/net/can/sja1000/f81601.c | 212 +++ + drivers/net/can/ti_hecc.c | 191 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- + drivers/net/can/xilinx_can.c | 293 ++- + drivers/net/dsa/mv88e6xxx/chip.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 8 +- + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 10 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 10 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 3 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 11 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 550 ++++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 95 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 156 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 109 +- + drivers/net/ethernet/broadcom/tg3.c | 6 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 23 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 23 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 5 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 4 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 9 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 41 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 15 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 34 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 10 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 11 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 135 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 10 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 + + drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +- + drivers/net/ethernet/intel/igb/igb_main.c | 8 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc_base.c | 5 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 2 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 14 +- + drivers/net/ethernet/intel/igc/igc_main.c | 8 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 9 +- + drivers/net/ethernet/jme.c | 11 +- + drivers/net/ethernet/marvell/mvneta.c | 8 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 +- + drivers/net/ethernet/marvell/skge.c | 6 +- + drivers/net/ethernet/marvell/sky2.c | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 43 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 66 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 24 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 17 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 22 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 5 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 10 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 120 ++ + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 21 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 3 +- + drivers/net/ethernet/qlogic/Kconfig | 9 - + drivers/net/ethernet/qlogic/Makefile | 1 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 12 +- + drivers/net/ethernet/realtek/r8169_main.c | 250 ++- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/efx.c | 10 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sfc/falcon/falcon_boards.c | 18 +- + drivers/net/ethernet/sis/sis900.c | 68 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 22 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/usb/asix_common.c | 9 +- + drivers/net/usb/ax88179_178a.c | 14 +- + drivers/net/usb/lan78xx.c | 23 +- + drivers/net/usb/smsc75xx.c | 20 +- + drivers/net/usb/sr9800.c | 9 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 7 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 3 +- + drivers/net/wireless/ath/wil6210/txrx.c | 9 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/nfc/nxp-nci/Kconfig | 7 +- + drivers/nfc/nxp-nci/core.c | 2 - + drivers/nfc/nxp-nci/i2c.c | 134 +- + drivers/nfc/nxp-nci/nxp-nci.h | 1 - + drivers/ptp/ptp_dte.c | 5 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/scsi/fcoe/fcoe_transport.c | 2 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/octeon/Kconfig | 2 +- + drivers/staging/octeon/ethernet-defines.h | 2 - + drivers/staging/octeon/ethernet-mdio.c | 6 +- + drivers/staging/octeon/ethernet-mem.c | 5 +- + drivers/staging/octeon/ethernet-rgmii.c | 10 +- + drivers/staging/octeon/ethernet-rx.c | 13 +- + drivers/staging/octeon/ethernet-rx.h | 2 - + drivers/staging/octeon/ethernet-sgmii.c | 8 +- + drivers/staging/octeon/ethernet-spi.c | 10 +- + drivers/staging/octeon/ethernet-tx.c | 19 +- + drivers/staging/octeon/ethernet-util.h | 4 - + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/octeon/octeon-ethernet.h | 29 +- + drivers/staging/octeon/octeon-stubs.h | 1429 +++++++++++++++ + drivers/staging/qlge/Kconfig | 10 + + .../{net/ethernet/qlogic => staging}/qlge/Makefile | 0 + drivers/staging/qlge/TODO | 46 + + .../{net/ethernet/qlogic => staging}/qlge/qlge.h | 0 + .../ethernet/qlogic => staging}/qlge/qlge_dbg.c | 0 + .../qlogic => staging}/qlge/qlge_ethtool.c | 0 + .../ethernet/qlogic => staging}/qlge/qlge_main.c | 0 + .../ethernet/qlogic => staging}/qlge/qlge_mpi.c | 0 + drivers/staging/unisys/visornic/visornic_main.c | 4 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 13 +- + include/linux/bvec.h | 5 +- + include/linux/can/core.h | 3 +- + include/linux/can/skb.h | 2 +- + include/linux/platform_data/nxp-nci.h | 19 - + include/linux/skbuff.h | 34 +- + include/linux/stmmac.h | 1 + + include/net/flow_offload.h | 19 + + include/net/ndisc.h | 1 + + include/net/tc_act/tc_mpls.h | 75 + + net/can/Kconfig | 11 +- + net/can/af_can.c | 10 +- + net/can/af_can.h | 1 + + net/can/bcm.c | 10 +- + net/can/gw.c | 1 + + net/can/proc.c | 1 + + net/can/raw.c | 10 +- + net/core/neighbour.c | 2 +- + net/core/skbuff.c | 26 +- + net/core/tso.c | 8 +- + net/ipv4/tcp.c | 14 +- + net/ipv6/exthdrs_core.c | 4 +- + net/ipv6/ndisc.c | 1 + + net/kcm/kcmsock.c | 8 +- + net/nfc/netlink.c | 6 +- + net/sched/cls_api.c | 25 + + net/tipc/link.c | 119 +- + net/tipc/msg.c | 59 + + net/tipc/msg.h | 28 +- + net/tipc/node.c | 6 +- + net/tipc/node.h | 6 +- + net/tls/tls_device.c | 14 +- + net/vmw_vsock/hyperv_transport.c | 24 +- + .../selftests/tc-testing/tc-tests/qdiscs/fifo.json | 304 ++++ + 212 files changed, 8013 insertions(+), 1984 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt + create mode 100644 drivers/net/can/kvaser_pciefd.c + create mode 100644 drivers/net/can/m_can/m_can.h + create mode 100644 drivers/net/can/m_can/m_can_platform.c + create mode 100644 drivers/net/can/m_can/tcan4x5x.c + create mode 100644 drivers/net/can/sja1000/f81601.c + create mode 100644 drivers/staging/octeon/octeon-stubs.h + create mode 100644 drivers/staging/qlge/Kconfig + rename drivers/{net/ethernet/qlogic => staging}/qlge/Makefile (100%) + create mode 100644 drivers/staging/qlge/TODO + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge.h (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_dbg.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_ethtool.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_main.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_mpi.c (100%) + delete mode 100644 include/linux/platform_data/nxp-nci.h + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fifo.json +Merging bpf-next/master (d3406913561c Merge branch 'devmap_hash') +$ git merge bpf-next/master +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Merge made by the 'recursive' strategy. + Documentation/bpf/prog_flow_dissector.rst | 18 + + include/linux/bpf.h | 11 +- + include/linux/bpf_types.h | 1 + + include/linux/skbuff.h | 2 +- + include/trace/events/xdp.h | 3 +- + include/uapi/linux/bpf.h | 7 + + kernel/bpf/devmap.c | 332 +++++++++++++++--- + kernel/bpf/verifier.c | 2 + + net/bpf/test_run.c | 39 ++- + net/core/filter.c | 15 +- + net/core/flow_dissector.c | 21 +- + samples/bpf/trace_output_user.c | 43 +-- + samples/bpf/xdp_sample_pkts_user.c | 61 +--- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/bash-completion/bpftool | 4 +- + tools/bpf/bpftool/map.c | 3 +- + tools/include/uapi/linux/bpf.h | 7 + + tools/lib/bpf/libbpf.c | 18 +- + tools/lib/bpf/libbpf.h | 2 +- + tools/lib/bpf/libbpf_probes.c | 1 + + tools/testing/selftests/bpf/Makefile | 14 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 6 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 90 +++-- + .../selftests/bpf/prog_tests/flow_dissector.c | 243 ++++++++++++- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 82 +++-- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 10 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 15 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 17 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 2 +- + .../selftests/bpf/prog_tests/stacktrace_build_id.c | 4 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 4 +- + .../selftests/bpf/prog_tests/xdp_noinline.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 47 ++- + .../selftests/bpf/progs/test_get_stack_rawtp.c | 2 +- + tools/testing/selftests/bpf/test_maps.c | 16 + + tools/testing/selftests/bpf/test_progs.c | 383 ++++++++++++++++++++- + tools/testing/selftests/bpf/test_progs.h | 45 ++- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 90 ++--- + tools/testing/selftests/bpf/test_verifier.c | 12 +- + tools/testing/selftests/bpf/trace_helpers.c | 125 ------- + tools/testing/selftests/bpf/trace_helpers.h | 9 - + .../testing/selftests/bpf/verifier/event_output.c | 94 +++++ + 43 files changed, 1423 insertions(+), 484 deletions(-) + create mode 100644 tools/testing/selftests/bpf/verifier/event_output.c +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 (0470e5e38c9d net/mlx5: fix -Wtype-limits compilation warnings) +$ git merge mlx5-next/mlx5-next +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) +Merging netfilter-next/master (dda91bd7abb0 Merge branch 'mlxsw-spectrum_acl-Forbid-unsupported-filters') +$ 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 +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fdab4568ebb2] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (15e830e90fde mwifiex: use eth_broadcast_addr() to assign broadcast address) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 6 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 53 ++++++-- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 30 ++--- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 9 -- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 16 +-- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 7 ++ + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 3 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 3 +- + drivers/net/wireless/marvell/libertas/main.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 3 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 136 ++++++--------------- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 9 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 4 - + drivers/net/wireless/realtek/rtw88/debug.c | 112 +++++++++++++++++ + drivers/net/wireless/realtek/rtw88/pci.c | 71 ++++++----- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + 36 files changed, 295 insertions(+), 260 deletions(-) +Merging bluetooth/master (fa9ccaf84f5d 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 (2ab45876756f mac80211: add support for the ADDBA extension element) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/mlme.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 29 +-- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 4 - + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 5 - + drivers/net/wireless/mac80211_hwsim.c | 13 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 3 +- + include/linux/ieee80211.h | 63 ++++- + include/net/mac80211.h | 49 +++- + include/uapi/linux/nl80211.h | 4 +- + net/mac80211/agg-rx.c | 70 +++++- + net/mac80211/debugfs.c | 3 +- + net/mac80211/driver-ops.h | 8 +- + net/mac80211/he.c | 15 ++ + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 14 +- + net/mac80211/key.c | 16 +- + net/mac80211/main.c | 18 +- + net/mac80211/mesh.c | 62 +++++ + net/mac80211/mesh.h | 4 + + net/mac80211/mesh_plink.c | 12 +- + net/mac80211/mlme.c | 1 + + net/mac80211/offchannel.c | 5 +- + net/mac80211/rate.h | 9 - + net/mac80211/sta_info.c | 1 - + net/mac80211/status.c | 180 +++++++++++++-- + net/mac80211/trace.h | 7 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 60 +++++ + net/mac80211/wpa.c | 6 +- + net/wireless/Kconfig | 2 + + net/wireless/core.c | 17 +- + net/wireless/core.h | 2 + + net/wireless/lib80211_crypt_ccmp.c | 197 +++++++--------- + net/wireless/nl80211.c | 28 ++- + net/wireless/scan.c | 269 ++++++++++++++-------- + 38 files changed, 854 insertions(+), 341 deletions(-) +Merging gfs2/for-next (5d69e57fa9cc gfs2: Minor gfs2_alloc_inode cleanup) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 191 +++++++++++++++++++++----------------------------------- + fs/gfs2/super.c | 14 ++--- + 2 files changed, 78 insertions(+), 127 deletions(-) +Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (1670e678a8a7 mtd: rawnand: ingenic: Add of_node_put() before return) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 1 + + drivers/mtd/nand/raw/meson_nand.c | 1 + + drivers/mtd/nand/raw/oxnas_nand.c | 8 ++- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 90 ++++++++----------------- + drivers/mtd/nand/raw/tango_nand.c | 1 + + drivers/mtd/nand/raw/vf610_nfc.c | 1 + + 6 files changed, 38 insertions(+), 64 deletions(-) +Merging spi-nor/spi-nor/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (8dfa20fcfbeb crypto: ghash - add comment and improve help text) +$ git merge crypto/master +Removing tools/crypto/getstat.c +Removing include/crypto/morus_common.h +Removing include/crypto/morus640_glue.h +Removing include/crypto/morus1280_glue.h +Removing drivers/crypto/ccree/cc_ivgen.h +Removing drivers/crypto/ccree/cc_ivgen.c +Removing crypto/morus640.c +Removing crypto/morus1280.c +Removing crypto/aegis256.c +Removing crypto/aegis128l.c +Removing arch/x86/include/asm/crypto/aes.h +Removing arch/x86/crypto/morus640_glue.c +Removing arch/x86/crypto/morus640-sse2-glue.c +Removing arch/x86/crypto/morus640-sse2-asm.S +Removing arch/x86/crypto/morus1280_glue.c +Removing arch/x86/crypto/morus1280-sse2-glue.c +Removing arch/x86/crypto/morus1280-sse2-asm.S +Removing arch/x86/crypto/morus1280-avx2-glue.c +Removing arch/x86/crypto/morus1280-avx2-asm.S +Removing arch/x86/crypto/aes-x86_64-asm_64.S +Removing arch/x86/crypto/aes-i586-asm_32.S +Removing arch/x86/crypto/aegis256-aesni-glue.c +Removing arch/x86/crypto/aegis256-aesni-asm.S +Removing arch/x86/crypto/aegis128l-aesni-glue.c +Removing arch/x86/crypto/aegis128l-aesni-asm.S +Removing arch/arm64/crypto/aes-ctr-fallback.h +Merge made by the 'recursive' strategy. + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-ce-core.S | 20 +- + arch/arm/crypto/aes-ce-glue.c | 168 +- + arch/arm/crypto/aes-cipher-core.S | 40 +- + arch/arm/crypto/aes-cipher-glue.c | 11 +- + arch/arm/crypto/aes-neonbs-glue.c | 69 +- + arch/arm/crypto/ghash-ce-glue.c | 80 +- + arch/arm64/crypto/Kconfig | 10 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 18 +- + arch/arm64/crypto/aes-ce-glue.c | 7 +- + arch/arm64/crypto/aes-cipher-core.S | 40 +- + arch/arm64/crypto/aes-cipher-glue.c | 11 +- + arch/arm64/crypto/aes-ctr-fallback.h | 50 - + arch/arm64/crypto/aes-glue.c | 39 +- + arch/arm64/crypto/aes-neon.S | 74 +- + arch/arm64/crypto/aes-neonbs-glue.c | 29 +- + arch/arm64/crypto/ghash-ce-glue.c | 30 +- + arch/s390/crypto/ghash_s390.c | 2 +- + arch/sparc/crypto/aes_glue.c | 8 +- + arch/x86/crypto/Makefile | 21 - + arch/x86/crypto/aegis128l-aesni-asm.S | 823 ------- + arch/x86/crypto/aegis128l-aesni-glue.c | 293 --- + arch/x86/crypto/aegis256-aesni-asm.S | 700 ------ + arch/x86/crypto/aegis256-aesni-glue.c | 293 --- + arch/x86/crypto/aes-i586-asm_32.S | 362 ---- + arch/x86/crypto/aes-x86_64-asm_64.S | 185 -- + arch/x86/crypto/aes_glue.c | 70 - + arch/x86/crypto/aesni-intel_glue.c | 23 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 3 +- + arch/x86/crypto/morus1280-avx2-asm.S | 619 ------ + arch/x86/crypto/morus1280-avx2-glue.c | 62 - + arch/x86/crypto/morus1280-sse2-asm.S | 893 -------- + arch/x86/crypto/morus1280-sse2-glue.c | 61 - + arch/x86/crypto/morus1280_glue.c | 205 -- + arch/x86/crypto/morus640-sse2-asm.S | 612 ------ + arch/x86/crypto/morus640-sse2-glue.c | 61 - + arch/x86/crypto/morus640_glue.c | 200 -- + arch/x86/include/asm/crypto/aes.h | 12 - + crypto/Kconfig | 152 +- + crypto/Makefile | 16 +- + crypto/aegis.h | 28 +- + crypto/{aegis128.c => aegis128-core.c} | 53 +- + crypto/aegis128-neon-inner.c | 149 ++ + crypto/aegis128-neon.c | 43 + + crypto/aegis128l.c | 522 ----- + crypto/aegis256.c | 473 ---- + crypto/aes_generic.c | 167 +- + crypto/aes_ti.c | 313 +-- + crypto/crypto_user_base.c | 37 +- + crypto/crypto_user_stat.c | 4 +- + crypto/fips.c | 11 + + crypto/ghash-generic.c | 31 +- + crypto/morus1280.c | 542 ----- + crypto/morus640.c | 533 ----- + crypto/tcrypt.c | 7 + + crypto/testmgr.c | 38 +- + crypto/testmgr.h | 2771 +----------------------- + drivers/char/hw_random/imx-rngc.c | 4 +- + drivers/char/hw_random/mxc-rnga.c | 4 +- + drivers/crypto/Kconfig | 14 +- + drivers/crypto/amcc/crypto4xx_alg.c | 24 +- + drivers/crypto/bcm/cipher.c | 13 + + drivers/crypto/caam/caamalg_qi2.h | 2 +- + drivers/crypto/caam/caampkc.c | 11 +- + drivers/crypto/cavium/nitrox/nitrox_csr.h | 124 +- + drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 3 +- + drivers/crypto/cavium/nitrox/nitrox_dev.h | 4 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 144 +- + drivers/crypto/ccp/Kconfig | 9 + + drivers/crypto/ccp/Makefile | 4 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 25 +- + drivers/crypto/ccp/ccp-crypto.h | 7 +- + drivers/crypto/ccp/ccp-dev-v3.c | 2 +- + drivers/crypto/ccp/ccp-dev-v5.c | 11 +- + drivers/crypto/ccp/ccp-dev.c | 29 +- + drivers/crypto/ccp/ccp-dev.h | 1 + + drivers/crypto/ccp/ccp-dmaengine.c | 12 +- + drivers/crypto/ccp/ccp-ops.c | 55 +- + drivers/crypto/ccree/Makefile | 2 +- + drivers/crypto/ccree/cc_aead.c | 102 +- + drivers/crypto/ccree/cc_aead.h | 3 +- + drivers/crypto/ccree/cc_driver.c | 14 +- + drivers/crypto/ccree/cc_driver.h | 10 - + drivers/crypto/ccree/cc_fips.c | 31 +- + drivers/crypto/ccree/cc_ivgen.c | 276 --- + drivers/crypto/ccree/cc_ivgen.h | 55 - + drivers/crypto/ccree/cc_pm.c | 2 - + drivers/crypto/ccree/cc_request_mgr.c | 47 +- + drivers/crypto/chelsio/Kconfig | 1 + + drivers/crypto/chelsio/chcr_algo.c | 46 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 - + drivers/crypto/chelsio/chcr_ipsec.c | 19 +- + drivers/crypto/chelsio/chtls/chtls_hw.c | 20 +- + drivers/crypto/inside-secure/safexcel.c | 47 +- + drivers/crypto/inside-secure/safexcel.h | 48 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 719 ++++-- + drivers/crypto/inside-secure/safexcel_hash.c | 577 ++--- + drivers/crypto/marvell/cipher.c | 2 +- + drivers/crypto/padlock-aes.c | 10 +- + drivers/crypto/ux500/cryp/cryp.h | 4 +- + drivers/crypto/ux500/hash/hash_alg.h | 4 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 4 +- + include/crypto/aes.h | 41 +- + include/crypto/ctr.h | 50 + + include/crypto/ghash.h | 2 +- + include/crypto/internal/cryptouser.h | 2 - + include/crypto/morus1280_glue.h | 97 - + include/crypto/morus640_glue.h | 97 - + include/crypto/morus_common.h | 18 - + include/linux/fips.h | 7 + + include/linux/padata.h | 13 +- + include/net/net_namespace.h | 3 + + kernel/padata.c | 116 +- + lib/crypto/Makefile | 3 + + lib/crypto/aes.c | 356 +++ + net/bluetooth/Kconfig | 3 +- + net/bluetooth/smp.c | 103 +- + tools/crypto/getstat.c | 294 --- + 118 files changed, 2723 insertions(+), 13124 deletions(-) + delete mode 100644 arch/arm64/crypto/aes-ctr-fallback.h + delete mode 100644 arch/x86/crypto/aegis128l-aesni-asm.S + delete mode 100644 arch/x86/crypto/aegis128l-aesni-glue.c + delete mode 100644 arch/x86/crypto/aegis256-aesni-asm.S + delete mode 100644 arch/x86/crypto/aegis256-aesni-glue.c + delete mode 100644 arch/x86/crypto/aes-i586-asm_32.S + delete mode 100644 arch/x86/crypto/aes-x86_64-asm_64.S + delete mode 100644 arch/x86/crypto/morus1280-avx2-asm.S + delete mode 100644 arch/x86/crypto/morus1280-avx2-glue.c + delete mode 100644 arch/x86/crypto/morus1280-sse2-asm.S + delete mode 100644 arch/x86/crypto/morus1280-sse2-glue.c + delete mode 100644 arch/x86/crypto/morus1280_glue.c + delete mode 100644 arch/x86/crypto/morus640-sse2-asm.S + delete mode 100644 arch/x86/crypto/morus640-sse2-glue.c + delete mode 100644 arch/x86/crypto/morus640_glue.c + delete mode 100644 arch/x86/include/asm/crypto/aes.h + rename crypto/{aegis128.c => aegis128-core.c} (89%) + create mode 100644 crypto/aegis128-neon-inner.c + create mode 100644 crypto/aegis128-neon.c + delete mode 100644 crypto/aegis128l.c + delete mode 100644 crypto/aegis256.c + delete mode 100644 crypto/morus1280.c + delete mode 100644 crypto/morus640.c + delete mode 100644 drivers/crypto/ccree/cc_ivgen.c + delete mode 100644 drivers/crypto/ccree/cc_ivgen.h + delete mode 100644 include/crypto/morus1280_glue.h + delete mode 100644 include/crypto/morus640_glue.h + delete mode 100644 include/crypto/morus_common.h + create mode 100644 lib/crypto/aes.c + delete mode 100644 tools/crypto/getstat.c +Merging drm/drm-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (0e738e03472a drm/amdkfd/kfd_mqd_manager_v10: Avoid fall-through warning) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_stream.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Resolved 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc_stream.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/powerplay/navi10_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9f2bae26f925] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 324 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 190 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 76 +- + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 57 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 375 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 112 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 517 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 33 + + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 66 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 24 + + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 331 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 29 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 116 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 265 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 38 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1417 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 4 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 485 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 68 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 16 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 139 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 61 + + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 36 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 90 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 71 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 355 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 27 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 44 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 21 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 56 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 11 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 28 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 30 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 46 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 70 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 27 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 64 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 33 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 16 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 688 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 62 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 176 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 34 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 365 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 5 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 5109 +++ + .../display/dc/dml/dcn20/display_mode_vba_20v2.h | 32 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 73 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 42 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 41 +- + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +- + .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 68 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 3 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 134 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 46 + + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 +- + drivers/gpu/drm/amd/display/include/audio_types.h | 4 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 8 + + .../amd/display/include/gpio_service_interface.h | 18 +- + .../drm/amd/display/include/link_service_types.h | 17 +- + .../drm/amd/display/modules/color/color_gamma.c | 163 +- + .../drm/amd/display/modules/color/color_gamma.h | 9 + + drivers/gpu/drm/amd/include/arct_ip_offset.h | 1654 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 4 + + .../include/asic_reg/mmhub/mmhub_9_4_1_default.h | 3933 ++ + .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 7753 ++++ + .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 44884 +++++++++++++++++++ + .../include/asic_reg/sdma0/sdma0_4_2_2_offset.h | 1051 + + .../include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h | 3002 ++ + .../include/asic_reg/sdma1/sdma1_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma2/sdma2_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma3/sdma3_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma4/sdma4_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma5/sdma5_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma6/sdma6_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma7/sdma7_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h | 2956 ++ + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 979 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 3609 ++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 1119 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 11 +- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 31 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 126 + + drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 28 + + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 11 + + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 878 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 15 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 81 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 54 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 80 +- + include/drm/amd_asic_type.h | 2 + + 192 files changed, 111866 insertions(+), 1514 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/arct_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h + create mode 100644 drivers/gpu/drm/amd/include/arct_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/navi14_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h +Merging drm-intel/for-linux-next (301efe96f777 drm/i915/uc: Don't fail on HuC firmware failure) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h +Removing drivers/gpu/drm/i915/intel_uc_fw.c +Removing drivers/gpu/drm/i915/intel_uc.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Removing drivers/gpu/drm/i915/intel_huc_fw.c +Removing drivers/gpu/drm/i915/intel_guc_fw.c +Auto-merging drivers/gpu/drm/i915/i915_trace.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h +Removing drivers/gpu/drm/i915/i915_timeline.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c +Removing drivers/gpu/drm/i915/i915_gem_render_state.h +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gt/selftest_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/mock_engine.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_ringbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging 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.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/display/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/Makefile +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_display_power.c' +Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_context.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_engine_cs.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_ringbuffer.c' +Resolved 'drivers/gpu/drm/i915/gt/intel_workarounds.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/selftest_workarounds.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_gem_gtt.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_gpu_error.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_trace.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_display_power.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_context.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_engine_cs.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_ringbuffer.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/selftest_workarounds.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_gem_gtt.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_gpu_error.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_trace.h'. +[master 837085f15d0a] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 20 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/i915/Kconfig.debug | 14 + + drivers/gpu/drm/i915/Makefile | 79 +- + drivers/gpu/drm/i915/Makefile.header-test | 7 +- + drivers/gpu/drm/i915/display/Makefile | 3 + + drivers/gpu/drm/i915/display/icl_dsi.c | 185 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 56 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 81 +- + drivers/gpu/drm/i915/display/intel_bios.c | 28 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + 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 | 403 ++-- + drivers/gpu/drm/i915/display/intel_display.c | 1245 +++++++----- + drivers/gpu/drm/i915/display/intel_display.h | 50 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 658 ++++++- + drivers/gpu/drm/i915/display/intel_display_power.h | 35 +- + drivers/gpu/drm/i915/display/intel_dp.c | 292 +-- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 8 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 652 +++++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 12 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 20 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 75 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 314 +-- + drivers/gpu/drm/i915/display/intel_sprite.c | 335 +++- + drivers/gpu/drm/i915/display/intel_tc.c | 537 ++++++ + drivers/gpu/drm/i915/display/intel_tc.h | 35 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 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 | 42 +- + 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 | 119 +- + drivers/gpu/drm/i915/gt/intel_context.h | 18 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 5 + + drivers/gpu/drm/i915/gt/intel_engine.h | 75 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 203 +- + 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 | 73 +- + 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 | 73 +- + 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 | 991 ++++++---- + 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 | 135 +- + .../i915/{i915_timeline.c => gt/intel_timeline.c} | 230 +-- + drivers/gpu/drm/i915/gt/intel_timeline.h | 93 + + .../intel_timeline_types.h} | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 227 ++- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 511 +++-- + 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 | 155 +- + .../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 | 290 ++- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 33 +- + 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 | 181 ++ + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 81 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 48 +- + 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 | 496 +---- + .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 2 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 69 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 53 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 0 + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 570 ++++++ + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h | 39 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 540 ++++++ + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h | 102 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 82 + + .../intel_guc.c => gt/uc/selftest_guc.c} | 49 +- + drivers/gpu/drm/i915/gvt/gtt.h | 13 +- + drivers/gpu/drm/i915/i915_active.c | 321 +++- + drivers/gpu/drm/i915/i915_active.h | 28 +- + drivers/gpu/drm/i915/i915_active_types.h | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 217 ++- + drivers/gpu/drm/i915/i915_drv.c | 200 +- + drivers/gpu/drm/i915/i915_drv.h | 242 +-- + drivers/gpu/drm/i915/i915_fixed.h | 5 + + drivers/gpu/drm/i915/i915_gem.c | 320 ++-- + 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 | 2017 ++++++++------------ + 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 | 588 +++--- + drivers/gpu/drm/i915/i915_gpu_error.h | 71 +- + drivers/gpu/drm/i915/i915_irq.c | 803 ++++---- + drivers/gpu/drm/i915/i915_irq.h | 45 +- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 43 +- + drivers/gpu/drm/i915/i915_perf.c | 304 ++- + 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 | 231 ++- + 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 | 12 +- + 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 | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 37 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 308 --- + drivers/gpu/drm/i915/intel_gvt.c | 7 +- + drivers/gpu/drm/i915/intel_gvt.h | 7 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 215 --- + drivers/gpu/drm/i915/intel_pm.c | 441 +++-- + drivers/gpu/drm/i915/intel_pm.h | 4 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_uc.c | 561 ------ + drivers/gpu/drm/i915/intel_uc_fw.c | 357 ---- + 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 | 40 +- + 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/i915_vma.c | 10 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 38 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 10 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 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 + + 244 files changed, 12978 insertions(+), 10263 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 (90%) + 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%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (88%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (91%) + 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 (76%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h (91%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (100%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h (60%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h (57%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h + rename drivers/gpu/drm/i915/{selftests/intel_guc.c => gt/uc/selftest_guc.c} (85%) + delete mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h + delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h + delete mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c + 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 (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/output.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging drm-misc/for-linux-next (63b87c310a83 drm/mst: Fix sphinx warnings in drm_dp_msg_connector register functions) +$ git merge drm-misc/for-linux-next +Removing include/drm/tinydrm/tinydrm-helpers.h +Removing include/drm/tinydrm/mipi-dbi.h +Removing drivers/gpu/drm/vboxvideo/vbox_prime.c +Removing drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c +Removing drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +Removing drivers/gpu/drm/tinydrm/core/Makefile +Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.h +Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Removing drivers/gpu/drm/mgag200/mgag200_fb.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_modes.c +Removing drivers/gpu/drm/ast/ast_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging MAINTAINERS +Removing Documentation/gpu/tinydrm.rst +Removing Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt +Removing Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt +Removing Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt +Removing Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt +Removing Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt +Removing Documentation/devicetree/bindings/display/panel/panel.txt +Removing Documentation/devicetree/bindings/display/panel/panel-lvds.txt +Removing Documentation/devicetree/bindings/display/panel/panel-common.txt +Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt +Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt +Removing Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt +Removing Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt +Removing Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt +Removing Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/bridge/sii902x.txt | 5 +- + .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 - + .../display/panel/ampire,am-480272h3tmqw-t01h.yaml | 42 + + .../display/panel/arm,versatile-tft-panel.txt | 2 +- + .../display/panel/armadeus,st0700-adapt.txt | 9 - + .../display/panel/armadeus,st0700-adapt.yaml | 33 + + .../display/panel/bananapi,s070wv20-ct16.txt | 12 - + .../display/panel/bananapi,s070wv20-ct16.yaml | 31 + + .../bindings/display/panel/boe,himax8279d.txt | 24 + + .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 - + .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 31 + + .../bindings/display/panel/edt,et-series.txt | 2 +- + .../bindings/display/panel/giantplus,gpm940b0.txt | 12 + + .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 - + .../display/panel/innolux,ee101ia-01d.yaml | 31 + + .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 + + .../devicetree/bindings/display/panel/lvds.yaml | 107 +++ + .../display/panel/mitsubishi,aa104xd12.txt | 47 -- + .../display/panel/mitsubishi,aa104xd12.yaml | 75 ++ + .../display/panel/mitsubishi,aa121td01.txt | 47 -- + .../display/panel/mitsubishi,aa121td01.yaml | 74 ++ + .../display/panel/ortustech,com37h3m05dtc.txt | 12 + + .../display/panel/ortustech,com37h3m99dtc.txt | 12 + + .../bindings/display/panel/panel-common.txt | 101 --- + .../bindings/display/panel/panel-common.yaml | 149 ++++ + .../bindings/display/panel/panel-lvds.txt | 121 --- + .../devicetree/bindings/display/panel/panel.txt | 4 - + .../bindings/display/panel/pda,91-00156-a0.txt | 14 - + .../bindings/display/panel/pda,91-00156-a0.yaml | 31 + + .../panel/raspberrypi,7inch-touchscreen.txt | 49 -- + .../panel/raspberrypi,7inch-touchscreen.yaml | 71 ++ + .../bindings/display/panel/raydium,rm67191.txt | 41 + + .../display/panel/rocktech,jh057n00900.txt | 5 + + .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 - + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 68 ++ + .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 + + .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 + + .../bindings/display/panel/sharp,ls020b1dd01d.txt | 12 + + .../bindings/display/panel/simple-panel.txt | 29 +- + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 - + .../display/panel/tfc,s9700rtwv43tr-01b.yaml | 33 + + .../bindings/display/panel/tpo,tpg110.txt | 70 -- + .../bindings/display/panel/tpo,tpg110.yaml | 101 +++ + .../bindings/display/rockchip/rockchip-lvds.txt | 11 - + .../devicetree/bindings/display/ssd1307fb.txt | 10 + + Documentation/gpu/drivers.rst | 1 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/drm-mm.rst | 40 +- + Documentation/gpu/introduction.rst | 16 + + Documentation/gpu/tinydrm.rst | 30 - + Documentation/gpu/todo.rst | 72 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 107 +++ + MAINTAINERS | 32 +- + drivers/dma-buf/reservation.c | 65 +- + drivers/gpu/drm/Kconfig | 6 + + drivers/gpu/drm/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 6 +- + drivers/gpu/drm/arm/malidp_drv.c | 5 +- + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 5 +- + drivers/gpu/drm/armada/armada_gem.h | 3 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/Makefile | 2 +- + drivers/gpu/drm/ast/ast_dp501.c | 5 +- + drivers/gpu/drm/ast/ast_drv.c | 22 +- + drivers/gpu/drm/ast/ast_drv.h | 46 +- + drivers/gpu/drm/ast/ast_fb.c | 346 -------- + drivers/gpu/drm/ast/ast_main.c | 75 +- + drivers/gpu/drm/ast/ast_mode.c | 47 +- + drivers/gpu/drm/ast/ast_post.c | 7 +- + drivers/gpu/drm/ast/ast_ttm.c | 7 +- + drivers/gpu/drm/ati_pcigart.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 12 +- + drivers/gpu/drm/bochs/bochs.h | 6 +- + drivers/gpu/drm/bochs/bochs_drv.c | 11 +- + drivers/gpu/drm/bochs/bochs_hw.c | 4 + + drivers/gpu/drm/bochs/bochs_kms.c | 9 +- + drivers/gpu/drm/bridge/Kconfig | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 292 +++++-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/sii902x.c | 44 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 ++ + drivers/gpu/drm/bridge/tc358767.c | 673 +++++++++------- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 46 +- + drivers/gpu/drm/cirrus/cirrus.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 45 +- + drivers/gpu/drm/drm_client.c | 61 +- + drivers/gpu/drm/drm_connector.c | 4 +- + drivers/gpu/drm/drm_dma.c | 2 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 18 +- + drivers/gpu/drm/drm_dp_helper.c | 31 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 142 +++- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 51 +- + drivers/gpu/drm/drm_file.c | 9 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 72 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + + drivers/gpu/drm/drm_gem_vram_helper.c | 78 +- + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 139 ++-- + drivers/gpu/drm/drm_legacy_misc.c | 2 +- + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/drm_memory.c | 2 +- + .../gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} | 499 ++++++++---- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 4 + + drivers/gpu/drm/drm_modes.c | 17 +- + drivers/gpu/drm/drm_prime.c | 867 +++++++++++---------- + drivers/gpu/drm/drm_scatter.c | 2 +- + drivers/gpu/drm/drm_syncobj.c | 1 + + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 28 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 - + drivers/gpu/drm/gm12u320/Kconfig | 9 + + drivers/gpu/drm/gm12u320/Makefile | 2 + + drivers/gpu/drm/gm12u320/gm12u320.c | 814 +++++++++++++++++++ + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 6 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 10 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 - + drivers/gpu/drm/i2c/sil164_drv.c | 3 +- + drivers/gpu/drm/i810/i810_dma.c | 17 +- + drivers/gpu/drm/i810/i810_drv.c | 8 +- + drivers/gpu/drm/i810/i810_drv.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 3 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +- + drivers/gpu/drm/imx/imx-drm-core.c | 13 +- + drivers/gpu/drm/imx/imx-ldb.c | 22 +- + drivers/gpu/drm/imx/imx-tve.c | 10 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 8 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 5 +- + drivers/gpu/drm/imx/parallel-display.c | 8 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 75 +- + drivers/gpu/drm/lima/lima_device.c | 41 +- + drivers/gpu/drm/lima/lima_drv.c | 20 +- + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/lima/lima_gem_prime.c | 3 +- + drivers/gpu/drm/lima/lima_object.c | 9 +- + drivers/gpu/drm/lima/lima_object.h | 3 +- + drivers/gpu/drm/lima/lima_vm.h | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 10 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 18 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 35 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- + drivers/gpu/drm/meson/meson_crtc.c | 16 +- + drivers/gpu/drm/meson/meson_drv.c | 33 +- + drivers/gpu/drm/meson/meson_drv.h | 11 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +- + drivers/gpu/drm/meson/meson_overlay.c | 13 +- + drivers/gpu/drm/meson/meson_plane.c | 16 +- + drivers/gpu/drm/meson/meson_registers.h | 2 + + drivers/gpu/drm/meson/meson_vclk.c | 7 +- + drivers/gpu/drm/meson/meson_vclk.h | 4 + + drivers/gpu/drm/meson/meson_venc.c | 10 +- + drivers/gpu/drm/meson/meson_venc.h | 2 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +- + drivers/gpu/drm/meson/meson_viu.c | 7 +- + drivers/gpu/drm/meson/meson_vpp.c | 7 +- + drivers/gpu/drm/meson/meson_vpp.h | 3 + + drivers/gpu/drm/mga/mga_dma.c | 13 +- + drivers/gpu/drm/mga/mga_drv.c | 7 +- + drivers/gpu/drm/mga/mga_drv.h | 27 +- + drivers/gpu/drm/mga/mga_ioc32.c | 3 +- + drivers/gpu/drm/mga/mga_irq.c | 12 +- + drivers/gpu/drm/mga/mga_state.c | 8 +- + drivers/gpu/drm/mga/mga_warp.c | 4 +- + drivers/gpu/drm/mgag200/Makefile | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 40 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 315 -------- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 96 +-- + drivers/gpu/drm/mgag200/mgag200_mode.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +- + drivers/gpu/drm/msm/msm_atomic.c | 8 +- + drivers/gpu/drm/msm/msm_drv.c | 25 +- + drivers/gpu/drm/msm/msm_gem.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.c | 3 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 16 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 - + drivers/gpu/drm/nouveau/nouveau_abi16.c | 6 - + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 - + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 32 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 22 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 + + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 2 + + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-lvds.c | 5 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 359 +++++++++ + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 + + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 668 ++++++++++++++++ + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 75 +- + drivers/gpu/drm/panel/panel-simple.c | 343 +++++++- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 41 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 - + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 + + drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +- + drivers/gpu/drm/pl111/pl111_display.c | 6 +- + drivers/gpu/drm/pl111/pl111_drm.h | 11 +- + drivers/gpu/drm/pl111/pl111_drv.c | 13 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 3 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 9 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 3 + + drivers/gpu/drm/pl111/pl111_vexpress.c | 1 + + drivers/gpu/drm/qxl/qxl_cmd.c | 2 + + drivers/gpu/drm/qxl/qxl_debugfs.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 3 + + drivers/gpu/drm/qxl/qxl_draw.c | 2 + + drivers/gpu/drm/qxl/qxl_drv.c | 15 +- + drivers/gpu/drm/qxl/qxl_drv.h | 7 +- + drivers/gpu/drm/qxl/qxl_gem.c | 1 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 3 + + drivers/gpu/drm/qxl/qxl_irq.c | 4 + + drivers/gpu/drm/qxl/qxl_kms.c | 9 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 16 +- + drivers/gpu/drm/r128/r128_ioc32.c | 3 +- + drivers/gpu/drm/r128/r128_irq.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 6 +- + drivers/gpu/drm/radeon/radeon_prime.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- + drivers/gpu/drm/rockchip/Makefile | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 116 +-- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 29 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 282 ------- + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 22 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 115 ++- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 - + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/scheduler/sched_fence.c | 6 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 - + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_tvout.c | 16 +- + drivers/gpu/drm/stm/drv.c | 5 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +- + drivers/gpu/drm/stm/ltdc.c | 2 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +- + drivers/gpu/drm/sun4i/sun8i_csc.c | 157 +++- + drivers/gpu/drm/sun4i/sun8i_csc.h | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +- + drivers/gpu/drm/tegra/drm.c | 30 +- + drivers/gpu/drm/tegra/gem.c | 7 +- + drivers/gpu/drm/tegra/gem.h | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 24 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +- + drivers/gpu/drm/tinydrm/Kconfig | 23 +- + drivers/gpu/drm/tinydrm/Makefile | 5 - + drivers/gpu/drm/tinydrm/core/Makefile | 4 - + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 207 ----- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 179 ----- + drivers/gpu/drm/tinydrm/hx8357d.c | 64 +- + drivers/gpu/drm/tinydrm/ili9225.c | 185 ++--- + drivers/gpu/drm/tinydrm/ili9341.c | 86 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 93 +-- + drivers/gpu/drm/tinydrm/repaper.c | 61 +- + drivers/gpu/drm/tinydrm/st7586.c | 134 ++-- + drivers/gpu/drm/tinydrm/st7735r.c | 81 +- + drivers/gpu/drm/tve200/tve200_display.c | 8 +- + drivers/gpu/drm/tve200/tve200_drm.h | 15 +- + drivers/gpu/drm/tve200/tve200_drv.c | 8 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_connector.h | 2 + + drivers/gpu/drm/udl/udl_dmabuf.c | 11 +- + drivers/gpu/drm/udl/udl_drv.c | 9 +- + drivers/gpu/drm/udl/udl_drv.h | 11 +- + drivers/gpu/drm/udl/udl_encoder.c | 6 +- + drivers/gpu/drm/udl/udl_fb.c | 15 +- + drivers/gpu/drm/udl/udl_gem.c | 9 +- + drivers/gpu/drm/udl/udl_main.c | 6 +- + drivers/gpu/drm/udl/udl_modeset.c | 6 +- + drivers/gpu/drm/udl/udl_transfer.c | 4 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.h | 13 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 + + drivers/gpu/drm/vboxvideo/Makefile | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 13 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 12 - + drivers/gpu/drm/vboxvideo/vbox_prime.c | 56 -- + drivers/gpu/drm/vc4/vc4_bo.c | 7 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 11 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - + drivers/gpu/drm/vc4/vc4_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.h | 20 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- + drivers/gpu/drm/vc4/vc4_gem.c | 2 + + drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- + drivers/gpu/drm/vc4/vc4_kms.c | 4 +- + drivers/gpu/drm/vc4/vc4_plane.c | 9 +- + drivers/gpu/drm/vc4/vc4_txp.c | 14 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 4 + + drivers/gpu/drm/vgem/vgem_drv.c | 21 +- + drivers/gpu/drm/vgem/vgem_drv.h | 1 - + drivers/gpu/drm/vgem/vgem_fence.c | 24 +- + drivers/gpu/drm/via/via_dma.c | 43 +- + drivers/gpu/drm/via/via_dmablit.c | 41 +- + drivers/gpu/drm/via/via_drv.c | 7 +- + drivers/gpu/drm/via/via_drv.h | 75 +- + drivers/gpu/drm/via/via_irq.c | 54 +- + drivers/gpu/drm/via/via_map.c | 6 +- + drivers/gpu/drm/via/via_mm.c | 7 +- + drivers/gpu/drm/via/via_verifier.c | 22 +- + drivers/gpu/drm/via/via_video.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 2 + + drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + .../gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} | 169 ++-- + drivers/gpu/drm/vkms/vkms_crtc.c | 100 ++- + drivers/gpu/drm/vkms/vkms_drv.c | 50 +- + drivers/gpu/drm/vkms/vkms_drv.h | 44 +- + drivers/gpu/drm/vkms/vkms_gem.c | 1 + + drivers/gpu/drm/vkms/vkms_output.c | 6 +- + drivers/gpu/drm/vkms/vkms_plane.c | 46 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 - + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front.h | 11 +- + drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 8 +- + drivers/gpu/drm/zte/zx_hdmi.c | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 4 +- + drivers/gpu/drm/zte/zx_vga.c | 4 +- + drivers/gpu/drm/zte/zx_vou.c | 5 +- + drivers/video/fbdev/amba-clcd.c | 4 +- + drivers/video/fbdev/au1200fb.c | 5 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/video/fbdev/core/fbmon.c | 96 --- + drivers/video/fbdev/core/modedb.c | 57 -- + drivers/video/fbdev/mmp/fb/mmpfb.c | 1 - + drivers/video/fbdev/nvidia/nv_backlight.c | 2 - + drivers/video/fbdev/nvidia/nv_setup.c | 24 - + drivers/video/fbdev/ssd1307fb.c | 131 +++- + drivers/video/of_display_timing.c | 11 +- + include/drm/bridge/analogix_dp.h | 4 - + include/drm/drm_agpsupport.h | 14 - + include/drm/drm_client.h | 2 + + include/drm/drm_connector.h | 3 + + include/drm/drm_dp_helper.h | 4 + + include/drm/drm_dp_mst_helper.h | 11 + + include/drm/drm_drv.h | 114 ++- + include/drm/drm_gem.h | 18 +- + include/drm/drm_gem_framebuffer_helper.h | 7 - + include/drm/drm_gem_vram_helper.h | 27 +- + include/drm/drm_ioctl.h | 3 + + include/drm/drm_mipi_dbi.h | 188 +++++ + include/drm/drm_mode_config.h | 7 + + include/drm/drm_panel.h | 1 + + include/drm/drm_prime.h | 41 +- + include/drm/drm_vblank.h | 1 - + include/drm/drm_vram_mm_helper.h | 2 + + include/drm/tinydrm/mipi-dbi.h | 117 --- + include/drm/tinydrm/tinydrm-helpers.h | 75 -- + include/linux/fb.h | 3 - + include/linux/reservation.h | 46 +- + include/linux/soc/amlogic/meson-canvas.h | 1 + + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/panfrost_drm.h | 39 + + include/uapi/linux/media-bus-format.h | 3 +- + 473 files changed, 8549 insertions(+), 6294 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpm940b0.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls020b1dd01d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml + delete mode 100644 Documentation/gpu/tinydrm.rst + delete mode 100644 drivers/gpu/drm/ast/ast_fb.c + rename drivers/gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} (65%) + create mode 100644 drivers/gpu/drm/gm12u320/Kconfig + create mode 100644 drivers/gpu/drm/gm12u320/Makefile + create mode 100644 drivers/gpu/drm/gm12u320/gm12u320.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h + delete mode 100644 drivers/gpu/drm/tinydrm/core/Makefile + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c + delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_prime.c + rename drivers/gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} (52%) + create mode 100644 include/drm/drm_mipi_dbi.h + delete mode 100644 include/drm/tinydrm/mipi-dbi.h + delete mode 100644 include/drm/tinydrm/tinydrm-helpers.h +Merging drm-msm/msm-next (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (57bdd4057516 drm/etnaviv: Use devm_platform_ioremap_resource()) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++++++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 9 ++++----- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 7 +++++-- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 5 +++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +++--- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 5 +++-- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 ++ + 10 files changed, 36 insertions(+), 12 deletions(-) +Merging regmap/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (f474808acb3c ALSA: aoa: onyx: always initialize register read value) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + sound/aoa/codecs/onyx.c | 4 +- + sound/firewire/amdtp-am824.c | 134 +- + sound/firewire/amdtp-stream-trace.h | 6 +- + sound/firewire/amdtp-stream.c | 264 ++-- + sound/firewire/amdtp-stream.h | 27 +- + sound/firewire/digi00x/amdtp-dot.c | 112 +- + sound/firewire/fireface/amdtp-ff.c | 105 +- + sound/firewire/fireworks/fireworks_stream.c | 2 +- + sound/firewire/motu/amdtp-motu.c | 155 +- + sound/firewire/tascam/amdtp-tascam.c | 115 +- + sound/hda/hdac_controller.c | 2 + + sound/i2c/other/ak4xxx-adda.c | 7 +- + sound/pci/echoaudio/echoaudio.c | 5 +- + sound/pci/hda/hda_controller.c | 5 +- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_hdmi.c | 265 +++- + sound/usb/Makefile | 1 + + sound/usb/line6/driver.c | 4 +- + sound/usb/mixer.c | 4 + + sound/usb/mixer.h | 4 + + sound/usb/mixer_quirks.c | 7 + + sound/usb/mixer_scarlett_gen2.c | 2075 +++++++++++++++++++++++++++ + sound/usb/mixer_scarlett_gen2.h | 7 + + 23 files changed, 2915 insertions(+), 397 deletions(-) + create mode 100644 sound/usb/mixer_scarlett_gen2.c + create mode 100644 sound/usb/mixer_scarlett_gen2.h +Merging sound-asoc/for-next (33854feb1faa Merge branch 'asoc-5.4' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging include/sound/sof/dai-intel.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/sun8i-a33-codec.txt | 2 +- + include/sound/soc-dai.h | 25 + + include/sound/soc-dapm.h | 2 + + include/sound/soc.h | 4 - + include/sound/sof/dai-intel.h | 3 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 1 + + sound/pci/hda/hda_codec.c | 8 +- + sound/soc/Makefile | 2 +- + sound/soc/bcm/cygnus-pcm.c | 6 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ad193x.c | 19 +- + sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++ + sound/soc/codecs/cs47l35.c | 2 +- + sound/soc/codecs/cs47l90.c | 9 +- + sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++ + sound/soc/codecs/madera.c | 531 ++++- + sound/soc/codecs/madera.h | 10 + + sound/soc/codecs/max98373.c | 34 +- + sound/soc/codecs/max98373.h | 1 + + sound/soc/codecs/mt6358.c | 6 +- + sound/soc/codecs/pcm3168a.c | 8 +- + sound/soc/codecs/rt1308.c | 48 +- + sound/soc/codecs/rt1308.h | 6 +- + sound/soc/codecs/rt5665.c | 8 +- + sound/soc/codecs/rt5677.c | 1 - + sound/soc/codecs/sgtl5000.c | 248 ++- + sound/soc/codecs/sgtl5000.h | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 7 +- + sound/soc/codecs/wcd-clsh-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 3 +- + sound/soc/codecs/wm8955.c | 4 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/codecs/wm_adsp.h | 4 +- + sound/soc/fsl/fsl_esai.c | 262 ++- + sound/soc/fsl/fsl_sai.c | 27 +- + sound/soc/fsl/fsl_sai.h | 7 +- + sound/soc/intel/common/sst-ipc.h | 1 + + sound/soc/intel/skylake/Makefile | 12 +- + sound/soc/intel/skylake/bxt-sst.c | 50 +- + sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- + sound/soc/intel/skylake/cnl-sst.c | 37 +- + sound/soc/intel/skylake/skl-debug.c | 14 +- + sound/soc/intel/skylake/skl-messages.c | 245 ++- + sound/soc/intel/skylake/skl-nhlt.c | 18 +- + sound/soc/intel/skylake/skl-pcm.c | 74 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 8 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 52 +- + sound/soc/intel/skylake/skl-sst-utils.c | 37 +- + sound/soc/intel/skylake/skl-sst.c | 51 +- + sound/soc/intel/skylake/skl-topology.c | 441 ++--- + sound/soc/intel/skylake/skl-topology.h | 43 +- + sound/soc/intel/skylake/skl.c | 54 +- + sound/soc/intel/skylake/skl.h | 102 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 +- + sound/soc/rockchip/rockchip_max98090.c | 1 - + sound/soc/sh/rcar/core.c | 16 +- + sound/soc/sh/rcar/rsnd.h | 12 +- + sound/soc/soc-compress.c | 9 +- + sound/soc/soc-core.c | 316 +-- + sound/soc/soc-dai.c | 407 ++++ + sound/soc/soc-dapm.c | 191 +- + sound/soc/soc-pcm.c | 200 +- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/core.c | 4 +- + sound/soc/sof/intel/hda-codec.c | 50 +- + sound/soc/sof/intel/hda-ctrl.c | 21 +- + sound/soc/sof/intel/hda-dai.c | 38 +- + sound/soc/sof/intel/hda-dsp.c | 100 +- + sound/soc/sof/intel/hda.c | 28 +- + sound/soc/sof/intel/hda.h | 9 +- + sound/soc/sof/ipc.c | 8 +- + sound/soc/sof/loader.c | 14 +- + sound/soc/sof/ops.h | 28 +- + sound/soc/sof/pcm.c | 63 +- + sound/soc/sof/pm.c | 6 +- + sound/soc/sof/sof-pci-dev.c | 3 + + sound/soc/sof/sof-priv.h | 12 +- + sound/soc/sof/topology.c | 3 + + sound/soc/ti/davinci-mcasp.c | 185 +- + 84 files changed, 6153 insertions(+), 1728 deletions(-) + create mode 100644 sound/soc/codecs/cs47l15.c + create mode 100644 sound/soc/codecs/cs47l92.c + create mode 100644 sound/soc/soc-dai.c +Merging modules/modules-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge modules/modules-next +Already up to date. +Merging input/next (c394159310d0 Input: soc_button_array - add support for newer surface devices) +$ git merge input/next +Auto-merging drivers/input/touchscreen/sun4i-ts.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/input/evdev.c | 35 ++--- + drivers/input/input.c | 40 ++++++ + drivers/input/joystick/Kconfig | 10 ++ + drivers/input/joystick/Makefile | 5 +- + drivers/input/joystick/fsia6b.c | 231 ++++++++++++++++++++++++++++++ + drivers/input/misc/Kconfig | 6 +- + drivers/input/misc/soc_button_array.c | 105 ++++++++++++-- + drivers/input/mouse/cyapa.c | 16 +-- + drivers/input/mouse/elan_i2c_core.c | 20 +-- + drivers/input/rmi4/rmi_2d_sensor.c | 1 - + drivers/input/touchscreen/fsl-imx25-tcq.c | 4 +- + drivers/input/touchscreen/mxs-lradc-ts.c | 10 +- + drivers/input/touchscreen/sun4i-ts.c | 3 +- + drivers/input/touchscreen/ts4800-ts.c | 4 +- + drivers/platform/x86/surfacepro3_button.c | 47 ++++++ + include/linux/input.h | 14 ++ + include/uapi/linux/serio.h | 1 + + 18 files changed, 465 insertions(+), 93 deletions(-) + create mode 100644 drivers/input/joystick/fsia6b.c +Merging block/for-next (5b9ddbdf2f36 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (733232f8c852 dm: use printk ratelimiting functions) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (979f97f2771b mmc: host: sdhci: Fix the incorrect soft reset operation when runtime resuming) +$ git merge mmc/next +Auto-merging drivers/mmc/host/sdhci-s3c.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 14 +++-- + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 4 +- + MAINTAINERS | 1 + + drivers/memstick/host/r592.c | 6 +- + drivers/mmc/host/mmci.c | 69 ++++++++++++---------- + drivers/mmc/host/mxs-mmc.c | 4 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-iproc.c | 9 +++ + drivers/mmc/host/sdhci-of-at91.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 16 ++--- + drivers/mmc/host/sdhci-pltfm.c | 4 +- + drivers/mmc/host/sdhci-pxav3.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 2 +- + drivers/mmc/host/sdhci-sprd.c | 2 +- + drivers/mmc/host/sdhci-xenon.c | 2 +- + drivers/mmc/host/sdhci.c | 4 +- + drivers/mmc/host/sdhci.h | 2 +- + 18 files changed, 80 insertions(+), 67 deletions(-) +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9121b1005404] 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 (b5e29aa880be mfd: davinci_voicecodec: Remove pointless #include) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/davinci_voicecodec.c | 9 ++++----- + drivers/mfd/max77620.c | 4 +++- + 2 files changed, 7 insertions(+), 6 deletions(-) +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 (43b84b2883b1 Merge branch 'regulator-5.4' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/act8865-regulator.c | 129 ++++++++++++++++++++++++++++++---- + drivers/regulator/lm363x-regulator.c | 10 +-- + drivers/regulator/rk808-regulator.c | 2 +- + drivers/regulator/stm32-booster.c | 4 -- + 4 files changed, 123 insertions(+), 22 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 (8cf8684e0d24 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging net/ceph/ceph_common.c +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0cd9a0f551f1] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 128 ++++++-- + Documentation/security/keys/request-key.rst | 9 +- + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/md/dm-crypt.c | 2 +- + drivers/nvdimm/security.c | 2 +- + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/crypto/keyinfo.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/key.h | 121 +++---- + include/uapi/linux/keyctl.h | 65 ++++ + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/compat.c | 2 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 2 +- + security/keys/internal.h | 16 +- + security/keys/key.c | 29 +- + security/keys/keyctl.c | 104 ++++-- + security/keys/keyring.c | 27 +- + security/keys/permission.c | 361 +++++++++++++++++++-- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +++-- + security/keys/request_key.c | 34 +- + security/keys/request_key_auth.c | 15 +- + security/selinux/hooks.c | 16 +- + security/smack/smack_lsm.c | 3 +- + 46 files changed, 992 insertions(+), 325 deletions(-) +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +[master d7d2e2d0a98e] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Jul 30 11:42:21 2019 +1000 +Merging selinux/next (5f9e832c1370 Linus 5.3-rc1) +$ 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 (a18670f4617d watchdog: ath79_wdt: fix a typo in the name of a function) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/ath79_wdt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging iommu/next (66929812955b iommu/amd: Add support for X2APIC IOMMU interrupts) +$ 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 (5f9e832c1370 Linus 5.3-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (470062c40eaa dt-bindings: crypto: Convert Allwinner A10 Security Engine to a schema) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +Removing Documentation/devicetree/bindings/crypto/sun4i-ss.txt +Removing Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt +Merge made by the 'recursive' strategy. + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 84 +++++++++++++++++++ + .../devicetree/bindings/bus/sun50i-de2-bus.txt | 40 --------- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 79 ++++++++++++++++++ + .../devicetree/bindings/crypto/sun4i-ss.txt | 23 ------ + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 95 ++++++++++++++++++++++ + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 65 --------------- + 6 files changed, 258 insertions(+), 128 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt + create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt + create mode 100644 Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +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 (1bda625684d2 Merge branch 'spi-5.4' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-sprd-adi.txt | 11 ++- + drivers/spi/spi-dw-mmio.c | 10 +-- + drivers/spi/spi-dw-pci.c | 6 +- + drivers/spi/spi-sprd-adi.c | 92 +++++++++++++++------- + 4 files changed, 78 insertions(+), 41 deletions(-) +Merging tip/auto-latest (397d428ddd0f Merge branch 'locking/core') +$ git merge tip/auto-latest +Removing tools/testing/selftests/x86/mpx-mm.h +Removing tools/testing/selftests/x86/mpx-mini-test.c +Removing tools/testing/selftests/x86/mpx-hw.h +Removing tools/testing/selftests/x86/mpx-dig.c +Removing tools/testing/selftests/x86/mpx-debug.h +Removing arch/x86/kernel/apic/x2apic.h +CONFLICT (modify/delete): arch/x86/include/uapi/asm/types.h deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/include/uapi/asm/types.h left in tree. +Removing arch/x86/include/uapi/asm/termios.h +Removing arch/x86/include/uapi/asm/termbits.h +Removing arch/x86/include/uapi/asm/resource.h +Removing arch/x86/include/uapi/asm/param.h +Removing arch/x86/include/uapi/asm/ipcbuf.h +Removing arch/x86/include/uapi/asm/ioctls.h +Removing arch/x86/include/uapi/asm/ioctl.h +Removing arch/x86/include/uapi/asm/fcntl.h +Removing arch/x86/include/uapi/asm/errno.h +Removing arch/x86/include/asm/ipi.h +Removing arch/x86/include/asm/apic_flat_64.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/include/uapi/asm/types.h +arch/x86/include/uapi/asm/types.h: needs merge +rm 'arch/x86/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master c5da0fd83394] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/entry/common.c | 13 +- + arch/x86/entry/syscall_64.c | 25 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscalltbl.sh | 35 +- + arch/x86/events/core.c | 2 +- + arch/x86/hyperv/hv_init.c | 14 + + arch/x86/include/asm/apic.h | 11 +- + arch/x86/include/asm/apic_flat_64.h | 8 - + arch/x86/include/asm/barrier.h | 3 +- + arch/x86/include/asm/bitops.h | 7 +- + arch/x86/include/asm/bugs.h | 2 + + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/hyperv-tlfs.h | 12 +- + arch/x86/include/asm/ipi.h | 109 -- + arch/x86/include/asm/mmu_context.h | 8 +- + arch/x86/include/asm/mshyperv.h | 5 +- + arch/x86/include/asm/msr.h | 3 +- + arch/x86/include/asm/paravirt.h | 12 - + arch/x86/include/asm/paravirt_types.h | 5 - + arch/x86/include/asm/realmode.h | 1 - + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/special_insns.h | 24 - + arch/x86/include/asm/suspend_64.h | 2 +- + arch/x86/include/asm/syscall.h | 4 + + arch/x86/include/asm/tlbflush.h | 30 +- + arch/x86/include/asm/unistd.h | 6 - + arch/x86/include/uapi/asm/errno.h | 1 - + arch/x86/include/uapi/asm/fcntl.h | 1 - + arch/x86/include/uapi/asm/ioctl.h | 1 - + arch/x86/include/uapi/asm/ioctls.h | 1 - + arch/x86/include/uapi/asm/ipcbuf.h | 1 - + arch/x86/include/uapi/asm/param.h | 1 - + arch/x86/include/uapi/asm/resource.h | 1 - + arch/x86/include/uapi/asm/termbits.h | 1 - + arch/x86/include/uapi/asm/termios.h | 1 - + arch/x86/include/uapi/asm/types.h | 7 - + arch/x86/include/uapi/asm/unistd.h | 2 +- + arch/x86/kernel/apic/apic.c | 162 ++- + arch/x86/kernel/apic/apic_flat_64.c | 66 +- + arch/x86/kernel/apic/apic_noop.c | 18 +- + arch/x86/kernel/apic/apic_numachip.c | 8 +- + arch/x86/kernel/apic/bigsmp_32.c | 9 +- + arch/x86/kernel/apic/ipi.c | 174 ++- + arch/x86/kernel/apic/local.h | 68 + + arch/x86/kernel/apic/probe_32.c | 41 +- + arch/x86/kernel/apic/probe_64.c | 21 +- + arch/x86/kernel/apic/x2apic.h | 9 - + arch/x86/kernel/apic/x2apic_cluster.c | 20 +- + arch/x86/kernel/apic/x2apic_phys.c | 23 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 30 +- + arch/x86/kernel/asm-offsets_64.c | 21 +- + arch/x86/kernel/cpu/amd.c | 21 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/cpu/cpuid-deps.c | 97 +- + arch/x86/kernel/cpu/hygon.c | 21 +- + arch/x86/kernel/crash.c | 2 - + arch/x86/kernel/kgdb.c | 2 +- + arch/x86/kernel/nmi.c | 3 + + arch/x86/kernel/paravirt.c | 4 - + arch/x86/kernel/reboot.c | 7 +- + arch/x86/kernel/smp.c | 88 +- + arch/x86/kernel/smpboot.c | 12 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/power/cpu.c | 4 - + arch/x86/realmode/rm/header.S | 1 - + arch/x86/realmode/rm/trampoline_32.S | 3 - + arch/x86/realmode/rm/trampoline_64.S | 3 - + arch/x86/realmode/rm/trampoline_common.S | 4 - + arch/x86/xen/enlighten_pv.c | 15 - + drivers/hv/hyperv_vmbus.h | 8 +- + include/linux/bitmap.h | 23 + + include/linux/cgroup.h | 1 + + include/linux/cpumask.h | 41 +- + include/linux/cpuset.h | 13 +- + include/linux/lockdep.h | 11 +- + include/linux/sched.h | 5 + + include/linux/sched/deadline.h | 8 + + include/linux/sched/task.h | 6 +- + include/linux/sched/topology.h | 10 + + include/linux/stacktrace.h | 4 +- + include/linux/timerqueue.h | 13 +- + include/uapi/linux/prctl.h | 2 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/cpuset.c | 163 ++- + kernel/cpu.c | 35 +- + kernel/events/core.c | 9 +- + kernel/irq/manage.c | 3 +- + kernel/locking/lockdep.c | 159 ++- + kernel/locking/lockdep_internals.h | 9 +- + kernel/locking/lockdep_proc.c | 8 +- + kernel/locking/rtmutex.c | 6 +- + kernel/rcu/tree.c | 6 +- + kernel/sched/core.c | 115 +- + kernel/sched/deadline.c | 63 + + kernel/sched/fair.c | 173 ++- + kernel/sched/isolation.c | 12 +- + kernel/sched/sched.h | 14 +- + kernel/sched/stats.h | 7 +- + kernel/sched/topology.c | 50 +- + kernel/stacktrace.c | 4 +- + kernel/sys.c | 16 +- + kernel/trace/trace_sched_wakeup.c | 3 +- + lib/bitmap.c | 20 + + lib/timerqueue.c | 30 +- + tools/arch/x86/include/asm/cpufeatures.h | 1 - + tools/testing/selftests/x86/Makefile | 4 +- + tools/testing/selftests/x86/mpx-debug.h | 15 - + tools/testing/selftests/x86/mpx-dig.c | 497 ------- + tools/testing/selftests/x86/mpx-hw.h | 124 -- + tools/testing/selftests/x86/mpx-mini-test.c | 1613 ----------------------- + tools/testing/selftests/x86/mpx-mm.h | 10 - + tools/testing/selftests/x86/syscall_numbering.c | 89 ++ + 113 files changed, 1461 insertions(+), 3282 deletions(-) + delete mode 100644 arch/x86/include/asm/apic_flat_64.h + delete mode 100644 arch/x86/include/asm/ipi.h + delete mode 100644 arch/x86/include/uapi/asm/errno.h + delete mode 100644 arch/x86/include/uapi/asm/fcntl.h + delete mode 100644 arch/x86/include/uapi/asm/ioctl.h + delete mode 100644 arch/x86/include/uapi/asm/ioctls.h + delete mode 100644 arch/x86/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/x86/include/uapi/asm/param.h + delete mode 100644 arch/x86/include/uapi/asm/resource.h + delete mode 100644 arch/x86/include/uapi/asm/termbits.h + delete mode 100644 arch/x86/include/uapi/asm/termios.h + delete mode 100644 arch/x86/include/uapi/asm/types.h + create mode 100644 arch/x86/kernel/apic/local.h + delete mode 100644 arch/x86/kernel/apic/x2apic.h + delete mode 100644 tools/testing/selftests/x86/mpx-debug.h + delete mode 100644 tools/testing/selftests/x86/mpx-dig.c + delete mode 100644 tools/testing/selftests/x86/mpx-hw.h + delete mode 100644 tools/testing/selftests/x86/mpx-mini-test.c + delete mode 100644 tools/testing/selftests/x86/mpx-mm.h + create mode 100644 tools/testing/selftests/x86/syscall_numbering.c +Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/edac-for-next (3123c5c4ca15 edac: altera: Move Stratix10 SDRAM ECC to peripheral) +$ git merge edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/edac/altera_edac.c | 54 ++++++++++++++++++++++++++++++++++++++++++---- + drivers/edac/altera_edac.h | 25 ++++++++++++++++++++- + 3 files changed, 76 insertions(+), 7 deletions(-) +Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (30cd8604323d KVM: x86: Add fixed counters to PMU filter) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (1e0cf16cdad1 KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/emulate_loadstore.c +Auto-merging arch/powerpc/kvm/emulate.c +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/emulate.c | 1 + + arch/powerpc/kvm/emulate_loadstore.c | 6 ------ + 2 files changed, 1 insertion(+), 6 deletions(-) +Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (a1078e821b60 xen: let alloc_xenballooned_pages() fail if not enough memory free) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (f14312a93b34 platform/x86: pcengines-apuv2: use KEY_RESTART for front button) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (af7b65054952 leds: netxbig: Add of_node_put() in netxbig_leds_get_of_pdata()) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-kirkwood-netxbig.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/ams,as3645a.txt | 22 ++- + Documentation/devicetree/bindings/leds/common.txt | 62 ++++++- + .../devicetree/bindings/leds/leds-aat1290.txt | 12 +- + .../devicetree/bindings/leds/leds-an30259a.txt | 22 ++- + .../devicetree/bindings/leds/leds-cr0014114.txt | 26 ++- + .../devicetree/bindings/leds/leds-gpio.txt | 23 ++- + .../devicetree/bindings/leds/leds-lm3601x.txt | 10 +- + .../devicetree/bindings/leds/leds-lm3692x.txt | 9 +- + .../devicetree/bindings/leds/leds-lp8860.txt | 9 +- + .../devicetree/bindings/leds/leds-lt3593.txt | 11 +- + .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 10 +- + Documentation/leds/leds-class.rst | 70 ++++++- + drivers/leds/Kconfig | 6 +- + drivers/leds/led-class-flash.c | 9 +- + drivers/leds/led-class.c | 49 +++-- + drivers/leds/led-core.c | 127 +++++++++++++ + drivers/leds/leds-aat1290.c | 16 +- + drivers/leds/leds-an30259a.c | 29 +-- + drivers/leds/leds-apu.c | 157 ++-------------- + drivers/leds/leds-as3645a.c | 74 +++----- + drivers/leds/leds-cr0014114.c | 33 ++-- + drivers/leds/leds-gpio.c | 26 +-- + drivers/leds/leds-is31fl319x.c | 3 +- + drivers/leds/leds-ktd2692.c | 4 +- + drivers/leds/leds-lm3532.c | 5 +- + drivers/leds/leds-lm3601x.c | 38 ++-- + drivers/leds/leds-lm36274.c | 4 +- + drivers/leds/leds-lm3692x.c | 22 +-- + drivers/leds/leds-lm3697.c | 5 +- + drivers/leds/leds-lp5562.c | 6 +- + drivers/leds/leds-lp8860.c | 35 ++-- + drivers/leds/leds-lt3593.c | 20 +- + drivers/leds/leds-max77650.c | 24 ++- + drivers/leds/leds-netxbig.c | 76 +++++--- + drivers/leds/leds-ns2.c | 21 ++- + drivers/leds/leds-pwm.c | 3 +- + drivers/leds/leds-sc27xx-bltc.c | 22 +-- + drivers/leds/leds.h | 1 + + include/dt-bindings/leds/common.h | 55 +++++- + include/linux/led-class-flash.h | 15 +- + include/linux/leds.h | 79 +++++++- + .../linux/platform_data/leds-kirkwood-netxbig.h | 54 ------ + tools/leds/get_led_device_info.sh | 201 +++++++++++++++++++++ + 43 files changed, 979 insertions(+), 526 deletions(-) + delete mode 100644 include/linux/platform_data/leds-kirkwood-netxbig.h + create mode 100755 tools/leds/get_led_device_info.sh +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 (bbe70e4e4211 fs: kernfs: Fix possible null-pointer dereferences in kernfs_path_from_node_locked()) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/device_link.rst | 4 +- + drivers/base/core.c | 176 +++++++++++++++++-------------- + drivers/base/power/runtime.c | 4 +- + fs/kernfs/dir.c | 9 +- + include/linux/device.h | 4 +- + 5 files changed, 111 insertions(+), 86 deletions(-) +Merging usb/usb-next (2a0f4f16d201 Merge 5.3-rc2 into usb-next) +$ git merge usb/usb-next +Removing include/linux/oxu210hp.h +Removing drivers/usb/host/oxu210hp.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/mediatek,mtu3.txt | 2 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/core/hcd-pci.c | 3 +- + drivers/usb/dwc2/params.c | 5 +- + drivers/usb/dwc3/core.c | 3 +- + drivers/usb/host/oxu210hp-hcd.c | 443 +++++++++++++++++++- + drivers/usb/host/oxu210hp.h | 448 --------------------- + drivers/usb/host/xhci-dbgcap.c | 1 - + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-mem.c | 1 - + drivers/usb/typec/mux.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 6 +- + include/linux/oxu210hp.h | 8 - + tools/usb/usbip/libsrc/usbip_common.c | 6 +- + tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- + 15 files changed, 458 insertions(+), 481 deletions(-) + delete mode 100644 drivers/usb/host/oxu210hp.h + delete mode 100644 include/linux/oxu210hp.h +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 (609488bc979f Linux 5.3-rc2) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (67de843e3158 serial/8250: Add support for NI-Serial PXI/PXIe+485 devices) +$ git merge tty/tty-next +Auto-merging drivers/tty/hvc/hvcs.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/st,stm32-usart.txt | 5 + + Documentation/driver-api/serial/n_gsm.rst | 16 +- + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/isicom.c | 1 - + drivers/tty/n_gsm.c | 19 +- + drivers/tty/nozomi.c | 4 +- + drivers/tty/serial/8250/8250_exar.c | 7 +- + drivers/tty/serial/8250/8250_lpss.c | 10 +- + drivers/tty/serial/8250/8250_omap.c | 11 +- + drivers/tty/serial/8250/8250_pci.c | 295 ++++++++++++++++++++- + drivers/tty/serial/fsl_lpuart.c | 25 +- + drivers/tty/serial/icom.c | 2 - + drivers/tty/serial/stm32-usart.c | 55 +++- + 13 files changed, 394 insertions(+), 60 deletions(-) +Merging char-misc/char-misc-next (6de465a50a90 Merge 5.3-rc2 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-intel_th-devices-msc | 3 +- + .../{sysfs-class-mic.txt => sysfs-class-mic} | 0 + MAINTAINERS | 1 + + drivers/char/ppdev.c | 2 +- + drivers/fpga/dfl-afu-main.c | 14 +- + drivers/fpga/dfl-fme-main.c | 7 +- + drivers/hwtracing/intel_th/Makefile | 3 + + drivers/hwtracing/intel_th/msu-sink.c | 116 +++++ + drivers/hwtracing/intel_th/msu.c | 537 +++++++++++++++++---- + drivers/hwtracing/intel_th/msu.h | 20 +- + drivers/misc/cardreader/alcor_pci.c | 6 +- + drivers/misc/eeprom/ee1004.c | 6 +- + drivers/misc/eeprom/max6875.c | 6 +- + drivers/misc/fastrpc.c | 5 +- + drivers/misc/mic/card/mic_x100.c | 28 +- + include/linux/intel_th.h | 79 +++ + 16 files changed, 695 insertions(+), 138 deletions(-) + rename Documentation/ABI/testing/{sysfs-class-mic.txt => sysfs-class-mic} (100%) + create mode 100644 drivers/hwtracing/intel_th/msu-sink.c + create mode 100644 include/linux/intel_th.h +Merging extcon/extcon-next (21be848ebc5f extcon: axp288: Use for_each_set_bit() in axp288_extcon_log_rsi()) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 2 +- + .../devicetree/bindings/extcon/extcon-fsa9480.txt | 4 ++- + drivers/extcon/extcon-arizona.c | 2 +- + drivers/extcon/extcon-axp288.c | 16 ++++++------ + drivers/extcon/extcon-fsa9480.c | 1 + + drivers/extcon/extcon-gpio.c | 29 ++++++++++++++-------- + drivers/extcon/extcon-max77843.c | 6 ++--- + drivers/extcon/extcon-sm5502.c | 2 +- + 8 files changed, 38 insertions(+), 24 deletions(-) +Merging soundwire/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (e59fc5252911 staging: rtl8192*: display ESSIDs using %pE) +$ git merge staging/staging-next +Auto-merging drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +Removing drivers/staging/rtl8723bs/hal/hal_phy.c +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/ion.c | 36 - + drivers/staging/android/ion/ion.h | 10 +- + drivers/staging/comedi/drivers/daqboard2000.c | 7 +- + drivers/staging/erofs/data.c | 33 + + drivers/staging/erofs/internal.h | 7 +- + drivers/staging/erofs/super.c | 7 +- + drivers/staging/erofs/unzip_pagevec.h | 11 +- + drivers/staging/erofs/unzip_vle.c | 16 +- + drivers/staging/erofs/unzip_vle.h | 8 +- + drivers/staging/erofs/xattr.h | 17 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 39 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 4 + + drivers/staging/greybus/audio_manager.c | 2 +- + drivers/staging/greybus/i2c.c | 22 +- + drivers/staging/kpc2000/kpc2000_spi.c | 3 +- + drivers/staging/most/cdev/cdev.c | 4 +- + drivers/staging/most/dim2/dim2.c | 19 - + drivers/staging/most/dim2/hal.c | 99 ++- + drivers/staging/most/dim2/hal.h | 4 - + drivers/staging/mt7621-pci/pci-mt7621.c | 12 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 19 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 12 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 +- + .../staging/rtl8188eu/include/hal8188e_phy_reg.h | 881 --------------------- + drivers/staging/rtl8188eu/include/hal_intf.h | 2 +- + drivers/staging/rtl8188eu/include/mlme_osdep.h | 1 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8192u/r8192U_dm.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 2 +- + drivers/staging/rtl8712/recv_linux.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 6 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 5 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 16 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 34 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 8 +- + drivers/staging/rtl8712/rtl871x_mp.c | 9 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 10 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 2 +- + drivers/staging/rtl8712/rtl871x_recv.c | 3 +- + drivers/staging/rtl8712/rtl871x_recv.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 117 ++- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 5 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_phy.c | 157 ---- + drivers/staging/rtl8723bs/hal/odm.c | 17 +- + drivers/staging/rtl8723bs/hal/odm.h | 4 - + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 7 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 - + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 17 - + drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 3 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 13 +- + drivers/staging/vt6656/rxtx.c | 10 +- + drivers/staging/vt6656/usbpipe.c | 2 +- + drivers/staging/wilc1000/wilc_mon.c | 3 +- + drivers/staging/wilc1000/wilc_netdev.c | 1 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +- + drivers/staging/wilc1000/wilc_wlan.c | 14 +- + drivers/staging/wilc1000/wilc_wlan.h | 2 - + drivers/staging/wilc1000/wilc_wlan_cfg.c | 4 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 210 ++--- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + 85 files changed, 374 insertions(+), 1733 deletions(-) + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_phy.c +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 (f4c255f1a747 dmaengine: dma-jz4780: Break descriptor chains on JZ4740) +$ git merge slave-dma/next +Removing include/linux/omap-dmaengine.h +Removing include/linux/edma.h +Merge made by the 'recursive' strategy. + drivers/dma/bcm2835-dma.c | 4 ++- + drivers/dma/dma-jz4780.c | 15 +++++++-- + drivers/dma/tegra20-apb-dma.c | 75 ++++++++++++++++++++++++++++++++++++++---- + drivers/dma/ti/edma.c | 5 +-- + drivers/dma/ti/omap-dma.c | 3 +- + include/linux/edma.h | 29 ---------------- + include/linux/omap-dma.h | 2 -- + include/linux/omap-dmaengine.h | 18 ---------- + 8 files changed, 88 insertions(+), 63 deletions(-) + delete mode 100644 include/linux/edma.h + delete mode 100644 include/linux/omap-dmaengine.h +Merging cgroup/for-next (a581563f1bef cgroup: minor tweak for logic to get cgroup css) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging scsi/for-next (20122994e38a scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG) +$ git merge scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (838c1efc6a0a scsi: ufs: change msleep to usleep_range) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_lib.c +Merge made by the 'recursive' strategy. + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/scsi_lib.c | 37 +++++++++++++-- + drivers/scsi/ufs/ufshcd.c | 105 ++++++++++++++++++++++++------------------- + drivers/scsi/ufs/ufshcd.h | 42 ++++++++++++----- + drivers/scsi/virtio_scsi.c | 55 ++++++++++++++++------- + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_host.h | 16 ++++++- + 7 files changed, 182 insertions(+), 78 deletions(-) +Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/qcom_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging gpio/for-next (d2a561ae1961 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + arch/unicore32/kernel/irq.c | 1 - + drivers/gpio/gpio-bd70528.c | 4 +- + drivers/gpio/gpio-max77650.c | 1 + + drivers/gpio/gpiolib-of.c | 114 +++++++++++++++++++++++++++++++++++ + drivers/gpio/gpiolib-of.h | 45 ++++++++++++++ + drivers/gpio/gpiolib.c | 136 +++++++----------------------------------- + drivers/gpio/gpiolib.h | 27 --------- + include/linux/gpio/consumer.h | 64 ++++++++++---------- + 8 files changed, 217 insertions(+), 175 deletions(-) + create mode 100644 drivers/gpio/gpiolib-of.h +Merging gpio-brgl/gpio/for-next (66ad66293ede gpio: em: use a helper variable for &pdev->dev) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-em.c | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) +Merging pinctrl/for-next (87cdf194fbfb Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 40 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 45 +- + .../bindings/pinctrl/ingenic,pinctrl.txt | 17 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 5 +- + Documentation/driver-api/pinctl.rst | 6 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 92 ++- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 12 +- + drivers/pinctrl/aspeed/pinmux-aspeed.c | 2 +- + drivers/pinctrl/aspeed/pinmux-aspeed.h | 5 +- + drivers/pinctrl/pinctrl-ingenic.c | 755 +++++++++++++++++++-- + drivers/pinctrl/qcom/pinctrl-msm.c | 27 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 76 +-- + 13 files changed, 876 insertions(+), 208 deletions(-) +Merging pinctrl-samsung/for-next (5f9e832c1370 Linus 5.3-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 (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) +$ 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 (5f9e832c1370 Linus 5.3-rc1) +$ 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/include/uapi/asm/unistd.h +CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h +Auto-merging arch/riscv/Kconfig +Resolved 'arch/riscv/include/uapi/asm/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4291c647261e] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. +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 (8f1f98572c69 coresight: tmc-etr: Check if non-secure access is enabled) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++++----------- + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +++------ + drivers/hwtracing/coresight/coresight-etm4x.c | 14 +++++---- + drivers/hwtracing/coresight/coresight-funnel.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 10 +++---- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 26 +++++++++-------- + drivers/hwtracing/coresight/coresight-tmc.c | 12 ++++++++ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +++ + 9 files changed, 67 insertions(+), 48 deletions(-) +Merging rtc/rtc-next (06c8e550a84e rtc: s5m: convert to i2c_new_dummy_device) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rtc/trivial-rtc.yaml | 2 -- + drivers/rtc/rtc-imxdi.c | 4 +--- + drivers/rtc/rtc-isl12026.c | 6 +++--- + drivers/rtc/rtc-max77686.c | 8 ++++---- + drivers/rtc/rtc-mxc_v2.c | 4 +--- + drivers/rtc/rtc-s35390a.c | 8 ++++---- + drivers/rtc/rtc-s5m.c | 6 +++--- + 7 files changed, 16 insertions(+), 22 deletions(-) +Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 1 - + 1 file changed, 1 deletion(-) +Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) +$ git merge kspp/for-next/kspp +Auto-merging lib/test_stackinit.c +Merge made by the 'recursive' strategy. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init) +$ git merge fsi/next +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (341f8ae0f820 dt-bindings: nvmem: SID: Fix the examples node names) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/meson-mx-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c +Auto-merging drivers/nvmem/meson-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c +Auto-merging drivers/nvmem/Kconfig +Auto-merging Documentation/devicetree/bindings/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 '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 --no-edit -v -a +[master 4e16cee372a8] Merge remote-tracking branch 'nvmem/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/nvmem/meson-efuse.c | 2 +- + drivers/nvmem/meson-mx-efuse.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +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 (2a9321337b74 pidfd: add pidfd_wait tests) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Merge made by the 'recursive' strategy. + include/linux/pid.h | 4 + + include/uapi/linux/wait.h | 1 + + kernel/exit.c | 33 +++- + kernel/fork.c | 8 + + kernel/signal.c | 7 +- + tools/testing/selftests/pidfd/pidfd.h | 25 +++ + tools/testing/selftests/pidfd/pidfd_test.c | 14 -- + tools/testing/selftests/pidfd/pidfd_wait.c | 271 +++++++++++++++++++++++++++++ + 8 files changed, 344 insertions(+), 19 deletions(-) + create mode 100644 tools/testing/selftests/pidfd/pidfd_wait.c +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 (cc374377a19d mm/hmm: remove hmm_range vma) +$ git merge hmm/hmm +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 19 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 52 +++++++- + include/linux/hmm.h | 138 +++----------------- + mm/hmm.c | 223 +++++++++----------------------- + 7 files changed, 147 insertions(+), 303 deletions(-) +Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt | 5 +---- + .../devicetree/bindings/fpga/altera-freeze-bridge.txt | 5 +---- + .../devicetree/bindings/fpga/altera-hps2fpga-bridge.txt | 5 +---- + Documentation/devicetree/bindings/fpga/fpga-bridge.txt | 13 +++++++++++++ + .../devicetree/bindings/fpga/xilinx-pr-decoupler.txt | 8 ++------ + MAINTAINERS | 2 +- + drivers/fpga/altera-cvp.c | 3 ++- + drivers/fpga/altera-pr-ip-core-plat.c | 4 +++- + drivers/fpga/altera-pr-ip-core.c | 4 +--- + include/linux/fpga/altera-pr-ip-core.h | 2 +- + 10 files changed, 26 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/fpga-bridge.txt +$ git am -3 ../patches/powerpc_kvm-Fall-through-switch-case-explicitly.patch +Applying: powerpc/kvm: Fall through switch case explicitly +Merging akpm-current/current (2d8c3d2fb959 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging mm/vmalloc.c +Auto-merging mm/shmem.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging kernel/signal.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/cpumask.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/readpage.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/mips/include/asm/vdso/vdso.h +Auto-merging arch/arm/mm/dma-mapping.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-slab | 13 +- + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arm/include/asm/xen/page-coherent.h | 3 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/flush.c | 7 +- + arch/arm64/include/asm/xen/page-coherent.h | 3 +- + arch/arm64/mm/flush.c | 3 +- + arch/ia64/mm/init.c | 2 +- + arch/mips/include/asm/vdso/vdso.h | 1 + + arch/mips/include/uapi/asm/mman.h | 3 + + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/mm/book3s64/iommu_api.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/x86/mm/pat_rbtree.c | 19 +- + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/acpi/scan.c | 3 + + drivers/base/memory.c | 1 + + drivers/base/node.c | 39 ++-- + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 5 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- + drivers/infiniband/sw/siw/siw_mem.c | 8 +- + drivers/misc/sram-exec.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 3 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 8 +- + fs/aio.c | 9 +- + fs/btrfs/extent_io.c | 14 +- + fs/buffer.c | 56 +++++- + fs/coredump.c | 44 ++++- + fs/ext4/readpage.c | 9 + + fs/f2fs/data.c | 9 + + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 ++- + fs/io_uring.c | 2 +- + fs/jbd2/journal.c | 2 - + fs/jbd2/transaction.c | 12 -- + fs/mpage.c | 9 + + fs/ocfs2/alloc.c | 20 +- + fs/ocfs2/aops.c | 35 +++- + fs/ocfs2/dlm/dlmunlock.c | 23 ++- + fs/ocfs2/file.c | 10 +- + fs/ocfs2/journal.h | 11 +- + fs/ocfs2/xattr.c | 3 - + fs/proc/page.c | 40 ++-- + fs/proc/task_mmu.c | 2 +- + fs/ramfs/inode.c | 12 ++ + include/asm-generic/getorder.h | 50 ++--- + include/linux/cpumask.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/hugetlb.h | 2 +- + include/linux/interval_tree_generic.h | 22 +-- + include/linux/jbd2.h | 2 - + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 26 +++ + include/linux/memremap.h | 6 + + include/linux/mm.h | 31 ++- + include/linux/mm_types.h | 11 +- + include/linux/page-flags-layout.h | 18 +- + include/linux/rbtree_augmented.h | 88 +++++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 62 ------ + include/linux/string.h | 50 ++++- + include/linux/swap.h | 2 + + include/linux/vmalloc.h | 20 +- + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + include/trace/events/vmscan.h | 71 +++++-- + include/trace/events/writeback.h | 38 ++-- + include/uapi/asm-generic/mman-common.h | 3 + + ipc/msg.c | 18 +- + kernel/Makefile | 1 - + kernel/debug/debug_core.c | 31 ++- + kernel/dma/remap.c | 2 +- + kernel/events/uprobes.c | 68 +++++-- + kernel/hung_task.c | 94 +++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 8 + + kernel/sched/psi.c | 2 + + kernel/signal.c | 2 +- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 6 + + lib/Kconfig.kasan | 11 +- + lib/Makefile | 3 +- + lib/genalloc.c | 5 +- + lib/iov_iter.c | 2 +- + lib/math/rational.c | 63 ++++-- + lib/rbtree_test.c | 26 +-- + lib/string.c | 12 +- + lib/test_meminit.c | 2 +- + mm/Makefile | 1 + + mm/compaction.c | 50 ++--- + mm/filemap.c | 29 ++- + mm/gup.c | 132 ++++++------- + mm/hugetlb_cgroup.c | 2 +- + mm/internal.h | 2 +- + mm/kasan/common.c | 10 +- + mm/khugepaged.c | 3 - + mm/kmemleak.c | 2 +- + mm/ksm.c | 18 -- + mm/madvise.c | 274 +++++++++++++++++++++++++- + mm/memcontrol.c | 135 ++++++++++++- + mm/memory-failure.c | 3 - + mm/memory.c | 3 +- + mm/memory_hotplug.c | 34 +--- + mm/mempolicy.c | 103 +++++++--- + {kernel => mm}/memremap.c | 44 +++++ + mm/migrate.c | 60 ++---- + mm/mmap.c | 72 ++++--- + mm/nommu.c | 2 +- + mm/oom_kill.c | 74 +++---- + mm/page_alloc.c | 2 +- + mm/page_io.c | 11 +- + mm/page_poison.c | 2 +- + mm/page_vma_mapped.c | 3 +- + mm/readahead.c | 24 ++- + mm/rmap.c | 21 +- + mm/shmem.c | 8 +- + mm/slab.h | 64 ++++++ + mm/slab_common.c | 37 ++++ + mm/slob.c | 2 +- + mm/slub.c | 20 +- + mm/sparse.c | 16 +- + mm/swap.c | 56 +++++- + mm/swap_state.c | 2 +- + mm/swapfile.c | 4 +- + mm/util.c | 15 +- + mm/vmalloc.c | 81 +++++--- + mm/vmscan.c | 201 +++++++++++++++---- + mm/z3fold.c | 14 +- + mm/zpool.c | 16 ++ + mm/zsmalloc.c | 19 +- + mm/zswap.c | 8 +- + net/xdp/xdp_umem.c | 9 +- + net/xdp/xsk.c | 2 +- + scripts/checkpatch.pl | 36 ++-- + tools/include/linux/rbtree.h | 71 ++++--- + tools/include/linux/rbtree_augmented.h | 119 +++++++---- + tools/lib/rbtree.c | 37 +--- + tools/testing/selftests/cgroup/cgroup_util.c | 3 +- + usr/Makefile | 3 + + 151 files changed, 2393 insertions(+), 1073 deletions(-) + rename {kernel => mm}/memremap.c (88%) +$ 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: treewide: clarify pgtable_page_{ctor,dtor}() naming +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 60e47d61fcf1...3d4291c43c16 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3d4291c43c16 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/vm/split_page_table_lock.rst | 10 +++++----- + arch/arc/include/asm/pgalloc.h | 4 ++-- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/ia64/include/asm/pgalloc.h | 4 ++-- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +++--- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +++--- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/microblaze/include/asm/pgalloc.h | 4 ++-- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +++--- + arch/powerpc/mm/pgtable-frag.c | 6 +++--- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +++--- + arch/sh/include/asm/pgalloc.h | 6 +++--- + arch/sparc/mm/init_64.c | 4 ++-- + arch/sparc/mm/srmmu.c | 4 ++-- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 ++-- + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + include/asm-generic/pgalloc.h | 8 ++++---- + include/linux/mm.h | 4 ++-- + 31 files changed, 58 insertions(+), 57 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..b32afc818a3e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190730 |