diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-10-04 15:56:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-10-04 15:56:02 +1000 |
| commit | 311ef88adfa3b69c40234bf3000d1269e718919a (patch) | |
| tree | eedc20ee1370598cfbae405cdc9916ef3925bb95 | |
| parent | 836b1562d664e08f96f019229c6c8b606d53ce7f (diff) | |
| download | linux-311ef88adfa3b69c40234bf3000d1269e718919a.tar.gz linux-311ef88adfa3b69c40234bf3000d1269e718919a.tar.xz | |
Add linux-next specific files for 20191004next-20191004
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 315 | ||||
| -rw-r--r-- | Next/Trees | 317 | ||||
| -rw-r--r-- | Next/merge.log | 3824 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4459 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..60a4844a5c1b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,315 @@ +Name SHA1 +---- ---- +origin cc3a7bfe62b947b423fcb2cfe89fcba92bf48fa3 +fixes 04e6dac68d9b7c4c5e8579b8e435c3b7ec945b7c +kbuild-current d159d87700e9abbbfa5bc3e000344af81d9bda0d +arc-current 41277ba7eb4ef344a807cfb0f4319151abc9ffa3 +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes bcec1221c945baeb30200ce52abde93be5fb1be5 +arm64-fixes a2b99dcac36c332d4a49184716fc2a67dc1bdbb1 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes 253c892193ab58da6b1d94371285971b22c63260 +s390-fixes 9f494438d4bc4746831cb5289b9836c18e4bbf96 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 3afb0961884046c8fb4acbce65139088959681c8 +bpf 98beb3edeb974e906a81f305d88f7bc96b2ec83e +ipsec 68ce6688a5baefde30914fc07fc27292dbbe8320 +netfilter 134cc4cefad34d8d24670d8a911b59c3b89c6731 +ipvs 34a4c95abd25ab41fb390b985a08a651b1fa0b0f +wireless-drivers c91a9cfe9f6d136172a52ff6e01b3f83ba850c19 +mac80211 569aad4fcd82cba64eb10ede235d330a00f0aa09 +rdma-fixes b66f31efbdad95ec274345721d99d1d835e6de01 +sound-current f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc-fixes bbb90c4ed03bc0ca3ac8908d1b1c21fd0f2ea9eb +regmap-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +regulator-fixes c3f1e312854c1de03f59da2997075c182145573e +spi-fixes 6efab62559b19f8a38668b363d3b554a809a33bb +pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +driver-core.current 82af5b6609673f1cc7d3453d0be3d292dfffc813 +tty.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes 5eb3f4b87a0e7e949c976f32f296176a06d1a93b +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current 22d67a01d8d89552b989c9651419824bb4111200 +char-misc.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +input-current bd3b8480237680b5967aee3c814b92b2fd87a582 +crypto-current f703964fc66804e6049f2670fc11045aa8359b1a +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes ce3a677802121e038d2f062e90f96f84e7351da0 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 04cbfba6208592999d7bfe6609ec01dc3fde73f5 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 25b69a889b638b0b7e51e2c4fe717a66bec0e566 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes f90ec6cdf674248dcad85bf9af6e064bf472b841 +kvm-fixes fd3edd4a9066f28de99a16685a586d68a9f551f8 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 6bbfdcbc8e459acda67e32f520f7ecddc391afe9 +nvdimm-fixes 4c806b897d6075bfa5067e524fb058c57ab64e7b +btrfs-fixes a73d7fe3072f537ca987f0a060261aefcadd1f36 +vfs-fixes d4f4de5e5ef8efde85febb6876cd3c8ab1631999 +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +samsung-krzk-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes f437ade3296bacaddb6d7882ba0515940f01daf4 +scsi-fixes 9bc6157f5fd0e898c94f3018d088a3419bde0d8f +drm-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +amdgpu-fixes c0e70e10b11b1b7ca0f537e7ce4404a0459cdc7c +drm-intel-fixes 485f682be9fc8d41376936a3b01423edd07b9a75 +mmc-fixes faf97b84fa86d40eba5a30e9071dfb55133fb1b7 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +hyperv-fixes 83b50f83a96899f30c6369ef5988412fa2354ab2 +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 922b0375fc93fb1a20c5617e37c389c26bbccb70 +pidfd-fixes 78f6face5af344f12f4bd48b32faa6f499a06f36 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 02dc96ef6c25f990452c114c59d75c368a1f4c8f +gpio-intel-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-intel-fixes 260996c30f4f3a732f45045e3e0efe27017615e4 +erofs-fixes 65aa35c93cc014c72bae944675ea6e88c47a5497 +drm-misc-fixes b6559bf3ac32acfe34e17c73d68581e7f7415785 +kspp-gustavo 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild 8c0c37466a7bbeb8e41901eeab5cb84958bb3222 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm 3a6d5fc4376059d0f4047b58170325df9bd90e18 +arm64 e376897f424a1c807779a2635f62eb02d7e382f9 +arm-perf c8b0de762e0b7cf9f51ad13b19bd279809317f37 +arm-soc b7f1866c17825e1268e87adeae2fb092e2f9480d +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 1811b8867712da7812d6a71bce935681efe0ddb7 +aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd +at91 9072e308f6981b0db8f3699b3528e0c09f0e3b91 +bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1 +imx-mxs a70642cb3c1dd4a0c1545f6eccea787985fcfa7c +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 153e97d3bdf3549705d352ae49ce9d8fea2262c8 +omap 75e66cd99933cdcd8c89cb1a31f207370a91243d +qcom 63e5846442478bbd493377aee59ed817226c6475 +renesas ae688e1720fd387de34f2140a735917411672bf1 +renesas-geert aca0770d9702b007a9dc8d5ec5adc2f6df5c5c01 +reset 8c2def0f06555354ba6909fd591e1550e2f14161 +rockchip 7157e50bf728367644db37d6c52f5563323a6719 +samsung-krzk 2924a93b4c2b1934c0ec59d28f46814a83259f11 +scmi 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +sunxi f29e294b3f537368ae355019cb1eabfff00b6a82 +tegra d40c8de825cc75c582fef9627281a0b87d89518f +clk 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky e2c750853b66cf94b46430b5eaa4454daa19a138 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 0f1979b402df5f0dd86425830ddaa191d70f3655 +m68knommu 372ea263b3d9cdeb70f8cffa025b2e0875e51b62 +microblaze 7cca9b8b7c5bcc56d627851550840586a25aaa1b +mips 05d013a0366d50f4f0dbebf8c1b22b42020bf49a +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd e563af53af8bf17e4326eeac9f6a95cc6964a40f +powerpc 45824fc0da6e46cc5d563105e1eaaf3098a686f9 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5 +risc-v 9ce06497c2722a0f9109e4cc3ce35b7a69617886 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 ab5758848039de9a4b249d46e4ab591197eebaf2 +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 73625ed66389d4c620520058d828f43a93ab4d0c +xtensa ede62d7397ec546b7d82c7bc4ebd201681e48020 +fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835 +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave f41d3117280a8b0050a4fdc3936effb3305c3700 +ceph 3ee5a7015c8b7cb4de21f7345f8381946f2fce55 +cifs a860055e6b09299507ec42fe96b02149fc8c754e +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +ext3 0f7dbaee76f40c0089b573f56b262ce3be92a24a +ext4 040823b5372b445d1d9483811e85a24d71314d33 +f2fs 619e17cf75dd58905aa67ccd494a6ba5f19d6cc6 +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nfs-anna a8fd0feeca35cb8f9ddd950191f4aeb777f52f89 +nfsd e41f9efb85d38d95744b9f35b9903109032b93d4 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 88d32d3983e72f2a7de72a49b701e2529c48e9c1 +iomap 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d +djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk c38822ab9bd624e6f99bbc2576aa04151bff93f4 +pci da9c3eaa31f2d73853b0b71034cceeee49633fab +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid d789dc30163d1d10c3e0e0088bf461abdfc53582 +i2c 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +i3c f12b524ea3865805f7aa590616127f706149bf02 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 56ef4d6aa440533ace3d7c2d45b1a7af4b9f5c00 +jc_docs 185271a1fa0720110d26200b44cc36c02210604c +v4l-dvb 503e59365dd134b2c63864f14e2de0476284b003 +v4l-dvb-next 167f4555184b552f04e7274d1b23e4a9d39a0d58 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 315ea754a4c4b180c262041dbba6c8c9808d53c5 +cpufreq-arm f75d2accca7785657311653c125bb22f342dc5d9 +cpupower 7e5705c635ecfccde559ebbbe1eaf05b5cc60529 +opp 071afa50609d46f2f760851b90696f9a09714d24 +thermal 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma f3fceba5da5e149ecd8e58c1e1c60464629de27b +net-next 9077f052abd5391a866dd99e27212213648becef +bpf-next c588146378962786ddeec817f7736a53298a7b01 +ipsec-next 02dc96ef6c25f990452c114c59d75c368a1f4c8f +mlx5-next fc603294267f890b34684588f6980ea8c7b72ecf +netfilter-next fab401e1ee96efc58dc3891c6a9e9ee3cc6ba0f8 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e5dc8d0d2672f54fb46602ff6ffde28514bc5ff0 +wireless-drivers-next 97ef12263fce2835dfbc01d1d86b8c5fd711712f +bluetooth 840aff3994c89f6a84373ba5b3c3e8ea3e9b37f0 +mac80211-next 02dc96ef6c25f990452c114c59d75c368a1f4c8f +gfs2 f0b444b349e33ae0d3dd93e25ca365482a5d17d4 +mtd 2cfcfadb8e1380938d6631cffa4fa567b13f52b2 +nand f480b969448ee3896f55ef6d037ad4a2df3914bf +spi-nor 9607af6f857ff062b29562fc1fe36d22b16b9d27 +crypto 9575d1a5c0780ea26ff8dd29c94a32be32ce3c85 +drm 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +amdgpu c51785b9be2bf62fa750e1854768b4d27de4c039 +drm-intel 458863e08e13ecf22b9ba1ee6d4baba0ce9990ea +drm-tegra 9d5a549872651fc42f118e7b69bebaa37a72520c +drm-misc 4092de1ba34eb376791809fb366bc15f8a9e0b7c +drm-msm 9f614197c744002f9968e82c649fdf7fe778e1e7 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 +regmap 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +sound f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc 18762dd37fe7d76a72a8155ebaf42b02fcb8425c +modules 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +input 463fa44eec2fef50d111ed0199cf593235065c04 +block dd8f920bbca1527eb989026ed2274a5bf8cd7f33 +device-mapper afa179eb603847494aa5061d4f501224a30dd187 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 25812fcf74030d9c1be8b898573eaf28de21efee +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 81281b0a477cfe4da7389c092f27d9bfec24efed +backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08 +battery 7f7378618b4103c083db7de5017df958f8ada070 +regulator f9f6bfdb3c19fb9efc20f09ecd946a0220558d78 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 1f96e0f129eb2bea15a00c154eee8b85aa181d1a +selinux 3e3e24b42043eceb97ed834102c2d094dfd7aaa6 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo dc6b8f4f1579ecae182f4d933872cf41870e6c2d +tpmdd e13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu 142dfcda5a35555906946912713885960cbaf1db +vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f +audit 245d73698ed7abdc7e520dfa38048bb80ce89571 +devicetree 7329c06816a4a62c68c09a16d76d49d981f9f4e3 +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi 18b9802df190e9b28aa30d9ee5316d31e42d3710 +tip a5b576bfb3ba85d3e356f9900dce1428d4760582 +clockevents befd04abfbe4b933515dddb5659d0744be9dba6a +edac f05390d30e20cccd8f8de981dee42bcdd8d2d137 +irqchip bb0fed1c60cccbe4063b455a7228818395dac86e +ftrace 8ed4889eb83179dbc9a105cfed65cc42ecb61097 +rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672 +kvm fd3edd4a9066f28de99a16685a586d68a9f551f8 +kvm-arm 14933b51fbe7ee8fcf8d09b941c1d05ce84cc86d +kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69 +kvms390 0af2889f89bbb8bdab463862c59ceb5586f290eb +xen-tip a8fabb38525c51a094607768bac3ba46b3f4a9d5 +percpu 69f98a60cdbb22aeb565044b858eee4930502a7c +workqueues 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 +drivers-x86 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +chrome-platform e6679fd1e2fc253f62bbea13b76d9b6a8f90c68e +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 7ae4717cb9cbb22338962947266fa2bbb2fe8dcf +ipmi c9acc3c4f8e42ae538aea7f418fddc16f257ba75 +driver-core 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d +usb-serial 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-chipidea-next f14ac41f977fffd13971ad2dd63f348c112cf133 +phy-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +tty 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +char-misc 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +extcon e81b88932985c9134d410f4eaaaa9b81a3b4bd0c +soundwire dfcff3f8a5f18a0cfa233522b5647c2e6035fcb5 +thunderbolt 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging 9cc05ed4df03a60c8119b49e66f8b47436d89c27 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 6311b6521bcc804e4d2fd45a5640562a7b8b5241 +slave-dma c5c6faaee6e0c374c7dfaf053aa23750f5a68e20 +cgroup 275278e1525a43d19ae50dbf20e597dd5ca3a5e3 +scsi e41df1533a4f7e2591645713dd0e4425c4d5180e +scsi-mkp d4717f27dbd0c9d73ab7821c73e97b7398e869f8 +vhost 0d4a3f2abbef73b9e5bb5f12213c275565473588 +rpmsg 741dc0aa4122c5e1ec8c6b576503284281e29960 +gpio 367677d498390067a7b2769862185787077da412 +gpio-brgl 5ede17d61592844c6d09eaba513f9de14920965c +gpio-intel 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl cb0438e4436085d89706b5ccfce4d5da531253de +pinctrl-intel 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-samsung a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 +pwm 81420020e6918ead1b224c09288a350ad37404ad +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +y2038 870e0167cd9cff1246746bd163db90df60d1dd61 +livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9 +coresight acfec525a78af468d0ec02f4e52674b6f528f302 +rtc 1e2c8aadedbe19e369a4e5fb9ae383f695ed78a2 +nvdimm 4c806b897d6075bfa5067e524fb058c57ab64e7b +at24 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +ntb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kspp 6f88ed285e67555e31e2601f0e8c5fb25501c366 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvmem b76e01ccc28737ecd36e22beb05e6a42fff0238a +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 54ac450feb7f6db3810547bbfa3ef22ee3342864 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb-dt d8a050f5a3e8242242df6430d5980c142350e461 +pidfd c2ba8f41ad366dc12840dd87d8f1565185845126 +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fpga e56476897448a0cc6f748535a199d2b68ad47d55 +kunit 741a98d022362c90609ac9dcd8ad56314d8e68b3 +akpm-current 580a3a106e1d7b4512c714658f1126688850dfba +akpm d9e39da22050bbc97ecb00b27eff74151fdb7b3e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..118abfb73280 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,317 @@ +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 +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +renesas-geert git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +siox git https://git.pengutronix.de/git/ukl/linux#siox/next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb-dt git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +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..8ff067bbc2fa --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3824 @@ +$ date -R +Fri, 04 Oct 2019 08:05:06 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 65aa35c93cc0 Merge tag 'erofs-for-5.4-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs +Merging origin/master (cc3a7bfe62b9 vfs: Fix EOVERFLOW testing in put_compat_statfs64) +$ git merge origin/master +Updating 65aa35c93cc0..cc3a7bfe62b9 +Fast-forward + MAINTAINERS | 1 + + drivers/clocksource/timer-of.c | 4 ++- + fs/statfs.c | 17 +++------- + kernel/sched/membarrier.c | 1 - + kernel/time/tick-broadcast-hrtimer.c | 62 +++++++++++++++++------------------- + 5 files changed, 37 insertions(+), 48 deletions(-) +Merging fixes/master (04e6dac68d9b powerpc/64s/radix: fix for "tidy up TLB flushing code" and !CONFIG_PPC_RADIX_MMU) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 ++++ + 1 file changed, 4 insertions(+) +Merging kbuild-current/fixes (d159d87700e9 namespace: fix namespace.pl script to support relative paths) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 5 ----- + Documentation/kbuild/modules.rst | 3 ++- + Makefile | 24 ++---------------------- + arch/powerpc/boot/Makefile | 2 +- + scripts/Kbuild.include | 5 ----- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/mod/modpost.c | 13 +++++++++---- + scripts/namespace.pl | 13 +++++++------ + usr/include/Makefile | 9 --------- + 10 files changed, 23 insertions(+), 55 deletions(-) +Merging arc-current/for-curr (41277ba7eb4e ARC: mm: tlb flush optim: elide redundant uTLB invalidates for MMUv3) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/mmu.h | 6 +++ + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/mm/tlb.c | 81 +++++++++++++----------------------- + arch/arc/mm/tlbex.S | 18 ++++---- + 6 files changed, 51 insertions(+), 62 deletions(-) +Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for pfn_valid of arm) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (bcec1221c945 Merge tag 'omap-for-v5.4/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-icev2.dts | 2 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 6 +- + arch/arm/boot/dts/am4372.dtsi | 2 + + arch/arm/boot/dts/dra7-l4.dtsi | 48 +++++----- + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 11 ++- + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 5 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 3 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 +- + arch/arm/mach-omap2/pm.c | 100 --------------------- + arch/arm64/configs/defconfig | 2 +- + drivers/clk/ti/clk-7xx.c | 6 +- + 14 files changed, 52 insertions(+), 143 deletions(-) +Merging arm64-fixes/for-next/fixes (a2b99dcac36c docs: arm64: Fix indentation and doc formatting) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + Documentation/arm64/memory.rst | 9 ++++++++- + arch/arm64/kernel/cpu_errata.c | 4 ++-- + arch/arm64/kernel/process.c | 32 +++++++++++++++----------------- + 3 files changed, 25 insertions(+), 20 deletions(-) +Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (253c892193ab powerpc/eeh: Fix eeh eeh_debugfs_break_device() with SRIOV devices) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (9f494438d4bc s390/qdio: clarify size of the QIB parm area) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cpu_mf.h | 5 ++++- + arch/s390/include/asm/qdio.h | 2 +- + arch/s390/kernel/perf_cpum_cf_diag.c | 4 ++-- + arch/s390/kernel/perf_cpum_sf.c | 8 +++++++- + drivers/s390/cio/qdio_setup.c | 2 +- + drivers/s390/net/qeth_core_main.c | 3 +-- + 6 files changed, 16 insertions(+), 8 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 (3afb09618840 tcp: fix slab-out-of-bounds in tcp_zerocopy_receive()) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/device_drivers/index.rst | 1 + + Documentation/networking/j1939.rst | 2 +- + drivers/net/dsa/qca8k.c | 4 +- + drivers/net/dsa/rtl8366.c | 11 ++++-- + drivers/net/dsa/rtl8366rb.c | 16 +++++--- + drivers/net/dsa/sja1105/sja1105_main.c | 24 +++++++----- + drivers/net/dsa/sja1105/sja1105_spi.c | 6 ++- + drivers/net/ethernet/atheros/ag71xx.c | 6 ++- + drivers/net/ethernet/hisilicon/hns_mdio.c | 6 ++- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 3 +- + drivers/net/ethernet/mscc/ocelot_board.c | 14 ++++--- + drivers/net/ethernet/pensando/Kconfig | 1 + + drivers/net/ethernet/socionext/netsec.c | 30 ++++----------- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 13 ++++--- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 9 +++-- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 ++++++++---- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 -- + drivers/net/ieee802154/atusb.c | 3 +- + drivers/net/ieee802154/ca8210.c | 2 +- + drivers/net/ieee802154/mcr20a.c | 2 +- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/tun.c | 2 +- + drivers/net/usb/hso.c | 12 ++++-- + drivers/net/virtio_net.c | 2 +- + drivers/net/vrf.c | 8 ++-- + drivers/net/wireless/mac80211_hwsim.c | 4 +- + drivers/net/xen-netfront.c | 17 +++++---- + drivers/ptp/ptp_qoriq.c | 3 +- + drivers/staging/octeon/ethernet-tx.c | 6 +-- + include/linux/dsa/sja1105.h | 4 +- + include/linux/skbuff.h | 5 +-- + lib/textsearch.c | 4 +- + net/batman-adv/soft-interface.c | 2 +- + net/core/devlink.c | 6 +-- + net/core/skbuff.c | 2 +- + net/core/sock.c | 11 ++++-- + net/dccp/ipv4.c | 2 +- + net/dsa/tag_sja1105.c | 12 +++++- + net/ipv4/ip_gre.c | 1 + + net/ipv4/ip_input.c | 2 +- + net/ipv4/ipmr.c | 4 +- + net/ipv4/netfilter/nf_dup_ipv4.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp.c | 6 +-- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_timer.c | 9 ++++- + net/ipv4/udp.c | 15 +++++--- + net/ipv6/addrconf.c | 11 +++--- + net/ipv6/ip6_input.c | 12 +++++- + net/ipv6/netfilter/nf_dup_ipv6.c | 2 +- + net/ipv6/raw.c | 2 +- + net/ipv6/udp.c | 9 ++++- + net/l2tp/l2tp_core.c | 2 +- + net/l2tp/l2tp_eth.c | 2 +- + net/l2tp/l2tp_ip.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/mac80211/debugfs_netdev.c | 11 +++++- + net/mac80211/util.c | 13 ++++--- + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nft_connlimit.c | 7 +++- + net/openvswitch/vport-internal_dev.c | 2 +- + net/packet/af_packet.c | 4 +- + net/rds/ib.c | 6 +-- + net/sched/sch_cbq.c | 43 ++++++++++++++------- + net/sched/sch_cbs.c | 2 +- + net/sched/sch_taprio.c | 5 +-- + net/sctp/input.c | 2 +- + net/tipc/link.c | 29 ++++++++------ + net/tipc/msg.c | 5 +-- + net/vmw_vsock/af_vsock.c | 16 ++++++-- + net/vmw_vsock/hyperv_transport.c | 2 +- + net/vmw_vsock/virtio_transport_common.c | 2 +- + net/wireless/nl80211.c | 44 ++++++++++++++++++++-- + net/wireless/reg.c | 2 +- + net/wireless/scan.c | 7 +++- + net/wireless/wext-compat.c | 2 +- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_interface.c | 2 +- + net/xfrm/xfrm_output.c | 2 +- + net/xfrm/xfrm_policy.c | 2 +- + tools/testing/selftests/net/udpgso.c | 16 ++------ + 83 files changed, 372 insertions(+), 237 deletions(-) +Merging bpf/master (98beb3edeb97 samples/bpf: Add a workaround for asm_inline) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + net/xdp/xsk.c | 42 ++++++++++++++-------- + samples/bpf/asm_goto_workaround.h | 13 ++++++- + samples/bpf/task_fd_query_user.c | 1 + + tools/bpf/Makefile | 6 +++- + tools/lib/bpf/Makefile | 33 +++++++++++------ + tools/lib/bpf/libbpf_internal.h | 16 +++++++++ + tools/lib/bpf/xsk.c | 4 +-- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 3 +- + 9 files changed, 89 insertions(+), 31 deletions(-) +Merging ipsec/master (68ce6688a5ba net: sched: taprio: Fix potential integer overflow in taprio_set_picos_per_byte) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (134cc4cefad3 net: stmmac: Avoid deadlock on suspend/resume) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (34a4c95abd25 netfilter: nft_connlimit: disable bh on garbage collection) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (c91a9cfe9f6d rt2x00: initialize last_reset) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mac80211/master (569aad4fcd82 net: ag71xx: fix mdio subnode support) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (b66f31efbdad RDMA/iwcm: Fix a lock inversion issue) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 3 ++- + drivers/infiniband/core/device.c | 9 +++++---- + drivers/infiniband/hw/cxgb4/device.c | 7 +++++-- + drivers/infiniband/hw/cxgb4/qp.c | 10 +--------- + drivers/infiniband/hw/hfi1/sdma.c | 5 ++++- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 -- + drivers/infiniband/sw/siw/siw_qp.c | 15 +++++++++++---- + 7 files changed, 28 insertions(+), 23 deletions(-) +Merging sound-current/for-linus (f41f900568d9 ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (bbb90c4ed03b Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/max98373.c | 20 +++++++++------ + sound/soc/codecs/rt5651.c | 3 +++ + sound/soc/codecs/rt5682.c | 12 +++++++-- + sound/soc/codecs/wm8994.c | 43 ++++++++++++++++++------------- + sound/soc/codecs/wm_adsp.c | 7 ++++- + sound/soc/intel/boards/sof_rt5682.c | 51 ++++++++++++++++++++++++++++++++++--- + sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++++++++--- + sound/soc/soc-pcm.c | 4 +-- + sound/soc/soc-topology.c | 2 +- + sound/soc/sof/intel/Kconfig | 10 ++++++++ + sound/soc/sof/intel/bdw.c | 7 +++++ + sound/soc/sof/intel/byt.c | 6 +++++ + sound/soc/sof/intel/hda-ctrl.c | 12 +++------ + sound/soc/sof/intel/hda-loader.c | 1 + + sound/soc/sof/intel/hda-stream.c | 45 +++++++++++++++++++++++++++----- + sound/soc/sof/intel/hda.c | 7 +++++ + sound/soc/sof/intel/hda.h | 5 +++- + sound/soc/sof/loader.c | 4 +-- + sound/soc/sof/pcm.c | 35 +++++++++++++++++-------- + sound/soc/sof/topology.c | 4 ++- + 20 files changed, 243 insertions(+), 69 deletions(-) +Merging regmap-fixes/for-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (c3f1e312854c Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.yaml | 4 +- + drivers/regulator/core.c | 13 +++ + drivers/regulator/da9062-regulator.c | 118 ++++++++------------- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/lochnagar-regulator.c | 1 + + drivers/regulator/of_regulator.c | 27 +++-- + drivers/regulator/pfuze100-regulator.c | 8 +- + drivers/regulator/ti-abb-regulator.c | 26 ++--- + 8 files changed, 98 insertions(+), 104 deletions(-) +Merging spi-fixes/for-linus (6efab62559b1 Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-gpio.c | 4 +++- + drivers/spi/spi-mxic.c | 6 +++--- + drivers/spi/spi-orion.c | 3 --- + drivers/spi/spidev.c | 3 +++ + 5 files changed, 10 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (82af5b660967 sysfs: Fixes __BIN_ATTR_WO() macro) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + include/linux/sysfs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tty.current/tty-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (5eb3f4b87a0e USB: serial: option: add Telit FN980 compositions) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 3 +++ + drivers/usb/serial/ftdi_sio_ids.h | 9 +++++++++ + drivers/usb/serial/option.c | 8 ++++++++ + 3 files changed, 20 insertions(+) +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 +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (22d67a01d8d8 staging: rtl8188eu: fix HighestRate check in odm_ARFBRefresh_8188E()) +$ git merge staging.current/staging-linus +Auto-merging drivers/staging/octeon/ethernet-tx.c +Removing drivers/staging/fbtft/flexfb.c +Removing drivers/staging/fbtft/fbtft_device.c +Merge made by the 'recursive' strategy. + drivers/staging/exfat/Kconfig | 3 +- + drivers/staging/exfat/Makefile | 2 +- + drivers/staging/exfat/exfat.h | 2 +- + drivers/staging/exfat/exfat_blkdev.c | 2 +- + drivers/staging/exfat/exfat_cache.c | 2 +- + drivers/staging/exfat/exfat_core.c | 2 +- + drivers/staging/exfat/exfat_nls.c | 2 +- + drivers/staging/exfat/exfat_super.c | 2 +- + drivers/staging/exfat/exfat_upcase.c | 2 +- + drivers/staging/fbtft/Kconfig | 12 +- + drivers/staging/fbtft/Makefile | 4 - + drivers/staging/fbtft/fbtft_device.c | 1261 -------------------- + drivers/staging/fbtft/flexfb.c | 851 ------------- + drivers/staging/octeon/ethernet-tx.c | 9 +- + drivers/staging/octeon/octeon-stubs.h | 2 +- + .../staging/rtl8188eu/hal/hal8188e_rate_adaptive.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 1 + + 19 files changed, 25 insertions(+), 2146 deletions(-) + delete mode 100644 drivers/staging/fbtft/fbtft_device.c + delete mode 100644 drivers/staging/fbtft/flexfb.c +Merging char-misc.current/char-misc-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (bd3b84802376 Input: goodix - add support for 9-bytes reports) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/misc/da9063_onkey.c | 5 +--- + drivers/input/touchscreen/goodix.c | 58 ++++++++++++++++++++++++++++++++------ + 2 files changed, 51 insertions(+), 12 deletions(-) +Merging crypto-current/master (f703964fc668 crypto: arm/aes-ce - add dependency on AES library) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/arm/crypto/Kconfig | 1 + + arch/arm/crypto/aes-ce-core.S | 1 + + 2 files changed, 2 insertions(+) +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 (ce3a67780212 selftests: watchdog: Add command line option to show watchdog_info) +$ git merge kselftest-fixes/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kselftest.rst | 16 +++++++++++ + Makefile | 5 ++-- + tools/testing/selftests/Makefile | 19 +++++++++++-- + tools/testing/selftests/kselftest/runner.sh | 36 ++++++++++++++++++++++-- + tools/testing/selftests/kselftest_install.sh | 4 +-- + tools/testing/selftests/rtc/settings | 1 + + tools/testing/selftests/watchdog/watchdog-test.c | 27 +++++++++++++++++- + 7 files changed, 97 insertions(+), 11 deletions(-) + create mode 100644 tools/testing/selftests/rtc/settings +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 (04cbfba62085 Merge tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (dc9cfd269222 mtd: hyperbus: fix dependency and build error) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b mfd: rk808: Make PM function declaration static) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (63ad05e36ec5 media: cec-notifier: clear cec_adap in cec_notifier_unregister) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. +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 (25b69a889b63 mips: Loongson: Fix the link time qualifier of 'serial_exit()') +$ git merge mips-fixes/mips-fixes +Removing arch/mips/vdso/gettimeofday.c +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/qca/ar9331.dtsi | 2 +- + arch/mips/include/asm/octeon/cvmx-ipd.h | 1 + + arch/mips/include/asm/unistd.h | 1 + + arch/mips/kernel/cpu-bugs64.c | 14 +- + arch/mips/kernel/setup.c | 5 +- + arch/mips/kernel/syscall.c | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- + arch/mips/loongson64/common/mem.c | 35 ++-- + arch/mips/loongson64/common/serial.c | 2 +- + arch/mips/loongson64/loongson-3/numa.c | 11 +- + arch/mips/vdso/Makefile | 2 +- + arch/mips/vdso/gettimeofday.c | 269 ------------------------------ + 14 files changed, 39 insertions(+), 310 deletions(-) + delete mode 100644 arch/mips/vdso/gettimeofday.c +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (f90ec6cdf674 ARM: dts: am4372: Set memory bandwidth limit for DISPC) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (fd3edd4a9066 KVM: nVMX: cleanup and fix host 64-bit mode checks) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (6bbfdcbc8e45 hwmon: (nct7904) Add array fan_alarm and vsen_alarm to store the alarms in nct7904_data struct.) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/k10temp.rst | 18 +++++++++++++++++- + drivers/hwmon/nct7904.c | 33 +++++++++++++++++++++++++++------ + include/linux/hwmon.h | 2 +- + 4 files changed, 46 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (a73d7fe3072f Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 13 ++++++++++++- + fs/btrfs/inode.c | 3 +++ + fs/btrfs/ref-verify.c | 2 +- + fs/btrfs/tree-log.c | 36 +++++++++++++++++++++++++++--------- + fs/btrfs/volumes.c | 6 +++++- + 5 files changed, 48 insertions(+), 12 deletions(-) +Merging vfs-fixes/fixes (d4f4de5e5ef8 Fix the locking in dcache_readdir() and friends) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/libfs.c | 134 +++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 69 insertions(+), 65 deletions(-) +Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-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 (f437ade3296b dt-bindings: phy: lantiq: Fix Property Name) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 1 + + Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml | 7 +++---- + Documentation/devicetree/bindings/media/rc.yaml | 1 - + Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +- + 4 files changed, 5 insertions(+), 6 deletions(-) +Merging scsi-fixes/fixes (9bc6157f5fd0 scsi: qla2xxx: Remove WARN_ON_ONCE in qla2x00_status_cont_entry()) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Merge made by the 'recursive' strategy. + drivers/scsi/bnx2fc/bnx2fc_io.c | 29 +++++++-- + drivers/scsi/hisi_sas/hisi_sas_main.c | 6 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 + + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 109 ++++++++++++++++++++++++---------- + drivers/scsi/qla2xxx/qla_iocb.c | 7 ++- + drivers/scsi/qla2xxx/qla_isr.c | 2 - + drivers/scsi/qla2xxx/qla_mbx.c | 25 +++++++- + drivers/scsi/qla2xxx/qla_mid.c | 32 ++++++---- + drivers/scsi/qla2xxx/qla_os.c | 18 ++++-- + drivers/scsi/qla2xxx/qla_target.c | 26 ++++---- + drivers/scsi/sd.c | 3 +- + drivers/scsi/storvsc_drv.c | 3 +- + drivers/scsi/ufs/ufshcd.c | 3 + + 17 files changed, 195 insertions(+), 83 deletions(-) +Merging drm-fixes/drm-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (c0e70e10b11b drm/amd/display: fix dcn21 Makefile for clang) +$ git merge amdgpu-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 34 ++++++++++++++-------- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 -- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 12 ++++++++ + drivers/gpu/drm/amd/amdgpu/nv.c | 6 ++-- + drivers/gpu/drm/amd/amdgpu/soc15.c | 8 ++--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-- + .../drm/amd/display/dc/dce100/dce100_resource.c | 1 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 1 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 12 +++++++- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 13 ++++----- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 ++ + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 2 ++ + include/uapi/drm/amdgpu_drm.h | 2 ++ + 25 files changed, 85 insertions(+), 34 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (485f682be9fc Revert "drm/i915: Fix DP-MST crtc_mask") +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 12 +- + drivers/gpu/drm/i915/display/intel_display.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 184 ++++++++++++++------------- + drivers/gpu/drm/i915/display/intel_dp.h | 6 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 5 +- + 6 files changed, 111 insertions(+), 102 deletions(-) +Merging mmc-fixes/fixes (faf97b84fa86 mmc: sh_mmcif: Use platform_get_irq_optional() for optional interrupt) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/renesas_sdhi_core.c | 31 +++++++++++++++++++------------ + drivers/mmc/host/sh_mmcif.c | 6 ++---- + 2 files changed, 21 insertions(+), 16 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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (83b50f83a968 Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 56 +++++++++--------------------------------------- + drivers/hv/vmbus_drv.c | 6 ++++++ + 2 files changed, 16 insertions(+), 46 deletions(-) +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 (922b0375fc93 riscv: Fix memblock reservation for device tree blob) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/asm.h | 1 + + arch/riscv/kernel/entry.S | 21 ++++++++++++++++++++- + arch/riscv/mm/init.c | 12 +++++++++++- + 3 files changed, 32 insertions(+), 2 deletions(-) +Merging pidfd-fixes/fixes (78f6face5af3 sched: add kernel-doc for struct clone_args) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + include/uapi/linux/sched.h | 28 ++++++++++++++++++++++++++-- + kernel/fork.c | 11 +++++++++++ + tools/testing/selftests/pidfd/Makefile | 2 +- + 3 files changed, 38 insertions(+), 3 deletions(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (260996c30f4f pinctrl: cherryview: restore Strago DMI workaround for all versions) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 ---- + drivers/pinctrl/intel/pinctrl-intel.c | 27 ++++++++++++++------------- + 2 files changed, 14 insertions(+), 17 deletions(-) +Merging erofs-fixes/fixes (65aa35c93cc0 Merge tag 'erofs-for-5.4-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (b6559bf3ac32 Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixes) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + .../drm/arm/display/komeda/komeda_wb_connector.c | 7 ++++--- + drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- + drivers/gpu/drm/drm_atomic.c | 13 ++++++++---- + drivers/gpu/drm/drm_writeback.c | 23 ++++++++++++++-------- + drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 + + drivers/gpu/drm/vc4/vc4_txp.c | 5 ++--- + 8 files changed, 36 insertions(+), 23 deletions(-) +Merging kspp-gustavo/for-next/kspp (609488bc979f Linux 5.3-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (8c0c37466a7b kconfig: split util.c out of parser.y) +$ git merge kbuild/for-next +Removing arch/ia64/include/uapi/asm/ioctls.h +Removing arch/ia64/include/uapi/asm/ioctl.h +Removing arch/ia64/include/uapi/asm/errno.h +Removing arch/hexagon/include/uapi/asm/bitsperlong.h +Merge made by the 'recursive' strategy. + arch/hexagon/include/uapi/asm/bitsperlong.h | 27 ---------------------- + arch/ia64/include/uapi/asm/errno.h | 2 -- + arch/ia64/include/uapi/asm/ioctl.h | 2 -- + arch/ia64/include/uapi/asm/ioctls.h | 7 ------ + drivers/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 36 ++++++----------------------- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + scripts/.gitignore | 1 - + scripts/Makefile | 2 -- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/parser.y | 1 - + security/integrity/Makefile | 3 --- + 12 files changed, 9 insertions(+), 75 deletions(-) + delete mode 100644 arch/hexagon/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/ia64/include/uapi/asm/errno.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctl.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctls.h + rename {scripts => drivers/video/logo}/pnmtologo.c (100%) +Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-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 (c7d9eccb3c1e mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x)) +$ 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 (3a6d5fc43760 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (e376897f424a arm64: remove __iounmap) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (c8b0de762e0b perf/smmuv3: use devm_platform_ioremap_resource() to simplify code) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + drivers/perf/arm-cci.c | 4 +--- + drivers/perf/arm-ccn.c | 3 +-- + drivers/perf/arm_smmuv3_pmu.c | 5 ++--- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +---- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 +--- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 4 +--- + drivers/perf/xgene_pmu.c | 14 ++++---------- + 7 files changed, 11 insertions(+), 28 deletions(-) +Merging arm-soc/for-next (b7f1866c1782 Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + 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 (1811b8867712 Merge branch 'v5.5/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 9 +- + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts | 30 ++ + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 130 +++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 372 +++----------- + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 368 ++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 15 +- + .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 25 + + .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 25 + + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 557 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 20 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 + + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 73 ++- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 + + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 7 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 7 + + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 17 + + drivers/clk/meson/g12a.c | 13 +- + drivers/clk/meson/gxbb.c | 1 + + drivers/firmware/meson/meson_sm.c | 110 ++-- + drivers/nvmem/meson-efuse.c | 24 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 2 + + include/linux/firmware/meson/meson_sm.h | 15 +- + 42 files changed, 1505 insertions(+), 416 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (9072e308f698 Merge branches 'at91-drivers', 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + Documentation/arm/microchip.rst | 4 ++-- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 + + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + drivers/memory/atmel-ebi.c | 11 +++++------ + include/linux/mfd/syscon/atmel-matrix.h | 1 - + 5 files changed, 9 insertions(+), 10 deletions(-) +Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (a70642cb3c1d Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 15 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 39 +++ + arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 17 + + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 14 + + arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi | 148 +++++++++ + arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 338 ++++++++++++++++++++ + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 195 +----------- + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 382 +---------------------- + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 + + arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 64 +++- + arch/arm/boot/dts/imx6ull-opos6ul.dtsi | 6 + + arch/arm/boot/dts/imx6ull-opos6uldev.dts | 42 +++ + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 38 +++ + arch/arm/boot/dts/imx7-colibri.dtsi | 30 +- + arch/arm/boot/dts/imx7ulp.dtsi | 17 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 - + 23 files changed, 835 insertions(+), 597 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts +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 (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (153e97d3bdf3 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 (75e66cd99933 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile +Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db02ef27855e] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/for-next (63e584644247 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (ae688e1720fd arm64: dts: renesas: hihope-common: Fix eMMC status) +$ git merge renesas/next +Already up to date. +Merging renesas-geert/next (aca0770d9702 Merge branches 'renesas-arm-dt-for-v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'renesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-next) +$ git merge renesas-geert/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 12 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + arch/arm/boot/dts/emev2.dtsi | 4 + + arch/arm/boot/dts/r8a7790-lager.dts | 8 +- + arch/arm/boot/dts/r8a7793-gose.dts | 110 ++--- + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- + .../boot/dts/renesas/r8a774b1-hihope-rzg2n.dts | 26 ++ + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 472 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 30 ++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 30 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 11 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7743-sysc.c | 1 - + drivers/soc/renesas/r8a7745-sysc.c | 1 - + drivers/soc/renesas/r8a77470-sysc.c | 1 - + drivers/soc/renesas/r8a774a1-sysc.c | 1 - + drivers/soc/renesas/r8a774b1-sysc.c | 37 ++ + drivers/soc/renesas/r8a774c0-sysc.c | 4 +- + drivers/soc/renesas/r8a7779-sysc.c | 1 - + drivers/soc/renesas/r8a7790-sysc.c | 1 - + drivers/soc/renesas/r8a7791-sysc.c | 1 - + drivers/soc/renesas/r8a7792-sysc.c | 1 - + drivers/soc/renesas/r8a7794-sysc.c | 1 - + drivers/soc/renesas/r8a7795-sysc.c | 33 +- + drivers/soc/renesas/r8a7796-sysc.c | 23 +- + drivers/soc/renesas/r8a77965-sysc.c | 4 +- + drivers/soc/renesas/r8a77970-sysc.c | 4 +- + drivers/soc/renesas/r8a77980-sysc.c | 4 +- + drivers/soc/renesas/r8a77990-sysc.c | 4 +- + drivers/soc/renesas/r8a77995-sysc.c | 1 - + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 19 + + drivers/soc/renesas/rcar-sysc.h | 8 +- + drivers/soc/renesas/renesas-soc.c | 8 + + include/dt-bindings/clock/r8a774b1-cpg-mssr.h | 57 +++ + include/dt-bindings/power/r8a774b1-sysc.h | 26 ++ + 44 files changed, 888 insertions(+), 93 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1.dtsi + create mode 100644 drivers/soc/renesas/r8a774b1-sysc.c + create mode 100644 include/dt-bindings/clock/r8a774b1-cpg-mssr.h + create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h +Merging reset/reset/next (8c2def0f0655 reset: uniphier-glue: Add Pro5 USB3 support) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt +Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt +Merge made by the 'recursive' strategy. + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +- + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 5 ++- + drivers/reset/core.c | 2 - + drivers/reset/reset-meson-audio-arb.c | 43 ++++++++++++++++-- + drivers/reset/reset-uniphier-glue.c | 4 ++ + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + 10 files changed, 145 insertions(+), 112 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml +Merging rockchip/for-next (7157e50bf728 Merge branch 'v5.4-armsoc/dtsfixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 4 +- + .../bindings/clock/rockchip,px30-cru.txt | 5 + + .../devicetree/bindings/soc/rockchip/grf.txt | 1 + + arch/arm/boot/dts/rk3288.dtsi | 3 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 309 ++++++++++++++++++++- + arch/arm64/boot/dts/rockchip/px30.dtsi | 83 ++---- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 32 +-- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 6 +- + 8 files changed, 348 insertions(+), 95 deletions(-) +Merging samsung-krzk/for-next (2924a93b4c2b Merge branch 'for-v5.5/memory-samsung-dmc-dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/{lpddr2 => ddr}/lpddr2-timings.txt | 0 + .../devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt | 2 +- + .../devicetree/bindings/ddr/lpddr3-timings.txt | 58 + + Documentation/devicetree/bindings/ddr/lpddr3.txt | 101 ++ + .../bindings/memory-controllers/exynos5422-dmc.txt | 84 ++ + MAINTAINERS | 8 + + arch/arm/boot/dts/exynos3250.dtsi | 11 +- + arch/arm/boot/dts/exynos4210.dtsi | 23 +- + arch/arm/boot/dts/exynos4412.dtsi | 21 +- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 27 +- + arch/arm/boot/dts/exynos5250.dtsi | 39 +- + arch/arm/boot/dts/exynos5260.dtsi | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 6 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 + + arch/arm/boot/dts/exynos5420.dtsi | 90 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 117 ++ + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 4 + + arch/arm/boot/dts/exynos54xx.dtsi | 44 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + + arch/arm/boot/dts/exynos5800.dtsi | 2 +- + arch/arm/configs/exynos_defconfig | 2 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 168 +-- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 28 +- + drivers/memory/jedec_ddr.h | 61 + + drivers/memory/of_memory.c | 149 ++ + drivers/memory/of_memory.h | 18 + + drivers/memory/samsung/Kconfig | 13 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos5422-dmc.c | 1550 ++++++++++++++++++++ + 30 files changed, 2441 insertions(+), 200 deletions(-) + rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2-timings.txt (100%) + rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt (96%) + create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3-timings.txt + create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos5422-dmc.txt + create mode 100644 drivers/memory/samsung/exynos5422-dmc.c +Merging scmi/for-linux-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (f29e294b3f53 Merge branches 'sunxi/clk-for-5.5' and 'sunxi/fixes-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 9 +++++++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 6 ++++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 --------- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 21 +++++++++++++++------ + 4 files changed, 30 insertions(+), 15 deletions(-) +Merging tegra/for-next (d40c8de825cc Merge branch for-5.5/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 22 ++- + arch/arm/boot/dts/tegra30-apalis.dtsi | 22 ++- + arch/arm/boot/dts/tegra30-colibri.dtsi | 22 ++- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 24 +-- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 165 +++++++++++++++++++-- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 4 +- + drivers/firmware/tegra/bpmp.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 5 +- + drivers/soc/tegra/pmc.c | 28 +++- + 13 files changed, 244 insertions(+), 61 deletions(-) +Merging clk/clk-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (e2c750853b66 csky: Fixup csky_pmu.max_period assignment) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/perf_event.c +Auto-merging arch/csky/kernel/entry.S +Merge made by the 'recursive' strategy. +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 (0d3d343560ba genirq: remove the is_affinity_mask_valid hook) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (0f1979b402df m68k: Remove ioremap_fullcache()) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (372ea263b3d9 m68k: coldfire: Include the GPIO driver header) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (7cca9b8b7c5b microblaze: Switch to standard restart handler) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (05d013a0366d MIPS: Detect bad _PFN_SHIFT values) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (f3b17320db25 openrisc: map as uncached in ioremap) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e563af53af8b parisc: Do not hardcode registers in checksum functions) +$ git merge parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++ + arch/parisc/include/asm/checksum.h | 101 +++++++++++++++++++------------------ + drivers/parisc/sba_iommu.c | 8 --- + 3 files changed, 55 insertions(+), 57 deletions(-) +Merging powerpc/next (45824fc0da6e Merge tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ 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 (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (9ce06497c272 irqchip/sifive-plic: set max threshold for ignored handlers) +$ git merge risc-v/for-next +Already up to date. +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 (ab5758848039 s390/cio: exclude subchannels with no parent from pseudo check) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +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 +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master 126efd2b2f09] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +Merging sparc-next/master (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 (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ()) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ede62d7397ec Merge branch 'xtensa-5.5' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/mm/init.c +Auto-merging arch/xtensa/kernel/setup.c +Auto-merging arch/xtensa/kernel/head.S +Removing arch/xtensa/include/asm/user.h +Removing arch/xtensa/include/asm/hw_irq.h +Auto-merging arch/xtensa/Kconfig +Auto-merging Documentation/features/locking/queued-spinlocks/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/core/tracehook/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 396 ++++++++++++--------- + arch/xtensa/Makefile | 3 +- + arch/xtensa/boot/Makefile | 5 + + arch/xtensa/configs/xip_kc705_defconfig | 120 +++++++ + arch/xtensa/include/asm/Kbuild | 2 + + arch/xtensa/include/asm/cache.h | 6 + + arch/xtensa/include/asm/hw_irq.h | 14 - + arch/xtensa/include/asm/initialize_mmu.h | 3 +- + arch/xtensa/include/asm/kmem_layout.h | 29 ++ + arch/xtensa/include/asm/page.h | 11 + + arch/xtensa/include/asm/user.h | 20 -- + arch/xtensa/include/asm/vectors.h | 44 +-- + arch/xtensa/kernel/head.S | 13 +- + arch/xtensa/kernel/setup.c | 7 + + arch/xtensa/kernel/vmlinux.lds.S | 52 ++- + arch/xtensa/mm/init.c | 4 +- + 17 files changed, 474 insertions(+), 257 deletions(-) + create mode 100644 arch/xtensa/configs/xip_kc705_defconfig + delete mode 100644 arch/xtensa/include/asm/hw_irq.h + delete mode 100644 arch/xtensa/include/asm/user.h +Merging fscrypt/master (0642ea2409f3 ext4 crypto: fix to check feature status before get policy) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (f41d3117280a Merge branch 'for-next-next-v5.4-20191001' into for-next-20191001) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 107 +++++++------- + fs/btrfs/async-thread.h | 33 +---- + fs/btrfs/block-group.c | 3 +- + fs/btrfs/compression.c | 16 ++- + fs/btrfs/compression.h | 3 +- + fs/btrfs/ctree.c | 322 ++++++++++++++++++++++--------------------- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/delayed-inode.c | 5 +- + fs/btrfs/disk-io.c | 71 +++++----- + fs/btrfs/extent-io-tree.h | 248 +++++++++++++++++++++++++++++++++ + fs/btrfs/extent-tree.c | 164 ++++++++++++++++++++-- + fs/btrfs/extent_io.c | 157 +++++++++++---------- + fs/btrfs/extent_io.h | 226 +----------------------------- + fs/btrfs/file.c | 5 +- + fs/btrfs/inode.c | 98 ++++++++----- + fs/btrfs/locking.c | 78 ++++++++--- + fs/btrfs/locking.h | 13 +- + fs/btrfs/ordered-data.c | 1 - + fs/btrfs/qgroup.c | 3 - + fs/btrfs/raid56.c | 5 +- + fs/btrfs/reada.c | 13 +- + fs/btrfs/scrub.c | 17 +-- + fs/btrfs/super.c | 10 +- + fs/btrfs/transaction.c | 89 ++++++++++-- + fs/btrfs/transaction.h | 3 - + fs/btrfs/tree-checker.c | 78 ++++++++++- + fs/btrfs/tree-log.c | 48 ++----- + fs/btrfs/volumes.c | 276 ++----------------------------------- + fs/btrfs/volumes.h | 10 +- + include/trace/events/btrfs.h | 6 +- + 30 files changed, 1094 insertions(+), 1018 deletions(-) + create mode 100644 fs/btrfs/extent-io-tree.h +Merging ceph/master (3ee5a7015c8b ceph: call ceph_mdsc_destroy from destroy_fs_client) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (a860055e6b09 fs: cifs: mute -Wunused-const-variable message) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 2 +- + fs/cifs/dir.c | 8 +++++++- + fs/cifs/file.c | 33 +++++++++++++++++---------------- + fs/cifs/inode.c | 4 ++++ + fs/cifs/netmisc.c | 4 ---- + fs/cifs/smb2pdu.c | 3 ++- + fs/cifs/smb2proto.h | 4 ++++ + 7 files changed, 35 insertions(+), 23 deletions(-) +Merging configfs/for-next (e9c03af21cc7 configfs: calculate the symlink target only once) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (54ecb8f7028c Linux 5.4-rc1) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (0f7dbaee76f4 Merge quota initialization check fix from Chao Yu.) +$ git merge ext3/for_next +Auto-merging fs/notify/fanotify/fanotify_user.c +Merge made by the 'recursive' strategy. + fs/notify/fanotify/fanotify_user.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext4/dev (040823b5372b Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (619e17cf75dd Merge tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (54ecb8f7028c Linux 5.4-rc1) +$ 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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (a8fd0feeca35 pNFS/filelayout: enable LAYOUTGET on OPEN) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (e41f9efb85d3 sunrpc: clean up indentation issue) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (6a379f67454a jffs2: Fix memory leak in jffs2_scan_eraseblock() error path) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (88d32d3983e7 xfs: avoid unused to_mp() function warning) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (838c4f3d7515 iomap: move the iomap_dio_rw ->end_io callback into a structure) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) +$ git merge vfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging printk/for-next (c38822ab9bd6 Merge branch 'for-5.4' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (da9c3eaa31f2 Merge branch 'pci/virtualization') +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-sysfs.c | 8 +- + arch/s390/include/asm/pci.h | 5 +- + arch/s390/include/asm/pci_clp.h | 6 +- + arch/s390/pci/pci.c | 16 +-- + arch/s390/pci/pci_clp.c | 6 +- + arch/x86/pci/Makefile | 4 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/fixup.c | 46 ++++--- + arch/x86/pci/intel_mid_pci.c | 2 +- + arch/x86/pci/numachip.c | 5 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/iommu/of_iommu.c | 2 + + drivers/irqchip/irq-gic-v2m.c | 1 + + drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 + + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/misc/pci_endpoint_test.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- + drivers/pci/ats.c | 153 +++++++++++++--------- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 1 + + drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/pci-aardvark.c | 1 + + drivers/pci/controller/pci-hyperv.c | 10 +- + drivers/pci/controller/pci-thunder-pem.c | 1 + + drivers/pci/controller/pcie-cadence.h | 2 +- + drivers/pci/controller/pcie-rockchip.h | 2 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 10 +- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/pci.c | 14 +- + drivers/pci/pcie/aer.c | 23 ++-- + drivers/pci/probe.c | 1 + + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 65 +++++++-- + drivers/pci/setup-bus.c | 8 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/rapidio/devices/tsi721.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/staging/gasket/gasket_constants.h | 3 - + drivers/staging/gasket/gasket_core.c | 12 +- + drivers/staging/gasket/gasket_core.h | 4 +- + drivers/tty/serial/8250/8250_pci.c | 8 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 11 +- + drivers/vfio/pci/vfio_pci_config.c | 32 ++--- + drivers/vfio/pci/vfio_pci_private.h | 4 +- + drivers/video/fbdev/core/fbmem.c | 4 +- + drivers/video/fbdev/efifb.c | 2 +- + include/linux/of_pci.h | 5 +- + include/linux/pci-ats.h | 76 ++++------- + include/linux/pci-epc.h | 2 +- + include/linux/pci.h | 19 +-- + include/uapi/linux/pci_regs.h | 1 + + lib/devres.c | 2 +- + 64 files changed, 346 insertions(+), 290 deletions(-) +Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (e4dfa33d8c6e Merge branch 'for-5.5/logitech' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 7 +- + drivers/hid/hid-google-hammer.c | 105 +++- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-lg-g15.c | 899 +++++++++++++++++++++++++++++++++ + drivers/hid/hid-prodikeys.c | 4 +- + drivers/hid/hidraw.c | 10 +- + include/uapi/linux/input-event-codes.h | 75 +++ + 9 files changed, 1082 insertions(+), 30 deletions(-) + create mode 100644 drivers/hid/hid-lg-g15.c +$ git reset --hard HEAD^ +HEAD is now at 67856f6ea352 Merge remote-tracking branch 'pci/next' +Merging next-20191003 version of hid +$ git merge -m next-20191003/hid d789dc30163d1d10c3e0e0088bf461abdfc53582 +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 7 ++- + drivers/hid/hid-google-hammer.c | 105 ++++++++++++++++++++++++++++++++-------- + drivers/hid/hid-prodikeys.c | 4 +- + drivers/hid/hidraw.c | 10 ++-- + 4 files changed, 96 insertions(+), 30 deletions(-) +Merging i2c/i2c/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (f12b524ea386 i3c: master: use i3c_dev_get_master()) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (56ef4d6aa440 hwmon: (applesmc) switch to using input device polling mode) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 1 - + drivers/hwmon/applesmc.c | 38 ++++++++++++++++++-------------------- + drivers/hwmon/aspeed-pwm-tacho.c | 7 +------ + 3 files changed, 19 insertions(+), 27 deletions(-) +Merging jc_docs/docs-next (185271a1fa07 riscv-docs: correct the sequence of the magic number 2 since it's little endian) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 1 + + CREDITS | 3 +- + Documentation/Makefile | 3 +- + Documentation/admin-guide/cgroup-v2.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 10 +- + Documentation/admin-guide/perf/imx-ddr.rst | 35 ++-- + Documentation/admin-guide/perf/index.rst | 1 + + Documentation/conf.py | 3 +- + Documentation/dev-tools/kmemleak.rst | 2 +- + Documentation/driver-api/infrastructure.rst | 3 - + .../networking/device_drivers/intel/e100.rst | 14 +- + .../networking/device_drivers/intel/e1000.rst | 12 +- + .../networking/device_drivers/intel/e1000e.rst | 14 +- + .../networking/device_drivers/intel/fm10k.rst | 10 +- + .../networking/device_drivers/intel/i40e.rst | 8 +- + .../networking/device_drivers/intel/iavf.rst | 8 +- + .../networking/device_drivers/intel/ice.rst | 6 +- + .../networking/device_drivers/intel/igb.rst | 12 +- + .../networking/device_drivers/intel/igbvf.rst | 6 +- + .../networking/device_drivers/intel/ixgbe.rst | 10 +- + .../networking/device_drivers/intel/ixgbevf.rst | 6 +- + .../networking/device_drivers/pensando/ionic.rst | 6 +- + Documentation/process/index.rst | 1 + + Documentation/process/maintainers.rst | 1 + + Documentation/riscv/boot-image-header.rst | 2 +- + Documentation/security/lsm.rst | 2 +- + Documentation/sphinx-static/theme_overrides.css | 10 ++ + Documentation/sphinx/maintainers_include.py | 197 +++++++++++++++++++++ + .../it_IT/process/maintainer-pgp-guide.rst | 2 +- + MAINTAINERS | 62 +++---- + scripts/jobserver-count | 58 ++++++ + scripts/kernel-doc | 11 +- + scripts/sphinx-pre-install | 29 ++- + 33 files changed, 422 insertions(+), 132 deletions(-) + create mode 100644 Documentation/process/maintainers.rst + create mode 100755 Documentation/sphinx/maintainers_include.py + create mode 100755 scripts/jobserver-count +Merging v4l-dvb/master (503e59365dd1 media: i2c: ov2659: Switch to SPDX Licensing) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/ov2659.txt | 9 + + Documentation/media/cec.h.rst.exceptions | 89 +++ + Documentation/media/uapi/cec/cec-funcs.rst | 1 + + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 +- + .../media/uapi/cec/cec-ioc-adap-g-conn-info.rst | 105 +++ + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 8 + + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 8 +- + Documentation/media/uapi/v4l/ext-ctrls-flash.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 12 +- + Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 2 +- + Documentation/media/v4l-drivers/vimc.rst | 12 +- + MAINTAINERS | 1 + + drivers/media/cec/cec-adap.c | 12 +- + drivers/media/cec/cec-api.c | 20 + + drivers/media/cec/cec-core.c | 5 - + drivers/media/i2c/Kconfig | 54 +- + drivers/media/i2c/mt9m001.c | 2 +- + drivers/media/i2c/ov2659.c | 139 +++- + drivers/media/i2c/ov5695.c | 2 +- + drivers/media/i2c/ov6650.c | 137 ++-- + drivers/media/mc/mc-device.c | 65 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/am437x/am437x-vpfe.c | 860 +++++++++------------ + drivers/media/platform/am437x/am437x-vpfe.h | 43 +- + drivers/media/platform/am437x/am437x-vpfe_regs.h | 10 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 41 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 20 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 1 - + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 9 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 9 - + drivers/media/platform/rcar-vin/rcar-dma.c | 54 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 65 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 4 +- + drivers/media/platform/s3c-camif/camif-regs.c | 2 +- + drivers/media/platform/seco-cec/seco-cec.c | 1 + + drivers/media/platform/vim2m.c | 4 + + drivers/media/platform/vimc/Makefile | 7 +- + drivers/media/platform/vimc/vimc-capture.c | 81 +- + drivers/media/platform/vimc/vimc-common.c | 3 +- + drivers/media/platform/vimc/vimc-common.h | 58 ++ + drivers/media/platform/vimc/vimc-core.c | 216 +++--- + drivers/media/platform/vimc/vimc-debayer.c | 85 +- + drivers/media/platform/vimc/vimc-scaler.c | 84 +- + drivers/media/platform/vimc/vimc-sensor.c | 74 +- + drivers/media/platform/vimc/vimc-streamer.c | 1 - + drivers/media/platform/vivid/vivid-vid-cap.c | 3 - + drivers/media/platform/vivid/vivid-vid-out.c | 3 - + drivers/media/usb/cx231xx/Kconfig | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 509 ++++-------- + drivers/media/usb/cx231xx/cx231xx-cards.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 172 ++--- + drivers/media/usb/cx231xx/cx231xx-vbi.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 795 +++++-------------- + drivers/media/usb/cx231xx/cx231xx.h | 30 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 30 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 2 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 1 + + drivers/staging/media/hantro/hantro.h | 20 +- + drivers/staging/media/hantro/hantro_drv.c | 16 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 7 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 11 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 11 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- + drivers/staging/media/hantro/hantro_h264.c | 64 +- + drivers/staging/media/hantro/hantro_hw.h | 4 +- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 16 +- + drivers/staging/media/hantro/rk3399_vpu_hw.c | 12 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 11 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 12 +- + drivers/staging/media/imx/imx-media-utils.c | 10 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 12 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 74 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.h | 1 + + include/media/cec.h | 31 - + include/uapi/linux/cec.h | 133 +++- + 78 files changed, 1934 insertions(+), 2500 deletions(-) + create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-conn-info.rst +Merging v4l-dvb-next/master (167f4555184b Merge branch fixes_for_upstream into to_next) +$ git merge v4l-dvb-next/master +Already up to date! +Merge made by the 'recursive' strategy. +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 (315ea754a4c4 Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (f75d2accca77 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (7e5705c635ec tools/power/cpupower: Fix initializer override in hsw_ext_cstates) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 - + 1 file changed, 1 deletion(-) +Merging opp/opp/linux-next (071afa50609d Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +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 +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (f3fceba5da5e RDMA/rxe: Verify modify_device mask) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/counters.c | 12 ++++++++- + drivers/infiniband/core/device.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 18 ------------- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 --- + drivers/infiniband/hw/bnxt_re/main.c | 1 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 4 +++ + drivers/infiniband/sw/siw/siw_cm.c | 45 ++++++------------------------- + drivers/infiniband/ulp/iser/iscsi_iser.c | 3 ++- + drivers/infiniband/ulp/iser/iscsi_iser.h | 8 ++---- + drivers/infiniband/ulp/iser/iser_memory.c | 6 ++--- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +++--- + 12 files changed, 36 insertions(+), 76 deletions(-) +Merging net-next/master (9077f052abd5 net: propagate errors correctly in register_netdevice()) +$ git merge net-next/master +Auto-merging net/vmw_vsock/virtio_transport_common.c +Auto-merging net/rds/ib.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +Auto-merging drivers/net/dsa/sja1105/sja1105_spi.c +Auto-merging drivers/net/dsa/sja1105/sja1105_main.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/sh_eth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/renesas,ether.yaml | 114 +++++++ + Documentation/devicetree/bindings/net/sh_eth.txt | 69 ----- + MAINTAINERS | 2 +- + drivers/net/caif/Kconfig | 16 +- + drivers/net/dsa/sja1105/sja1105.h | 16 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 65 ++-- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 12 +- + drivers/net/dsa/sja1105/sja1105_ethtool.c | 16 +- + drivers/net/dsa/sja1105/sja1105_main.c | 18 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 17 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 97 +++--- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 16 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 9 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 9 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 128 +++++--- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 32 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 13 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 28 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 3 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 + + drivers/net/phy/at803x.c | 33 +- + drivers/net/usb/ax88179_178a.c | 31 +- + drivers/net/usb/r8152.c | 128 +++----- + include/linux/netdevice.h | 20 +- + include/linux/stmmac.h | 1 + + include/net/dsa.h | 2 - + include/net/ipv6.h | 5 + + include/net/net_namespace.h | 6 +- + include/uapi/linux/if.h | 1 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/rtnetlink.h | 7 + + init/do_mounts.c | 49 +++ + net/caif/Kconfig | 10 +- + net/core/dev.c | 332 ++++++++++++++++++--- + net/core/net-procfs.c | 4 +- + net/core/rtnetlink.c | 206 +++++++++++-- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv6/addrconf.c | 7 +- + net/rds/ib.c | 10 +- + net/rds/ib.h | 15 +- + net/rds/ib_cm.c | 166 ++++++++--- + net/rds/ib_recv.c | 13 +- + net/rds/ib_send.c | 19 +- + net/sched/sch_generic.c | 7 +- + net/vmw_vsock/virtio_transport_common.c | 55 +++- + security/selinux/nlmsgtab.c | 4 +- + 52 files changed, 1316 insertions(+), 538 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/renesas,ether.yaml + delete mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt +Merging bpf-next/master (c58814637896 selftests/bpf: Correct path to include msg + path) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + tools/lib/bpf/libbpf.map | 3 +++ + tools/testing/selftests/bpf/cgroup_helpers.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging ipsec-next/master (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (fc603294267f net/mlx5: Set only stag for match untagged packets) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (fab401e1ee96 net/rds: Log vendor error if send/recv Work requests fail) +$ 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 c8719111e466] 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 (e5dc8d0d2672 ipvs: batch __ip_vs_dev_cleanup) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_xmit.c +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 2 +- + net/netfilter/ipvs/ip_vs_core.c | 47 ++++++++++++++++++++++++----------------- + net/netfilter/ipvs/ip_vs_ctl.c | 12 ++++++++--- + net/netfilter/ipvs/ip_vs_xmit.c | 18 ++++++---------- + 4 files changed, 44 insertions(+), 35 deletions(-) +Merging wireless-drivers-next/master (97ef12263fce Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/qcom,ath10k.txt | 6 + + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wireless/ath/ath10k/core.c | 58 ++- + drivers/net/wireless/ath/ath10k/core.h | 9 + + drivers/net/wireless/ath/ath10k/coredump.c | 38 +- + drivers/net/wireless/ath/ath10k/coredump.h | 1 + + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.c | 3 + + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 189 +++++++--- + drivers/net/wireless/ath/ath10k/mac.h | 1 + + drivers/net/wireless/ath/ath10k/pci.c | 62 ++-- + drivers/net/wireless/ath/ath10k/qmi.c | 48 ++- + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 22 ++ + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 + + drivers/net/wireless/ath/ath10k/sdio.c | 3 - + drivers/net/wireless/ath/ath10k/snoc.c | 387 ++++++--------------- + drivers/net/wireless/ath/ath10k/snoc.h | 30 +- + drivers/net/wireless/ath/ath10k/usb.c | 1 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 82 ++++- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 68 ++++ + drivers/net/wireless/ath/ath10k/wmi.c | 45 ++- + drivers/net/wireless/ath/ath10k/wmi.h | 27 ++ + drivers/net/wireless/ath/ath5k/pci.c | 3 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 1 - + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 23 +- + drivers/net/wireless/ath/ath9k/pci.c | 5 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 6 +- + drivers/net/wireless/ath/wil6210/wmi.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 53 ++- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 + + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 4 + + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 3 +- + drivers/net/wireless/marvell/libertas/if_sdio.c | 5 + + drivers/net/wireless/marvell/mwifiex/scan.c | 14 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + + drivers/net/wireless/realtek/rtlwifi/efuse.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 8 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- + drivers/net/wireless/realtek/rtw88/coex.c | 14 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 77 ++++ + drivers/net/wireless/realtek/rtw88/fw.h | 29 ++ + drivers/net/wireless/realtek/rtw88/hci.h | 6 + + drivers/net/wireless/realtek/rtw88/mac.c | 2 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 43 ++- + drivers/net/wireless/realtek/rtw88/main.c | 84 +++-- + drivers/net/wireless/realtek/rtw88/main.h | 32 +- + drivers/net/wireless/realtek/rtw88/pci.c | 77 +++- + drivers/net/wireless/realtek/rtw88/phy.c | 2 +- + drivers/net/wireless/realtek/rtw88/ps.c | 162 ++++++--- + drivers/net/wireless/realtek/rtw88/ps.h | 14 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 7 +- + drivers/net/wireless/realtek/rtw88/rx.c | 2 - + drivers/net/wireless/realtek/rtw88/sec.c | 21 ++ + drivers/net/wireless/realtek/rtw88/sec.h | 1 + + drivers/net/wireless/realtek/rtw88/tx.c | 2 - + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1 + + drivers/net/wireless/st/cw1200/fwio.c | 6 +- + drivers/net/wireless/st/cw1200/queue.c | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 3 +- + 72 files changed, 1240 insertions(+), 640 deletions(-) +Merging bluetooth/master (840aff3994c8 Bluetooth: btusb: Use IS_ENABLED instead of #ifdef) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btrtl.c | 2 +- + drivers/bluetooth/btusb.c | 34 ++++++++++++++++------------------ + drivers/bluetooth/hci_nokia.c | 2 +- + net/bluetooth/smp.c | 6 ------ + 4 files changed, 18 insertions(+), 26 deletions(-) +Merging mac80211-next/master (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f0b444b349e3 gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (2cfcfadb8e13 mtd: pmc551: Remove set but not used variable 'soff_lo') +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (f480b969448e mtd: rawnand: omap2: Fix number of bitflips reporting with ELM) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9607af6f857f mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9575d1a5c078 crypto: caam - Cast to long first before pointer conversion) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (c51785b9be2b drm/amdgpu/powerplay: fix typo in mvdd table setup) +$ git merge amdgpu/drm-next +Auto-merging include/uapi/linux/kfd_ioctl.h +CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h +Auto-merging include/uapi/drm/amdgpu_drm.h +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/renoir_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/renoir_ppt.c +Auto-merging 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/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +Auto-merging drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.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_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/Makefile +Resolved 'drivers/gpu/drm/amd/amdgpu/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_chardev.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_priv.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/powerplay/renoir_ppt.c' using previous resolution. +Resolved 'include/uapi/linux/kfd_ioctl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8ccc3d93633e] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu.rst | 30 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 80 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 69 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 143 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 286 ++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 214 +++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 214 +++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 173 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 74 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 128 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 77 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 145 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 85 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 104 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 38 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 70 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 84 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 99 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 66 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 407 +++++++++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 32 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 532 +++++++++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 200 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 99 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 94 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 158 ++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 280 ++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 50 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 363 +------------ + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 92 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 344 +++--------- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 380 ++++++++++++++ + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 41 ++ + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 206 +++++++- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 70 ++- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 41 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 65 ++- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 160 +----- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 114 ++-- + drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 37 ++ + drivers/gpu/drm/amd/amdgpu/umc_v6_0.h | 31 ++ + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 48 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 41 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 1 - + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 139 ++--- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 261 +++++----- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 59 ++- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 37 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 32 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 25 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/Makefile | 7 + + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 209 +++++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 31 ++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 342 ++++++++++++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 66 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 17 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 3 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 132 ++--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 173 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 112 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 87 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 + + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 26 +- + drivers/gpu/drm/amd/display/dc/dc.h | 24 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 86 ++- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 20 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 22 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 3 - + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 - + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 28 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 57 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 84 +-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 12 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 577 +++++++++++++++------ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 49 ++ + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 9 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 8 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 8 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 10 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 85 ++- + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 - + drivers/gpu/drm/amd/display/dc/hdcp/Makefile | 28 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 326 ++++++++++++ + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 3 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 + + drivers/gpu/drm/amd/display/include/hdcp_types.h | 96 ++++ + .../drm/amd/display/modules/freesync/freesync.c | 32 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 32 ++ + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 426 +++++++++++++++ + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 442 ++++++++++++++++ + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 531 +++++++++++++++++++ + .../amd/display/modules/hdcp/hdcp1_transition.c | 307 +++++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 305 +++++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 163 ++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 139 +++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 328 ++++++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 272 ++++++++++ + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 289 +++++++++++ + .../drm/amd/display/modules/power/power_helpers.c | 93 ++-- + .../drm/amd/display/modules/power/power_helpers.h | 1 + + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4 +- + .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 49 +- + .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 + + .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 ++++ + .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 176 +++++++ + .../amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h | 42 ++ + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 13 +- + drivers/gpu/drm/amd/include/vega10_enum.h | 1 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 261 ++++++---- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 20 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 41 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +- + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 21 +- + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 333 +++++++++++- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 45 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 92 +++- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 2 - + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 4 +- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 11 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 44 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 64 +-- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 190 ++++--- + include/drm/amd_asic_type.h | 56 +- + include/drm/ttm/ttm_bo_api.h | 14 + + include/linux/device_cgroup.h | 19 +- + include/uapi/drm/amdgpu_drm.h | 2 + + security/device_cgroup.c | 15 +- + 251 files changed, 11457 insertions(+), 4198 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dm_cp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c + create mode 100644 drivers/gpu/drm/amd/display/include/hdcp_types.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h +Merging drm-intel/for-linux-next (458863e08e13 drm/i915: Mark contents as dirty on a write fault) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++++++++- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 12 +++++++----- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 --- + drivers/gpu/drm/i915/gt/intel_lrc.c | 21 ++++++++++++--------- + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++----- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ + drivers/gpu/drm/i915/i915_drv.c | 5 +++++ + drivers/gpu/drm/i915/i915_request.c | 25 ++++++++++++++++++++++--- + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 ++++++ + 11 files changed, 74 insertions(+), 28 deletions(-) +Merging drm-tegra/drm/tegra/for-next (9d5a54987265 drm/tegra: Fix ordering of cleanup code) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/drm.c | 14 +++++++------- + drivers/gpu/drm/tegra/sor.c | 24 +++++++++++------------- + 2 files changed, 18 insertions(+), 20 deletions(-) +Merging drm-misc/for-linux-next (4092de1ba34e Merge drm/drm-next into drm-misc-next) +$ git merge drm-misc/for-linux-next +Removing include/drm/drm_vram_mm_helper.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Removing drivers/gpu/drm/virtio/virtgpu_ttm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Removing drivers/gpu/drm/drm_vram_mm_helper.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c'. +[master 7f8ab3dc8186] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 5 + + .../devicetree/bindings/display/bridge/anx7814.txt | 6 +- + Documentation/gpu/drm-mm.rst | 11 +- + Documentation/gpu/todo.rst | 12 + + MAINTAINERS | 12 + + drivers/dma-buf/dma-resv.c | 2 +- + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 1 + + drivers/gpu/drm/arm/display/Kconfig | 6 + + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 86 ++- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 41 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 76 ++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 77 ++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 20 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 30 +- + drivers/gpu/drm/arm/display/komeda/komeda_event.c | 140 ++++ + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 14 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 30 +- + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 1 - + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 33 +- + drivers/gpu/drm/ast/ast_ttm.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/bochs/Kconfig | 2 + + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 3 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 28 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 3 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/lvds-encoder.c | 3 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 + + drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 + + drivers/gpu/drm/bridge/panel.c | 70 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 1 + + drivers/gpu/drm/bridge/sii902x.c | 1 + + drivers/gpu/drm/bridge/sii9234.c | 1 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 21 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 2 + + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +- + drivers/gpu/drm/bridge/tc358764.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 + + drivers/gpu/drm/bridge/ti-tfp410.c | 1 + + drivers/gpu/drm/cirrus/cirrus.c | 2 +- + drivers/gpu/drm/drm_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + drivers/gpu/drm/drm_blend.c | 7 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_connector.c | 142 ++-- + drivers/gpu/drm/drm_crtc_helper.c | 23 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 3 + + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_cec.c | 25 +- + drivers/gpu/drm/drm_dp_helper.c | 8 + + drivers/gpu/drm/drm_dp_mst_topology.c | 725 ++++++++++++++------- + drivers/gpu/drm/drm_dp_mst_topology_internal.h | 24 + + drivers/gpu/drm/drm_drv.c | 17 - + drivers/gpu/drm/drm_dsc.c | 23 +- + drivers/gpu/drm/drm_edid.c | 108 ++- + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_encoder.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_gem_ttm_helper.c | 56 ++ + drivers/gpu/drm/drm_gem_vram_helper.c | 660 +++++++++++++++---- + drivers/gpu/drm/drm_memory.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 9 +- + drivers/gpu/drm/drm_of.c | 5 - + drivers/gpu/drm/drm_panel.c | 14 +- + drivers/gpu/drm/drm_print.c | 60 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_syncobj.c | 1 + + drivers/gpu/drm/drm_trace.h | 14 +- + drivers/gpu/drm/drm_vblank.c | 54 +- + drivers/gpu/drm/drm_vram_helper_common.c | 8 +- + drivers/gpu/drm/drm_vram_mm_helper.c | 297 --------- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 + + drivers/gpu/drm/exynos/exynos_hdmi.c | 32 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 + + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 + + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda9950.c | 12 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 1 + + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +- + drivers/gpu/drm/i915/i915_drv.c | 41 +- + drivers/gpu/drm/imx/imx-ldb.c | 1 + + drivers/gpu/drm/imx/parallel-display.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm.c | 5 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 1 + + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + + drivers/gpu/drm/meson/meson_drv.c | 32 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 110 +++- + drivers/gpu/drm/meson/meson_vclk.c | 9 +- + drivers/gpu/drm/mgag200/Kconfig | 2 + + drivers/gpu/drm/mgag200/mgag200_cursor.c | 22 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 11 - + drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/edp/edp.c | 4 +- + drivers/gpu/drm/msm/edp/edp.h | 1 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 2 + + drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 + + drivers/gpu/drm/omapdrm/dss/output.c | 1 + + drivers/gpu/drm/omapdrm/omap_drv.c | 1 + + drivers/gpu/drm/omapdrm/omap_encoder.c | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 5 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 5 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 5 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 5 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 5 +- + drivers/gpu/drm/panel/panel-lvds.c | 26 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 5 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 5 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 5 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 5 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 5 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 5 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 5 +- + drivers/gpu/drm/panel/panel-simple.c | 29 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 5 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_issues.h | 81 +++ + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.c | 10 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_object.c | 13 + + drivers/gpu/drm/qxl/qxl_ttm.c | 1 + + drivers/gpu/drm/radeon/radeon_connectors.c | 27 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 + + drivers/gpu/drm/rockchip/rockchip_rgb.c | 4 +- + drivers/gpu/drm/selftests/Makefile | 2 +- + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 2 + + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 238 +++++++ + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 2 +- + .../gpu/drm/selftests/test-drm_modeset_common.h | 2 + + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 3 +- + drivers/gpu/drm/sti/sti_hdmi.c | 26 +- + drivers/gpu/drm/sti/sti_tvout.c | 10 +- + drivers/gpu/drm/sti/sti_vtg.c | 2 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 5 +- + drivers/gpu/drm/stm/ltdc.c | 39 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 1 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 22 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 + + drivers/gpu/drm/tilcdc/tilcdc_external.c | 5 +- + drivers/gpu/drm/tiny/Kconfig | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 14 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/udl/udl_connector.c | 8 - + drivers/gpu/drm/v3d/v3d_drv.c | 3 + + drivers/gpu/drm/v3d/v3d_gem.c | 55 +- + drivers/gpu/drm/vboxvideo/Kconfig | 2 + + drivers/gpu/drm/vboxvideo/vbox_drv.h | 2 - + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 3 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 3 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 5 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 131 ++-- + drivers/gpu/drm/virtio/virtgpu_fence.c | 4 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 183 ++++-- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 228 +++---- + drivers/gpu/drm/virtio/virtgpu_kms.c | 15 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 270 +++----- + drivers/gpu/drm/virtio/virtgpu_plane.c | 51 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 34 - + drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 --------- + drivers/gpu/drm/virtio/virtgpu_vq.c | 215 ++++-- + drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + drivers/video/fbdev/core/fbmem.c | 17 +- + drivers/video/fbdev/sa1100fb.c | 13 - + drivers/video/hdmi.c | 8 +- + include/drm/bridge/dw_hdmi.h | 1 + + include/drm/drm_bridge.h | 33 +- + include/drm/drm_connector.h | 25 +- + include/drm/drm_crtc.h | 1 - + include/drm/drm_dp_helper.h | 59 +- + include/drm/drm_dp_mst_helper.h | 12 +- + include/drm/drm_drv.h | 2 - + include/drm/drm_encoder.h | 6 +- + include/drm/drm_fb_helper.h | 6 +- + include/drm/drm_gem_ttm_helper.h | 19 + + include/drm/drm_gem_vram_helper.h | 107 ++- + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_modeset_lock.h | 9 + + include/drm/drm_panel.h | 13 +- + include/drm/drm_prime.h | 2 - + include/drm/drm_print.h | 26 + + include/drm/drm_rect.h | 31 + + include/drm/drm_vblank.h | 15 +- + include/drm/drm_vram_mm_helper.h | 104 --- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/linux/fb.h | 2 +- + include/uapi/drm/v3d_drm.h | 8 +- + 266 files changed, 3971 insertions(+), 2464 deletions(-) + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c + create mode 100644 drivers/gpu/drm/drm_dp_mst_topology_internal.h + create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c + delete mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c + create mode 100644 include/drm/drm_gem_ttm_helper.h + delete mode 100644 include/drm/drm_vram_mm_helper.h +Merging drm-msm/msm-next (9f614197c744 drm/msm: Use the correct dma_sync calls harder) +$ 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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (dbcc574a4bfa drm/etnaviv: fix missing unlock on error in etnaviv_iommuv1_context_alloc()) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (f41f900568d9 ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (18762dd37fe7 Merge branch 'asoc-5.5' into asoc-next) +$ git merge sound-asoc/for-next +Removing Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt +Merge made by the 'recursive' strategy. + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 38 + + .../devicetree/bindings/sound/arndale.txt | 5 +- + .../devicetree/bindings/sound/fsl,mqs.txt | 36 + + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 4 +- + .../bindings/sound/sun8i-codec-analog.txt | 17 - + .../devicetree/bindings/sound/tas2770.txt | 37 + + include/sound/dmaengine_pcm.h | 5 + + include/sound/soc-component.h | 4 - + include/sound/soc.h | 1 - + include/sound/sof/stream.h | 4 +- + sound/core/pcm_dmaengine.c | 83 +++ + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- + sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1761.c | 129 ++++ + sound/soc/codecs/madera.h | 2 + + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/tas2770.c | 808 +++++++++++++++++++++ + sound/soc/codecs/tas2770.h | 164 +++++ + sound/soc/codecs/wcd9335.c | 10 +- + sound/soc/codecs/wm8994.c | 156 +++- + sound/soc/codecs/wm8994.h | 10 +- + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_asrc.c | 65 +- + sound/soc/fsl/fsl_asrc.h | 7 +- + sound/soc/fsl/fsl_asrc_dma.c | 64 +- + sound/soc/fsl/fsl_mqs.c | 333 +++++++++ + sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +- + sound/soc/soc-core.c | 186 ++--- + sound/soc/soc-generic-dmaengine-pcm.c | 61 +- + sound/soc/soc-pcm.c | 64 +- + sound/soc/sof/Kconfig | 16 + + sound/soc/sof/core.c | 28 +- + sound/soc/sof/debug.c | 16 + + sound/soc/sof/intel/bdw.c | 22 +- + sound/soc/sof/intel/byt.c | 23 +- + sound/soc/sof/intel/hda-pcm.c | 15 +- + sound/soc/sof/ipc.c | 10 +- + sound/soc/sof/sof-priv.h | 17 +- + sound/soc/sof/trace.c | 17 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 9 +- + 43 files changed, 2253 insertions(+), 266 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2770.txt + create mode 100644 sound/soc/codecs/tas2770.c + create mode 100644 sound/soc/codecs/tas2770.h + create mode 100644 sound/soc/fsl/fsl_mqs.c +Merging modules/modules-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge modules/modules-next +Already up to date. +Merging input/next (463fa44eec2f Input: atmel_mxt_ts - disable IRQ across suspend) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging block/for-next (dd8f920bbca1 Merge branch 'for-5.4/io_uring' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (afa179eb6038 dm: introduce DM_GET_TARGET_VERSION) +$ 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 (25812fcf7403 mmc: mmci: make unexported functions static) +$ git merge mmc/next +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 59 ++ + .../devicetree/bindings/mmc/renesas,sdhi.txt | 1 + + .../devicetree/bindings/mmc/sdhci-milbeaut.txt | 30 + + MAINTAINERS | 2 + + drivers/memstick/host/jmb38x_ms.c | 12 +- + drivers/mmc/host/Kconfig | 19 + + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/bcm2835.c | 4 +- + drivers/mmc/host/cavium-octeon.c | 15 +- + drivers/mmc/host/dw_mmc.c | 4 +- + drivers/mmc/host/mmci.c | 20 +- + drivers/mmc/host/owl-mmc.c | 696 +++++++++++++++++++++ + drivers/mmc/host/sdhci-milbeaut.c | 362 +++++++++++ + drivers/mmc/host/sdhci-pci-core.c | 51 +- + drivers/mmc/host/sdhci.c | 11 + + drivers/mmc/host/sdhci_f_sdh30.c | 26 +- + drivers/mmc/host/sdhci_f_sdh30.h | 32 + + drivers/mmc/host/tmio_mmc_core.c | 9 - + 18 files changed, 1286 insertions(+), 69 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/owl-mmc.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-milbeaut.txt + create mode 100644 drivers/mmc/host/owl-mmc.c + create mode 100644 drivers/mmc/host/sdhci-milbeaut.c + create mode 100644 drivers/mmc/host/sdhci_f_sdh30.h +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 3aa03fea6b4b] 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 (81281b0a477c mfd: intel-lpss: Add default I2C device properties for Gemini Lake) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) +Merging backlight/for-backlight-next (c0b64faf0fe6 backlight: pwm_bl: Set scale type for brightness curves specified in the DT) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7f7378618b41 power: supply: cpcap-charger: Enable vbus boost voltage) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (f9f6bfdb3c19 Merge branch 'regulator-5.5' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 21 +++++ + .../bindings/regulator/qcom,spmi-regulator.txt | 25 ++++++ + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/da9063-regulator.c | 9 +-- + drivers/regulator/pbias-regulator.c | 6 +- + drivers/regulator/pcap-regulator.c | 4 - + drivers/regulator/qcom_smd-regulator.c | 92 ++++++++++++++++++++++ + drivers/regulator/qcom_spmi-regulator.c | 41 ++++++++++ + 8 files changed, 185 insertions(+), 14 deletions(-) +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +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 (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (1f96e0f129eb Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/request_key_auth.c +Auto-merging security/keys/request_key.c +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/digsig.c +Auto-merging net/wireless/reg.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/usb.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/ubifs/auth.c +Auto-merging fs/ecryptfs/keystore.c +CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/nvdimm/security.c +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/base/Kconfig +Auto-merging certs/system_keyring.c +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging Documentation/ioctl/ioctl-number.rst +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/crypto/keyinfo.c +rm 'fs/crypto/keyinfo.c' +$ git commit --no-edit -v -a +[master 3bdccdc816f3] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.rst | 1 + + Documentation/security/keys/core.rst | 186 ++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 124 +-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/security.h | 32 +- + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/keyctl.h | 68 ++ + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 8 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +- + security/keys/keyctl.c | 201 ++++- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 30 +- + security/smack/smack_lsm.c | 85 +- + 93 files changed, 3583 insertions(+), 354 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +[master a2a446d9ca5f] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Oct 4 11:26:02 2019 +1000 +$ git am -3 ../patches/0001-fscrypt-merge-resolution-for-keys-Replace-uid-gid-pe.patch +Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/crypto/keyring.c +M fs/crypto/keysetup_v1.c +$ git add -A . +$ git commit -v -a --amend +[master d2284840f17d] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Oct 4 11:26:02 2019 +1000 +$ git am -3 ../patches/0001-dm-verity-merge-fix-for-keys-Replace-uid-gid-perm-pe.patch +Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-verity-verify-sig.c +$ git add -A . +$ git commit -v -a --amend +[master f4ba99da94d0] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Oct 4 11:26:02 2019 +1000 +Merging selinux/next (3e3e24b42043 selinux: allow labeling before policy is loaded) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 12 ++++++++++++ + security/selinux/selinuxfs.c | 4 ---- + 2 files changed, 12 insertions(+), 4 deletions(-) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (dc6b8f4f1579 Merge remote-tracking branch 'upstream/master') +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/tomoyo.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging tpmdd/next (e13cd21ffd50 tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (ca2fc5efffde watchdog: f71808e_wdt: Add F81803 support) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (142dfcda5a35 Merge branch 'iommu/fixes' into next) +$ git merge iommu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (245d73698ed7 audit: Report suspicious O_CREAT usage) +$ git merge audit/next +Merge made by the 'recursive' strategy. + fs/namei.c | 8 ++++++-- + include/linux/audit.h | 5 +++-- + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 11 ++++++----- + 4 files changed, 16 insertions(+), 9 deletions(-) +Merging devicetree/for-next (7329c06816a4 dt-bindings: watchdog: meson-gxbb-wdt: Include generic watchdog bindings) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +Removing Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt +Removing Documentation/devicetree/bindings/rtc/s3c-rtc.txt +Removing Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt +Removing Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-reboot.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt +Removing Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt +Removing Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +Removing Documentation/devicetree/bindings/input/mpr121-touchkey.txt +Removing Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt +Removing Documentation/devicetree/bindings/gpu/samsung-scaler.txt +Removing Documentation/devicetree/bindings/gpu/samsung-rotator.txt +Removing Documentation/devicetree/bindings/gpu/samsung-g2d.txt +Removing Documentation/devicetree/bindings/bus/simple-pm-bus.txt +Removing Documentation/devicetree/bindings/bus/renesas,bsc.txt +Removing Documentation/devicetree/bindings/arm/samsung/sysreg.txt +Removing Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt +Removing Documentation/devicetree/bindings/arm/samsung/pmu.txt +Removing Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/exynos-chipid.txt | 12 -- + .../bindings/arm/samsung/exynos-chipid.yaml | 25 +++ + .../devicetree/bindings/arm/samsung/pmu.txt | 72 -------- + .../devicetree/bindings/arm/samsung/pmu.yaml | 105 ++++++++++++ + .../bindings/arm/samsung/samsung-boards.txt | 83 ---------- + .../bindings/arm/samsung/samsung-boards.yaml | 181 +++++++++++++++++++++ + .../arm/samsung/samsung-secure-firmware.yaml | 31 ++++ + .../devicetree/bindings/arm/samsung/sysreg.txt | 19 --- + .../devicetree/bindings/arm/samsung/sysreg.yaml | 45 +++++ + .../devicetree/bindings/bus/renesas,bsc.txt | 46 ------ + .../devicetree/bindings/bus/renesas,bsc.yaml | 60 +++++++ + .../devicetree/bindings/bus/simple-pm-bus.txt | 44 ----- + .../devicetree/bindings/bus/simple-pm-bus.yaml | 75 +++++++++ + .../devicetree/bindings/gpu/samsung-g2d.txt | 27 --- + .../devicetree/bindings/gpu/samsung-g2d.yaml | 75 +++++++++ + .../devicetree/bindings/gpu/samsung-rotator.txt | 28 ---- + .../devicetree/bindings/gpu/samsung-rotator.yaml | 48 ++++++ + .../devicetree/bindings/gpu/samsung-scaler.txt | 27 --- + .../devicetree/bindings/gpu/samsung-scaler.yaml | 81 +++++++++ + .../bindings/iio/adc/samsung,exynos-adc.txt | 107 ------------ + .../bindings/iio/adc/samsung,exynos-adc.yaml | 151 +++++++++++++++++ + .../bindings/input/fsl,mpr121-touchkey.yaml | 66 ++++++++ + Documentation/devicetree/bindings/input/input.yaml | 25 +++ + .../devicetree/bindings/input/mpr121-touchkey.txt | 30 ---- + .../bindings/interrupt-controller/renesas,irqc.txt | 48 ------ + .../interrupt-controller/renesas,irqc.yaml | 86 ++++++++++ + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 67 -------- + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 108 ++++++++++++ + .../bindings/power/reset/syscon-poweroff.txt | 30 ---- + .../bindings/power/reset/syscon-poweroff.yaml | 60 +++++++ + .../bindings/power/reset/syscon-reboot.txt | 30 ---- + .../bindings/power/reset/syscon-reboot.yaml | 60 +++++++ + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 40 ----- + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 77 +++++++++ + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 35 ---- + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 69 ++++++++ + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 31 ---- + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 85 ++++++++++ + .../bindings/timer/samsung,exynos4210-mct.txt | 88 ---------- + .../bindings/timer/samsung,exynos4210-mct.yaml | 124 ++++++++++++++ + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 3 + + .../devicetree/bindings/watchdog/samsung-wdt.txt | 35 ---- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 74 +++++++++ + drivers/of/fdt.c | 4 +- + 44 files changed, 1716 insertions(+), 901 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml + create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-secure-firmware.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt + create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml + create mode 100644 Documentation/devicetree/bindings/input/fsl,mpr121-touchkey.yaml + create mode 100644 Documentation/devicetree/bindings/input/input.yaml + delete mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt + create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml +Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (18b9802df190 Merge branch 'spi-5.5' into spi-next) +$ git merge spi/for-next +Removing Documentation/devicetree/bindings/spi/spi-sifive.txt +Removing Documentation/devicetree/bindings/spi/sh-hspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/renesas,hspi.yaml | 57 ++++++++++++++ + .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 +++ + Documentation/devicetree/bindings/spi/sh-hspi.txt | 26 ------- + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 3 +- + .../devicetree/bindings/spi/spi-sifive.txt | 37 ---------- + .../devicetree/bindings/spi/spi-sifive.yaml | 86 ++++++++++++++++++++++ + drivers/spi/spi-atmel.c | 24 ------ + drivers/spi/spi-dw-mmio.c | 1 + + drivers/spi/spi-dw-pci.c | 13 +++- + drivers/spi/spi-dw.c | 8 ++ + drivers/spi/spi-fsl-dspi.c | 20 +++++ + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 17 +++++ + drivers/spi/spi-lantiq-ssc.c | 10 +-- + drivers/spi/spi-mt65xx.c | 11 +-- + drivers/spi/spi-mxic.c | 2 +- + drivers/spi/spi-slave-mt27xx.c | 12 +-- + drivers/spi/spi-xtensa-xtfpga.c | 10 +-- + 18 files changed, 219 insertions(+), 131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/renesas,hspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt + delete mode 100644 Documentation/devicetree/bindings/spi/sh-hspi.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.yaml +Merging tip/auto-latest (a5b576bfb3ba Merge branch 'core/objtool') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 3 +- + arch/x86/Kconfig.cpu | 25 +++++--- + arch/x86/Makefile_32.cpu | 1 + + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/include/asm/cpu_entry_area.h | 2 +- + arch/x86/include/asm/module.h | 2 + + arch/x86/include/asm/pgtable-3level.h | 46 ++++++++------- + arch/x86/include/asm/pti.h | 2 +- + arch/x86/kernel/cpu/intel.c | 8 +-- + arch/x86/kernel/cpu/mce/amd.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 93 +++++++++++++++++++++++++----- + arch/x86/kernel/cpu/mce/intel.c | 10 ++-- + arch/x86/kernel/cpu/mce/internal.h | 6 ++ + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/microcode/core.c | 36 +++++++----- + arch/x86/kernel/cpu/microcode/intel.c | 5 +- + arch/x86/kernel/cpu/rdrand.c | 22 ++++++- + arch/x86/kernel/process.h | 2 +- + arch/x86/kernel/traps.c | 5 -- + arch/x86/math-emu/fpu_system.h | 6 +- + arch/x86/math-emu/reg_ld_str.c | 6 +- + arch/x86/realmode/rm/realmode.lds.S | 1 + + arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + tools/arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + 25 files changed, 204 insertions(+), 93 deletions(-) +Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated) +$ git merge clockevents/clockevents/next +Auto-merging kernel/time/posix-timers.c +CONFLICT (content): Merge conflict in kernel/time/posix-timers.c +Auto-merging drivers/clocksource/timer-of.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Resolved 'kernel/time/posix-timers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f67e0e8b2a5c] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/edac-for-next (f05390d30e20 EDAC: skx_common: get rid of unused type var) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/i5100_edac.c | 2 -- + drivers/edac/i5400_edac.c | 15 +++------------ + drivers/edac/i7300_edac.c | 4 ++-- + drivers/edac/sb_edac.c | 21 ++++++++------------- + drivers/edac/skx_common.c | 5 +---- + 5 files changed, 14 insertions(+), 33 deletions(-) +Merging irqchip/irq/irqchip-next (bb0fed1c60cc irqchip/sifive-plic: Switch to fasteoi flow) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-sifive-plic.c +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/atmel,aic.txt | 7 ++++-- + drivers/irqchip/irq-al-fic.c | 12 +++++++++ + drivers/irqchip/irq-atmel-aic5.c | 10 ++++++++ + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 29 +++++++++++----------- + 5 files changed, 43 insertions(+), 17 deletions(-) +Merging ftrace/for-next (8ed4889eb831 selftests/ftrace: Fix same probe error test) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (049b405029c0 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (fd3edd4a9066 KVM: nVMX: cleanup and fix host 64-bit mode checks) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (14933b51fbe7 KVM: arm64: pmu: Fix cycle counter truncation on counter stop) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/switch.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_hyp.h | 24 ------------------------ + arch/arm64/kvm/hyp/switch.c | 17 ++--------------- + arch/arm64/kvm/hyp/tlb.c | 36 ++++++++++++++++++++++-------------- + virt/kvm/arm/pmu.c | 4 +++- + virt/kvm/arm/vgic/trace.h | 2 +- + 5 files changed, 28 insertions(+), 55 deletions(-) +Merging kvm-ppc/kvm-ppc-next (ff42df49e75f KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0af2889f89bb KVM: s390: Remove unused parameter from __inject_sigp_restart()) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging xen-tip/linux-next (a8fabb38525c xen/xenbus: fix self-deadlock after killing user process) +$ git merge xen-tip/linux-next +Removing arch/arm64/include/asm/xen/xen-ops.h +Auto-merging arch/arm/xen/mm.c +Removing arch/arm/xen/efi.c +Removing arch/arm/include/asm/xen/xen-ops.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/xen/xen-ops.h | 6 --- + arch/arm/xen/Makefile | 1 - + arch/arm/xen/efi.c | 28 ----------- + arch/arm/xen/enlighten.c | 3 +- + arch/arm/xen/mm.c | 5 +- + arch/arm64/include/asm/xen/xen-ops.h | 7 --- + arch/arm64/xen/Makefile | 1 - + arch/x86/xen/efi.c | 14 +----- + drivers/xen/balloon.c | 24 +++------ + drivers/xen/efi.c | 84 ++++++++++++++++++-------------- + drivers/xen/xenbus/xenbus_dev_frontend.c | 20 +++++++- + include/xen/xen-ops.h | 25 +--------- + 12 files changed, 79 insertions(+), 139 deletions(-) + delete mode 100644 arch/arm/include/asm/xen/xen-ops.h + delete mode 100644 arch/arm/xen/efi.c + delete mode 100644 arch/arm64/include/asm/xen/xen-ops.h +Merging percpu/for-next (69f98a60cdbb Merge branch 'for-5.4' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (30ae2fc0a75e workqueue: Minor follow-ups to the rescuer destruction change) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (e6679fd1e2fc platform/chrome: wilco_ec: Add debugfs test_event file) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/wilco_ec/debugfs.c | 47 +++++++++++++++++++++++------- + 1 file changed, 37 insertions(+), 10 deletions(-) +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (7ae4717cb9cb leds: core: Fix leds.h structure documentation) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-led-driver-el15203000 | 139 ++++++++ + .../devicetree/bindings/leds/leds-el15203000.txt | 69 ++++ + drivers/leds/Kconfig | 17 +- + drivers/leds/Makefile | 1 + + drivers/leds/led-class-flash.c | 50 +++ + drivers/leds/led-class.c | 10 +- + drivers/leds/led-triggers.c | 90 ++++-- + drivers/leds/leds-bcm6328.c | 7 +- + drivers/leds/leds-bcm6358.c | 7 +- + drivers/leds/leds-el15203000.c | 357 +++++++++++++++++++++ + drivers/leds/leds-lm3601x.c | 4 +- + drivers/leds/leds-lm3692x.c | 47 ++- + drivers/leds/leds-tlc591xx.c | 90 ++---- + drivers/leds/leds.h | 6 + + include/linux/led-class-flash.h | 41 ++- + include/linux/leds.h | 105 +++--- + 16 files changed, 845 insertions(+), 195 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000 + create mode 100644 Documentation/devicetree/bindings/leds/leds-el15203000.txt + create mode 100644 drivers/leds/leds-el15203000.c +Merging ipmi/for-next (c9acc3c4f8e4 ipmi_si_intf: Fix race in timer shutdown handling) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (18a93cd38be3 usb: gadget: net2280: Add workaround for AB chip Errata 11) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (f14ac41f977f usb: chipidea: core: change vbus-regulator as optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 8 +++++ + drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/udc.c | 73 ++++++++++++++++++++------------------ + drivers/usb/chipidea/usbmisc_imx.c | 31 +++++++++++----- + 5 files changed, 72 insertions(+), 44 deletions(-) +Merging phy-next/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (e81b88932985 extcon-intel-cht-wc: Don't reset USB data connection at probe) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) +Merging soundwire/next (dfcff3f8a5f1 soundwire: stream: make stream name a const pointer) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (9cc05ed4df03 staging: fieldbus: move "offline mode" definition to fieldbus core) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/board/armadillo800eva.c | 12 +- + drivers/staging/fieldbus/anybuss/anybuss-client.h | 11 +- + drivers/staging/fieldbus/anybuss/hms-profinet.c | 2 +- + drivers/staging/fieldbus/anybuss/host.c | 6 +- + drivers/staging/fieldbus/dev_core.c | 3 - + drivers/staging/fieldbus/fieldbus_dev.h | 6 + + drivers/staging/isdn/gigaset/interface.c | 2 +- + drivers/staging/olpc_dcon/Kconfig | 21 +-- + drivers/staging/olpc_dcon/Makefile | 4 +- + drivers/staging/olpc_dcon/TODO | 1 - + drivers/staging/olpc_dcon/olpc_dcon.c | 6 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 5 - + drivers/staging/qlge/qlge_dbg.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 55 +++---- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 8 +- + drivers/staging/rtl8192u/r8192U_core.c | 127 ++++----------- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 - + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 23 +-- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1 - + drivers/staging/rtl8723bs/core/rtw_security.c | 1 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 15 -- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 - + drivers/staging/rtl8723bs/hal/odm_DIG.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 56 +------ + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - + drivers/staging/sm750fb/ddk750_chip.c | 38 ++--- + drivers/staging/sm750fb/ddk750_chip.h | 18 +-- + drivers/staging/sm750fb/ddk750_mode.c | 8 +- + drivers/staging/vt6656/main_usb.c | 8 +- + drivers/staging/wilc1000/wilc_hif.c | 8 +- + drivers/staging/wilc1000/wilc_netdev.c | 131 +++++++++------ + drivers/staging/wilc1000/wilc_spi.c | 11 ++ + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 188 ++++++++++------------ + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 + + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + 45 files changed, 325 insertions(+), 492 deletions(-) +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 (6311b6521bcc drivers: qcom: Add BCM vote macro to header) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (c5c6faaee6e0 dmaengine: ti: edma: Use bitmap_set() instead of open coded edma_set_bits()) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (275278e1525a Merge branch 'for-5.3-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (e41df1533a4f Merge remote-tracking branch 'mkp-scsi/5.4/scsi-postmerge' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/scsi_lib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging scsi-mkp/for-next (d4717f27dbd0 Merge branch '5.5/scsi-queue' into 5.5/scsi-next) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/bfa/bfad.c | 3 +- + drivers/scsi/bfa/bfad_attr.c | 4 +- + drivers/scsi/csiostor/csio_hw.c | 20 +- + drivers/scsi/csiostor/csio_mb.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 28 --- + drivers/scsi/fnic/vnic_dev.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 1 - + drivers/scsi/lpfc/lpfc_attr.c | 32 ++- + drivers/scsi/lpfc/lpfc_crtn.h | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 6 + + drivers/scsi/lpfc/lpfc_els.c | 24 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 144 ++++++++---- + drivers/scsi/lpfc/lpfc_hw4.h | 2 + + drivers/scsi/lpfc/lpfc_init.c | 66 +++--- + drivers/scsi/lpfc/lpfc_nportdisc.c | 141 +++++++++--- + drivers/scsi/lpfc/lpfc_nvme.c | 73 +++--- + drivers/scsi/lpfc/lpfc_nvmet.c | 53 ++--- + drivers/scsi/lpfc/lpfc_scsi.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 149 ++++++++---- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 36 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 15 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 344 ++++++++++++++++++++++++---- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 9 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 + + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 12 +- + drivers/scsi/mvsas/mv_sas.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 8 + + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/scsi.c | 4 + + drivers/scsi/scsi_logging.c | 10 +- + drivers/scsi/scsi_sysfs.c | 22 +- + drivers/scsi/sd.c | 4 + + drivers/scsi/smartpqi/smartpqi_init.c | 15 +- + drivers/scsi/ufs/ufs-hisi.c | 5 +- + drivers/scsi/ufs/ufs-mediatek.c | 3 + + drivers/scsi/ufs/ufshcd-dwc.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 9 + + drivers/scsi/ufs/ufshcd.h | 10 + + include/scsi/scsi_device.h | 5 +- + include/scsi/scsi_host.h | 3 + + 43 files changed, 916 insertions(+), 375 deletions(-) +Merging vhost/linux-next (0d4a3f2abbef Revert "vhost: block speculation of translated descriptors") +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (741dc0aa4122 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (367677d49839 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (5ede17d61592 dt-bindings: gpio: rcar: Add DT binding for r8a774b1) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + + Documentation/driver-api/gpio/driver.rst | 4 +++ + drivers/gpio/gpio-mxc.c | 13 +++++-- + drivers/gpio/gpiolib.c | 42 ++++++++++------------ + 4 files changed, 33 insertions(+), 27 deletions(-) +Merging gpio-intel/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (cb0438e44360 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (81420020e691 pwm: sun4i: Drop redundant assignment to variable pval) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm-mediatek.txt | 2 +- + drivers/pwm/pwm-sun4i.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (870e0167cd9c Merge tag 'compat-ioctl-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Auto-merging lib/iov_iter.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/watchdog/f71808e_wdt.c +Auto-merging drivers/watchdog/ath79_wdt.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/vhost/vsock.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/class/usbtmc.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging drivers/rtc/rtc-ds1374.c +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/pci/switch/switchtec.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/net/tap.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/hwtracing/stm/core.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/dma-buf/sync_file.c +Auto-merging drivers/dma-buf/sw_sync.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/char/random.c +Auto-merging drivers/char/ppdev.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/android/binder.c +Auto-merging arch/um/drivers/hostaudio_kern.c +Merge made by the 'recursive' strategy. + Documentation/networking/ppp_generic.txt | 2 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + block/scsi_ioctl.c | 132 +++- + drivers/android/binder.c | 2 +- + drivers/block/pktcdvd.c | 25 + + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ppdev.c | 12 +- + drivers/char/random.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwtracing/stm/core.c | 12 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/isdn/capi/capi.c | 31 + + drivers/media/rc/lirc_dev.c | 4 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ppp/ppp_generic.c | 245 +++++--- + drivers/net/tap.c | 12 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rtc/dev.c | 13 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-vr41xx.c | 10 + + drivers/s390/char/tape_char.c | 41 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 28 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/sd.c | 14 +- + drivers/scsi/sg.c | 59 +- + drivers/scsi/st.c | 28 +- + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/pi433/pi433_if.c | 12 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/tty_io.c | 5 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 12 +- + drivers/vfio/vfio.c | 39 +- + drivers/vhost/net.c | 12 +- + drivers/vhost/scsi.c | 12 +- + drivers/vhost/test.c | 12 +- + drivers/vhost/vsock.c | 12 +- + drivers/video/fbdev/aty/atyfb_base.c | 12 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/watchdog/acquirewdt.c | 1 + + drivers/watchdog/advantechwdt.c | 1 + + drivers/watchdog/alim1535_wdt.c | 1 + + drivers/watchdog/alim7101_wdt.c | 1 + + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 1 + + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + drivers/watchdog/cpu5wdt.c | 1 + + drivers/watchdog/eurotechwdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 1 + + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/geodewdt.c | 1 + + drivers/watchdog/ib700wdt.c | 1 + + drivers/watchdog/ibmasr.c | 1 + + drivers/watchdog/indydog.c | 1 + + drivers/watchdog/intel_scu_watchdog.c | 1 + + drivers/watchdog/iop_wdt.c | 1 + + drivers/watchdog/it8712f_wdt.c | 1 + + drivers/watchdog/ixp4xx_wdt.c | 1 + + drivers/watchdog/m54xx_wdt.c | 1 + + drivers/watchdog/machzwd.c | 1 + + drivers/watchdog/mixcomwd.c | 1 + + drivers/watchdog/mtx-1_wdt.c | 1 + + drivers/watchdog/mv64x60_wdt.c | 1 + + drivers/watchdog/nv_tco.c | 1 + + drivers/watchdog/pc87413_wdt.c | 1 + + drivers/watchdog/pcwd.c | 1 + + drivers/watchdog/pcwd_pci.c | 1 + + drivers/watchdog/pcwd_usb.c | 1 + + drivers/watchdog/pika_wdt.c | 1 + + drivers/watchdog/pnx833x_wdt.c | 1 + + drivers/watchdog/rc32434_wdt.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/sa1100_wdt.c | 1 + + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/sbc60xxwdt.c | 1 + + drivers/watchdog/sbc7240_wdt.c | 1 + + drivers/watchdog/sbc_epx_c3.c | 1 + + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + + drivers/watchdog/sc1200wdt.c | 1 + + drivers/watchdog/sc520_wdt.c | 1 + + drivers/watchdog/sch311x_wdt.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/smsc37b787_wdt.c | 1 + + drivers/watchdog/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 1 + + drivers/watchdog/wdrtas.c | 1 + + drivers/watchdog/wdt.c | 1 + + drivers/watchdog/wdt285.c | 1 + + drivers/watchdog/wdt977.c | 1 + + drivers/watchdog/wdt_pci.c | 1 + + fs/btrfs/super.c | 2 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/ceph/super.h | 1 + + fs/compat_ioctl.c | 917 ++-------------------------- + fs/ecryptfs/file.c | 1 + + fs/ext4/ioctl.c | 1 + + fs/f2fs/file.c | 1 + + fs/fat/file.c | 13 +- + fs/fuse/dev.c | 2 +- + fs/gfs2/file.c | 30 + + fs/hpfs/dir.c | 1 + + fs/hpfs/file.c | 1 + + fs/ioctl.c | 80 ++- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/ioctl.c | 1 + + fs/userfaultfd.c | 2 +- + include/linux/blkdev.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 7 + + include/linux/mtio.h | 60 ++ + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 14 + + lib/iov_iter.c | 1 + + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/rfkill/core.c | 2 +- + net/socket.c | 3 + + net/unix/af_unix.c | 19 + + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + 155 files changed, 935 insertions(+), 1394 deletions(-) + create mode 100644 include/linux/mtio.h +Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (acfec525a78a coresight: etm4x: Add support for ThunderX2) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 9 + + drivers/hwtracing/coresight/coresight-etm4x.c | 319 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.h | 64 +++++ + drivers/hwtracing/coresight/coresight.c | 6 + + include/linux/coresight.h | 6 + + 5 files changed, 404 insertions(+) +Merging rtc/rtc-next (1e2c8aadedbe rtc: cmos: fix the AltCentury value on AMD/Hygon platform) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 19 +------------------ + drivers/rtc/rtc-mc146818-lib.c | 9 +++++++-- + include/linux/mc146818rtc.h | 2 ++ + 5 files changed, 12 insertions(+), 21 deletions(-) +Merging nvdimm/libnvdimm-for-next (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (6f88ed285e67 Merge branch 'fixes/usercopy/highmem-fromlist' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (799e064cc79e fsi: scom: Don't abort operations for minor errors) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (b76e01ccc287 nvmem: imx: scu: fix dependency in Kconfig) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/sprd-efuse.txt | 39 ++ + drivers/nvmem/Kconfig | 12 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/imx-ocotp-scu.c | 120 +++++- + drivers/nvmem/imx-ocotp.c | 4 + + drivers/nvmem/sc27xx-efuse.c | 13 +- + drivers/nvmem/sprd-efuse.c | 424 +++++++++++++++++++++ + include/linux/nvmem-consumer.h | 2 +- + 8 files changed, 597 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/sprd-efuse.txt + create mode 100644 drivers/nvmem/sprd-efuse.c +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 (54ac450feb7f video: hyperv: hyperv_fb: Support deferred IO for Hyper-V frame buffer driver) +$ git merge hyperv/hyperv-next +Auto-merging net/vmw_vsock/hyperv_transport.c +Auto-merging drivers/scsi/storvsc_drv.c +Merge made by the 'recursive' strategy. + drivers/net/hyperv/hyperv_net.h | 3 + + drivers/net/hyperv/netvsc_drv.c | 57 ++++++ + drivers/scsi/storvsc_drv.c | 41 ++++ + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/hyperv_fb.c | 428 ++++++++++++++++++++++++++++++++++++--- + net/vmw_vsock/hyperv_transport.c | 20 ++ + 6 files changed, 517 insertions(+), 33 deletions(-) +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (d8a050f5a3e8 kgdb: fix comment regarding static function) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (c2ba8f41ad36 perf_event_open: switch to copy_struct_from_user()) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/sched.h +Merge made by the 'recursive' strategy. + include/linux/bitops.h | 7 +++ + include/linux/uaccess.h | 70 +++++++++++++++++++++++ + include/uapi/linux/sched.h | 2 + + kernel/events/core.c | 47 +++------------- + kernel/fork.c | 34 +++--------- + kernel/sched/core.c | 43 +++----------- + lib/strnlen_user.c | 8 +-- + lib/test_user_copy.c | 136 +++++++++++++++++++++++++++++++++++++++++++-- + lib/usercopy.c | 55 ++++++++++++++++++ + 9 files changed, 288 insertions(+), 114 deletions(-) +Merging devfreq/for-next (d2f5fccd1ac9 PM / devfreq: Make log message more explicit when devfreq device already exists) +$ git merge devfreq/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/devfreq/devfreq.c | 2 +- + include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h +Merging hmm/hmm (54ecb8f7028c Linux 5.4-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e56476897448 fpga: Remove dev_err() usage after platform_get_irq()) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/zynq-fpga.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging kunit/test (741a98d02236 kunit: fix failure to build without printk) +$ git merge kunit/test +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kunit/api/index.rst | 16 + + Documentation/dev-tools/kunit/api/test.rst | 11 + + Documentation/dev-tools/kunit/faq.rst | 62 + + Documentation/dev-tools/kunit/index.rst | 79 ++ + Documentation/dev-tools/kunit/start.rst | 180 +++ + Documentation/dev-tools/kunit/usage.rst | 576 ++++++++ + MAINTAINERS | 13 + + arch/um/configs/kunit_defconfig | 3 + + include/kunit/assert.h | 356 +++++ + include/kunit/string-stream.h | 51 + + include/kunit/test.h | 1490 ++++++++++++++++++++ + include/kunit/try-catch.h | 75 + + kernel/Makefile | 2 + + kernel/sysctl-test.c | 392 +++++ + lib/Kconfig.debug | 13 + + lib/Makefile | 2 + + lib/kunit/Kconfig | 36 + + lib/kunit/Makefile | 9 + + lib/kunit/assert.c | 141 ++ + lib/kunit/example-test.c | 88 ++ + lib/kunit/string-stream-test.c | 52 + + lib/kunit/string-stream.c | 217 +++ + lib/kunit/test-test.c | 331 +++++ + lib/kunit/test.c | 478 +++++++ + lib/kunit/try-catch.c | 118 ++ + tools/objtool/check.c | 1 + + tools/testing/kunit/.gitignore | 3 + + tools/testing/kunit/configs/all_tests.config | 3 + + tools/testing/kunit/kunit.py | 136 ++ + tools/testing/kunit/kunit_config.py | 66 + + tools/testing/kunit/kunit_kernel.py | 149 ++ + tools/testing/kunit/kunit_parser.py | 310 ++++ + tools/testing/kunit/kunit_tool_test.py | 206 +++ + .../test_data/test_is_test_passed-all_passed.log | 32 + + .../kunit/test_data/test_is_test_passed-crash.log | 69 + + .../test_data/test_is_test_passed-failure.log | 36 + + .../test_data/test_is_test_passed-no_tests_run.log | 75 + + .../test_data/test_output_isolated_correctly.log | 106 ++ + .../kunit/test_data/test_read_from_file.kconfig | 17 + + 40 files changed, 6001 insertions(+) + create mode 100644 Documentation/dev-tools/kunit/api/index.rst + create mode 100644 Documentation/dev-tools/kunit/api/test.rst + create mode 100644 Documentation/dev-tools/kunit/faq.rst + create mode 100644 Documentation/dev-tools/kunit/index.rst + create mode 100644 Documentation/dev-tools/kunit/start.rst + create mode 100644 Documentation/dev-tools/kunit/usage.rst + create mode 100644 arch/um/configs/kunit_defconfig + create mode 100644 include/kunit/assert.h + create mode 100644 include/kunit/string-stream.h + create mode 100644 include/kunit/test.h + create mode 100644 include/kunit/try-catch.h + create mode 100644 kernel/sysctl-test.c + create mode 100644 lib/kunit/Kconfig + create mode 100644 lib/kunit/Makefile + create mode 100644 lib/kunit/assert.c + create mode 100644 lib/kunit/example-test.c + create mode 100644 lib/kunit/string-stream-test.c + create mode 100644 lib/kunit/string-stream.c + create mode 100644 lib/kunit/test-test.c + create mode 100644 lib/kunit/test.c + create mode 100644 lib/kunit/try-catch.c + create mode 100644 tools/testing/kunit/.gitignore + create mode 100644 tools/testing/kunit/configs/all_tests.config + create mode 100755 tools/testing/kunit/kunit.py + create mode 100644 tools/testing/kunit/kunit_config.py + create mode 100644 tools/testing/kunit/kunit_kernel.py + create mode 100644 tools/testing/kunit/kunit_parser.py + create mode 100755 tools/testing/kunit/kunit_tool_test.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log + create mode 100644 tools/testing/kunit/test_data/test_output_isolated_correctly.log + create mode 100644 tools/testing/kunit/test_data/test_read_from_file.kconfig +$ git am -3 ../patches/0001-Revert-rtc-cmos-fix-the-AltCentury-value-on-AMD-Hygo.patch +Applying: Revert "rtc: cmos: fix the AltCentury value on AMD/Hygon platform" +Merging akpm-current/current (580a3a106e1d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/fat/file.c +Auto-merging Documentation/admin-guide/cgroup-v2.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v2.rst +Resolved 'Documentation/admin-guide/cgroup-v2.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 230f71459760] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 20 +++-- + Documentation/admin-guide/sysctl/kernel.rst | 20 ++++- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +-- + arch/arm/mm/dma-mapping.c | 2 +- + drivers/misc/sram-exec.c | 2 +- + fs/aio.c | 9 +-- + fs/buffer.c | 56 +++++++++++++- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 ++++-- + fs/fs-writeback.c | 9 ++- + fs/ocfs2/aops.c | 25 ++++++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++++++-------- + fs/proc/page.c | 40 +++++----- + fs/ramfs/inode.c | 12 +++ + include/linux/genalloc.h | 2 +- + include/linux/memcontrol.h | 29 ++++++++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 ++ + include/linux/sched.h | 9 +++ + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 45 ++++++++++++ + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++++++++++++--- + ipc/msg.c | 18 ++--- + kernel/dma/remap.c | 2 +- + kernel/fork.c | 4 +- + kernel/hung_task.c | 94 ++++++++++++++++++++---- + kernel/sysctl.c | 8 ++ + lib/Kconfig.debug | 6 ++ + lib/genalloc.c | 5 +- + lib/math/rational.c | 63 ++++++++++++---- + mm/memcontrol.c | 5 ++ + mm/memory_hotplug.c | 17 ++++- + mm/memremap.c | 27 ++++++- + mm/mmap.c | 43 +++++++---- + mm/oom_kill.c | 67 +++++++++-------- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 ++++- + mm/slob.c | 62 ++++++++++++---- + mm/slub.c | 14 +++- + mm/sparse.c | 2 +- + mm/vmscan.c | 105 +++++++++++++++++++++------ + scripts/checkpatch.pl | 24 ++++++ + 48 files changed, 816 insertions(+), 243 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 16402313e729...d9e39da22050 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d9e39da22050 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 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..a5cb923b597c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191004 |