diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-10-09 16:03:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-10-09 16:03:21 +1100 |
| commit | 1ba4389f4572d716d73f8bacab4e181d82504780 (patch) | |
| tree | 420ae1e207b0474667966fe8ad9241f3fd145faa | |
| parent | 3e6d2847cbccaad6b21f9646bb24d983bd7599ea (diff) | |
| download | linux-next-1ba4389f4572d716d73f8bacab4e181d82504780.tar.gz | |
Add linux-next specific files for 20191009next-20191009
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 | 5561 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6196 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..fd1efa2ca401 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,315 @@ +Name SHA1 +---- ---- +origin d5001955c281c014a3af6d1559db40b5756ad89a +fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kbuild-current b8d5e105ebbf2e3e314cb79b67733bd998df6039 +arc-current 41277ba7eb4ef344a807cfb0f4319151abc9ffa3 +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes 60c1b3e25728e0485f08e72e61c3cad5331925a3 +arm64-fixes 3e7c93bd04edfb0cae7dad1215544c9350254b8f +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes 3439595d5b85f0af565f5a58e495d885537fb227 +s390-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 503c9addef613c872679e24fc8a78f3febeb5a08 +bpf 98beb3edeb974e906a81f305d88f7bc96b2ec83e +ipsec 68ce6688a5baefde30914fc07fc27292dbbe8320 +netfilter 503c9addef613c872679e24fc8a78f3febeb5a08 +ipvs 503c9addef613c872679e24fc8a78f3febeb5a08 +wireless-drivers 98d22b01f9f6f85eb8870290006241b316829fd3 +mac80211 dc0c18ed229cdcca283dd78fefa38273ec37a42c +rdma-fixes 0417791536ae1e28d7f0418f1d20048ec4d3c6cf +sound-current 130bce3afbbbbe585cba8604f2124c28e8d86fb0 +sound-asoc-fixes 456e6594c461b0f7b06e546c9eed4fecb2c54fe1 +regmap-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +regulator-fixes 4a3ab8e34117bf9c90725a0248da86ed0bb97069 +spi-fixes fdce5b9c5b563011535805824e452bfb744e5660 +pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +driver-core.current 82af5b6609673f1cc7d3453d0be3d292dfffc813 +tty.current fc64f7abbef2dae7ee4c94702fb3cf9a2be5431a +usb.current 623170ff59710474d2db3dfb0ebb7577f44abd33 +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes 7d7e21fafdbc7fcf0854b877bd0975b487ed2717 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current 80b15db5e1e9c3300de299b2d43d1aafb593e6ac +char-misc.current fc739a058d99c9297ef6bfd923b809d85855b9a9 +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 747125db6dcd8bcc21f13d013f6e6a2acade21ee +input-current bd3b8480237680b5967aee3c814b92b2fd87a582 +crypto-current f703964fc66804e6049f2670fc11045aa8359b1a +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes ce3a677802121e038d2f062e90f96f84e7351da0 +modules-fixes fcfacb9f83745d9fa97937b8bc94a73bb0607912 +slave-dma-fixes 04cbfba6208592999d7bfe6609ec01dc3fde73f5 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 3e84a18a259e1df35e5b549ab92ec3baf82ff010 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 88356d09904bc606182c625575237269aeece22e +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 647c8977e111c0a62c93a489ebc4b045c833fdb4 +kvm-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 11c943a1a635d2c7141b5b6667ebb521ab4ecd58 +nvdimm-fixes 4c806b897d6075bfa5067e524fb058c57ab64e7b +btrfs-fixes 26966e98a28b32f66de5696f3a5ef60e83f270cc +vfs-fixes d4f4de5e5ef8efde85febb6876cd3c8ab1631999 +dma-mapping-fixes 2cf2aa6a69db0b17b3979144287af8775c1c1534 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +samsung-krzk-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes f437ade3296bacaddb6d7882ba0515940f01daf4 +scsi-fixes b23f330d5145b92f90cf16f1adc5444ad06764b4 +drm-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +amdgpu-fixes c0e70e10b11b1b7ca0f537e7ce4404a0459cdc7c +drm-intel-fixes b925708f28c2b7a3a362d709bd7f77bc75c1daac +mmc-fixes faf97b84fa86d40eba5a30e9071dfb55133fb1b7 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +hyperv-fixes 83b50f83a96899f30c6369ef5988412fa2354ab2 +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 727a399b7476d1c509c4526594ad514e47a7e069 +pidfd-fixes 5ca3d87b3828a797b1a0126d2806650f72a4b6c1 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 02dc96ef6c25f990452c114c59d75c368a1f4c8f +gpio-intel-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-intel-fixes 260996c30f4f3a732f45045e3e0efe27017615e4 +erofs-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +drm-misc-fixes cc635be34eb672a30a4936db30987b7c2e91fb61 +kspp-gustavo da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kbuild da676aa92374e062e9c1b01d94478bfe558786eb +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm 3a6d5fc4376059d0f4047b58170325df9bd90e18 +arm64 e376897f424a1c807779a2635f62eb02d7e382f9 +arm-perf c8b0de762e0b7cf9f51ad13b19bd279809317f37 +arm-soc be78662f5e30972cc5e31a8190e510a0a5ea8d8f +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 31e508a2bfdbe0064fefbca876763ac536aa688e +aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd +at91 9072e308f6981b0db8f3699b3528e0c09f0e3b91 +bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1 +imx-mxs fade20c4077bf757456ecb57328b76343b1995f2 +keystone 008ea917df67ac3c1a2919cad0c7e418434d6804 +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 53fccfb4be900d62c55b64fb102a0ae28fb19458 +omap 7968f13dadce592a183aeedd4202a220f73b665b +qcom a5ff49630785b3294bd2d06797c805d32ced40c0 +renesas ae688e1720fd387de34f2140a735917411672bf1 +renesas-geert aca0770d9702b007a9dc8d5ec5adc2f6df5c5c01 +reset bdb369e1e98ad948d282e78e4ec64d951c2f6f05 +rockchip 7ba0ed602ef7d188acac963c72c9e10ee13b61f4 +samsung-krzk 8216ec3fda499f1a4ab4dad7394e15c318b5c9bd +scmi 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +sunxi d4938008349354ca4903130db7612c7cf205884c +tegra d40c8de825cc75c582fef9627281a0b87d89518f +clk 51f9d768d5b803256a3d90b56140495a42ad87d3 +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky f7dafb0af1deae412911dbeee1f984d54517486d +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 0f1979b402df5f0dd86425830ddaa191d70f3655 +m68knommu da0c9ea146cbe92b832f1b0f694840ea8eb33cce +microblaze 39014c45467f0a655ae77f98be549a0a4ba5cfe1 +mips a14bf1dc494aa5126e4f23ebd9fa04991133814e +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd 0836e665ade97cb729b3c99593e8cbf473cf26f5 +powerpc 45824fc0da6e46cc5d563105e1eaaf3098a686f9 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5 +risc-v 9ce06497c2722a0f9109e4cc3ce35b7a69617886 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 da0c9ea146cbe92b832f1b0f694840ea8eb33cce +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 73625ed66389d4c620520058d828f43a93ab4d0c +xtensa ede62d7397ec546b7d82c7bc4ebd201681e48020 +fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835 +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave f41d3117280a8b0050a4fdc3936effb3305c3700 +ceph 3ee5a7015c8b7cb4de21f7345f8381946f2fce55 +cifs d3f8236c7b0b74209054a2019f1f053b863e3cd9 +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs da0c9ea146cbe92b832f1b0f694840ea8eb33cce +ext3 0f7dbaee76f40c0089b573f56b262ce3be92a24a +ext4 040823b5372b445d1d9483811e85a24d71314d33 +f2fs b145b0eb2031a620ca010174240963e4d2c6ce26 +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs da0c9ea146cbe92b832f1b0f694840ea8eb33cce +nfs-anna a8fd0feeca35cb8f9ddd950191f4aeb777f52f89 +nfsd 832b2cb955437dcfe9b8f08e5f37303c9097fc87 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 6350744c66a41ac4d044bd083852a5cc20bd5b93 +iomap 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d +djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk c38822ab9bd624e6f99bbc2576aa04151bff93f4 +pci da9c3eaa31f2d73853b0b71034cceeee49633fab +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid 75799e7ed50ec99fb71590800dcddd985ec3898f +i2c 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +i3c f12b524ea3865805f7aa590616127f706149bf02 +dmi c11f2bc422b9ef61268094a1bea82676936e4f9d +hwmon-staging b2a7ca7a132214dc6488f043d406d3be2ec3e4cc +jc_docs f704985b1e7ea0f9fde1cfb1354d57593ba62fcb +v4l-dvb 219031a6e7dff52a066e8b074adc0697f501e3d3 +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 909624d8db5bbd369690749eb4c4392766f39f94 +net-next 11fc7d5a0a2d458cae8ce5d5ee3ebfdabe2cb35a +bpf-next f05c2001ecc98629cecd47728e4db11e5a17e58d +ipsec-next 4361f5b6118ad77872f54f813321aa4905a7e9c1 +mlx5-next 7d47433cf74f942a414171867d89c08640cfef45 +netfilter-next f8615bf8a3dabd84bf844c6f888929495039d389 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next ac524481d7f72d46805bcaa6595f233236c92132 +wireless-drivers-next f170d44bc4ec2feae5f6206980e7ae7fbf0432a0 +bluetooth 840aff3994c89f6a84373ba5b3c3e8ea3e9b37f0 +mac80211-next 2ce113de31320756b25179f3f4512a522bc45263 +gfs2 f6ef4bff81cc147ffc89ff754389eed98380a44a +mtd b34c095ca6091836c4da3856ed30c8690a2d1d3a +nand 5121b4219972c16e9ac92545a6743af2e99d4abc +spi-nor 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +crypto eff9771d51529acf7f6f58a60b2923b98da28f0e +drm 97ea56540ffc59dac275ccb64b8a5e457348a250 +amdgpu 127bd7e931352525385e3f0090a635daf0984997 +drm-intel 458863e08e13ecf22b9ba1ee6d4baba0ce9990ea +drm-tegra 9d5a549872651fc42f118e7b69bebaa37a72520c +drm-misc 94e2ec3f7fef86506293a448273b2b4ee21e6195 +drm-msm 8fbd534b7248f5d0311d9dbfd7b4749317e4395a +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 +regmap 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +sound 82e8d723e9e6698572098bf2976223d5069b34b5 +sound-asoc d1cb6c0891c7130c18a5488e57e6c39247257814 +modules 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +input 3df955f870c214368d73236733b8a9e5a994b2c3 +block c121a069344ae3e10b6e1c8e78826e2ce6986466 +device-mapper 633b1613b2a49304743c18314bb6e6465c21fd8a +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 25812fcf74030d9c1be8b898573eaf28de21efee +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 38a6fc63a3ea86ff128d93ce6e548ace12fc78cb +backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08 +battery 7f7378618b4103c083db7de5017df958f8ada070 +regulator 70336ab5ded12119193ff1c02cf5c4de8b74ed07 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 1f96e0f129eb2bea15a00c154eee8b85aa181d1a +selinux 42345b68c2e3e2b6549fc34b937ff44240dfc3b6 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo 23641a048089b9659f01c8a125eb2566a4936f3c +tpmdd e13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu 142dfcda5a35555906946912713885960cbaf1db +vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f +audit 245d73698ed7abdc7e520dfa38048bb80ce89571 +devicetree a36a383dc30103cd2b0472ae635848cc1e25c4ab +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi 944572040aacb69ad0f540ad21687f4ce142cf86 +tip 80bb240ac08b3475cb9d82d4aff1f921e0a284a4 +clockevents befd04abfbe4b933515dddb5659d0744be9dba6a +edac f05390d30e20cccd8f8de981dee42bcdd8d2d137 +irqchip bb0fed1c60cccbe4063b455a7228818395dac86e +ftrace 8ed4889eb83179dbc9a105cfed65cc42ecb61097 +rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672 +kvm da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kvm-arm 61f8d64aae65365f2cd11e4930918e31f3721d0a +kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69 +kvms390 f76f6371643b563a7168a6ba5713ce93caa36ecc +xen-tip c6875f3aacf2a5a913205accddabf0bfb75cac76 +percpu 69f98a60cdbb22aeb565044b858eee4930502a7c +workqueues 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 +drivers-x86 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +chrome-platform e6679fd1e2fc253f62bbea13b76d9b6a8f90c68e +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 7ae4717cb9cbb22338962947266fa2bbb2fe8dcf +ipmi c9acc3c4f8e42ae538aea7f418fddc16f257ba75 +driver-core 201e91091b1d47047f55580b5474e1239f4d17aa +usb 2538f0ee8a2920d58812687e84c854b4a9882013 +usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d +usb-serial 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-chipidea-next f14ac41f977fffd13971ad2dd63f348c112cf133 +phy-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +tty 7726fb53e75fa48714181efd00167e0734303afb +char-misc 3e917975b7cdef6cfe92931e04677d8cf1d3df98 +extcon e81b88932985c9134d410f4eaaaa9b81a3b4bd0c +soundwire dfcff3f8a5f18a0cfa233522b5647c2e6035fcb5 +thunderbolt da0c9ea146cbe92b832f1b0f694840ea8eb33cce +staging d49d1c76b96ebf39539e93d5ab7943a01ef70e4f +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 44223a8b45d77af7bd9244376b952f1c703392c6 +slave-dma c5c6faaee6e0c374c7dfaf053aa23750f5a68e20 +cgroup 1a99fcc035fb666f5d0909aef0a753284cb5d04c +scsi dda08a80d6594535567920c6caf13f54d62b1496 +scsi-mkp e1f92b500067ea649891c972eca18c493c3bba84 +vhost 0d4a3f2abbef73b9e5bb5f12213c275565473588 +rpmsg 741dc0aa4122c5e1ec8c6b576503284281e29960 +gpio 6dd9b912c9b4d8e7b4877554fc9e412e1189e30a +gpio-brgl 5ede17d61592844c6d09eaba513f9de14920965c +gpio-intel 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl 4afb0edace6047d46ca5d9bfd70d9cfd93228edd +pinctrl-intel da0c9ea146cbe92b832f1b0f694840ea8eb33cce +pinctrl-samsung a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 +pwm 81420020e6918ead1b224c09288a350ad37404ad +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +y2038 870e0167cd9cff1246746bd163db90df60d1dd61 +livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9 +coresight acfec525a78af468d0ec02f4e52674b6f528f302 +rtc 09ef18bcd5ac6c2213cedd20f4f8cad08bbe3d74 +nvdimm 4c806b897d6075bfa5067e524fb058c57ab64e7b +at24 285be87c79e173f08af5e1a6417a106fb14934b7 +ntb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kspp 6f88ed285e67555e31e2601f0e8c5fb25501c366 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvmem b76e01ccc28737ecd36e22beb05e6a42fff0238a +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 41928dfdf5bdaa789bac2640150817833c82e110 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb-dt d8a050f5a3e8242242df6430d5980c142350e461 +pidfd c2ba8f41ad366dc12840dd87d8f1565185845126 +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fpga d20c0da8b2020acaa107b42041c8da2bafed1910 +kunit d460623c5fa126dc51bb2571dd7714ca75b0116c +akpm-current 1dd4e9b5f0a99fb653b01907ee0cd81525cf065b +akpm 9ba4b35423b1e414e48d582ea2d3c1f2c22bedf4 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..cac52c6ce936 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5561 @@ +$ date -R +Wed, 09 Oct 2019 07:53:04 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at da0c9ea146cb Linux 5.4-rc2 +Merging origin/master (d5001955c281 Merge tag 'gpio-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) +$ git merge origin/master +Updating da0c9ea146cb..d5001955c281 +Fast-forward + Documentation/admin-guide/cgroup-v2.rst | 20 +++++-- + Documentation/core-api/memory-allocation.rst | 4 ++ + Documentation/dev-tools/kselftest.rst | 16 ++++++ + Makefile | 5 +- + arch/x86/include/asm/uaccess.h | 23 ++++++++ + drivers/gpio/gpio-eic-sprd.c | 7 ++- + drivers/gpio/gpio-max77620.c | 6 +- + drivers/gpio/gpiolib-of.c | 2 +- + drivers/gpio/gpiolib.c | 27 ++++++--- + fs/fs-writeback.c | 9 ++- + fs/ocfs2/aops.c | 25 +++++++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++++++++---------- + fs/readdir.c | 44 +-------------- + include/linux/memcontrol.h | 29 ++++++++++ + include/linux/slab.h | 4 ++ + include/linux/uaccess.h | 6 +- + kernel/fork.c | 4 +- + kernel/panic.c | 1 + + mm/memcontrol.c | 5 ++ + mm/memremap.c | 2 - + mm/page_alloc.c | 8 ++- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 ++++++- + mm/slob.c | 62 +++++++++++++++----- + mm/slub.c | 14 ++++- + mm/sparse.c | 2 +- + mm/vmpressure.c | 20 ++++--- + mm/vmscan.c | 72 ++++++++++++++++++++++-- + mm/z3fold.c | 10 +++- + security/selinux/ss/services.c | 9 ++- + 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 ++++++++- + 36 files changed, 442 insertions(+), 160 deletions(-) + create mode 100644 tools/testing/selftests/rtc/settings +Merging fixes/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (b8d5e105ebbf scripts: setlocalversion: fix a bashism) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + scripts/setlocalversion | 2 +- + 2 files changed, 2 insertions(+), 2 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 (60c1b3e25728 ARM: multi_v7_defconfig: Fix SPI_STM32_QSPI support) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (3e7c93bd04ed arm64: armv8_deprecated: Checking return value for memory allocation) +$ git merge arm64-fixes/for-next/fixes +Removing arch/arm64/kernel/vdso/gettimeofday.S +Removing arch/arm64/include/asm/vdso_datapage.h +Merge made by the 'recursive' strategy. + Documentation/arm64/memory.rst | 9 +++++- + arch/arm64/Kconfig | 15 ++++++++-- + arch/arm64/Makefile | 16 ---------- + arch/arm64/include/asm/atomic_lse.h | 6 ++-- + arch/arm64/include/asm/vdso/compat_barrier.h | 2 +- + arch/arm64/include/asm/vdso_datapage.h | 33 --------------------- + arch/arm64/kernel/armv8_deprecated.c | 5 ++++ + arch/arm64/kernel/cpu_errata.c | 4 +-- + arch/arm64/kernel/cpufeature.c | 1 + + arch/arm64/kernel/entry.S | 1 + + arch/arm64/kernel/ftrace.c | 12 ++++++-- + arch/arm64/kernel/process.c | 32 ++++++++++---------- + arch/arm64/kernel/vdso/gettimeofday.S | 0 + arch/arm64/kernel/vdso32/Makefile | 44 ++++++++++++++++++---------- + arch/arm64/mm/fault.c | 13 ++++++-- + lib/vdso/Kconfig | 9 ------ + 16 files changed, 98 insertions(+), 104 deletions(-) + delete mode 100644 arch/arm64/include/asm/vdso_datapage.h + delete mode 100644 arch/arm64/kernel/vdso/gettimeofday.S +Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (3439595d5b85 selftests/powerpc: Fix compile error on tlbie_test due to newer gcc) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/64/mmu.h | 8 ++++++-- + arch/powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 ++++ + arch/powerpc/platforms/pseries/lpar.c | 3 +++ + tools/testing/selftests/powerpc/mm/tlbie_test.c | 2 +- + 4 files changed, 14 insertions(+), 3 deletions(-) +Merging s390-fixes/fixes (da0c9ea146cb Linux 5.4-rc2) +$ git merge s390-fixes/fixes +Already up to date. +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 (503c9addef61 ptp: fix typo of "mechanism" in Kconfig help text) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/b53/b53_common.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 ++ + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 29 +++++++++++------- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 11 +++++-- + drivers/ptp/Kconfig | 4 +-- + include/trace/events/rxrpc.h | 18 ++++++------ + net/rxrpc/ar-internal.h | 1 + + net/rxrpc/call_accept.c | 5 ++-- + net/rxrpc/call_object.c | 34 +++++++++++++--------- + net/rxrpc/conn_client.c | 9 ++++-- + net/rxrpc/conn_object.c | 13 +++++---- + net/rxrpc/conn_service.c | 2 +- + net/rxrpc/peer_object.c | 16 ++++++---- + net/rxrpc/recvmsg.c | 6 ++-- + net/rxrpc/sendmsg.c | 3 +- + 16 files changed, 96 insertions(+), 60 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 (503c9addef61 ptp: fix typo of "mechanism" in Kconfig help text) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (503c9addef61 ptp: fix typo of "mechanism" in Kconfig help text) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (98d22b01f9f6 rt2x00: remove input-polldev.h header) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging mac80211/master (dc0c18ed229c mac80211: fix scan when operating on DFS channels in ETSI domains) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 2 +- + include/net/cfg80211.h | 8 ++++++++ + net/mac80211/mlme.c | 5 +++-- + net/mac80211/rx.c | 11 ++++++++++- + net/mac80211/scan.c | 30 ++++++++++++++++++++++++++++-- + net/wireless/nl80211.c | 2 +- + net/wireless/reg.c | 1 + + net/wireless/reg.h | 8 -------- + net/wireless/scan.c | 23 +++++++++++++---------- + net/wireless/wext-sme.c | 8 ++++++-- + 10 files changed, 71 insertions(+), 27 deletions(-) +Merging rdma-fixes/for-rc (0417791536ae RDMA/mlx5: Add missing synchronize_srcu() for MW cases) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cm.c | 3 ++ + drivers/infiniband/core/cma.c | 3 +- + drivers/infiniband/core/device.c | 9 ++-- + drivers/infiniband/core/nldev.c | 12 ++--- + drivers/infiniband/core/security.c | 2 +- + drivers/infiniband/core/umem_odp.c | 6 ++- + drivers/infiniband/hw/cxgb4/device.c | 7 ++- + drivers/infiniband/hw/cxgb4/mem.c | 28 ++++++----- + drivers/infiniband/hw/cxgb4/qp.c | 10 +--- + drivers/infiniband/hw/hfi1/sdma.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 4 ++ + drivers/infiniband/hw/mlx5/devx.c | 58 +++++++---------------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- + drivers/infiniband/hw/mlx5/mr.c | 68 +++++++++++---------------- + drivers/infiniband/hw/mlx5/odp.c | 58 ++++++++++++++++++----- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 - + drivers/infiniband/sw/siw/siw_qp.c | 15 ++++-- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 8 +--- + 18 files changed, 154 insertions(+), 147 deletions(-) +Merging sound-current/for-linus (130bce3afbbb ALSA: hdac: clear link output stream mapping) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/hda_register.h | 3 +++ + sound/hda/ext/hdac_ext_controller.c | 5 +++++ + sound/pci/hda/patch_realtek.c | 24 +++++++++++++++++++++--- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging sound-asoc-fixes/for-linus (456e6594c461 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 | 10 +++++--- + sound/soc/intel/boards/sof_rt5682.c | 51 ++++++++++++++++++++++++++++++++++--- + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++++++++--- + sound/soc/soc-pcm.c | 17 +++++++++---- + 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 ++- + 21 files changed, 255 insertions(+), 75 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 (4a3ab8e34117 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/qcom-rpmh-regulator.c | 4 +- + drivers/regulator/ti-abb-regulator.c | 26 ++--- + 9 files changed, 100 insertions(+), 106 deletions(-) +Merging spi-fixes/for-linus (fdce5b9c5b56 Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-dspi.c | 5 ++++- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 38 +++++++++++++++++++++++++++++++++----- + drivers/spi/spi-gpio.c | 4 +++- + drivers/spi/spi-mxic.c | 6 +++--- + drivers/spi/spi-orion.c | 3 --- + drivers/spi/spi-stm32-qspi.c | 3 ++- + drivers/spi/spidev.c | 3 +++ + 8 files changed, 49 insertions(+), 15 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 (fc64f7abbef2 serial: 8250_omap: Fix gpio check for auto RTS/CTS) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + .../bindings/serial/renesas,sci-serial.txt | 2 ++ + drivers/tty/n_hdlc.c | 5 +++++ + drivers/tty/serial/8250/8250_omap.c | 5 +++-- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/fsl_linflexuart.c | 21 ++++++++++++++------- + drivers/tty/serial/fsl_lpuart.c | 2 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/serial_mctrl_gpio.c | 3 +++ + drivers/tty/serial/sh-sci.c | 8 ++++++-- + drivers/tty/serial/uartlite.c | 3 ++- + drivers/tty/serial/xilinx_uartps.c | 8 +++++++- + include/uapi/linux/serial_core.h | 2 +- + 13 files changed, 47 insertions(+), 17 deletions(-) +Merging usb.current/usb-linus (623170ff5971 usb:cdns3: Fix for CV CH9 running with g_zero driver.) +$ git merge usb.current/usb-linus +Removing drivers/usb/misc/rio500_usb.h +Removing drivers/usb/misc/rio500.c +Auto-merging MAINTAINERS +Removing Documentation/usb/rio.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/amlogic,dwc3.txt | 4 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 7 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 7 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 4 +- + .../devicetree/bindings/usb/mediatek,mtu3.txt | 4 +- + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 5 + + Documentation/devicetree/bindings/usb/usb-uhci.txt | 2 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- + Documentation/usb/rio.rst | 109 ---- + MAINTAINERS | 7 - + arch/arm/boot/dts/sun4i-a10.dtsi | 4 + + arch/arm/boot/dts/sun5i.dtsi | 2 + + arch/arm/boot/dts/sun6i-a31.dtsi | 4 + + arch/arm/boot/dts/sun7i-a20.dtsi | 4 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 3 + + arch/arm/boot/dts/sun8i-r40.dtsi | 4 + + arch/arm/boot/dts/sun9i-a80.dtsi | 5 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 + + arch/arm/configs/badge4_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 + + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + drivers/base/platform.c | 46 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 3 +- + drivers/usb/cdns3/cdns3-pci-wrap.c | 3 +- + drivers/usb/cdns3/ep0.c | 12 +- + drivers/usb/class/usblp.c | 8 +- + drivers/usb/dwc3/drd.c | 7 +- + drivers/usb/dwc3/gadget.c | 7 +- + drivers/usb/dwc3/host.c | 7 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/dummy_hcd.c | 3 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 4 +- + drivers/usb/host/xhci-ext-caps.c | 1 + + drivers/usb/host/xhci-ring.c | 4 +- + drivers/usb/host/xhci.c | 78 ++- + drivers/usb/image/microtek.c | 4 + + drivers/usb/misc/Kconfig | 10 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/adutux.c | 21 +- + drivers/usb/misc/legousbtower.c | 55 +- + drivers/usb/misc/rio500.c | 554 --------------------- + drivers/usb/misc/rio500_usb.h | 20 - + drivers/usb/misc/usblcd.c | 60 ++- + drivers/usb/misc/yurex.c | 7 +- + drivers/usb/renesas_usbhs/common.h | 1 + + drivers/usb/renesas_usbhs/fifo.c | 2 +- + drivers/usb/renesas_usbhs/fifo.h | 1 + + drivers/usb/renesas_usbhs/mod_gadget.c | 18 +- + drivers/usb/renesas_usbhs/pipe.c | 15 + + drivers/usb/renesas_usbhs/pipe.h | 1 + + drivers/usb/serial/ftdi_sio.c | 3 + + drivers/usb/serial/ftdi_sio_ids.h | 9 + + drivers/usb/serial/keyspan.c | 4 +- + drivers/usb/serial/option.c | 11 + + drivers/usb/serial/usb-serial.c | 5 +- + drivers/usb/typec/tcpm/tcpm.c | 14 +- + drivers/usb/typec/ucsi/displayport.c | 2 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 42 +- + drivers/usb/usb-skeleton.c | 8 +- + drivers/usb/usbip/vhci_hcd.c | 4 +- + include/linux/platform_device.h | 2 + + 69 files changed, 357 insertions(+), 902 deletions(-) + delete mode 100644 Documentation/usb/rio.rst + delete mode 100644 drivers/usb/misc/rio500.c + delete mode 100644 drivers/usb/misc/rio500_usb.h +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 (7d7e21fafdbc USB: serial: keyspan: fix NULL-derefs on open() and write()) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +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 (80b15db5e1e9 staging: vt6655: Fix memory leak in vt6655_probe) +$ 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 | 7 +- + drivers/staging/exfat/exfat_upcase.c | 2 +- + drivers/staging/fbtft/Kconfig | 12 +- + drivers/staging/fbtft/Makefile | 4 - + drivers/staging/fbtft/fbtft-core.c | 7 +- + 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 +- + drivers/staging/speakup/sysfs-driver-speakup | 369 ++++++ + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 1 + + drivers/staging/vt6655/device_main.c | 4 +- + 22 files changed, 405 insertions(+), 2151 deletions(-) + delete mode 100644 drivers/staging/fbtft/fbtft_device.c + delete mode 100644 drivers/staging/fbtft/flexfb.c + create mode 100644 drivers/staging/speakup/sysfs-driver-speakup +Merging char-misc.current/char-misc-linus (fc739a058d99 misc: fastrpc: prevent memory leak in fastrpc_dma_buf_attach) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/fastrpc.c | 1 + + drivers/misc/mei/bus-fixup.c | 14 +++++++++++--- + drivers/misc/mei/hw-me-regs.h | 3 +++ + drivers/misc/mei/hw-me.c | 21 ++++++++++++++++++--- + drivers/misc/mei/hw-me.h | 8 ++++++-- + drivers/misc/mei/mei_dev.h | 4 ++++ + drivers/misc/mei/pci-me.c | 13 ++++++++----- + 7 files changed, 51 insertions(+), 13 deletions(-) +Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (747125db6dcd thunderbolt: Drop unnecessary read when writing LC command in Ice Lake) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/nhi_ops.c | 1 - + drivers/thunderbolt/switch.c | 28 +++++++++++----------------- + 2 files changed, 11 insertions(+), 18 deletions(-) +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 +Already up to date. +Merging modules-fixes/modules-linus (fcfacb9f8374 doc: move namespaces.rst from kbuild/ to core-api/) +$ git merge modules-fixes/modules-linus +Auto-merging scripts/mod/modpost.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/core-api/index.rst | 1 + + .../symbol-namespaces.rst} | 0 + MAINTAINERS | 1 + + Makefile | 2 +- + include/linux/export.h | 10 ++++---- + scripts/coccinelle/misc/add_namespace.cocci | 2 ++ + scripts/mod/modpost.c | 29 +++++++++++----------- + scripts/nsdeps | 4 +-- + 8 files changed, 27 insertions(+), 22 deletions(-) + rename Documentation/{kbuild/namespaces.rst => core-api/symbol-namespaces.rst} (100%) +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 (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/au1550nd.c | 5 ++--- + drivers/mtd/spi-nor/spi-nor.c | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) +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 (3e84a18a259e media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/meson/ao-cec-g12a.c | 36 +++++++++++++++--------------- + drivers/media/platform/meson/ao-cec.c | 30 ++++++++++++------------- + 2 files changed, 33 insertions(+), 33 deletions(-) +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 (88356d09904b MIPS: include: Mark __cmpxchg as __always_inline) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/cmpxchg.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (647c8977e111 ARM: dts: am3874-iceboard: Fix 'i2c-mux-idle-disconnect' usage) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/configs/omap2plus_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am3874-iceboard.dts | 9 +-------- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 4 ++++ + arch/arm/boot/dts/omap54xx-clocks.dtsi | 2 +- + arch/arm/configs/omap2plus_defconfig | 12 ++++++------ + 4 files changed, 12 insertions(+), 15 deletions(-) +Merging kvm-fixes/master (da0c9ea146cb Linux 5.4-rc2) +$ 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 (11c943a1a635 hwmon: docs: Extend inspur-ipsps1 title underline) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/inspur-ipsps1.rst | 2 +- + Documentation/hwmon/k10temp.rst | 18 +++++++++++++++++- + drivers/hwmon/nct7904.c | 33 +++++++++++++++++++++++++++------ + include/linux/hwmon.h | 2 +- + 5 files changed, 47 insertions(+), 9 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 (26966e98a28b 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/send.c | 2 +- + fs/btrfs/tree-log.c | 36 +++++++++++++++++++++++++++--------- + fs/btrfs/volumes.c | 6 +++++- + 6 files changed, 49 insertions(+), 13 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 (2cf2aa6a69db dma-mapping: fix false positivse warnings in dma_common_free_remap()) +$ 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 +Already up to date. +Merging scsi-fixes/fixes (b23f330d5145 scsi: MAINTAINERS: Update qla2xxx driver) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/sd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 16 +++++++++++++--- + drivers/scsi/qla2xxx/qla_isr.c | 2 -- + drivers/scsi/scsi_error.c | 3 +++ + drivers/scsi/sd.c | 3 ++- + include/scsi/scsi_eh.h | 1 + + 6 files changed, 20 insertions(+), 7 deletions(-) +Merging drm-fixes/drm-fixes (da0c9ea146cb Linux 5.4-rc2) +$ 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 +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (b925708f28c2 drm/i915: Mark contents as dirty on a write fault) +$ git merge drm-intel-fixes/for-linux-next-fixes +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 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 (727a399b7476 riscv: remove the switch statement in do_trap_break()) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/kernel/traps.c | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) +Merging pidfd-fixes/fixes (5ca3d87b3828 taskstats: fix data-race) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/taskstats.c | 21 ++++++++++++--------- + lib/test_user_copy.c | 15 +++++++++------ + 2 files changed, 21 insertions(+), 15 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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (cc635be34eb6 drm/panel: tpo-td043mtea1: Fix SPI alias) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 9 ++++++++- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 9 ++++++++- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 9 ++++++++- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +-- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 9 ++++++++- + 5 files changed, 33 insertions(+), 6 deletions(-) +Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (da676aa92374 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 | 15 +++++---------- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + scripts/.gitignore | 1 - + scripts/Makefile | 2 -- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/parser.y | 1 - + 11 files changed, 7 insertions(+), 53 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 (be78662f5e30 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 (31e508a2bfdb 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 | 3 + + include/linux/firmware/meson/meson_sm.h | 15 +- + 42 files changed, 1506 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 (fade20c4077b Merge branch 'imx/defconfig' 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/imx6q-dhcom-pdk2.dts | 8 + + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 17 + + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 14 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 10 + + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sll.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + 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/imx6ul-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + 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/imx7d.dtsi | 5 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imx7ulp.dtsi | 27 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 - + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 18 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 35 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 15 + + drivers/clk/imx/clk-imx8mm.c | 87 +---- + drivers/clk/imx/clk-imx8mn.c | 89 +---- + drivers/clk/imx/clk-pll14xx.c | 72 ++-- + drivers/clk/imx/clk.h | 3 + + drivers/firmware/imx/imx-scu.c | 10 +- + drivers/soc/imx/soc-imx-scu.c | 2 +- + 47 files changed, 1026 insertions(+), 812 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 (008ea917df67 Merge branch 'for_5.5/keystone-dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-clocks.dtsi | 27 +++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2e-clocks.dtsi | 20 ++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 21 +++++++++++++++++++-- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 20 ++++++++++++++++++-- + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 20 ++++++++++++++++++-- + arch/arm/configs/keystone_defconfig | 1 + + 6 files changed, 103 insertions(+), 6 deletions(-) +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 (53fccfb4be90 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt +Merge made by the 'recursive' strategy. + ...-controller.txt => ap80x-system-controller.txt} | 14 +- + .../bindings/arm/marvell/armada-7k-8k.txt | 24 - + .../bindings/arm/marvell/armada-7k-8k.yaml | 61 +++ + MAINTAINERS | 3 +- + arch/arm/boot/dts/armada-38x.dtsi | 5 + + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 5 + + arch/arm/boot/dts/armada-xp.dtsi | 2 +- + arch/arm/boot/dts/dove.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +- + arch/arm64/boot/dts/marvell/Makefile | 3 + + .../dts/marvell/armada-3720-espressobin-emmc.dts | 42 ++ + .../marvell/armada-3720-espressobin-v7-emmc.dts | 59 +++ + .../dts/marvell/armada-3720-espressobin-v7.dts | 36 ++ + .../boot/dts/marvell/armada-3720-espressobin.dts | 184 +------ + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 177 +++++++ + .../boot/dts/marvell/armada-3720-turris-mox.dts | 21 +- + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 28 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 56 +- + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 23 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 42 ++ + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 456 +--------------- + arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 93 ++++ + arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 29 ++ + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 444 ++++++++++++++++ + arch/arm64/boot/dts/marvell/armada-common.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 575 +-------------------- + arch/arm64/boot/dts/marvell/armada-cp115.dtsi | 12 + + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 568 ++++++++++++++++++++ + arch/arm64/boot/dts/marvell/cn9130-db.dts | 403 +++++++++++++++ + arch/arm64/boot/dts/marvell/cn9130.dtsi | 37 ++ + arch/arm64/boot/dts/marvell/cn9131-db.dts | 202 ++++++++ + arch/arm64/boot/dts/marvell/cn9132-db.dts | 221 ++++++++ + 34 files changed, 2554 insertions(+), 1284 deletions(-) + rename Documentation/devicetree/bindings/arm/marvell/{ap806-system-controller.txt => ap80x-system-controller.txt} (91%) + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap80x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp115.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dts +Merging omap/for-next (7968f13dadce Merge branch 'omap-for-v5.5/ti-sysc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 75 ++++++++++++++++----------------------------------- + 1 file changed, 23 insertions(+), 52 deletions(-) +Merging qcom/for-next (a5ff49630785 Merge branches 'arm64-for-5.5', 'drivers-for-5.5' and 'dts-for-5.5' into for-next) +$ git merge qcom/for-next +Removing drivers/soc/qcom/llcc-sdm845.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/qcom,rpmpd.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 12 ++ + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 22 +-- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 ++ + arch/arm/boot/dts/qcom-pm8941.dtsi | 10 ++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 39 ++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 51 +------ + drivers/soc/qcom/Kconfig | 14 +- + drivers/soc/qcom/Makefile | 3 +- + drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} | 155 ++++++++++++++++++++- + drivers/soc/qcom/llcc-sdm845.c | 100 ------------- + drivers/soc/qcom/rpmpd.c | 23 +++ + drivers/soc/qcom/smd-rpm.c | 18 ++- + drivers/soc/qcom/socinfo.c | 2 + + include/dt-bindings/power/qcom-rpmpd.h | 9 ++ + include/linux/soc/qcom/llcc-qcom.h | 104 -------------- + 19 files changed, 302 insertions(+), 283 deletions(-) + rename drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} (64%) + delete mode 100644 drivers/soc/qcom/llcc-sdm845.c +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 (bdb369e1e98a reset: add support for the Meson-A1 SoC Reset Controller) +$ 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 +- + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../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-meson.c | 35 ++++++++-- + drivers/reset/reset-uniphier-glue.c | 4 ++ + include/dt-bindings/reset/amlogic,meson-a1-reset.h | 74 ++++++++++++++++++++++ + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + 13 files changed, 248 insertions(+), 119 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 + create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h +Merging rockchip/for-next (7ba0ed602ef7 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 | 39 ++- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 + + 9 files changed, 379 insertions(+), 98 deletions(-) +Merging samsung-krzk/for-next (8216ec3fda49 Merge branch 'next/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 | 13 +- + arch/arm/boot/dts/exynos4.dtsi | 14 +- + arch/arm/boot/dts/exynos4210.dtsi | 27 +- + arch/arm/boot/dts/exynos4412.dtsi | 25 +- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 27 +- + arch/arm/boot/dts/exynos5250.dtsi | 41 +- + 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 | 46 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + + arch/arm/boot/dts/exynos5800.dtsi | 2 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 + + arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 + + 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 ++++++++++++++++++++ + drivers/soc/samsung/exynos-chipid.c | 2 +- + 34 files changed, 2464 insertions(+), 215 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 (d49380083493 Merge branch 'sunxi/dt-for-5.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi +Merge made by the 'recursive' strategy. + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 9 +++---- + arch/arm/boot/dts/sun7i-a20.dtsi | 5 ++-- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 29 ++++++++++++++++++++++ + .../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 ------- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 19 ++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 23 +++++++++++------ + 9 files changed, 94 insertions(+), 25 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 (51f9d768d5b8 Merge branch 'clk-marvell' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/armada3700-periph-clock.txt | 5 +- + drivers/clk/at91/sam9x60.c | 1 + + drivers/clk/clk-bd718x7.c | 1 + + drivers/clk/hisilicon/clk-hi3660.c | 60 ++++---- + drivers/clk/hisilicon/clk-hi3670.c | 152 ++++++++++----------- + drivers/clk/mvebu/armada-37xx-periph.c | 6 +- + 6 files changed, 115 insertions(+), 110 deletions(-) +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (f7dafb0af1de csky: Add setup_initrd check code) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/kernel/setup.c | 3 --- + arch/csky/mm/init.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 3 deletions(-) +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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (39014c45467f microblaze: entry: Remove unneeded need_resched() loop) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/entry.S | 5 ----- + 1 file changed, 5 deletions(-) +Merging mips/mips-next (a14bf1dc494a MIPS: generic: Use __initconst for const init data) +$ git merge mips/mips-next +Auto-merging arch/mips/include/asm/cmpxchg.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/ralink.txt | 14 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/nvmem.rst | 2 + + arch/mips/Kconfig | 19 +- + arch/mips/Makefile | 3 + + arch/mips/Makefile.postlink | 10 +- + arch/mips/boot/dts/ingenic/ci20.dts | 214 ++++++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 86 ++++ + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 197 +++++++ + arch/mips/boot/dts/ralink/mt7628a.dtsi | 16 + + arch/mips/generic/init.c | 6 +- + arch/mips/include/asm/atomic.h | 571 +++++++-------------- + arch/mips/include/asm/barrier.h | 228 ++------ + arch/mips/include/asm/bitops.h | 443 +++++----------- + arch/mips/include/asm/bugs.h | 18 +- + arch/mips/include/asm/cmpxchg.h | 59 ++- + arch/mips/include/asm/cpu.h | 4 +- + arch/mips/include/asm/futex.h | 15 +- + arch/mips/include/asm/llsc.h | 19 +- + arch/mips/include/asm/mach-ip27/mmzone.h | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 3 +- + .../asm/mach-loongson64/kernel-entry-init.h | 28 +- + .../include/asm/mach-loongson64/loongson_regs.h | 227 ++++++++ + arch/mips/include/asm/pci/bridge.h | 1 + + arch/mips/include/asm/sn/agent.h | 2 +- + arch/mips/include/asm/sn/arch.h | 31 -- + arch/mips/include/asm/sn/hub.h | 4 +- + arch/mips/include/asm/sn/ioc3.h | 9 + + arch/mips/include/asm/sn/mapped_kernel.h | 4 +- + arch/mips/include/asm/sn/sn0/arch.h | 2 - + arch/mips/include/asm/sn/sn_private.h | 5 +- + arch/mips/include/asm/sn/types.h | 4 - + arch/mips/include/asm/string.h | 2 + + arch/mips/include/asm/sync.h | 207 ++++++++ + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/cpu-probe.c | 16 +- + arch/mips/kernel/genex.S | 8 +- + arch/mips/kernel/idle.c | 3 +- + arch/mips/kernel/pm-cps.c | 20 +- + arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} | 11 +- + arch/mips/kernel/syscall.c | 3 +- + arch/mips/lib/bitops.c | 57 +- + arch/mips/loongson64/Platform | 2 +- + arch/mips/loongson64/loongson-3/smp.c | 160 ++++-- + arch/mips/mm/c-r4k.c | 3 +- + arch/mips/pci/pci-xtalk-bridge.c | 137 ++++- + arch/mips/power/cpu.c | 8 +- + arch/mips/sgi-ip27/ip27-hubio.c | 10 +- + arch/mips/sgi-ip27/ip27-init.c | 33 +- + arch/mips/sgi-ip27/ip27-irq.c | 4 +- + arch/mips/sgi-ip27/ip27-klconfig.c | 14 +- + arch/mips/sgi-ip27/ip27-klnuma.c | 21 +- + arch/mips/sgi-ip27/ip27-memory.c | 63 +-- + arch/mips/sgi-ip27/ip27-nmi.c | 16 +- + arch/mips/sgi-ip27/ip27-reset.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 72 +-- + arch/mips/sgi-ip27/ip27-timer.c | 4 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 48 +- + arch/mips/tools/.gitignore | 1 + + arch/mips/tools/Makefile | 5 + + arch/mips/tools/loongson3-llsc-check.c | 307 +++++++++++ + drivers/nvmem/core.c | 61 +-- + drivers/platform/mips/cpu_hwmon.c | 15 + + include/linux/nvmem-consumer.h | 9 + + 64 files changed, 2236 insertions(+), 1340 deletions(-) + create mode 100644 arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts + create mode 100644 arch/mips/include/asm/mach-loongson64/loongson_regs.h + create mode 100644 arch/mips/include/asm/sync.h + rename arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} (97%) + create mode 100644 arch/mips/tools/loongson3-llsc-check.c +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (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 (0836e665ade9 parisc: Fix vmap memory leak in ioremap()/iounmap()) +$ git merge parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++ + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/checksum.h | 101 +++++++++++++++++++------------------ + arch/parisc/include/asm/ldcw.h | 2 +- + arch/parisc/mm/ioremap.c | 12 +++-- + drivers/parisc/sba_iommu.c | 8 --- + kernel/sysctl.c | 4 +- + 7 files changed, 66 insertions(+), 66 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 (da0c9ea146cb Linux 5.4-rc2) +$ 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 dd57604a715c] 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 (d3f8236c7b0b CIFS: Force reval dentry if LOOKUP_REVAL flag is set) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 24 ++++++++++++++++-------- + 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 | 7 ++----- + fs/cifs/smb2proto.h | 4 ++++ + 8 files changed, 51 insertions(+), 35 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 (da0c9ea146cb Linux 5.4-rc2) +$ 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 (b145b0eb2031 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (da0c9ea146cb Linux 5.4-rc2) +$ 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 (832b2cb95543 svcrdma: Improve DMA mapping trace points) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 4 ++-- + fs/nfsd/nfs4xdr.c | 2 -- + include/trace/events/rpcrdma.h | 30 +++++++++++++++++++++++------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 ++++++-- + 4 files changed, 31 insertions(+), 13 deletions(-) +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 (6350744c66a4 xfs: move local to extent inode logging into bmap helper) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_ag.c | 5 ++--- + fs/xfs/libxfs/xfs_attr_leaf.c | 21 +++------------------ + fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- + fs/xfs/libxfs/xfs_bmap.h | 3 ++- + fs/xfs/libxfs/xfs_dir2_block.c | 2 +- + fs/xfs/scrub/refcount.c | 3 +-- + fs/xfs/xfs_bmap_util.c | 4 +++- + fs/xfs/xfs_buf.c | 12 +++++++++++- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + 10 files changed, 29 insertions(+), 31 deletions(-) +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 +Auto-merging arch/s390/pci/pci_clp.c +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 (75799e7ed50e 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/Kconfig | 1 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-axff.c | 11 +- + drivers/hid/hid-core.c | 7 +- + drivers/hid/hid-dr.c | 12 +- + drivers/hid/hid-emsff.c | 12 +- + drivers/hid/hid-gaff.c | 12 +- + drivers/hid/hid-google-hammer.c | 105 +++- + drivers/hid/hid-holtekff.c | 12 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-lg-g15.c | 899 +++++++++++++++++++++++++++++++++ + drivers/hid/hid-lg2ff.c | 12 +- + drivers/hid/hid-lg3ff.c | 11 +- + drivers/hid/hid-lg4ff.c | 11 +- + drivers/hid/hid-lgff.c | 11 +- + drivers/hid/hid-logitech-hidpp.c | 11 +- + drivers/hid/hid-microsoft.c | 12 +- + drivers/hid/hid-prodikeys.c | 4 +- + drivers/hid/hid-sony.c | 12 +- + drivers/hid/hid-tmff.c | 12 +- + drivers/hid/hid-zpff.c | 12 +- + drivers/hid/hidraw.c | 10 +- + include/uapi/linux/input-event-codes.h | 75 +++ + 24 files changed, 1209 insertions(+), 67 deletions(-) + create mode 100644 drivers/hid/hid-lg-g15.c +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 (c11f2bc422b9 firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (b2a7ca7a1322 hwmon: abituguru: make array probe_order static, makes object smaller) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 1 - + drivers/hwmon/abituguru.c | 2 +- + drivers/hwmon/applesmc.c | 38 ++++++++++++++++++-------------------- + drivers/hwmon/aspeed-pwm-tacho.c | 7 +------ + 4 files changed, 20 insertions(+), 28 deletions(-) +Merging jc_docs/docs-next (f704985b1e7e docs/driver-api: Catch up with dma_buf file-name changes) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +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 --no-edit -v -a +[master 823476334670] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + CREDITS | 3 +- + Documentation/Makefile | 3 +- + Documentation/admin-guide/cgroup-v2.rst | 12 +- + 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/core-api/genalloc.rst | 8 +- + Documentation/core-api/mm-api.rst | 2 +- + Documentation/core-api/refcount-vs-atomic.rst | 36 ++-- + Documentation/dev-tools/kmemleak.rst | 2 +- + Documentation/driver-api/dma-buf.rst | 6 +- + 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 +++---- + lib/genalloc.c | 2 +- + scripts/jobserver-count | 58 ++++++ + scripts/kernel-doc | 11 +- + scripts/sphinx-pre-install | 29 ++- + 38 files changed, 452 insertions(+), 162 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 (219031a6e7df media: venus: fix build on 32bit environments) +$ git merge v4l-dvb/master +Removing drivers/media/usb/dvb-usb-v2/gl861.h +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/dvb-frontends/cxd2820r_c.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_t.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/tc90522.c | 27 +- + drivers/media/dvb-frontends/tc90522.h | 3 + + 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/pci/cx23885/cx23888-ir.c | 5 +- + drivers/media/pci/dm1105/dm1105.c | 1 - + drivers/media/pci/saa7164/saa7164-core.c | 166 ++-- + drivers/media/pci/smipcie/smipcie.h | 1 - + drivers/media/platform/Kconfig | 2 + + 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/qcom/venus/core.c | 56 +- + drivers/media/platform/qcom/venus/core.h | 30 + + drivers/media/platform/qcom/venus/helpers.c | 247 +++++- + drivers/media/platform/qcom/venus/helpers.h | 3 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 6 + + drivers/media/platform/qcom/venus/vdec.c | 8 +- + drivers/media/platform/qcom/venus/venc.c | 4 + + 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/rc/imon.c | 61 +- + drivers/media/rc/ir-rcmm-decoder.c | 6 +- + drivers/media/rc/mceusb.c | 141 ++-- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-main.c | 1 + + drivers/media/rc/tango-ir.c | 14 +- + drivers/media/usb/b2c2/flexcop-usb.c | 8 +- + drivers/media/usb/cx231xx/Kconfig | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 509 ++++-------- + drivers/media/usb/cx231xx/cx231xx-audio.c | 1 - + 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/dvb-usb-v2/dvb_usb.h | 2 + + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 16 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 391 ++++------ + drivers/media/usb/dvb-usb-v2/gl861.h | 14 - + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +- + drivers/media/usb/em28xx/em28xx-audio.c | 1 - + drivers/media/usb/em28xx/em28xx-cards.c | 20 + + drivers/media/usb/em28xx/em28xx-dvb.c | 30 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/tm6000/tm6000-regs.h | 2 +- + drivers/media/usb/tm6000/tm6000-usb-isoc.h | 2 +- + drivers/media/usb/tm6000/tm6000.h | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 1 - + 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-funcs.h | 34 +- + include/uapi/linux/cec.h | 133 +++- + 117 files changed, 2783 insertions(+), 2944 deletions(-) + create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-conn-info.rst + delete mode 100644 drivers/media/usb/dvb-usb-v2/gl861.h +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 (909624d8db5b IB/cm: Use container_of() instead of typecast) +$ git merge rdma/for-next +Removing include/uapi/rdma/cxgb3-abi.h +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Removing drivers/infiniband/hw/cxgb3/tcb.h +Removing drivers/infiniband/hw/cxgb3/iwch_qp.c +Removing drivers/infiniband/hw/cxgb3/iwch_provider.h +Removing drivers/infiniband/hw/cxgb3/iwch_provider.c +Removing drivers/infiniband/hw/cxgb3/iwch_mem.c +Removing drivers/infiniband/hw/cxgb3/iwch_ev.c +Removing drivers/infiniband/hw/cxgb3/iwch_cq.c +Removing drivers/infiniband/hw/cxgb3/iwch_cm.h +Removing drivers/infiniband/hw/cxgb3/iwch_cm.c +Removing drivers/infiniband/hw/cxgb3/iwch.h +Removing drivers/infiniband/hw/cxgb3/iwch.c +Removing drivers/infiniband/hw/cxgb3/cxio_wr.h +Removing drivers/infiniband/hw/cxgb3/cxio_resource.h +Removing drivers/infiniband/hw/cxgb3/cxio_resource.c +Removing drivers/infiniband/hw/cxgb3/cxio_hal.h +Removing drivers/infiniband/hw/cxgb3/cxio_hal.c +Removing drivers/infiniband/hw/cxgb3/Makefile +Removing drivers/infiniband/hw/cxgb3/Kconfig +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/cm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-class-infiniband | 19 - + MAINTAINERS | 8 - + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/core/cm.c | 4 +- + drivers/infiniband/core/counters.c | 12 +- + drivers/infiniband/core/device.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/hw/Makefile | 1 - + 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/hw/cxgb3/Kconfig | 19 - + drivers/infiniband/hw/cxgb3/Makefile | 7 - + drivers/infiniband/hw/cxgb3/cxio_hal.c | 1312 ------------- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 204 -- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 344 ---- + drivers/infiniband/hw/cxgb3/cxio_resource.h | 69 - + drivers/infiniband/hw/cxgb3/cxio_wr.h | 802 -------- + drivers/infiniband/hw/cxgb3/iwch.c | 282 --- + drivers/infiniband/hw/cxgb3/iwch.h | 155 -- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2258 ----------------------- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 233 --- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 230 --- + drivers/infiniband/hw/cxgb3/iwch_ev.c | 232 --- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 101 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 1321 ------------- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 347 ---- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 1082 ----------- + drivers/infiniband/hw/cxgb3/tcb.h | 632 ------- + drivers/infiniband/hw/mlx5/main.c | 4 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 +- + drivers/infiniband/hw/mlx5/odp.c | 2 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 4 + + drivers/infiniband/sw/siw/siw_cm.c | 45 +- + drivers/infiniband/sw/siw/siw_main.c | 11 +- + 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 +- + drivers/infiniband/ulp/srp/ib_srp.c | 15 +- + drivers/infiniband/ulp/srp/ib_srp.h | 3 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 186 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 34 +- + include/uapi/rdma/cxgb3-abi.h | 82 - + include/uapi/rdma/rdma_user_ioctl_cmds.h | 1 - + 45 files changed, 182 insertions(+), 9939 deletions(-) + delete mode 100644 drivers/infiniband/hw/cxgb3/Kconfig + delete mode 100644 drivers/infiniband/hw/cxgb3/Makefile + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.c + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.h + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.c + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.h + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_wr.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cq.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_ev.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_mem.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_qp.c + delete mode 100644 drivers/infiniband/hw/cxgb3/tcb.h + delete mode 100644 include/uapi/rdma/cxgb3-abi.h +Merging net-next/master (11fc7d5a0a2d tun: fix memory leak in error path) +$ git merge net-next/master +Auto-merging net/rxrpc/peer_object.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.h +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 ---- + Documentation/networking/tls.rst | 26 ++ + MAINTAINERS | 2 +- + drivers/crypto/chelsio/Kconfig | 2 +- + drivers/crypto/chelsio/chtls/chtls.h | 5 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 20 +- + drivers/net/caif/Kconfig | 16 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 1 - + 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 | 106 +++++- + drivers/net/dsa/sja1105/sja1105_ptp.c | 17 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 97 +++--- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 35 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 158 ++++----- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 14 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 39 ++- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 8 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 9 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 24 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 17 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 66 ++-- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 40 +-- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 34 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 18 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 10 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 29 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 9 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 59 ++-- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 3 +- + .../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/rocker/rocker_main.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 22 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 118 ++++++- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 29 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 3 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 114 ++++--- + drivers/net/netdevsim/bus.c | 1 + + drivers/net/netdevsim/dev.c | 364 +++++++++++---------- + drivers/net/netdevsim/fib.c | 175 ++++++---- + drivers/net/netdevsim/netdev.c | 10 +- + drivers/net/netdevsim/netdevsim.h | 20 +- + drivers/net/phy/at803x.c | 33 +- + drivers/net/phy/broadcom.c | 32 +- + drivers/net/phy/mscc.c | 14 +- + drivers/net/tun.c | 14 +- + drivers/net/usb/ax88179_178a.c | 31 +- + drivers/net/usb/r8152.c | 128 +++----- + drivers/nfc/nfcmrvl/i2c.c | 1 - + drivers/nfc/s3fwrn5/i2c.c | 1 - + include/linux/mroute_base.h | 28 +- + include/linux/netdevice.h | 20 +- + include/linux/skbuff.h | 6 +- + include/linux/skmsg.h | 12 +- + include/linux/stmmac.h | 1 + + include/net/addrconf.h | 6 +- + include/net/devlink.h | 5 +- + include/net/dsa.h | 2 - + include/net/fib_notifier.h | 13 +- + include/net/fib_rules.h | 3 +- + include/net/genetlink.h | 20 +- + include/net/ip6_fib.h | 11 +- + include/net/ip_fib.h | 11 +- + include/net/ipv6.h | 5 + + include/net/net_namespace.h | 6 +- + include/net/netns/mib.h | 3 + + include/net/snmp.h | 6 + + include/net/sock.h | 2 +- + include/net/tls.h | 69 ++-- + include/net/tls_toe.h | 77 +++++ + include/uapi/linux/devlink.h | 4 + + include/uapi/linux/if.h | 1 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/netfilter_arp/arp_tables.h | 2 +- + include/uapi/linux/netfilter_bridge/ebtables.h | 2 +- + include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- + include/uapi/linux/rtnetlink.h | 7 + + include/uapi/linux/snmp.h | 17 + + include/uapi/linux/tipc_config.h | 4 +- + include/uapi/linux/virtio_ring.h | 2 +- + init/do_mounts.c | 49 +++ + net/caif/Kconfig | 10 +- + net/core/dev.c | 352 ++++++++++++++++---- + net/core/devlink.c | 241 +++++++++++--- + net/core/fib_notifier.c | 95 +++--- + net/core/fib_rules.c | 23 +- + net/core/filter.c | 4 +- + net/core/net-procfs.c | 4 +- + net/core/rtnetlink.c | 206 ++++++++++-- + net/core/sock.c | 5 +- + net/ieee802154/nl802154.c | 39 +-- + net/ipv4/fib_notifier.c | 13 +- + net/ipv4/fib_rules.c | 5 +- + net/ipv4/fib_trie.c | 44 ++- + net/ipv4/igmp.c | 2 +- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/ipmr.c | 13 +- + net/ipv4/ipmr_base.c | 30 +- + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv6/addrconf.c | 7 +- + net/ipv6/fib6_notifier.c | 11 +- + net/ipv6/fib6_rules.c | 5 +- + net/ipv6/ip6_fib.c | 50 ++- + net/ipv6/ip6mr.c | 13 +- + net/netlink/genetlink.c | 295 ++++++++++------- + net/nfc/netlink.c | 17 +- + net/openvswitch/conntrack.c | 21 +- + net/rds/ib.c | 11 +- + net/rds/ib.h | 15 +- + net/rds/ib_cm.c | 167 +++++++--- + net/rds/ib_recv.c | 13 +- + net/rds/ib_send.c | 19 +- + net/rxrpc/peer_object.c | 2 + + net/sched/sch_generic.c | 7 +- + net/tipc/netlink.c | 21 +- + net/tipc/netlink.h | 1 - + net/tipc/netlink_compat.c | 19 +- + net/tipc/node.c | 6 +- + net/tipc/socket.c | 6 +- + net/tipc/udp_media.c | 6 +- + net/tls/Kconfig | 10 + + net/tls/Makefile | 5 +- + net/tls/tls_device.c | 46 ++- + net/tls/tls_main.c | 172 ++++------ + net/tls/tls_proc.c | 47 +++ + net/tls/tls_sw.c | 18 +- + net/tls/tls_toe.c | 139 ++++++++ + net/tls/trace.c | 10 + + net/tls/trace.h | 202 ++++++++++++ + net/vmw_vsock/virtio_transport_common.c | 55 +++- + samples/pktgen/README.rst | 2 +- + samples/pktgen/functions.sh | 154 ++++++++- + samples/pktgen/parameters.sh | 2 +- + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 15 +- + .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 15 +- + samples/pktgen/pktgen_sample01_simple.sh | 23 +- + samples/pktgen/pktgen_sample02_multiqueue.sh | 23 +- + .../pktgen/pktgen_sample03_burst_single_flow.sh | 15 +- + samples/pktgen/pktgen_sample04_many_flows.sh | 22 +- + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 15 +- + ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 23 +- + security/selinux/nlmsgtab.c | 4 +- + .../selftests/drivers/net/netdevsim/devlink.sh | 163 ++++++++- + .../drivers/net/netdevsim/devlink_in_netns.sh | 72 ++++ + tools/testing/selftests/net/forwarding/lib.sh | 7 +- + 169 files changed, 4212 insertions(+), 1808 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/renesas,ether.yaml + delete mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt + create mode 100644 include/net/tls_toe.h + create mode 100644 net/tls/tls_proc.c + create mode 100644 net/tls/tls_toe.c + create mode 100644 net/tls/trace.c + create mode 100644 net/tls/trace.h + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh +$ git am -3 ../patches/0001-rxrpc-fix-up-for-rxrpc-Fix-trace-after-put-looking-a.patch +Applying: rxrpc: fix up for "rxrpc: Fix trace-after-put looking at the put peer record" +$ git reset HEAD^ +Unstaged changes after reset: +M net/rxrpc/peer_object.c +$ git add -A . +$ git commit -v -a --amend +[master edcd5cac6411] Merge remote-tracking branch 'net-next/master' + Date: Wed Oct 9 09:33:24 2019 +1100 +Merging bpf-next/master (f05c2001ecc9 Merge branch 'bpf-libbpf-helpers') +$ git merge bpf-next/master +Removing tools/testing/selftests/bpf/bpf_helpers.h +Auto-merging tools/lib/bpf/libbpf_internal.h +Auto-merging tools/lib/bpf/Makefile +CONFLICT (content): Merge conflict in tools/lib/bpf/Makefile +Recorded preimage for 'tools/lib/bpf/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/lib/bpf/Makefile'. +[master 3f6433abf44e] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/prog_flow_dissector.rst | 3 + + arch/x86/net/bpf_jit_comp.c | 10 + + include/uapi/linux/bpf.h | 32 +- + net/core/flow_dissector.c | 38 +- + samples/bpf/Makefile | 2 +- + samples/bpf/hbm_kern.h | 27 +- + samples/bpf/map_perf_test_kern.c | 24 +- + samples/bpf/offwaketime_kern.c | 1 + + samples/bpf/parse_ldabs.c | 1 + + samples/bpf/sampleip_kern.c | 1 + + samples/bpf/sockex1_kern.c | 1 + + samples/bpf/sockex2_kern.c | 1 + + samples/bpf/sockex3_kern.c | 1 + + samples/bpf/spintest_kern.c | 1 + + samples/bpf/tcbpf1_kern.c | 1 + + samples/bpf/test_map_in_map_kern.c | 16 +- + samples/bpf/test_overhead_kprobe_kern.c | 1 + + samples/bpf/test_probe_write_user_kern.c | 1 + + samples/bpf/trace_event_kern.c | 1 + + samples/bpf/tracex1_kern.c | 1 + + samples/bpf/tracex2_kern.c | 1 + + samples/bpf/tracex3_kern.c | 1 + + samples/bpf/tracex4_kern.c | 1 + + samples/bpf/tracex5_kern.c | 1 + + samples/bpf/xdp_adjust_tail_kern.c | 7 +- + samples/bpf/xdp_adjust_tail_user.c | 29 +- + samples/bpf/xdpsock_user.c | 2 +- + scripts/bpf_helpers_doc.py | 155 +++++- + tools/bpf/bpftool/main.c | 4 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 22 +- + tools/include/uapi/linux/bpf.h | 32 +- + tools/lib/bpf/.gitignore | 4 + + tools/lib/bpf/Makefile | 30 +- + tools/lib/bpf/bpf_core_read.h | 167 +++++++ + tools/{testing/selftests => lib}/bpf/bpf_endian.h | 0 + tools/lib/bpf/bpf_helpers.h | 41 ++ + tools/lib/bpf/bpf_tracing.h | 195 ++++++++ + tools/lib/bpf/libbpf.c | 183 ++++--- + tools/lib/bpf/libbpf.h | 48 +- + tools/lib/bpf/libbpf.map | 6 + + tools/lib/bpf/libbpf_internal.h | 32 ++ + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/bpf_helpers.h | 535 --------------------- + tools/testing/selftests/bpf/bpf_legacy.h | 39 ++ + tools/testing/selftests/bpf/cgroup_helpers.c | 4 +- + .../selftests/bpf/prog_tests/attach_probe.c | 49 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 8 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 16 +- + .../testing/selftests/bpf/progs/core_reloc_types.h | 9 + + tools/testing/selftests/bpf/progs/loop1.c | 1 + + tools/testing/selftests/bpf/progs/loop2.c | 1 + + tools/testing/selftests/bpf/progs/loop3.c | 1 + + tools/testing/selftests/bpf/progs/sockopt_sk.c | 13 +- + tools/testing/selftests/bpf/progs/tcp_rtt.c | 13 +- + .../selftests/bpf/progs/test_attach_probe.c | 1 - + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 1 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 1 + + .../selftests/bpf/progs/test_core_reloc_arrays.c | 11 +- + .../selftests/bpf/progs/test_core_reloc_flavors.c | 9 +- + .../selftests/bpf/progs/test_core_reloc_ints.c | 19 +- + .../selftests/bpf/progs/test_core_reloc_kernel.c | 61 ++- + .../selftests/bpf/progs/test_core_reloc_misc.c | 9 +- + .../selftests/bpf/progs/test_core_reloc_mods.c | 19 +- + .../selftests/bpf/progs/test_core_reloc_nesting.c | 7 +- + .../bpf/progs/test_core_reloc_primitives.c | 13 +- + .../bpf/progs/test_core_reloc_ptr_as_arr.c | 5 +- + .../selftests/bpf/progs/test_get_stack_rawtp.c | 4 +- + .../testing/selftests/bpf/progs/test_perf_buffer.c | 1 - + .../selftests/bpf/progs/test_stacktrace_map.c | 1 - + tools/testing/selftests/bpf/test_flow_dissector.sh | 48 +- + tools/testing/selftests/bpf/verifier/loops1.c | 17 + + 72 files changed, 1236 insertions(+), 811 deletions(-) + create mode 100644 tools/lib/bpf/bpf_core_read.h + rename tools/{testing/selftests => lib}/bpf/bpf_endian.h (100%) + create mode 100644 tools/lib/bpf/bpf_helpers.h + create mode 100644 tools/lib/bpf/bpf_tracing.h + delete mode 100644 tools/testing/selftests/bpf/bpf_helpers.h + create mode 100644 tools/testing/selftests/bpf/bpf_legacy.h +Merging ipsec-next/master (4361f5b6118a xfrm: remove the unnecessary .net_exit for xfrmi) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_interface.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_interface.c | 23 ----------------------- + 1 file changed, 23 deletions(-) +Merging mlx5-next/mlx5-next (7d47433cf74f net/mlx5: Expose optimal performance scatter entries capability) +$ git merge mlx5-next/mlx5-next +Merge made by the 'recursive' strategy. + include/linux/mlx5/mlx5_ifc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging netfilter-next/master (f8615bf8a3da netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c.) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/ipset/ip_set.h | 196 +---------------------- + include/linux/netfilter/ipset/ip_set_bitmap.h | 14 -- + include/linux/netfilter/ipset/ip_set_getport.h | 3 - + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 26 ++- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 18 +-- + net/netfilter/ipset/ip_set_bitmap_port.c | 41 ++++- + net/netfilter/ipset/ip_set_core.c | 212 +++++++++++++++++++++++-- + net/netfilter/ipset/ip_set_getport.c | 28 ---- + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/ipset/ip_set_hash_ip.c | 10 +- + net/netfilter/ipset/ip_set_hash_ipmac.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 24 +-- + net/netfilter/ipset/ip_set_hash_mac.c | 6 +- + net/netfilter/ipset/ip_set_hash_net.c | 24 +-- + net/netfilter/ipset/ip_set_hash_netiface.c | 24 +-- + net/netfilter/ipset/ip_set_hash_netnet.c | 28 ++-- + net/netfilter/ipset/ip_set_hash_netport.c | 24 +-- + net/netfilter/ipset/ip_set_hash_netportnet.c | 28 ++-- + net/netfilter/ipset/ip_set_list_set.c | 4 +- + 23 files changed, 376 insertions(+), 372 deletions(-) +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 b2630de6a74b] 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 (ac524481d7f7 ipvs: batch __ip_vs_dev_cleanup) +$ git merge ipvs-next/master +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 (f170d44bc4ec rsi: fix potential null dereference in rsi_probe()) +$ 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 | 81 ++++- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 13 + + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 4 + + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 3 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 2 + + drivers/net/wireless/marvell/libertas/if_sdio.c | 5 + + drivers/net/wireless/marvell/libertas/mesh.c | 1 - + 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 | 226 +++++++++++- + drivers/net/wireless/realtek/rtw88/fw.h | 80 ++++- + drivers/net/wireless/realtek/rtw88/hci.h | 6 + + drivers/net/wireless/realtek/rtw88/mac.c | 133 +++++-- + drivers/net/wireless/realtek/rtw88/mac.h | 1 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 195 ++++++++++- + drivers/net/wireless/realtek/rtw88/main.c | 154 +++++--- + drivers/net/wireless/realtek/rtw88/main.h | 72 +++- + drivers/net/wireless/realtek/rtw88/pci.c | 77 +++- + drivers/net/wireless/realtek/rtw88/phy.c | 2 +- + drivers/net/wireless/realtek/rtw88/ps.c | 191 +++++++--- + drivers/net/wireless/realtek/rtw88/ps.h | 16 +- + drivers/net/wireless/realtek/rtw88/reg.h | 5 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 14 +- + drivers/net/wireless/realtek/rtw88/rx.c | 24 +- + drivers/net/wireless/realtek/rtw88/rx.h | 11 + + drivers/net/wireless/realtek/rtw88/sec.c | 21 ++ + drivers/net/wireless/realtek/rtw88/sec.h | 1 + + drivers/net/wireless/realtek/rtw88/tx.c | 135 ++++++- + drivers/net/wireless/realtek/rtw88/tx.h | 8 + + drivers/net/wireless/realtek/rtw88/util.c | 27 ++ + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1 + + drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +- + drivers/net/wireless/st/cw1200/fwio.c | 6 +- + drivers/net/wireless/st/cw1200/queue.c | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 3 +- + 83 files changed, 2092 insertions(+), 730 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 (2ce113de3132 mac80211: simplify TX aggregation start) +$ git merge mac80211-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/mac80211.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 3 +-- + drivers/net/wireless/ath/wcn36xx/main.c | 5 +++-- + .../wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +-- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 5 ++--- + drivers/net/wireless/mac80211_hwsim.c | 3 +-- + drivers/net/wireless/marvell/mwl8k.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 +-- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 +-- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 3 +-- + drivers/net/wireless/mediatek/mt7601u/main.c | 3 +-- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 ++-- + drivers/net/wireless/realtek/rtlwifi/base.c | 3 +-- + drivers/net/wireless/realtek/rtw88/mac80211.c | 3 +-- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +-- + include/net/mac80211.h | 11 +++++++++-- + include/uapi/linux/nl80211.h | 8 ++++++++ + net/mac80211/agg-tx.c | 9 ++++++++- + net/mac80211/ibss.c | 9 +-------- + net/mac80211/tx.c | 15 ++++----------- + 23 files changed, 52 insertions(+), 54 deletions(-) +Merging gfs2/for-next (f6ef4bff81cc gfs2: Fix memory leak when gfs2meta's fs_context is freed) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 2 +- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/recovery.c | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) +Merging mtd/mtd/next (b34c095ca609 mtd: st_spi_fsm: remove unused field from struct stfsm) +$ git merge mtd/mtd/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +-- + drivers/mtd/devices/spear_smi.c | 4 ---- + drivers/mtd/devices/st_spi_fsm.c | 1 - + drivers/mtd/mtdchar.c | 10 +++++----- + drivers/mtd/nand/raw/denali_dt.c | 4 +--- + drivers/mtd/nand/raw/hisi504_nand.c | 4 +--- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 - + drivers/mtd/nand/raw/marvell_nand.c | 4 +--- + drivers/mtd/nand/raw/meson_nand.c | 4 +--- + drivers/mtd/nand/raw/mtk_ecc.c | 4 +--- + drivers/mtd/nand/raw/mtk_nand.c | 1 - + drivers/mtd/nand/raw/omap2.c | 8 ++------ + drivers/mtd/nand/raw/sh_flctl.c | 4 +--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 5 +---- + drivers/mtd/nand/raw/sunxi_nand.c | 4 +--- + drivers/mtd/spi-nor/cadence-quadspi.c | 4 +--- + 16 files changed, 17 insertions(+), 48 deletions(-) +Merging nand/nand/next (5121b4219972 dt-bindings: mtd: Add Cadence NAND controller driver) +$ git merge nand/nand/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mtd/cadence-nand-controller.txt | 53 + + MAINTAINERS | 7 + + drivers/mtd/nand/raw/Kconfig | 7 + + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 21 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 3031 ++++++++++++++++++++ + drivers/mtd/nand/raw/nand_base.c | 8 +- + drivers/mtd/nand/raw/nand_micron.c | 4 +- + 8 files changed, 3127 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt + create mode 100644 drivers/mtd/nand/raw/cadence-nand-controller.c +Merging spi-nor/spi-nor/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (eff9771d5152 crypto: caam - use mapped_{src,dst}_nents for descriptor) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rng/nuvoton,npcm-rng.txt | 12 + + .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 + + arch/arm/boot/dts/omap3-n900.dts | 6 + + arch/arm/mach-omap2/pdata-quirks.c | 14 +- + arch/arm64/crypto/ghash-ce-core.S | 501 +++-- + arch/arm64/crypto/ghash-ce-glue.c | 293 ++- + crypto/Makefile | 2 +- + crypto/algif_skcipher.c | 2 +- + crypto/jitterentropy.c | 6 +- + crypto/testmgr.c | 24 + + crypto/testmgr.h | 375 ++++ + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/iproc-rng200.c | 9 +- + drivers/char/hw_random/mtk-rng.c | 9 +- + drivers/char/hw_random/npcm-rng.c | 186 ++ + drivers/char/hw_random/omap3-rom-rng.c | 168 +- + drivers/crypto/Kconfig | 3 + + drivers/crypto/caam/caampkc.c | 72 +- + drivers/crypto/caam/caampkc.h | 8 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 39 +- + drivers/crypto/cavium/nitrox/nitrox_dev.h | 15 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 9 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 8 + + drivers/crypto/cavium/nitrox/nitrox_req.h | 4 + + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 133 +- + drivers/crypto/ccp/ccp-ops.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- + drivers/crypto/hisilicon/Kconfig | 9 +- + drivers/crypto/hisilicon/qm.c | 6 + + drivers/crypto/inside-secure/safexcel.c | 270 ++- + drivers/crypto/inside-secure/safexcel.h | 119 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 2039 ++++++++++++++++---- + drivers/crypto/inside-secure/safexcel_hash.c | 1479 +++++++++++++- + drivers/crypto/inside-secure/safexcel_ring.c | 5 +- + drivers/crypto/qce/ablkcipher.c | 2 +- + drivers/crypto/qce/sha.c | 2 +- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 + + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 139 +- + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 12 + + drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 9 +- + drivers/crypto/sunxi-ss/sun4i-ss.h | 2 + + drivers/crypto/talitos.c | 6 +- + include/crypto/internal/skcipher.h | 30 - + include/crypto/skcipher.h | 30 + + 45 files changed, 5053 insertions(+), 1060 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt + create mode 100644 drivers/char/hw_random/npcm-rng.c +Merging drm/drm-next (97ea56540ffc Merge tag 'drm-intel-next-2019-10-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.h +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Recorded preimage for 'drivers/gpu/drm/i915/gem/i915_gem_mman.c' +Recorded preimage for 'drivers/gpu/drm/i915/gem/i915_gem_pm.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_request.c' +Recorded preimage for 'drivers/gpu/drm/i915/selftests/i915_gem.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gem/i915_gem_mman.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gem/i915_gem_pm.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_request.c'. +Recorded resolution for 'drivers/gpu/drm/i915/selftests/i915_gem.c'. +[master 8fd579214162] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 32 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 24 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 9 +- + drivers/gpu/drm/i915/display/intel_audio.c | 36 +- + drivers/gpu/drm/i915/display/intel_bios.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 81 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 1264 ++++++++------------ + drivers/gpu/drm/i915/display/intel_cdclk.h | 13 +- + drivers/gpu/drm/i915/display/intel_color.c | 529 +++++++- + drivers/gpu/drm/i915/display/intel_color.h | 7 + + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 642 +++++++--- + drivers/gpu/drm/i915/display/intel_display.c | 1074 ++++++++--------- + drivers/gpu/drm/i915/display/intel_display.h | 49 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 398 +++--- + drivers/gpu/drm/i915/display/intel_display_power.h | 40 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 36 +- + drivers/gpu/drm/i915/display/intel_dp.c | 228 ++-- + drivers/gpu/drm/i915/display/intel_dp.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 18 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 364 +++++- + drivers/gpu/drm/i915/display/intel_dsb.c | 332 +++++ + drivers/gpu/drm/i915/display/intel_dsb.h | 52 + + drivers/gpu/drm/i915/display/intel_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 19 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 214 +++- + drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 229 ++-- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 31 +- + drivers/gpu/drm/i915/display/intel_psr.c | 299 +++-- + drivers/gpu/drm/i915/display/intel_psr.h | 1 - + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + + drivers/gpu/drm/i915/display/intel_sprite.c | 117 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 1 - + drivers/gpu/drm/i915/display/intel_tc.c | 87 +- + drivers/gpu/drm/i915/display/intel_tc.h | 1 + + drivers/gpu/drm/i915/display/intel_tv.c | 10 +- + drivers/gpu/drm/i915/display/intel_vga.c | 160 +++ + drivers/gpu/drm/i915/display/intel_vga.h | 18 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 390 ++---- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 56 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 83 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 87 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 33 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 147 +-- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 124 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 62 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 31 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 163 +-- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 40 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 540 ++++++--- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 268 ++++- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 4 - + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 2 - + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 33 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 13 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 15 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 19 +- + drivers/gpu/drm/i915/gt/intel_context.c | 22 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 1 - + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 73 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.c | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 35 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 30 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 149 ++- + drivers/gpu/drm/i915/gt/intel_gt.h | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 85 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 11 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 123 ++ + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 24 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 18 +- + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 5 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 1219 +++++++++++++------ + drivers/gpu/drm/i915/gt/intel_lrc.h | 14 + + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 66 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 712 +++++++++++ + drivers/gpu/drm/i915/gt/intel_rc6.h | 25 + + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 28 + + drivers/gpu/drm/i915/gt/intel_reset.c | 123 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 14 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 6 + + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 97 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 37 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 37 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 46 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 10 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 62 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 50 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 155 +-- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 513 +++++--- + drivers/gpu/drm/i915/gt/selftest_reset.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 97 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 63 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 30 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 51 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 8 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 4 - + drivers/gpu/drm/i915/gvt/aperture_gm.c | 12 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 17 - + drivers/gpu/drm/i915/gvt/scheduler.c | 27 +- + drivers/gpu/drm/i915/i915_active.c | 340 ++++-- + drivers/gpu/drm/i915/i915_active.h | 328 ++--- + drivers/gpu/drm/i915/i915_active_types.h | 33 +- + drivers/gpu/drm/i915/i915_buddy.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 274 +++-- + drivers/gpu/drm/i915/i915_drv.c | 205 +--- + drivers/gpu/drm/i915/i915_drv.h | 118 +- + drivers/gpu/drm/i915/i915_gem.c | 310 +---- + drivers/gpu/drm/i915/i915_gem_evict.c | 58 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 9 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 247 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 67 +- + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 28 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 3 +- + drivers/gpu/drm/i915/i915_irq.c | 322 ++--- + drivers/gpu/drm/i915/i915_irq.h | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 44 +- + drivers/gpu/drm/i915/i915_perf.c | 116 +- + drivers/gpu/drm/i915/i915_perf.h | 5 +- + drivers/gpu/drm/i915/i915_pmu.c | 247 ++-- + drivers/gpu/drm/i915/i915_pmu.h | 4 +- + drivers/gpu/drm/i915/i915_query.c | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 636 +++++++--- + drivers/gpu/drm/i915/i915_request.c | 254 ++-- + drivers/gpu/drm/i915/i915_request.h | 32 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 8 +- + drivers/gpu/drm/i915/i915_suspend.c | 11 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 67 ++ + drivers/gpu/drm/i915/i915_switcheroo.h | 14 + + drivers/gpu/drm/i915/i915_sysfs.c | 88 +- + drivers/gpu/drm/i915/i915_trace.h | 40 +- + drivers/gpu/drm/i915/i915_vma.c | 590 ++++++--- + drivers/gpu/drm/i915/i915_vma.h | 132 +- + drivers/gpu/drm/i915/intel_csr.c | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 217 ++-- + drivers/gpu/drm/i915/intel_device_info.h | 3 +- + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 906 ++------------ + drivers/gpu/drm/i915/intel_pm.h | 3 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 - + drivers/gpu/drm/i915/intel_uncore.c | 94 +- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 42 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 4 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 10 - + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 55 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 395 +++++- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + drivers/gpu/drm/i915/selftests/i915_random.c | 20 + + drivers/gpu/drm/i915/selftests/i915_random.h | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 251 ++-- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 19 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 33 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.h | 2 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 14 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 36 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 6 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 45 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 17 +- + include/drm/i915_drm.h | 18 - + include/drm/i915_mei_hdcp_interface.h | 42 +- + include/uapi/drm/i915_drm.h | 6 +- + 196 files changed, 11807 insertions(+), 8042 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6_types.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.c + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.h +Merging amdgpu/drm-next (127bd7e93135 drm/amdgpu: move gpu reset out of amdgpu_device_suspend) +$ 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 413a31a92e6e] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu.rst | 30 +- + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 84 +-- + 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 | 138 +++-- + 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 | 215 ++++++-- + 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 | 147 ++---- + 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 | 18 +- + 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 | 52 +- + 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 | 94 ++-- + 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 | 346 +++--------- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 + + 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_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 23 +- + 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 | 267 +++++----- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 65 ++- + .../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_module.c | 2 +- + 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 | 28 +- + 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 | 213 +++++++- + 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 | 346 ++++++++++++ + .../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 | 114 ++-- + 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 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 12 - + 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.c | 7 - + 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_dwb_scl.c | 4 - + .../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 | 36 +- + 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/dsc/rc_calc.c | 3 - + 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 | 36 +- + 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 | 266 ++++++---- + 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 +- + 258 files changed, 11629 insertions(+), 4347 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/selftests/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.h +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_mman.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_request.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/selftests/i915_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 62493c765d57] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. +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 (94e2ec3f7fef drm/vkms: prime import support) +$ git merge drm-misc/for-linux-next +Removing include/drm/drm_vram_mm_helper.h +Removing include/drm/drm_os_linux.h +Removing include/drm/drmP.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/media/platform/seco-cec/seco-cec.c +Auto-merging drivers/media/platform/meson/ao-cec.c +Auto-merging drivers/media/platform/meson/ao-cec-g12a.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/panel/panel-tpo-td043mtea1.c +Auto-merging drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +Auto-merging drivers/gpu/drm/panel/panel-sony-acx565akm.c +Auto-merging drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +Auto-merging drivers/gpu/drm/panel/panel-lg-lb035q02.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dss.c +Removing drivers/gpu/drm/omapdrm/dss/core.c +Auto-merging drivers/gpu/drm/i915/i915_vma.h +Auto-merging drivers/gpu/drm/i915/i915_vma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.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 drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_gem.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_gem_gtt.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_vma.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_gem.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_gem_gtt.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_vma.c'. +[master 3269cc14e1ad] 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/mcde.rst | 2 +- + Documentation/gpu/todo.rst | 22 +- + MAINTAINERS | 12 + + drivers/dma-buf/dma-fence.c | 78 +-- + 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/arm/malidp_drv.c | 6 + + drivers/gpu/drm/arm/malidp_hw.c | 9 + + drivers/gpu/drm/arm/malidp_hw.h | 3 + + drivers/gpu/drm/arm/malidp_regs.h | 10 + + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 1 - + drivers/gpu/drm/ast/ast_drv.h | 43 +- + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 266 ++++---- + 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 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 + + 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_damage_helper.c | 8 +- + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_cec.c | 29 +- + 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_mm.c | 36 +- + 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 | 60 +- + 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/i810/i810_dma.c | 4 +- + 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/gem/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 41 +- + drivers/gpu/drm/i915/i915_gem.c | 4 +- + 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/lima/lima_device.c | 3 +- + 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 | 327 ++++++---- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 23 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 7 +- + 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/Makefile | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 55 -- + drivers/gpu/drm/omapdrm/dss/dispc.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 37 ++ + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 125 ++-- + 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 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 14 +- + .../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 | 35 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 + + drivers/gpu/drm/tilcdc/tilcdc_external.c | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- + 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_crtc.c | 2 +- + 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/vc4/vc4_hvs.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 4 +- + 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 | 14 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 + + drivers/gpu/drm/vkms/vkms_gem.c | 27 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + drivers/media/cec/cec-notifier.c | 5 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 6 +- + drivers/media/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/platform/meson/ao-cec.c | 4 +- + drivers/media/platform/s5p-cec/s5p_cec.c | 4 +- + drivers/media/platform/seco-cec/seco-cec.c | 4 +- + drivers/media/platform/sti/cec/stih-cec.c | 4 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 4 +- + 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/drmP.h | 103 --- + include/drm/drm_bridge.h | 33 +- + include/drm/drm_connector.h | 25 +- + include/drm/drm_crtc.h | 1 - + include/drm/drm_dp_helper.h | 85 ++- + 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_mm.h | 7 +- + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_modeset_lock.h | 9 + + include/drm/drm_os_linux.h | 55 -- + 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/media/cec-notifier.h | 7 +- + include/uapi/drm/drm_fourcc.h | 26 +- + include/uapi/drm/v3d_drm.h | 8 +- + 307 files changed, 4736 insertions(+), 3142 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 + delete mode 100644 drivers/gpu/drm/omapdrm/dss/core.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c + delete mode 100644 include/drm/drmP.h + create mode 100644 include/drm/drm_gem_ttm_helper.h + delete mode 100644 include/drm/drm_os_linux.h + delete mode 100644 include/drm/drm_vram_mm_helper.h +$ git am -3 ../patches/0001-cec-fix-up-for-cec-add-cec_adapter-to-cec_notifier_c.patch +Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/platform/cec-gpio/cec-gpio.c +$ git add -A . +$ git commit -v -a --amend +[master 390c4ae8c1dc] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Oct 9 11:10:23 2019 +1100 +$ git am -3 ../patches/0001-drm-amdkfd-update-for-drmP.h-removal.patch +Applying: drm/amdkfd: update for drmP.h removal +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdkfd/kfd_priv.h +$ git add -A . +$ git commit -v -a --amend +[master aa4c6e223107] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Oct 9 11:10:23 2019 +1100 +Merging drm-msm/msm-next (8fbd534b7248 drm/msm/dpu: Remove set but not used variables 'mode', 'dpu_kms', 'priv') +$ git merge drm-msm/msm-next +Auto-merging drivers/soc/qcom/Makefile +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/gmu.txt | 51 +++ + .../devicetree/bindings/sram/qcom,ocmem.yaml | 96 +++++ + drivers/firmware/qcom_scm-32.c | 52 ++- + drivers/firmware/qcom_scm-64.c | 12 + + drivers/firmware/qcom_scm.c | 53 +++ + drivers/firmware/qcom_scm.h | 9 + + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 28 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 25 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 3 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++ + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 43 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 15 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 59 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 - + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 10 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 6 +- + drivers/gpu/drm/msm/msm_gpu.c | 6 +- + drivers/gpu/drm/msm/msm_gpummu.c | 6 +- + drivers/gpu/drm/msm/msm_iommu.c | 6 +- + drivers/gpu/drm/msm/msm_mmu.h | 4 +- + drivers/soc/qcom/Kconfig | 10 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/ocmem.c | 433 +++++++++++++++++++++ + include/linux/qcom_scm.h | 26 ++ + include/soc/qcom/ocmem.h | 65 ++++ + 34 files changed, 919 insertions(+), 252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sram/qcom,ocmem.yaml + create mode 100644 drivers/soc/qcom/ocmem.c + create mode 100644 include/soc/qcom/ocmem.h +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 (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/arm,malidp.txt | 3 +++ + 1 file changed, 3 insertions(+) +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 (82e8d723e9e6 sound: Fix Kconfig indentation) +$ git merge sound/for-next +Auto-merging sound/soc/sof/intel/Kconfig +Merge made by the 'recursive' strategy. + sound/core/Kconfig | 28 ++++++++++++------------ + sound/drivers/Kconfig | 20 +++++++++--------- + sound/firewire/Kconfig | 6 +++--- + sound/isa/Kconfig | 18 ++++++++-------- + sound/mips/Kconfig | 12 +++++------ + sound/pci/Kconfig | 2 +- + sound/soc/cirrus/Kconfig | 14 ++++++------ + sound/soc/codecs/Kconfig | 32 ++++++++++++++-------------- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/boards/Kconfig | 48 +++++++++++++++++++++--------------------- + sound/soc/pxa/Kconfig | 16 +++++++------- + sound/soc/qcom/Kconfig | 20 +++++++++--------- + sound/soc/samsung/Kconfig | 8 +++---- + sound/soc/sof/imx/Kconfig | 12 +++++------ + sound/soc/sof/intel/Kconfig | 22 +++++++++---------- + sound/soc/xilinx/Kconfig | 20 +++++++++--------- + sound/soc/zte/Kconfig | 12 +++++------ + sound/usb/Kconfig | 32 ++++++++++++++-------------- + 18 files changed, 162 insertions(+), 162 deletions(-) +Merging sound-asoc/for-next (d1cb6c0891c7 Merge branch 'asoc-5.5' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/arndale_rt5631.c +Auto-merging sound/soc/samsung/Kconfig +CONFLICT (content): Merge conflict in sound/soc/samsung/Kconfig +Auto-merging sound/soc/codecs/Kconfig +Removing Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt +Resolved 'sound/soc/samsung/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 488e76e11c80] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 38 + + .../devicetree/bindings/sound/arndale.txt | 5 +- + .../devicetree/bindings/sound/fsl,mqs.txt | 36 + + .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 6 + + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 4 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + + .../bindings/sound/sun8i-codec-analog.txt | 17 - + .../devicetree/bindings/sound/tas2770.txt | 37 + + include/sound/dmaengine_pcm.h | 5 + + include/sound/pxa2xx-lib.h | 26 +- + include/sound/soc-acpi.h | 2 + + include/sound/soc-component.h | 45 +- + include/sound/soc.h | 6 +- + include/sound/sof.h | 3 + + include/sound/sof/stream.h | 4 +- + sound/arm/pxa2xx-pcm-lib.c | 80 +- + sound/core/pcm_dmaengine.c | 83 +++ + sound/soc/amd/acp-pcm-dma.c | 63 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 56 +- + sound/soc/atmel/atmel-pcm-pdc.c | 48 +- + sound/soc/au1x/dbdma2.c | 64 +- + sound/soc/au1x/dma.c | 63 +- + sound/soc/bcm/cygnus-pcm.c | 56 +- + 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/pcm3168a.c | 98 +-- + sound/soc/codecs/rt5514-spi.c | 41 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/tas2770.c | 819 +++++++++++++++++++++ + sound/soc/codecs/tas2770.h | 143 ++++ + sound/soc/codecs/wcd9335.c | 10 +- + sound/soc/codecs/wm8994.c | 156 +++- + sound/soc/codecs/wm8994.h | 10 +- + sound/soc/dwc/dwc-pcm.c | 48 +- + 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 | 120 ++- + sound/soc/fsl/fsl_dma.c | 53 +- + sound/soc/fsl/fsl_mqs.c | 335 +++++++++ + sound/soc/fsl/imx-pcm-fiq.c | 56 +- + sound/soc/fsl/mpc5200_dma.c | 51 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 30 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 52 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 62 +- + sound/soc/intel/skylake/skl-pcm.c | 67 +- + sound/soc/jz4740/jz4740-i2s.c | 5 +- + sound/soc/kirkwood/kirkwood-dma.c | 50 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 28 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 10 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 76 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 11 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 26 +- + sound/soc/meson/axg-fifo.c | 56 +- + sound/soc/meson/axg-fifo.h | 20 +- + sound/soc/meson/axg-frddr.c | 24 +- + sound/soc/meson/axg-toddr.c | 24 +- + sound/soc/pxa/mmp-pcm.c | 62 +- + sound/soc/pxa/pxa-ssp.c | 14 +- + sound/soc/pxa/pxa2xx-ac97.c | 14 +- + sound/soc/pxa/pxa2xx-i2s.c | 14 +- + sound/soc/pxa/pxa2xx-pcm.c | 14 +- + sound/soc/qcom/lpass-platform.c | 70 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 71 +- + sound/soc/qcom/qdsp6/q6routing.c | 14 +- + sound/soc/samsung/Kconfig | 6 +- + sound/soc/samsung/Makefile | 4 +- + sound/soc/samsung/arndale.c | 217 ++++++ + sound/soc/samsung/arndale_rt5631.c | 164 ----- + sound/soc/samsung/idma.c | 58 +- + sound/soc/sh/dma-sh7760.c | 46 +- + sound/soc/sh/fsi.c | 31 +- + sound/soc/sh/rcar/core.c | 23 +- + sound/soc/sh/siu_pcm.c | 44 +- + sound/soc/soc-component.c | 76 +- + sound/soc/soc-core.c | 303 ++++---- + sound/soc/soc-generic-dmaengine-pcm.c | 163 ++-- + sound/soc/soc-ops.c | 11 +- + sound/soc/soc-pcm.c | 75 +- + sound/soc/soc-utils.c | 11 +- + 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/pcm.c | 88 +-- + sound/soc/sof/sof-priv.h | 17 +- + sound/soc/sof/trace.c | 17 +- + sound/soc/sprd/sprd-pcm-dma.c | 74 +- + sound/soc/stm/stm32_adfsdm.c | 42 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/txx9/txx9aclc.c | 48 +- + sound/soc/uniphier/aio-dma.c | 51 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 63 +- + sound/soc/xtensa/xtfpga-i2s.c | 30 +- + 101 files changed, 3905 insertions(+), 1643 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 + create mode 100644 sound/soc/samsung/arndale.c + delete mode 100644 sound/soc/samsung/arndale_rt5631.c +Merging modules/modules-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge modules/modules-next +Already up to date. +Merging input/next (3df955f870c2 Input: gpio_mouse - switch to using input device polling mode) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/input-poller.c | 9 +++++++ + drivers/input/mouse/Kconfig | 1 - + drivers/input/mouse/gpio_mouse.c | 45 ++++++++++++++------------------ + drivers/input/touchscreen/atmel_mxt_ts.c | 4 +++ + include/linux/input.h | 1 + + 5 files changed, 34 insertions(+), 26 deletions(-) +Merging block/for-next (c121a069344a Merge branch 'for-5.5/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 4 +- + block/blk-mq-sysfs.c | 16 +- + block/blk-mq.c | 50 ++---- + block/blk-mq.h | 9 - + block/blk-stat.c | 7 +- + block/blk-sysfs.c | 8 - + block/t10-pi.c | 8 +- + drivers/block/null_blk_main.c | 78 +++++--- + fs/io_uring.c | 401 +++++++++++++++++++++++++++++++++++------- + include/linux/blk-mq.h | 74 ++++++-- + include/linux/blkdev.h | 1 - + include/trace/events/wbt.h | 12 +- + include/uapi/linux/io_uring.h | 7 + + 13 files changed, 488 insertions(+), 187 deletions(-) +Merging device-mapper/for-next (633b1613b2a4 dm snapshot: rework COW throttling to fix deadlock) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-clone-target.c | 4 +- + drivers/md/dm-snap.c | 94 ++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 79 insertions(+), 19 deletions(-) +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (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 563bdb3d9624] 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 (38a6fc63a3ea mfd: db8500-prcmu: Example using new OF_MFD_CELL/MFD_CELL_BASIC MACROs) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/ab8500-core.c | 138 +++++++++++++------------------------------ + drivers/mfd/db8500-prcmu.c | 21 +++---- + drivers/mfd/intel-lpss-pci.c | 28 ++++++--- + drivers/mfd/ipaq-micro.c | 6 +- + drivers/mfd/rk808.c | 22 ++----- + include/linux/mfd/core.h | 29 +++++++++ + include/linux/mfd/rk808.h | 2 +- + 7 files changed, 105 insertions(+), 141 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 (70336ab5ded1 Merge branch 'regulator-5.5' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,rpmh-regulator.txt | 4 + + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 21 +++++ + .../bindings/regulator/qcom,spmi-regulator.txt | 25 ++++++ + .../devicetree/bindings/regulator/regulator.yaml | 7 +- + drivers/gpio/gpiolib-devres.c | 33 +++----- + drivers/gpio/gpiolib.c | 48 +++++++++++ + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/da9062-regulator.c | 14 +--- + drivers/regulator/da9063-regulator.c | 9 +-- + drivers/regulator/da9211-regulator.c | 12 +-- + drivers/regulator/max77686-regulator.c | 5 +- + drivers/regulator/max8907-regulator.c | 15 +++- + drivers/regulator/pbias-regulator.c | 75 +++++++----------- + drivers/regulator/pcap-regulator.c | 4 - + drivers/regulator/qcom-rpmh-regulator.c | 62 ++++++++++++++- + drivers/regulator/qcom_smd-regulator.c | 92 ++++++++++++++++++++++ + drivers/regulator/qcom_spmi-regulator.c | 41 ++++++++++ + drivers/regulator/rk808-regulator.c | 29 ++----- + drivers/regulator/s2mps11.c | 7 +- + drivers/regulator/s5m8767.c | 7 +- + drivers/regulator/slg51000-regulator.c | 13 ++- + drivers/regulator/tps65090-regulator.c | 26 +++--- + drivers/regulator/tps65132-regulator.c | 17 ++-- + include/linux/gpio/consumer.h | 54 ++++++++++--- + 24 files changed, 451 insertions(+), 170 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 00c9bb6be2b9] 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 43e15fc20a40] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Oct 9 12:13:22 2019 +1100 +$ 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 eeb44c7d6688] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Oct 9 12:13:22 2019 +1100 +$ 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 af428728bcd5] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Oct 9 12:13:22 2019 +1100 +Merging selinux/next (42345b68c2e3 selinux: default_range glblub implementation) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 12 ++++++++++++ + security/selinux/include/security.h | 3 ++- + security/selinux/selinuxfs.c | 4 ---- + security/selinux/ss/context.h | 32 ++++++++++++++++++++++++++++++++ + security/selinux/ss/ebitmap.c | 18 ++++++++++++++++++ + security/selinux/ss/ebitmap.h | 1 + + security/selinux/ss/mls.c | 3 +++ + security/selinux/ss/policydb.c | 5 +++++ + security/selinux/ss/policydb.h | 1 + + 9 files changed, 74 insertions(+), 5 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 (23641a048089 printk: Monitor change of console loglevel.) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 20 ++++++++++++++++++++ + security/tomoyo/tomoyo.c | 6 ++++++ + 2 files changed, 26 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 (a36a383dc301 Merge branch 'dt/linus' into dt/next) +$ 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/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/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 +- + 41 files changed, 1625 insertions(+), 871 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 + 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 (944572040aac Merge remote-tracking branch 'spi/topic/ptp' 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 | 35 ++++++ + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 17 +++ + drivers/spi/spi-gpio.c | 5 +- + 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 +- + drivers/spi/spi.c | 127 +++++++++++++++++++++ + include/linux/spi/spi.h | 61 ++++++++++ + 21 files changed, 423 insertions(+), 135 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 (80bb240ac08b 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/boot/compressed/string.c | 10 ++ + 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/include/asm/uv/bios.h | 2 +- + arch/x86/include/asm/uv/uv.h | 16 +- + arch/x86/include/asm/uv/uv_hub.h | 61 +++---- + arch/x86/kernel/apic/x2apic_uv_x.c | 184 ++++++++++++++++++--- + 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/head_32.S | 2 - + arch/x86/kernel/head_64.S | 11 +- + 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/platform/efi/efi.c | 3 - + arch/x86/platform/uv/bios_uv.c | 9 +- + arch/x86/realmode/rm/realmode.lds.S | 1 + + arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + drivers/firmware/efi/cper.c | 2 +- + drivers/firmware/efi/efi.c | 3 + + drivers/firmware/efi/rci2-table.c | 2 +- + drivers/firmware/efi/tpm.c | 24 ++- + include/linux/tpm_eventlog.h | 16 +- + kernel/events/core.c | 4 + + tools/arch/arm/include/uapi/asm/kvm.h | 4 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 4 +- + tools/arch/s390/include/uapi/asm/kvm.h | 6 + + tools/arch/x86/include/uapi/asm/vmx.h | 2 + + tools/arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + tools/include/uapi/asm-generic/mman-common.h | 3 + + tools/include/uapi/drm/i915_drm.h | 1 + + tools/include/uapi/linux/fs.h | 55 +----- + tools/include/uapi/linux/fscrypt.h | 181 ++++++++++++++++++++ + tools/include/uapi/linux/kvm.h | 3 + + tools/include/uapi/linux/usbdevice_fs.h | 4 + + tools/lib/subcmd/Makefile | 8 +- + tools/perf/Documentation/asciidoc.conf | 3 + + tools/perf/Documentation/jitdump-specification.txt | 4 +- + tools/perf/arch/arm/annotate/instructions.c | 4 +- + tools/perf/arch/arm64/annotate/instructions.c | 4 +- + tools/perf/arch/powerpc/util/header.c | 3 +- + tools/perf/arch/s390/annotate/instructions.c | 6 +- + tools/perf/arch/s390/util/header.c | 9 +- + tools/perf/arch/x86/annotate/instructions.c | 6 +- + tools/perf/arch/x86/util/header.c | 3 +- + tools/perf/builtin-kvm.c | 7 +- + tools/perf/builtin-script.c | 6 +- + tools/perf/check-headers.sh | 1 + + .../arch/s390/{cf_m8561 => cf_z15}/basic.json | 0 + .../arch/s390/{cf_m8561 => cf_z15}/crypto.json | 0 + .../arch/s390/{cf_m8561 => cf_z15}/crypto6.json | 0 + .../arch/s390/{cf_m8561 => cf_z15}/extended.json | 0 + .../pmu-events/arch/s390/cf_z15/transaction.json | 7 + + tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- + tools/perf/pmu-events/jevents.c | 12 +- + tools/perf/tests/perf-hooks.c | 3 +- + tools/perf/util/annotate.c | 35 +++- + tools/perf/util/annotate.h | 4 + + tools/perf/util/evsel.c | 3 +- + tools/perf/util/jitdump.c | 6 +- + tools/perf/util/llvm-utils.c | 6 +- + tools/perf/util/map.c | 3 + + tools/perf/util/python.c | 6 + + 78 files changed, 776 insertions(+), 284 deletions(-) + create mode 100644 tools/include/uapi/linux/fscrypt.h + rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json (100%) + rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json (100%) + rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json (100%) + rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json (100%) + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/transaction.json +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 722c9bcf69bd] 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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (61f8d64aae65 arm64: KVM: Handle PMCR_EL0.LC as RES1 on pure AArch64 systems) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm64/kvm/sys_regs.c | 4 ++++ + virt/kvm/arm/pmu.c | 22 ++++++++++++---------- + 2 files changed, 16 insertions(+), 10 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 (f76f6371643b KVM: s390: Cleanup kvm_arch_init error path) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 ++--- + arch/s390/kvm/kvm-s390.c | 18 +++++++----------- + 2 files changed, 9 insertions(+), 14 deletions(-) +Merging xen-tip/linux-next (c6875f3aacf2 x86/xen: Return from panic notifier) +$ git merge xen-tip/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 ++++ + arch/x86/xen/enlighten.c | 28 ++++++++++++++++++++++--- + 2 files changed, 29 insertions(+), 3 deletions(-) +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 (201e91091b1d sh: add the sh_ prefix to early platform symbols) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/platform_device.h +Auto-merging include/linux/device.h +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/base/platform.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/driver-api/device_link.rst | 3 +- + arch/sh/drivers/Makefile | 2 +- + arch/sh/drivers/platform_early.c | 347 ++++++++++++++++++++++++ + arch/sh/include/asm/platform_early.h | 61 +++++ + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 1 + + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 3 +- + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 3 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 9 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 3 +- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 3 +- + arch/sh/kernel/setup.c | 3 +- + arch/sh/kernel/time.c | 5 +- + drivers/base/core.c | 167 ++++++++++++ + drivers/base/platform.c | 288 -------------------- + drivers/clocksource/sh_cmt.c | 13 +- + drivers/clocksource/sh_mtu2.c | 13 +- + drivers/clocksource/sh_tmu.c | 14 +- + drivers/of/platform.c | 12 + + drivers/of/property.c | 245 +++++++++++++++++ + drivers/tty/serial/sh-sci.c | 11 +- + include/linux/device.h | 26 ++ + include/linux/fwnode.h | 19 ++ + include/linux/platform_device.h | 64 +---- + 48 files changed, 1003 insertions(+), 388 deletions(-) + create mode 100644 arch/sh/drivers/platform_early.c + create mode 100644 arch/sh/include/asm/platform_early.h +Merging usb/usb-next (2538f0ee8a29 usb: host: xhci-tegra: Add Tegra194 XHCI support) +$ git merge usb/usb-next +Auto-merging drivers/usb/renesas_usbhs/mod_gadget.c +Auto-merging drivers/usb/renesas_usbhs/common.h +Auto-merging drivers/usb/misc/Kconfig +Auto-merging drivers/usb/image/microtek.c +Auto-merging drivers/usb/gadget/udc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/renesas,usb3-peri.txt | 23 ++ + .../devicetree/bindings/usb/ti,hd3ss3220.txt | 38 +++ + Documentation/devicetree/bindings/usb/usb251xb.txt | 1 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 22 +- + drivers/usb/dwc3/Kconfig | 4 +- + drivers/usb/gadget/legacy/Kconfig | 20 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/at91_udc.c | 4 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 4 +- + drivers/usb/gadget/udc/bdc/bdc_udc.c | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 4 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 4 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 4 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 5 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 5 +- + drivers/usb/host/Kconfig | 68 +++--- + drivers/usb/host/isp1362-hcd.c | 5 +- + drivers/usb/host/ohci-at91.c | 7 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/xhci-tegra.c | 101 ++++++-- + drivers/usb/image/microtek.c | 3 +- + drivers/usb/isp1760/isp1760-hcd.c | 2 - + drivers/usb/misc/Kconfig | 8 +- + drivers/usb/misc/ftdi-elan.c | 6 +- + drivers/usb/misc/sisusbvga/Kconfig | 2 +- + drivers/usb/misc/usb251xb.c | 49 +++- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_gadget.c | 3 +- + drivers/usb/phy/phy-keystone.c | 4 +- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/renesas_usbhs/common.c | 5 +- + drivers/usb/renesas_usbhs/common.h | 3 +- + drivers/usb/renesas_usbhs/mod.c | 19 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 12 +- + drivers/usb/serial/Kconfig | 44 ++-- + drivers/usb/storage/scsiglue.c | 4 +- + drivers/usb/typec/Kconfig | 10 + + drivers/usb/typec/Makefile | 1 + + drivers/usb/typec/hd3ss3220.c | 259 +++++++++++++++++++++ + drivers/usb/usbip/stub_tx.c | 2 +- + 42 files changed, 578 insertions(+), 202 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt + create mode 100644 drivers/usb/typec/hd3ss3220.c +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 (7726fb53e75f tty:n_gsm.c: destroy port by tty_port_destroy()) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-aspeed-vuart | 11 ++- + Documentation/devicetree/bindings/serial/8250.txt | 5 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + + drivers/tty/n_gsm.c | 1 + + drivers/tty/serial/8250/8250_aspeed_vuart.c | 84 ++++++++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 75 +++++++++---------- + drivers/tty/serial/8250/8250_lpss.c | 21 +++--- + drivers/tty/serial/8250/8250_of.c | 31 ++++++++ + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 4 -- + drivers/tty/serial/imx.c | 5 +- + drivers/tty/serial/serial_core.c | 3 +- + drivers/tty/serial/sprd_serial.c | 33 +++++++++ + drivers/tty/tty_ldisc.c | 7 +- + 14 files changed, 212 insertions(+), 70 deletions(-) +Merging char-misc/char-misc-next (3e917975b7cd mei: me: fix me_intr_clear function name in KDoc) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/mei/hw-me.c +Auto-merging drivers/misc/mei/bus-fixup.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-mei | 2 +- + drivers/misc/eeprom/eeprom.c | 4 ++++ + drivers/misc/mei/bus-fixup.c | 9 --------- + drivers/misc/mei/hw-me.c | 2 +- + drivers/misc/ti-st/st_core.c | 4 ++-- + 5 files changed, 8 insertions(+), 13 deletions(-) +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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (d49d1c76b96e staging: comedi: Remove set but not used variable 'aref') +$ git merge staging/staging-next +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +Auto-merging drivers/staging/octeon/octeon-stubs.h +Auto-merging drivers/staging/exfat/exfat_super.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/board/armadillo800eva.c | 12 +- + drivers/staging/comedi/drivers/dt3000.c | 3 +- + drivers/staging/exfat/TODO | 9 + + drivers/staging/exfat/exfat_super.c | 34 +- + 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/mt7621-pci/pci-mt7621.c | 23 +- + drivers/staging/octeon/octeon-ethernet.h | 2 +- + drivers/staging/octeon/octeon-stubs.h | 11 +- + 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/TODO | 3 - + drivers/staging/qlge/qlge.h | 145 +- + drivers/staging/qlge/qlge_dbg.c | 78 +- + drivers/staging/qlge/qlge_main.c | 881 +++++------ + drivers/staging/qlge/qlge_mpi.c | 1 - + drivers/staging/rtl8188eu/core/rtw_ap.c | 31 +- + drivers/staging/rtl8188eu/core/rtw_efuse.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/r8190_rtl8256.c | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 127 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 - + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 23 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1 - + drivers/staging/rtl8723bs/core/rtw_recv.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 10 - + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 15 - + drivers/staging/rtl8723bs/core/rtw_xmit.c | 18 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 - + drivers/staging/rtl8723bs/hal/hal_btcoex.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/hal/sdio_ops.c | 2 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 11 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 56 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - + drivers/staging/sm750fb/ddk750_chip.c | 41 +- + drivers/staging/sm750fb/ddk750_chip.h | 18 +- + drivers/staging/sm750fb/ddk750_mode.c | 11 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 3 + + .../interface/vchiq_arm/vchiq_2835_arm.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 7 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 6 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 2 +- + drivers/staging/vt6656/main_usb.c | 9 +- + drivers/staging/vt6656/rxtx.c | 8 +- + .../bindings/net/wireless/siliabs,wfx.txt | 97 ++ + drivers/staging/wfx/Kconfig | 7 + + drivers/staging/wfx/Makefile | 24 + + drivers/staging/wfx/TODO | 20 + + drivers/staging/wfx/bh.c | 316 ++++ + drivers/staging/wfx/bh.h | 32 + + drivers/staging/wfx/bus.h | 34 + + drivers/staging/wfx/bus_sdio.c | 268 ++++ + drivers/staging/wfx/bus_spi.c | 264 ++++ + drivers/staging/wfx/data_rx.c | 208 +++ + drivers/staging/wfx/data_rx.h | 18 + + drivers/staging/wfx/data_tx.c | 799 ++++++++++ + drivers/staging/wfx/data_tx.h | 93 ++ + drivers/staging/wfx/debug.c | 304 ++++ + drivers/staging/wfx/debug.h | 19 + + drivers/staging/wfx/fwio.c | 387 +++++ + drivers/staging/wfx/fwio.h | 15 + + drivers/staging/wfx/hif_api_cmd.h | 681 ++++++++ + drivers/staging/wfx/hif_api_general.h | 437 ++++++ + drivers/staging/wfx/hif_api_mib.h | 558 +++++++ + drivers/staging/wfx/hif_rx.c | 336 ++++ + drivers/staging/wfx/hif_rx.h | 18 + + drivers/staging/wfx/hif_tx.c | 470 ++++++ + drivers/staging/wfx/hif_tx.h | 67 + + drivers/staging/wfx/hif_tx_mib.h | 290 ++++ + drivers/staging/wfx/hwio.c | 338 ++++ + drivers/staging/wfx/hwio.h | 75 + + drivers/staging/wfx/key.c | 258 +++ + drivers/staging/wfx/key.h | 22 + + drivers/staging/wfx/main.c | 500 ++++++ + drivers/staging/wfx/main.h | 48 + + drivers/staging/wfx/queue.c | 606 ++++++++ + drivers/staging/wfx/queue.h | 59 + + drivers/staging/wfx/scan.c | 289 ++++ + drivers/staging/wfx/scan.h | 42 + + drivers/staging/wfx/secure_link.h | 46 + + drivers/staging/wfx/sta.c | 1640 ++++++++++++++++++++ + drivers/staging/wfx/sta.h | 101 ++ + drivers/staging/wfx/traces.h | 434 ++++++ + drivers/staging/wfx/wfx.h | 204 +++ + drivers/staging/wfx/wfx_version.h | 3 + + 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 | 204 ++- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 + + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + drivers/staging/wlan-ng/p80211wep.c | 64 +- + 118 files changed, 11361 insertions(+), 1306 deletions(-) + create mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt + create mode 100644 drivers/staging/wfx/Kconfig + create mode 100644 drivers/staging/wfx/Makefile + create mode 100644 drivers/staging/wfx/TODO + create mode 100644 drivers/staging/wfx/bh.c + create mode 100644 drivers/staging/wfx/bh.h + create mode 100644 drivers/staging/wfx/bus.h + create mode 100644 drivers/staging/wfx/bus_sdio.c + create mode 100644 drivers/staging/wfx/bus_spi.c + create mode 100644 drivers/staging/wfx/data_rx.c + create mode 100644 drivers/staging/wfx/data_rx.h + create mode 100644 drivers/staging/wfx/data_tx.c + create mode 100644 drivers/staging/wfx/data_tx.h + create mode 100644 drivers/staging/wfx/debug.c + create mode 100644 drivers/staging/wfx/debug.h + create mode 100644 drivers/staging/wfx/fwio.c + create mode 100644 drivers/staging/wfx/fwio.h + create mode 100644 drivers/staging/wfx/hif_api_cmd.h + create mode 100644 drivers/staging/wfx/hif_api_general.h + create mode 100644 drivers/staging/wfx/hif_api_mib.h + create mode 100644 drivers/staging/wfx/hif_rx.c + create mode 100644 drivers/staging/wfx/hif_rx.h + create mode 100644 drivers/staging/wfx/hif_tx.c + create mode 100644 drivers/staging/wfx/hif_tx.h + create mode 100644 drivers/staging/wfx/hif_tx_mib.h + create mode 100644 drivers/staging/wfx/hwio.c + create mode 100644 drivers/staging/wfx/hwio.h + create mode 100644 drivers/staging/wfx/key.c + create mode 100644 drivers/staging/wfx/key.h + create mode 100644 drivers/staging/wfx/main.c + create mode 100644 drivers/staging/wfx/main.h + create mode 100644 drivers/staging/wfx/queue.c + create mode 100644 drivers/staging/wfx/queue.h + create mode 100644 drivers/staging/wfx/scan.c + create mode 100644 drivers/staging/wfx/scan.h + create mode 100644 drivers/staging/wfx/secure_link.h + create mode 100644 drivers/staging/wfx/sta.c + create mode 100644 drivers/staging/wfx/sta.h + create mode 100644 drivers/staging/wfx/traces.h + create mode 100644 drivers/staging/wfx/wfx.h + create mode 100644 drivers/staging/wfx/wfx_version.h +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 (44223a8b45d7 interconnect: qcom: Fix icc_onecell_data allocation) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/qcom/qcs404.c | 3 ++- + drivers/interconnect/qcom/sdm845.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) +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 (1a99fcc035fb selftests: cgroup: Run test_core under interfering stress) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup-internal.h | 5 +- + kernel/cgroup/cgroup-v1.c | 5 +- + kernel/cgroup/cgroup.c | 70 +++++++----- + tools/testing/selftests/cgroup/Makefile | 4 +- + tools/testing/selftests/cgroup/cgroup_util.c | 42 +++++++- + tools/testing/selftests/cgroup/cgroup_util.h | 6 +- + tools/testing/selftests/cgroup/test_core.c | 146 ++++++++++++++++++++++++++ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + tools/testing/selftests/cgroup/test_stress.sh | 4 + + tools/testing/selftests/cgroup/with_stress.sh | 101 ++++++++++++++++++ + 10 files changed, 344 insertions(+), 41 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_stress.sh + create mode 100755 tools/testing/selftests/cgroup/with_stress.sh +Merging scsi/for-next (dda08a80d659 Merge branch 'misc' into for-next) +$ git merge scsi/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 + + drivers/target/target_core_tpg.c | 12 - + drivers/target/target_core_xcopy.c | 1 - + include/scsi/scsi_device.h | 5 +- + include/scsi/scsi_host.h | 3 + + include/target/target_core_base.h | 1 - + 46 files changed, 916 insertions(+), 389 deletions(-) +Merging scsi-mkp/for-next (e1f92b500067 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/scsi_lib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +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 (6dd9b912c9b4 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 1 + + .../gpio/{sgpio-aspeed.c => gpio-aspeed-sgpio.c} | 0 + drivers/gpio/gpio-max77620.c | 231 +++++++++++---------- + drivers/gpio/gpio-tegra186.c | 97 +++++++-- + drivers/gpio/gpiolib.c | 12 ++ + include/uapi/linux/gpio.h | 4 + + 7 files changed, 222 insertions(+), 132 deletions(-) + rename drivers/gpio/{sgpio-aspeed.c => gpio-aspeed-sgpio.c} (100%) +Merging gpio-brgl/gpio/for-next (5ede17d61592 dt-bindings: gpio: rcar: Add DT binding for r8a774b1) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +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 (4afb0edace60 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 14 +--- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 4 +- + drivers/pinctrl/devicetree.c | 40 ++++----- + drivers/pinctrl/devicetree.h | 7 -- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 18 ++--- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 32 ++++---- + drivers/pinctrl/pinctrl-at91-pio4.c | 62 ++++++++++++++ + drivers/pinctrl/pinctrl-coh901.c | 50 ++++++------ + drivers/pinctrl/pinctrl-pic32.c | 25 +++--- + drivers/pinctrl/pinctrl-stmfx.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 1 + + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 121 ++++++++-------------------- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 41 +++++----- + drivers/pinctrl/sirf/pinctrl-sirf.c | 43 +++++----- + drivers/pinctrl/spear/pinctrl-plgpio.c | 47 +++++------ + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 6 ++ + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- + 17 files changed, 251 insertions(+), 264 deletions(-) +Merging pinctrl-intel/for-next (da0c9ea146cb Linux 5.4-rc2) +$ 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/ocfs2/ioctl.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 (09ef18bcd5ac rtc: use devm_platform_ioremap_resource() to simplify code) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-asm9260.c | 4 +--- + drivers/rtc/rtc-aspeed.c | 4 +--- + drivers/rtc/rtc-at91rm9200.c | 19 +------------------ + drivers/rtc/rtc-at91sam9.c | 4 +--- + drivers/rtc/rtc-brcmstb-waketimer.c | 4 +--- + drivers/rtc/rtc-cadence.c | 4 +--- + drivers/rtc/rtc-coh901331.c | 4 +--- + drivers/rtc/rtc-davinci.c | 4 +--- + drivers/rtc/rtc-digicolor.c | 4 +--- + drivers/rtc/rtc-ds1216.c | 4 +--- + drivers/rtc/rtc-ds1286.c | 4 +--- + drivers/rtc/rtc-ds1511.c | 4 +--- + drivers/rtc/rtc-ds1553.c | 4 +--- + drivers/rtc/rtc-ep93xx.c | 4 +--- + drivers/rtc/rtc-fsl-ftm-alarm.c | 9 +-------- + drivers/rtc/rtc-goldfish.c | 8 +------- + drivers/rtc/rtc-jz4740.c | 4 +--- + drivers/rtc/rtc-lpc24xx.c | 4 +--- + drivers/rtc/rtc-lpc32xx.c | 4 +--- + drivers/rtc/rtc-m48t86.c | 11 ++--------- + drivers/rtc/rtc-meson.c | 4 +--- + drivers/rtc/rtc-mt7622.c | 4 +--- + drivers/rtc/rtc-mv.c | 4 +--- + drivers/rtc/rtc-omap.c | 4 +--- + drivers/rtc/rtc-pic32.c | 4 +--- + drivers/rtc/rtc-r7301.c | 7 +------ + drivers/rtc/rtc-rtd119x.c | 4 +--- + drivers/rtc/rtc-s3c.c | 4 +--- + drivers/rtc/rtc-sa1100.c | 4 +--- + drivers/rtc/rtc-spear.c | 4 +--- + drivers/rtc/rtc-st-lpc.c | 4 +--- + drivers/rtc/rtc-stk17ta8.c | 4 +--- + drivers/rtc/rtc-stm32.c | 4 +--- + drivers/rtc/rtc-sunxi.c | 4 +--- + drivers/rtc/rtc-tegra.c | 4 +--- + drivers/rtc/rtc-tx4939.c | 4 +--- + drivers/rtc/rtc-vt8500.c | 4 +--- + drivers/rtc/rtc-xgene.c | 4 +--- + drivers/rtc/rtc-zynqmp.c | 5 +---- + 41 files changed, 42 insertions(+), 152 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 (285be87c79e1 eeprom: at24: Improve confusing log message) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +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 +Auto-merging include/linux/nvmem-consumer.h +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 (41928dfdf5bd Drivers: hv: balloon: Remove dependencies on guest page size) +$ git merge hyperv/hyperv-next +Auto-merging net/vmw_vsock/hyperv_transport.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-hyperv | 23 ++ + MAINTAINERS | 1 + + arch/x86/hyperv/hv_init.c | 8 + + arch/x86/include/asm/mshyperv.h | 1 + + drivers/hv/Makefile | 1 + + drivers/hv/connection.c | 15 +- + drivers/hv/hv_balloon.c | 25 +- + drivers/hv/hv_debugfs.c | 178 +++++++++++++ + drivers/hv/hv_fcopy.c | 3 +- + drivers/hv/hv_kvp.c | 3 +- + drivers/hv/hv_snapshot.c | 3 +- + drivers/hv/hv_util.c | 13 +- + drivers/hv/hyperv_vmbus.h | 31 +++ + drivers/hv/ring_buffer.c | 2 + + drivers/hv/vmbus_drv.c | 12 +- + 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 ++++++++++++++++++++++++++++--- + include/linux/hyperv.h | 19 ++ + lib/Kconfig.debug | 7 + + net/vmw_vsock/hyperv_transport.c | 20 ++ + tools/hv/vmbus_testing | 376 +++++++++++++++++++++++++++ + 24 files changed, 1206 insertions(+), 65 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-hyperv + create mode 100644 drivers/hv/hv_debugfs.c + create mode 100755 tools/hv/vmbus_testing +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 +Already up to date. +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 (d20c0da8b202 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 (d460623c5fa1 Documentation: kunit: Fix verification command) +$ git merge kunit/test +Auto-merging lib/Kconfig.debug +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 | 138 ++ + 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, 6003 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 +Merging akpm-current/current (1dd4e9b5f0a9 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/genalloc.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/dma/remap.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/hv/hv_balloon.c +Auto-merging Documentation/core-api/genalloc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .gitattributes | 2 + + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/printk-formats.rst | 8 + + Documentation/dev-tools/kasan.rst | 3 + + Documentation/process/deprecated.rst | 10 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/mm/mmu.c | 4 +- + arch/ia64/mm/init.c | 4 +- + arch/powerpc/mm/mem.c | 3 +- + arch/s390/mm/init.c | 4 +- + arch/sh/mm/init.c | 4 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 4 +- + drivers/hv/hv_balloon.c | 4 +- + drivers/misc/sram-exec.c | 2 +- + drivers/xen/balloon.c | 1 - + fs/aio.c | 9 +- + fs/binfmt_elf.c | 56 ++-- + fs/buffer.c | 56 +++- + fs/eventpoll.c | 36 +-- + fs/hugetlbfs/inode.c | 4 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/file.c | 134 ++++++--- + fs/proc/generic.c | 37 ++- + fs/proc/internal.h | 2 +- + fs/proc/page.c | 40 +-- + fs/ramfs/inode.c | 12 + + fs/userfaultfd.c | 3 +- + include/linux/build_bug.h | 4 +- + include/linux/errcode.h | 16 ++ + include/linux/genalloc.h | 2 +- + include/linux/hugetlb.h | 3 +- + include/linux/memblock.h | 3 + + include/linux/memcontrol.h | 3 +- + include/linux/memory_hotplug.h | 12 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 14 +- + include/linux/mmzone.h | 2 +- + include/linux/notifier.h | 4 - + include/linux/page_ext.h | 10 +- + include/linux/page_owner.h | 1 + + include/linux/proc_fs.h | 4 +- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 20 -- + include/linux/string.h | 45 +++ + include/linux/thread_info.h | 2 + + include/linux/wait.h | 4 +- + include/trace/events/kmem.h | 21 ++ + include/trace/events/vmscan.h | 71 ++++- + ipc/msg.c | 18 +- + kernel/dma/remap.c | 2 +- + kernel/hung_task.c | 94 +++++- + kernel/notifier.c | 41 +-- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 14 + + lib/Makefile | 1 + + lib/errcode.c | 212 ++++++++++++++ + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 32 ++- + lib/math/rational.c | 63 +++- + lib/test_printf.c | 14 + + lib/ubsan.c | 64 ++--- + lib/vsprintf.c | 26 ++ + mm/cma.c | 8 +- + mm/filemap.c | 21 -- + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 207 ++++++-------- + mm/internal.h | 22 ++ + mm/kmemleak.c | 30 +- + mm/memblock.c | 65 ++++- + mm/memcontrol.c | 11 +- + mm/memory.c | 46 ++- + mm/memory_hotplug.c | 232 ++++++--------- + mm/memremap.c | 45 ++- + mm/mmap.c | 74 +++-- + mm/nommu.c | 8 +- + mm/oom_kill.c | 67 +++-- + mm/page_alloc.c | 8 +- + mm/page_ext.c | 24 +- + mm/page_owner.c | 117 +++++--- + mm/rmap.c | 25 +- + mm/shmem.c | 13 +- + mm/slab.c | 7 +- + mm/slab.h | 2 +- + mm/slab_common.c | 99 ++++--- + mm/slub.c | 18 +- + mm/sparse.c | 2 +- + mm/swap.c | 16 +- + mm/userfaultfd.c | 70 ++--- + mm/util.c | 14 + + mm/vmalloc.c | 2 +- + mm/vmscan.c | 53 ++-- + mm/z3fold.c | 363 +++++++++++++++++++----- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 24 ++ + scripts/get_maintainer.pl | 38 ++- + tools/testing/selftests/vm/config | 1 + + 100 files changed, 2026 insertions(+), 1047 deletions(-) + create mode 100644 include/linux/errcode.h + create mode 100644 lib/errcode.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: samples/watch_queue/watch_test: fix build +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments' +Applying: kernel-hacking: create submenu for arch special debugging options +Applying: kernel-hacking: group kernel data structures debugging together +Applying: kernel-hacking: move kernel testing and coverage options to same submenu +Applying: kernel-hacking: move Oops into 'Lockups and Hangs' +Applying: kernel-hacking: move SCHED_STACK_END_CHECK after DEBUG_STACK_USAGE +Applying: kernel-hacking: create a submenu for scheduler debugging options +Applying: kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg options' +Applying: kernel-hacking: move DEBUG_FS to 'Generic Kernel Debugging Instruments' +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 + + b796b6072a40...9ba4b35423b1 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9ba4b35423b1 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 +- + lib/Kconfig.debug | 663 ++++++++++++++------------- + samples/watch_queue/Makefile | 1 - + 5 files changed, 346 insertions(+), 325 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..d82a81c0b13b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.3 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0eb8b3ae4d72 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191009 |