diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-07-20 18:29:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-07-20 18:29:44 +1000 |
| commit | 89cf553533084a35b44f533d59198497d3319d69 (patch) | |
| tree | 3ea4efae54be95f77431ac7145aee51c877e4ea2 | |
| parent | 5c8a3667d4be049f4e59c18c0d5d32044fe8dd8d (diff) | |
| download | linux-89cf553533084a35b44f533d59198497d3319d69.tar.gz linux-89cf553533084a35b44f533d59198497d3319d69.tar.xz | |
Add linux-next specific files for 20180720next-20180720
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 286 | ||||
| -rw-r--r-- | Next/Trees | 288 | ||||
| -rw-r--r-- | Next/merge.log | 10013 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10590 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a787392d3dc9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,286 @@ +Name SHA1 +---- ---- +origin fb7d1bcf1602b46f37ada72178516c01a250e434 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +arc-current af1fc5baa724c63ce1733dfcf855bad5ef6078e3 +arm-current b4c7e2bd2eb4764afe3af9409ff3b1b87116fa30 +arm64-fixes 2fd8eb4ad87104c54800ef3cea498c92eb15c78a +m68k-current b12c8a70643ffe2598c572cd206e4f68c524eb6f +powerpc-fixes b03897cf318dfc47de33a7ecbc7655584266f034 +sparc 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net f39f28ff82c14b4f628973d9bba835195a71d437 +bpf f39f28ff82c14b4f628973d9bba835195a71d437 +ipsec 7284fdf39a912322ce97de2d30def3c6068a418c +netfilter c293ac959f809ee1cd31609d9e62bccf6804b2e6 +ipvs 0026129c8629265bfe5079c1e017fa8543796d9f +wireless-drivers 248c690a2dc8725b5a5e06a1e0cdd65c7da06801 +mac80211 5cf3006cc81d9aa09a10aa781fc065546b12919d +rdma-fixes d63c46734c545ad0488761059004a65c46efdde3 +sound-current f3d737b6340b0c7bacd8bc751605f0ed6203f146 +sound-asoc-fixes 94688072d0c4d8fdc7de8a5333026539aab6cdd5 +regmap-fixes 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +regulator-fixes 35e160a31b7cd3fe331493155267a213bc3b5d91 +spi-fixes 525e437354b65ae3fe460a14b55d7bbf2d703016 +pci-current 270ed733e68955049b693bea8f4a1efb293a96ae +driver-core.current 722e5f2b1eec7de61117b7c0a7914761e3da2eda +tty.current 021c91791a5e7e85c567452f1be3e4c2c6cb6063 +usb.current 2c3806c4824547c1627bc338e53a4f32e5921fe6 +usb-gadget-fixes eec24f2a0d4dc3b1d95a3ccd2feb523ede3ba775 +usb-serial-fixes 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy ad5003300b077bf1af15e667097b3b1f73288177 +staging.current b96fba8d5855c3617adbfb43ca4723a808cac954 +char-misc.current 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +input-current 384cf4285b34e08917e3e66603382f2b0c4f6e1b +crypto-current 2546da99212f22034aecf279da9c47cbfac6c981 +ide 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 1e4b044d22517cae7047c99038abb444423243ca +backlight-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +mtd-fixes aa7eee8a143a7e8b530eb1e75fb86cae793d1e21 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +v4l-dvb-fixes 0ca54b29054151b7a52cbb8904732280afe5a302 +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes 38c0a74fe06da3be133cae3fb7bde6a9438e698b +omap-fixes d3f6daede246038cf2ea38b78d732f9dd8feb1d6 +kvm-fixes 1bbb07cba557089ff121af0804d3685c4f0c24ba +kvms390-fixes f4a551b72358facbbe5714248dff78404272feee +hwmon-fixes 1e4b044d22517cae7047c99038abb444423243ca +nvdimm-fixes ee6581ceba7f8314b81b2f2a81f1cf3f67c679e2 +btrfs-fixes 0b71627421211958dabeb9e92c98611119c904c8 +vfs-fixes 9ba546c01976a426292af99e682a557075d6c010 +dma-mapping-fixes 7ec916f82c48dcfc115eee2e3e0e6d400e310fc5 +drivers-x86-fixes 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +samsung-krzk-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pinctrl-samsung-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +devicetree-fixes b9952b5218added5577e4a3443969bc20884cea9 +scsi-fixes 2b548dd3790f95c2e174d51c2c8ada71b6505b4e +drm-fixes bf642e3a1996f1ed8f083c5ecd4b51270a9e11bc +drm-intel-fixes 09d2da310d61c4bfae33ea05b88e7a8f31350d9e +mmc-fixes 3b1074bf9817bf43d4da375aa5f4b6c88f1d953e +rtc-fixes fd6792bb022e43faa0c4a45b6f25285e21206f9d +drm-misc-fixes d530b5f1ca0bb66958a2b714bebe40a1248b9c15 +kbuild 000fef8e0b8f70acc0ead39928f7dd674c0e1e30 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 2550bbfd495227945e17ed1fa1c05bce4753b86b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 52e19c3c1eaf103c2eb4f764825136abcfea1538 +arm-perf c13207905340d85eaddd85b6d2868218f324b180 +arm-soc c27f807a9df76843d45da39c12325bfefb308bb9 +actions 35afadd11222dcec0f3c6b25be89195ccc582116 +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic b3fd49121640c682a94e1838d47a30a71a3a7661 +aspeed 403d991cce7d63299b62a85e65c3f398c3412a5f +at91 072b30559769af7d54b1ec80e5fb6c3bb574d7f6 +bcm2835 5997adb149859fffd1c2fe9a583471e02548a6d8 +imx-mxs 6632f203415f0aa1ce609483a0ff03c08912f69f +keystone ed3bf0f321b929b20b015ee0f77ae194e91b5d85 +mediatek 4d42d1310018e57175dc651eb13c87ee0e4db454 +mvebu 23b7c60b80f6d43f61b0a9be6f8a1a4f61e2bbdd +omap 61e2c471cc1b66b4d3115cace920f652b24cc101 +reset 6b39fd590aebca1a6a4c827f29f14d2b6df3939d +qcom 376e1f304fc70372df452b257be8cd4bdaa00eec +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 9b0f888f9c185957eb5d14b1806ef4b1ddae063c +rockchip 75589311007d12c35cc687db5c003f41c41c0a39 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 44c29c1f2c9f0a2604e0b4a6e044d2504e0a7752 +sunxi 51c756fe7803401e874c8b433b68e9fd34dbf56e +tegra f29cfb31cf001f132cfbb9822054a2ea4e17e601 +arm64 11527b3e0b577513ea318f01e392ccf7feb9d2a4 +clk 4db3ff7a7f1185c8544d157fd2967c0fb73694f4 +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 31b02fe54206541a2073d2fc41c574998ed91ff5 +h8300 2f61c9ca404f32c7bdc9922d1fb070c2dfd4a349 +m68k cd629147324c7bd1441214f89bd567bdb610286f +m68knommu a23aa852f423dac75a1d329e4720b374d5f36909 +microblaze bd05a58ddfd719015d66e8670af48feb386a3ca6 +mips 1ae22a0e35636efceab83728ba30b013df761592 +nds32 d2516b16bcbc972fd8b41f94e98c810fb5e47016 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc ae15a41a641449f536578b0d9ec0e4ade130deb5 +parisc-hd ce397d215ccd07b8ae3f71db689aedb85d56ab40 +powerpc ce57c6610cc2d7cde61fc005a2d2090bce46fc73 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 021c91791a5e7e85c567452f1be3e4c2c6cb6063 +s390 cd0ed39dc9e8b10d469f53ae03310bca09296bdd +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c +xtensa cb6db64ef5a9be87a633c8aadf87c3863fadb6e5 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 6f383855b92d736733466470a6bc051051f8f0f4 +ceph 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3 +cifs 887e4f50dc55ce1394c328e001026449be4f071e +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 6aee47d7f61e576a4c8f39758b5c7e50fcb2b287 +ext4 362eca70b53389bddf3143fe20f53dcce2cfdf61 +f2fs ea1ac43174f95914e39234e26492cc76e13c0345 +fuse 8139306548abd8d2163948da8317f00b286ad82a +jfs bd646104ac5a6bf8bdddaeaf4e441f5d439ded96 +nfs 7b0df92ac12148098391bf53f3494af17812f264 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd 32620db998a58b88f43156d2ddb53b7038fe88a8 +orangefs 4fb7d986e27e752032e31504b1f571ddb9d97758 +overlayfs 5ab72f7d021ff0140dab77ad4161f234d07b4a3d +ubifs f5a926dd529870de4bd19199ce7b36985f130d70 +v9fs 74622fbdedde4adc4b507b1c6f4b5f72db15b86a +xfs efe803277364a621348b679058222d644e113c9c +file-locks 1cf8e5de4055f85383405a21a0a7c3c4348bf2ed +vfs f6756d7df99193e124a201663c74ed090f427482 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 7973c51853f8c2378571ede27307178279f29b81 +pci b3dd889f1a82e3b6682ec70df5f9548f77b597a5 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid 57194b03594239c17a713d8f5a986da0e6bb1ff7 +i2c cf124845db96d44d14c3a859cfa4fa2418b3ae9f +dmi 7f73745fec52c402cac71e212d996545c20d2ef6 +hwmon-staging f1fd4a4db777030a2542701fb0d3a261d4472d6d +jc_docs 6b4c1360e8adc2cbecf400b97c1ffcf9c5aad31e +v4l-dvb 39fbb88165b2bbbc77ea7acab5f10632a31526e6 +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev 34db50e55656621c19b1a83bf896be5ac75025b9 +pm 45414aea93b54ca1f79ed662590b3339f4935698 +cpupower ce397d215ccd07b8ae3f71db689aedb85d56ab40 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp c5c2a97b3ac7d1ec19e7cff9e38caca6afefc3de +thermal e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 +thermal-soc 1d32d387967ce19813ed69115b9fe0224375e02b +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma c012691508f5fcc09b0a777fd1747f266093fe1b +net-next 3bc950c34b28b60f879ea0ef8d97e65a8c8f1d50 +bpf-next 8ae71e76cf1f7b8de5c75356a00840e54c93e7a5 +ipsec-next 03dc7a35fcc83a199121a5156c4a7a976b836682 +mlx5-next 048f31437ac5da336cf08e13f5fdc8add6a9bb16 +netfilter-next 24c458c485c87eef97e91d2e180f222555528b11 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 66c524acfb5186806a381dbfb05b9f4a1205cdbe +wireless-drivers-next 4a07ed51cae18765c76d9aede5b9830d42db1546 +bluetooth b71c69c26b4916d11b8d403d8e667bbd191f1b8f +mac80211-next 518ea3c54eb7e454b718a50aa35bc5ea7856aa20 +gfs2 e2b8bd8c3088f596e2a78010e27873f3898e29ef +mtd d70420bcd447e5400a0116b20b9b6088bb32448e +nand db4a671e39ff46ad0cda474b944a4b5d56c5691c +spi-nor a3804084ddf02b4bbf9102f0f671f13708c0b9e9 +crypto d6be72ee2c77469d4fb391ccccc2ebc1b167a242 +drm 539c475dadc430bd0f1601902fcacc1e55ffe85a +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel f7a738fca03c8dae6a1b448393989cc9f612198d +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 106b6c39c870c1f7628ba41693e571f419b1981d +drm-msm e35e0193ab7310004db60b5ff82e76e89beff3d6 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp e368fc75c190a4ad5853e4ec5a0c8acf86bd5119 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 81f2b25adddeff2fc7fdd1f23f889d018ba65466 +etnaviv f6ffbd4fc1a1caafe2ab840993b917fba5324598 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 6714e53130ba2253ca4f278efef05162d6894197 +sound 7abeb64da6deeffa52f74e3b1e19d2c9e2c3ae6b +sound-asoc 48a5536e483900c17f8fb0bed322a5ad599a31c4 +modules 4d58e7034d1971436d44f203cf69d2feb6b82e5c +input 2b6e68119c474a62396b387130a984ad8240dce2 +block 93d8cf625a323e773c8c60340f51e6e13ad4d385 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper d284f8248c72d0cb36a930920e60592eb455cd0d +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc 44350993d01c901cc201ef2663fd0fded2e03d06 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 685dbcaa25becfba864b72ec3f03470833b7f692 +mfd 99266311865e3c7852fbaaecfc1f5c748f99fcb6 +backlight 858c5dfc8c336ca26b8d4d9f639a9dc40c5daa80 +battery 89b135ba1b73cd54a09283b39420c90538283801 +regulator dc63d3bc501ff42f0e232dce9cac689e598661a7 +security 530a13df0b0bd7ddd2f601c77283aa8b775e37d9 +apparmor f4585bc20fc785d94192cf780ee925e25891ddfd +integrity 5e27e2c80ac88a37c81037aee49dff98ddfecfa8 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 631d2b490569118c5e4d4e35983efe36d9798cb5 +tpmdd 776afd1719255f0b6cb65e1b17f60ac7693fec64 +watchdog 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe +iommu 9494874609c387d3fc2041507165ecfa59ca9ba4 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio c1abca96b252a9627f99f39215b84e5de92bf1e3 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit baa2a4fdd525c8c4b0f704d20457195b29437839 +devicetree 3a6372daddebbc34ef8dd51771da8f08f060b19d +mailbox f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 +spi 484d5c6c7aad49f0c601fdfbd85b6215e9cfddb6 +tip 61144b9f528bfd8c439713b825bb88742c9ffd9c +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6663484b4e2d98f5609dc1b90fe4c242dd8fe18a +irqchip 6a88c221acbaaa0460d190f99093ab8114f23c09 +ftrace a9235b544a0ae95fbd56443bdbd251358c7df4c5 +rcu d57fa29ddc3c4c2bd1f4b315ccc6bbf4f1cfcff6 +kvm 6f0d349d922ba44e4348a17a78ea51b7135965b1 +kvm-arm e25028c8ded011d19f9a11164807507c94febc01 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 2e7297216699e06b02fdd316a5eeb3d5b2317aa9 +kvms390 a3da7b4a3be51f37f434f14e11e60491f098b6ea +xen-tip 0ce0bba4e5e0eb9b753bb821785de5d23c494392 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 66448bc274cadedb71fda7d914e7c29d8dead217 +drivers-x86 1a32ebb26ba9adc9a3fe59079b79a82f6bbec34e +chrome-platform 40291fb75123816b35ba06696e56b9cf2d96bf90 +hsi ce397d215ccd07b8ae3f71db689aedb85d56ab40 +leds 6f7b0bad88397ad5d7901ce63696163ac8b481ce +ipmi a4fb7ddc63560cccbaeb293dbd53d7e5554bd447 +driver-core 726e41097920a73e4c7c33385dcc0debb1281e18 +usb 500f0716b5f7fd6b0ff3d045588c7588ce2eee1d +usb-gadget 47265c067c0d129f3a0e94bc221293a780af9d78 +usb-serial 5edb65a33710bbf10f38b42e0d497b35ec1ed908 +usb-chipidea-next ba0ab35a81de1da15e1691142834eefd34e34a0e +phy-next d5f5ee1a16a4f14e9b98d1352bc850e43f2968ca +tty fefe287e4bf6ee23a5d9422a0a49de5389acc712 +char-misc 555e7943f2818391c12aaa4b721b4f5ebb1fd036 +extcon 8a9dbb779fe882325b9a0238494a7afaff2eb444 +staging d7db5843bc09c4d8a7d30c09b18c03a1dd5fd713 +mux 6a3d4baac84a624d7f4ae602254d022fea1eb5f2 +slave-dma 443b3707bb4693f5bd4e6cbbbe7619104376af90 +cgroup e4f8d81c738db6d3ffdabfb8329aa2feaa310699 +scsi 8b1ff4bab168cdbaac4b82b9344bcc24944778f4 +scsi-mkp f4e34f2a5dd9c0db19baad3f015c3abd5f2e0343 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata 48ffb6b32df85a6cff811256a260bcfb748383e4 +vhost 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b +rpmsg 3d065621c92140cea8c792beaebc8b737af8e5e7 +gpio d166d33c1862de91012b5dcb5689efbab0973e8f +pinctrl b283cec1c68004f3facad4f993d7faab8ce6897b +pinctrl-samsung ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pwm 19ad2b75c6436eb7a5233a68cca13ceb17041ec8 +userns 04035aa33a1258ca3c30f58138897ca3e97485f1 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 067954f27faa858e2a7c1827c5ba482f53a06e70 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest d2d49495b5c0dffee5c4da5ea12ac0da6679bd08 +y2038 e264abeaf9daa3cde9aed8013a6f82b0370425e5 +livepatching 0eb53cdd58f54d62b8059a5f712651b98adfc71f +coresight 1f0a504d39aee05844c70da17e911f7c91a20acf +rtc 7e580769b79f1df2ac67cf935ee95ac1d42b8144 +nvdimm 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +at24 ce397d215ccd07b8ae3f71db689aedb85d56ab40 +ntb b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 +kspp 9edc4161661e169273dcc28f848abc805c96adc1 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco ce397d215ccd07b8ae3f71db689aedb85d56ab40 +xarray 4c8e6fcba1656906abf924029b696f381351d67e +fsi fea9cf321c916e9372874e6f2af1bf0b5beb89fb +siox 1e4b044d22517cae7047c99038abb444423243ca +ida eafb6e79625d134d4ffa4ad774b1a44f1b9ad469 +akpm-current a1d8d12c793b9211ba835c492a1820d89887d22d +akpm 90a8c406d3224e1f2d38932f96c30da28f696b38 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c33d465ee2c4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,288 @@ +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 +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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/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 +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.infradead.org/linux-mtd.git#master +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/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 +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 +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 +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +uuid git git://git.infradead.org/users/hch/uuid.git#for-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 +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/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/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/nferre/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 +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +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/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +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 +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-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 +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +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.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.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 +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-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 git://people.freedesktop.org/~robclark/linux#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 +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-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 +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.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/tj/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/bleung/chrome-platform.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 +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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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/jikos/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 +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi.git#master +siox git https://git.pengutronix.de/git/ukl/linux#siox/next +ida git git://git.infradead.org/users/willy/linux-dax.git#ida +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f4a78a1e607d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10013 @@ +$ date -R +Fri, 20 Jul 2018 08:15:01 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 04a132065175 Merge tag 'for-4.18-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (fb7d1bcf1602 Merge tag 'pci-v4.18-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge origin/master +Updating 04a132065175..fb7d1bcf1602 +Fast-forward + .../bindings/arm/samsung/samsung-boards.txt | 2 +- + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + .../bindings/gpio/nintendo,hollywood-gpio.txt | 2 +- + .../bindings/input/touchscreen/hideep.txt | 2 +- + .../interrupt-controller/nvidia,tegra20-ictlr.txt | 2 +- + .../interrupt-controller/st,stm32-exti.txt | 2 +- + .../devicetree/bindings/mips/brcm/soc.txt | 2 +- + Documentation/devicetree/bindings/net/fsl-fman.txt | 2 +- + .../devicetree/bindings/power/power_domain.txt | 2 +- + .../devicetree/bindings/regulator/tps65090.txt | 2 +- + .../devicetree/bindings/reset/st,sti-softreset.txt | 2 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 2 +- + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 2 +- + .../devicetree/bindings/sound/qcom,apq8096.txt | 2 +- + Documentation/devicetree/bindings/w1/w1-gpio.txt | 2 +- + Documentation/networking/bonding.txt | 2 +- + Documentation/networking/e100.rst | 27 +-- + Documentation/networking/e1000.rst | 187 ++++++++++++--------- + MAINTAINERS | 7 +- + crypto/af_alg.c | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 - + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 11 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 47 +++--- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 24 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 30 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 - + drivers/net/ethernet/broadcom/tg3.c | 13 ++ + drivers/net/ethernet/broadcom/tg3.h | 2 + + drivers/net/ethernet/cadence/macb.h | 11 ++ + drivers/net/ethernet/cadence/macb_main.c | 36 ++-- + drivers/net/ethernet/cavium/Kconfig | 12 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 5 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 14 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 35 ++-- + drivers/net/ethernet/ibm/ibmvnic.c | 43 +++-- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 48 +++--- + drivers/net/ethernet/qlogic/qed/qed.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 39 +++-- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 2 + + drivers/net/ethernet/qualcomm/qca_spi.c | 21 ++- + drivers/net/ethernet/realtek/r8169.c | 1 + + drivers/net/ethernet/renesas/ravb_main.c | 93 ++-------- + drivers/net/ethernet/renesas/sh_eth.c | 94 ++--------- + drivers/net/ethernet/sfc/ef10.c | 30 +++- + drivers/net/ethernet/sfc/efx.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 - + drivers/net/hyperv/netvsc.c | 17 +- + drivers/net/hyperv/rndis_filter.c | 1 + + drivers/net/ieee802154/adf7242.c | 34 +++- + drivers/net/ieee802154/at86rf230.c | 15 +- + drivers/net/ieee802154/fakelb.c | 2 +- + drivers/net/ieee802154/mcr20a.c | 3 +- + drivers/net/phy/marvell.c | 54 ++++-- + drivers/net/phy/phy_device.c | 7 +- + drivers/net/phy/sfp-bus.c | 35 +++- + drivers/net/tun.c | 2 +- + drivers/net/usb/asix_devices.c | 4 +- + drivers/net/usb/lan78xx.c | 5 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/smsc75xx.c | 62 +++++++ + drivers/net/wireless/ath/ath10k/mac.c | 16 +- + drivers/net/wireless/ath/ath10k/wmi.h | 1 + + drivers/net/wireless/ath/wcn36xx/testmode.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 + + drivers/net/wireless/marvell/mwifiex/usb.c | 7 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 17 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + drivers/of/base.c | 6 +- + drivers/of/of_private.h | 2 + + drivers/of/overlay.c | 11 ++ + drivers/pci/controller/dwc/pcie-designware-host.c | 3 +- + drivers/pci/controller/pci-aardvark.c | 2 +- + drivers/pci/controller/pci-ftpci100.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 8 +- + drivers/pci/controller/pci-v3-semi.c | 2 +- + drivers/pci/controller/pci-versatile.c | 2 +- + drivers/pci/controller/pci-xgene.c | 2 +- + drivers/pci/controller/pcie-mediatek.c | 2 +- + drivers/pci/endpoint/pci-epf-core.c | 62 ++++--- + drivers/pci/of.c | 2 +- + drivers/pci/pci.c | 38 +++++ + drivers/ptp/ptp_chardev.c | 1 + + include/linux/bpf-cgroup.h | 1 + + include/linux/filter.h | 6 +- + include/linux/fsl/guts.h | 1 + + include/linux/if_bridge.h | 4 +- + include/linux/igmp.h | 2 + + include/linux/marvell_phy.h | 2 + + include/linux/pci.h | 2 + + include/linux/skbuff.h | 10 +- + include/net/ip6_route.h | 6 + + include/net/ipv6.h | 13 +- + include/net/netfilter/nf_tables_core.h | 6 + + include/net/netfilter/nf_tproxy.h | 4 +- + include/net/tc_act/tc_csum.h | 1 - + include/net/tc_act/tc_tunnel_key.h | 1 - + include/net/tcp.h | 6 +- + include/net/xdp_sock.h | 4 + + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/tcp.h | 4 + + kernel/bpf/btf.c | 30 ++-- + kernel/bpf/devmap.c | 7 +- + kernel/bpf/hashtab.c | 16 +- + kernel/bpf/sockmap.c | 43 +++-- + kernel/bpf/syscall.c | 4 +- + kernel/bpf/verifier.c | 11 +- + lib/rhashtable.c | 27 ++- + net/batman-adv/bat_iv_ogm.c | 4 +- + net/batman-adv/bat_v.c | 4 +- + net/batman-adv/debugfs.c | 40 +++++ + net/batman-adv/debugfs.h | 11 ++ + net/batman-adv/hard-interface.c | 37 +++- + net/batman-adv/translation-table.c | 7 +- + net/bpf/test_run.c | 17 +- + net/core/filter.c | 149 +++++++++++++--- + net/core/gen_stats.c | 16 +- + net/core/skbuff.c | 1 + + net/dns_resolver/dns_key.c | 28 +-- + net/ieee802154/6lowpan/core.c | 6 + + net/ipv4/fib_frontend.c | 1 + + net/ipv4/igmp.c | 58 +++++-- + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ip_sockglue.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv4/netfilter/nf_tproxy_ipv4.c | 18 +- + net/ipv4/sysctl_net_ipv4.c | 5 +- + net/ipv4/tcp.c | 16 +- + net/ipv4/tcp_dctcp.c | 31 +--- + net/ipv4/tcp_ipv4.c | 23 ++- + net/ipv4/tcp_output.c | 4 - + net/ipv6/Kconfig | 1 + + net/ipv6/calipso.c | 9 +- + net/ipv6/exthdrs.c | 111 ++++-------- + net/ipv6/ip6_fib.c | 156 +++++++++-------- + net/ipv6/ip6_gre.c | 3 +- + net/ipv6/ipv6_sockglue.c | 32 ++-- + net/ipv6/mcast.c | 64 ++++--- + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 1 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 + + net/ipv6/netfilter/nf_tproxy_ipv6.c | 18 +- + net/ipv6/route.c | 10 +- + net/ipv6/seg6_iptunnel.c | 2 +- + net/netfilter/Kconfig | 25 +-- + net/netfilter/Makefile | 7 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_tables_set_core.c | 28 +++ + net/netfilter/nft_compat.c | 13 ++ + net/netfilter/nft_set_bitmap.c | 19 +-- + net/netfilter/nft_set_hash.c | 29 +--- + net/netfilter/nft_set_rbtree.c | 19 +-- + net/netfilter/xt_TPROXY.c | 8 +- + net/nfc/llcp_commands.c | 9 +- + net/nsh/nsh.c | 2 +- + net/packet/af_packet.c | 2 + + net/qrtr/qrtr.c | 13 +- + net/sched/act_csum.c | 6 +- + net/sched/act_tunnel_key.c | 6 +- + net/sched/cls_api.c | 4 +- + net/sched/sch_fq_codel.c | 25 ++- + net/sctp/transport.c | 2 +- + net/smc/af_smc.c | 37 ++-- + net/smc/smc_clc.c | 3 +- + net/smc/smc_close.c | 2 + + net/smc/smc_tx.c | 12 +- + net/tipc/discover.c | 18 +- + net/tipc/net.c | 17 +- + net/tipc/node.c | 7 +- + net/tls/tls_sw.c | 7 +- + net/xdp/xsk.c | 30 ++-- + net/xdp/xsk_queue.h | 9 +- + samples/bpf/.gitignore | 49 ++++++ + samples/bpf/parse_varlen.c | 6 +- + samples/bpf/test_overhead_user.c | 19 ++- + samples/bpf/trace_event_user.c | 27 ++- + samples/bpf/xdp2skb_meta.sh | 6 +- + samples/bpf/xdpsock_user.c | 2 +- + scripts/tags.sh | 1 + + sound/core/rawmidi.c | 20 ++- + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_realtek.c | 2 + + tools/testing/selftests/bpf/test_verifier.c | 23 ++- + tools/testing/selftests/net/fib_tests.sh | 41 ----- + tools/testing/selftests/net/udpgso_bench.sh | 3 - + 205 files changed, 1887 insertions(+), 1183 deletions(-) + create mode 100644 net/netfilter/nf_tables_set_core.c + create mode 100644 samples/bpf/.gitignore +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (af1fc5baa724 ARCv2: [plat-hsdk]: Save accl reg pair by default) +$ git merge arc-current/for-curr +Auto-merging arch/arc/include/asm/pgtable.h +Auto-merging arch/arc/Kconfig +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 2 +- + arch/arc/Makefile | 15 +------- + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/hsdk_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsim_hs_defconfig | 1 - + arch/arc/configs/nsim_hs_smp_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/include/asm/entry-compact.h | 6 +++ + arch/arc/include/asm/entry.h | 3 -- + arch/arc/include/asm/mach_desc.h | 2 - + arch/arc/include/asm/page.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/kernel/irq.c | 2 +- + arch/arc/kernel/process.c | 47 ++++++++++++++++------ + arch/arc/plat-hsdk/Kconfig | 3 ++ + arch/arc/plat-hsdk/platform.c | 62 ++++++++++++++++++++++++++++++ + 24 files changed, 112 insertions(+), 47 deletions(-) +Merging arm-current/fixes (b4c7e2bd2eb4 ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (2fd8eb4ad871 arm64: neon: Fix function may_use_simd() return error status) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (b03897cf318d powerpc/powernv: Fix save/restore of SPRG3 on entry/exit from stop (idle)) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 1 + + arch/powerpc/include/asm/mmu_context.h | 4 ++-- + arch/powerpc/kernel/idle_book3s.S | 2 ++ + arch/powerpc/kvm/book3s_64_vio.c | 2 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 6 ++++-- + arch/powerpc/mm/mmu_context_iommu.c | 37 ++++++++++++++++++++++++++++++++-- + arch/powerpc/xmon/xmon.c | 4 ++-- + drivers/vfio/vfio_iommu_spapr_tce.c | 10 ++++----- + 8 files changed, 52 insertions(+), 14 deletions(-) +Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (f39f28ff82c1 Merge tag 'sound-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge net/master +Already up to date. +Merging bpf/master (f39f28ff82c1 Merge tag 'sound-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_input) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/esp6.c | 4 +++- + net/ipv6/ip6_vti.c | 11 ++++++----- + net/xfrm/xfrm_policy.c | 3 +++ + net/xfrm/xfrm_user.c | 18 +++++++++++------- + 4 files changed, 23 insertions(+), 13 deletions(-) +Merging netfilter/master (c293ac959f80 netfilter: nft_set_rbtree: fix panic when destroying set by GC) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 4 ++-- + net/netfilter/nf_tables_api.c | 11 ++++------- + net/netfilter/nft_immediate.c | 3 +++ + net/netfilter/nft_lookup.c | 13 +++++++++++-- + net/netfilter/nft_set_hash.c | 1 + + net/netfilter/nft_set_rbtree.c | 7 +++++-- + 6 files changed, 26 insertions(+), 13 deletions(-) +Merging ipvs/master (0026129c8629 rhashtable: add restart routine in rhashtable_free_and_destroy()) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (248c690a2dc8 Merge tag 'wireless-drivers-for-davem-2018-07-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (5cf3006cc81d nl80211: Add a missing break in parse_station_flags) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 12 ++++++------ + net/mac80211/rx.c | 5 +---- + net/mac80211/util.c | 3 ++- + net/wireless/nl80211.c | 25 ++++++++++++++++--------- + net/wireless/trace.h | 18 ++++++++++-------- + 5 files changed, 35 insertions(+), 28 deletions(-) +Merging rdma-fixes/for-rc (d63c46734c54 RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f3d737b6340b ALSA: hda/realtek - Yet another Clevo P950 quirk entry) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (94688072d0c4 Merge branch 'asoc-4.18' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/acp-pcm-dma.c | 3 ++- + sound/soc/codecs/cs47l24.c | 8 ++++++++ + sound/soc/codecs/hdmi-codec.c | 21 +++++++++++++++------ + sound/soc/codecs/wm5102.c | 8 ++++++++ + sound/soc/codecs/wm5110.c | 8 ++++++++ + sound/soc/codecs/wm_adsp.c | 2 ++ + sound/soc/qcom/qdsp6/q6afe-dai.c | 5 ++++- + sound/soc/qcom/qdsp6/q6asm-dai.c | 4 +++- + sound/soc/qcom/qdsp6/q6routing.c | 2 +- + sound/soc/sh/rcar/core.c | 6 ++++++ + sound/soc/sh/rcar/ssi.c | 37 ++++++++++++++++++++++++------------- + sound/soc/soc-dapm.c | 7 +++++++ + sound/soc/soc-pcm.c | 8 ++++++++ + sound/soc/soc-utils.c | 2 +- + 14 files changed, 97 insertions(+), 24 deletions(-) +Merging regmap-fixes/for-linus (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (35e160a31b7c Merge branch 'regulator-4.18' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/arizona-ldo1.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (525e437354b6 Merge branch 'spi-4.18' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-cadence.c | 4 +-- + drivers/spi/spi-dw.c | 3 +- + drivers/spi/spi-fsl-dspi.c | 12 ++++++++ + drivers/spi/spi-orion.c | 77 ++++++++++++++++++++++++---------------------- + drivers/spi/spi-sh-msiof.c | 53 ++++++++++++++++--------------- + 5 files changed, 85 insertions(+), 64 deletions(-) +Merging pci-current/for-linus (270ed733e689 PCI: v3-semi: Fix I/O space page leak) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (722e5f2b1eec driver core: Partially revert "driver core: correct device's shutdown order") +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 8 -------- + 1 file changed, 8 deletions(-) +Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (2c3806c48245 Merge tag 'fixes-for-v4.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/rockchip,dwc3.txt | 3 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 4 + + drivers/phy/motorola/phy-mapphone-mdm6600.c | 4 +- + drivers/usb/chipidea/Kconfig | 9 +-- + drivers/usb/chipidea/Makefile | 3 +- + drivers/usb/chipidea/ci.h | 8 -- + drivers/usb/chipidea/ulpi.c | 3 + + drivers/usb/class/cdc-acm.c | 3 + + drivers/usb/dwc2/gadget.c | 6 +- + drivers/usb/dwc2/hcd.c | 54 +++++++------ + drivers/usb/dwc2/hcd_intr.c | 9 ++- + drivers/usb/dwc3/ep0.c | 3 - + drivers/usb/gadget/composite.c | 1 - + drivers/usb/gadget/function/f_uac2.c | 24 +++--- + drivers/usb/gadget/function/u_audio.c | 88 ++++++++-------------- + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 11 ++- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 14 +++- + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 33 ++++++++ + drivers/usb/gadget/udc/r8a66597-udc.c | 6 +- + drivers/usb/phy/phy-fsl-usb.c | 4 +- + tools/usb/ffs-test.c | 19 ++++- + 21 files changed, 178 insertions(+), 131 deletions(-) +Merging usb-gadget-fixes/fixes (eec24f2a0d4d usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3') +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (b96fba8d5855 staging: speakup: fix wraparound in uaccess length check) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/ks7010/ks_hostif.c | 12 +- + drivers/staging/rtl8188eu/Kconfig | 1 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 161 ++++++++++++++++++-------- + drivers/staging/rtl8188eu/core/rtw_security.c | 92 +++++++-------- + drivers/staging/speakup/speakup_soft.c | 6 +- + 5 files changed, 171 insertions(+), 101 deletions(-) +Merging char-misc.current/char-misc-linus (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (384cf4285b34 Input: i8042 - add Lenovo LaVie Z to the i8042 reset list) +$ git merge input-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/input/mouse/elan_i2c_core.c | 2 ++ + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 3 files changed, 10 insertions(+) +Merging crypto-current/master (2546da99212f crypto: af_alg - Initialize sg_num_bytes in error code path) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (1e4b044d2251 Linux 4.18-rc4) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts) +$ git merge mtd-fixes/master +Already up to date. +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (0ca54b290541 media: rc: be less noisy when driver misbehaves) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/rc/rc-ir-raw.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (38c0a74fe06d MIPS: Fix off-by-one in pci_resource_to_user()) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/pci/pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap-fixes/fixes (d3f6daede246 ARM: dts: omap4-droid4: fix dts w.r.t. pwm) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap4-droid4-xt894.dts | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) +Merging kvm-fixes/master (1bbb07cba557 kvmclock: fix TSC calibration for nested guests) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. +Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (1e4b044d2251 Linux 4.18-rc4) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dereference in acpi_nfit_ctl) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (0b7162742121 Merge branch 'for-next-current-v4.18-20180717' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 30 ++++++++++++++++++++----- + fs/btrfs/inode.c | 67 +++++++++++++++++++++++++++++++++++++++++--------------- + 2 files changed, 73 insertions(+), 24 deletions(-) +Merging vfs-fixes/fixes (9ba546c01976 aio: don't expose __aio_sigset in uapi) +$ git merge vfs-fixes/fixes +Auto-merging include/uapi/linux/aio_abi.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lease.c | 16 +--------------- + drivers/misc/cxl/api.c | 8 ++++---- + drivers/scsi/cxlflash/ocxl_hw.c | 5 ++--- + fs/aio.c | 5 +++++ + fs/internal.h | 1 - + include/linux/fs.h | 1 + + include/linux/syscalls.h | 1 + + include/uapi/linux/aio_abi.h | 6 ------ + 8 files changed, 14 insertions(+), 29 deletions(-) +Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()") +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (b9952b5218ad of: overlay: update phandle cache on overlay apply and remove) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (2b548dd3790f scsi: mpt3sas: Fix calltrace observed while running IO & reset) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/cxlflash/main.h | 4 +-- + drivers/scsi/hpsa.c | 25 +++++++++++++++--- + drivers/scsi/hpsa.h | 1 + + drivers/scsi/libiscsi.c | 12 ++++----- + drivers/scsi/mpt3sas/mpt3sas_base.c | 1 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 12 +++++++++ + drivers/scsi/qedi/qedi_main.c | 11 ++++++++ + drivers/scsi/qla2xxx/qla_def.h | 2 ++ + drivers/scsi/qla2xxx/qla_gs.c | 40 +++++++++++++++++++---------- + drivers/scsi/qla2xxx/qla_init.c | 14 +++++----- + drivers/scsi/qla2xxx/qla_os.c | 4 +-- + drivers/scsi/sd_zbc.c | 5 ++-- + drivers/scsi/sg.c | 15 +++++------ + drivers/target/iscsi/cxgbit/cxgbit_target.c | 16 +++++++----- + 15 files changed, 111 insertions(+), 53 deletions(-) +Merging drm-fixes/drm-fixes (bf642e3a1996 Merge tag 'drm-intel-fixes-2018-07-12' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (09d2da310d61 Merge tag 'gvt-fixes-2018-07-11' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses and brace) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/mxcmmc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offset) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (d530b5f1ca0b drm: re-enable error handling) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 ++++++++++++ + drivers/gpu/drm/drm_context.c | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) +Merging kbuild/for-next (000fef8e0b8f Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/kbuild/kbuild.txt | 16 +++ + Documentation/kbuild/makefiles.txt | 2 +- + Documentation/process/changes.rst | 27 +++-- + Makefile | 17 +-- + arch/alpha/boot/Makefile | 2 +- + arch/arm64/kernel/vdso/note.S | 3 + + arch/powerpc/kernel/vdso32/note.S | 3 + + arch/powerpc/purgatory/Makefile | 3 +- + arch/s390/purgatory/Makefile | 3 +- + arch/x86/entry/vdso/vdso-note.S | 3 + + arch/x86/entry/vdso/vdso32/note.S | 3 + + arch/x86/purgatory/Makefile | 3 +- + include/linux/build-salt.h | 20 ++++ + init/Kconfig | 9 ++ + init/version.c | 3 + + kernel/Makefile | 2 +- + net/bpfilter/Makefile | 4 +- + samples/bpf/Makefile | 22 ++-- + samples/seccomp/Makefile | 6 +- + scripts/.gitignore | 1 + + scripts/Kbuild.include | 2 +- + scripts/Makefile | 5 +- + scripts/Makefile.host | 24 ++-- + scripts/basic/.gitignore | 1 - + scripts/basic/Makefile | 1 - + scripts/{basic => }/bin2c.c | 0 + scripts/coccinelle/api/atomic_as_refcounter.cocci | 129 ++++++++++++++++++++++ + scripts/depmod.sh | 8 +- + scripts/kconfig/Makefile | 9 +- + scripts/kconfig/check-pkgconfig.sh | 8 ++ + scripts/kconfig/confdata.c | 4 +- + scripts/kconfig/expr.h | 2 +- + scripts/kconfig/gconf.c | 4 +- + scripts/kconfig/menu.c | 2 +- + scripts/kconfig/symbol.c | 2 +- + scripts/kconfig/zconf.y | 2 +- + scripts/mod/modpost.c | 3 + + security/tomoyo/Makefile | 2 +- + tools/build/Build.include | 2 +- + tools/build/Makefile | 2 +- + tools/objtool/Makefile | 4 +- + 41 files changed, 288 insertions(+), 80 deletions(-) + create mode 100644 include/linux/build-salt.h + rename scripts/{basic => }/bin2c.c (100%) + create mode 100644 scripts/coccinelle/api/atomic_as_refcounter.cocci + create mode 100644 scripts/kconfig/check-pkgconfig.sh +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (52e19c3c1eaf Merge branches 'clkdev', 'fixes', 'misc' and 'spectre' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/signal.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../sched/membarrier-sync-core/arch-support.txt | 8 +-- + arch/arm/Kconfig | 1 + + arch/arm/Makefile | 4 +- + arch/arm/include/asm/assembler.h | 4 ++ + arch/arm/include/asm/thread_info.h | 2 +- + arch/arm/include/asm/uaccess.h | 26 +++++++--- + arch/arm/kernel/signal.c | 58 +++++++++++----------- + arch/arm/kernel/sys_oabi-compat.c | 8 +-- + arch/arm/lib/copy_from_user.S | 9 ++++ + arch/arm/vfp/vfpmodule.c | 16 +++--- + drivers/clk/clkdev.c | 5 +- + 11 files changed, 82 insertions(+), 59 deletions(-) +Merging arm-perf/for-next/perf (c13207905340 arm64: perf: Add support for chaining event counters) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm/kernel/perf_event_v6.c | 14 +- + arch/arm/kernel/perf_event_v7.c | 15 ++- + arch/arm/kernel/perf_event_xscale.c | 18 ++- + arch/arm64/kernel/perf_event.c | 251 +++++++++++++++++++++++++++++------- + drivers/perf/arm-cci.c | 38 ++++-- + drivers/perf/arm_pmu.c | 38 +++--- + drivers/perf/arm_pmu_platform.c | 2 +- + include/linux/perf/arm_pmu.h | 11 +- + 8 files changed, 292 insertions(+), 95 deletions(-) +Merging arm-soc/for-next (c27f807a9df7 ARM: Document merges) +$ git merge arm-soc/for-next +Removing arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi +Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi +Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi +Removing arch/arm/mach-shmobile/smp-r8a7791.c +Removing arch/arm/mach-shmobile/smp-r8a7790.c +Removing arch/arm/mach-shmobile/setup-r8a7791.c +Removing arch/arm/mach-shmobile/setup-r8a7790.c +Removing arch/arm/mach-shmobile/r8a7791.h +Removing arch/arm/mach-shmobile/r8a7790.h +Removing arch/arm/mach-shmobile/pm-r8a7779.c +Removing arch/arm/mach-shmobile/platsmp-apmu.h +Removing arch/arm/mach-davinci/psc.c +Removing arch/arm/mach-davinci/clock.c +Removing arch/arm/mach-davinci/aemif.c +Auto-merging arch/arm/boot/dts/omap4-droid4-xt894.dts +Removing arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi +Removing arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt +Removing Documentation/devicetree/bindings/arm/insignal-boards.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 4 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/arm/insignal-boards.txt | 8 - + Documentation/devicetree/bindings/arm/rockchip.txt | 9 + + .../bindings/arm/samsung/samsung-boards.txt | 5 +- + Documentation/devicetree/bindings/bus/ti-sysc.txt | 1 + + .../devicetree/bindings/sound/mrvl,pxa-ssp.txt | 8 +- + .../devicetree/bindings/timer/ti,davinci-timer.txt | 37 + + Documentation/hwmon/raspberrypi-hwmon | 22 + + MAINTAINERS | 11 + + arch/arm/Kconfig | 5 +- + arch/arm/Kconfig.debug | 14 +- + arch/arm/arm-soc-for-next-contents.txt | 108 +++ + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-sl50.dts | 297 ++++++-- + arch/arm/boot/dts/am33xx.dtsi | 4 +- + arch/arm/boot/dts/am3517-evm.dts | 50 +- + arch/arm/boot/dts/am3517-som.dtsi | 105 ++- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 4 - + arch/arm/boot/dts/am572x-idk-common.dtsi | 4 - + arch/arm/boot/dts/am57xx-idk-common.dtsi | 7 +- + arch/arm/boot/dts/armada-388-clearfog-base.dts | 5 - + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 5 - + arch/arm/boot/dts/armada-388-clearfog.dts | 7 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 7 +- + arch/arm/boot/dts/armada-388-helios4.dts | 313 +++++++++ + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 6 - + arch/arm/boot/dts/bcm-cygnus.dtsi | 9 + + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 88 +++ + arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 34 + + arch/arm/boot/dts/bcm2837.dtsi | 6 + + arch/arm/boot/dts/bcm283x.dtsi | 6 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 + + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 + + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 + + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 + + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 + + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 + + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 + + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 + + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 4 + + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 + + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 4 + + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 4 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 4 + + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 + + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 233 ++++++ + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 + + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 + + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 + + arch/arm/boot/dts/bcm47094.dtsi | 7 +- + arch/arm/boot/dts/bcm5301x.dtsi | 35 +- + arch/arm/boot/dts/bcm53573.dtsi | 8 + + arch/arm/boot/dts/bcm94708.dts | 4 + + arch/arm/boot/dts/bcm94709.dts | 4 + + arch/arm/boot/dts/bcm953012er.dts | 4 + + arch/arm/boot/dts/bcm953012hr.dts | 4 + + arch/arm/boot/dts/bcm953012k.dts | 4 + + arch/arm/boot/dts/da850-enbw-cmc.dts | 4 + + arch/arm/boot/dts/da850-evm.dts | 91 ++- + arch/arm/boot/dts/da850-lcdk.dts | 9 + + arch/arm/boot/dts/da850-lego-ev3.dts | 86 +++ + arch/arm/boot/dts/da850.dtsi | 176 +++++ + arch/arm/boot/dts/dra7-evm-common.dtsi | 10 + + arch/arm/boot/dts/dra7-evm.dts | 9 - + arch/arm/boot/dts/dra7.dtsi | 4 +- + arch/arm/boot/dts/dra71-evm.dts | 8 + + arch/arm/boot/dts/dra72-evm-common.dtsi | 1 + + arch/arm/boot/dts/dra74x.dtsi | 10 + + arch/arm/boot/dts/dra76-evm.dts | 14 + + arch/arm/boot/dts/dra76x.dtsi | 64 ++ + arch/arm/boot/dts/exynos3250.dtsi | 18 +- + arch/arm/boot/dts/exynos4.dtsi | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 13 + + arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi | 20 - + arch/arm/boot/dts/exynos4412.dtsi | 9 + + arch/arm/boot/dts/exynos5250.dtsi | 25 +- + arch/arm/boot/dts/exynos5410.dtsi | 8 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 6 + + arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi | 21 - + arch/arm/boot/dts/exynos5420.dtsi | 10 +- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +- + arch/arm/boot/dts/gemini-sl93512r.dts | 328 +++++++++ + arch/arm/boot/dts/gemini-sq201.dts | 159 +++++ + arch/arm/boot/dts/highbank.dts | 30 + + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 20 + + arch/arm/boot/dts/keystone-k2g-evm.dts | 63 ++ + arch/arm/boot/dts/keystone-k2g-ice.dts | 59 ++ + arch/arm/boot/dts/keystone-k2g-netcp.dtsi | 147 ++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 25 +- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 20 + + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 20 + + arch/arm/boot/dts/logicpd-som-lv.dtsi | 2 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 7 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 4 +- + arch/arm/boot/dts/omap4-duovero.dtsi | 1 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 24 +- + arch/arm/boot/dts/omap4-panda-es.dts | 12 + + arch/arm/boot/dts/omap4-sdp.dts | 2 +- + arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5.dtsi | 14 + + arch/arm/boot/dts/pxa2xx.dtsi | 2 +- + arch/arm/boot/dts/pxa3xx.dtsi | 33 + + arch/arm/boot/dts/rk3036-evb.dts | 40 +- + arch/arm/boot/dts/rk3036-kylin.dts | 40 +- + arch/arm/boot/dts/rk3036.dtsi | 40 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 39 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 39 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 39 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 39 +- + arch/arm/boot/dts/rk3066a.dtsi | 39 +- + arch/arm/boot/dts/rk3188-px3-evb.dts | 39 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 39 +- + arch/arm/boot/dts/rk3188.dtsi | 39 +- + arch/arm/boot/dts/rk3228-evb.dts | 40 +- + arch/arm/boot/dts/rk3229-evb.dts | 40 +- + arch/arm/boot/dts/rk3229.dtsi | 39 +- + arch/arm/boot/dts/rk322x.dtsi | 43 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 40 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 40 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 42 +- + arch/arm/boot/dts/rk3288-fennec.dts | 40 +- + arch/arm/boot/dts/rk3288-firefly-beta.dts | 39 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 39 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 39 +- + arch/arm/boot/dts/rk3288-firefly.dts | 39 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 39 +- + arch/arm/boot/dts/rk3288-miqi.dts | 39 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 39 +- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 39 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 39 +- + arch/arm/boot/dts/rk3288-r89.dts | 39 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 40 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 40 +- + arch/arm/boot/dts/rk3288-tinker.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 5 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 41 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 39 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 39 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 75 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 39 +- + arch/arm/boot/dts/rk3288.dtsi | 122 ++-- + arch/arm/boot/dts/rk3xxx.dtsi | 39 +- + arch/arm/boot/dts/rv1108-evb.dts | 40 +- + arch/arm/boot/dts/rv1108.dtsi | 40 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 419 +++++++++++ + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 45 ++ + arch/arm/boot/dts/s5pv210-galaxys.dts | 77 ++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 2 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 12 + + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 - + arch/arm/boot/dts/stm32f429.dtsi | 3 +- + arch/arm/boot/dts/stm32f746.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 75 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 25 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 45 ++ + arch/arm/boot/dts/stm32mp157c.dtsi | 309 +++++++- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 9 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 2 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 7 +- + ...gra20-iris-512.dts => tegra20-colibri-iris.dts} | 4 +- + ...gra20-colibri-512.dtsi => tegra20-colibri.dtsi} | 27 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 31 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 9 +- + arch/arm/boot/dts/tegra30-beaver.dts | 5 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 3 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 4 +- + arch/arm/boot/dts/tegra30.dtsi | 13 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 11 +- + arch/arm/configs/keystone_defconfig | 5 + + arch/arm/configs/multi_v7_defconfig | 7 + + arch/arm/configs/mvebu_v7_defconfig | 13 +- + arch/arm/configs/s5pv210_defconfig | 49 +- + arch/arm/firmware/trusted_foundations.c | 14 +- + arch/arm/include/debug/renesas-scif.S | 5 +- + arch/arm/mach-davinci/Kconfig | 13 +- + arch/arm/mach-davinci/Makefile | 4 +- + arch/arm/mach-davinci/aemif.c | 218 ------ + arch/arm/mach-davinci/board-da830-evm.c | 68 +- + arch/arm/mach-davinci/board-da850-evm.c | 95 +-- + arch/arm/mach-davinci/board-dm355-evm.c | 2 + + arch/arm/mach-davinci/board-dm355-leopard.c | 2 + + arch/arm/mach-davinci/board-dm365-evm.c | 61 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 57 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 54 +- + arch/arm/mach-davinci/board-mityomapl138.c | 57 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 + + arch/arm/mach-davinci/board-omapl138-hawk.c | 143 +++- + arch/arm/mach-davinci/board-sffsdr.c | 2 + + arch/arm/mach-davinci/clock.c | 745 -------------------- + arch/arm/mach-davinci/clock.h | 76 -- + arch/arm/mach-davinci/common.c | 3 - + arch/arm/mach-davinci/da830.c | 462 ++---------- + arch/arm/mach-davinci/da850.c | 778 ++++----------------- + arch/arm/mach-davinci/da8xx-dt.c | 66 -- + arch/arm/mach-davinci/davinci.h | 8 + + arch/arm/mach-davinci/devices-da8xx.c | 43 +- + arch/arm/mach-davinci/devices.c | 1 - + arch/arm/mach-davinci/dm355.c | 406 ++--------- + arch/arm/mach-davinci/dm365.c | 485 +------------ + arch/arm/mach-davinci/dm644x.c | 344 ++------- + arch/arm/mach-davinci/dm646x.c | 372 ++-------- + arch/arm/mach-davinci/include/mach/clock.h | 3 - + arch/arm/mach-davinci/include/mach/common.h | 11 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 6 +- + arch/arm/mach-davinci/pm_domain.c | 5 + + arch/arm/mach-davinci/psc.c | 137 ---- + arch/arm/mach-davinci/psc.h | 12 - + arch/arm/mach-davinci/time.c | 22 +- + arch/arm/mach-davinci/usb-da8xx.c | 242 +------ + arch/arm/mach-mvebu/platsmp.c | 49 +- + arch/arm/mach-mvebu/pmsu.c | 6 +- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 5 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 113 ++- + arch/arm/mach-omap1/ams-delta-fiq.h | 42 ++ + arch/arm/mach-omap1/board-ams-delta.c | 301 ++++++-- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 4 +- + arch/arm/mach-omap2/omap_hwmod_reset.c | 12 +- + arch/arm/mach-omap2/pm-asm-offsets.c | 2 + + arch/arm/mach-omap2/pm-debug.c | 37 +- + arch/arm/mach-omap2/pm33xx-core.c | 20 +- + arch/arm/mach-omap2/sleep33xx.S | 52 +- + arch/arm/mach-omap2/sleep43xx.S | 110 ++- + arch/arm/mach-pxa/devices.c | 161 +---- + arch/arm/mach-pxa/devices.h | 6 +- + arch/arm/mach-pxa/hx4700.c | 4 + + arch/arm/mach-pxa/mioa701.c | 2 - + arch/arm/mach-pxa/pxa25x.c | 38 +- + arch/arm/mach-pxa/pxa27x.c | 39 +- + arch/arm/mach-pxa/pxa3xx.c | 41 +- + arch/arm/mach-pxa/zylonite.c | 11 - + arch/arm/mach-shmobile/Makefile | 6 +- + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/headsmp-apmu.S | 5 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 245 +++---- + arch/arm/mach-shmobile/platsmp-apmu.h | 32 - + arch/arm/mach-shmobile/platsmp.c | 9 - + arch/arm/mach-shmobile/pm-r8a7779.c | 41 -- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 25 - + arch/arm/mach-shmobile/r8a7779.h | 2 - + arch/arm/mach-shmobile/r8a7790.h | 7 - + arch/arm/mach-shmobile/r8a7791.h | 7 - + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- + arch/arm/mach-shmobile/setup-emev2.c | 10 +- + arch/arm/mach-shmobile/setup-r7s72100.c | 10 +- + arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 38 - + arch/arm/mach-shmobile/setup-r8a7791.c | 39 -- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 16 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- + arch/arm/mach-shmobile/smp-emev2.c | 10 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 64 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 71 -- + arch/arm/mach-shmobile/smp-r8a7791.c | 53 -- + arch/arm/plat-pxa/ssp.c | 47 -- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 41 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 35 + + arch/arm64/boot/dts/broadcom/stingray/Makefile | 2 + + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 35 +- + .../boot/dts/broadcom/stingray/bcm958802a802x.dts | 26 + + .../dts/broadcom/stingray/stingray-board-base.dtsi | 51 ++ + .../boot/dts/broadcom/stingray/stingray-clock.dtsi | 26 +- + .../boot/dts/broadcom/stingray/stingray-pcie.dtsi | 54 ++ + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 19 + + .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi | 20 - + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 19 - + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 14 +- + .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi | 21 - + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 21 + + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 22 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 106 +++ + .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 5 +- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 5 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 61 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 159 ++++- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 29 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 23 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 324 ++++++++- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 25 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 74 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 133 +++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 133 +++- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 24 +- + arch/arm64/boot/dts/renesas/salvator-x.dtsi | 7 +- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 7 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 5 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 9 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 44 +- + .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 39 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 39 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 47 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 42 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 79 +++ + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 397 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 86 +-- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 367 +--------- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 39 +- + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 39 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 39 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 40 +- + .../dts/rockchip/rk3399-sapphire-excavator.dts | 41 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 44 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 153 ++-- + arch/arm64/configs/defconfig | 3 + + drivers/ata/pata_pxa.c | 10 +- + drivers/bus/ti-sysc.c | 64 ++ + drivers/clk/davinci/psc-da830.c | 3 +- + drivers/clk/davinci/psc-da850.c | 3 +- + drivers/clk/davinci/psc-dm365.c | 3 +- + drivers/clk/davinci/psc-dm644x.c | 3 +- + drivers/clk/davinci/psc-dm646x.c | 3 +- + drivers/clk/ti/clk-7xx.c | 1 + + drivers/dma/pxa_dma.c | 15 +- + drivers/firmware/arm_scmi/perf.c | 5 - + drivers/firmware/raspberrypi.c | 29 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/raspberrypi-hwmon.c | 166 +++++ + drivers/input/serio/ams_delta_serio.c | 198 +++--- + drivers/media/platform/pxa_camera.c | 22 +- + drivers/memory/tegra/mc.c | 16 +- + drivers/memory/ti-emif-pm.c | 33 + + drivers/misc/vexpress-syscfg.c | 10 +- + drivers/mmc/host/pxamci.c | 29 +- + drivers/mtd/nand/raw/marvell_nand.c | 17 +- + drivers/net/ethernet/smsc/smc911x.c | 13 +- + drivers/net/ethernet/smsc/smc91x.c | 9 +- + drivers/net/ethernet/smsc/smc91x.h | 1 - + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 + + drivers/soc/renesas/rcar-sysc.c | 64 +- + drivers/soc/ti/pm33xx.c | 16 +- + drivers/soc/ti/wkup_m3_ipc.c | 76 ++ + drivers/tee/optee/Kconfig | 8 + + drivers/tee/optee/core.c | 2 +- + drivers/tee/optee/rpc.c | 2 +- + include/dt-bindings/bus/ti-sysc.h | 2 + + include/dt-bindings/clock/dra7.h | 1 + + include/linux/cpuhotplug.h | 1 + + include/linux/dma/pxa-dma.h | 9 + + .../linux/platform_data}/ams-delta-fiq.h | 31 +- + include/linux/platform_data/mmp_dma.h | 4 + + include/linux/platform_data/mtd-davinci-aemif.h | 1 - + include/linux/platform_data/pm33xx.h | 29 +- + include/linux/platform_data/ti-sysc.h | 1 + + include/linux/pxa2xx_ssp.h | 2 - + include/linux/soc/renesas/rcar-sysc.h | 13 +- + include/linux/wkup_m3_ipc.h | 9 + + include/soc/bcm2835/raspberrypi-firmware.h | 1 + + sound/soc/pxa/pxa-ssp.c | 5 +- + 420 files changed, 8667 insertions(+), 9061 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + create mode 100644 Documentation/devicetree/bindings/timer/ti,davinci-timer.txt + create mode 100644 Documentation/hwmon/raspberrypi-hwmon + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/armada-388-helios4.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi + create mode 100644 arch/arm/boot/dts/gemini-sl93512r.dts + create mode 100644 arch/arm/boot/dts/keystone-k2g-netcp.dtsi + create mode 100644 arch/arm/boot/dts/s5pv210-aries.dtsi + create mode 100644 arch/arm/boot/dts/s5pv210-fascinate4g.dts + create mode 100644 arch/arm/boot/dts/s5pv210-galaxys.dts + rename arch/arm/boot/dts/{tegra20-iris-512.dts => tegra20-colibri-iris.dts} (95%) + rename arch/arm/boot/dts/{tegra20-colibri-512.dtsi => tegra20-colibri.dtsi} (96%) + delete mode 100644 arch/arm/mach-davinci/aemif.c + delete mode 100644 arch/arm/mach-davinci/clock.c + delete mode 100644 arch/arm/mach-davinci/psc.c + create mode 100644 arch/arm/mach-omap1/ams-delta-fiq.h + delete mode 100644 arch/arm/mach-shmobile/platsmp-apmu.h + delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c + delete mode 100644 arch/arm/mach-shmobile/r8a7790.h + delete mode 100644 arch/arm/mach-shmobile/r8a7791.h + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7790.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c + delete mode 100644 arch/arm/mach-shmobile/smp-r8a7790.c + delete mode 100644 arch/arm/mach-shmobile/smp-r8a7791.c + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958802a802x.dts + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi + delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi + delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi + create mode 100644 drivers/hwmon/raspberrypi-hwmon.c + rename {arch/arm/mach-omap1/include/mach => include/linux/platform_data}/ams-delta-fiq.h (68%) +Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next) +$ git merge actions/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar.dtsi | 3 +-- + arch/arm/boot/dts/owl-s500.dtsi | 3 +-- + arch/arm64/boot/dts/actions/Makefile | 2 ++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 11 ++--------- + arch/arm64/boot/dts/actions/s900.dtsi | 23 +++++++++++++++++++++-- + drivers/soc/actions/Makefile | 2 ++ + drivers/soc/actions/owl-sps-helper.c | 6 +----- + drivers/soc/actions/owl-sps.c | 6 +----- + 11 files changed, 36 insertions(+), 29 deletions(-) +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (b3fd49121640 Merge branch 'v4.19/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 13 ++ + .../bindings/clock/amlogic,axg-audio-clkc.txt | 56 ++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 111 +++++++++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 162 +++++++++++++++ + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 17 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 48 +++++ + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 218 +++++++++++++++++++++ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 15 +- + .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 7 + + .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 22 +++ + .../boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 22 +++ + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 24 +++ + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 15 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 7 + + include/dt-bindings/clock/axg-audio-clkc.h | 94 +++++++++ + include/dt-bindings/clock/axg-clkc.h | 4 + + include/dt-bindings/clock/gxbb-clkc.h | 1 + + 19 files changed, 815 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts + create mode 100644 include/dt-bindings/clock/axg-audio-clkc.h +Merging aspeed/for-next (403d991cce7d Merge branches 'defconfig-for-v4.19' and 'dt-for-v4.19' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 14 ++-- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 18 ++++- + arch/arm/boot/dts/aspeed-g5.dtsi | 25 +++++- + arch/arm/configs/aspeed_g4_defconfig | 111 ++++++++++++++++++++++---- + arch/arm/configs/aspeed_g5_defconfig | 115 ++++++++++++++++++++++----- + arch/arm/configs/multi_v5_defconfig | 30 ++++--- + 7 files changed, 259 insertions(+), 58 deletions(-) +Merging at91/at91-next (072b30559769 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/arm/atmel-pmc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-pmc.txt | 14 -- + .../devicetree/bindings/clock/at91-clock.txt | 9 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 5 - + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/at91-dvk_som60.dts | 95 +++++++++ + arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 159 ++++++++++++++ + arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 90 ++++++++ + arch/arm/boot/dts/at91-gatwick.dts | 121 +++++++++++ + arch/arm/boot/dts/at91-som60.dtsi | 230 +++++++++++++++++++++ + arch/arm/boot/dts/at91-wb45n.dts | 64 ++++++ + arch/arm/boot/dts/at91-wb45n.dtsi | 165 +++++++++++++++ + arch/arm/boot/dts/at91-wb50n.dts | 112 ++++++++++ + arch/arm/boot/dts/at91-wb50n.dtsi | 198 ++++++++++++++++++ + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 8 +- + arch/arm/boot/dts/sama5d3.dtsi | 8 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/mach-at91/pm.c | 192 ++++++++++++++--- + arch/arm/mach-at91/pm.h | 6 +- + arch/arm/mach-at91/pm_suspend.S | 142 +++++++++++-- + include/linux/clk/at91_pmc.h | 15 ++ + 24 files changed, 1558 insertions(+), 89 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt + create mode 100644 arch/arm/boot/dts/at91-dvk_som60.dts + create mode 100644 arch/arm/boot/dts/at91-dvk_su60_somc.dtsi + create mode 100644 arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi + create mode 100644 arch/arm/boot/dts/at91-gatwick.dts + create mode 100644 arch/arm/boot/dts/at91-som60.dtsi + create mode 100644 arch/arm/boot/dts/at91-wb45n.dts + create mode 100644 arch/arm/boot/dts/at91-wb45n.dtsi + create mode 100644 arch/arm/boot/dts/at91-wb50n.dts + create mode 100644 arch/arm/boot/dts/at91-wb50n.dtsi +Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging drivers/hwmon/Kconfig +CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig +Auto-merging drivers/firmware/raspberrypi.c +CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c +Resolved 'drivers/firmware/raspberrypi.c' using previous resolution. +Resolved 'drivers/hwmon/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 08d2a2d9c20a] Merge remote-tracking branch 'bcm2835/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging imx-mxs/for-next (6632f203415f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/m4if.txt | 12 + + .../devicetree/bindings/arm/freescale/tigerp.txt | 12 + + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + arch/arm/boot/dts/Makefile | 12 +- + arch/arm/boot/dts/imx31-lite.dts | 177 +++++ + arch/arm/boot/dts/imx31.dtsi | 223 ++++++ + arch/arm/boot/dts/imx50-evk.dts | 8 - + arch/arm/boot/dts/imx50-pinfunc.h | 4 +- + arch/arm/boot/dts/imx50.dtsi | 18 - + arch/arm/boot/dts/imx51-babbage.dts | 25 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 21 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 67 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 448 +++++++++++ + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 459 +++++++++++ + arch/arm/boot/dts/imx51.dtsi | 61 +- + arch/arm/boot/dts/imx53-kp-ddc.dts | 146 ++++ + arch/arm/boot/dts/imx53-kp-hsc.dts | 52 ++ + arch/arm/boot/dts/imx53-kp.dtsi | 189 +++++ + arch/arm/boot/dts/imx53-ppd.dts | 36 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 9 +- + arch/arm/boot/dts/imx53.dtsi | 7 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 3 - + arch/arm/boot/dts/imx6dl-icore-mipi.dts | 25 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 54 +- + arch/arm/boot/dts/imx6dl.dtsi | 24 + + arch/arm/boot/dts/imx6q-apalis-eval.dts | 16 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 4 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 66 ++ + arch/arm/boot/dts/imx6q-icore-mipi.dts | 8 + + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 1 + + arch/arm/boot/dts/imx6q.dtsi | 88 ++- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 75 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 78 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 49 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 25 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 59 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl.dtsi | 1 - + arch/arm/boot/dts/imx6sl-evk.dts | 4 + + arch/arm/boot/dts/imx6sl.dtsi | 44 +- + arch/arm/boot/dts/imx6sll-evk.dts | 384 +++++++++ + arch/arm/boot/dts/imx6sll-pinfunc.h | 880 +++++++++++++++++++++ + arch/arm/boot/dts/imx6sll.dtsi | 780 ++++++++++++++++++ + arch/arm/boot/dts/imx6sx.dtsi | 16 +- + arch/arm/boot/dts/imx6ul.dtsi | 6 + + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 14 - + arch/arm/boot/dts/imx6ull.dtsi | 62 +- + arch/arm/boot/dts/imx7d-sdb.dts | 33 +- + arch/arm/boot/dts/imx7d.dtsi | 6 + + arch/arm/boot/dts/imx7s.dtsi | 1 - + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/mach-imx/Kconfig | 33 +- + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/common.h | 3 +- + arch/arm/mach-imx/cpu-imx5.c | 45 ++ + arch/arm/mach-imx/cpu.c | 1 + + arch/arm/mach-imx/cpuidle-imx6sl.c | 7 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 1 + + arch/arm/mach-imx/gpc.c | 14 + + arch/arm/mach-imx/imx31-dt.c | 18 - + arch/arm/mach-imx/mach-imx51.c | 30 +- + arch/arm/mach-imx/mach-imx53.c | 2 +- + arch/arm/mach-imx/mach-imx6sl.c | 5 +- + arch/arm/mach-imx/mach-imx7d-cm4.c | 18 + + arch/arm/mach-imx/pm-imx6.c | 33 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 44 +- + arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 42 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 44 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 42 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 42 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 38 +- + .../boot/dts/freescale/qoriq-bman-portals.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-qman-portals.dtsi | 2 +- + drivers/clk/imx/clk-imx6ul.c | 28 +- + drivers/soc/imx/gpc.c | 10 + + include/dt-bindings/clock/imx6ul-clock.h | 8 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 3 + + 111 files changed, 4758 insertions(+), 1272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/freescale/m4if.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/tigerp.txt + create mode 100644 arch/arm/boot/dts/imx31-lite.dts + create mode 100644 arch/arm/boot/dts/imx51-zii-scu2-mezz.dts + create mode 100644 arch/arm/boot/dts/imx51-zii-scu3-esb.dts + create mode 100644 arch/arm/boot/dts/imx53-kp-ddc.dts + create mode 100644 arch/arm/boot/dts/imx53-kp-hsc.dts + create mode 100644 arch/arm/boot/dts/imx53-kp.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-icore-mipi.dts + create mode 100644 arch/arm/boot/dts/imx6sll-evk.dts + create mode 100644 arch/arm/boot/dts/imx6sll-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6sll.dtsi + create mode 100644 arch/arm/mach-imx/mach-imx7d-cm4.c +Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (4d42d1310018 Merge branch 'v4.18-next/soc' into for-next) +$ git merge mediatek/for-next +Removing arch/arm/boot/dts/mt7623n-rfb.dtsi +Removing arch/arm/boot/dts/mt7623n-rfb-nand.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/mediatek.txt | 3 - + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + arch/arm/boot/dts/Makefile | 1 - + arch/arm/boot/dts/mt7623.dtsi | 3 + + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 6 +- + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 73 ------------------ + arch/arm/boot/dts/mt7623n-rfb.dtsi | 86 ---------------------- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 12 ++- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 81 +++++++++++++++++++- + 11 files changed, 100 insertions(+), 172 deletions(-) + delete mode 100644 arch/arm/boot/dts/mt7623n-rfb-nand.dts + delete mode 100644 arch/arm/boot/dts/mt7623n-rfb.dtsi +Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (61e2c471cc1b Merge branch 'am654-for-v4.19' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.txt | 23 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 457 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 136 ++++++ + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/ti/Makefile | 9 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 31 ++ + arch/arm64/boot/dts/ti/k3-am65.dtsi | 87 ++++ + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 36 ++ + arch/arm64/boot/dts/ti/k3-am654.dtsi | 115 ++++++ + drivers/soc/ti/Kconfig | 14 + + 14 files changed, 929 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt + create mode 100755 arch/arm/boot/dts/am335x-osd3358-sm-red.dts + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe.dts + create mode 100644 arch/arm64/boot/dts/ti/Makefile + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am654-base-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am654.dtsi +Merging reset/reset/next (6b39fd590aeb reset: uniphier: add reset control support for SPI) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 +++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 56 +++++++ + drivers/reset/Kconfig | 19 +++ + drivers/reset/Makefile | 2 + + drivers/reset/reset-qcom-aoss.c | 133 ++++++++++++++++ + drivers/reset/reset-simple.c | 1 + + drivers/reset/reset-uniphier-usb3.c | 171 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 9 ++ + include/dt-bindings/reset/qcom,sdm845-aoss.h | 17 ++ + 9 files changed, 460 insertions(+) + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 drivers/reset/reset-qcom-aoss.c + create mode 100644 drivers/reset/reset-uniphier-usb3.c + create mode 100644 include/dt-bindings/reset/qcom,sdm845-aoss.h +Merging qcom/for-next (376e1f304fc7 firmware: qcom: scm: add a dummy qcom_scm_assign_mem()) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.txt | 26 + + .../devicetree/bindings/soc/qcom/rpmh-rsc.txt | 137 ++++ + arch/arm64/boot/dts/qcom/pm8005.dtsi | 33 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 55 ++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 45 ++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 763 +++++++++++++++++++++ + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 6 + + drivers/soc/qcom/llcc-sdm845.c | 94 +++ + drivers/soc/qcom/llcc-slice.c | 335 +++++++++ + drivers/soc/qcom/rpmh-internal.h | 114 +++ + drivers/soc/qcom/rpmh-rsc.c | 695 +++++++++++++++++++ + drivers/soc/qcom/rpmh.c | 513 ++++++++++++++ + drivers/soc/qcom/smem.c | 10 +- + drivers/soc/qcom/trace-rpmh.h | 82 +++ + include/dt-bindings/soc/qcom,rpmh-rsc.h | 14 + + include/linux/qcom_scm.h | 4 + + include/linux/soc/qcom/llcc-qcom.h | 180 +++++ + include/soc/qcom/rpmh.h | 51 ++ + include/soc/qcom/tcs.h | 56 ++ + 20 files changed, 3235 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt + create mode 100644 arch/arm64/boot/dts/qcom/pm8005.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8998.dtsi + create mode 100644 drivers/soc/qcom/llcc-sdm845.c + create mode 100644 drivers/soc/qcom/llcc-slice.c + create mode 100644 drivers/soc/qcom/rpmh-internal.h + create mode 100644 drivers/soc/qcom/rpmh-rsc.c + create mode 100644 drivers/soc/qcom/rpmh.c + create mode 100644 drivers/soc/qcom/trace-rpmh.h + create mode 100644 include/dt-bindings/soc/qcom,rpmh-rsc.h + create mode 100644 include/linux/soc/qcom/llcc-qcom.h + create mode 100644 include/soc/qcom/rpmh.h + create mode 100644 include/soc/qcom/tcs.h +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (9b0f888f9c18 Merge branches 'arm-dt-for-v4.19' and 'arm64-dt-for-v4.19' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/shmobile.txt | 5 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/emev2-kzm9d.dts | 5 +- + arch/arm/boot/dts/emev2.dtsi | 5 +- + arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi | 79 ++++++++++++++ + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 5 +- + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 5 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 5 +- + arch/arm/boot/dts/r7s72100-gr-peach.dts | 5 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 +- + arch/arm/boot/dts/r7s72100.dtsi | 5 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 5 +- + arch/arm/boot/dts/r8a73a4.dtsi | 5 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 5 +- + arch/arm/boot/dts/r8a7740.dtsi | 5 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts | 5 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 5 +- + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 5 +- + arch/arm/boot/dts/r8a7743.dtsi | 14 ++- + .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 5 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 5 +- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 5 +- + arch/arm/boot/dts/r8a7745.dtsi | 5 +- + arch/arm/boot/dts/r8a77470.dtsi | 16 +-- + arch/arm/boot/dts/r8a7778-bockw.dts | 5 +- + arch/arm/boot/dts/r8a7778.dtsi | 5 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 5 +- + arch/arm/boot/dts/r8a7779.dtsi | 5 +- + arch/arm/boot/dts/r8a7790-lager.dts | 26 +---- + arch/arm/boot/dts/r8a7790-stout.dts | 26 ----- + arch/arm/boot/dts/r8a7790.dtsi | 39 +++++-- + arch/arm/boot/dts/r8a7791-koelsch.dts | 26 +---- + arch/arm/boot/dts/r8a7791-porter.dts | 59 ++++++----- + arch/arm/boot/dts/r8a7791.dtsi | 19 ++-- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 26 +---- + arch/arm/boot/dts/r8a7792.dtsi | 5 +- + arch/arm/boot/dts/r8a7793-gose.dts | 26 +---- + arch/arm/boot/dts/r8a7793.dtsi | 20 ++-- + arch/arm/boot/dts/r8a7794-alt.dts | 26 +---- + arch/arm/boot/dts/r8a7794-silk.dts | 26 +---- + arch/arm/boot/dts/r8a7794.dtsi | 5 +- + arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 5 +- + arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 5 +- + arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 28 +++++ + arch/arm/boot/dts/r9a06g032.dtsi | 115 ++++++++++++++++++++ + arch/arm/boot/dts/sh73a0-kzm9g.dts | 5 +- + arch/arm/boot/dts/sh73a0.dtsi | 5 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 19 +--- + arch/arm/mach-shmobile/Kconfig | 2 + + arch/arm/mach-shmobile/Makefile | 2 +- + arch/arm/mach-shmobile/headsmp-apmu.S | 2 - + arch/arm/mach-shmobile/setup-r8a73a4.c | 1 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 - + arch/arm/mach-shmobile/smp-r8a7779.c | 22 ++-- + arch/arm/mach-shmobile/timer.c | 8 -- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 94 +++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 79 ++++++++++++++ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 12 +++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 95 ++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 118 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 12 +-- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 + + drivers/soc/renesas/Makefile | 3 + + drivers/soc/renesas/r9a06g032-smp.c | 96 +++++++++++++++++ + 73 files changed, 905 insertions(+), 412 deletions(-) + create mode 100644 arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi + create mode 100644 arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts + create mode 100644 arch/arm/boot/dts/r9a06g032.dtsi + create mode 100644 drivers/soc/renesas/r9a06g032-smp.c +Merging rockchip/for-next (75589311007d Merge branch 'v4.19-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 5 + + .../bindings/clock/rockchip,px30-cru.txt | 65 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 599 +++++++++++ + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-half-divider.c | 227 +++++ + drivers/clk/rockchip/clk-px30.c | 1039 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3399.c | 2 +- + drivers/clk/rockchip/clk.c | 10 + + drivers/clk/rockchip/clk.h | 126 ++- + include/dt-bindings/clock/px30-cru.h | 389 ++++++++ + 12 files changed, 2464 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-ficus.dts + create mode 100644 drivers/clk/rockchip/clk-half-divider.c + create mode 100644 drivers/clk/rockchip/clk-px30.c + create mode 100644 include/dt-bindings/clock/px30-cru.h +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (44c29c1f2c9f Merge branch 'for-v4.19/exynos5440-removal-drivers' into for-next) +$ git merge samsung-krzk/for-next +Removing include/dt-bindings/clock/exynos5440.h +Removing drivers/cpufreq/exynos5440-cpufreq.c +Removing drivers/clk/samsung/clk-exynos5440.c +Removing Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt +Removing Documentation/devicetree/bindings/clock/exynos5440-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 1 - + .../devicetree/bindings/clock/exynos5440-clock.txt | 28 -- + .../bindings/cpufreq/cpufreq-exynos5440.txt | 28 -- + arch/arm/mach-s3c24xx/include/mach/s3c2412.h | 2 +- + drivers/ata/ahci_platform.c | 1 - + drivers/clk/samsung/Makefile | 1 - + drivers/clk/samsung/clk-exynos5440.c | 167 -------- + drivers/cpufreq/Kconfig.arm | 14 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/exynos5440-cpufreq.c | 452 --------------------- + drivers/usb/host/ehci-exynos.c | 7 - + drivers/usb/host/ohci-exynos.c | 6 - + include/dt-bindings/clock/exynos5440.h | 44 -- + 13 files changed, 1 insertion(+), 751 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt + delete mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt + delete mode 100644 drivers/clk/samsung/clk-exynos5440.c + delete mode 100644 drivers/cpufreq/exynos5440-cpufreq.c + delete mode 100644 include/dt-bindings/clock/exynos5440.h +Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.19' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/sun50i-de2-bus.txt | 37 +++ + .../devicetree/bindings/clock/sun8i-de2.txt | 1 + + .../devicetree/bindings/mmc/sunxi-mmc.txt | 2 + + .../devicetree/bindings/net/dwmac-sun8i.txt | 8 - + .../devicetree/bindings/sram/sunxi-sram.txt | 31 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 4 +- + arch/arm/boot/dts/sun5i.dtsi | 32 ++- + arch/arm/boot/dts/sun6i-a31.dtsi | 30 ++ + arch/arm/boot/dts/sun7i-a20.dtsi | 38 ++- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 22 ++ + arch/arm/boot/dts/sun8i-a33.dtsi | 9 + + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 8 + + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 8 + + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 8 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 2 - + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 21 ++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 7 + + arch/arm/boot/dts/sun8i-h3.dtsi | 31 ++ + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 29 ++ + arch/arm/boot/dts/sun8i-r40.dtsi | 319 ++++++++++++++++++++- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 - + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 9 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 219 ++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 285 ++++++++++++++++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 15 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 7 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 113 +++++++- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 146 ++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 67 ++++- + drivers/bus/Kconfig | 10 + + drivers/bus/Makefile | 1 + + drivers/bus/sun50i-de2.c | 48 ++++ + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 11 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 58 ++-- + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 8 +- + drivers/soc/sunxi/sunxi_sram.c | 87 +++++- + include/dt-bindings/clock/sun8i-r40-ccu.h | 4 + + 45 files changed, 1692 insertions(+), 83 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts + create mode 100644 drivers/bus/sun50i-de2.c +Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (11527b3e0b57 arm64: Drop asmlinkage qualifier from syscall_trace_{enter,exit}) +$ git merge arm64/for-next/core +Auto-merging include/linux/syscalls.h +Removing arch/arm64/kernel/entry32.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/include/asm/kvm_emulate.h | 14 +-- + arch/arm64/Kconfig | 16 ++++ + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/acpi.h | 6 +- + arch/arm64/include/asm/barrier.h | 13 +++ + arch/arm64/include/asm/cache.h | 4 + + arch/arm64/include/asm/cacheflush.h | 27 +++++- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/fpsimd.h | 17 +++- + arch/arm64/include/asm/insn.h | 2 - + arch/arm64/include/asm/kvm_emulate.h | 10 +- + arch/arm64/include/asm/numa.h | 4 + + arch/arm64/include/asm/processor.h | 6 +- + arch/arm64/include/asm/ptrace.h | 79 +++++++++++----- + arch/arm64/include/asm/spinlock.h | 117 +---------------------- + arch/arm64/include/asm/spinlock_types.h | 17 +--- + arch/arm64/include/asm/syscall.h | 8 +- + arch/arm64/include/asm/syscall_wrapper.h | 80 ++++++++++++++++ + arch/arm64/include/asm/sysreg.h | 30 ++---- + arch/arm64/include/asm/tlbflush.h | 7 ++ + arch/arm64/include/asm/topology.h | 4 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 28 +++--- + arch/arm64/kernel/Makefile | 5 +- + arch/arm64/kernel/acpi_numa.c | 88 ++++++++++------- + arch/arm64/kernel/armv8_deprecated.c | 32 +++---- + arch/arm64/kernel/cpu-reset.h | 9 +- + arch/arm64/kernel/cpu_errata.c | 30 ++++-- + arch/arm64/kernel/cpufeature.c | 4 +- + arch/arm64/kernel/entry.S | 157 ++++--------------------------- + arch/arm64/kernel/entry32.S | 121 ------------------------ + arch/arm64/kernel/fpsimd.c | 19 ---- + arch/arm64/kernel/insn.c | 70 +------------- + arch/arm64/kernel/machine_kexec.c | 3 +- + arch/arm64/kernel/process.c | 20 ++-- + arch/arm64/kernel/ptrace.c | 40 ++++---- + arch/arm64/kernel/signal.c | 8 +- + arch/arm64/kernel/signal32.c | 24 +++-- + arch/arm64/kernel/smp.c | 44 ++++++--- + arch/arm64/kernel/sys.c | 29 +++--- + arch/arm64/kernel/sys32.c | 135 ++++++++++++++++++++++---- + arch/arm64/kernel/syscall.c | 132 ++++++++++++++++++++++++++ + arch/arm64/kernel/topology.c | 58 ++++++++---- + arch/arm64/kernel/traps.c | 18 +--- + arch/arm64/kvm/guest.c | 14 +-- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +- + arch/arm64/kvm/regmap.c | 22 ++--- + arch/arm64/kvm/reset.c | 4 +- + arch/arm64/mm/cache.S | 4 +- + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/flush.c | 2 +- + arch/arm64/mm/mmu.c | 48 +++++++++- + arch/arm64/mm/numa.c | 29 ++++-- + arch/arm64/mm/ptdump_debugfs.c | 13 +-- + arch/x86/mm/pgtable.c | 61 ++++++++++-- + fs/statfs.c | 14 ++- + include/asm-generic/pgtable.h | 8 +- + include/linux/compat.h | 11 +++ + include/linux/syscalls.h | 11 +++ + include/uapi/asm-generic/unistd.h | 4 +- + lib/ioremap.c | 4 +- + virt/kvm/arm/aarch32.c | 20 ++-- + 63 files changed, 994 insertions(+), 821 deletions(-) + create mode 100644 arch/arm64/include/asm/syscall_wrapper.h + delete mode 100644 arch/arm64/kernel/entry32.S + create mode 100644 arch/arm64/kernel/syscall.c +Merging clk/clk-next (4db3ff7a7f11 Merge branch 'clk-qcom-rpmh' into clk-next) +$ git merge clk/clk-next +Removing drivers/clk/meson/clk-audio-divider.c +Auto-merging drivers/clk/clkdev.c +Auto-merging Documentation/devicetree/bindings/clock/at91-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/at91-clock.txt | 35 + + .../devicetree/bindings/clock/maxim,max9485.txt | 59 ++ + .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 43 + + arch/arm/mach-at91/Kconfig | 4 + + drivers/clk/Kconfig | 6 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/clk-i2s-mux.c | 116 +++ + drivers/clk/clk-aspeed.c | 61 +- + drivers/clk/clk-max9485.c | 387 +++++++++ + drivers/clk/clk-si514.c | 38 +- + drivers/clk/clk-si544.c | 38 +- + drivers/clk/clk.c | 218 ++++- + drivers/clk/imx/clk-imx51-imx53.c | 44 +- + drivers/clk/imx/clk-imx6q.c | 16 +- + drivers/clk/imx/clk-imx6sl.c | 12 - + drivers/clk/imx/clk-imx6sll.c | 6 + + drivers/clk/imx/clk-imx6sx.c | 40 +- + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/clk/ingenic/jz4740-cgu.c | 4 +- + drivers/clk/meson/Kconfig | 28 +- + drivers/clk/meson/Makefile | 4 +- + drivers/clk/meson/axg-audio.c | 845 +++++++++++++++++++ + drivers/clk/meson/axg-audio.h | 127 +++ + drivers/clk/meson/axg.c | 244 +++++- + drivers/clk/meson/axg.h | 8 +- + drivers/clk/meson/clk-audio-divider.c | 110 --- + drivers/clk/meson/clk-phase.c | 63 ++ + drivers/clk/meson/clk-triphase.c | 68 ++ + drivers/clk/meson/clkc-audio.h | 28 + + drivers/clk/meson/clkc.h | 11 +- + drivers/clk/meson/gxbb.c | 119 ++- + drivers/clk/meson/gxbb.h | 5 +- + drivers/clk/meson/sclk-div.c | 243 ++++++ + drivers/clk/mvebu/armada-37xx-periph.c | 43 +- + drivers/clk/pxa/clk-pxa25x.c | 6 +- + drivers/clk/pxa/clk-pxa27x.c | 7 +- + drivers/clk/pxa/clk-pxa3xx.c | 7 +- + drivers/clk/qcom/Kconfig | 9 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-rpmh.c | 329 ++++++++ + drivers/clk/qcom/gcc-ipq806x.c | 3 - + drivers/clk/qcom/gcc-mdm9615.c | 2 - + drivers/clk/qcom/gcc-msm8660.c | 5 - + drivers/clk/qcom/gcc-msm8960.c | 5 - + drivers/clk/qcom/gcc-msm8996.c | 1 + + drivers/clk/qcom/gcc-sdm845.c | 43 +- + drivers/clk/qcom/mmcc-msm8996.c | 1 + + drivers/clk/renesas/Kconfig | 6 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a06g032-clocks.c | 893 +++++++++++++++++++++ + drivers/clk/socfpga/clk-s10.c | 9 +- + drivers/clk/tegra/clk-bpmp.c | 12 +- + drivers/clk/tegra/clk-divider.c | 5 +- + drivers/clk/tegra/clk-emc.c | 2 +- + drivers/clk/tegra/clk-tegra124.c | 3 +- + include/dt-bindings/clock/aspeed-clock.h | 2 +- + include/dt-bindings/clock/imx6sll-clock.h | 9 +- + include/dt-bindings/clock/maxim,max9485.h | 18 + + include/dt-bindings/clock/pxa-clock.h | 3 +- + include/dt-bindings/clock/qcom,gcc-sdm845.h | 2 + + include/dt-bindings/clock/r9a06g032-sysctrl.h | 148 ++++ + include/linux/clk-provider.h | 26 + + include/linux/clk.h | 33 + + include/trace/events/clk.h | 36 + + 66 files changed, 4346 insertions(+), 359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/maxim,max9485.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt + create mode 100644 drivers/clk/at91/clk-i2s-mux.c + create mode 100644 drivers/clk/clk-max9485.c + create mode 100644 drivers/clk/meson/axg-audio.c + create mode 100644 drivers/clk/meson/axg-audio.h + delete mode 100644 drivers/clk/meson/clk-audio-divider.c + create mode 100644 drivers/clk/meson/clk-phase.c + create mode 100644 drivers/clk/meson/clk-triphase.c + create mode 100644 drivers/clk/meson/clkc-audio.h + create mode 100644 drivers/clk/meson/sclk-div.c + create mode 100644 drivers/clk/qcom/clk-rpmh.c + create mode 100644 drivers/clk/renesas/r9a06g032-clocks.c + create mode 100644 include/dt-bindings/clock/maxim,max9485.h + create mode 100644 include/dt-bindings/clock/r9a06g032-sysctrl.h +Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Auto-merging drivers/clk/samsung/clk-s3c2410-dclk.c +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/Kconfig | 1 + + arch/c6x/kernel/setup.c | 26 +------------------------- + 2 files changed, 2 insertions(+), 25 deletions(-) +Merging h8300/h8300-next (2f61c9ca404f Merge branch 'h8300-next' of git.sourceforge.jp:/gitroot/uclinux-h8/linux into h8300-next) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 + + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/include/asm/bitops.h | 12 ++++++------ + arch/h8300/kernel/setup.c | 38 +++++++++----------------------------- + arch/h8300/kernel/sim-console.c | 7 ++++--- + 5 files changed, 21 insertions(+), 39 deletions(-) +Merging m68k/for-next (cd629147324c m68k/defconfig: Update defconfigs for v4.18-rc1) +$ git merge m68k/for-next +Removing arch/m68k/include/asm/dma-mapping.h +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 5 +++ + arch/m68k/apollo/config.c | 8 ---- + arch/m68k/atari/config.c | 5 --- + arch/m68k/atari/time.c | 63 ------------------------------ + arch/m68k/bvme6000/config.c | 45 ---------------------- + arch/m68k/configs/amiga_defconfig | 28 +++++++++----- + arch/m68k/configs/apollo_defconfig | 26 ++++++++----- + arch/m68k/configs/atari_defconfig | 25 +++++++----- + arch/m68k/configs/bvme6000_defconfig | 26 ++++++++----- + arch/m68k/configs/hp300_defconfig | 26 ++++++++----- + arch/m68k/configs/mac_defconfig | 26 ++++++++----- + arch/m68k/configs/multi_defconfig | 28 +++++++++----- + arch/m68k/configs/mvme147_defconfig | 26 ++++++++----- + arch/m68k/configs/mvme16x_defconfig | 26 ++++++++----- + arch/m68k/configs/q40_defconfig | 26 ++++++++----- + arch/m68k/configs/sun3_defconfig | 24 ++++++++---- + arch/m68k/configs/sun3x_defconfig | 26 ++++++++----- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/bitops.h | 8 +++- + arch/m68k/include/asm/dma-mapping.h | 12 ------ + arch/m68k/include/asm/io.h | 7 ++++ + arch/m68k/include/asm/io_mm.h | 42 ++------------------ + arch/m68k/include/asm/io_no.h | 12 ------ + arch/m68k/include/asm/kmap.h | 9 ++++- + arch/m68k/include/asm/machdep.h | 1 - + arch/m68k/include/asm/macintosh.h | 1 - + arch/m68k/include/asm/page_no.h | 2 +- + arch/m68k/kernel/dma.c | 68 ++++----------------------------- + arch/m68k/kernel/setup_mm.c | 15 ++------ + arch/m68k/kernel/setup_no.c | 21 ++-------- + arch/m68k/mac/config.c | 21 +--------- + arch/m68k/mac/misc.c | 74 +++++++++++++++++------------------- + arch/m68k/mm/init.c | 1 - + arch/m68k/mm/mcfmmu.c | 13 ++++--- + arch/m68k/mm/motorola.c | 35 ++++++----------- + arch/m68k/mvme147/config.c | 7 ---- + arch/m68k/mvme16x/config.c | 8 ---- + arch/m68k/q40/config.c | 30 --------------- + arch/m68k/sun3/config.c | 4 -- + drivers/input/keyboard/hilkbd.c | 4 +- + drivers/net/ethernet/8390/mac8390.c | 20 +++++----- + drivers/nubus/bus.c | 3 ++ + 42 files changed, 322 insertions(+), 536 deletions(-) + delete mode 100644 arch/m68k/include/asm/dma-mapping.h +Merging m68knommu/for-next (a23aa852f423 m68knommu: Fix typos in Coldfire 5272 DMA debug code) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 29 +++++++++++++++++++++++++++++ + arch/m68k/include/asm/dma.h | 4 ++-- + 2 files changed, 31 insertions(+), 2 deletions(-) +Merging microblaze/next (bd05a58ddfd7 microblaze: warn if of_iomap() failed) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/pci/xilinx_pci.c | 1 + + 1 file changed, 1 insertion(+) +Merging mips/mips-next (1ae22a0e3563 MIPS: Add FP_MODE regset support) +$ git merge mips/mips-next +Auto-merging fs/binfmt_elf.c +Removing arch/mips/mti-malta/malta-reset.c +Removing arch/mips/mti-malta/malta-pm.c +Removing arch/mips/mm/dma-default.c +Removing arch/mips/loongson64/common/dma-swiotlb.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Removing arch/mips/include/asm/mach-loongson64/dma-coherence.h +Removing arch/mips/include/asm/mach-jazz/dma-coherence.h +Removing arch/mips/include/asm/mach-ip32/dma-coherence.h +Removing arch/mips/include/asm/mach-ip27/dma-coherence.h +Removing arch/mips/include/asm/mach-generic/dma-coherence.h +Removing arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +Removing arch/mips/include/asm/mach-bmips/dma-coherence.h +Removing arch/mips/include/asm/mach-ath25/dma-coherence.h +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c2d9c1e61bf] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/Kconfig | 35 +- + arch/mips/Makefile | 12 +- + arch/mips/alchemy/board-gpr.c | 3 +- + arch/mips/alchemy/board-mtx1.c | 3 +- + arch/mips/alchemy/board-xxs1500.c | 3 +- + arch/mips/alchemy/devboards/platform.c | 3 +- + arch/mips/ar7/clock.c | 29 + + arch/mips/ar7/prom.c | 4 +- + arch/mips/ath25/Kconfig | 1 + + arch/mips/ath25/board.c | 6 +- + arch/mips/ath25/early_printk.c | 5 +- + arch/mips/ath79/early_printk.c | 16 +- + arch/mips/bcm63xx/early_printk.c | 1 + + arch/mips/bmips/dma.c | 32 +- + arch/mips/bmips/setup.c | 7 - + arch/mips/boot/Makefile | 52 +- + arch/mips/boot/compressed/uart-prom.c | 3 +- + arch/mips/boot/ecoff.h | 61 +- + arch/mips/boot/elf2ecoff.c | 31 +- + arch/mips/cavium-octeon/dma-octeon.c | 191 +- + arch/mips/cavium-octeon/octeon-irq.c | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 +- + arch/mips/cavium-octeon/setup.c | 4 +- + arch/mips/configs/malta_defconfig | 1 + + arch/mips/configs/malta_kvm_defconfig | 1 + + arch/mips/configs/malta_kvm_guest_defconfig | 1 + + arch/mips/configs/malta_qemu_32r6_defconfig | 1 + + arch/mips/configs/maltaaprp_defconfig | 1 + + arch/mips/configs/maltasmvp_defconfig | 1 + + arch/mips/configs/maltasmvp_eva_defconfig | 1 + + arch/mips/configs/maltaup_defconfig | 1 + + arch/mips/configs/maltaup_xpa_defconfig | 1 + + arch/mips/fw/arc/arc_con.c | 1 + + arch/mips/fw/arc/promlib.c | 1 + + arch/mips/fw/sni/sniprom.c | 1 + + arch/mips/generic/init.c | 13 - + arch/mips/include/asm/atomic.h | 195 +- + arch/mips/include/asm/bmips.h | 16 - + arch/mips/include/asm/dma-coherence.h | 6 +- + arch/mips/include/asm/dma-direct.h | 17 +- + arch/mips/include/asm/dma-mapping.h | 21 +- + arch/mips/include/asm/io.h | 35 +- + arch/mips/include/asm/mach-ath25/dma-coherence.h | 76 - + arch/mips/include/asm/mach-bmips/dma-coherence.h | 54 - + .../include/asm/mach-cavium-octeon/dma-coherence.h | 79 - + arch/mips/include/asm/mach-generic/dma-coherence.h | 73 - + arch/mips/include/asm/mach-generic/kmalloc.h | 3 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 70 - + arch/mips/include/asm/mach-ip32/dma-coherence.h | 92 - + arch/mips/include/asm/mach-jazz/dma-coherence.h | 60 - + .../include/asm/mach-loongson64/dma-coherence.h | 93 - + arch/mips/include/asm/mmu_context.h | 2 - + arch/mips/include/asm/octeon/cvmx-ciu-defs.h | 10062 +------------------ + arch/mips/include/asm/octeon/pci-octeon.h | 3 + + arch/mips/include/asm/processor.h | 2 +- + arch/mips/include/asm/setup.h | 2 + + arch/mips/include/asm/sgialib.h | 1 - + arch/mips/include/asm/txx9/generic.h | 1 - + arch/mips/jazz/jazzdma.c | 141 +- + arch/mips/jazz/setup.c | 17 +- + arch/mips/kernel/early_printk.c | 2 - + arch/mips/kernel/early_printk_8250.c | 1 + + arch/mips/kernel/genex.S | 46 + + arch/mips/kernel/idle.c | 12 +- + arch/mips/kernel/process.c | 80 +- + arch/mips/kernel/ptrace.c | 254 +- + arch/mips/kernel/ptrace32.c | 2 +- + arch/mips/kernel/relocate_kernel.S | 4 +- + arch/mips/kernel/setup.c | 24 + + arch/mips/kernel/traps.c | 7 - + arch/mips/lantiq/early_printk.c | 1 + + arch/mips/lantiq/prom.c | 8 - + arch/mips/lasat/prom.c | 1 + + arch/mips/loongson64/Kconfig | 5 - + arch/mips/loongson64/common/Makefile | 6 +- + arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 +- + arch/mips/loongson64/common/dma-swiotlb.c | 109 - + arch/mips/loongson64/common/dma.c | 18 + + arch/mips/loongson64/common/early_printk.c | 1 + + arch/mips/loongson64/loongson-3/Makefile | 2 +- + arch/mips/loongson64/loongson-3/dma.c | 25 + + arch/mips/mm/Makefile | 4 +- + arch/mips/mm/c-r4k.c | 12 +- + arch/mips/mm/cache.c | 4 +- + arch/mips/mm/dma-default.c | 404 - + arch/mips/mm/dma-noncoherent.c | 208 + + arch/mips/mm/dma-swiotlb.c | 61 + + arch/mips/mm/page.c | 15 - + arch/mips/mti-malta/Makefile | 2 - + arch/mips/mti-malta/malta-pm.c | 96 - + arch/mips/mti-malta/malta-reset.c | 30 - + arch/mips/mti-malta/malta-setup.c | 39 +- + arch/mips/netlogic/common/earlycons.c | 1 + + arch/mips/netlogic/xlp/dt.c | 14 - + arch/mips/paravirt/serial.c | 5 +- + arch/mips/pci/ops-bridge.c | 4 +- + arch/mips/pci/pci-ar2315.c | 24 + + arch/mips/pci/pci-ip27.c | 25 +- + arch/mips/pci/pci-octeon.c | 4 - + arch/mips/pci/pcie-octeon.c | 6 +- + arch/mips/pic32/pic32mzda/early_console.c | 5 +- + arch/mips/ralink/early_printk.c | 7 +- + arch/mips/sgi-ip27/ip27-console.c | 1 + + arch/mips/sgi-ip32/Makefile | 2 +- + arch/mips/sgi-ip32/ip32-dma.c | 37 + + arch/mips/sibyte/Kconfig | 1 - + arch/mips/sibyte/common/cfe.c | 1 + + arch/mips/txx9/generic/setup.c | 1 + + arch/mips/vr41xx/common/pmu.c | 3 +- + fs/binfmt_elf.c | 2 +- + include/linux/dma-noncoherent.h | 8 + + include/uapi/linux/elf.h | 2 + + kernel/dma/noncoherent.c | 8 +- + 113 files changed, 1422 insertions(+), 11876 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-ath25/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-bmips/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-generic/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-ip27/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-ip32/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-jazz/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-loongson64/dma-coherence.h + delete mode 100644 arch/mips/loongson64/common/dma-swiotlb.c + create mode 100644 arch/mips/loongson64/common/dma.c + create mode 100644 arch/mips/loongson64/loongson-3/dma.c + delete mode 100644 arch/mips/mm/dma-default.c + create mode 100644 arch/mips/mm/dma-noncoherent.c + create mode 100644 arch/mips/mm/dma-swiotlb.c + delete mode 100644 arch/mips/mti-malta/malta-pm.c + delete mode 100644 arch/mips/mti-malta/malta-reset.c + create mode 100644 arch/mips/sgi-ip32/ip32-dma.c +Merging nds32/next (d2516b16bcbc nds32: fix logic for module) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Kconfig | 12 ++--- + arch/nds32/Makefile | 2 + + arch/nds32/include/asm/cacheflush.h | 9 +++- + arch/nds32/include/asm/futex.h | 2 +- + arch/nds32/kernel/module.c | 4 +- + arch/nds32/kernel/setup.c | 3 +- + arch/nds32/mm/cacheflush.c | 100 +++++++++++++++--------------------- + 7 files changed, 60 insertions(+), 72 deletions(-) +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (ae15a41a6414 openrisc: entry: Fix delay slot exception detection) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (ce57c6610cc2 Merge branch 'topic/ppc-kvm' into next) +$ git merge powerpc/next +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_spapr_tce.c +Removing drivers/misc/cxl/phb.c +Auto-merging drivers/misc/cxl/api.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_vio.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +Recorded preimage for 'drivers/vfio/vfio_iommu_spapr_tce.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/vfio/vfio_iommu_spapr_tce.c'. +[master 8ce7cc88290a] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/DAWR-POWER9.txt | 58 +++ + Documentation/powerpc/transactional_memory.txt | 44 +++ + arch/powerpc/Kconfig | 1 + + arch/powerpc/boot/dts/ac14xx.dts | 20 +- + arch/powerpc/boot/dts/fsl/kmcent2.dts | 2 +- + arch/powerpc/boot/dts/pdm360ng.dts | 2 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 20 -- + arch/powerpc/include/asm/book3s/64/pgtable.h | 5 +- + arch/powerpc/include/asm/book3s/64/radix.h | 35 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 - + arch/powerpc/include/asm/cputable.h | 26 +- + arch/powerpc/include/asm/eeh.h | 15 +- + arch/powerpc/include/asm/iommu.h | 11 +- + arch/powerpc/include/asm/paca.h | 5 - + arch/powerpc/include/asm/pnv-pci.h | 7 - + arch/powerpc/kernel/asm-offsets.c | 1 - + arch/powerpc/kernel/cputable.c | 38 -- + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +- + arch/powerpc/kernel/eeh.c | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/idle_book3s.S | 50 --- + arch/powerpc/kernel/machine_kexec.c | 7 +- + arch/powerpc/kernel/mce_power.c | 18 +- + arch/powerpc/kernel/pci-common.c | 3 - + arch/powerpc/kernel/process.c | 10 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 15 +- + arch/powerpc/kvm/book3s_64_vio.c | 11 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 18 +- + arch/powerpc/kvm/book3s_hv.c | 10 - + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 16 +- + arch/powerpc/kvm/book3s_xive_template.c | 39 +- + arch/powerpc/mm/hash_utils_64.c | 30 -- + arch/powerpc/mm/hugetlbpage.c | 9 +- + arch/powerpc/mm/mmu_context_book3s64.c | 12 +- + arch/powerpc/mm/pgtable-radix.c | 60 +--- + arch/powerpc/mm/tlb-radix.c | 18 - + arch/powerpc/perf/core-book3s.c | 34 -- + arch/powerpc/perf/isa207-common.c | 12 +- + arch/powerpc/perf/isa207-common.h | 5 - + arch/powerpc/perf/power9-pmu.c | 54 +-- + arch/powerpc/platforms/52xx/mpc52xx_pm.c | 5 +- + arch/powerpc/platforms/Kconfig.cputype | 1 - + arch/powerpc/platforms/embedded6xx/wii.c | 10 - + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 12 +- + arch/powerpc/platforms/powernv/idle.c | 28 -- + arch/powerpc/platforms/powernv/memtrace.c | 29 -- + arch/powerpc/platforms/powernv/pci-cxl.c | 199 ---------- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 399 +++++++++++++++++++++ + arch/powerpc/platforms/powernv/pci-ioda.c | 208 ++--------- + arch/powerpc/platforms/powernv/pci.c | 158 -------- + arch/powerpc/platforms/powernv/pci.h | 53 ++- + arch/powerpc/platforms/powernv/smp.c | 27 +- + arch/powerpc/sysdev/msi_bitmap.c | 15 +- + arch/powerpc/sysdev/xive/common.c | 8 +- + arch/powerpc/sysdev/xive/native.c | 24 +- + arch/powerpc/xmon/xmon.c | 5 +- + drivers/cpufreq/powernv-cpufreq.c | 20 +- + drivers/misc/cxl/Kconfig | 8 - + drivers/misc/cxl/Makefile | 2 +- + drivers/misc/cxl/api.c | 132 ------- + drivers/misc/cxl/base.c | 83 ----- + drivers/misc/cxl/context.c | 3 +- + drivers/misc/cxl/cxl.h | 41 --- + drivers/misc/cxl/cxllib.c | 4 - + drivers/misc/cxl/debugfs.c | 5 - + drivers/misc/cxl/guest.c | 3 - + drivers/misc/cxl/main.c | 5 - + drivers/misc/cxl/native.c | 3 +- + drivers/misc/cxl/pci.c | 392 +++----------------- + drivers/misc/cxl/phb.c | 44 --- + drivers/misc/cxl/vphb.c | 46 ++- + drivers/misc/ocxl/context.c | 22 +- + drivers/misc/ocxl/link.c | 24 +- + drivers/misc/ocxl/sysfs.c | 5 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 65 +--- + include/misc/cxl-base.h | 10 - + include/misc/cxl.h | 68 ---- + scripts/checkstack.pl | 11 +- + .../powerpc/dscr/dscr_inherit_exec_test.c | 8 +- + 80 files changed, 833 insertions(+), 2087 deletions(-) + create mode 100644 Documentation/powerpc/DAWR-POWER9.txt + create mode 100644 arch/powerpc/platforms/powernv/pci-ioda-tce.c + delete mode 100644 drivers/misc/cxl/phb.c +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (021c91791a5e Linux 4.18-rc3) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (cd0ed39dc9e8 s390/tape: replace PTR_RET with PTR_ERR_OR_ZERO) +$ git merge s390/features +Auto-merging init/Kconfig +Removing drivers/s390/crypto/ap_asm.h +Auto-merging drivers/s390/block/dasd.c +Auto-merging arch/s390/purgatory/Makefile +Auto-merging arch/s390/mm/pgalloc.c +Auto-merging arch/s390/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 42 +-- + arch/s390/appldata/appldata_base.c | 122 ++++----- + arch/s390/boot/Makefile | 45 +++- + arch/s390/{kernel => boot}/als.c | 20 +- + arch/s390/boot/compressed/.gitignore | 1 + + arch/s390/boot/compressed/Makefile | 55 ++-- + arch/s390/boot/compressed/head.S | 8 +- + arch/s390/boot/compressed/misc.c | 37 --- + arch/s390/boot/compressed/vmlinux.lds.S | 15 +- + .../compressed/{vmlinux.scr => vmlinux.scr.lds.S} | 4 + + arch/s390/boot/ebcdic.c | 2 + + arch/s390/{kernel => boot}/head.S | 11 +- + arch/s390/{kernel => boot}/head_kdump.S | 0 + arch/s390/boot/mem.S | 2 + + arch/s390/boot/sclp_early_core.c | 2 + + arch/s390/hypfs/hypfs_diag.c | 4 +- + arch/s390/hypfs/inode.c | 6 +- + arch/s390/include/asm/ap.h | 284 +++++++++++++++++++-- + arch/s390/include/asm/lowcore.h | 2 +- + arch/s390/include/asm/nospec-insn.h | 4 +- + arch/s390/include/asm/pci.h | 5 + + arch/s390/include/asm/purgatory.h | 6 - + arch/s390/include/asm/qdio.h | 1 - + arch/s390/include/asm/sections.h | 2 - + arch/s390/include/asm/setup.h | 4 +- + arch/s390/include/uapi/asm/chsc.h | 10 +- + arch/s390/kernel/Makefile | 24 +- + arch/s390/kernel/early.c | 12 + + arch/s390/kernel/entry.h | 1 - + arch/s390/kernel/head64.S | 43 ++-- + arch/s390/kernel/nospec-branch.c | 12 +- + arch/s390/kernel/nospec-sysfs.c | 2 + + arch/s390/kernel/perf_regs.c | 6 +- + arch/s390/kernel/setup.c | 4 +- + arch/s390/kernel/sysinfo.c | 4 + + arch/s390/kernel/topology.c | 44 ++-- + arch/s390/kernel/vmlinux.lds.S | 13 +- + arch/s390/mm/cmm.c | 74 +++--- + arch/s390/mm/extmem.c | 4 +- + arch/s390/mm/fault.c | 2 + + arch/s390/mm/pgalloc.c | 2 +- + arch/s390/pci/pci_debug.c | 8 + + arch/s390/purgatory/Makefile | 9 +- + arch/s390/purgatory/head.S | 45 ++-- + arch/s390/purgatory/purgatory.c | 9 - + arch/s390/scripts/Makefile.chkbss | 11 +- + arch/s390/tools/gen_opcode_table.c | 4 +- + drivers/s390/block/dasd.c | 17 +- + drivers/s390/block/dasd_alias.c | 2 +- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/scm_blk.c | 1 + + drivers/s390/char/Makefile | 5 - + drivers/s390/char/keyboard.c | 28 +- + drivers/s390/char/monwriter.c | 2 +- + drivers/s390/char/sclp_async.c | 38 +-- + drivers/s390/char/tape_3590.c | 8 +- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/cio/chp.c | 21 +- + drivers/s390/cio/chsc.c | 18 +- + drivers/s390/cio/chsc.h | 18 +- + drivers/s390/cio/cio.c | 77 +----- + drivers/s390/cio/cio.h | 1 - + drivers/s390/cio/css.c | 82 ++++-- + drivers/s390/cio/css.h | 3 +- + drivers/s390/cio/qdio_main.c | 5 +- + drivers/s390/crypto/ap_asm.h | 236 ----------------- + drivers/s390/crypto/ap_bus.c | 25 +- + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/ap_card.c | 1 - + drivers/s390/crypto/ap_queue.c | 20 -- + drivers/s390/crypto/pkey_api.c | 2 +- + drivers/s390/crypto/zcrypt_card.c | 12 + + drivers/s390/crypto/zcrypt_cca_key.h | 20 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 20 +- + drivers/s390/crypto/zcrypt_queue.c | 12 + + drivers/s390/scsi/zfcp_aux.c | 2 +- + init/Kconfig | 15 +- + lib/raid6/s390vx.uc | 34 +-- + 82 files changed, 852 insertions(+), 917 deletions(-) + rename arch/s390/{kernel => boot}/als.c (83%) + rename arch/s390/boot/compressed/{vmlinux.scr => vmlinux.scr.lds.S} (70%) + create mode 100644 arch/s390/boot/ebcdic.c + rename arch/s390/{kernel => boot}/head.S (98%) + rename arch/s390/{kernel => boot}/head_kdump.S (100%) + create mode 100644 arch/s390/boot/mem.S + create mode 100644 arch/s390/boot/sclp_early_core.c + delete mode 100644 drivers/s390/crypto/ap_asm.h +Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (cb6db64ef5a9 Merge branch 'xtensa-dma-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Removing arch/xtensa/include/asm/dma-mapping.h +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 3 + + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/dma-mapping.h | 26 ----- + arch/xtensa/include/asm/kmem_layout.h | 6 -- + arch/xtensa/include/asm/pgtable.h | 8 ++ + arch/xtensa/include/asm/platform.h | 27 +++++ + arch/xtensa/kernel/pci-dma.c | 193 +++++++++++++--------------------- + arch/xtensa/platforms/xtfpga/setup.c | 33 ++++++ + 8 files changed, 143 insertions(+), 154 deletions(-) + delete mode 100644 arch/xtensa/include/asm/dma-mapping.h +Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (6f383855b92d Merge branch 'for-next-next-v4.19-20180716' into for-next-20180716) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/scrub.c +Merge made by the 'recursive' strategy. + fs/btrfs/acl.c | 13 +- + fs/btrfs/backref.c | 4 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/check-integrity.c | 9 +- + fs/btrfs/compression.c | 29 +- + fs/btrfs/ctree.c | 53 +-- + fs/btrfs/ctree.h | 70 ++-- + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/delayed-ref.c | 43 ++- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dev-replace.c | 13 +- + fs/btrfs/disk-io.c | 42 +-- + fs/btrfs/extent-tree.c | 866 ++++++++++++++++++++----------------------- + fs/btrfs/extent_io.c | 238 ++++++++---- + fs/btrfs/extent_io.h | 8 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 91 +---- + fs/btrfs/free-space-cache.c | 37 +- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/inode-map.c | 12 +- + fs/btrfs/inode.c | 66 +--- + fs/btrfs/ioctl.c | 101 +++-- + fs/btrfs/ordered-data.c | 124 ------- + fs/btrfs/ordered-data.h | 20 +- + fs/btrfs/print-tree.c | 39 +- + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 92 ++++- + fs/btrfs/qgroup.h | 6 +- + fs/btrfs/raid56.c | 109 ++---- + fs/btrfs/reada.c | 3 +- + fs/btrfs/relocation.c | 204 ++-------- + fs/btrfs/scrub.c | 382 +------------------ + fs/btrfs/send.c | 17 +- + fs/btrfs/struct-funcs.c | 1 - + fs/btrfs/super.c | 65 ++-- + fs/btrfs/sysfs.c | 2 - + fs/btrfs/transaction.c | 2 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-checker.c | 114 +++++- + fs/btrfs/tree-log.c | 191 ++-------- + fs/btrfs/volumes.c | 439 ++++++++++------------ + fs/btrfs/volumes.h | 7 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/btrfs.h | 26 ++ + 45 files changed, 1418 insertions(+), 2165 deletions(-) +Merging ceph/master (8b8f53af1ed9 ceph: fix dentry leak in splice_dentry()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (887e4f50dc55 smb3: snapshot mounts are read-only and make sure info is displayable about the mount) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/CHANGES | 1072 +------------------------------- + fs/cifs/Kconfig | 50 +- + fs/cifs/cache.c | 6 +- + fs/cifs/cifs_debug.c | 33 +- + fs/cifs/cifsencrypt.c | 12 +- + fs/cifs/cifsfs.c | 31 +- + fs/cifs/cifsglob.h | 14 +- + fs/cifs/cifsproto.h | 6 +- + fs/cifs/cifssmb.c | 12 +- + fs/cifs/connect.c | 28 +- + fs/cifs/fscache.c | 12 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 36 +- + fs/cifs/netmisc.c | 19 +- + fs/cifs/smb2misc.c | 13 +- + fs/cifs/smb2ops.c | 48 +- + fs/cifs/smb2pdu.c | 203 +++--- + fs/cifs/smb2pdu.h | 12 + + fs/cifs/smb2proto.h | 5 +- + fs/cifs/smb2transport.c | 4 - + fs/cifs/transport.c | 4 - + 21 files changed, 340 insertions(+), 1288 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/dir.c | 11 +++++++++++ + fs/configfs/item.c | 24 ++++-------------------- + fs/configfs/symlink.c | 2 +- + 3 files changed, 16 insertions(+), 21 deletions(-) +Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/inode.c | 2 +- + fs/ext2/super.c | 7 +-- + fs/notify/fanotify/fanotify_user.c | 99 +++++++++++++---------------------- + fs/notify/fdinfo.c | 8 +-- + fs/notify/fsnotify.h | 16 +++++- + fs/notify/inotify/inotify_user.c | 9 +++- + fs/notify/mark.c | 103 ++++++++++++++++++++----------------- + fs/udf/ialloc.c | 2 +- + fs/udf/inode.c | 45 ++++++---------- + fs/udf/super.c | 8 +-- + fs/udf/udf_i.h | 2 +- + fs/udf/udf_sb.h | 2 +- + fs/udf/udfdecl.h | 4 +- + fs/udf/udftime.c | 6 +-- + include/linux/fsnotify_backend.h | 40 +++++++++----- + include/linux/inotify.h | 2 +- + include/uapi/linux/inotify.h | 1 + + kernel/audit_tree.c | 17 +++--- + 18 files changed, 190 insertions(+), 183 deletions(-) +Merging ext4/dev (362eca70b533 ext4: fix inline data updates with checksums enabled) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/inline.c | 19 +++++++++++-------- + fs/ext4/inode.c | 16 +++++++--------- + fs/ext4/mmp.c | 7 ++----- + fs/ext4/super.c | 7 ++++--- + 4 files changed, 24 insertions(+), 25 deletions(-) +Merging f2fs/dev (ea1ac43174f9 f2fs: avoid potential deadlock in f2fs_sbi_store) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 29 ++++++++++++++--------------- + fs/f2fs/data.c | 31 +++++++++++++++++++------------ + fs/f2fs/f2fs.h | 11 +++++++++-- + fs/f2fs/file.c | 10 +++++++++- + fs/f2fs/gc.c | 4 +--- + fs/f2fs/inode.c | 3 +++ + fs/f2fs/node.c | 10 +++++++++- + fs/f2fs/segment.c | 21 +++++++++++---------- + fs/f2fs/super.c | 21 ++++++++++++++------- + fs/f2fs/sysfs.c | 6 ++++-- + 10 files changed, 93 insertions(+), 53 deletions(-) +Merging fuse/for-next (8139306548ab fuse: convert last timespec use to timespec64) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 10 ++++++---- + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 4 ++-- + fs/fuse/inode.c | 22 ++++++++++++++-------- + 4 files changed, 23 insertions(+), 15 deletions(-) +Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_incore.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (7b0df92ac121 pNFS/flexfiles: Process writeback resends from nfsiod context as well) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging net/sunrpc/xprtrdma/fmr_ops.c +Merge made by the 'recursive' strategy. +Merging nfsd/nfsd-next (32620db998a5 NFSD stop ongoing async copies on client shutdown) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/netns.h | 9 ++ + fs/nfsd/nfs4callback.c | 98 ++++++++++++++++ + fs/nfsd/nfs4layouts.c | 11 +- + fs/nfsd/nfs4proc.c | 309 +++++++++++++++++++++++++++++++++++++++++++++---- + fs/nfsd/nfs4state.c | 89 ++++++++++++-- + fs/nfsd/nfs4xdr.c | 89 ++++++++++++-- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 1 + + fs/nfsd/nfssvc.c | 6 + + fs/nfsd/state.h | 10 ++ + fs/nfsd/xdr4.h | 29 +++++ + fs/nfsd/xdr4cb.h | 10 ++ + include/linux/nfs4.h | 8 ++ + 13 files changed, 622 insertions(+), 53 deletions(-) +Merging orangefs/for-next (4fb7d986e27e orangefs: Adding new return type vm_fault_t) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/file.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) +Merging overlayfs/overlayfs-next (5ab72f7d021f ovl: Enable metadata only feature) +$ git merge overlayfs/overlayfs-next +Auto-merging security/smack/smack_lsm.c +Auto-merging net/socket.c +Auto-merging include/linux/fs.h +Auto-merging fs/pipe.c +Auto-merging fs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/aio.c +Auto-merging drivers/misc/cxl/api.c +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 3 +- + Documentation/filesystems/overlayfs.txt | 90 ++++-- + Documentation/filesystems/vfs.txt | 16 +- + drivers/gpu/drm/drm_lease.c | 2 +- + drivers/misc/cxl/api.c | 3 +- + drivers/scsi/cxlflash/ocxl_hw.c | 3 +- + fs/aio.c | 8 +- + fs/anon_inodes.c | 3 +- + fs/binfmt_misc.c | 2 +- + fs/btrfs/ctree.h | 5 +- + fs/btrfs/ioctl.c | 11 +- + fs/file_table.c | 107 ++++--- + fs/hugetlbfs/inode.c | 3 +- + fs/inode.c | 46 +-- + fs/internal.h | 16 +- + fs/ioctl.c | 1 + + fs/locks.c | 20 +- + fs/namei.c | 47 ++- + fs/namespace.c | 69 +---- + fs/ocfs2/file.c | 17 +- + fs/open.c | 116 +++----- + fs/overlayfs/Kconfig | 19 ++ + fs/overlayfs/Makefile | 4 +- + fs/overlayfs/copy_up.c | 190 ++++++++---- + fs/overlayfs/dir.c | 105 +++++-- + fs/overlayfs/export.c | 3 + + fs/overlayfs/file.c | 511 ++++++++++++++++++++++++++++++++ + fs/overlayfs/inode.c | 175 +++++++---- + fs/overlayfs/namei.c | 195 +++++++----- + fs/overlayfs/overlayfs.h | 47 ++- + fs/overlayfs/ovl_entry.h | 6 +- + fs/overlayfs/readdir.c | 19 +- + fs/overlayfs/super.c | 103 ++++--- + fs/overlayfs/util.c | 252 +++++++++++++++- + fs/pipe.c | 15 +- + fs/read_write.c | 94 +++--- + fs/xattr.c | 9 +- + fs/xfs/xfs_file.c | 29 +- + include/linux/dcache.h | 15 +- + include/linux/file.h | 3 +- + include/linux/fs.h | 36 ++- + include/linux/fsnotify.h | 14 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/security.h | 5 +- + ipc/shm.c | 8 +- + mm/memfd.c | 2 +- + mm/shmem.c | 3 +- + net/socket.c | 3 +- + security/apparmor/lsm.c | 4 +- + security/security.c | 4 +- + security/selinux/hooks.c | 4 +- + security/smack/smack_lsm.c | 6 +- + security/tomoyo/tomoyo.c | 2 +- + 53 files changed, 1724 insertions(+), 751 deletions(-) + create mode 100644 fs/overlayfs/file.c +Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (74622fbdedde net/9p/trans_virtio.c: fix some spell mistakes in comments) +$ git merge v9fs/9p-next +Removing net/9p/util.c +Merge made by the 'recursive' strategy. + fs/9p/v9fs.c | 2 +- + fs/9p/vfs_file.c | 2 +- + include/net/9p/9p.h | 8 -- + include/net/9p/client.h | 62 ++-------- + net/9p/Makefile | 1 - + net/9p/client.c | 322 +++++++++++++++++------------------------------- + net/9p/mod.c | 7 +- + net/9p/protocol.c | 2 +- + net/9p/trans_virtio.c | 16 ++- + net/9p/util.c | 141 --------------------- + 10 files changed, 148 insertions(+), 415 deletions(-) + delete mode 100644 net/9p/util.c +Merging xfs/for-next (efe803277364 xfs: Initialize variables in xfs_alloc_get_rec before using them) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + fs/buffer.c | 76 +-- + fs/internal.h | 2 + + fs/iomap.c | 770 ++++++++++++++++++++++++++--- + fs/xfs/libxfs/xfs_alloc.c | 29 +- + fs/xfs/libxfs/xfs_alloc.h | 1 - + fs/xfs/libxfs/xfs_attr.c | 117 +++-- + fs/xfs/libxfs/xfs_attr_leaf.c | 26 +- + fs/xfs/libxfs/xfs_attr_remote.c | 25 +- + fs/xfs/libxfs/xfs_bmap.c | 297 ++++------- + fs/xfs/libxfs/xfs_bmap.h | 23 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 20 +- + fs/xfs/libxfs/xfs_btree.h | 3 - + fs/xfs/libxfs/xfs_da_btree.c | 22 +- + fs/xfs/libxfs/xfs_da_btree.h | 2 - + fs/xfs/libxfs/xfs_defer.c | 22 +- + fs/xfs/libxfs/xfs_defer.h | 2 +- + fs/xfs/libxfs/xfs_dir2.c | 76 ++- + fs/xfs/libxfs/xfs_dir2.h | 9 +- + fs/xfs/libxfs/xfs_ialloc.c | 6 +- + fs/xfs/libxfs/xfs_ialloc.h | 1 - + fs/xfs/libxfs/xfs_refcount.c | 14 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 8 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 4 +- + fs/xfs/scrub/common.c | 2 +- + fs/xfs/xfs_aops.c | 979 +++++++++---------------------------- + fs/xfs/xfs_aops.h | 4 +- + fs/xfs/xfs_bmap_item.c | 8 + + fs/xfs/xfs_bmap_util.c | 79 ++- + fs/xfs/xfs_buf.c | 192 +++----- + fs/xfs/xfs_buf.h | 11 +- + fs/xfs/xfs_dquot.c | 34 +- + fs/xfs/xfs_file.c | 3 +- + fs/xfs/xfs_filestream.c | 3 +- + fs/xfs/xfs_fsmap.c | 2 +- + fs/xfs/xfs_inode.c | 92 ++-- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_iomap.c | 42 +- + fs/xfs/xfs_log_recover.c | 7 +- + fs/xfs/xfs_refcount_item.c | 8 + + fs/xfs/xfs_reflink.c | 141 ++---- + fs/xfs/xfs_reflink.h | 4 - + fs/xfs/xfs_rtalloc.c | 11 +- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_symlink.c | 26 +- + fs/xfs/xfs_trace.h | 23 +- + fs/xfs/xfs_trans.c | 8 +- + fs/xfs/xfs_trans.h | 3 +- + include/linux/iomap.h | 47 ++ + 48 files changed, 1605 insertions(+), 1684 deletions(-) +Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging vfs/for-next (f6756d7df991 Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging net/socket.c +Auto-merging kernel/trace/trace.c +Auto-merging init/Kconfig +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/udf/super.c +Auto-merging fs/statfs.c +Auto-merging fs/pipe.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/open.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/file_table.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/autofs/init.c +Auto-merging fs/aio.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/misc/ibmasm/ibmasmfs.c +Auto-merging drivers/misc/cxl/api.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/dax/super.c +Auto-merging arch/s390/hypfs/inode.c +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Resolved 'include/linux/fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d9b88a967e1c] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/index.rst | 33 ++ + Documentation/filesystems/mount_api.txt | 439 +++++++++++++++ + Documentation/filesystems/porting | 20 + + Documentation/filesystems/vfs.txt | 18 +- + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/ia64/kernel/perfmon.c | 3 +- + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/s390/hypfs/inode.c | 7 +- + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 6 + + arch/x86/entry/syscalls/syscall_64.tbl | 6 + + arch/x86/kernel/cpu/intel_rdt.h | 24 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 151 ++--- + arch/x86/kernel/setup.c | 1 + + drivers/base/devtmpfs.c | 7 +- + drivers/dax/super.c | 2 +- + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/i915/i915_gemfs.c | 2 +- + drivers/infiniband/hw/qib/qib_fs.c | 7 +- + drivers/misc/cxl/api.c | 24 +- + drivers/misc/ibmasm/ibmasmfs.c | 11 +- + drivers/mtd/mtdsuper.c | 26 +- + drivers/oprofile/oprofilefs.c | 8 +- + drivers/scsi/cxlflash/ocxl_hw.c | 25 +- + drivers/usb/gadget/function/f_fs.c | 7 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/xenfs/super.c | 7 +- + fs/9p/vfs_inode.c | 7 +- + fs/9p/vfs_inode_dotl.c | 7 +- + fs/9p/vfs_super.c | 2 +- + fs/Makefile | 5 +- + fs/adfs/super.c | 9 +- + fs/affs/super.c | 13 +- + fs/afs/internal.h | 9 +- + fs/afs/mntpt.c | 147 ++--- + fs/afs/super.c | 536 +++++++++++------- + fs/afs/volume.c | 4 +- + fs/aio.c | 23 +- + fs/anon_inodes.c | 32 +- + fs/attr.c | 5 +- + fs/autofs/autofs_i.h | 2 +- + fs/autofs/init.c | 4 +- + fs/autofs/inode.c | 3 +- + fs/bad_inode.c | 2 +- + fs/befs/linuxvfs.c | 11 +- + fs/bfs/inode.c | 8 +- + fs/binfmt_misc.c | 7 +- + fs/block_dev.c | 2 +- + fs/btrfs/super.c | 30 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/ceph/file.c | 7 +- + fs/ceph/super.c | 3 +- + fs/ceph/super.h | 3 +- + fs/cifs/cifs_dfs_ref.c | 3 +- + fs/cifs/cifsfs.c | 18 +- + fs/cifs/cifsfs.h | 3 +- + fs/cifs/dir.c | 7 +- + fs/coda/inode.c | 11 +- + fs/configfs/mount.c | 7 +- + fs/cramfs/inode.c | 17 +- + fs/dcache.c | 27 - + fs/debugfs/inode.c | 14 +- + fs/devpts/inode.c | 10 +- + fs/ecryptfs/main.c | 2 +- + fs/efivarfs/super.c | 9 +- + fs/efs/super.c | 14 +- + fs/exofs/super.c | 7 +- + fs/ext2/super.c | 14 +- + fs/ext4/super.c | 16 +- + fs/f2fs/super.c | 13 +- + fs/fat/inode.c | 3 +- + fs/fat/namei_msdos.c | 8 +- + fs/fat/namei_vfat.c | 8 +- + fs/file_table.c | 50 +- + fs/freevxfs/vxfs_super.c | 12 +- + fs/fs_context.c | 721 ++++++++++++++++++++++++ + fs/fsopen.c | 335 ++++++++++++ + fs/fuse/control.c | 9 +- + fs/fuse/dir.c | 10 +- + fs/fuse/inode.c | 16 +- + fs/gfs2/inode.c | 32 +- + fs/gfs2/ops_fstype.c | 6 +- + fs/gfs2/super.c | 4 +- + fs/hfs/super.c | 12 +- + fs/hfsplus/super.c | 12 +- + fs/hostfs/hostfs_kern.c | 7 +- + fs/hpfs/super.c | 11 +- + fs/hugetlbfs/inode.c | 392 +++++++------ + fs/internal.h | 6 +- + fs/isofs/inode.c | 11 +- + fs/jffs2/super.c | 10 +- + fs/jfs/super.c | 11 +- + fs/kernfs/mount.c | 88 ++- + fs/libfs.c | 19 +- + fs/minix/inode.c | 14 +- + fs/namei.c | 222 +++----- + fs/namespace.c | 877 ++++++++++++++++++++++-------- + fs/nfs/dir.c | 14 +- + fs/nfs/internal.h | 4 +- + fs/nfs/namespace.c | 3 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4namespace.c | 3 +- + fs/nfs/nfs4proc.c | 2 +- + fs/nfs/nfs4super.c | 27 +- + fs/nfs/super.c | 22 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/super.c | 10 +- + fs/nsfs.c | 3 +- + fs/ntfs/super.c | 13 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 +- + fs/ocfs2/super.c | 14 +- + fs/omfs/inode.c | 9 +- + fs/open.c | 16 +- + fs/openpromfs/inode.c | 11 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/super.c | 5 +- + fs/overlayfs/super.c | 11 +- + fs/pipe.c | 39 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 50 +- + fs/proc/internal.h | 6 +- + fs/proc/root.c | 212 ++++++-- + fs/pstore/inode.c | 10 +- + fs/qnx4/inode.c | 14 +- + fs/qnx6/inode.c | 14 +- + fs/ramfs/inode.c | 6 +- + fs/reiserfs/super.c | 14 +- + fs/romfs/super.c | 13 +- + fs/squashfs/super.c | 12 +- + fs/statfs.c | 470 ++++++++++++++++ + fs/super.c | 394 +++++++++++--- + fs/sysfs/mount.c | 67 ++- + fs/sysv/inode.c | 3 +- + fs/sysv/super.c | 16 +- + fs/tracefs/inode.c | 10 +- + fs/ubifs/super.c | 5 +- + fs/udf/super.c | 16 +- + fs/ufs/super.c | 11 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/cgroup.h | 3 +- + include/linux/dcache.h | 2 - + include/linux/debugfs.h | 8 +- + include/linux/file.h | 7 +- + include/linux/fs.h | 64 ++- + include/linux/fs_context.h | 178 ++++++ + include/linux/fsinfo.h | 40 ++ + include/linux/ima.h | 4 +- + include/linux/kernfs.h | 39 +- + include/linux/lsm_hooks.h | 88 ++- + include/linux/module.h | 6 + + include/linux/mount.h | 10 +- + include/linux/mtd/super.h | 4 +- + include/linux/ramfs.h | 4 +- + include/linux/security.h | 74 ++- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 11 + + include/uapi/linux/fcntl.h | 2 + + include/uapi/linux/fs.h | 68 +-- + include/uapi/linux/fsinfo.h | 237 ++++++++ + include/uapi/linux/mount.h | 75 +++ + init/Kconfig | 10 - + init/do_mounts.c | 5 +- + init/do_mounts_initrd.c | 1 + + ipc/mqueue.c | 120 +++- + ipc/shm.c | 39 +- + kernel/bpf/inode.c | 7 +- + kernel/cgroup/cgroup-internal.h | 49 +- + kernel/cgroup/cgroup-v1.c | 302 +++++----- + kernel/cgroup/cgroup.c | 226 ++++---- + kernel/cgroup/cpuset.c | 67 ++- + kernel/trace/trace.c | 7 +- + mm/shmem.c | 58 +- + mm/zsmalloc.c | 3 +- + net/socket.c | 31 +- + net/sunrpc/rpc_pipe.c | 7 +- + samples/statx/Makefile | 5 +- + samples/statx/test-fsinfo.c | 539 ++++++++++++++++++ + security/apparmor/apparmorfs.c | 8 +- + security/apparmor/include/mount.h | 11 +- + security/apparmor/lsm.c | 84 ++- + security/apparmor/mount.c | 47 ++ + security/inode.c | 7 +- + security/integrity/ima/ima.h | 4 +- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_main.c | 16 +- + security/security.c | 70 ++- + security/selinux/hooks.c | 294 +++++++++- + security/selinux/selinuxfs.c | 8 +- + security/smack/smack_lsm.c | 344 ++++++++++-- + security/smack/smackfs.c | 9 +- + security/tomoyo/common.h | 3 + + security/tomoyo/mount.c | 46 ++ + security/tomoyo/tomoyo.c | 19 +- + 199 files changed, 7501 insertions(+), 2295 deletions(-) + create mode 100644 Documentation/filesystems/mount_api.txt + create mode 100644 fs/fs_context.c + create mode 100644 fs/fsopen.c + create mode 100644 include/linux/fs_context.h + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 include/uapi/linux/mount.h + create mode 100644 samples/statx/test-fsinfo.c +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (7973c51853f8 Merge branch 'for-4.19-nmi' into for-next) +$ git merge printk/for-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace.c +Merge made by the 'recursive' strategy. + include/linux/printk.h | 10 ++- + kernel/printk/internal.h | 9 ++- + kernel/printk/printk.c | 181 ++++++++++++++++++++++++-------------------- + kernel/printk/printk_safe.c | 58 +++++++++----- + kernel/trace/trace.c | 4 +- + lib/Kconfig.debug | 11 +++ + lib/nmi_backtrace.c | 3 - + lib/test_printf.c | 24 +++++- + 8 files changed, 188 insertions(+), 112 deletions(-) +Merging pci/next (b3dd889f1a82 Merge branch 'remotes/lorenzo/pci/vmd') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/of.c +Auto-merging drivers/pci/iov.c +Removing drivers/pci/hotplug/pcihp_skeleton.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/pci/controller/pci-aardvark.c +CONFLICT (content): Merge conflict in drivers/pci/controller/pci-aardvark.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'drivers/pci/controller/pci-aardvark.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/controller/pci-aardvark.c'. +[master 70a4ecea5d7c] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-devices-aer_stats | 122 ++++++++ + .../PCI/endpoint/function/binding/pci-test.txt | 2 + + Documentation/PCI/endpoint/pci-endpoint.txt | 4 +- + Documentation/PCI/endpoint/pci-test-function.txt | 29 +- + Documentation/PCI/endpoint/pci-test-howto.txt | 30 +- + Documentation/PCI/pcieaer-howto.txt | 5 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.txt | 5 + + .../bindings/pci/cdns,cdns-pcie-host.txt | 6 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/misc-devices/pci-endpoint-test.txt | 6 + + arch/x86/include/asm/pci-direct.h | 4 - + arch/x86/kernel/setup.c | 5 - + arch/x86/pci/common.c | 4 - + arch/x86/pci/early.c | 44 --- + drivers/misc/pci_endpoint_test.c | 290 +++++++++++++---- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 3 +- + drivers/pci/ats.c | 3 + + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-exynos.c | 1 - + drivers/pci/controller/dwc/pci-imx6.c | 1 - + drivers/pci/controller/dwc/pci-keystone.c | 1 - + drivers/pci/controller/dwc/pcie-armada8k.c | 1 - + drivers/pci/controller/dwc/pcie-artpec6.c | 3 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 210 +++++++++++-- + drivers/pci/controller/dwc/pcie-designware-plat.c | 12 +- + drivers/pci/controller/dwc/pcie-designware.h | 29 +- + drivers/pci/controller/dwc/pcie-histb.c | 1 - + drivers/pci/controller/dwc/pcie-kirin.c | 28 ++ + drivers/pci/controller/dwc/pcie-qcom.c | 1 - + drivers/pci/controller/dwc/pcie-spear13xx.c | 1 - + drivers/pci/controller/pci-aardvark.c | 79 +---- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/pci/controller/pcie-cadence-ep.c | 21 +- + drivers/pci/controller/pcie-cadence-host.c | 33 ++ + drivers/pci/controller/pcie-cadence.c | 123 ++++++++ + drivers/pci/controller/pcie-cadence.h | 13 +- + drivers/pci/controller/pcie-iproc.c | 159 ++++++++-- + drivers/pci/controller/pcie-iproc.h | 8 + + drivers/pci/controller/pcie-rockchip-ep.c | 2 +- + drivers/pci/controller/vmd.c | 13 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 86 +++-- + drivers/pci/endpoint/pci-ep-cfs.c | 24 ++ + drivers/pci/endpoint/pci-epc-core.c | 68 +++- + drivers/pci/hotplug/acpi_pcihp.c | 36 ++- + drivers/pci/hotplug/pciehp_ctrl.c | 2 + + drivers/pci/hotplug/pcihp_skeleton.c | 348 --------------------- + drivers/pci/hotplug/shpchp_core.c | 21 ++ + drivers/pci/hotplug/shpchp_ctrl.c | 2 + + drivers/pci/iov.c | 4 +- + drivers/pci/of.c | 14 +- + drivers/pci/pci-acpi.c | 29 -- + drivers/pci/pci-sysfs.c | 3 + + drivers/pci/pci.c | 53 +++- + drivers/pci/pci.h | 52 ++- + drivers/pci/pcie/Kconfig | 8 - + drivers/pci/pcie/aer.c | 278 +++++++++++++--- + drivers/pci/pcie/aspm.c | 10 +- + drivers/pci/pcie/dpc.c | 107 +++---- + drivers/pci/probe.c | 64 +++- + drivers/pci/quirks.c | 199 ++++++++++++ + drivers/pci/rom.c | 11 +- + drivers/pci/switch/switchtec.c | 14 +- + include/linux/pci-epc.h | 16 +- + include/linux/pci-epf.h | 1 + + include/linux/pci.h | 8 +- + include/linux/pci_hotplug.h | 20 +- + include/linux/pci_ids.h | 1 + + include/linux/switchtec.h | 4 - + include/uapi/linux/pci_regs.h | 4 +- + include/uapi/linux/pcitest.h | 3 + + tools/pci/pcitest.c | 51 ++- + tools/pci/pcitest.sh | 15 + + 73 files changed, 1973 insertions(+), 892 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats + delete mode 100644 drivers/pci/hotplug/pcihp_skeleton.c +Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (57194b035942 Merge branch 'for-4.19/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 3 +- + Documentation/input/multi-touch-protocol.rst | 12 +- + drivers/hid/hid-core.c | 17 +- + drivers/hid/hid-elan.c | 235 +++-- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 3 + + drivers/hid/hid-microsoft.c | 49 +- + drivers/hid/hid-multitouch.c | 989 +++++++++++++-------- + drivers/hid/hid-ntrig.c | 2 + + drivers/hid/hid-redragon.c | 26 +- + drivers/hid/hid-sony.c | 164 +--- + drivers/hid/hid-wiimote-core.c | 14 + + drivers/hid/hid-wiimote-modules.c | 440 +++++++++ + drivers/hid/hid-wiimote.h | 3 + + drivers/hid/i2c-hid/i2c-hid.c | 57 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 2 - + drivers/hid/usbhid/hid-core.c | 7 +- + drivers/hid/wacom_sys.c | 105 ++- + drivers/hid/wacom_wac.c | 20 +- + include/linux/hid.h | 15 +- + include/linux/platform_data/i2c-hid.h | 7 +- + include/uapi/linux/input.h | 9 +- + 22 files changed, 1453 insertions(+), 728 deletions(-) +Merging i2c/i2c/for-next (cf124845db96 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/i2c/busses/i2c-i801 | 11 +- + Documentation/i2c/gpio-fault-injection | 49 ++++++-- + drivers/char/tpm/tpm_i2c_infineon.c | 8 +- + drivers/i2c/busses/Kconfig | 11 +- + drivers/i2c/busses/i2c-brcmstb.c | 8 +- + drivers/i2c/busses/i2c-davinci.c | 4 +- + drivers/i2c/busses/i2c-designware-common.c | 76 ++++++++++++ + drivers/i2c/busses/i2c-designware-core.h | 2 + + drivers/i2c/busses/i2c-designware-master.c | 191 +++++++++++++++++------------ + drivers/i2c/busses/i2c-designware-slave.c | 47 ++----- + drivers/i2c/busses/i2c-gpio.c | 97 ++++++++++----- + drivers/i2c/busses/i2c-i801.c | 4 + + drivers/i2c/busses/i2c-s3c2410.c | 4 +- + drivers/i2c/busses/i2c-sprd.c | 8 +- + drivers/i2c/busses/i2c-tegra.c | 90 +++++++++++--- + drivers/i2c/i2c-core-slave.c | 8 +- + drivers/i2c/i2c-core-smbus.c | 28 +++-- + drivers/i2c/i2c-mux.c | 4 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 28 +---- + drivers/i2c/muxes/i2c-mux-pca9541.c | 75 +++-------- + drivers/i2c/muxes/i2c-mux-pca954x.c | 27 +--- + drivers/iio/temperature/mlx90614.c | 4 +- + drivers/input/touchscreen/rohm_bu21023.c | 4 +- + drivers/media/dvb-frontends/af9013.c | 8 +- + drivers/media/dvb-frontends/drxk_hard.c | 4 +- + drivers/media/dvb-frontends/rtl2830.c | 12 +- + drivers/media/dvb-frontends/tda1004x.c | 6 +- + drivers/media/tuners/tda18271-common.c | 8 +- + drivers/mfd/88pm860x-i2c.c | 8 +- + include/linux/i2c.h | 23 ++-- + 30 files changed, 486 insertions(+), 371 deletions(-) +Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string) +$ git merge dmi/master +Auto-merging include/linux/mod_devicetable.h +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (f1fd4a4db777 hwmon: Add NPCM7xx PWM and Fan driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/npcm750-pwm-fan.txt | 84 ++ + Documentation/hwmon/max34440 | 16 +- + Documentation/hwmon/mlxreg-fan | 60 ++ + Documentation/hwmon/npcm750-pwm-fan | 22 + + Documentation/hwmon/sysfs-interface | 48 + + drivers/hwmon/Kconfig | 22 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/emc1403.c | 2 + + drivers/hwmon/mlxreg-fan.c | 489 +++++++++ + drivers/hwmon/nct6775.c | 6 +- + drivers/hwmon/nct7904.c | 68 +- + drivers/hwmon/npcm750-pwm-fan.c | 1057 ++++++++++++++++++++ + drivers/hwmon/pmbus/Kconfig | 2 +- + drivers/hwmon/pmbus/max34440.c | 93 +- + 14 files changed, 1926 insertions(+), 45 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt + create mode 100644 Documentation/hwmon/mlxreg-fan + create mode 100644 Documentation/hwmon/npcm750-pwm-fan + create mode 100644 drivers/hwmon/mlxreg-fan.c + create mode 100644 drivers/hwmon/npcm750-pwm-fan.c +Merging jc_docs/docs-next (6b4c1360e8ad Documentation: Add powerpc options for spec_store_bypass_disable) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/README.rst | 2 + + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/core-api/idr.rst | 2 + + Documentation/dev-tools/kselftest.rst | 5 + + Documentation/devicetree/bindings/leds/common.txt | 2 +- + Documentation/doc-guide/kernel-doc.rst | 9 +- + Documentation/doc-guide/parse-headers.rst | 4 +- + Documentation/doc-guide/sphinx.rst | 2 +- + Documentation/filesystems/relay.txt | 4 +- + Documentation/index.rst | 26 +- + Documentation/kernel-hacking/index.rst | 2 + + Documentation/nommu-mmap.txt | 2 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/howto.rst | 2 +- + Documentation/sphinx/kerneldoc.py | 10 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/sysctl/vm.txt | 13 + + Documentation/trace/events.rst | 2 +- + .../trace/{histogram.txt => histogram.rst} | 1250 ++++++++++---------- + Documentation/trace/index.rst | 1 + + Documentation/translations/index.rst | 13 + + .../translations/it_IT/disclaimer-ita.rst | 13 + + .../translations/it_IT/doc-guide/index.rst | 24 + + .../translations/it_IT/doc-guide/kernel-doc.rst | 554 +++++++++ + .../translations/it_IT/doc-guide/parse-headers.rst | 196 +++ + .../translations/it_IT/doc-guide/sphinx.rst | 457 +++++++ + Documentation/translations/it_IT/index.rst | 117 ++ + Documentation/translations/zh_CN/oops-tracing.txt | 4 +- + MAINTAINERS | 8 +- + include/linux/gpio.h | 2 +- + kernel/trace/Kconfig | 2 +- + lib/reed_solomon/reed_solomon.c | 2 +- + scripts/documentation-file-ref-check | 6 + + 33 files changed, 2089 insertions(+), 667 deletions(-) + rename Documentation/trace/{histogram.txt => histogram.rst} (73%) + create mode 100644 Documentation/translations/index.rst + create mode 100644 Documentation/translations/it_IT/disclaimer-ita.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/index.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/kernel-doc.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/parse-headers.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/sphinx.rst + create mode 100644 Documentation/translations/it_IT/index.rst +Merging v4l-dvb/master (39fbb88165b2 media: bpf: ensure bpf program is freed on detach) +$ git merge v4l-dvb/master +Auto-merging drivers/media/rc/bpf-lirc.c +Removing drivers/media/pci/cx25821/cx25821-video-upstream.h +Removing drivers/media/pci/cx25821/cx25821-video-upstream.c +Removing drivers/media/pci/cx25821/cx25821-audio-upstream.h +Removing drivers/media/pci/cx25821/cx25821-audio-upstream.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/ak7375.txt | 8 + + .../bindings/media/i2c/dongwoon,dw9807.txt | 9 + + .../devicetree/bindings/media/i2c/nokia,smia.txt | 3 + + .../devicetree/bindings/media/i2c/ov5640.txt | 5 + + .../devicetree/bindings/media/nvidia,tegra-vde.txt | 11 +- + .../devicetree/bindings/media/rcar_vin.txt | 25 +- + .../devicetree/bindings/media/video-interfaces.txt | 4 + + .../media/uapi/mediactl/media-ioc-device-info.rst | 48 +- + .../uapi/mediactl/media-ioc-enum-entities.rst | 83 +- + .../media/uapi/mediactl/media-ioc-enum-links.rst | 70 +- + .../media/uapi/mediactl/media-ioc-g-topology.rst | 204 +-- + Documentation/media/uapi/mediactl/media-types.rst | 499 ++----- + Documentation/media/uapi/v4l/extended-controls.rst | 48 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 15 +- + MAINTAINERS | 26 + + arch/sh/boards/mach-ap325rxa/setup.c | 282 ++-- + arch/sh/boards/mach-kfr2r09/setup.c | 217 ++- + arch/sh/boards/mach-migor/setup.c | 7 +- + arch/sh/boards/mach-se/7724/setup.c | 120 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 18 +- + drivers/media/i2c/Kconfig | 31 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv748x/adv748x-csi2.c | 2 +- + drivers/media/i2c/adv7604.c | 7 +- + drivers/media/i2c/ak7375.c | 292 ++++ + drivers/media/i2c/cx25840/cx25840-core.h | 33 +- + drivers/media/i2c/dw9807.c | 329 +++++ + drivers/media/i2c/imx258.c | 8 + + drivers/media/i2c/imx274.c | 194 ++- + drivers/media/i2c/lm3560.c | 3 +- + drivers/media/i2c/ov5640.c | 163 ++- + drivers/media/i2c/ov772x.c | 353 +++-- + drivers/media/i2c/rj54n1cb0c.c | 1437 ++++++++++++++++++++ + drivers/media/i2c/smiapp/smiapp-core.c | 16 + + drivers/media/i2c/soc_camera/ov772x.c | 2 +- + drivers/media/i2c/tc358743.c | 5 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/media-device.c | 13 +- + drivers/media/pci/bt8xx/bttv-driver.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 - + drivers/media/pci/cx25821/cx25821-audio-upstream.c | 679 --------- + drivers/media/pci/cx25821/cx25821-audio-upstream.h | 58 - + drivers/media/pci/cx25821/cx25821-video-upstream.c | 673 --------- + drivers/media/pci/cx25821/cx25821-video-upstream.h | 135 -- + drivers/media/pci/cx25821/cx25821.h | 12 - + drivers/media/pci/cx88/cx88-alsa.c | 7 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 1 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 6 + + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/atmel/atmel-isi.c | 27 +- + drivers/media/platform/cadence/Kconfig | 2 + + drivers/media/platform/cadence/cdns-csi2rx.c | 1 + + drivers/media/platform/cadence/cdns-csi2tx.c | 1 + + drivers/media/platform/coda/coda-bit.c | 38 +- + drivers/media/platform/coda/coda-common.c | 144 +- + drivers/media/platform/coda/coda.h | 2 + + drivers/media/platform/coda/coda_regs.h | 1 + + drivers/media/platform/exynos4-is/fimc-isp-video.c | 11 +- + drivers/media/platform/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 6 +- + drivers/media/platform/fsl-viu.c | 38 +- + drivers/media/platform/m2m-deinterlace.c | 25 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 20 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 23 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 16 - + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/media/platform/mx2_emmaprp.c | 21 +- + drivers/media/platform/omap/Kconfig | 1 + + drivers/media/platform/omap3isp/isp.c | 6 +- + drivers/media/platform/qcom/venus/vdec.c | 2 - + drivers/media/platform/qcom/venus/vdec_ctrls.c | 10 +- + drivers/media/platform/qcom/venus/venc.c | 6 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 10 +- + drivers/media/platform/rcar-vin/rcar-core.c | 313 +++-- + drivers/media/platform/rcar-vin/rcar-dma.c | 52 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 12 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 31 +- + drivers/media/platform/rcar_jpu.c | 6 - + drivers/media/platform/renesas-ceu.c | 91 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 45 +- + drivers/media/platform/rockchip/rga/rga.c | 14 +- + drivers/media/platform/rockchip/rga/rga.h | 2 - + drivers/media/platform/s3c-camif/camif-capture.c | 2 + + drivers/media/platform/s5p-g2d/g2d.c | 3 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 15 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 18 - + drivers/media/platform/stm32/stm32-dcmi.c | 259 ++-- + drivers/media/platform/ti-vpe/vpe.c | 20 - + drivers/media/platform/vim2m.c | 42 +- + drivers/media/platform/vivid/vivid-ctrls.c | 2 +- + drivers/media/rc/bpf-lirc.c | 1 + + drivers/media/tuners/tuner-simple.c | 5 +- + drivers/media/usb/cx231xx/Kconfig | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/tm6000/tm6000-dvb.c | 5 + + drivers/media/v4l2-core/v4l2-ctrls.c | 38 +- + drivers/media/v4l2-core/v4l2-dev.c | 16 +- + drivers/media/v4l2-core/v4l2-device.c | 3 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 122 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 191 ++- + drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 6 +- + drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 5 + + drivers/staging/media/imx/imx-media-capture.c | 38 +- + drivers/staging/media/imx/imx-media-csi.c | 112 +- + drivers/staging/media/imx/imx-media-utils.c | 1 + + drivers/staging/media/imx/imx-media.h | 2 + + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 24 +- + include/media/i2c/lm3560.h | 1 + + include/media/v4l2-common.h | 2 +- + include/media/v4l2-ioctl.h | 15 +- + include/media/v4l2-mem2mem.h | 25 +- + include/uapi/linux/media.h | 2 +- + include/uapi/linux/v4l2-controls.h | 20 +- + 117 files changed, 4553 insertions(+), 3615 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ak7375.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807.txt + create mode 100644 drivers/media/i2c/ak7375.c + create mode 100644 drivers/media/i2c/dw9807.c + create mode 100644 drivers/media/i2c/rj54n1cb0c.c + delete mode 100644 drivers/media/pci/cx25821/cx25821-audio-upstream.c + delete mode 100644 drivers/media/pci/cx25821/cx25821-audio-upstream.h + delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream.c + delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream.h +Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (34db50e55656 efifb: Copy the ACPI BGRT boot graphics to the framebuffer) +$ git merge fbdev/fbdev-for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + Documentation/fb/fbcon.txt | 7 ++ + drivers/firmware/efi/efi-bgrt.c | 2 +- + drivers/video/console/Kconfig | 11 ++ + drivers/video/console/dummycon.c | 69 ++++++++-- + drivers/video/fbdev/core/fbcon.c | 83 ++++++++++++ + drivers/video/fbdev/efifb.c | 140 +++++++++++++++++++++ + drivers/video/fbdev/goldfishfb.c | 14 ++- + .../omap2/omapfb/displays/encoder-tpd12s015.c | 12 +- + drivers/video/fbdev/simplefb.c | 2 +- + include/linux/console.h | 5 + + kernel/printk/printk.c | 1 + + 11 files changed, 331 insertions(+), 15 deletions(-) +Merging pm/linux-next (45414aea93b5 Merge branch 'acpi-battery' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/soc/imx/gpc.c +Auto-merging Documentation/devicetree/bindings/power/power_domain.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/marvell/armada-37xx.txt | 15 + + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 211 ++++++------ + .../devicetree/bindings/power/power_domain.txt | 8 + + Documentation/driver-api/device_link.rst | 12 +- + drivers/acpi/acpica/aclocal.h | 1 - + drivers/acpi/acpica/nsaccess.c | 7 - + drivers/acpi/acpica/nssearch.c | 1 - + drivers/acpi/battery.c | 10 +- + drivers/acpi/button.c | 17 +- + drivers/acpi/ec.c | 2 +- + drivers/acpi/sleep.c | 30 +- + drivers/acpi/x86/utils.c | 12 +- + drivers/base/core.c | 25 +- + drivers/base/power/common.c | 17 + + drivers/base/power/domain.c | 24 ++ + drivers/cpufreq/armada-37xx-cpufreq.c | 163 +++++++++- + drivers/cpufreq/cppc_cpufreq.c | 52 +++ + drivers/cpufreq/imx6q-cpufreq.c | 21 ++ + drivers/cpufreq/intel_pstate.c | 41 ++- + drivers/cpufreq/pcc-cpufreq.c | 13 + + drivers/cpufreq/qcom-cpufreq-kryo.c | 5 +- + drivers/cpuidle/cpuidle-arm.c | 3 +- + drivers/devfreq/devfreq.c | 16 +- + drivers/devfreq/event/exynos-ppmu.c | 6 +- + drivers/devfreq/rk3399_dmc.c | 102 +++--- + drivers/gpu/drm/tegra/dc.c | 2 +- + drivers/gpu/ipu-v3/ipu-pre.c | 3 +- + drivers/gpu/ipu-v3/ipu-prg.c | 3 +- + drivers/powercap/Kconfig | 10 + + drivers/powercap/Makefile | 1 + + drivers/powercap/idle_inject.c | 356 +++++++++++++++++++++ + drivers/soc/imx/gpc.c | 2 +- + drivers/thermal/imx_thermal.c | 28 +- + include/acpi/acpixf.h | 2 +- + include/dt-bindings/clock/rk3399-ddr.h | 56 ++++ + include/linux/device.h | 14 +- + include/linux/idle_inject.h | 29 ++ + include/linux/pm_domain.h | 15 + + kernel/power/swap.c | 4 +- + 39 files changed, 1080 insertions(+), 259 deletions(-) + create mode 100644 drivers/powercap/idle_inject.c + create mode 100644 include/dt-bindings/clock/rk3399-ddr.h + create mode 100644 include/linux/idle_inject.h +Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (1d32d387967c thermal: ti-soc-thermal: remove dead code) +$ git merge thermal-soc/next +Auto-merging drivers/thermal/imx_thermal.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qcom-tsens.txt | 2 + + drivers/thermal/armada_thermal.c | 81 +++-- + drivers/thermal/imx_thermal.c | 5 +- + drivers/thermal/qcom/Makefile | 2 +- + drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} | 30 +- + drivers/thermal/qcom/tsens.c | 6 + + drivers/thermal/qcom/tsens.h | 7 +- + drivers/thermal/ti-soc-thermal/dra752-bandgap.h | 68 ---- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 65 ---- + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 6 - + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 10 - + drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h | 10 - + .../thermal/ti-soc-thermal/omap5-thermal-data.c | 46 +-- + drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h | 41 --- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 370 --------------------- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 43 +-- + 16 files changed, 88 insertions(+), 704 deletions(-) + rename drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} (66%) +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (c012691508f5 IB/cm: Remove cma_multicast->igmp_joined) +$ git merge rdma/for-next +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging fs/cifs/smbdirect.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hfi1/rc.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c +Auto-merging MAINTAINERS +Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d7961c3d8754] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 15 +- + drivers/infiniband/core/addr.c | 12 +- + drivers/infiniband/core/cache.c | 724 ++++++++----- + drivers/infiniband/core/cm.c | 142 +-- + drivers/infiniband/core/cm_msgs.h | 7 - + drivers/infiniband/core/cma.c | 165 +-- + drivers/infiniband/core/device.c | 21 +- + drivers/infiniband/core/mad.c | 99 +- + drivers/infiniband/core/mad_priv.h | 7 +- + drivers/infiniband/core/multicast.c | 40 +- + drivers/infiniband/core/nldev.c | 16 +- + drivers/infiniband/core/rdma_core.c | 347 +++--- + drivers/infiniband/core/rdma_core.h | 34 +- + drivers/infiniband/core/rw.c | 4 +- + drivers/infiniband/core/sa_query.c | 138 ++- + drivers/infiniband/core/sysfs.c | 66 +- + drivers/infiniband/core/umem.c | 62 +- + drivers/infiniband/core/user_mad.c | 1 + + drivers/infiniband/core/uverbs.h | 18 +- + drivers/infiniband/core/uverbs_cmd.c | 312 +++--- + drivers/infiniband/core/uverbs_ioctl.c | 155 ++- + drivers/infiniband/core/uverbs_ioctl_merge.c | 10 +- + drivers/infiniband/core/uverbs_main.c | 53 +- + drivers/infiniband/core/uverbs_marshall.c | 2 - + drivers/infiniband/core/uverbs_std_types.c | 163 +-- + .../infiniband/core/uverbs_std_types_counters.c | 61 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 102 +- + drivers/infiniband/core/uverbs_std_types_dm.c | 48 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 144 +-- + drivers/infiniband/core/uverbs_std_types_mr.c | 62 +- + drivers/infiniband/core/verbs.c | 513 ++++++--- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 106 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 64 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 3 - + drivers/infiniband/hw/cxgb4/cq.c | 105 +- + drivers/infiniband/hw/cxgb4/ev.c | 5 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 + + drivers/infiniband/hw/cxgb4/provider.c | 3 +- + drivers/infiniband/hw/cxgb4/t4.h | 18 +- + drivers/infiniband/hw/hfi1/chip.c | 205 ++-- + drivers/infiniband/hw/hfi1/chip.h | 30 + + drivers/infiniband/hw/hfi1/driver.c | 63 +- + drivers/infiniband/hw/hfi1/file_ops.c | 10 +- + drivers/infiniband/hw/hfi1/hfi.h | 243 ++--- + drivers/infiniband/hw/hfi1/init.c | 44 +- + drivers/infiniband/hw/hfi1/pcie.c | 19 +- + drivers/infiniband/hw/hfi1/pio.c | 14 +- + drivers/infiniband/hw/hfi1/qp.c | 6 +- + drivers/infiniband/hw/hfi1/qp.h | 24 +- + drivers/infiniband/hw/hfi1/rc.c | 6 +- + drivers/infiniband/hw/hfi1/ruc.c | 14 +- + drivers/infiniband/hw/hfi1/sdma.c | 10 +- + drivers/infiniband/hw/hfi1/verbs.c | 18 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 12 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 9 - + drivers/infiniband/hw/hns/hns_roce_device.h | 15 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 406 ++++--- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 336 +++++- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 123 ++- + drivers/infiniband/hw/hns/hns_roce_main.c | 9 +- + drivers/infiniband/hw/i40iw/Kconfig | 1 + + drivers/infiniband/hw/i40iw/i40iw_cm.c | 26 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 83 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 5 +- + drivers/infiniband/hw/mlx4/ah.c | 70 +- + drivers/infiniband/hw/mlx4/mad.c | 22 +- + drivers/infiniband/hw/mlx4/main.c | 41 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx4/qp.c | 186 +++- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/ah.c | 11 +- + drivers/infiniband/hw/mlx5/cmd.c | 27 + + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/cong.c | 9 +- + drivers/infiniband/hw/mlx5/devx.c | 1109 ++++++++++++++++++++ + drivers/infiniband/hw/mlx5/main.c | 289 +++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 34 +- + drivers/infiniband/hw/mlx5/mr.c | 32 +- + drivers/infiniband/hw/mlx5/qp.c | 226 +++- + drivers/infiniband/hw/mthca/mthca_av.c | 5 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- + drivers/infiniband/hw/nes/nes.h | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 8 +- + drivers/infiniband/hw/nes/nes_hw.c | 6 +- + drivers/infiniband/hw/nes/nes_verbs.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 26 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 21 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 22 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 25 +- + drivers/infiniband/hw/qedr/verbs.c | 30 +- + drivers/infiniband/hw/qib/qib_verbs.c | 3 +- + drivers/infiniband/hw/qib/qib_verbs.h | 3 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 40 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 5 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 49 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 6 +- + drivers/infiniband/sw/rdmavt/ah.c | 4 +- + drivers/infiniband/sw/rdmavt/qp.c | 11 +- + drivers/infiniband/sw/rxe/rxe.c | 3 +- + drivers/infiniband/sw/rxe/rxe_av.c | 30 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 5 +- + drivers/infiniband/sw/rxe/rxe_net.c | 67 +- + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 31 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 15 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 44 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 16 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 37 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 22 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 16 +- + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/srp/ib_srp.c | 5 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 49 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 21 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 17 - + drivers/nvme/target/rdma.c | 2 +- + fs/cifs/smbdirect.c | 13 +- + include/linux/idr.h | 11 + + include/linux/mlx5/device.h | 3 + + include/linux/mlx5/driver.h | 2 - + include/linux/mlx5/mlx5_ifc.h | 86 +- + include/rdma/ib_addr.h | 2 + + include/rdma/ib_cache.h | 58 +- + include/rdma/ib_cm.h | 3 + + include/rdma/ib_mad.h | 33 + + include/rdma/ib_sa.h | 49 +- + include/rdma/ib_verbs.h | 156 ++- + include/rdma/opa_addr.h | 2 +- + include/rdma/rdmavt_qp.h | 30 +- + include/rdma/uverbs_ioctl.h | 307 +++--- + include/rdma/uverbs_named_ioctl.h | 106 +- + include/rdma/uverbs_std_types.h | 46 +- + include/rdma/uverbs_types.h | 24 +- + include/uapi/rdma/cxgb4-abi.h | 12 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 7 +- + include/uapi/rdma/ib_user_ioctl_verbs.h | 42 + + include/uapi/rdma/ib_user_verbs.h | 5 +- + include/uapi/rdma/mlx5-abi.h | 6 +- + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 73 ++ + net/core/secure_seq.c | 1 + + net/rds/ib.c | 2 +- + net/smc/smc_core.c | 20 +- + net/smc/smc_ib.c | 25 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + 161 files changed, 6114 insertions(+), 3417 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/devx.c +Merging net-next/master (3bc950c34b28 Merge branch 'docs-Convert-alias-and-bridge-to-rst') +$ git merge net-next/master +Auto-merging samples/bpf/Makefile +Auto-merging net/wireless/nl80211.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/tipc/node.c +Auto-merging net/smc/smc_tx.c +Auto-merging net/smc/smc_ib.c +CONFLICT (content): Merge conflict in net/smc/smc_ib.c +Auto-merging net/smc/smc_core.c +Auto-merging net/smc/smc_clc.c +Auto-merging net/smc/af_smc.c +Auto-merging net/sched/cls_api.c +Auto-merging net/sched/act_tunnel_key.c +CONFLICT (content): Merge conflict in net/sched/act_tunnel_key.c +Auto-merging net/sched/act_csum.c +CONFLICT (content): Merge conflict in net/sched/act_csum.c +Auto-merging net/packet/af_packet.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/rx.c +Auto-merging net/ipv6/ipv6_sockglue.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/tcp_ipv4.c +CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/inet_fragment.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/filter.c +Auto-merging net/batman-adv/debugfs.c +Auto-merging lib/rhashtable.c +Auto-merging ipc/shm.c +Auto-merging include/net/tcp.h +Auto-merging include/net/ipv6.h +Auto-merging include/net/cfg80211.h +Auto-merging include/linux/skbuff.h +CONFLICT (content): Merge conflict in include/linux/skbuff.h +Auto-merging drivers/net/wireless/realtek/rtlwifi/base.c +Auto-merging drivers/net/usb/rtl8150.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/usb/asix_devices.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h +Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +Removing drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +Auto-merging drivers/net/ethernet/cavium/liquidio/lio_main.c +Auto-merging drivers/net/ethernet/cavium/Kconfig +CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/Kconfig +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_nic.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_hw.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/aquantia/atlantic/aq_hw.h +Auto-merging drivers/infiniband/hw/hfi1/vnic_main.c +Auto-merging arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/alias.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/net/fsl-fman.txt +Resolved 'drivers/net/ethernet/aquantia/atlantic/aq_hw.h' using previous resolution. +Recorded preimage for 'drivers/net/ethernet/cavium/Kconfig' +Resolved 'include/linux/skbuff.h' using previous resolution. +Resolved 'net/ipv4/tcp_ipv4.c' using previous resolution. +Resolved 'net/sched/act_csum.c' using previous resolution. +Resolved 'net/sched/act_tunnel_key.c' using previous resolution. +Resolved 'net/smc/smc_ib.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/ethernet/cavium/Kconfig'. +[master 4fdf88958127] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-rfkill | 6 +- + Documentation/ABI/testing/sysfs-class-net-queues | 11 + + .../devicetree/bindings/net/dsa/realtek-smi.txt | 153 + + .../bindings/net/dsa/vitesse,vsc73xx.txt | 81 + + Documentation/devicetree/bindings/net/fsl-fman.txt | 25 +- + .../devicetree/bindings/net/rockchip-dwmac.txt | 1 + + .../devicetree/bindings/ptp/ptp-qoriq.txt | 15 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/networking/00-INDEX | 2 - + Documentation/networking/alias.rst | 49 + + Documentation/networking/alias.txt | 40 - + .../networking/{bridge.txt => bridge.rst} | 6 + + Documentation/networking/index.rst | 4 + + Documentation/networking/ip-sysctl.txt | 20 +- + Documentation/networking/net_failover.rst | 111 +- + Documentation/networking/scaling.txt | 61 +- + Documentation/rfkill.txt | 18 +- + MAINTAINERS | 12 + + arch/alpha/include/uapi/asm/socket.h | 3 + + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 140 +- + arch/arm/net/bpf_jit_32.c | 1062 +++---- + arch/arm/net/bpf_jit_32.h | 42 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 14 +- + arch/ia64/include/uapi/asm/socket.h | 3 + + arch/mips/include/uapi/asm/socket.h | 3 + + arch/parisc/include/uapi/asm/socket.h | 3 + + arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 14 +- + arch/s390/include/uapi/asm/socket.h | 3 + + arch/sparc/include/uapi/asm/socket.h | 3 + + arch/xtensa/include/uapi/asm/socket.h | 3 + + drivers/atm/zatm.c | 2 - + drivers/connector/connector.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- + drivers/hwmon/hwmon.c | 4 + + drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 4 +- + drivers/isdn/capi/capi.c | 5 +- + drivers/isdn/capi/capidrv.c | 3 +- + drivers/isdn/gigaset/bas-gigaset.c | 29 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 1 + + drivers/isdn/hardware/mISDN/hfcsusb.c | 36 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 + + drivers/isdn/hardware/mISDN/mISDNisar.c | 4 + + drivers/isdn/hisax/avm_pci.c | 1 + + drivers/isdn/hisax/callc.c | 1 + + drivers/isdn/hisax/config.c | 1 + + drivers/isdn/hisax/gazel.c | 4 + + drivers/isdn/hisax/hfc_usb.c | 10 +- + drivers/isdn/hisax/isar.c | 2 + + drivers/isdn/hisax/l3_1tr6.c | 1 + + drivers/isdn/hisax/l3dss1.c | 1 + + drivers/isdn/hisax/st5481_usb.c | 11 +- + drivers/isdn/hysdn/hysdn_boot.c | 2 + + drivers/isdn/i4l/isdn_tty.c | 4 +- + drivers/isdn/i4l/isdn_v110.c | 9 + + drivers/isdn/mISDN/stack.c | 1 + + drivers/net/bonding/bond_main.c | 3 +- + drivers/net/dsa/Kconfig | 24 +- + drivers/net/dsa/Makefile | 3 + + drivers/net/dsa/bcm_sf2.c | 7 +- + drivers/net/dsa/mv88e6xxx/chip.c | 17 + + drivers/net/dsa/mv88e6xxx/chip.h | 23 + + drivers/net/dsa/mv88e6xxx/global2.h | 3 + + drivers/net/dsa/mv88e6xxx/global2_avb.c | 25 + + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 134 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.h | 14 +- + drivers/net/dsa/mv88e6xxx/ptp.c | 101 +- + drivers/net/dsa/mv88e6xxx/ptp.h | 71 + + drivers/net/dsa/realtek-smi.c | 487 ++++ + drivers/net/dsa/realtek-smi.h | 144 + + drivers/net/dsa/rtl8366.c | 515 ++++ + drivers/net/dsa/rtl8366rb.c | 1424 +++++++++ + drivers/net/dsa/vitesse-vsc73xx.c | 1365 +++++++++ + drivers/net/ethernet/Makefile | 7 +- + drivers/net/ethernet/alteon/acenic.c | 5 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 117 + + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 20 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 12 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 47 +- + .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 8 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 51 +- + .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 8 + + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 52 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 35 + + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 69 +- + drivers/net/ethernet/aquantia/atlantic/ver.h | 4 +- + drivers/net/ethernet/atheros/alx/main.c | 2 - + drivers/net/ethernet/aurora/Kconfig | 1 + + drivers/net/ethernet/aurora/nb8800.c | 2 - + drivers/net/ethernet/broadcom/Kconfig | 4 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 3 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 - + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 121 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 15 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 13 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 16 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 11 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 1 - + drivers/net/ethernet/broadcom/cnic.c | 11 +- + drivers/net/ethernet/broadcom/tg3.c | 14 + + drivers/net/ethernet/cadence/Kconfig | 6 +- + drivers/net/ethernet/cavium/Kconfig | 9 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 3 + + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 5 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 39 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 2 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 9 + + .../net/ethernet/cavium/liquidio/request_manager.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 6 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 32 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 32 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 225 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 186 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 145 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 8 + + drivers/net/ethernet/chelsio/cxgb4/sched.c | 3 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 376 ++- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 51 + + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 24 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 12 + + drivers/net/ethernet/cortina/gemini.c | 135 +- + drivers/net/ethernet/emulex/benet/be.h | 39 +- + drivers/net/ethernet/emulex/benet/be_main.c | 6 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 88 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 3 + + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 39 + + drivers/net/ethernet/freescale/fec_ptp.c | 2 - + drivers/net/ethernet/freescale/fman/fman.c | 3 +- + drivers/net/ethernet/freescale/fman/fman.h | 1 + + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 27 + + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 1 + + drivers/net/ethernet/freescale/fman/fman_memac.c | 5 + + drivers/net/ethernet/freescale/fman/fman_memac.h | 1 + + drivers/net/ethernet/freescale/fman/fman_port.c | 12 + + drivers/net/ethernet/freescale/fman/fman_port.h | 2 + + drivers/net/ethernet/freescale/fman/fman_tgec.c | 21 + + drivers/net/ethernet/freescale/fman/fman_tgec.h | 1 + + drivers/net/ethernet/freescale/fman/mac.c | 3 + + drivers/net/ethernet/freescale/fman/mac.h | 1 + + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 - + drivers/net/ethernet/freescale/ucc_geth.c | 9 +- + drivers/net/ethernet/hisilicon/Kconfig | 15 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 46 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 18 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 358 ++- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 9 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 89 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 3 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 413 +-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 30 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 38 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 17 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 26 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 97 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 3 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 16 + + drivers/net/ethernet/intel/igb/igb.h | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 260 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 65 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 - + drivers/net/ethernet/lantiq_etop.c | 10 +- + drivers/net/ethernet/marvell/mvpp2/Makefile | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 134 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 973 ++++++- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 203 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 703 +++++ + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 179 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 223 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 75 +- + drivers/net/ethernet/mellanox/mlx4/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx4/catas.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/crdump.c | 239 ++ + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 213 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 7 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 4 +- + .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 37 + + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 11 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 20 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/rxtx.c | 109 + + .../ethernet/mellanox/mlx5/core/en_accel/rxtx.h | 14 + + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 69 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 33 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 117 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 64 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 25 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 17 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 43 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 7 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 78 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 54 +- + drivers/net/ethernet/mellanox/mlxsw/pci.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 385 ++- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 373 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 193 +- + .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 253 ++ + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 459 +++ + .../ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c | 374 +++ + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 222 ++ + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 302 ++ + .../ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c | 82 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 32 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 95 + + .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 215 ++ + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 80 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 316 ++ + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 124 - + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 384 +-- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 151 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 69 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 432 +-- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h | 11 +- + .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | 322 +-- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 250 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 3 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 5 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 47 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + + drivers/net/ethernet/micrel/ksz884x.c | 3 - + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 445 ++- + drivers/net/ethernet/mscc/ocelot.h | 2 +- + drivers/net/ethernet/mscc/ocelot_board.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 254 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 13 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 43 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 6 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 85 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 108 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 4 +- + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 5 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 2 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 12 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 6 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.h | 28 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 87 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 58 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 16 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 4 +- + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 22 +- + drivers/net/ethernet/oki-semi/pch_gbe/Makefile | 2 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 40 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 262 -- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h | 35 - + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 19 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 193 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 2 - + drivers/net/ethernet/packetengines/Kconfig | 6 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 10 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 - + drivers/net/ethernet/qlogic/qede/qede_filter.c | 1 - + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +- + drivers/net/ethernet/realtek/Kconfig | 2 +- + drivers/net/ethernet/realtek/r8169.c | 815 ++---- + drivers/net/ethernet/renesas/ravb_main.c | 9 +- + drivers/net/ethernet/renesas/sh_eth.c | 12 +- + drivers/net/ethernet/renesas/sh_eth.h | 8 +- + drivers/net/ethernet/sfc/Makefile | 2 + + drivers/net/ethernet/sfc/ef10_sriov.c | 5 +- + drivers/net/ethernet/sfc/efx.c | 12 + + drivers/net/ethernet/sfc/net_driver.h | 3 + + drivers/net/ethernet/sfc/rx.c | 7 +- + drivers/net/ethernet/smsc/epic100.c | 2 - + drivers/net/ethernet/socionext/netsec.c | 2 - + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 69 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 15 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 60 + + drivers/net/ethernet/sun/ldmvsw.c | 3 +- + drivers/net/ethernet/sun/niu.c | 16 - + drivers/net/ethernet/sun/sunvnet.c | 3 +- + drivers/net/ethernet/tehuti/tehuti.c | 2 - + drivers/net/ethernet/ti/cpsw.c | 39 +- + drivers/net/ethernet/ti/cpts.c | 5 +- + drivers/net/ethernet/ti/netcp_core.c | 13 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 112 +- + drivers/net/fjes/fjes_main.c | 8 +- + drivers/net/geneve.c | 17 +- + drivers/net/hamradio/6pack.c | 5 +- + drivers/net/hyperv/netvsc_drv.c | 6 +- + drivers/net/macvlan.c | 11 +- + drivers/net/net_failover.c | 7 +- + drivers/net/netdevsim/Makefile | 4 + + drivers/net/netdevsim/bpf.c | 41 +- + drivers/net/netdevsim/ipsec.c | 297 ++ + drivers/net/netdevsim/netdev.c | 12 +- + drivers/net/netdevsim/netdevsim.h | 47 +- + drivers/net/ntb_netdev.c | 2 +- + drivers/net/phy/Kconfig | 6 +- + drivers/net/phy/dp83tc811.c | 46 +- + drivers/net/phy/fixed_phy.c | 7 +- + drivers/net/phy/mdio-mux-gpio.c | 22 +- + drivers/net/phy/phy.c | 91 +- + drivers/net/phy/realtek.c | 80 + + drivers/net/phy/sfp.c | 727 +++++ + drivers/net/phy/vitesse.c | 175 ++ + drivers/net/phy/xilinx_gmii2rgmii.c | 20 +- + drivers/net/team/team.c | 8 +- + drivers/net/tun.c | 4 +- + drivers/net/usb/asix_devices.c | 38 +- + drivers/net/usb/catc.c | 1 + + drivers/net/usb/cdc-phonet.c | 6 +- + drivers/net/usb/hso.c | 44 +- + drivers/net/usb/kaweth.c | 8 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/r8152.c | 12 +- + drivers/net/usb/rtl8150.c | 5 +- + drivers/net/virtio_net.c | 1 - + drivers/net/vxlan.c | 140 +- + drivers/net/wan/farsync.c | 2 - + drivers/net/wan/lmc/lmc_main.c | 2 - + drivers/net/wimax/i2400m/control.c | 3 +- + drivers/net/wimax/i2400m/fw.c | 3 +- + drivers/net/wimax/i2400m/netdev.c | 2 - + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + drivers/net/xen-netback/interface.c | 4 +- + drivers/net/xen-netfront.c | 3 +- + drivers/of/of_mdio.c | 17 +- + drivers/ptp/Kconfig | 2 +- + drivers/ptp/ptp_qoriq.c | 104 +- + drivers/s390/net/Kconfig | 10 + + drivers/s390/net/Makefile | 3 + + drivers/s390/net/ism.h | 221 ++ + drivers/s390/net/ism_drv.c | 623 ++++ + drivers/s390/net/qeth_core.h | 22 +- + drivers/s390/net/qeth_core_main.c | 131 +- + drivers/s390/net/qeth_core_mpc.h | 2 + + drivers/s390/net/qeth_l2.h | 5 + + drivers/s390/net/qeth_l2_main.c | 20 +- + drivers/s390/net/qeth_l3_main.c | 360 ++- + drivers/staging/netlogic/xlr_net.c | 9 +- + drivers/staging/rtl8188eu/include/wifi.h | 1 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 3 +- + drivers/staging/rtl8712/wifi.h | 1 - + drivers/staging/rtl8723bs/include/wifi.h | 1 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 7 +- + drivers/staging/rtlwifi/base.c | 2 +- + drivers/vhost/net.c | 95 +- + include/linux/cpumask.h | 11 +- + include/linux/etherdevice.h | 3 +- + include/linux/fsl/ptp_qoriq.h | 38 +- + include/linux/hwmon.h | 32 + + include/linux/ieee80211.h | 437 ++- + include/linux/if_team.h | 18 + + include/linux/ipc.h | 2 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/list.h | 30 + + include/linux/mlx4/device.h | 8 + + include/linux/mlx5/mlx5_ifc_fpga.h | 1 + + include/linux/mroute_base.h | 3 +- + include/linux/netdev_features.h | 2 + + include/linux/netdevice.h | 200 +- + include/linux/netfilter.h | 37 + + include/linux/openvswitch.h | 5 + + include/linux/phy.h | 2 + + include/linux/reciprocal_div.h | 68 + + include/linux/rfkill.h | 20 +- + include/linux/rhashtable-types.h | 137 + + include/linux/rhashtable.h | 164 +- + include/linux/sctp.h | 7 + + include/linux/sfp.h | 72 +- + include/linux/skbuff.h | 7 +- + include/linux/tcp.h | 5 +- + include/linux/udp.h | 4 +- + include/net/act_api.h | 28 +- + include/net/bonding.h | 13 + + include/net/busy_poll.h | 1 + + include/net/cfg80211.h | 106 +- + include/net/devlink.h | 195 ++ + include/net/dsa.h | 3 + + include/net/flow_dissector.h | 4 +- + include/net/ieee80211_radiotap.h | 123 + + include/net/inet_common.h | 2 +- + include/net/inet_frag.h | 2 +- + include/net/inet_sock.h | 1 + + include/net/ip.h | 27 +- + include/net/ip_tunnels.h | 8 +- + include/net/ipv6.h | 28 +- + include/net/lag.h | 17 + + include/net/mac80211.h | 64 +- + include/net/netfilter/nf_flow_table.h | 2 +- + include/net/netfilter/nf_log.h | 3 +- + include/net/netns/hash.h | 7 +- + include/net/pkt_cls.h | 19 +- + include/net/pkt_sched.h | 7 + + include/net/sch_generic.h | 21 + + include/net/sctp/structs.h | 12 +- + include/net/seg6.h | 2 +- + include/net/seg6_hmac.h | 2 +- + include/net/smc.h | 65 + + include/net/sock.h | 69 +- + include/net/tc_act/tc_pedit.h | 1 + + include/net/tc_act/tc_skbedit.h | 37 +- + include/net/tcp.h | 32 +- + include/net/tls.h | 82 +- + include/net/transp_v6.h | 3 +- + include/net/udp.h | 4 +- + include/net/udp_tunnel.h | 6 +- + include/net/xdp.h | 13 + + include/trace/events/net.h | 7 + + include/trace/events/sock.h | 30 +- + include/uapi/asm-generic/socket.h | 3 + + include/uapi/linux/bpf.h | 9 +- + include/uapi/linux/devlink.h | 42 + + include/uapi/linux/errqueue.h | 4 + + include/uapi/linux/if_link.h | 4 + + include/uapi/linux/ila.h | 1 + + include/uapi/linux/mroute.h | 2 + + include/uapi/linux/net_tstamp.h | 18 + + include/uapi/linux/nl80211.h | 102 +- + include/uapi/linux/openvswitch.h | 3 + + include/uapi/linux/pkt_cls.h | 4 + + include/uapi/linux/pkt_sched.h | 135 + + include/uapi/linux/sctp.h | 5 + + include/uapi/linux/smc_diag.h | 10 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tc_act/tc_pedit.h | 9 +- + include/uapi/linux/tc_act/tc_skbedit.h | 2 + + include/uapi/linux/tc_act/tc_tunnel_key.h | 26 + + include/uapi/linux/tipc_netlink.h | 14 + + ipc/msg.c | 1 + + ipc/sem.c | 1 + + ipc/shm.c | 1 + + ipc/util.c | 1 + + lib/nlattr.c | 4 +- + lib/reciprocal_div.c | 41 + + lib/rhashtable.c | 58 +- + lib/test_rhashtable.c | 8 +- + net/8021q/vlan.c | 13 +- + net/batman-adv/Kconfig | 8 +- + net/batman-adv/bat_iv_ogm.h | 6 +- + net/batman-adv/bat_v_ogm.h | 6 +- + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/batman-adv/debugfs.c | 2 +- + net/batman-adv/originator.c | 17 +- + net/batman-adv/types.h | 7 +- + net/core/dev.c | 828 ++++-- + net/core/devlink.c | 1774 ++++++++++-- + net/core/ethtool.c | 1 + + net/core/filter.c | 3 +- + net/core/flow_dissector.c | 34 +- + net/core/neighbour.c | 3 +- + net/core/net-sysfs.c | 123 +- + net/core/pktgen.c | 10 +- + net/core/rtnetlink.c | 83 +- + net/core/skbuff.c | 7 +- + net/core/sock.c | 47 +- + net/core/xdp.c | 38 +- + net/decnet/dn_nsp_in.c | 1 + + net/dsa/dsa2.c | 14 + + net/dsa/slave.c | 2 +- + net/dsa/switch.c | 22 +- + net/ethernet/eth.c | 12 +- + net/ipv4/af_inet.c | 14 +- + net/ipv4/esp4_offload.c | 4 +- + net/ipv4/fou.c | 20 +- + net/ipv4/gre_offload.c | 8 +- + net/ipv4/icmp.c | 9 +- + net/ipv4/inet_fragment.c | 1 + + net/ipv4/ip_gre.c | 2 + + net/ipv4/ip_input.c | 147 +- + net/ipv4/ip_output.c | 22 +- + net/ipv4/ipmr.c | 22 +- + net/ipv4/ipmr_base.c | 1 + + net/ipv4/netfilter/nf_log_ipv4.c | 8 +- + net/ipv4/ping.c | 10 +- + net/ipv4/proc.c | 2 + + net/ipv4/raw.c | 11 +- + net/ipv4/tcp.c | 20 +- + net/ipv4/tcp_bbr.c | 6 +- + net/ipv4/tcp_input.c | 48 +- + net/ipv4/tcp_ipv4.c | 3 +- + net/ipv4/tcp_minisocks.c | 229 +- + net/ipv4/tcp_offload.c | 17 +- + net/ipv4/tcp_output.c | 14 - + net/ipv4/tcp_rate.c | 4 + + net/ipv4/udp.c | 11 +- + net/ipv4/udp_offload.c | 13 +- + net/ipv6/addrconf.c | 45 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/datagram.c | 4 +- + net/ipv6/esp6_offload.c | 4 +- + net/ipv6/icmp.c | 14 +- + net/ipv6/ila/Makefile | 2 +- + net/ipv6/ila/ila.h | 27 +- + net/ipv6/ila/ila_common.c | 30 - + net/ipv6/ila/ila_main.c | 121 + + net/ipv6/ila/ila_xlat.c | 291 +- + net/ipv6/ip6_flowlabel.c | 3 +- + net/ipv6/ip6_gre.c | 2 + + net/ipv6/ip6_input.c | 131 +- + net/ipv6/ip6_offload.c | 16 +- + net/ipv6/ip6_output.c | 38 +- + net/ipv6/ip6mr.c | 1 + + net/ipv6/ipv6_sockglue.c | 3 +- + net/ipv6/netfilter/nf_log_ipv6.c | 8 +- + net/ipv6/ping.c | 7 +- + net/ipv6/raw.c | 18 +- + net/ipv6/seg6.c | 1 + + net/ipv6/seg6_hmac.c | 1 + + net/ipv6/tcpv6_offload.c | 4 +- + net/ipv6/udp.c | 13 +- + net/ipv6/udp_offload.c | 4 +- + net/l2tp/l2tp_core.c | 15 +- + net/l2tp/l2tp_core.h | 12 - + net/l2tp/l2tp_debugfs.c | 3 - + net/l2tp/l2tp_ip6.c | 10 +- + net/l2tp/l2tp_ppp.c | 180 +- + net/mac80211/Makefile | 1 + + net/mac80211/agg-rx.c | 10 +- + net/mac80211/agg-tx.c | 19 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/ethtool.c | 6 +- + net/mac80211/he.c | 55 + + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 47 +- + net/mac80211/iface.c | 4 +- + net/mac80211/main.c | 36 +- + net/mac80211/mlme.c | 312 +- + net/mac80211/offchannel.c | 2 +- + net/mac80211/rx.c | 129 +- + net/mac80211/scan.c | 56 +- + net/mac80211/sta_info.c | 101 +- + net/mac80211/sta_info.h | 20 +- + net/mac80211/trace.h | 2 +- + net/mac80211/tx.c | 21 +- + net/mac80211/util.c | 159 +- + net/netfilter/core.c | 15 + + net/netfilter/nf_conntrack_broadcast.c | 2 +- + net/netfilter/nf_conntrack_core.c | 36 + + net/netfilter/nf_log_common.c | 5 +- + net/netfilter/nf_nat_core.c | 6 +- + net/netfilter/nf_tables_api.c | 1 + + net/netfilter/nft_meta.c | 9 +- + net/netfilter/nft_socket.c | 5 +- + net/netfilter/xt_cgroup.c | 6 +- + net/netfilter/xt_owner.c | 2 +- + net/netfilter/xt_recent.c | 3 +- + net/netfilter/xt_socket.c | 8 + + net/openvswitch/actions.c | 33 + + net/openvswitch/flow_netlink.c | 80 +- + net/packet/af_packet.c | 16 +- + net/rds/ib_recv.c | 5 +- + net/sched/Kconfig | 22 + + net/sched/Makefile | 2 + + net/sched/act_api.c | 424 ++- + net/sched/act_bpf.c | 34 +- + net/sched/act_connmark.c | 29 +- + net/sched/act_csum.c | 34 +- + net/sched/act_gact.c | 31 +- + net/sched/act_ife.c | 33 +- + net/sched/act_ipt.c | 44 +- + net/sched/act_mirred.c | 38 +- + net/sched/act_nat.c | 30 +- + net/sched/act_pedit.c | 111 +- + net/sched/act_police.c | 31 +- + net/sched/act_sample.c | 34 +- + net/sched/act_simple.c | 31 +- + net/sched/act_skbedit.c | 175 +- + net/sched/act_skbmod.c | 34 +- + net/sched/act_tunnel_key.c | 275 +- + net/sched/act_vlan.c | 40 +- + net/sched/cls_api.c | 106 +- + net/sched/cls_bpf.c | 39 + + net/sched/cls_flower.c | 134 +- + net/sched/cls_matchall.c | 32 + + net/sched/cls_u32.c | 111 + + net/sched/sch_api.c | 11 +- + net/sched/sch_cake.c | 3019 ++++++++++++++++++++ + net/sched/sch_etf.c | 484 ++++ + net/sched/sch_htb.c | 13 - + net/sched/sch_netem.c | 73 +- + net/sctp/associola.c | 15 + + net/sctp/input.c | 1 + + net/sctp/ipv6.c | 20 +- + net/sctp/protocol.c | 16 +- + net/sctp/socket.c | 245 +- + net/smc/Makefile | 2 +- + net/smc/af_smc.c | 228 +- + net/smc/smc.h | 7 +- + net/smc/smc_cdc.c | 86 +- + net/smc/smc_cdc.h | 43 +- + net/smc/smc_clc.c | 193 +- + net/smc/smc_clc.h | 81 +- + net/smc/smc_core.c | 285 +- + net/smc/smc_core.h | 72 +- + net/smc/smc_diag.c | 18 +- + net/smc/smc_ib.c | 142 +- + net/smc/smc_ib.h | 4 +- + net/smc/smc_ism.c | 314 ++ + net/smc/smc_ism.h | 48 + + net/smc/smc_pnet.c | 157 +- + net/smc/smc_pnet.h | 16 + + net/smc/smc_rx.c | 2 +- + net/smc/smc_tx.c | 193 +- + net/smc/smc_tx.h | 2 + + net/strparser/strparser.c | 26 +- + net/tipc/bearer.c | 1 + + net/tipc/group.c | 37 +- + net/tipc/group.h | 1 + + net/tipc/link.c | 125 +- + net/tipc/link.h | 2 + + net/tipc/msg.c | 35 +- + net/tipc/node.c | 86 +- + net/tipc/node.h | 14 +- + net/tipc/socket.c | 5 + + net/tls/tls_device.c | 301 +- + net/tls/tls_device_fallback.c | 9 +- + net/tls/tls_main.c | 32 +- + net/tls/tls_sw.c | 135 +- + net/wireless/core.c | 21 +- + net/wireless/core.h | 2 +- + net/wireless/nl80211.c | 194 +- + net/wireless/sysfs.c | 4 +- + net/wireless/util.c | 87 +- + net/wireless/wext-compat.c | 10 +- + samples/bpf/Makefile | 4 + + samples/bpf/xdp_redirect_cpu_kern.c | 11 +- + samples/bpf/xdp_rxq_info_kern.c | 43 + + samples/bpf/xdp_rxq_info_user.c | 45 +- + samples/bpf/xdp_sample_pkts_kern.c | 66 + + samples/bpf/xdp_sample_pkts_user.c | 169 ++ + tools/bpf/Makefile.helpers | 59 + + tools/bpf/bpftool/Documentation/Makefile | 13 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 33 +- + tools/bpf/bpftool/Makefile | 8 +- + tools/bpf/bpftool/bash-completion/bpftool | 134 +- + tools/bpf/bpftool/btf_dumper.c | 251 ++ + tools/bpf/bpftool/cgroup.c | 170 +- + tools/bpf/bpftool/common.c | 2 - + tools/bpf/bpftool/main.c | 4 +- + tools/bpf/bpftool/main.h | 36 +- + tools/bpf/bpftool/map.c | 223 +- + tools/bpf/bpftool/prog.c | 249 +- + tools/bpf/bpftool/xlated_dumper.c | 6 +- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 + + tools/build/feature/test-reallocarray.c | 8 + + tools/include/linux/compiler-gcc.h | 4 + + tools/include/linux/overflow.h | 278 ++ + tools/include/tools/libc_compat.h | 20 + + tools/include/uapi/linux/bpf.h | 35 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 6 +- + tools/lib/bpf/btf.c | 65 +- + tools/lib/bpf/btf.h | 3 + + tools/lib/bpf/libbpf.c | 237 +- + tools/lib/bpf/libbpf.h | 13 + + tools/lib/bpf/libbpf_errno.c | 74 + + tools/testing/selftests/bpf/Makefile | 1 + + tools/testing/selftests/bpf/cgroup_helpers.c | 6 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 6 +- + tools/testing/selftests/bpf/test_offload.py | 81 +- + tools/testing/selftests/bpf/test_sock_addr.c | 37 +- + tools/testing/selftests/bpf/test_tcpbpf.h | 1 + + tools/testing/selftests/bpf/test_tcpbpf_kern.c | 17 +- + tools/testing/selftests/bpf/test_tcpbpf_user.c | 119 +- + tools/testing/selftests/bpf/trace_helpers.c | 48 +- + tools/testing/selftests/bpf/trace_helpers.h | 4 + + .../selftests/drivers/net/mlxsw/mirror_gre.sh | 217 ++ + .../drivers/net/mlxsw/mirror_gre_scale.sh | 197 ++ + .../selftests/drivers/net/mlxsw/router_scale.sh | 167 ++ + .../net/mlxsw/spectrum/devlink_lib_spectrum.sh | 119 + + .../net/mlxsw/spectrum/devlink_resources.sh | 117 + + .../drivers/net/mlxsw/spectrum/mirror_gre_scale.sh | 13 + + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 55 + + .../drivers/net/mlxsw/spectrum/router_scale.sh | 18 + + .../drivers/net/mlxsw/spectrum/tc_flower_scale.sh | 19 + + .../selftests/drivers/net/mlxsw/tc_flower_scale.sh | 134 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/forwarding/README | 2 + + .../net/forwarding/bridge_port_isolation.sh | 151 + + .../selftests/net/forwarding/devlink_lib.sh | 108 + + .../selftests/net/forwarding/gre_multipath.sh | 354 +++ + tools/testing/selftests/net/forwarding/lib.sh | 173 +- + .../net/forwarding/mirror_gre_bridge_1d.sh | 132 + + .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 6 +- + .../net/forwarding/mirror_gre_bridge_1q.sh | 126 + + .../selftests/net/forwarding/mirror_gre_changes.sh | 11 +- + .../selftests/net/forwarding/mirror_gre_lib.sh | 4 +- + .../selftests/net/forwarding/mirror_gre_nh.sh | 4 + + .../net/forwarding/mirror_gre_topo_lib.sh | 2 +- + .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 15 +- + .../testing/selftests/net/forwarding/mirror_lib.sh | 2 +- + .../selftests/net/forwarding/router_bridge.sh | 113 + + .../selftests/net/forwarding/router_bridge_vlan.sh | 132 + + .../selftests/net/forwarding/router_multipath.sh | 39 - + tools/testing/selftests/net/ip6_gre_headroom.sh | 65 + + tools/testing/selftests/net/rtnetlink.sh | 128 +- + tools/testing/selftests/net/tls.c | 692 +++++ + .../tc-testing/tc-tests/actions/csum.json | 24 + + .../tc-testing/tc-tests/actions/tunnel_key.json | 917 ++++++ + .../selftests/tc-testing/tc-tests/filters/fw.json | 1049 +++++++ + 746 files changed, 42762 insertions(+), 8800 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/realtek-smi.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt + create mode 100644 Documentation/networking/alias.rst + delete mode 100644 Documentation/networking/alias.txt + rename Documentation/networking/{bridge.txt => bridge.rst} (85%) + create mode 100644 drivers/net/dsa/realtek-smi.c + create mode 100644 drivers/net/dsa/realtek-smi.h + create mode 100644 drivers/net/dsa/rtl8366.c + create mode 100644 drivers/net/dsa/rtl8366rb.c + create mode 100644 drivers/net/dsa/vitesse-vsc73xx.c + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx4/crdump.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/rxtx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/rxtx.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c + delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h + delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c + delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h + create mode 100644 drivers/net/netdevsim/ipsec.c + create mode 100644 drivers/s390/net/ism.h + create mode 100644 drivers/s390/net/ism_drv.c + create mode 100644 include/linux/rhashtable-types.h + create mode 100644 include/net/lag.h + create mode 100644 net/ipv6/ila/ila_main.c + create mode 100644 net/mac80211/he.c + create mode 100644 net/sched/sch_cake.c + create mode 100644 net/sched/sch_etf.c + create mode 100644 net/smc/smc_ism.c + create mode 100644 net/smc/smc_ism.h + create mode 100644 samples/bpf/xdp_sample_pkts_kern.c + create mode 100644 samples/bpf/xdp_sample_pkts_user.c + create mode 100644 tools/bpf/Makefile.helpers + create mode 100644 tools/bpf/bpftool/btf_dumper.c + create mode 100644 tools/build/feature/test-reallocarray.c + create mode 100644 tools/include/linux/overflow.h + create mode 100644 tools/include/tools/libc_compat.h + create mode 100644 tools/lib/bpf/libbpf_errno.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/mirror_gre.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/mirror_gre_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/router_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_lib_spectrum.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/mirror_gre_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/router_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/tc_flower_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_port_isolation.sh + create mode 100644 tools/testing/selftests/net/forwarding/devlink_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_vlan.sh + create mode 100755 tools/testing/selftests/net/ip6_gre_headroom.sh + create mode 100644 tools/testing/selftests/net/tls.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/fw.json +$ git am -3 ../patches/net-phy-sfp-Do-not-use-imply-HWMON.patch +Applying: net: phy: sfp: Do not use "imply HWMON" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/phy/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master f850804152cf] Merge remote-tracking branch 'net-next/master' + Date: Fri Jul 20 11:48:15 2018 +1000 +Merging bpf-next/master (8ae71e76cf1f Merge branch 'bpf-offload-sharing') +$ git merge bpf-next/master +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/sockmap.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/netronome/nfp/bpf/main.c | 23 +++ + drivers/net/ethernet/netronome/nfp/bpf/main.h | 4 + + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_app.c | 17 ++ + drivers/net/ethernet/netronome/nfp/nfp_app.h | 8 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 + + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 + + drivers/net/netdevsim/bpf.c | 50 +++-- + drivers/net/netdevsim/netdev.c | 103 +++++++++- + drivers/net/netdevsim/netdevsim.h | 23 ++- + include/linux/bpf.h | 13 +- + kernel/bpf/cgroup.c | 7 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/offload.c | 223 ++++++++++++++++----- + kernel/bpf/sockmap.c | 3 - + kernel/bpf/verifier.c | 2 +- + samples/bpf/bpf_load.c | 3 + + samples/bpf/test_cgrp2_sock2.c | 2 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/lib/bpf/Makefile | 6 +- + tools/testing/selftests/bpf/test_offload.py | 151 +++++++++++++- + 21 files changed, 555 insertions(+), 101 deletions(-) +Merging ipsec-next/master (03dc7a35fcc8 ipv6: xfrm: use 64-bit timestamps) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/key/af_key.c +Auto-merging net/core/pktgen.c +Auto-merging include/uapi/linux/if_link.h +Merge made by the 'recursive' strategy. + include/net/flow.h | 9 + + include/net/xfrm.h | 57 ++- + include/uapi/linux/if_link.h | 10 + + include/uapi/linux/xfrm.h | 5 +- + net/core/pktgen.c | 2 +- + net/ipv6/xfrm6_mode_ro.c | 2 +- + net/key/af_key.c | 6 +- + net/xfrm/Kconfig | 8 + + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_device.c | 13 +- + net/xfrm/xfrm_input.c | 5 + + net/xfrm/xfrm_interface.c | 972 +++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_output.c | 3 +- + net/xfrm/xfrm_policy.c | 229 ++++------ + net/xfrm/xfrm_state.c | 43 +- + net/xfrm/xfrm_user.c | 94 ++++- + 16 files changed, 1250 insertions(+), 209 deletions(-) + create mode 100644 net/xfrm/xfrm_interface.c +Merging mlx5-next/mlx5-next (048f31437ac5 net/mlx5: Fix tristate and description for MLX5 module) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 37 ++++----- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 22 +---- + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 2 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 12 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/driver.h | 5 ++ + include/linux/mlx5/fs.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 93 +++++++++++++++++++++- + 13 files changed, 142 insertions(+), 63 deletions(-) +Merging netfilter-next/master (24c458c485c8 netfilter: nf_osf: add missing definitions to header file) +$ git merge netfilter-next/master +Auto-merging net/netfilter/xt_TPROXY.c +Auto-merging net/netfilter/nf_tables_api.c +Removing net/netfilter/nf_conntrack_l3proto_generic.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/netfilter/Makefile +Auto-merging net/netfilter/Kconfig +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +Removing net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +Removing net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +Auto-merging include/net/netfilter/nf_tproxy.h +Removing include/net/netfilter/nf_conntrack_l3proto.h +Auto-merging include/net/ipv6.h +Merge made by the 'recursive' strategy. + include/linux/netfilter/nfnetlink.h | 1 + + include/linux/netfilter_ipv4.h | 11 - + include/linux/netfilter_ipv6.h | 5 - + include/net/ip_vs.h | 18 +- + include/net/ipv6.h | 28 - + include/net/ipv6_frag.h | 104 +++ + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 - + include/net/netfilter/nf_conntrack.h | 5 + + include/net/netfilter/nf_conntrack_core.h | 15 +- + include/net/netfilter/nf_conntrack_count.h | 37 +- + include/net/netfilter/nf_conntrack_helper.h | 4 +- + include/net/netfilter/nf_conntrack_l3proto.h | 84 -- + include/net/netfilter/nf_conntrack_l4proto.h | 14 +- + include/net/netfilter/nf_conntrack_timeout.h | 18 +- + include/net/netfilter/nf_tproxy.h | 8 + + include/net/netns/nftables.h | 1 + + include/uapi/linux/netfilter/nf_osf.h | 11 + + include/uapi/linux/netfilter/nf_tables.h | 4 +- + include/uapi/linux/netfilter/xt_osf.h | 10 +- + net/bridge/netfilter/nft_reject_bridge.c | 3 +- + net/ieee802154/6lowpan/reassembly.c | 2 +- + net/ipv4/netfilter.c | 53 -- + net/ipv4/netfilter/Kconfig | 22 +- + net/ipv4/netfilter/Makefile | 6 - + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 472 ------------ + net/ipv6/netfilter.c | 62 -- + net/ipv6/netfilter/Kconfig | 27 +- + net/ipv6/netfilter/Makefile | 6 - + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 460 ----------- + net/ipv6/netfilter/nf_conntrack_reasm.c | 17 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 4 +- + net/ipv6/reassembly.c | 92 +-- + net/netfilter/Kconfig | 12 +- + net/netfilter/Makefile | 7 +- + net/netfilter/ipvs/ip_vs_conn.c | 67 +- + net/netfilter/ipvs/ip_vs_proto.c | 19 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 + + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 + + net/netfilter/ipvs/ip_vs_proto_udp.c | 2 + + net/netfilter/ipvs/ip_vs_sync.c | 18 +- + net/netfilter/nf_conncount.c | 386 +++++++--- + net/netfilter/nf_conntrack_core.c | 252 ++++-- + net/netfilter/nf_conntrack_expect.c | 1 - + net/netfilter/nf_conntrack_helper.c | 6 +- + net/netfilter/nf_conntrack_l3proto_generic.c | 66 -- + net/netfilter/nf_conntrack_netlink.c | 98 ++- + net/netfilter/nf_conntrack_proto.c | 845 +++++++++++++++------ + net/netfilter/nf_conntrack_proto_dccp.c | 44 +- + net/netfilter/nf_conntrack_proto_generic.c | 32 +- + net/netfilter/nf_conntrack_proto_gre.c | 24 +- + net/{ipv4 => }/netfilter/nf_conntrack_proto_icmp.c | 19 +- + .../netfilter/nf_conntrack_proto_icmpv6.c | 17 +- + net/netfilter/nf_conntrack_proto_sctp.c | 46 +- + net/netfilter/nf_conntrack_proto_tcp.c | 52 +- + net/netfilter/nf_conntrack_proto_udp.c | 55 +- + net/netfilter/nf_conntrack_standalone.c | 28 +- + net/netfilter/nf_flow_table_core.c | 13 +- + net/netfilter/nf_nat_core.c | 8 - + net/netfilter/nf_osf.c | 252 +++--- + net/netfilter/nf_tables_api.c | 194 +++-- + net/netfilter/nfnetlink.c | 23 +- + net/netfilter/nfnetlink_cttimeout.c | 13 +- + net/netfilter/nft_chain_filter.c | 4 +- + net/netfilter/nft_connlimit.c | 36 +- + net/netfilter/nft_ct.c | 2 +- + net/netfilter/nft_dynset.c | 2 + + net/netfilter/nft_socket.c | 17 +- + net/netfilter/utils.c | 131 +++- + net/netfilter/xt_CT.c | 2 +- + net/netfilter/xt_TEE.c | 4 +- + net/netfilter/xt_TPROXY.c | 9 - + net/openvswitch/conntrack.c | 20 +- + 72 files changed, 2029 insertions(+), 2408 deletions(-) + create mode 100644 include/net/ipv6_frag.h + delete mode 100644 include/net/netfilter/nf_conntrack_l3proto.h + delete mode 100644 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c + delete mode 100644 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c + delete mode 100644 net/netfilter/nf_conntrack_l3proto_generic.c + rename net/{ipv4 => }/netfilter/nf_conntrack_proto_icmp.c (96%) + rename net/{ipv6 => }/netfilter/nf_conntrack_proto_icmpv6.c (96%) +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/hci/core.c | 10 ++++++++++ + net/nfc/netlink.c | 6 ++++-- + 7 files changed, 39 insertions(+), 53 deletions(-) +Merging ipvs-next/master (66c524acfb51 netfilter: conntrack: remove l3proto abstraction) +$ git merge ipvs-next/master +Auto-merging net/openvswitch/conntrack.c +Auto-merging net/netfilter/xt_TPROXY.c +Auto-merging net/netfilter/nf_nat_core.c +Auto-merging net/netfilter/nf_conntrack_proto_icmpv6.c +Auto-merging net/netfilter/nf_conntrack_proto_icmp.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/netfilter/nf_conntrack_helper.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/netfilter/Makefile +CONFLICT (content): Merge conflict in net/netfilter/Makefile +Auto-merging net/netfilter/Kconfig +CONFLICT (content): Merge conflict in net/netfilter/Kconfig +Auto-merging net/ipv6/netfilter/nf_defrag_ipv6_hooks.c +Auto-merging net/ipv6/netfilter/Kconfig +CONFLICT (content): Merge conflict in net/ipv6/netfilter/Kconfig +Auto-merging include/net/netfilter/nf_tproxy.h +Resolved 'net/ipv6/netfilter/Kconfig' using previous resolution. +Resolved 'net/netfilter/Kconfig' using previous resolution. +Resolved 'net/netfilter/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1e2d10b30256] Merge remote-tracking branch 'ipvs-next/master' +$ git diff -M --stat --summary HEAD^.. +Merging wireless-drivers-next/master (4a07ed51cae1 mt76x2: debugfs: add sw pulse statistics to dfs debugfs) +$ git merge wireless-drivers-next/master +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/Kconfig | 24 +- + drivers/net/wireless/ath/ath10k/ce.c | 2 +- + drivers/net/wireless/ath/ath10k/ce.h | 42 ++ + drivers/net/wireless/ath/ath10k/core.c | 19 +- + drivers/net/wireless/ath/ath10k/core.h | 3 +- + drivers/net/wireless/ath/ath10k/debug.c | 21 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +- + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 7 +- + drivers/net/wireless/ath/ath10k/pci.h | 42 -- + drivers/net/wireless/ath/ath10k/snoc.c | 47 +- + drivers/net/wireless/ath/ath10k/snoc.h | 1 - + drivers/net/wireless/ath/ath10k/spectral.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 14 +- + drivers/net/wireless/ath/ath5k/pcu.c | 1 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 17 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 + + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 18 +- + drivers/net/wireless/atmel/atmel.c | 14 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 40 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 25 + + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 6 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 43 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 18 + + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 18 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.h | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- + drivers/net/wireless/marvell/libertas/cfg.c | 12 +- + drivers/net/wireless/marvell/libertas/dev.h | 1 + + drivers/net/wireless/marvell/libertas/if_sdio.c | 30 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 7 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 52 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 12 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 16 +- + .../net/wireless/mediatek/mt76/mt76x2_debugfs.c | 22 + + drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c | 377 ++++++++++++++- + drivers/net/wireless/mediatek/mt76/mt76x2_dfs.h | 64 +++ + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 39 +- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 107 ++++- + drivers/net/wireless/mediatek/mt76/mt76x2_tx.c | 33 ++ + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 + + drivers/net/wireless/quantenna/qtnfmac/commands.c | 57 ++- + drivers/net/wireless/quantenna/qtnfmac/core.c | 25 + + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 20 + + drivers/net/wireless/rndis_wlan.c | 6 +- + drivers/net/wireless/ti/wl18xx/debugfs.c | 29 +- + drivers/net/wireless/ti/wlcore/acx.c | 1 - + drivers/net/wireless/ti/wlcore/cmd.c | 10 + + drivers/net/wireless/ti/wlcore/debugfs.c | 90 ++-- + drivers/net/wireless/ti/wlcore/main.c | 528 ++++++++++++++------- + drivers/net/wireless/ti/wlcore/ps.c | 146 ------ + drivers/net/wireless/ti/wlcore/ps.h | 3 - + drivers/net/wireless/ti/wlcore/scan.c | 13 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 13 +- + drivers/net/wireless/ti/wlcore/testmode.c | 20 +- + drivers/net/wireless/ti/wlcore/tx.c | 10 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 30 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 1 - + drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 - + drivers/net/wireless/zydas/zd1211rw/zd_chip.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 21 +- + include/linux/bitfield.h | 7 +- + lib/Kconfig.debug | 7 + + lib/Makefile | 1 + + lib/test_bitfield.c | 168 +++++++ + 79 files changed, 1787 insertions(+), 704 deletions(-) + create mode 100644 lib/test_bitfield.c +Merging bluetooth/master (b71c69c26b49 Bluetooth: Use lock_sock_nested in bt_accept_enqueue) +$ git merge bluetooth/master +Removing include/linux/platform_data/bt-nokia-h4p.h +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 21 +- + include/linux/platform_data/bt-nokia-h4p.h | 38 ---- + include/net/bluetooth/hci.h | 94 ++++++++ + include/net/bluetooth/hci_core.h | 8 + + net/6lowpan/iphc.c | 1 + + net/bluetooth/af_bluetooth.c | 2 +- + net/bluetooth/hci_conn.c | 72 +++++-- + net/bluetooth/hci_core.c | 30 +++ + net/bluetooth/hci_debugfs.c | 19 ++ + net/bluetooth/hci_event.c | 330 +++++++++++++++++++++++------ + net/bluetooth/hci_request.c | 138 ++++++++---- + net/bluetooth/sco.c | 3 +- + 12 files changed, 587 insertions(+), 169 deletions(-) + delete mode 100644 include/linux/platform_data/bt-nokia-h4p.h +Merging mac80211-next/master (518ea3c54eb7 mac80211_hwsim: Add support for HE) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 123 ++++++++++++++++++++++++++++++++++ + net/mac80211/tx.c | 2 +- + 2 files changed, 124 insertions(+), 1 deletion(-) +Merging gfs2/for-next (e2b8bd8c3088 gfs2: remove redundant variable 'moved') +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/acl.c | 6 +- + fs/gfs2/aops.c | 337 +++-------------------------------------- + fs/gfs2/aops.h | 19 +++ + fs/gfs2/bmap.c | 412 +++++++++++++++++++++++++++++++++++++++++---------- + fs/gfs2/dir.c | 4 +- + fs/gfs2/file.c | 161 ++++++++++++++++++-- + fs/gfs2/incore.h | 2 - + fs/gfs2/lock_dlm.c | 20 ++- + fs/gfs2/log.c | 28 +++- + fs/gfs2/lops.c | 2 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/recovery.c | 7 +- + fs/gfs2/rgrp.c | 78 +++++++--- + fs/gfs2/super.c | 1 - + fs/gfs2/sys.c | 11 +- + fs/gfs2/trace_gfs2.h | 3 +- + fs/gfs2/trans.h | 6 +- + fs/gfs2/util.c | 38 ++--- + fs/gfs2/util.h | 10 +- + 19 files changed, 669 insertions(+), 480 deletions(-) + create mode 100644 fs/gfs2/aops.h +Merging mtd/mtd/next (d70420bcd447 mtd: adapt misleading comment in mtd_oob_ops structure) +$ git merge mtd/mtd/next +Auto-merging lib/Makefile +Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/brcm,trx.txt | 37 ++++++++++++++++++++++ + drivers/mtd/Kconfig | 24 +++++++------- + drivers/mtd/chips/Kconfig | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 2 -- + drivers/mtd/chips/gen_probe.c | 7 ++-- + drivers/mtd/devices/Kconfig | 4 +-- + drivers/mtd/devices/powernv_flash.c | 1 + + drivers/mtd/devices/sst25l.c | 5 ++- + drivers/mtd/lpddr/Kconfig | 8 ++--- + drivers/mtd/maps/Kconfig | 24 +++++++------- + drivers/mtd/maps/gpio-addr-flash.c | 3 ++ + drivers/mtd/maps/impa7.c | 5 ++- + drivers/mtd/maps/intel_vr_nor.c | 2 +- + drivers/mtd/maps/latch-addr-flash.c | 5 ++- + drivers/mtd/maps/rbtx4939-flash.c | 3 +- + drivers/mtd/mtdchar.c | 10 ++++-- + drivers/mtd/mtdcore.c | 28 ++++++++++++---- + drivers/mtd/nftlmount.c | 3 +- + drivers/mtd/parsers/parser_trx.c | 7 ++++ + fs/jffs2/dir.c | 32 +++++++++---------- + fs/jffs2/file.c | 6 ++-- + fs/jffs2/fs.c | 12 +++---- + fs/jffs2/os-linux.h | 13 ++++---- + include/linux/mtd/mtd.h | 8 +++-- + lib/Makefile | 1 + + lib/bch.c | 23 +++++++++----- + 26 files changed, 175 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,trx.txt +Merging nand/nand/next (db4a671e39ff mtd: rawnand: add hooks that may be called during nand_scan()) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Auto-merging arch/mips/txx9/generic/setup.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/denali-nand.txt | 5 + + Documentation/devicetree/bindings/mtd/nand.txt | 6 +- + .../bindings/mtd/nvidia-tegra20-nand.txt | 64 + + .../devicetree/bindings/mtd/qcom_nandc.txt | 7 +- + Documentation/devicetree/bindings/mtd/spi-nand.txt | 5 + + MAINTAINERS | 7 + + arch/arm/mach-pxa/balloon3.c | 1 - + arch/arm/mach-pxa/em-x270.c | 1 - + arch/mips/jz4740/board-qi_lb60.c | 3 +- + arch/mips/txx9/generic/setup.c | 2 +- + arch/mips/txx9/generic/setup_tx4938.c | 2 +- + arch/mips/txx9/generic/setup_tx4939.c | 2 +- + drivers/bcma/Kconfig | 3 +- + drivers/memory/Kconfig | 6 +- + drivers/mtd/nand/Kconfig | 1 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/onenand/generic.c | 5 +- + drivers/mtd/nand/onenand/samsung.c | 5 +- + drivers/mtd/nand/raw/Kconfig | 162 +-- + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/atmel/nand-controller.c | 25 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 +- + drivers/mtd/nand/raw/cafe_nand.c | 8 - + drivers/mtd/nand/raw/cmx270_nand.c | 4 +- + drivers/mtd/nand/raw/cs553x_nand.c | 3 +- + drivers/mtd/nand/raw/davinci_nand.c | 36 +- + drivers/mtd/nand/raw/denali.c | 79 +- + drivers/mtd/nand/raw/denali.h | 1 + + drivers/mtd/nand/raw/denali_dt.c | 70 +- + drivers/mtd/nand/raw/denali_pci.c | 1 + + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/docg4.c | 26 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 6 +- + drivers/mtd/nand/raw/fsmc_nand.c | 35 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 15 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 20 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 11 +- + drivers/mtd/nand/raw/jz4740_nand.c | 9 +- + drivers/mtd/nand/raw/jz4780_nand.c | 7 +- + drivers/mtd/nand/raw/marvell_nand.c | 97 +- + drivers/mtd/nand/raw/mtk_nand.c | 4 +- + drivers/mtd/nand/raw/mxc_nand.c | 21 +- + drivers/mtd/nand/raw/nand_base.c | 217 ++-- + drivers/mtd/nand/raw/nand_bbt.c | 10 +- + drivers/mtd/nand/raw/nand_hynix.c | 23 + + drivers/mtd/nand/raw/nand_micron.c | 344 +++++- + drivers/mtd/nand/raw/nand_timings.c | 20 +- + drivers/mtd/nand/raw/nandsim.c | 2 +- + drivers/mtd/nand/raw/ndfc.c | 4 +- + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/raw/orion_nand.c | 9 +- + drivers/mtd/nand/raw/oxnas_nand.c | 4 +- + drivers/mtd/nand/raw/plat_nand.c | 2 - + drivers/mtd/nand/raw/qcom_nandc.c | 520 ++++++--- + drivers/mtd/nand/raw/s3c2410.c | 22 +- + drivers/mtd/nand/raw/sharpsl.c | 5 +- + drivers/mtd/nand/raw/sunxi_nand.c | 10 +- + drivers/mtd/nand/raw/tango_nand.c | 4 +- + drivers/mtd/nand/raw/tegra_nand.c | 1232 ++++++++++++++++++++ + drivers/mtd/nand/raw/txx9ndfmc.c | 8 +- + drivers/mtd/nand/spi/Kconfig | 7 + + drivers/mtd/nand/spi/Makefile | 3 + + drivers/mtd/nand/spi/core.c | 1155 ++++++++++++++++++ + drivers/mtd/nand/spi/macronix.c | 144 +++ + drivers/mtd/nand/spi/micron.c | 133 +++ + drivers/mtd/nand/spi/winbond.c | 141 +++ + include/linux/mtd/rawnand.h | 94 +- + include/linux/mtd/spinand.h | 421 +++++++ + .../linux/platform_data/jz4740}/jz4740_nand.h | 4 +- + include/linux/platform_data/mtd-orion_nand.h | 1 - + .../linux/platform_data}/txx9/ndfmc.h | 6 +- + include/linux/spi/spi-mem.h | 4 +- + 73 files changed, 4628 insertions(+), 702 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/spi-nand.txt + create mode 100644 drivers/mtd/nand/raw/tegra_nand.c + create mode 100644 drivers/mtd/nand/spi/Kconfig + create mode 100644 drivers/mtd/nand/spi/Makefile + create mode 100644 drivers/mtd/nand/spi/core.c + create mode 100644 drivers/mtd/nand/spi/macronix.c + create mode 100644 drivers/mtd/nand/spi/micron.c + create mode 100644 drivers/mtd/nand/spi/winbond.c + create mode 100644 include/linux/mtd/spinand.h + rename {arch/mips/include/asm/mach-jz4740 => include/linux/platform_data/jz4740}/jz4740_nand.h (91%) + rename {arch/mips/include/asm => include/linux/platform_data}/txx9/ndfmc.h (91%) +Merging spi-nor/spi-nor/next (a3804084ddf0 mtd: spi-nor: stm32-quadspi: replace "%p" with "%pK") +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 5 +---- + drivers/mtd/spi-nor/atmel-quadspi.c | 21 +++++++++++++++++++++ + drivers/mtd/spi-nor/nxp-spifi.c | 1 + + drivers/mtd/spi-nor/stm32-quadspi.c | 6 +++--- + 4 files changed, 26 insertions(+), 7 deletions(-) +Merging crypto/master (d6be72ee2c77 crypto: chtls - use 64-bit arithmetic instead of 32-bit) +$ git merge crypto/master +Auto-merging security/keys/dh.c +Removing include/crypto/vmac.h +Auto-merging crypto/sha3_generic.c +Auto-merging crypto/morus640.c +Auto-merging arch/arm64/crypto/aes-glue.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/api-samples.rst | 2 +- + .../bindings/crypto/inside-secure-safexcel.txt | 15 +- + MAINTAINERS | 2 +- + arch/arm/crypto/ghash-ce-glue.c | 5 +- + arch/arm/crypto/sha1-ce-glue.c | 1 - + arch/arm/crypto/sha1_glue.c | 1 - + arch/arm/crypto/sha1_neon_glue.c | 1 - + arch/arm/crypto/sha2-ce-glue.c | 2 - + arch/arm/crypto/sha256_glue.c | 2 - + arch/arm/crypto/sha256_neon_glue.c | 2 - + arch/arm/crypto/sha512-glue.c | 2 - + arch/arm/crypto/sha512-neon-glue.c | 2 - + arch/arm64/crypto/aes-glue.c | 3 - + arch/arm64/crypto/ghash-ce-glue.c | 1 - + arch/arm64/crypto/sha1-ce-glue.c | 1 - + arch/arm64/crypto/sha2-ce-glue.c | 2 - + arch/arm64/crypto/sha256-glue.c | 4 - + arch/arm64/crypto/sha3-ce-glue.c | 4 - + arch/arm64/crypto/sha512-ce-glue.c | 2 - + arch/arm64/crypto/sha512-glue.c | 2 - + arch/arm64/crypto/sm3-ce-glue.c | 1 - + arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - + arch/mips/cavium-octeon/crypto/octeon-sha1.c | 1 - + arch/mips/cavium-octeon/crypto/octeon-sha256.c | 2 - + arch/mips/cavium-octeon/crypto/octeon-sha512.c | 2 - + arch/powerpc/crypto/md5-glue.c | 1 - + arch/powerpc/crypto/sha1-spe-glue.c | 1 - + arch/powerpc/crypto/sha1.c | 1 - + arch/powerpc/crypto/sha256-spe-glue.c | 2 - + arch/s390/crypto/aes_s390.c | 1 - + arch/s390/crypto/ghash_s390.c | 1 - + arch/s390/crypto/sha1_s390.c | 1 - + arch/s390/crypto/sha256_s390.c | 2 - + arch/s390/crypto/sha512_s390.c | 2 - + arch/sparc/crypto/md5_glue.c | 1 - + arch/sparc/crypto/sha1_glue.c | 1 - + arch/sparc/crypto/sha256_glue.c | 2 - + arch/sparc/crypto/sha512_glue.c | 2 - + arch/x86/crypto/ghash-clmulni-intel_glue.c | 6 +- + arch/x86/crypto/poly1305_glue.c | 1 - + arch/x86/crypto/sha1-mb/sha1_mb.c | 17 +- + arch/x86/crypto/sha1_ssse3_glue.c | 4 - + arch/x86/crypto/sha256-mb/sha256_mb.c | 18 +- + .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 2 +- + arch/x86/crypto/sha256_ssse3_glue.c | 8 - + arch/x86/crypto/sha512-mb/sha512_mb.c | 18 +- + arch/x86/crypto/sha512_ssse3_glue.c | 6 - + crypto/ablkcipher.c | 2 + + crypto/aegis128.c | 1 - + crypto/aegis128l.c | 3 +- + crypto/aegis256.c | 1 - + crypto/blkcipher.c | 1 + + crypto/crypto_null.c | 1 - + crypto/dh.c | 66 ++- + crypto/dh_helper.c | 15 +- + crypto/ecc.c | 42 +- + crypto/ecc_curve_defs.h | 22 +- + crypto/ghash-generic.c | 1 - + crypto/md4.c | 1 - + crypto/md5.c | 1 - + crypto/morus1280.c | 1 - + crypto/morus640.c | 1 - + crypto/poly1305_generic.c | 1 - + crypto/rmd128.c | 1 - + crypto/rmd160.c | 1 - + crypto/rmd256.c | 1 - + crypto/rmd320.c | 1 - + crypto/sha1_generic.c | 2 +- + crypto/sha256_generic.c | 4 +- + crypto/sha3_generic.c | 4 - + crypto/sha512_generic.c | 26 +- + crypto/skcipher.c | 1 - + crypto/sm3_generic.c | 1 - + crypto/tcrypt.c | 2 +- + crypto/testmgr.c | 59 ++- + crypto/testmgr.h | 217 +++++--- + crypto/tgr192.c | 3 - + crypto/vmac.c | 444 ++++++++--------- + crypto/wp512.c | 3 - + drivers/crypto/Kconfig | 2 + + drivers/crypto/amcc/crypto4xx_core.c | 18 +- + drivers/crypto/atmel-ecc.c | 35 +- + drivers/crypto/atmel-sha.c | 4 +- + drivers/crypto/axis/artpec6_crypto.c | 28 +- + drivers/crypto/bcm/cipher.c | 8 +- + drivers/crypto/caam/caamhash.c | 3 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 2 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 3 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 3 +- + drivers/crypto/ccp/psp-dev.c | 32 +- + drivers/crypto/ccp/psp-dev.h | 19 +- + drivers/crypto/ccp/sp-dev.h | 7 +- + drivers/crypto/ccp/sp-pci.c | 36 +- + drivers/crypto/ccree/cc_cipher.c | 140 ++++-- + drivers/crypto/ccree/cc_driver.c | 4 +- + drivers/crypto/ccree/cc_hash.c | 85 +--- + drivers/crypto/chelsio/chcr_algo.c | 7 +- + drivers/crypto/chelsio/chtls/chtls_hw.c | 2 +- + drivers/crypto/inside-secure/safexcel.c | 469 +++++++++++------ + drivers/crypto/inside-secure/safexcel.h | 196 +++++--- + drivers/crypto/inside-secure/safexcel_cipher.c | 487 ++++++++++++++---- + drivers/crypto/inside-secure/safexcel_hash.c | 555 ++++++++++++++++++--- + drivers/crypto/inside-secure/safexcel_ring.c | 58 ++- + drivers/crypto/marvell/hash.c | 3 +- + drivers/crypto/n2_core.c | 3 +- + drivers/crypto/nx/nx-aes-xcbc.c | 1 - + drivers/crypto/nx/nx-sha256.c | 1 - + drivers/crypto/nx/nx-sha512.c | 1 - + drivers/crypto/omap-sham.c | 36 +- + drivers/crypto/padlock-sha.c | 8 +- + drivers/crypto/qce/sha.c | 3 +- + drivers/crypto/s5p-sss.c | 9 +- + drivers/crypto/sahara.c | 6 +- + drivers/crypto/stm32/stm32-cryp.c | 62 +++ + drivers/crypto/stm32/stm32-hash.c | 95 +++- + drivers/crypto/stm32/stm32_crc32.c | 62 +++ + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 20 +- + drivers/crypto/talitos.c | 37 +- + drivers/crypto/ux500/hash/hash_core.c | 15 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 112 +++-- + drivers/crypto/virtio/virtio_crypto_common.h | 25 +- + drivers/crypto/virtio/virtio_crypto_core.c | 29 ++ + drivers/crypto/virtio/virtio_crypto_mgr.c | 81 ++- + drivers/crypto/vmx/ghash.c | 2 +- + drivers/staging/skein/skein_generic.c | 3 - + include/crypto/dh.h | 4 + + include/crypto/sha.h | 4 + + include/crypto/vmac.h | 63 --- + security/keys/dh.c | 2 +- + 129 files changed, 2635 insertions(+), 1346 deletions(-) + delete mode 100644 include/crypto/vmac.h +Merging drm/drm-next (539c475dadc4 Merge tag 'drm-intel-next-2018-07-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.c +Removing drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +Auto-merging drivers/gpu/drm/sun4i/Makefile +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.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/gvt/mmio_context.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio.h +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/gvt.h +Auto-merging drivers/gpu/drm/i915/gvt/gtt.c +Auto-merging drivers/gpu/drm/i915/gvt/display.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_plane.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +Removing drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.h +Removing drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/display/panel/edt,etm0700g0dh6.txt +Removing Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 284f3143c4fd] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 6 + + .../devicetree/bindings/display/ilitek,ili9341.txt | 27 + + .../bindings/display/mediatek/mediatek,disp.txt | 2 +- + .../bindings/display/panel/auo,g070vvn01.txt | 29 + + .../bindings/display/panel/boe,hv070wsa-100.txt | 28 + + .../display/panel/dataimage,scf0700c48ggu18.txt | 8 + + .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 + + .../bindings/display/panel/edt,et-series.txt | 39 + + .../bindings/display/panel/edt,et070080dh6.txt | 10 - + .../bindings/display/panel/edt,etm0700g0dh6.txt | 10 - + .../bindings/display/panel/ilitek,ili9881c.txt | 20 + + .../bindings/display/panel/innolux,g070y2-l01.txt | 12 + + .../bindings/display/panel/innolux,p097pfg.txt | 24 + + .../bindings/display/panel/innolux,tv123wam.txt | 20 + + .../display/panel/kingdisplay,kd097d04.txt | 22 + + ...0dhu.txt => newhaven,nhd-4.3-480272ef-atxl.txt} | 4 +- + .../display/panel/rocktech,rk070er9427.txt | 25 + + .../bindings/display/panel/sharp,lq035q7db03.txt | 12 + + .../bindings/display/sunxi/sun4i-drm.txt | 64 +- + .../devicetree/bindings/vendor-prefixes.txt | 4 + + Documentation/driver-api/dma-buf.rst | 6 + + Documentation/gpu/amdgpu.rst | 129 + + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-client.rst | 12 + + Documentation/gpu/drm-kms.rst | 15 + + Documentation/gpu/drm-mm.rst | 20 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/kms-properties.csv | 1 + + Documentation/gpu/v3d.rst | 28 + + Documentation/locking/ww-mutex-design.txt | 65 +- + drivers/dma-buf/dma-buf.c | 56 +- + drivers/dma-buf/dma-fence-array.c | 1 - + drivers/dma-buf/dma-fence.c | 167 +- + drivers/dma-buf/reservation.c | 2 +- + drivers/dma-buf/sw_sync.c | 1 - + drivers/gpu/drm/Kconfig | 11 + + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 182 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 251 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 202 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 207 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 311 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 128 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 288 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 40 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 36 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 72 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 289 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 29 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 23 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 457 +++ + drivers/gpu/drm/amd/display/Kconfig | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 170 + + .../amdgpu_dm/amdgpu_dm_debugfs.h} | 18 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 28 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 535 +++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 329 -- + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 2 + + drivers/gpu/drm/amd/display/dc/basics/logger.c | 83 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 196 ++ + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 218 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 46 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 194 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 80 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 424 ++- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 11 + + drivers/gpu/drm/amd/display/dc/dc.h | 25 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 61 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 35 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 21 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 718 ++-- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h | 93 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 3 - + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 5 - + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 49 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 16 +- + .../drm/amd/display/dc/dce110/dce110_compressor.c | 6 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 396 +-- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 8 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 23 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 24 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 20 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 28 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 362 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 341 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 32 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 74 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 88 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 6 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 5 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 63 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 79 - + .../gpu/drm/amd/display/dc/dml/soc_bounding_box.h | 35 - + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 16 + + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h | 41 +- + .../display/dc/i2caux/dce110/aux_engine_dce110.c | 56 +- + drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + .../gpu/drm/amd/display/dc/inc/hw/display_clock.h | 43 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 11 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + .../drm/amd/display/include/ddc_service_types.h | 3 +- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 7 + + .../gpu/drm/amd/display/include/grph_object_defs.h | 46 + + .../gpu/drm/amd/display/include/grph_object_id.h | 16 + + .../gpu/drm/amd/display/include/logger_interface.h | 2 + + .../drm/amd/display/modules/color/color_gamma.c | 137 + + drivers/gpu/drm/amd/display/modules/stats/stats.c | 4 +- + drivers/gpu/drm/amd/include/amd_pcie.h | 2 + + drivers/gpu/drm/amd/include/amd_shared.h | 46 +- + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 20 + + drivers/gpu/drm/amd/include/dm_pp_interface.h | 37 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 15 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 100 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 12 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 56 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 139 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 42 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 140 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 1051 +++--- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 10 + + .../amd/powerplay/hwmgr/vega12_processpptables.c | 6 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 2 - + .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 18 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 119 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 74 - + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 10 - + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 86 - + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 80 - + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 85 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 5 +- + drivers/gpu/drm/arm/Makefile | 1 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- + drivers/gpu/drm/arm/malidp_crtc.c | 10 + + drivers/gpu/drm/arm/malidp_drv.c | 177 +- + drivers/gpu/drm/arm/malidp_drv.h | 26 + + drivers/gpu/drm/arm/malidp_hw.c | 297 +- + drivers/gpu/drm/arm/malidp_hw.h | 40 +- + drivers/gpu/drm/arm/malidp_mw.c | 250 ++ + drivers/gpu/drm/arm/malidp_mw.h | 14 + + drivers/gpu/drm/arm/malidp_regs.h | 24 +- + drivers/gpu/drm/armada/armada_fb.c | 23 +- + drivers/gpu/drm/armada/armada_fb.h | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 19 +- + drivers/gpu/drm/bridge/Kconfig | 4 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 6 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 10 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 20 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 43 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 408 ++- + drivers/gpu/drm/drm_atomic_helper.c | 112 +- + drivers/gpu/drm/drm_client.c | 406 +++ + drivers/gpu/drm/drm_connector.c | 163 +- + drivers/gpu/drm/drm_crtc.c | 46 +- + drivers/gpu/drm/drm_crtc_internal.h | 22 +- + drivers/gpu/drm/drm_debugfs.c | 7 + + drivers/gpu/drm/drm_debugfs_crc.c | 9 +- + drivers/gpu/drm/drm_drv.c | 8 + + drivers/gpu/drm/drm_dumb_buffers.c | 29 +- + drivers/gpu/drm/drm_edid.c | 279 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 355 +- + drivers/gpu/drm/drm_fb_helper.c | 359 +- + drivers/gpu/drm/drm_file.c | 306 +- + drivers/gpu/drm/drm_framebuffer.c | 49 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 2 +- + drivers/gpu/drm/drm_global.c | 2 +- + drivers/gpu/drm/drm_internal.h | 2 + + drivers/gpu/drm/drm_ioctl.c | 11 +- + drivers/gpu/drm/drm_mm.c | 91 +- + drivers/gpu/drm/drm_mode_config.c | 5 + + drivers/gpu/drm/drm_modes.c | 17 +- + drivers/gpu/drm/drm_of.c | 18 +- + drivers/gpu/drm/drm_panel.c | 27 +- + drivers/gpu/drm/drm_pci.c | 58 - + drivers/gpu/drm/drm_plane.c | 41 +- + drivers/gpu/drm/drm_plane_helper.c | 12 +- + drivers/gpu/drm/drm_prime.c | 34 +- + drivers/gpu/drm/drm_probe_helper.c | 13 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/drm_syncobj.c | 1 - + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/drm_vma_manager.c | 1 + + drivers/gpu/drm/drm_writeback.c | 353 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 - + drivers/gpu/drm/exynos/exynos_dp.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 + + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 62 +- + drivers/gpu/drm/gma500/framebuffer.h | 1 - + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 18 +- + drivers/gpu/drm/gma500/gtt.h | 2 + + drivers/gpu/drm/gma500/mdfld_intel_display.c | 3 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - + drivers/gpu/drm/i2c/tda998x_drv.c | 13 +- + drivers/gpu/drm/i810/i810_dma.c | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 12 + + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 20 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 22 +- + drivers/gpu/drm/i915/dvo_ivch.c | 26 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 44 +- + drivers/gpu/drm/i915/dvo_sil164.c | 10 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 16 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 43 +- + drivers/gpu/drm/i915/gvt/display.c | 62 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 26 +- + drivers/gpu/drm/i915/gvt/edid.c | 20 +- + drivers/gpu/drm/i915/gvt/execlist.h | 13 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 +- + drivers/gpu/drm/i915/gvt/firmware.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 11 +- + drivers/gpu/drm/i915/gvt/gvt.c | 27 +- + drivers/gpu/drm/i915/gvt/gvt.h | 20 +- + drivers/gpu/drm/i915/gvt/handlers.c | 399 ++- + drivers/gpu/drm/i915/gvt/interrupt.c | 17 +- + drivers/gpu/drm/i915/gvt/mmio.c | 12 +- + drivers/gpu/drm/i915/gvt/mmio.h | 11 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 22 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +- + drivers/gpu/drm/i915/gvt/page_track.c | 5 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 36 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 208 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 - + drivers/gpu/drm/i915/gvt/vgpu.c | 56 +- + drivers/gpu/drm/i915/i915_debugfs.c | 222 +- + drivers/gpu/drm/i915/i915_drv.c | 137 +- + drivers/gpu/drm/i915/i915_drv.h | 97 +- + drivers/gpu/drm/i915/i915_gem.c | 529 +-- + drivers/gpu/drm/i915/i915_gem.h | 21 + + drivers/gpu/drm/i915/i915_gem_context.c | 174 +- + drivers/gpu/drm/i915/i915_gem_context.h | 28 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 11 - + drivers/gpu/drm/i915/i915_gem_evict.c | 3 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 115 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1194 +++---- + drivers/gpu/drm/i915/i915_gem_gtt.h | 76 +- + drivers/gpu/drm/i915/i915_gem_object.h | 13 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 4 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 13 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 7 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 58 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 561 ++- + drivers/gpu/drm/i915/i915_params.c | 3 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 144 +- + drivers/gpu/drm/i915/i915_pmu.c | 67 +- + drivers/gpu/drm/i915/i915_pmu.h | 8 + + drivers/gpu/drm/i915/i915_pvinfo.h | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 3655 +++++++++++--------- + drivers/gpu/drm/i915/i915_request.c | 100 +- + drivers/gpu/drm/i915/i915_request.h | 14 +- + drivers/gpu/drm/i915/i915_timeline.h | 2 + + drivers/gpu/drm/i915/i915_trace.h | 148 +- + drivers/gpu/drm/i915/i915_vgpu.c | 8 +- + drivers/gpu/drm/i915/i915_vgpu.h | 6 + + drivers/gpu/drm/i915/i915_vma.c | 377 +- + drivers/gpu/drm/i915/i915_vma.h | 53 +- + drivers/gpu/drm/i915/icl_dsi.c | 127 + + drivers/gpu/drm/i915/intel_acpi.c | 27 +- + drivers/gpu/drm/i915/intel_atomic.c | 7 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 18 +- + drivers/gpu/drm/i915/intel_audio.c | 48 +- + drivers/gpu/drm/i915/intel_bios.c | 129 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 16 +- + drivers/gpu/drm/i915/intel_cdclk.c | 61 +- + drivers/gpu/drm/i915/intel_crt.c | 55 +- + drivers/gpu/drm/i915/intel_ddi.c | 177 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_display.c | 755 ++-- + drivers/gpu/drm/i915/intel_display.h | 22 +- + drivers/gpu/drm/i915/intel_dp.c | 287 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 12 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 39 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 12 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 205 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 18 +- + drivers/gpu/drm/i915/intel_drv.h | 47 +- + drivers/gpu/drm/i915/intel_dsi.h | 34 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 15 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 279 +- + drivers/gpu/drm/i915/intel_fbc.c | 129 +- + drivers/gpu/drm/i915/intel_fbdev.c | 9 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 - + drivers/gpu/drm/i915/intel_guc.c | 158 +- + drivers/gpu/drm/i915/intel_guc.h | 5 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +- + drivers/gpu/drm/i915/intel_guc_log.c | 70 +- + drivers/gpu/drm/i915/intel_guc_log.h | 26 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 76 +- + drivers/gpu/drm/i915/intel_gvt.c | 2 + + drivers/gpu/drm/i915/intel_hangcheck.c | 17 +- + drivers/gpu/drm/i915/intel_hdmi.c | 140 +- + drivers/gpu/drm/i915/intel_huc.c | 8 + + drivers/gpu/drm/i915/intel_huc.h | 6 + + drivers/gpu/drm/i915/intel_i2c.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 871 +++-- + drivers/gpu/drm/i915/intel_lrc.h | 7 - + drivers/gpu/drm/i915/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 66 +- + drivers/gpu/drm/i915/intel_opregion.c | 31 +- + drivers/gpu/drm/i915/intel_opregion.h | 1 + + drivers/gpu/drm/i915/intel_panel.c | 8 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 445 --- + drivers/gpu/drm/i915/intel_psr.c | 620 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 394 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 101 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 333 +- + drivers/gpu/drm/i915/intel_sdvo.c | 47 +- + drivers/gpu/drm/i915/intel_sprite.c | 291 +- + drivers/gpu/drm/i915/intel_tv.c | 20 +- + drivers/gpu/drm/i915/intel_uc.c | 165 +- + drivers/gpu/drm/i915/intel_uncore.c | 28 +- + drivers/gpu/drm/i915/intel_uncore.h | 22 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 14 +- + drivers/gpu/drm/i915/intel_workarounds.c | 170 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 76 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 47 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 188 +- + drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 39 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 173 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 63 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 34 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 33 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 55 +- + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 89 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 18 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 16 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 7 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 14 - + drivers/gpu/drm/i915/selftests/mock_engine.c | 49 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 20 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 65 +- + drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} | 117 +- + .../drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 98 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 + + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 235 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 102 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 76 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 7 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 3 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 4 +- + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 8 +- + drivers/gpu/drm/msm/msm_fb.c | 54 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 2 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 4 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +- + drivers/gpu/drm/omapdrm/dss/display.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 5 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 73 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 2 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 1 + + drivers/gpu/drm/omapdrm/omap_debugfs.c | 9 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 109 +- + drivers/gpu/drm/omapdrm/omap_fb.h | 2 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 286 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 19 - + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 503 +++ + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 352 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 1 - + drivers/gpu/drm/panel/panel-lvds.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 58 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 1 - + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 1 - + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 1 - + drivers/gpu/drm/panel/panel-simple.c | 296 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 1 - + drivers/gpu/drm/pl111/Makefile | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 54 +- + drivers/gpu/drm/pl111/pl111_drm.h | 5 + + drivers/gpu/drm/pl111/pl111_drv.c | 46 +- + drivers/gpu/drm/pl111/pl111_nomadik.c | 36 + + drivers/gpu/drm/pl111/pl111_nomadik.h | 18 + + drivers/gpu/drm/qxl/qxl_release.c | 7 - + drivers/gpu/drm/radeon/ci_dpm.c | 20 +- + drivers/gpu/drm/radeon/cik.c | 22 +- + drivers/gpu/drm/radeon/r600_dpm.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 4 + + drivers/gpu/drm/radeon/radeon_connectors.c | 90 +- + drivers/gpu/drm/radeon/radeon_test.c | 1 + + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/radeon/si.c | 22 +- + drivers/gpu/drm/radeon/si_dpm.c | 20 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 4 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 16 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 86 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 3 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 75 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 23 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 6 +- + drivers/gpu/drm/savage/savage_state.c | 2 +- + drivers/gpu/drm/scheduler/gpu_scheduler.c | 293 +- + drivers/gpu/drm/scheduler/sched_fence.c | 11 - + drivers/gpu/drm/selftests/drm_mm_selftests.h | 2 + + drivers/gpu/drm/selftests/test-drm_mm.c | 71 + + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 4 +- + drivers/gpu/drm/sti/sti_gdp.c | 8 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/stm/ltdc.c | 21 +- + drivers/gpu/drm/stm/ltdc.h | 1 + + drivers/gpu/drm/sun4i/Makefile | 2 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 122 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 67 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 115 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 41 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 8 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 54 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 90 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 26 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 274 ++ + drivers/gpu/drm/sun4i/sun8i_tcon_top.h | 44 + + drivers/gpu/drm/tegra/dsi.c | 3 + + drivers/gpu/drm/tegra/gem.c | 14 - + drivers/gpu/drm/tegra/output.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 +- + drivers/gpu/drm/tinydrm/Kconfig | 10 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 +- + drivers/gpu/drm/tinydrm/ili9225.c | 1 - + drivers/gpu/drm/tinydrm/ili9341.c | 232 ++ + drivers/gpu/drm/tinydrm/mi0283qt.c | 1 - + drivers/gpu/drm/tinydrm/mipi-dbi.c | 2 + + drivers/gpu/drm/tinydrm/st7586.c | 1 - + drivers/gpu/drm/tinydrm/st7735r.c | 1 - + drivers/gpu/drm/ttm/ttm_bo_vm.c | 45 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 18 - + drivers/gpu/drm/udl/udl_drv.h | 3 +- + drivers/gpu/drm/udl/udl_gem.c | 15 +- + drivers/gpu/drm/v3d/v3d_bo.c | 28 +- + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_fence.c | 17 - + drivers/gpu/drm/v3d/v3d_gem.c | 11 +- + drivers/gpu/drm/v3d/v3d_irq.c | 3 - + drivers/gpu/drm/v3d/v3d_regs.h | 1 + + drivers/gpu/drm/v3d/v3d_sched.c | 26 +- + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 147 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.h | 10 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 57 +- + drivers/gpu/drm/vc4/vc4_fence.c | 8 - + drivers/gpu/drm/vc4/vc4_kms.c | 11 +- + drivers/gpu/drm/vc4/vc4_plane.c | 98 +- + drivers/gpu/drm/vc4/vc4_regs.h | 6 + + drivers/gpu/drm/vc4/vc4_txp.c | 477 +++ + drivers/gpu/drm/vgem/vgem_drv.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - + drivers/gpu/drm/virtio/virtgpu_fb.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 7 - + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +- + drivers/gpu/drm/vkms/Makefile | 3 + + drivers/gpu/drm/vkms/vkms_crtc.c | 35 + + drivers/gpu/drm/vkms/vkms_drv.c | 139 + + drivers/gpu/drm/vkms/vkms_drv.h | 31 + + drivers/gpu/drm/vkms/vkms_output.c | 91 + + drivers/gpu/drm/vkms/vkms_plane.c | 46 + + drivers/gpu/drm/vmwgfx/Kconfig | 1 + + drivers/gpu/drm/vmwgfx/Makefile | 4 +- + .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 3 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 233 +- + .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 86 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 300 +- + .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 7 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 3 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 1094 +++--- + .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 334 +- + .../gpu/drm/vmwgfx/device_include/svga_escape.h | 3 +- + .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 3 +- + drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 211 +- + drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 6 +- + .../drm/vmwgfx/device_include/vmware_pack_begin.h | 25 +- + .../drm/vmwgfx/device_include/vmware_pack_end.h | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1123 ++++++ + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 376 -- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 72 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 186 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 122 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 41 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 42 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 602 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 80 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 709 +--- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 144 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 107 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 553 ++- + .../{vmwgfx_buffer.c => vmwgfx_ttm_buffer.c} | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front.h | 4 +- + drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +- + drivers/pci/pci.c | 2 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/tee/tee_shm.c | 6 - + include/drm/drmP.h | 23 +- + include/drm/drm_atomic.h | 14 +- + include/drm/drm_atomic_helper.h | 1 + + include/drm/drm_bridge.h | 48 +- + include/drm/drm_client.h | 139 + + include/drm/drm_connector.h | 58 +- + include/drm/drm_crtc.h | 38 +- + include/drm/drm_debugfs_crc.h | 3 +- + include/drm/drm_device.h | 21 + + include/drm/drm_encoder.h | 16 +- + include/drm/drm_fb_cma_helper.h | 6 - + include/drm/drm_fb_helper.h | 38 + + include/drm/drm_file.h | 7 + + include/drm/drm_mm.h | 34 +- + include/drm/drm_mode_config.h | 36 +- + include/drm/drm_modeset_helper_vtables.h | 15 + + include/drm/drm_of.h | 8 + + include/drm/drm_panel.h | 3 +- + include/drm/drm_pci.h | 7 - + include/drm/drm_plane.h | 23 +- + include/drm/drm_plane_helper.h | 6 +- + include/drm/drm_prime.h | 6 +- + include/drm/drm_writeback.h | 136 + + include/drm/gpu_scheduler.h | 162 +- + include/drm/i915_pciids.h | 37 +- + include/drm/tinydrm/tinydrm.h | 23 +- + include/dt-bindings/clock/sun8i-tcon-top.h | 11 + + include/linux/dma-buf.h | 21 +- + include/linux/dma-fence.h | 32 +- + include/linux/pci.h | 3 + + include/linux/ww_mutex.h | 45 +- + include/uapi/drm/amdgpu_drm.h | 26 +- + include/uapi/drm/drm.h | 9 + + include/uapi/drm/drm_fourcc.h | 80 + + include/uapi/drm/drm_mode.h | 8 + + include/uapi/drm/vmwgfx_drm.h | 166 +- + kernel/locking/locktorture.c | 2 +- + kernel/locking/mutex.c | 345 +- + kernel/locking/test-ww_mutex.c | 2 +- + lib/locking-selftest.c | 2 +- + 696 files changed, 30883 insertions(+), 16846 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/edt,et-series.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/edt,etm0700g0dh6.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g070y2-l01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p097pfg.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,tv123wam.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd097d04.txt + rename Documentation/devicetree/bindings/display/panel/{edt,et057090dhu.txt => newhaven,nhd-4.3-480272ef-atxl.txt} (55%) + create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,rk070er9427.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq035q7db03.txt + create mode 100644 Documentation/gpu/amdgpu.rst + create mode 100644 Documentation/gpu/drm-client.rst + create mode 100644 Documentation/gpu/v3d.rst + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c + rename drivers/gpu/drm/amd/{powerplay/inc/pp_power_source.h => display/amdgpu_dm/amdgpu_dm_debugfs.h} (81%) + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.h + create mode 100644 drivers/gpu/drm/arm/malidp_mw.c + create mode 100644 drivers/gpu/drm/arm/malidp_mw.h + create mode 100644 drivers/gpu/drm/drm_client.c + create mode 100644 drivers/gpu/drm/drm_writeback.c + create mode 100644 drivers/gpu/drm/i915/icl_dsi.c + rename drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (96%) + rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (84%) + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c + create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.c + create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h + create mode 100644 drivers/gpu/drm/tinydrm/ili9341.c + create mode 100644 drivers/gpu/drm/vc4/vc4_txp.c + create mode 100644 drivers/gpu/drm/vkms/Makefile + create mode 100644 drivers/gpu/drm/vkms/vkms_crtc.c + create mode 100644 drivers/gpu/drm/vkms/vkms_drv.c + create mode 100644 drivers/gpu/drm/vkms/vkms_drv.h + create mode 100644 drivers/gpu/drm/vkms/vkms_output.c + create mode 100644 drivers/gpu/drm/vkms/vkms_plane.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c + rename drivers/gpu/drm/vmwgfx/{vmwgfx_buffer.c => vmwgfx_ttm_buffer.c} (99%) + create mode 100644 include/drm/drm_client.h + create mode 100644 include/drm/drm_writeback.h + create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.h +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (f7a738fca03c drm/i915/icl: compute the TBT PLL registers) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/intel_display.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/gtt.h +Auto-merging drivers/gpu/drm/i915/gvt/gtt.c +Auto-merging arch/x86/kernel/early-quirks.c +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master edb015188f1b] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/early-quirks.c | 18 + + drivers/gpu/drm/drm_gem.c | 9 + + drivers/gpu/drm/i915/gvt/gtt.c | 423 +++++++++++++++++--- + drivers/gpu/drm/i915/gvt/gtt.h | 9 + + drivers/gpu/drm/i915/gvt/gvt.c | 4 + + drivers/gpu/drm/i915/gvt/handlers.c | 39 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 126 ++++-- + drivers/gpu/drm/i915/gvt/mpt.h | 7 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 150 ++----- + drivers/gpu/drm/i915/i915_drv.c | 40 +- + drivers/gpu/drm/i915/i915_drv.h | 21 +- + drivers/gpu/drm/i915/i915_gem.c | 76 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 104 +++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 9 +- + drivers/gpu/drm/i915/i915_gem_object.h | 14 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 12 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 38 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 18 +- + drivers/gpu/drm/i915/i915_irq.c | 115 +++--- + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 13 +- + drivers/gpu/drm/i915/i915_reg.h | 436 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_selftest.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 8 + + drivers/gpu/drm/i915/intel_ddi.c | 14 +- + drivers/gpu/drm/i915/intel_display.c | 84 +++- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 221 ++--------- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 22 +- + drivers/gpu/drm/i915/intel_drv.h | 55 ++- + drivers/gpu/drm/i915/intel_engine_cs.c | 19 +- + drivers/gpu/drm/i915/intel_guc.c | 2 + + drivers/gpu/drm/i915/intel_guc_submission.c | 72 ++-- + drivers/gpu/drm/i915/intel_gvt.c | 3 + + drivers/gpu/drm/i915/intel_hotplug.c | 118 +++--- + drivers/gpu/drm/i915/intel_i2c.c | 70 +++- + drivers/gpu/drm/i915/intel_lrc.c | 146 ++----- + drivers/gpu/drm/i915/intel_lrc.h | 2 + + drivers/gpu/drm/i915/intel_lvds.c | 136 +------ + drivers/gpu/drm/i915/intel_panel.c | 20 - + drivers/gpu/drm/i915/intel_pm.c | 8 +- + drivers/gpu/drm/i915/intel_psr.c | 17 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 13 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 40 +- + drivers/gpu/drm/i915/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/intel_tv.c | 3 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 6 + + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 113 +++++- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 2 + + drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 +++ + drivers/gpu/drm/i915/selftests/intel_guc.c | 10 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 171 +++++++- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 115 ++++++ + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 8 +- + include/drm/drm_vma_manager.h | 1 + + include/drm/i915_drm.h | 4 +- + 61 files changed, 2242 insertions(+), 1024 deletions(-) + create mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h +$ git am -3 ../patches/0001-drm-i915-kvmgt-merge-fixup-for-Check-the-pfn-got-fro.patch +Applying: drm/i915/kvmgt: merge fixup for "Check the pfn got from vfio_pin_pages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gvt/kvmgt.c +$ git add -A . +$ git commit -v -a --amend +[master 827ff24cd29a] Merge remote-tracking branch 'drm-intel/for-linux-next' + Date: Fri Jul 20 12:36:49 2018 +1000 +Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (106b6c39c870 drm/print: Fix DRM_DEBUG_DP macro) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/sun4i/Makefile +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Merge made by the 'recursive' strategy. + Documentation/gpu/drm-kms-helpers.rst | 26 +- + Documentation/gpu/drm-kms.rst | 13 +- + drivers/dma-buf/reservation.c | 6 +- + drivers/gpu/drm/Kconfig | 10 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +- + drivers/gpu/drm/arc/arcpgu_sim.c | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 6 +- + drivers/gpu/drm/bochs/bochs_kms.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +- + drivers/gpu/drm/bridge/panel.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +- + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_client.c | 8 +- + drivers/gpu/drm/drm_connector.c | 56 +- + drivers/gpu/drm/drm_crtc.c | 15 +- + drivers/gpu/drm/drm_crtc_internal.h | 6 +- + drivers/gpu/drm/drm_debugfs.c | 4 +- + drivers/gpu/drm/drm_dp_cec.c | 428 ++++++++++++++ + drivers/gpu/drm/drm_dp_helper.c | 33 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 4 +- + drivers/gpu/drm/drm_drv.c | 15 +- + drivers/gpu/drm/drm_fourcc.c | 42 +- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 3 +- + drivers/gpu/drm/drm_modes.c | 6 +- + drivers/gpu/drm/drm_of.c | 9 +- + drivers/gpu/drm/drm_plane.c | 148 +++-- + drivers/gpu/drm/drm_probe_helper.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/drm_writeback.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 2 +- + drivers/gpu/drm/gma500/intel_bios.h | 38 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 5 +- + drivers/gpu/drm/i915/intel_dp.c | 23 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 2 - + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_modes.c | 2 +- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/intel_sprite.c | 20 +- + drivers/gpu/drm/imx/imx-ldb.c | 5 +- + drivers/gpu/drm/imx/imx-tve.c | 4 +- + drivers/gpu/drm/imx/parallel-display.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 22 +- + drivers/gpu/drm/meson/meson_vclk.c | 656 +++++++++------------ + drivers/gpu/drm/meson/meson_vclk.h | 4 + + drivers/gpu/drm/meson/meson_venc.c | 378 ++---------- + drivers/gpu/drm/meson/meson_venc.h | 3 +- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- + drivers/gpu/drm/msm/edp/edp_connector.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + drivers/gpu/drm/pl111/pl111_display.c | 2 +- + drivers/gpu/drm/pl111/pl111_drv.c | 15 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 8 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 4 +- + drivers/gpu/drm/stm/drv.c | 10 +- + drivers/gpu/drm/sun4i/Kconfig | 7 + + drivers/gpu/drm/sun4i/Makefile | 3 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 56 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 3 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 5 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 55 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 4 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 61 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 61 +- + drivers/gpu/drm/tegra/dsi.c | 2 +- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/output.c | 2 +- + drivers/gpu/drm/tegra/rgb.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 4 +- + drivers/gpu/drm/tinydrm/Kconfig | 1 + + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.c | 8 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- + drivers/gpu/drm/vc4/vc4_vec.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 95 +++ + drivers/gpu/drm/vkms/vkms_drv.c | 28 +- + drivers/gpu/drm/vkms/vkms_drv.h | 47 ++ + drivers/gpu/drm/vkms/vkms_gem.c | 179 ++++++ + drivers/gpu/drm/vkms/vkms_output.c | 22 +- + drivers/gpu/drm/vkms/vkms_plane.c | 11 + + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- + drivers/gpu/drm/zte/zx_hdmi.c | 4 +- + drivers/gpu/drm/zte/zx_tvenc.c | 2 +- + drivers/gpu/drm/zte/zx_vga.c | 4 +- + drivers/staging/vboxvideo/vbox_mode.c | 4 +- + include/drm/drmP.h | 19 - + include/drm/drm_connector.h | 221 ++++--- + include/drm/drm_crtc.h | 240 ++++++-- + include/drm/drm_dp_helper.h | 56 ++ + include/drm/drm_drv.h | 29 + + include/drm/drm_fourcc.h | 2 + + include/drm/drm_modes.h | 2 +- + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/drm_plane.h | 174 ++++-- + include/drm/drm_print.h | 6 + + include/drm/drm_property.h | 4 +- + include/uapi/drm/drm_fourcc.h | 83 +++ + 169 files changed, 2502 insertions(+), 1390 deletions(-) + create mode 100644 drivers/gpu/drm/drm_dp_cec.c + create mode 100644 drivers/gpu/drm/vkms/vkms_gem.c +Merging drm-msm/msm-next (e35e0193ab73 drm/msm/dsi: replace version checks with helper functions) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 12 +- + drivers/gpu/drm/msm/dsi/dsi.h | 16 ++ + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 56 ++++- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 12 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 355 +++++++++++++++------------ + drivers/gpu/drm/msm/msm_drv.c | 9 + + drivers/gpu/drm/msm/msm_drv.h | 1 + + 10 files changed, 305 insertions(+), 174 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added the late system pm functions) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (81f2b25addde drm/imx: Remove unused field imx_drm_device.pipes) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c +Auto-merging drivers/gpu/drm/imx/imx-ldb.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm-core.c | 9 ++++----- + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/imx-ldb.c | 9 ++++++--- + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + drivers/gpu/ipu-v3/ipu-cpmem.c | 15 +++++++++++++-- + drivers/gpu/ipu-v3/ipu-csi.c | 37 ++++++++++++++++++++++++++++++------- + 6 files changed, 53 insertions(+), 19 deletions(-) +Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (6714e53130ba Merge branch 'regmap-4.19' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 4 ++ + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regmap-sccb.c | 128 +++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-slimbus.c | 23 ++----- + include/linux/regmap.h | 35 ++++++++++ + 5 files changed, 175 insertions(+), 16 deletions(-) + create mode 100644 drivers/base/regmap/regmap-sccb.c +Merging sound/for-next (7abeb64da6de Merge branch 'topic/drm_audio_component' into for-next) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/ac97-bus.txt | 32 + + Documentation/sound/alsa-configuration.rst | 2 +- + Documentation/sound/cards/multisound.sh | 1139 ++++++++++++++++++++ + Documentation/sound/hd-audio/models.rst | 264 ++++- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/intel_audio.c | 22 +- + drivers/gpu/vga/vga_switcheroo.c | 63 +- + drivers/staging/most/sound/sound.c | 1 - + include/drm/drm_audio_component.h | 118 ++ + include/drm/i915_component.h | 85 +- + include/linux/usb/audio-v3.h | 15 + + include/linux/vga_switcheroo.h | 8 +- + include/sound/hda_component.h | 61 ++ + include/sound/hda_i915.h | 37 +- + include/sound/hdaudio.h | 62 +- + include/sound/hdaudio_ext.h | 123 +-- + include/sound/pcm.h | 3 +- + include/uapi/linux/usb/audio.h | 49 +- + sound/ac97/bus.c | 26 + + sound/aoa/core/gpio-feature.c | 4 +- + sound/core/pcm.c | 7 +- + sound/core/pcm_lib.c | 38 +- + sound/core/pcm_local.h | 2 + + sound/core/pcm_native.c | 10 +- + sound/core/rawmidi.c | 249 ++--- + sound/drivers/aloop.c | 1 - + sound/drivers/opl3/opl3_midi.c | 12 - + sound/drivers/opl3/opl3_oss.c | 6 - + sound/drivers/vx/vx_pcm.c | 2 - + sound/firewire/bebob/bebob_pcm.c | 1 - + sound/firewire/dice/dice-pcm.c | 2 - + sound/firewire/digi00x/digi00x-pcm.c | 1 - + sound/firewire/fireface/ff-pcm.c | 1 - + sound/firewire/fireworks/fireworks_pcm.c | 1 - + sound/firewire/isight.c | 1 - + sound/firewire/motu/motu-pcm.c | 2 - + sound/firewire/motu/motu-protocol-v2.c | 64 +- + sound/firewire/motu/motu-protocol-v3.c | 19 +- + sound/firewire/motu/motu.c | 19 + + sound/firewire/motu/motu.h | 5 +- + sound/firewire/oxfw/oxfw-pcm.c | 2 - + sound/firewire/tascam/tascam-pcm.c | 1 - + sound/hda/Kconfig | 7 +- + sound/hda/Makefile | 1 + + sound/hda/ext/hdac_ext_bus.c | 80 +- + sound/hda/ext/hdac_ext_controller.c | 64 +- + sound/hda/ext/hdac_ext_stream.c | 104 +- + sound/hda/hdac_component.c | 335 ++++++ + sound/hda/hdac_i915.c | 335 +----- + sound/isa/Kconfig | 2 +- + sound/isa/es1688/es1688.c | 2 - + sound/isa/gus/gus_reset.c | 2 - + sound/isa/sb/emu8000_patch.c | 7 +- + sound/isa/sb/sb8_main.c | 3 - + sound/mips/sgio2audio.c | 3 - + sound/pci/ali5451/ali5451.c | 5 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 3 - + sound/pci/ctxfi/ctmixer.c | 15 +- + sound/pci/emu10k1/emu10k1_patch.c | 7 +- + sound/pci/hda/dell_wmi_helper.c | 116 +- + sound/pci/hda/hda_codec.c | 93 +- + sound/pci/hda/hda_codec.h | 6 +- + sound/pci/hda/hda_generic.c | 144 ++- + sound/pci/hda/hda_generic.h | 16 + + sound/pci/hda/hda_intel.c | 16 +- + sound/pci/hda/patch_analog.c | 4 +- + sound/pci/hda/patch_cirrus.c | 29 +- + sound/pci/hda/patch_conexant.c | 100 +- + sound/pci/hda/patch_hdmi.c | 61 +- + sound/pci/hda/patch_realtek.c | 852 ++++++++------- + sound/pci/hda/patch_sigmatel.c | 31 +- + sound/pci/hda/patch_via.c | 294 +++-- + sound/pci/hda/thinkpad_helper.c | 27 +- + sound/pci/ice1712/prodigy_hifi.c | 21 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 1 - + sound/soc/codecs/hdac_hdmi.c | 426 ++++---- + sound/soc/codecs/rt5514-spi.c | 1 - + sound/soc/intel/skylake/skl-messages.c | 50 +- + sound/soc/intel/skylake/skl-nhlt.c | 8 +- + sound/soc/intel/skylake/skl-pcm.c | 112 +- + sound/soc/intel/skylake/skl-topology.c | 20 +- + sound/soc/intel/skylake/skl-topology.h | 6 +- + sound/soc/intel/skylake/skl.c | 190 ++-- + sound/soc/intel/skylake/skl.h | 7 +- + sound/usb/6fire/pcm.c | 1 - + sound/usb/caiaq/audio.c | 6 +- + sound/usb/clock.c | 24 +- + sound/usb/hiface/pcm.c | 1 - + sound/usb/line6/toneport.c | 5 +- + sound/usb/midi.c | 5 +- + sound/usb/misc/ua101.c | 2 - + sound/usb/mixer.c | 212 +++- + sound/usb/pcm.c | 2 - + sound/x86/intel_hdmi_audio.c | 2 +- + 94 files changed, 4112 insertions(+), 2315 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ac97-bus.txt + create mode 100755 Documentation/sound/cards/multisound.sh + create mode 100644 include/drm/drm_audio_component.h + create mode 100644 include/sound/hda_component.h + create mode 100644 sound/hda/hdac_component.c +Merging sound-asoc/for-next (48a5536e4839 Merge branch 'asoc-4.19' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/intel/skylake/skl.c +Auto-merging sound/soc/intel/skylake/skl-topology.h +Auto-merging sound/soc/intel/skylake/skl-topology.c +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Auto-merging sound/soc/codecs/hdac_hdmi.c +Removing sound/arm/pxa2xx-pcm.h +Removing sound/arm/pxa2xx-pcm.c +Removing Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt +Auto-merging Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt +Removing Documentation/devicetree/bindings/sound/dioo,dio2125.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 23 + + .../bindings/sound/amlogic,axg-spdifout.txt | 20 + + .../bindings/sound/amlogic,axg-tdm-formatters.txt | 28 + + .../devicetree/bindings/sound/atmel-i2s.txt | 11 +- + .../devicetree/bindings/sound/audio-graph-card.txt | 2 + + .../devicetree/bindings/sound/dioo,dio2125.txt | 12 - + .../devicetree/bindings/sound/everest,es7134.txt | 7 +- + .../devicetree/bindings/sound/everest,es7241.txt | 28 + + .../bindings/sound/marvell,pxa2xx-ac97.txt | 27 + + .../devicetree/bindings/sound/mrvl,pxa-ssp.txt | 8 + + .../devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | 15 - + .../devicetree/bindings/sound/name-prefix.txt | 24 + + .../devicetree/bindings/sound/qcom,q6adm.txt | 6 + + .../devicetree/bindings/sound/qcom,q6afe.txt | 6 + + .../devicetree/bindings/sound/qcom,q6asm.txt | 6 + + Documentation/devicetree/bindings/sound/rt5682.txt | 50 + + .../devicetree/bindings/sound/simple-amplifier.txt | 12 + + .../devicetree/bindings/sound/tas571x.txt | 1 + + include/linux/pxa2xx_ssp.h | 8 + + include/sound/ac97/codec.h | 8 +- + include/sound/ac97/compat.h | 9 +- + include/sound/ac97/controller.h | 8 +- + include/sound/ac97/regs.h | 20 +- + include/sound/ac97_codec.h | 25 +- + include/sound/compress_driver.h | 21 +- + include/sound/dmaengine_pcm.h | 14 +- + include/sound/pxa2xx-lib.h | 13 +- + include/sound/rt5682.h | 40 + + include/sound/simple_card.h | 7 +- + include/sound/simple_card_utils.h | 23 +- + include/sound/soc-acpi-intel-match.h | 19 +- + include/sound/soc-acpi.h | 13 +- + include/sound/soc-dai.h | 7 +- + include/sound/soc-dapm.h | 11 +- + include/sound/soc-dpcm.h | 7 +- + include/sound/soc-topology.h | 37 +- + include/sound/soc.h | 35 +- + sound/arm/Kconfig | 5 - + sound/arm/Makefile | 3 - + sound/arm/pxa2xx-ac97-lib.c | 12 + + sound/arm/pxa2xx-ac97.c | 124 +- + sound/arm/pxa2xx-pcm-lib.c | 75 +- + sound/arm/pxa2xx-pcm.c | 129 - + sound/arm/pxa2xx-pcm.h | 27 - + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 66 +- + sound/soc/amd/acp-pcm-dma.c | 157 +- + sound/soc/amd/acp.h | 12 +- + sound/soc/atmel/atmel-i2s.c | 46 +- + sound/soc/codecs/Kconfig | 25 +- + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/adau17x1.c | 1 + + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak5558.c | 4 +- + sound/soc/codecs/cx20442.c | 23 +- + sound/soc/codecs/es7134.c | 227 +- + sound/soc/codecs/es7241.c | 322 +++ + sound/soc/codecs/hdac_hdmi.c | 69 + + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 2 +- + sound/soc/codecs/pcm1789.c | 3 +- + sound/soc/codecs/rt1305.c | 15 +- + sound/soc/codecs/rt5651.c | 235 +- + sound/soc/codecs/rt5651.h | 8 + + sound/soc/codecs/rt5682.c | 2681 ++++++++++++++++++++ + sound/soc/codecs/rt5682.h | 1324 ++++++++++ + sound/soc/codecs/{dio2125.c => simple-amplifier.c} | 42 +- + sound/soc/codecs/tas571x.c | 110 + + sound/soc/codecs/tas571x.h | 16 + + sound/soc/codecs/tscs42xx.c | 37 +- + sound/soc/codecs/tscs42xx.h | 8 + + sound/soc/codecs/wm_adsp.c | 102 +- + sound/soc/codecs/wmfw.h | 1 + + sound/soc/davinci/davinci-mcasp.c | 16 +- + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/generic/audio-graph-card.c | 41 +- + sound/soc/generic/audio-graph-scu-card.c | 25 +- + sound/soc/generic/simple-card-utils.c | 74 +- + sound/soc/generic/simple-card.c | 106 +- + sound/soc/generic/simple-scu-card.c | 21 +- + sound/soc/intel/boards/Kconfig | 14 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 55 +- + sound/soc/intel/boards/bytcr_rt5651.c | 364 ++- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 643 +++++ + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + + sound/soc/intel/common/Makefile | 6 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 59 + + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 40 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 56 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 32 + + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 41 + + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 16 +- + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 91 + + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 47 + + sound/soc/intel/skylake/skl-pcm.c | 7 +- + sound/soc/intel/skylake/skl-topology.c | 5 +- + sound/soc/intel/skylake/skl-topology.h | 5 +- + sound/soc/intel/skylake/skl.c | 170 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 64 +- + sound/soc/mediatek/common/mtk-base-afe.h | 6 +- + sound/soc/mediatek/mt6797/mt6797-afe-common.h | 1 + + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 65 +- + sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 20 +- + sound/soc/mediatek/mt6797/mt6797-dai-hostless.c | 16 +- + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 19 +- + sound/soc/meson/Kconfig | 29 + + sound/soc/meson/Makefile | 11 + + sound/soc/meson/axg-fifo.c | 341 +++ + sound/soc/meson/axg-fifo.h | 80 + + sound/soc/meson/axg-frddr.c | 141 + + sound/soc/meson/axg-spdifout.c | 456 ++++ + sound/soc/meson/axg-toddr.c | 199 ++ + sound/soc/omap/omap-abe-twl6040.c | 2 +- + sound/soc/pxa/Kconfig | 6 +- + sound/soc/pxa/pxa-ssp.c | 176 +- + sound/soc/pxa/pxa2xx-ac97.c | 47 +- + sound/soc/pxa/pxa2xx-i2s.c | 9 +- + sound/soc/pxa/pxa2xx-pcm.c | 73 - + sound/soc/qcom/apq8096.c | 77 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6adm.c | 16 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 213 +- + sound/soc/qcom/qdsp6/q6afe.c | 43 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 38 +- + sound/soc/qcom/qdsp6/q6asm.c | 17 +- + sound/soc/qcom/qdsp6/q6routing.c | 69 +- + sound/soc/rockchip/Makefile | 3 +- + sound/soc/rockchip/rockchip_i2s.c | 3 +- + sound/soc/rockchip/rockchip_pcm.c | 45 + + sound/soc/rockchip/rockchip_pcm.h | 14 + + sound/soc/rockchip/rockchip_rt5645.c | 27 +- + sound/soc/sh/dma-sh7760.c | 26 +- + sound/soc/sh/fsi.c | 22 +- + sound/soc/sh/hac.c | 20 +- + sound/soc/sh/migor.c | 14 +- + sound/soc/sh/rcar/Makefile | 1 + + sound/soc/sh/rcar/adg.c | 15 +- + sound/soc/sh/rcar/cmd.c | 19 +- + sound/soc/sh/rcar/core.c | 35 +- + sound/soc/sh/rcar/ctu.c | 15 +- + sound/soc/sh/rcar/dma.c | 17 +- + sound/soc/sh/rcar/dvc.c | 16 +- + sound/soc/sh/rcar/gen.c | 16 +- + sound/soc/sh/rcar/mix.c | 14 +- + sound/soc/sh/rcar/rsnd.h | 17 +- + sound/soc/sh/rcar/src.c | 16 +- + sound/soc/sh/rcar/ssi.c | 22 +- + sound/soc/sh/rcar/ssiu.c | 15 +- + sound/soc/sh/sh7760-ac97.c | 14 +- + sound/soc/sh/siu.h | 26 +- + sound/soc/sh/siu_dai.c | 26 +- + sound/soc/sh/siu_pcm.c | 27 +- + sound/soc/sh/ssi.c | 21 +- + sound/soc/soc-ac97.c | 29 +- + sound/soc/soc-acpi.c | 20 +- + sound/soc/soc-compress.c | 24 +- + sound/soc/soc-core.c | 232 +- + sound/soc/soc-dapm.c | 42 +- + sound/soc/soc-devres.c | 15 +- + sound/soc/soc-generic-dmaengine-pcm.c | 19 +- + sound/soc/soc-io.c | 19 +- + sound/soc/soc-jack.c | 19 +- + sound/soc/soc-ops.c | 29 +- + sound/soc/soc-pcm.c | 456 ++-- + sound/soc/soc-topology.c | 91 +- + sound/soc/soc-utils.c | 22 +- + sound/soc/sti/uniperif_player.c | 6 +- + sound/soc/sti/uniperif_reader.c | 2 +- + sound/soc/stm/Kconfig | 1 + + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 146 +- + sound/soc/tegra/tegra_rt5677.c | 17 +- + sound/soc/uniphier/aio-cpu.c | 5 - + 176 files changed, 10165 insertions(+), 2252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt + delete mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es7241.txt + create mode 100644 Documentation/devicetree/bindings/sound/marvell,pxa2xx-ac97.txt + delete mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/name-prefix.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 include/sound/rt5682.h + delete mode 100644 sound/arm/pxa2xx-pcm.c + delete mode 100644 sound/arm/pxa2xx-pcm.h + create mode 100644 sound/soc/codecs/es7241.c + create mode 100644 sound/soc/codecs/rt5682.c + create mode 100644 sound/soc/codecs/rt5682.h + rename sound/soc/codecs/{dio2125.c => simple-amplifier.c} (68%) + create mode 100644 sound/soc/intel/boards/glk_rt5682_max98357a.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-bxt-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-cnl-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-glk-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-kbl-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-skl-match.c + create mode 100644 sound/soc/meson/Kconfig + create mode 100644 sound/soc/meson/Makefile + create mode 100644 sound/soc/meson/axg-fifo.c + create mode 100644 sound/soc/meson/axg-fifo.h + create mode 100644 sound/soc/meson/axg-frddr.c + create mode 100644 sound/soc/meson/axg-spdifout.c + create mode 100644 sound/soc/meson/axg-toddr.c + create mode 100644 sound/soc/rockchip/rockchip_pcm.c + create mode 100644 sound/soc/rockchip/rockchip_pcm.h +Merging modules/modules-next (4d58e7034d19 ARM: module: fix modsign build error) +$ git merge modules/modules-next +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/module.h | 1 + + include/linux/module.h | 4 +- + kernel/module-internal.h | 25 +++++++- + kernel/module.c | 137 ++++++++++++++++++++---------------------- + kernel/module_signing.c | 12 ++-- + 5 files changed, 98 insertions(+), 81 deletions(-) +Merging input/next (2b6e68119c47 Input: gpio_keys - add missing include to gpio_keys.h) +$ git merge input/next +Auto-merging include/xen/interface/io/kbdif.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/input/keys.txt | 8 + + .../bindings/input/touchscreen/bu21029.txt | 35 ++ + .../devicetree/bindings/input/touchscreen/eeti.txt | 30 ++ + drivers/input/joystick/iforce/iforce-packets.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 69 +-- + drivers/input/keyboard/imx_keypad.c | 12 +- + drivers/input/keyboard/snvs_pwrkey.c | 15 +- + drivers/input/misc/xen-kbdfront.c | 183 ++++---- + drivers/input/serio/i8042.c | 3 + + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/bu21029_ts.c | 484 +++++++++++++++++++++ + drivers/input/touchscreen/eeti_ts.c | 37 +- + drivers/input/touchscreen/egalax_ts.c | 5 +- + drivers/input/touchscreen/fsl-imx25-tcq.c | 21 +- + drivers/input/touchscreen/imx6ul_tsc.c | 14 +- + include/linux/gpio_keys.h | 2 + + include/xen/interface/io/displif.h | 8 + + include/xen/interface/io/kbdif.h | 78 +++- + include/xen/interface/io/sndif.h | 10 +- + 20 files changed, 819 insertions(+), 210 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/keys.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21029.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/eeti.txt + create mode 100644 drivers/input/touchscreen/bu21029_ts.c +Merging block/for-next (93d8cf625a32 Merge branch 'for-4.19/block' into for-next) +$ git merge block/for-next +Auto-merging mm/shmem.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/block_dev.c +Auto-merging block/bsg.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/procfs-diskstats | 10 + + Documentation/admin-guide/cgroup-v2.rst | 89 ++- + Documentation/block/null_blk.txt | 7 + + Documentation/block/stat.txt | 28 +- + Documentation/iostats.txt | 15 + + block/Kconfig | 16 + + block/Makefile | 4 +- + block/bfq-iosched.c | 131 +++- + block/bfq-iosched.h | 7 +- + block/bfq-wf2q.c | 30 +- + block/bio.c | 67 ++- + block/blk-cgroup.c | 284 ++++++++- + block/blk-core.c | 45 +- + block/blk-ioc.c | 2 +- + block/blk-iolatency.c | 925 +++++++++++++++++++++++++++++ + block/blk-lib.c | 10 + + block/blk-mq-debugfs-zoned.c | 24 + + block/blk-mq-debugfs.c | 24 +- + block/blk-mq-debugfs.h | 9 + + block/blk-mq-pci.c | 5 +- + block/blk-mq-sched.c | 112 +--- + block/blk-mq.c | 161 +++-- + block/blk-mq.h | 13 +- + block/blk-rq-qos.c | 194 ++++++ + block/blk-rq-qos.h | 109 ++++ + block/blk-settings.c | 4 +- + block/blk-stat.c | 16 +- + block/blk-stat.h | 4 + + block/blk-sysfs.c | 22 +- + block/blk-throttle.c | 25 +- + block/blk-wbt.c | 372 ++++++------ + block/blk-wbt.h | 68 +-- + block/blk-zoned.c | 2 +- + block/blk.h | 6 + + block/bsg.c | 460 +------------- + block/genhd.c | 29 +- + block/partition-generic.c | 25 +- + block/partitions/ldm.c | 3 - + drivers/block/DAC960.c | 9 +- + drivers/block/Makefile | 5 +- + drivers/block/brd.c | 14 +- + drivers/block/drbd/drbd_int.h | 2 - + drivers/block/drbd/drbd_receiver.c | 6 +- + drivers/block/drbd/drbd_req.c | 4 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/floppy.c | 3 - + drivers/block/loop.c | 3 +- + drivers/block/null_blk.c | 125 ++-- + drivers/block/null_blk.h | 108 ++++ + drivers/block/null_blk_zoned.c | 149 +++++ + drivers/block/paride/bpck.c | 3 +- + drivers/block/pktcdvd.c | 69 ++- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/skd_main.c | 16 +- + drivers/block/zram/zram_drv.c | 19 +- + drivers/lightnvm/Kconfig | 30 +- + drivers/lightnvm/pblk-cache.c | 9 +- + drivers/lightnvm/pblk-core.c | 78 +-- + drivers/lightnvm/pblk-gc.c | 34 +- + drivers/lightnvm/pblk-init.c | 98 +-- + drivers/lightnvm/pblk-rb.c | 24 +- + drivers/lightnvm/pblk-read.c | 247 +++++--- + drivers/lightnvm/pblk-recovery.c | 47 +- + drivers/lightnvm/pblk-sysfs.c | 13 +- + drivers/lightnvm/pblk-write.c | 35 +- + drivers/lightnvm/pblk.h | 48 +- + drivers/md/bcache/request.c | 13 +- + drivers/md/dm.c | 6 +- + drivers/md/md.c | 8 +- + drivers/nvdimm/btt.c | 12 +- + drivers/nvdimm/nd.h | 7 +- + drivers/nvdimm/pmem.c | 13 +- + drivers/nvme/host/lightnvm.c | 16 +- + fs/block_dev.c | 6 +- + fs/ext4/super.c | 5 +- + fs/ext4/sysfs.c | 6 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/super.c | 3 +- + fs/mpage.c | 4 +- + include/linux/bio.h | 12 +- + include/linux/blk-cgroup.h | 123 +++- + include/linux/blk-mq.h | 4 +- + include/linux/blk_types.h | 27 +- + include/linux/blkdev.h | 30 +- + include/linux/cgroup-defs.h | 3 + + include/linux/genhd.h | 14 +- + include/linux/memcontrol.h | 13 + + include/linux/sched.h | 8 + + include/linux/swap.h | 11 +- + include/linux/tracehook.h | 2 + + include/uapi/linux/blkzoned.h | 2 +- + kernel/trace/blktrace.c | 6 +- + mm/huge_memory.c | 6 +- + mm/memcontrol.c | 13 + + mm/memory.c | 11 +- + mm/page_io.c | 3 +- + mm/readahead.c | 7 + + mm/shmem.c | 10 +- + mm/swapfile.c | 31 + + 99 files changed, 3457 insertions(+), 1545 deletions(-) + create mode 100644 block/blk-iolatency.c + create mode 100644 block/blk-mq-debugfs-zoned.c + create mode 100644 block/blk-rq-qos.c + create mode 100644 block/blk-rq-qos.h + create mode 100644 drivers/block/null_blk.h + create mode 100644 drivers/block/null_blk_zoned.c +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (d284f8248c72 dm writecache: support optional offset for start of device) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/writecache.txt | 2 ++ + drivers/md/dm-writecache.c | 43 ++++++++++++++++++++---------- + 2 files changed, 31 insertions(+), 14 deletions(-) +Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- + drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- + drivers/scsi/pcmcia/nsp_cs.h | 4 ---- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 6 files changed, 5 insertions(+), 59 deletions(-) +Merging mmc/next (44350993d01c mmc: tegra: Add and use tegra_sdhci_get_max_clock()) +$ git merge mmc/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 2 + + Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 6 +- + .../devicetree/bindings/mmc/sdhci-msm.txt | 7 +- + .../devicetree/bindings/mmc/sdhci-of-dwcmshc.txt | 20 + + MAINTAINERS | 7 + + drivers/mmc/core/core.c | 48 +- + drivers/mmc/core/core.h | 2 - + drivers/mmc/core/mmc.c | 10 + + drivers/mmc/core/mmc_ops.c | 2 +- + drivers/mmc/core/sdio.c | 1 - + drivers/mmc/host/Kconfig | 11 + + drivers/mmc/host/Makefile | 4 +- + drivers/mmc/host/dw_mmc-exynos.c | 33 +- + drivers/mmc/host/pxamci.c | 211 ++++----- + drivers/mmc/host/renesas_sdhi_core.c | 127 ++++- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 20 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 17 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 29 +- + drivers/mmc/host/sdhci-msm.c | 510 ++++++++++++++++----- + drivers/mmc/host/sdhci-of-arasan.c | 16 + + drivers/mmc/host/sdhci-of-dwcmshc.c | 116 +++++ + drivers/mmc/host/sdhci-of-esdhc.c | 91 ++-- + drivers/mmc/host/sdhci-pci-core.c | 3 + + drivers/mmc/host/sdhci-pci-dwc-mshc.c | 84 ++++ + drivers/mmc/host/sdhci-pci.h | 5 + + drivers/mmc/host/sdhci-tegra.c | 20 +- + drivers/mmc/host/sdhci-xenon-phy.c | 1 + + drivers/mmc/host/sdhci.c | 9 +- + drivers/mmc/host/tmio_mmc.h | 6 + + drivers/mmc/host/tmio_mmc_core.c | 47 +- + include/linux/mfd/tmio.h | 3 + + include/linux/mmc/host.h | 10 +- + include/linux/mmc/mmc.h | 2 +- + include/linux/platform_data/mmc-esdhc-imx.h | 2 - + 34 files changed, 1088 insertions(+), 394 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt + create mode 100644 drivers/mmc/host/sdhci-of-dwcmshc.c + create mode 100644 drivers/mmc/host/sdhci-pci-dwc-mshc.c +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (685dbcaa25be drivers/md/raid5: Use irqsave variant of atomic_dec_and_lock()) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md-cluster.c | 47 +++++++++++++++++++++++++++++++++++------------ + drivers/md/md.c | 17 +++++++++++++++++ + drivers/md/md.h | 1 + + drivers/md/raid5-cache.c | 2 -- + drivers/md/raid5.c | 5 ++--- + 5 files changed, 55 insertions(+), 17 deletions(-) +Merging mfd/for-mfd-next (99266311865e mfd: axp20x: Support AXP806 in I2C mode) +$ git merge mfd/for-mfd-next +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h +Auto-merging drivers/gpu/drm/i915/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/i915/Kconfig' +Resolved 'drivers/gpu/drm/i915/intel_display.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/Kconfig'. +[master 91cb32964fdd] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/axp20x.txt | 7 +- + Documentation/devicetree/bindings/mfd/madera.txt | 102 + + Documentation/devicetree/bindings/mfd/tps65910.txt | 2 +- + .../bindings/pinctrl/cirrus,madera-pinctrl.txt | 99 + + MAINTAINERS | 16 + + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-madera.c | 206 + + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/intel_display.h | 24 + + drivers/gpu/drm/i915/intel_drv.h | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 13 + + drivers/media/cec/cec-notifier.c | 11 +- + drivers/media/platform/Kconfig | 11 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/cros-ec-cec/Makefile | 1 + + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 347 ++ + drivers/mfd/Kconfig | 50 + + drivers/mfd/Makefile | 14 + + drivers/mfd/arizona-core.c | 34 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x.c | 28 +- + drivers/mfd/cros_ec_dev.c | 32 + + drivers/mfd/cs47l35-tables.c | 1609 ++++++++ + drivers/mfd/cs47l85-tables.c | 3009 +++++++++++++++ + drivers/mfd/cs47l90-tables.c | 2674 +++++++++++++ + drivers/mfd/da9063-core.c | 44 +- + drivers/mfd/da9063-i2c.c | 239 +- + drivers/mfd/da9063-irq.c | 264 +- + drivers/mfd/dln2.c | 10 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/kempld-core.c | 15 +- + drivers/mfd/madera-core.c | 609 +++ + drivers/mfd/madera-i2c.c | 140 + + drivers/mfd/madera-spi.c | 139 + + drivers/mfd/madera.h | 44 + + drivers/mfd/rave-sp.c | 119 +- + drivers/mfd/ti_am335x_tscadc.c | 3 +- + drivers/mfd/wm8994-core.c | 15 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/cirrus/Kconfig | 14 + + drivers/pinctrl/cirrus/Makefile | 13 + + drivers/pinctrl/cirrus/pinctrl-cs47l35.c | 45 + + drivers/pinctrl/cirrus/pinctrl-cs47l85.c | 59 + + drivers/pinctrl/cirrus/pinctrl-cs47l90.c | 57 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 1076 ++++++ + drivers/pinctrl/cirrus/pinctrl-madera.h | 41 + + drivers/platform/chrome/cros_ec_proto.c | 40 +- + drivers/regulator/da9063-regulator.c | 84 +- + include/linux/mfd/cros_ec.h | 2 +- + include/linux/mfd/cros_ec_commands.h | 229 +- + include/linux/mfd/da9063/core.h | 15 +- + include/linux/mfd/madera/core.h | 187 + + include/linux/mfd/madera/pdata.h | 59 + + include/linux/mfd/madera/registers.h | 3917 ++++++++++++++++++++ + include/linux/mfd/rave-sp.h | 1 + + include/linux/mfd/wm8994/pdata.h | 6 + + include/media/cec-notifier.h | 27 +- + 60 files changed, 15404 insertions(+), 429 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/madera.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt + create mode 100644 drivers/gpio/gpio-madera.c + create mode 100644 drivers/media/platform/cros-ec-cec/Makefile + create mode 100644 drivers/media/platform/cros-ec-cec/cros-ec-cec.c + create mode 100644 drivers/mfd/cs47l35-tables.c + create mode 100644 drivers/mfd/cs47l85-tables.c + create mode 100644 drivers/mfd/cs47l90-tables.c + create mode 100644 drivers/mfd/madera-core.c + create mode 100644 drivers/mfd/madera-i2c.c + create mode 100644 drivers/mfd/madera-spi.c + create mode 100644 drivers/mfd/madera.h + create mode 100644 drivers/pinctrl/cirrus/Kconfig + create mode 100644 drivers/pinctrl/cirrus/Makefile + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l35.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l85.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l90.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera-core.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera.h + create mode 100644 include/linux/mfd/madera/core.h + create mode 100644 include/linux/mfd/madera/pdata.h + create mode 100644 include/linux/mfd/madera/registers.h +Merging backlight/for-backlight-next (858c5dfc8c33 backlight: adp8860: Mark expected switch fall-through) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 34 ++- + drivers/video/backlight/adp8860_bl.c | 1 + + drivers/video/backlight/pwm_bl.c | 232 +++++++++++++++++++-- + include/linux/backlight.h | 1 - + 4 files changed, 247 insertions(+), 21 deletions(-) +Merging battery/for-next (89b135ba1b73 power: supply: adp5061: Fix a couple off by ones) +$ git merge battery/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/input/qcom,pm8941-pwrkey.txt | 1 + + .../devicetree/bindings/power/reset/qcom,pon.txt | 45 ++ + .../bindings/power/supply/sbs_sbs-battery.txt | 12 +- + MAINTAINERS | 7 + + drivers/power/reset/Kconfig | 11 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/qcom-pon.c | 91 +++ + drivers/power/reset/zx-reboot.c | 1 + + drivers/power/supply/Kconfig | 21 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 14 +- + drivers/power/supply/adp5061.c | 745 +++++++++++++++++++++ + drivers/power/supply/cros_usbpd-charger.c | 544 +++++++++++++++ + drivers/power/supply/max1721x_battery.c | 2 +- + drivers/power/supply/sbs-battery.c | 67 +- + drivers/power/supply/tps65217_charger.c | 22 +- + 16 files changed, 1543 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt + create mode 100644 drivers/power/reset/qcom-pon.c + create mode 100644 drivers/power/supply/adp5061.c + create mode 100644 drivers/power/supply/cros_usbpd-charger.c +Merging regulator/for-next (dc63d3bc501f Merge branch 'regulator-4.19' into regulator-next) +$ git merge regulator/for-next +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-bd9571mwv-regulator | 27 +++ + .../devicetree/bindings/regulator/pfuze100.txt | 77 +++++++- + .../bindings/regulator/rohm,bd71837-regulator.txt | 8 - + .../bindings/regulator/uniphier-regulator.txt | 57 ++++++ + drivers/base/core.c | 30 +++ + drivers/regulator/Kconfig | 12 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/bd71837-regulator.c | 39 ++-- + drivers/regulator/bd9571mwv-regulator.c | 72 ++++++- + drivers/regulator/core.c | 44 +++-- + drivers/regulator/max8997-regulator.c | 3 +- + drivers/regulator/pfuze100-regulator.c | 86 +++++++-- + drivers/regulator/uniphier-regulator.c | 213 +++++++++++++++++++++ + include/linux/device.h | 1 + + include/linux/regulator/driver.h | 4 +- + include/linux/regulator/pfuze100.h | 11 ++ + 16 files changed, 611 insertions(+), 74 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator + create mode 100644 Documentation/devicetree/bindings/regulator/uniphier-regulator.txt + create mode 100644 drivers/regulator/uniphier-regulator.c +Merging security/next-testing (530a13df0b0b Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging kernel/module.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/ima.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 --- + drivers/base/firmware_loader/fallback.c | 7 ++++ + include/linux/ima.h | 7 ++++ + include/linux/lsm_hooks.h | 6 +++ + include/linux/security.h | 27 +++++++++++++ + kernel/kexec.c | 8 ++++ + kernel/module.c | 2 +- + security/integrity/ima/Kconfig | 58 ++++++++++++++++++++++++++++ + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_main.c | 68 ++++++++++++++++++++++++++------- + security/integrity/ima/ima_policy.c | 48 +++++++++++++++++++++-- + security/loadpin/loadpin.c | 6 +++ + security/security.c | 13 +++++++ + security/selinux/hooks.c | 15 ++++++++ + 14 files changed, 248 insertions(+), 23 deletions(-) +Merging apparmor/apparmor-next (f4585bc20fc7 apparmor: Fully initialize aa_perms struct when answering userspace query) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 5 +---- + security/apparmor/file.c | 3 ++- + security/apparmor/include/perms.h | 3 ++- + security/apparmor/lib.c | 17 +++++++++++++---- + 4 files changed, 18 insertions(+), 10 deletions(-) +Merging integrity/next-integrity (5e27e2c80ac8 integrity: prevent deadlock during digsig verification.) +$ git merge integrity/next-integrity +Auto-merging security/security.c +Merge made by the 'recursive' strategy. + crypto/api.c | 2 +- + include/linux/crypto.h | 5 ++++ + include/linux/integrity.h | 13 +++++++++ + include/uapi/linux/audit.h | 1 + + security/integrity/digsig_asymmetric.c | 23 ++++++++++++++++ + security/integrity/evm/Kconfig | 1 + + security/integrity/evm/evm.h | 10 +++++-- + security/integrity/evm/evm_crypto.c | 50 ++++++++++++++++++---------------- + security/integrity/evm/evm_main.c | 19 ++++++++----- + security/integrity/iint.c | 9 ++++-- + security/integrity/ima/Kconfig | 1 + + security/integrity/ima/ima_policy.c | 9 ++++-- + security/integrity/integrity.h | 15 ++++++++++ + security/integrity/integrity_audit.c | 6 +--- + security/security.c | 7 ++++- + 15 files changed, 126 insertions(+), 45 deletions(-) +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (631d2b490569 selinux: constify write_op[]) +$ git merge selinux/next +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 68 ++++++++++++++--------------- + security/selinux/netif.c | 11 ++--- + security/selinux/netlink.c | 2 +- + security/selinux/netnode.c | 5 +-- + security/selinux/netport.c | 5 +-- + security/selinux/selinuxfs.c | 12 +++--- + security/selinux/ss/avtab.c | 51 +++++++++++----------- + security/selinux/ss/conditional.c | 16 +++---- + security/selinux/ss/ebitmap.c | 15 +++---- + security/selinux/ss/policydb.c | 91 ++++++++++++++++++++------------------- + security/selinux/ss/services.c | 71 +++++++++++++++--------------- + security/selinux/ss/sidtab.c | 5 +-- + 14 files changed, 174 insertions(+), 181 deletions(-) +Merging tpmdd/next (776afd171925 ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead) +$ git merge tpmdd/next +Auto-merging security/integrity/ima/ima.h +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-chip.c | 68 +++++++--- + drivers/char/tpm/tpm-interface.c | 72 +++++++--- + drivers/char/tpm/tpm.h | 31 +++-- + drivers/char/tpm/tpm2-cmd.c | 258 +++++++++++++++--------------------- + drivers/char/tpm/tpm2-space.c | 12 +- + drivers/char/tpm/tpm_crb.c | 101 ++++---------- + drivers/char/tpm/tpm_tis_core.c | 2 + + drivers/char/tpm/tpm_tis_core.h | 1 + + drivers/char/tpm/tpm_tis_spi.c | 9 +- + drivers/char/tpm/tpm_vtpm_proxy.c | 2 +- + include/linux/tpm.h | 7 + + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_crypto.c | 4 +- + security/integrity/ima/ima_init.c | 16 +-- + security/integrity/ima/ima_queue.c | 4 +- + 15 files changed, 285 insertions(+), 304 deletions(-) +Merging watchdog/master (9d3cce1e8b85 Linux 4.18-rc5) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (9494874609c3 Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Removing include/linux/platform_data/sh_ipmmu.h +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 3 + + arch/x86/include/asm/irq_remapping.h | 5 ++ + drivers/iommu/Kconfig | 22 ++++++++ + drivers/iommu/Makefile | 2 + + drivers/iommu/amd_iommu.c | 25 ++++++-- + drivers/iommu/amd_iommu_debugfs.c | 33 +++++++++++ + drivers/iommu/amd_iommu_init.c | 57 +++++++++++++------ + drivers/iommu/amd_iommu_proto.h | 6 ++ + drivers/iommu/amd_iommu_types.h | 22 ++++++-- + drivers/iommu/dmar.c | 6 +- + drivers/iommu/intel-iommu.c | 18 +++++- + drivers/iommu/intel-svm.c | 2 +- + drivers/iommu/iommu-debugfs.c | 66 ++++++++++++++++++++++ + drivers/iommu/iommu.c | 2 + + drivers/iommu/ipmmu-vmsa.c | 38 ++++++++++--- + drivers/iommu/msm_iommu.c | 16 ++---- + include/linux/dmar.h | 5 -- + include/linux/intel-iommu.h | 8 ++- + include/linux/iommu.h | 7 +++ + include/linux/platform_data/sh_ipmmu.h | 18 ------ + 20 files changed, 283 insertions(+), 78 deletions(-) + create mode 100644 drivers/iommu/amd_iommu_debugfs.c + create mode 100644 drivers/iommu/iommu-debugfs.c + delete mode 100644 include/linux/platform_data/sh_ipmmu.h +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (baa2a4fdd525 audit: fix use-after-free in audit_add_watch) +$ git merge audit/next +Auto-merging kernel/audit_tree.c +Auto-merging include/uapi/linux/audit.h +Auto-merging include/net/xfrm.h +Merge made by the 'recursive' strategy. + drivers/tty/tty_audit.c | 2 +- + include/linux/audit.h | 5 ++++- + include/linux/cred.h | 15 ++++++++++----- + include/net/xfrm.h | 2 +- + include/uapi/linux/audit.h | 3 ++- + kernel/audit.c | 7 ++----- + kernel/audit_tree.c | 2 ++ + kernel/audit_watch.c | 41 ++++++++++++++++++++++++++--------------- + kernel/auditfilter.c | 17 ++++++++++------- + kernel/auditsc.c | 14 +++++++------- + net/netfilter/xt_AUDIT.c | 2 +- + net/netlabel/netlabel_user.c | 2 +- + 12 files changed, 67 insertions(+), 45 deletions(-) +Merging devicetree/for-next (3a6372daddeb dt-bindings: sound: wm8994: document wlf,csnaddr-pd property) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 3 ++ + .../devicetree/bindings/misc/aspeed,cvic.txt | 35 ++++++++++++++++++++++ + Documentation/devicetree/bindings/sound/wm8994.txt | 6 ++++ + Documentation/devicetree/bindings/sram/sram.txt | 2 ++ + .../devicetree/bindings/vendor-prefixes.txt | 2 ++ + drivers/of/address.c | 6 ++-- + 6 files changed, 52 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txt +Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (484d5c6c7aad Merge branch 'spi-4.19' into spi-next) +$ git merge spi/for-next +Removing include/linux/spi/adi_spi3.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-rockchip.txt | 1 + + drivers/spi/spi-dw.c | 3 + + drivers/spi/spi-dw.h | 1 + + drivers/spi/spi-fsl-dspi.c | 473 +++++++++++---------- + drivers/spi/spi-pxa2xx.c | 4 + + include/linux/spi/adi_spi3.h | 254 ----------- + include/linux/spi/spi_bitbang.h | 2 +- + 7 files changed, 263 insertions(+), 475 deletions(-) + delete mode 100644 include/linux/spi/adi_spi3.h +Merging tip/auto-latest (61144b9f528b Merge branch 'x86/timers') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/linux/compat.h +Auto-merging drivers/video/fbdev/efifb.c +Auto-merging drivers/infiniband/core/rdma_core.c +Removing arch/x86/platform/intel-mid/mrfld.c +Removing arch/x86/platform/intel-mid/mfld.c +Removing arch/x86/platform/intel-mid/intel_mid_weak_decls.h +Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt.h +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/mips/include/asm/atomic.h +Auto-merging arch/m68k/include/asm/bitops.h +Removing arch/ia64/kernel/jprobes.S +Removing arch/arm64/lib/bitops.S +Merge made by the 'recursive' strategy. + Documentation/kprobes.txt | 35 +- + Documentation/x86/intel_rdt_ui.txt | 380 ++++- + Documentation/x86/x86_64/boot-options.txt | 4 + + arch/alpha/include/asm/atomic.h | 56 +- + arch/arc/include/asm/atomic.h | 86 +- + arch/arc/include/asm/kprobes.h | 2 - + arch/arc/kernel/kprobes.c | 50 +- + arch/arm/include/asm/atomic.h | 55 +- + arch/arm/include/asm/hw_breakpoint.h | 7 +- + arch/arm/include/asm/kprobes.h | 2 - + arch/arm/include/asm/probes.h | 1 - + arch/arm/kernel/hw_breakpoint.c | 78 +- + arch/arm/probes/kprobes/core.c | 139 +- + arch/arm/probes/kprobes/test-core.c | 1 - + arch/arm64/include/asm/atomic.h | 47 +- + arch/arm64/include/asm/bitops.h | 21 +- + arch/arm64/include/asm/hw_breakpoint.h | 7 +- + arch/arm64/include/asm/kprobes.h | 1 - + arch/arm64/kernel/hw_breakpoint.c | 86 +- + arch/arm64/kernel/probes/kprobes.c | 88 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/bitops.S | 76 - + arch/h8300/include/asm/atomic.h | 19 +- + arch/hexagon/include/asm/atomic.h | 18 +- + arch/ia64/include/asm/atomic.h | 81 -- + arch/ia64/include/asm/kprobes.h | 2 - + arch/ia64/include/uapi/asm/break.h | 1 - + arch/ia64/kernel/Makefile | 2 +- + arch/ia64/kernel/jprobes.S | 90 -- + arch/ia64/kernel/kprobes.c | 93 +- + arch/m68k/include/asm/atomic.h | 24 +- + arch/m68k/include/asm/bitops.h | 6 +- + arch/mips/include/asm/atomic.h | 172 --- + arch/mips/include/asm/kprobes.h | 13 - + arch/mips/kernel/kprobes.c | 70 +- + arch/mips/kvm/mips.c | 4 +- + arch/openrisc/include/asm/atomic.h | 4 +- + arch/openrisc/include/asm/cmpxchg.h | 3 +- + arch/parisc/include/asm/atomic.h | 107 -- + arch/powerpc/include/asm/atomic.h | 52 +- + arch/powerpc/include/asm/hw_breakpoint.h | 7 +- + arch/powerpc/include/asm/kprobes.h | 12 - + arch/powerpc/kernel/hw_breakpoint.c | 47 +- + arch/powerpc/kernel/kprobes-ftrace.c | 72 +- + arch/powerpc/kernel/kprobes.c | 92 +- + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 39 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/powerpc/perf/core-book3s.c | 6 +- + arch/riscv/include/asm/atomic.h | 149 +- + arch/s390/include/asm/atomic.h | 65 - + arch/s390/include/asm/kprobes.h | 2 - + arch/s390/kernel/kprobes.c | 86 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/sh/include/asm/atomic.h | 35 - + arch/sh/include/asm/cmpxchg-xchg.h | 3 +- + arch/sh/include/asm/hw_breakpoint.h | 8 +- + arch/sh/include/asm/kprobes.h | 4 - + arch/sh/kernel/hw_breakpoint.c | 53 +- + arch/sh/kernel/kprobes.c | 72 +- + arch/sparc/include/asm/atomic_32.h | 24 +- + arch/sparc/include/asm/atomic_64.h | 65 +- + arch/sparc/include/asm/kprobes.h | 1 - + arch/sparc/kernel/kprobes.c | 65 +- + arch/sparc/lib/atomic32.c | 4 +- + arch/x86/Kconfig | 4 +- + arch/x86/Makefile | 5 - + arch/x86/boot/compressed/eboot.c | 245 ++-- + arch/x86/boot/compressed/kaslr.c | 96 +- + arch/x86/crypto/aegis128-aesni-asm.S | 2 +- + arch/x86/crypto/aegis128l-aesni-asm.S | 2 +- + arch/x86/crypto/aegis256-aesni-asm.S | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 8 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 4 +- + arch/x86/crypto/morus1280-avx2-asm.S | 2 +- + arch/x86/crypto/morus1280-sse2-asm.S | 2 +- + arch/x86/crypto/morus640-sse2-asm.S | 2 +- + arch/x86/crypto/sha1_ssse3_asm.S | 2 +- + arch/x86/entry/entry_64.S | 5 +- + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/events/intel/ds.c | 8 +- + arch/x86/events/intel/lbr.c | 56 +- + arch/x86/events/perf_event.h | 5 + + arch/x86/hyperv/hv_apic.c | 59 +- + arch/x86/hyperv/mmu.c | 80 +- + arch/x86/include/asm/atomic.h | 30 +- + arch/x86/include/asm/atomic64_32.h | 61 +- + arch/x86/include/asm/atomic64_64.h | 48 +- + arch/x86/include/asm/hw_breakpoint.h | 7 +- + arch/x86/include/asm/intel-family.h | 13 + + arch/x86/include/asm/intel-mid.h | 43 - + arch/x86/include/asm/kprobes.h | 5 +- + arch/x86/include/asm/mshyperv.h | 34 + + arch/x86/include/asm/orc_types.h | 2 + + arch/x86/include/asm/percpu.h | 7 +- + arch/x86/include/asm/refcount.h | 1 + + arch/x86/include/asm/trace/hyperv.h | 15 + + arch/x86/include/asm/uaccess_64.h | 7 +- + arch/x86/include/asm/unwind_hints.h | 16 +- + arch/x86/kernel/apic/vector.c | 17 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/intel_rdt.c | 11 + + arch/x86/kernel/cpu/intel_rdt.h | 152 +- + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 129 +- + arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 1522 ++++++++++++++++++++ + arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h | 43 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 798 +++++++++- + arch/x86/kernel/cpu/mcheck/mce.c | 202 +-- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/hw_breakpoint.c | 131 +- + arch/x86/kernel/kprobes/common.h | 10 - + arch/x86/kernel/kprobes/core.c | 124 +- + arch/x86/kernel/kprobes/ftrace.c | 49 +- + arch/x86/kernel/kprobes/opt.c | 1 - + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/paravirt_patch_64.c | 2 +- + arch/x86/kernel/stacktrace.c | 42 +- + arch/x86/kernel/tsc_msr.c | 96 +- + arch/x86/kernel/unwind_orc.c | 52 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/mm/numa_emulation.c | 107 +- + arch/x86/platform/efi/quirks.c | 14 +- + arch/x86/platform/intel-mid/Makefile | 2 +- + arch/x86/platform/intel-mid/intel-mid.c | 23 +- + arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 18 - + arch/x86/platform/intel-mid/mfld.c | 70 - + arch/x86/platform/intel-mid/mrfld.c | 105 -- + arch/x86/power/hibernate_asm_64.S | 2 +- + arch/x86/um/vdso/.gitignore | 1 - + arch/x86/um/vdso/Makefile | 16 - + arch/xtensa/include/asm/atomic.h | 98 -- + arch/xtensa/include/asm/hw_breakpoint.h | 7 +- + arch/xtensa/kernel/hw_breakpoint.c | 40 +- + drivers/block/rbd.c | 2 +- + drivers/firmware/efi/Kconfig | 12 + + drivers/firmware/efi/cper.c | 17 +- + drivers/firmware/efi/efi.c | 22 +- + drivers/firmware/efi/esrt.c | 5 +- + drivers/firmware/efi/libstub/arm-stub.c | 7 +- + drivers/firmware/efi/runtime-wrappers.c | 202 ++- + drivers/infiniband/core/rdma_core.c | 2 +- + drivers/video/fbdev/efifb.c | 51 +- + fs/afs/rxrpc.c | 2 +- + fs/timerfd.c | 8 +- + include/asm-generic/atomic-instrumented.h | 71 +- + include/asm-generic/atomic.h | 33 - + include/asm-generic/atomic64.h | 15 +- + include/asm-generic/bitops/atomic.h | 188 +-- + include/asm-generic/bitops/lock.h | 68 +- + include/linux/atomic.h | 415 ++++-- + include/linux/bitops.h | 22 +- + include/linux/bits.h | 26 + + include/linux/compat.h | 9 - + include/linux/compat_time.h | 9 + + include/linux/cpuhotplug.h | 1 + + include/linux/efi.h | 5 +- + include/linux/kprobes.h | 53 - + include/linux/ktime.h | 7 +- + include/linux/nmi.h | 10 +- + include/linux/perf_event.h | 2 +- + include/linux/posix-timers.h | 4 +- + include/linux/refcount.h | 34 +- + include/linux/sched/sysctl.h | 1 - + include/linux/smpboot.h | 15 +- + include/linux/swait.h | 36 +- + include/linux/syscalls.h | 10 +- + include/linux/time.h | 4 +- + include/linux/time64.h | 1 + + include/uapi/linux/time.h | 7 + + kernel/bpf/syscall.c | 4 +- + kernel/compat.c | 29 - + kernel/cpu.c | 5 + + kernel/events/core.c | 20 +- + kernel/events/hw_breakpoint.c | 92 +- + kernel/events/uprobes.c | 6 +- + kernel/fail_function.c | 3 - + kernel/irq/irqdesc.c | 13 +- + kernel/irq/manage.c | 44 +- + kernel/irq/proc.c | 22 +- + kernel/kprobes.c | 167 +-- + kernel/kthread.c | 6 +- + kernel/power/suspend.c | 4 +- + kernel/rcu/srcutiny.c | 4 +- + kernel/rcu/tree.c | 8 +- + kernel/rcu/tree_exp.h | 4 +- + kernel/rcu/tree_plugin.h | 12 +- + kernel/sched/Makefile | 2 +- + kernel/sched/core.c | 51 +- + kernel/sched/cpufreq_schedutil.c | 104 +- + kernel/sched/deadline.c | 19 +- + kernel/sched/debug.c | 31 +- + kernel/sched/fair.c | 417 +----- + kernel/sched/pelt.c | 399 +++++ + kernel/sched/pelt.h | 72 + + kernel/sched/rt.c | 15 +- + kernel/sched/sched.h | 68 +- + kernel/sched/swait.c | 32 +- + kernel/smpboot.c | 54 +- + kernel/stop_machine.c | 6 +- + kernel/sys.c | 4 +- + kernel/sysctl.c | 8 - + kernel/test_kprobes.c | 94 -- + kernel/time/alarmtimer.c | 7 +- + kernel/time/hrtimer.c | 7 +- + kernel/time/ntp.c | 6 +- + kernel/time/posix-cpu-timers.c | 2 +- + kernel/time/posix-stubs.c | 2 +- + kernel/time/posix-timers.c | 55 +- + kernel/time/posix-timers.h | 2 +- + kernel/time/time.c | 31 +- + kernel/time/timekeeping.c | 38 +- + kernel/trace/trace_kprobe.c | 11 +- + kernel/watchdog.c | 147 +- + lib/Kconfig.debug | 2 +- + lib/atomic64.c | 14 +- + lib/iov_iter.c | 77 +- + lib/refcount.c | 55 +- + net/atm/pppoatm.c | 2 +- + net/rxrpc/call_object.c | 2 +- + net/rxrpc/conn_object.c | 4 +- + net/rxrpc/local_object.c | 2 +- + net/rxrpc/peer_object.c | 2 +- + tools/objtool/arch/x86/include/asm/orc_types.h | 2 + + tools/objtool/check.c | 1 + + tools/objtool/check.h | 2 +- + tools/objtool/elf.c | 6 +- + tools/objtool/orc_dump.c | 3 +- + tools/objtool/orc_gen.c | 2 + + tools/perf/Documentation/perf-list.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 4 +- + tools/testing/selftests/timers/raw_skew.c | 5 + + virt/kvm/arm/arm.c | 4 +- + virt/kvm/arm/psci.c | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 4 +- + 235 files changed, 6332 insertions(+), 5054 deletions(-) + delete mode 100644 arch/arm64/lib/bitops.S + delete mode 100644 arch/ia64/kernel/jprobes.S + create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h + delete mode 100644 arch/x86/platform/intel-mid/intel_mid_weak_decls.h + delete mode 100644 arch/x86/platform/intel-mid/mfld.c + delete mode 100644 arch/x86/platform/intel-mid/mrfld.c + create mode 100644 include/linux/bits.h + create mode 100644 kernel/sched/pelt.c + create mode 100644 kernel/sched/pelt.h +Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (6663484b4e2d EDAC, thunderx: Remove VLA usage) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 3 ++- + drivers/edac/edac_mc_sysfs.c | 6 +++--- + drivers/edac/i7core_edac.c | 22 +++++++++++++++------- + drivers/edac/thunderx_edac.c | 14 +++++++++----- + 4 files changed, 29 insertions(+), 16 deletions(-) +Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree_plugin.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/locking/locktorture.c +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/sched.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'kernel/rcu/tree_plugin.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 466cc5a9c265] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Data-Structures/Data-Structures.html | 118 +-- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 22 +- + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 123 +-- + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 16 +- + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 56 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 237 ++--- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 12 +- + Documentation/RCU/stallwarn.txt | 24 +- + Documentation/RCU/whatisRCU.txt | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/core-api/atomic_ops.rst | 2 +- + Documentation/memory-barriers.txt | 43 +- + .../translations/ko_KR/memory-barriers.txt | 22 +- + MAINTAINERS | 15 +- + include/linux/rculist.h | 19 +- + include/linux/rcupdate.h | 20 +- + include/linux/rcutiny.h | 2 +- + include/linux/sched.h | 4 +- + include/linux/spinlock.h | 53 +- + include/linux/srcu.h | 17 + + include/linux/torture.h | 4 +- + include/trace/events/rcu.h | 112 ++- + kernel/locking/locktorture.c | 5 +- + kernel/rcu/rcu.h | 104 +- + kernel/rcu/rcuperf.c | 57 +- + kernel/rcu/rcutorture.c | 462 ++++++--- + kernel/rcu/srcutree.c | 39 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 1019 +++++++++++--------- + kernel/rcu/tree.h | 71 +- + kernel/rcu/tree_exp.h | 14 +- + kernel/rcu/tree_plugin.h | 176 ++-- + kernel/rcu/update.c | 45 +- + kernel/sched/completion.c | 8 +- + kernel/sched/core.c | 71 +- + kernel/sched/wait.c | 55 +- + kernel/torture.c | 15 +- + tools/memory-model/Documentation/explanation.txt | 2 +- + tools/memory-model/Documentation/recipes.txt | 12 +- + tools/memory-model/README | 20 +- + tools/memory-model/linux-kernel.bell | 2 +- + ...itmus => IRIW+fencembonceonces+OnceOnce.litmus} | 2 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 2 +- + ...tmus => LB+fencembonceonce+ctrlonceonce.litmus} | 2 +- + ...=> MP+fencewmbonceonce+fencermbonceonce.litmus} | 2 +- + ...bonceonces.litmus => R+fencembonceonces.litmus} | 2 +- + tools/memory-model/litmus-tests/README | 25 +- + ...mus => S+fencewmbonceonce+poacquireonce.litmus} | 2 +- + ...onceonces.litmus => SB+fencembonceonces.litmus} | 2 +- + .../litmus-tests/SB+rfionceonce-poonceonces.litmus | 32 + + ...WRC+pooncerelease+fencermbonceonce+Once.litmus} | 2 +- + ...elease+poacquirerelease+fencembonceonce.litmus} | 2 +- + tools/memory-model/scripts/checkalllitmus.sh | 2 +- + tools/memory-model/scripts/checklitmus.sh | 2 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 1 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 + + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + 64 files changed, 1898 insertions(+), 1365 deletions(-) + rename tools/memory-model/litmus-tests/{IRIW+mbonceonces+OnceOnce.litmus => IRIW+fencembonceonces+OnceOnce.litmus} (95%) + rename tools/memory-model/litmus-tests/{LB+ctrlonceonce+mbonceonce.litmus => LB+fencembonceonce+ctrlonceonce.litmus} (95%) + rename tools/memory-model/litmus-tests/{MP+wmbonceonce+rmbonceonce.litmus => MP+fencewmbonceonce+fencermbonceonce.litmus} (91%) + rename tools/memory-model/litmus-tests/{R+mbonceonces.litmus => R+fencembonceonces.litmus} (95%) + rename tools/memory-model/litmus-tests/{S+wmbonceonce+poacquireonce.litmus => S+fencewmbonceonce+poacquireonce.litmus} (90%) + rename tools/memory-model/litmus-tests/{SB+mbonceonces.litmus => SB+fencembonceonces.litmus} (95%) + create mode 100644 tools/memory-model/litmus-tests/SB+rfionceonce-poonceonces.litmus + rename tools/memory-model/litmus-tests/{WRC+pooncerelease+rmbonceonce+Once.litmus => WRC+pooncerelease+fencermbonceonce+Once.litmus} (93%) + rename tools/memory-model/litmus-tests/{Z6.0+pooncerelease+poacquirerelease+mbonceonce.litmus => Z6.0+pooncerelease+poacquirerelease+fencembonceonce.litmus} (94%) + mode change 100644 => 100755 tools/memory-model/scripts/checkalllitmus.sh + mode change 100644 => 100755 tools/memory-model/scripts/checklitmus.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Merging kvm/linux-next (6f0d349d922b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (2e7297216699 KVM: PPC: Book3S: Check if IOMMU page is contained in the pinned physical page) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c +CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_vio.c +Recorded preimage for 'arch/powerpc/kvm/book3s_64_vio_hv.c' +Recorded preimage for 'drivers/vfio/vfio_iommu_spapr_tce.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/kvm/book3s_64_vio_hv.c'. +Recorded resolution for 'drivers/vfio/vfio_iommu_spapr_tce.c'. +[master bf3673a11b5f] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/include/asm/kvm_host.h | 17 ++++++++--------- + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 5 ++--- + arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++-------- + arch/powerpc/kvm/emulate_loadstore.c | 7 +++---- + arch/powerpc/kvm/powerpc.c | 30 +++++++++++++++--------------- + 6 files changed, 39 insertions(+), 40 deletions(-) +Merging kvms390/next (a3da7b4a3be5 KVM: s390: add etoken support for guests) +$ git merge kvms390/next +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 10 +- + arch/s390/include/uapi/asm/kvm.h | 5 +- + arch/s390/kvm/kvm-s390.c | 301 +++++++++++++++++++++++---------------- + arch/s390/kvm/priv.c | 30 ++-- + arch/s390/kvm/vsie.c | 11 +- + arch/s390/tools/gen_facilities.c | 3 +- + include/linux/kvm_host.h | 7 + + virt/kvm/kvm_main.c | 2 +- + 8 files changed, 226 insertions(+), 143 deletions(-) +Merging xen-tip/linux-next (0ce0bba4e5e0 xen: setup pv irq ops vector earlier) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (1a32ebb26ba9 platform/x86: thinkpad_acpi: Support battery quirk) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 77 +++ + MAINTAINERS | 2 +- + drivers/platform/mellanox/Kconfig | 11 + + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxreg-io.c | 245 ++++++++ + drivers/platform/x86/Kconfig | 16 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/asus-wireless.c | 24 +- + drivers/platform/x86/asus-wmi.c | 34 +- + drivers/platform/x86/dell-smbios-base.c | 35 +- + drivers/platform/x86/dell-smbios-smm.c | 4 +- + drivers/platform/x86/dell-smbios-wmi.c | 2 +- + drivers/platform/x86/ideapad-laptop.c | 4 +- + drivers/platform/x86/intel-hid.c | 178 +++++- + drivers/platform/x86/intel-vbtn.c | 5 + + drivers/platform/x86/intel_ips.c | 5 +- + drivers/platform/x86/intel_pmc_core.c | 120 ++++ + drivers/platform/x86/intel_pmc_core.h | 6 + + drivers/platform/x86/mlx-platform.c | 175 +++++- + drivers/platform/x86/thinkpad_acpi.c | 125 +++-- + drivers/platform/x86/toshiba_acpi.c | 30 +- + .../x86/{silead_dmi.c => touchscreen_dmi.c} | 625 ++++++++++++--------- + drivers/platform/x86/wmi.c | 9 +- + 23 files changed, 1337 insertions(+), 398 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-mlxreg-io + create mode 100644 drivers/platform/mellanox/mlxreg-io.c + rename drivers/platform/x86/{silead_dmi.c => touchscreen_dmi.c} (73%) +Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19) +$ git merge chrome-platform/for-next +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/exynos_defconfig | 4 ++-- + arch/arm/configs/multi_v7_defconfig | 4 ++-- + arch/arm/configs/pxa_defconfig | 4 ++-- + arch/arm64/configs/defconfig | 4 ++-- + drivers/input/keyboard/Kconfig | 2 +- + drivers/mfd/Kconfig | 20 -------------------- + drivers/mfd/Makefile | 2 -- + drivers/platform/chrome/Kconfig | 20 ++++++++++++++++++++ + drivers/platform/chrome/Makefile | 2 ++ + drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++- + drivers/{mfd => platform/chrome}/cros_ec_i2c.c | 0 + drivers/{mfd => platform/chrome}/cros_ec_spi.c | 0 + 12 files changed, 40 insertions(+), 32 deletions(-) + rename drivers/{mfd => platform/chrome}/cros_ec_i2c.c (100%) + rename drivers/{mfd => platform/chrome}/cros_ec_spi.c (100%) +Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (6f7b0bad8839 usb: simplify usbport trigger) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lm3692x.txt | 5 +- + .../devicetree/bindings/leds/leds-lt3593.txt | 32 ++++ + drivers/leds/Kconfig | 5 +- + drivers/leds/led-triggers.c | 39 ++++- + drivers/leds/leds-apu.c | 44 ++++- + drivers/leds/leds-lm3692x.c | 181 ++++++++++++++------ + drivers/leds/leds-lt3593.c | 190 ++++++++++++--------- + drivers/leds/leds-max8997.c | 2 +- + drivers/leds/trigger/Kconfig | 15 +- + drivers/leds/trigger/ledtrig-activity.c | 51 +++--- + drivers/leds/trigger/ledtrig-backlight.c | 64 +++---- + drivers/leds/trigger/ledtrig-camera.c | 3 +- + drivers/leds/trigger/ledtrig-default-on.c | 20 +-- + drivers/leds/trigger/ledtrig-gpio.c | 92 +++------- + drivers/leds/trigger/ledtrig-heartbeat.c | 49 +++--- + drivers/leds/trigger/ledtrig-netdev.c | 101 ++++------- + drivers/leds/trigger/ledtrig-oneshot.c | 91 +++------- + drivers/leds/trigger/ledtrig-timer.c | 58 ++----- + drivers/leds/trigger/ledtrig-transient.c | 102 ++++------- + drivers/net/can/Kconfig | 6 + + drivers/tty/vt/keyboard.c | 4 +- + drivers/usb/core/ledtrig-usbport.c | 34 ++-- + include/linux/leds.h | 36 +++- + net/bluetooth/leds.c | 6 +- + net/mac80211/led.c | 20 ++- + net/rfkill/core.c | 4 +- + 26 files changed, 638 insertions(+), 616 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lt3593.txt +Merging ipmi/for-next (a4fb7ddc6356 ipmi: kcs_bmc: don't change device name) +$ git merge ipmi/for-next +Auto-merging include/linux/pci_ids.h +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_ipmi.c | 4 +-- + drivers/char/ipmi/ipmi_bt_sm.c | 64 ++++++++++++++++----------------- + drivers/char/ipmi/ipmi_devintf.c | 11 +++--- + drivers/char/ipmi/ipmi_dmi.c | 23 +++++++----- + drivers/char/ipmi/ipmi_kcs_sm.c | 4 +-- + drivers/char/ipmi/ipmi_msghandler.c | 51 +++++++++++++------------- + drivers/char/ipmi/ipmi_powernv.c | 4 +-- + drivers/char/ipmi/ipmi_poweroff.c | 67 ++++++++++++++++------------------ + drivers/char/ipmi/ipmi_si_hardcode.c | 9 ++--- + drivers/char/ipmi/ipmi_si_hotmod.c | 17 ++++----- + drivers/char/ipmi/ipmi_si_intf.c | 28 +++++++-------- + drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- + drivers/char/ipmi/ipmi_si_pci.c | 21 +++++------ + drivers/char/ipmi/ipmi_si_platform.c | 20 ++++++----- + drivers/char/ipmi/ipmi_smic_sm.c | 26 ++++++-------- + drivers/char/ipmi/ipmi_ssif.c | 69 +++++++++++++++++------------------- + drivers/char/ipmi/ipmi_watchdog.c | 52 +++++++++++++-------------- + drivers/char/ipmi/kcs_bmc.c | 7 ++-- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/ibmpex.c | 2 +- + include/linux/ipmi.h | 2 +- + include/linux/ipmi_smi.h | 2 +- + include/linux/pci_ids.h | 4 +++ + 23 files changed, 238 insertions(+), 253 deletions(-) +Merging driver-core/driver-core-next (726e41097920 drivers: core: Remove glue dirs from sysfs earlier) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Auto-merging drivers/iommu/msm_iommu.c +Auto-merging drivers/iommu/ipmmu-vmsa.c +CONFLICT (content): Merge conflict in drivers/iommu/ipmmu-vmsa.c +Auto-merging drivers/base/power/domain.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/iommu/ipmmu-vmsa.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c7c28e2f490] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 ++ + .../bindings/pinctrl/pinctrl-bindings.txt | 6 + + .../driver-api/firmware/fallback-mechanisms.rst | 7 +- + drivers/base/base.h | 2 - + drivers/base/cacheinfo.c | 24 ++-- + drivers/base/core.c | 16 +-- + drivers/base/dd.c | 134 +++++++++++++++++---- + drivers/base/init.c | 2 +- + drivers/base/power/domain.c | 2 +- + drivers/iommu/arm-smmu-v3.c | 2 - + drivers/iommu/arm-smmu.c | 7 -- + drivers/iommu/exynos-iommu.c | 2 - + drivers/iommu/ipmmu-vmsa.c | 7 -- + drivers/iommu/msm_iommu.c | 2 - + drivers/iommu/of_iommu.c | 21 +--- + drivers/iommu/qcom_iommu.c | 2 - + drivers/iommu/rockchip-iommu.c | 2 - + drivers/pinctrl/devicetree.c | 15 ++- + fs/kernfs/symlink.c | 2 +- + fs/sysfs/group.c | 29 +++-- + include/asm-generic/vmlinux.lds.h | 2 - + include/linux/device.h | 105 +++++++++------- + include/linux/kobject.h | 17 +++ + include/linux/of_iommu.h | 4 - + include/linux/sysfs.h | 6 +- + lib/kobject.c | 2 +- + 26 files changed, 267 insertions(+), 162 deletions(-) +Merging usb/usb-next (500f0716b5f7 Merge 4.18-rc5 into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/usb/class/cdc-acm.c +Removing drivers/staging/typec/TODO +Removing drivers/staging/typec/Makefile +Removing drivers/staging/typec/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/sysfs-class-typec | 48 ++ + Documentation/ABI/testing/sysfs-bus-typec | 51 ++ + Documentation/ABI/testing/sysfs-class-typec | 62 +-- + .../ABI/testing/sysfs-driver-typec-displayport | 49 ++ + .../bindings/connector/usb-connector.txt | 44 ++ + .../devicetree/bindings/usb/npcm7xx-usb.txt | 18 + + .../devicetree/bindings/usb/typec-tcpci.txt | 49 ++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + Documentation/driver-api/usb/typec_bus.rst | 136 +++++ + MAINTAINERS | 11 +- + drivers/nfc/nfcmrvl/usb.c | 5 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/typec/Kconfig | 23 - + drivers/staging/typec/Makefile | 2 - + drivers/staging/typec/TODO | 5 - + drivers/usb/class/cdc-acm.c | 40 +- + drivers/usb/class/cdc-wdm.c | 47 +- + drivers/usb/class/usblp.c | 10 +- + drivers/usb/core/devio.c | 5 +- + drivers/usb/core/hub.c | 42 ++ + drivers/usb/core/message.c | 9 +- + drivers/usb/host/Kconfig | 8 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-hcd.c | 1 + + drivers/usb/host/ehci-hub.c | 8 + + drivers/usb/host/ehci-npcm7xx.c | 212 ++++++++ + drivers/usb/host/ehci-sched.c | 4 - + drivers/usb/host/u132-hcd.c | 2 - + drivers/usb/host/whci/pzl.c | 2 - + drivers/usb/host/xhci-dbgcap.c | 2 - + drivers/usb/host/xhci-hub.c | 11 + + drivers/usb/host/xhci-plat.c | 1 + + drivers/usb/host/xhci-rcar.c | 43 +- + drivers/usb/host/xhci.c | 1 + + drivers/usb/host/xhci.h | 2 + + drivers/usb/isp1760/isp1760-hcd.c | 2 - + drivers/usb/misc/adutux.c | 10 +- + drivers/usb/misc/appledisplay.c | 1 + + drivers/usb/misc/iowarrior.c | 5 - + drivers/usb/misc/ldusb.c | 7 +- + drivers/usb/misc/legousbtower.c | 5 +- + drivers/usb/misc/sisusbvga/sisusb.c | 4 +- + drivers/usb/misc/usbtest.c | 10 +- + drivers/usb/misc/uss720.c | 2 - + drivers/usb/mon/mon_bin.c | 8 +- + drivers/usb/musb/musb_dsps.c | 2 +- + drivers/usb/musb/musb_host.c | 1 + + drivers/usb/renesas_usbhs/mod_gadget.c | 1 + + drivers/usb/typec/Kconfig | 18 + + drivers/usb/typec/Makefile | 5 +- + drivers/usb/typec/altmodes/Kconfig | 14 + + drivers/usb/typec/altmodes/Makefile | 2 + + drivers/usb/typec/altmodes/displayport.c | 580 +++++++++++++++++++++ + drivers/usb/typec/bus.c | 402 ++++++++++++++ + drivers/usb/typec/bus.h | 38 ++ + drivers/usb/typec/class.c | 544 +++++++++++++------ + drivers/usb/typec/fusb302/fusb302.c | 12 - + drivers/usb/typec/mux.c | 6 +- + drivers/usb/typec/mux/pi3usb30532.c | 13 +- + drivers/{staging => usb}/typec/tcpci.c | 66 ++- + drivers/{staging => usb}/typec/tcpci.h | 0 + drivers/{staging => usb}/typec/tcpci_rt1711h.c | 0 + drivers/usb/typec/tcpm.c | 330 +++++++++--- + drivers/usb/typec/tps6598x.c | 11 +- + drivers/usb/usb-skeleton.c | 10 +- + drivers/usb/usbip/vudc_dev.c | 2 - + drivers/usb/wusbcore/security.c | 2 +- + drivers/usb/wusbcore/wa-xfer.c | 8 +- + drivers/uwb/hwa-rc.c | 1 + + include/dt-bindings/usb/pd.h | 62 +++ + include/linux/mod_devicetable.h | 15 + + include/linux/usb/hcd.h | 1 + + include/linux/usb/pd.h | 1 + + include/linux/usb/tcpm.h | 11 +- + include/linux/usb/typec.h | 55 +- + include/linux/usb/typec_altmode.h | 160 ++++++ + include/linux/usb/typec_dp.h | 95 ++++ + include/linux/usb/typec_mux.h | 2 +- + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + .../selftests/drivers/usb/usbip/usbip_test.sh | 2 - + 82 files changed, 2964 insertions(+), 537 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-class-typec + create mode 100644 Documentation/ABI/testing/sysfs-bus-typec + create mode 100644 Documentation/ABI/testing/sysfs-driver-typec-displayport + create mode 100644 Documentation/devicetree/bindings/usb/npcm7xx-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/typec-tcpci.txt + create mode 100644 Documentation/driver-api/usb/typec_bus.rst + delete mode 100644 drivers/staging/typec/Kconfig + delete mode 100644 drivers/staging/typec/Makefile + delete mode 100644 drivers/staging/typec/TODO + create mode 100644 drivers/usb/host/ehci-npcm7xx.c + create mode 100644 drivers/usb/typec/altmodes/Kconfig + create mode 100644 drivers/usb/typec/altmodes/Makefile + create mode 100644 drivers/usb/typec/altmodes/displayport.c + create mode 100644 drivers/usb/typec/bus.c + create mode 100644 drivers/usb/typec/bus.h + rename drivers/{staging => usb}/typec/tcpci.c (92%) + rename drivers/{staging => usb}/typec/tcpci.h (100%) + rename drivers/{staging => usb}/typec/tcpci_rt1711h.c (100%) + create mode 100644 include/dt-bindings/usb/pd.h + create mode 100644 include/linux/usb/typec_altmode.h + create mode 100644 include/linux/usb/typec_dp.h +Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (5edb65a33710 USB: serial: cp210x: improve line-speed handling for CP2104 and CP2105) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + Documentation/usb/usb-serial.txt | 9 -- + drivers/usb/serial/cp210x.c | 176 +++++++++++++++++++++++++--------- + drivers/usb/serial/cyberjack.c | 17 ++-- + drivers/usb/serial/digi_acceleport.c | 35 +++---- + drivers/usb/serial/io_edgeport.c | 17 ++-- + drivers/usb/serial/io_ti.c | 5 +- + drivers/usb/serial/ir-usb.c | 2 +- + drivers/usb/serial/iuu_phoenix.c | 5 - + drivers/usb/serial/kl5kusb105.c | 1 - + drivers/usb/serial/kl5kusb105.h | 3 - + drivers/usb/serial/kobil_sct.c | 24 +++-- + drivers/usb/serial/mos7720.c | 14 +-- + drivers/usb/serial/mos7840.c | 5 +- + drivers/usb/serial/quatech2.c | 7 +- + drivers/usb/serial/sierra.c | 13 +-- + drivers/usb/serial/ssu100.c | 2 +- + drivers/usb/serial/symbolserial.c | 5 +- + drivers/usb/serial/ti_usb_3410_5052.c | 9 +- + drivers/usb/serial/usb_wwan.c | 5 +- + 19 files changed, 222 insertions(+), 132 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_tegra.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging phy-next/next (d5f5ee1a16a4 phy: berlin: switch to SPDX license identifier) +$ git merge phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/brcm,sr-pcie-phy.txt | 41 +++ + .../devicetree/bindings/phy/phy-mtk-tphy.txt | 6 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 14 +- + .../devicetree/bindings/phy/rcar-gen3-phy-pcie.txt | 24 ++ + MAINTAINERS | 3 +- + drivers/phy/broadcom/Kconfig | 10 + + drivers/phy/broadcom/Makefile | 2 + + drivers/phy/broadcom/phy-bcm-sr-pcie.c | 305 +++++++++++++++++++++ + drivers/phy/marvell/phy-berlin-sata.c | 5 +- + drivers/phy/marvell/phy-berlin-usb.c | 5 +- + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-tphy.c | 85 +++++- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 1 + + drivers/phy/renesas/Kconfig | 7 + + drivers/phy/renesas/Makefile | 1 + + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 151 ++++++++++ + 16 files changed, 641 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/brcm,sr-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt + create mode 100644 drivers/phy/broadcom/phy-bcm-sr-pcie.c + create mode 100644 drivers/phy/renesas/phy-rcar-gen3-pcie.c +Merging tty/tty-next (fefe287e4bf6 tty: support CIBAUD without BOTHER) +$ git merge tty/tty-next +Auto-merging drivers/tty/vt/keyboard.c +Auto-merging drivers/s390/char/keyboard.c +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt +Auto-merging Documentation/devicetree/bindings/arm/mediatek.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/serial/fsl-imx-uart.txt | 6 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/omap_serial.txt | 1 + + .../bindings/serial/renesas,sci-serial.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 2 +- + drivers/parport/parport_serial.c | 9 + + drivers/s390/char/keyboard.c | 30 +- + drivers/tty/serdev/core.c | 48 +++- + drivers/tty/serial/8250/8250_core.c | 4 + + drivers/tty/serial/8250/8250_dw.c | 70 ++++- + drivers/tty/serial/8250/8250_exar.c | 38 ++- + drivers/tty/serial/8250/8250_of.c | 6 +- + drivers/tty/serial/8250/8250_omap.c | 1 + + drivers/tty/serial/8250/8250_port.c | 36 ++- + drivers/tty/serial/8250/serial_cs.c | 6 +- + drivers/tty/serial/imx.c | 5 +- + drivers/tty/serial/jsm/jsm_tty.c | 3 +- + drivers/tty/serial/max310x.c | 14 +- + drivers/tty/serial/pxa.c | 3 +- + drivers/tty/serial/qcom_geni_serial.c | 261 ++++++++++++++--- + drivers/tty/serial/serial_core.c | 17 +- + drivers/tty/serial/sh-sci.c | 174 ++++++++---- + drivers/tty/serial/xilinx_uartps.c | 23 +- + drivers/tty/tty_baudrate.c | 22 +- + drivers/tty/tty_io.c | 19 +- + drivers/tty/tty_ldsem.c | 82 +++--- + drivers/tty/vt/keyboard.c | 30 +- + drivers/tty/vt/vc_screen.c | 90 +++++- + drivers/tty/vt/vt.c | 308 ++++++++++++++++++++- + include/linux/console_struct.h | 2 + + include/linux/selection.h | 5 + + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 7 + + include/linux/serial_sci.h | 1 + + include/linux/tty_ldisc.h | 4 +- + include/uapi/linux/keyboard.h | 23 +- + 38 files changed, 1113 insertions(+), 247 deletions(-) +Merging char-misc/char-misc-next (555e7943f281 misc: vexpress/syscfg: Use devm_ioremap_resource() to map memory) +$ git merge char-misc/char-misc-next +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging drivers/media/platform/qcom/venus/venc.c +Auto-merging drivers/media/platform/qcom/venus/vdec.c +Auto-merging drivers/crypto/ux500/hash/hash_core.c +Auto-merging drivers/crypto/stm32/stm32_crc32.c +Auto-merging arch/x86/include/asm/mshyperv.h +Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 + + Documentation/ABI/testing/sysfs-class-fpga-manager | 24 + + Documentation/ABI/testing/sysfs-class-fpga-region | 9 + + Documentation/ABI/testing/sysfs-class-gnss | 15 + + Documentation/ABI/testing/sysfs-class-mei | 11 + + Documentation/ABI/testing/sysfs-platform-dfl-fme | 23 + + Documentation/ABI/testing/sysfs-platform-dfl-port | 16 + + .../devicetree/bindings/arm/coresight.txt | 58 +- + Documentation/devicetree/bindings/gnss/gnss.txt | 36 + + .../devicetree/bindings/gnss/sirfstar.txt | 45 + + Documentation/devicetree/bindings/gnss/u-blox.txt | 44 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 3 +- + .../devicetree/bindings/nvmem/sc27xx-efuse.txt | 52 + + .../bindings/slimbus/slim-ngd-qcom-ctrl.txt | 84 ++ + .../devicetree/bindings/vendor-prefixes.txt | 3 + + Documentation/driver-api/fpga/fpga-mgr.rst | 12 +- + Documentation/driver-api/fpga/fpga-region.rst | 12 +- + Documentation/driver-api/fpga/intro.rst | 14 +- + Documentation/driver-api/slimbus.rst | 5 + + Documentation/fpga/dfl.txt | 285 ++++ + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/sysctl/kernel.txt | 11 + + Documentation/w1/slaves/w1_ds2438 | 2 +- + MAINTAINERS | 19 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 1 + + arch/arm/mach-mmp/sram.c | 1 + + arch/arm/plat-samsung/adc.c | 1 + + arch/x86/hyperv/hv_init.c | 31 +- + arch/x86/include/asm/hyperv-tlfs.h | 17 +- + arch/x86/include/asm/mshyperv.h | 13 +- + arch/x86/kernel/cpu/mshyperv.c | 6 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/android/Kconfig | 2 +- + drivers/ata/pata_imx.c | 1 + + drivers/ata/pata_samsung_cf.c | 1 + + drivers/auxdisplay/hd44780.c | 1 + + drivers/char/hpet.c | 2 - + drivers/char/hw_random/atmel-rng.c | 1 + + drivers/char/hw_random/exynos-trng.c | 1 + + drivers/char/hw_random/imx-rngc.c | 1 + + drivers/char/hw_random/powernv-rng.c | 1 + + drivers/char/mem.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 4 - + drivers/char/virtio_console.c | 60 +- + drivers/crypto/mediatek/mtk-platform.c | 1 + + drivers/crypto/qce/core.c | 1 + + drivers/crypto/stm32/stm32_crc32.c | 1 + + drivers/crypto/ux500/cryp/cryp_core.c | 1 + + drivers/crypto/ux500/hash/hash_core.c | 1 + + drivers/devfreq/tegra-devfreq.c | 1 + + drivers/dma/ep93xx_dma.c | 1 + + drivers/dma/s3c24xx-dma.c | 1 + + drivers/extcon/extcon-intel-cht-wc.c | 1 + + drivers/extcon/extcon-max3355.c | 1 + + drivers/extcon/extcon-qcom-spmi-misc.c | 1 + + drivers/firmware/qemu_fw_cfg.c | 1 + + drivers/fpga/Kconfig | 68 + + drivers/fpga/Makefile | 14 + + drivers/fpga/dfl-afu-dma-region.c | 463 ++++++ + drivers/fpga/dfl-afu-main.c | 636 ++++++++ + drivers/fpga/dfl-afu-region.c | 166 +++ + drivers/fpga/dfl-afu.h | 100 ++ + drivers/fpga/dfl-fme-br.c | 114 ++ + drivers/fpga/dfl-fme-main.c | 279 ++++ + drivers/fpga/dfl-fme-mgr.c | 349 +++++ + drivers/fpga/dfl-fme-pr.c | 479 ++++++ + drivers/fpga/dfl-fme-pr.h | 84 ++ + drivers/fpga/dfl-fme-region.c | 89 ++ + drivers/fpga/dfl-fme.h | 38 + + drivers/fpga/dfl-pci.c | 243 ++++ + drivers/fpga/dfl.c | 1044 +++++++++++++ + drivers/fpga/dfl.h | 410 ++++++ + drivers/fpga/fpga-mgr.c | 28 + + drivers/fpga/fpga-region.c | 22 + + drivers/fsi/Kconfig | 8 + + drivers/fsi/Makefile | 1 + + drivers/fsi/fsi-core.c | 215 ++- + drivers/fsi/fsi-master-gpio.c | 471 ++++-- + drivers/fsi/fsi-master-hub.c | 5 +- + drivers/fsi/fsi-master.h | 35 + + drivers/fsi/fsi-sbefifo.c | 1010 +++++++++++++ + drivers/fsi/fsi-scom.c | 441 +++++- + drivers/gnss/Kconfig | 43 + + drivers/gnss/Makefile | 16 + + drivers/gnss/core.c | 420 ++++++ + drivers/gnss/serial.c | 275 ++++ + drivers/gnss/serial.h | 47 + + drivers/gnss/sirf.c | 408 ++++++ + drivers/gnss/ubx.c | 153 ++ + drivers/gpu/drm/mediatek/mtk_cec.c | 1 + + drivers/gpu/drm/sun4i/sun6i_drc.c | 1 + + drivers/hid/hid-hyperv.c | 3 + + drivers/hsi/controllers/omap_ssi_port.c | 1 + + drivers/hv/channel_mgmt.c | 4 +- + drivers/hv/hv.c | 30 +- + drivers/hv/hv_balloon.c | 3 + + drivers/hv/hv_util.c | 3 + + drivers/hv/ring_buffer.c | 65 +- + drivers/hv/vmbus_drv.c | 110 ++ + drivers/hwmon/max197.c | 1 + + drivers/hwmon/mc13783-adc.c | 1 + + drivers/hwtracing/coresight/Kconfig | 11 + + drivers/hwtracing/coresight/Makefile | 1 + + drivers/hwtracing/coresight/coresight-catu.c | 577 ++++++++ + drivers/hwtracing/coresight/coresight-catu.h | 119 ++ + drivers/hwtracing/coresight/coresight-etb10.c | 12 +- + drivers/hwtracing/coresight/coresight-etm.h | 3 - + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 43 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 4 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 47 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 - + drivers/hwtracing/coresight/coresight-priv.h | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 1074 ++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc.c | 83 +- + drivers/hwtracing/coresight/coresight-tmc.h | 113 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 7 +- + drivers/hwtracing/coresight/coresight.c | 53 +- + drivers/input/serio/hyperv-keyboard.c | 3 + + drivers/ipack/carriers/tpci200.c | 7 + + drivers/media/platform/coda/imx-vdoa.c | 1 + + drivers/media/platform/davinci/vpbe_osd.c | 1 + + drivers/media/platform/davinci/vpbe_venc.c | 1 + + drivers/media/platform/qcom/venus/vdec.c | 1 + + drivers/media/platform/qcom/venus/venc.c | 1 + + drivers/media/platform/rcar-fcp.c | 1 + + drivers/media/platform/sti/hva/hva-v4l2.c | 1 + + drivers/media/platform/vimc/vimc-capture.c | 1 + + drivers/media/platform/vimc/vimc-debayer.c | 1 + + drivers/media/platform/vimc/vimc-scaler.c | 1 + + drivers/media/platform/vimc/vimc-sensor.c | 1 + + drivers/memory/tegra/tegra186.c | 1 + + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/cros_ec_dev.c | 1 + + drivers/misc/aspeed-lpc-snoop.c | 84 +- + drivers/misc/cardreader/rtsx_pcr.c | 12 +- + drivers/misc/eeprom/at25.c | 4 + + drivers/misc/eeprom/idt_89hpesx.c | 4 +- + drivers/misc/genwqe/card_debugfs.c | 4 - + drivers/misc/genwqe/card_dev.c | 5 - + drivers/misc/ibmvmc.c | 2 +- + drivers/misc/mei/bus-fixup.c | 92 +- + drivers/misc/mei/bus.c | 36 +- + drivers/misc/mei/client.c | 44 +- + drivers/misc/mei/client.h | 2 +- + drivers/misc/mei/hw-me.c | 7 +- + drivers/misc/mei/hw-txe.c | 4 +- + drivers/misc/mei/hw.h | 2 - + drivers/misc/mei/interrupt.c | 15 +- + drivers/misc/mei/main.c | 41 +- + drivers/misc/mei/mei_dev.h | 27 +- + drivers/misc/mic/cosm/cosm_main.h | 5 +- + drivers/misc/mic/cosm/cosm_scif_server.c | 6 +- + drivers/misc/mic/cosm_client/cosm_scif_client.c | 6 +- + drivers/misc/mic/scif/scif_api.c | 1 + + drivers/misc/sgi-xp/xpc_channel.c | 3 - + drivers/misc/sgi-xp/xpc_partition.c | 5 +- + drivers/misc/sram.c | 18 +- + drivers/misc/ti-st/Kconfig | 3 +- + drivers/misc/ti-st/st_kim.c | 3 +- + drivers/misc/tsl2550.c | 2 +- + drivers/misc/vmw_balloon.c | 181 +-- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 9 +- + drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c | 1 + + drivers/net/ethernet/calxeda/xgmac.c | 1 + + drivers/net/ethernet/faraday/ftmac100.c | 1 + + drivers/net/hyperv/netvsc_drv.c | 3 + + drivers/net/wireless/ath/ath9k/ahb.c | 1 + + drivers/net/wireless/ti/wl12xx/main.c | 1 + + drivers/net/wireless/ti/wl18xx/main.c | 1 + + drivers/nvmem/Kconfig | 11 + + drivers/nvmem/Makefile | 3 +- + drivers/nvmem/core.c | 2 - + drivers/nvmem/imx-ocotp.c | 7 + + drivers/nvmem/lpc18xx_eeprom.c | 1 + + drivers/nvmem/mtk-efuse.c | 1 + + drivers/nvmem/qfprom.c | 1 + + drivers/nvmem/rave-sp-eeprom.c | 6 +- + drivers/nvmem/sc27xx-efuse.c | 264 ++++ + drivers/nvmem/uniphier-efuse.c | 1 + + drivers/parport/ieee1284.c | 3 +- + drivers/parport/parport_sunbpp.c | 8 +- + drivers/perf/arm-ccn.c | 1 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 1 + + drivers/pinctrl/pinctrl-u300.c | 1 + + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 1 + + drivers/platform/goldfish/goldfish_pipe.c | 3 +- + drivers/platform/x86/intel_bxtwc_tmu.c | 1 + + drivers/platform/x86/intel_punit_ipc.c | 1 + + drivers/power/avs/smartreflex.c | 1 + + drivers/power/reset/ltc2952-poweroff.c | 1 + + drivers/power/supply/max8998_charger.c | 1 + + drivers/power/supply/olpc_battery.c | 1 + + drivers/ptp/ptp_dte.c | 1 + + drivers/regulator/tps65912-regulator.c | 1 + + drivers/reset/reset-ath79.c | 1 + + drivers/reset/reset-axs10x.c | 1 + + drivers/reset/reset-imx7.c | 1 + + drivers/rtc/rtc-coh901331.c | 1 + + drivers/rtc/rtc-cpcap.c | 1 + + drivers/rtc/rtc-ftrtc010.c | 1 + + drivers/rtc/rtc-mc13xxx.c | 1 + + drivers/rtc/rtc-mxc_v2.c | 1 + + drivers/rtc/rtc-r7301.c | 1 + + drivers/rtc/rtc-sh.c | 1 + + drivers/rtc/rtc-tegra.c | 1 + + drivers/scsi/storvsc_drv.c | 3 + + drivers/siox/siox-bus-gpio.c | 1 + + drivers/siox/siox-core.c | 30 +- + drivers/slimbus/Kconfig | 12 +- + drivers/slimbus/Makefile | 5 +- + drivers/slimbus/core.c | 41 + + drivers/slimbus/messaging.c | 79 +- + drivers/slimbus/qcom-ngd-ctrl.c | 1526 ++++++++++++++++++++ + drivers/slimbus/slimbus.h | 198 +++ + drivers/slimbus/stream.c | 477 ++++++ + drivers/tty/goldfish.c | 1 + + drivers/tty/serial/8250/8250_em.c | 1 + + drivers/tty/serial/sccnxp.c | 1 + + drivers/usb/gadget/udc/fsl_mxc_udc.c | 1 + + drivers/video/fbdev/hyperv_fb.c | 6 + + .../omap2/omapfb/displays/encoder-tpd12s015.c | 1 + + drivers/vme/bridges/vme_ca91cx42.c | 2 - + drivers/w1/masters/ds2482.c | 2 +- + drivers/w1/masters/ds2490.c | 16 +- + drivers/w1/masters/mxc_w1.c | 1 + + drivers/watchdog/coh901327_wdt.c | 1 + + drivers/watchdog/davinci_wdt.c | 1 + + drivers/watchdog/imgpdc_wdt.c | 1 + + drivers/watchdog/max63xx_wdt.c | 1 + + drivers/watchdog/max77620_wdt.c | 1 + + drivers/watchdog/moxart_wdt.c | 1 + + drivers/watchdog/omap_wdt.c | 1 + + drivers/watchdog/tangox_wdt.c | 1 + + include/linux/coresight.h | 68 +- + include/linux/fpga/fpga-mgr.h | 24 + + include/linux/fpga/fpga-region.h | 2 + + include/linux/fsi-sbefifo.h | 33 + + include/linux/gnss.h | 75 + + include/linux/hyperv.h | 31 +- + include/linux/platform_device.h | 2 +- + include/linux/slimbus.h | 60 +- + include/trace/events/fsi_master_gpio.h | 102 ++ + include/uapi/linux/eventpoll.h | 8 +- + include/uapi/linux/fpga-dfl.h | 179 +++ + include/uapi/linux/fsi.h | 58 + + scripts/ver_linux | 14 +- + tools/hv/hv_vss_daemon.c | 65 +- + tools/hv/lsvmbus | 12 +- + 262 files changed, 14817 insertions(+), 919 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fpga-region + create mode 100644 Documentation/ABI/testing/sysfs-class-gnss + create mode 100644 Documentation/ABI/testing/sysfs-platform-dfl-fme + create mode 100644 Documentation/ABI/testing/sysfs-platform-dfl-port + create mode 100644 Documentation/devicetree/bindings/gnss/gnss.txt + create mode 100644 Documentation/devicetree/bindings/gnss/sirfstar.txt + create mode 100644 Documentation/devicetree/bindings/gnss/u-blox.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/sc27xx-efuse.txt + create mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt + create mode 100644 Documentation/fpga/dfl.txt + create mode 100644 drivers/fpga/dfl-afu-dma-region.c + create mode 100644 drivers/fpga/dfl-afu-main.c + create mode 100644 drivers/fpga/dfl-afu-region.c + create mode 100644 drivers/fpga/dfl-afu.h + create mode 100644 drivers/fpga/dfl-fme-br.c + create mode 100644 drivers/fpga/dfl-fme-main.c + create mode 100644 drivers/fpga/dfl-fme-mgr.c + create mode 100644 drivers/fpga/dfl-fme-pr.c + create mode 100644 drivers/fpga/dfl-fme-pr.h + create mode 100644 drivers/fpga/dfl-fme-region.c + create mode 100644 drivers/fpga/dfl-fme.h + create mode 100644 drivers/fpga/dfl-pci.c + create mode 100644 drivers/fpga/dfl.c + create mode 100644 drivers/fpga/dfl.h + create mode 100644 drivers/fsi/fsi-sbefifo.c + create mode 100644 drivers/gnss/Kconfig + create mode 100644 drivers/gnss/Makefile + create mode 100644 drivers/gnss/core.c + create mode 100644 drivers/gnss/serial.c + create mode 100644 drivers/gnss/serial.h + create mode 100644 drivers/gnss/sirf.c + create mode 100644 drivers/gnss/ubx.c + create mode 100644 drivers/hwtracing/coresight/coresight-catu.c + create mode 100644 drivers/hwtracing/coresight/coresight-catu.h + create mode 100644 drivers/nvmem/sc27xx-efuse.c + create mode 100644 drivers/slimbus/qcom-ngd-ctrl.c + create mode 100644 drivers/slimbus/stream.c + create mode 100644 include/linux/fsi-sbefifo.h + create mode 100644 include/linux/gnss.h + create mode 100644 include/uapi/linux/fpga-dfl.h + create mode 100644 include/uapi/linux/fsi.h +Merging extcon/extcon-next (8a9dbb779fe8 extcon: Release locking when sending the notification of connector state) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 22 ++++++---------------- + drivers/extcon/extcon.c | 3 ++- + 3 files changed, 9 insertions(+), 18 deletions(-) +Merging staging/staging-next (d7db5843bc09 staging: gasket: drop gasket_cdev_get_info, use container_of) +$ git merge staging/staging-next +Removing drivers/staging/skein/threefish_block.c +Removing drivers/staging/skein/threefish_api.h +Removing drivers/staging/skein/threefish_api.c +Removing drivers/staging/skein/skein_iv.h +CONFLICT (modify/delete): drivers/staging/skein/skein_generic.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/skein/skein_generic.c left in tree. +Removing drivers/staging/skein/skein_block.h +Removing drivers/staging/skein/skein_block.c +Removing drivers/staging/skein/skein_base.h +Removing drivers/staging/skein/skein_base.c +Removing drivers/staging/skein/skein_api.h +Removing drivers/staging/skein/skein_api.c +Removing drivers/staging/skein/TODO +Removing drivers/staging/skein/Makefile +Removing drivers/staging/skein/Kconfig +Removing drivers/staging/rts5208/trace.h +Removing drivers/staging/rts5208/trace.c +Removing drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h +Removing drivers/staging/rtl8723bs/include/rtw_br_ext.h +Removing drivers/staging/rtl8723bs/include/rtw_beamforming.h +Removing drivers/staging/rtl8723bs/include/rtl8192c_rf.h +Auto-merging drivers/staging/rtl8188eu/os_dep/os_intfs.c +Auto-merging drivers/staging/rtl8188eu/include/wifi.h +Removing drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h +Removing drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h +Removing drivers/staging/rtl8188eu/include/rtl8188e_led.h +Auto-merging drivers/staging/rtl8188eu/core/rtw_security.c +Auto-merging drivers/staging/rtl8188eu/core/rtw_recv.c +Removing drivers/staging/mt7621-gpio/mediatek,mt7621-gpio.txt +Removing drivers/staging/mt7621-gpio/gpio-mt7621.c +Removing drivers/staging/mt7621-gpio/TODO +Removing drivers/staging/mt7621-gpio/Makefile +Removing drivers/staging/mt7621-gpio/Kconfig +Auto-merging drivers/staging/ks7010/ks_hostif.c +Removing drivers/staging/iio/gyro/adis16060_core.c +Removing drivers/staging/iio/gyro/Makefile +Removing drivers/staging/iio/gyro/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/skein/skein_generic.c +drivers/staging/skein/skein_generic.c: needs merge +rm 'drivers/staging/skein/skein_generic.c' +$ git commit -v -a +[master 5876c1786686] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 12 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 9 + + .../input/touchscreen/resistive-adc-touch.txt | 30 + + .../bindings/input/touchscreen/touchscreen.txt | 3 + + MAINTAINERS | 29 +- + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/adc/at91-sama5d2_adc.c | 780 +- + drivers/iio/counter/104-quad-8.c | 87 +- + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 1 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 31 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 143 +- + drivers/iio/industrialio-core.c | 27 +- + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/resistive-adc-touch.c | 204 + + drivers/staging/Kconfig | 6 +- + drivers/staging/Makefile | 3 +- + drivers/staging/android/ashmem.c | 46 +- + drivers/staging/android/vsoc.c | 11 +- + drivers/staging/clocking-wizard/Kconfig | 2 +- + drivers/staging/comedi/comedi.h | 2 +- + drivers/staging/comedi/comedi_compat32.h | 2 +- + drivers/staging/comedi/comedi_fops.c | 6 +- + drivers/staging/comedi/comedi_pci.h | 2 +- + drivers/staging/comedi/comedi_pcmcia.h | 2 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/comedilib.h | 2 +- + drivers/staging/comedi/drivers.c | 26 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 6 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 12 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/pcl816.c | 4 +- + drivers/staging/comedi/drivers/pcl818.c | 4 +- + drivers/staging/fbtft/fb_s6d02a1.c | 30 +- + drivers/staging/fbtft/fb_ssd1351.c | 6 +- + drivers/staging/fbtft/fbtft_device.c | 10 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 34 +- + drivers/staging/gasket/Kconfig | 23 + + drivers/staging/gasket/Makefile | 9 + + drivers/staging/gasket/TODO | 15 + + drivers/staging/gasket/apex.h | 87 + + drivers/staging/gasket/apex_driver.c | 757 ++ + drivers/staging/gasket/gasket.h | 122 + + drivers/staging/gasket/gasket_constants.h | 47 + + drivers/staging/gasket/gasket_core.c | 2092 +++++ + drivers/staging/gasket/gasket_core.h | 707 ++ + drivers/staging/gasket/gasket_interrupt.c | 589 ++ + drivers/staging/gasket/gasket_interrupt.h | 118 + + drivers/staging/gasket/gasket_ioctl.c | 441 ++ + drivers/staging/gasket/gasket_ioctl.h | 26 + + drivers/staging/gasket/gasket_logging.h | 64 + + drivers/staging/gasket/gasket_page_table.c | 1756 +++++ + drivers/staging/gasket/gasket_page_table.h | 251 + + drivers/staging/gasket/gasket_sysfs.c | 427 + + drivers/staging/gasket/gasket_sysfs.h | 179 + + drivers/staging/gdm724x/gdm_tty.c | 18 +- + drivers/staging/gdm724x/gdm_usb.c | 5 - + drivers/staging/goldfish/README | 6 - + drivers/staging/goldfish/goldfish_audio.c | 79 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/accel/adis16203.c | 6 +- + drivers/staging/iio/accel/adis16240.c | 11 +- + drivers/staging/iio/adc/ad7606.h | 2 +- + drivers/staging/iio/gyro/Kconfig | 16 - + drivers/staging/iio/gyro/Makefile | 6 - + drivers/staging/iio/gyro/adis16060_core.c | 234 - + drivers/staging/ks7010/ks_hostif.c | 2 - + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/mt7621-dts/gbpc1.dts | 24 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 104 +- + drivers/staging/mt7621-eth/mtk_eth_soc.c | 16 +- + drivers/staging/mt7621-gpio/Kconfig | 6 - + drivers/staging/mt7621-gpio/Makefile | 3 - + drivers/staging/mt7621-gpio/TODO | 3 - + drivers/staging/mt7621-gpio/gpio-mt7621.c | 370 - + .../staging/mt7621-gpio/mediatek,mt7621-gpio.txt | 68 - + drivers/staging/mt7621-mmc/dbg.c | 54 +- + drivers/staging/mt7621-mmc/dbg.h | 6 - + drivers/staging/mt7621-mmc/mt6575_sd.h | 588 +- + drivers/staging/mt7621-mmc/sd.c | 584 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 148 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 174 +- + drivers/staging/mt7621-spi/spi-mt7621.c | 206 +- + drivers/staging/olpc_dcon/Kconfig | 6 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 6 +- + drivers/staging/pi433/pi433_if.c | 93 +- + drivers/staging/pi433/pi433_if.h | 9 +- + drivers/staging/pi433/rf69.c | 283 +- + drivers/staging/pi433/rf69.h | 12 +- + drivers/staging/pi433/rf69_enum.h | 3 +- + drivers/staging/pi433/rf69_registers.h | 3 +- + drivers/staging/rtl8188eu/Makefile | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 63 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 56 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 17 +- + drivers/staging/rtl8188eu/core/rtw_rf.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 1295 +-- + drivers/staging/rtl8188eu/core/rtw_sreset.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 32 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 33 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 13 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 10 +- + drivers/staging/rtl8188eu/hal/fw.c | 13 +- + ...188ERateAdaptive.c => hal8188e_rate_adaptive.c} | 0 + drivers/staging/rtl8188eu/hal/hal_com.c | 75 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 10 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 18 +- + drivers/staging/rtl8188eu/hal/odm.c | 10 +- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 10 +- + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 10 +- + drivers/staging/rtl8188eu/hal/phy.c | 10 +- + drivers/staging/rtl8188eu/hal/pwrseq.c | 10 +- + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rf.c | 10 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 18 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 11 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 11 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 10 +- + drivers/staging/rtl8188eu/include/basic_types.h | 12 +- + drivers/staging/rtl8188eu/include/drv_types.h | 10 +- + drivers/staging/rtl8188eu/include/fw.h | 13 +- + .../{Hal8188EPhyCfg.h => hal8188e_phy_cfg.h} | 10 +- + .../{Hal8188EPhyReg.h => hal8188e_phy_reg.h} | 10 +- + ...188ERateAdaptive.h => hal8188e_rate_adaptive.h} | 0 + drivers/staging/rtl8188eu/include/hal_com.h | 10 +- + drivers/staging/rtl8188eu/include/hal_intf.h | 12 +- + drivers/staging/rtl8188eu/include/ieee80211.h | 21 +- + drivers/staging/rtl8188eu/include/mlme_osdep.h | 10 +- + drivers/staging/rtl8188eu/include/mon.h | 10 +- + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 10 +- + drivers/staging/rtl8188eu/include/odm.h | 10 +- + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 11 +- + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 10 +- + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 10 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 10 +- + drivers/staging/rtl8188eu/include/odm_precomp.h | 12 +- + drivers/staging/rtl8188eu/include/odm_reg.h | 10 +- + drivers/staging/rtl8188eu/include/odm_types.h | 10 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 10 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 10 +- + drivers/staging/rtl8188eu/include/pwrseq.h | 11 +- + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 10 +- + drivers/staging/rtl8188eu/include/recv_osdep.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 14 +- + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 28 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_android.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ap.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_debug.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_efuse.h | 12 +- + drivers/staging/rtl8188eu/include/rtw_event.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ht.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 74 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_iol.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_led.h | 11 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 10 +- + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 1086 --- + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_qos.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_rf.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_security.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_sreset.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_xmit.h | 10 +- + drivers/staging/rtl8188eu/include/sta_info.h | 10 +- + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 10 +- + drivers/staging/rtl8188eu/include/wifi.h | 10 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 10 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 10 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 10 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 21 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 10 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 10 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 22 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 - + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 976 +-- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 71 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 127 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 641 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 94 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 44 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 2 +- + drivers/staging/rtl8192u/r8192U.h | 104 +- + drivers/staging/rtl8192u/r8192U_core.c | 59 +- + drivers/staging/rtl8192u/r8192U_dm.c | 3 +- + drivers/staging/rtl8192u/r819xU_phy.c | 92 +- + drivers/staging/rtl8192u/r819xU_phy.h | 53 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 18 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 143 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 108 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 5 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 268 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 2 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/rtl8192c_rf.h | 28 - + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 1 - + .../staging/rtl8723bs/include/rtw_beamforming.h | 127 - + drivers/staging/rtl8723bs/include/rtw_br_ext.h | 55 - + drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 19 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 108 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 19 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 5 - + drivers/staging/rtlwifi/halmac/halmac_api.h | 1 - + drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h | 17 - + drivers/staging/rtlwifi/halmac/rtl_halmac.c | 2 +- + drivers/staging/rtlwifi/phydm/phydm.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/sw.c | 2 +- + drivers/staging/rts5208/Makefile | 2 +- + drivers/staging/rts5208/ms.c | 337 - + drivers/staging/rts5208/rtsx.c | 38 +- + drivers/staging/rts5208/rtsx.h | 25 - + drivers/staging/rts5208/rtsx_card.c | 29 - + drivers/staging/rts5208/rtsx_card.h | 1 - + drivers/staging/rts5208/rtsx_chip.c | 140 - + drivers/staging/rts5208/rtsx_chip.h | 18 - + drivers/staging/rts5208/rtsx_scsi.c | 216 - + drivers/staging/rts5208/rtsx_transport.c | 1 - + drivers/staging/rts5208/sd.c | 328 +- + drivers/staging/rts5208/spi.c | 71 - + drivers/staging/rts5208/trace.c | 27 - + drivers/staging/rts5208/trace.h | 40 - + drivers/staging/rts5208/xd.c | 112 - + drivers/staging/skein/Kconfig | 16 - + drivers/staging/skein/Makefile | 11 - + drivers/staging/skein/TODO | 8 - + drivers/staging/skein/skein_api.c | 231 - + drivers/staging/skein/skein_api.h | 230 - + drivers/staging/skein/skein_base.c | 870 --- + drivers/staging/skein/skein_base.h | 336 - + drivers/staging/skein/skein_block.c | 469 -- + drivers/staging/skein/skein_block.h | 347 - + drivers/staging/skein/skein_generic.c | 211 - + drivers/staging/skein/skein_iv.h | 187 - + drivers/staging/skein/threefish_api.c | 78 - + drivers/staging/skein/threefish_api.h | 171 - + drivers/staging/skein/threefish_block.c | 8244 -------------------- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/speakup/kobjects.c | 4 +- + drivers/staging/speakup/spk_types.h | 2 + + drivers/staging/speakup/synth.c | 40 +- + drivers/staging/speakup/varhandlers.c | 5 +- + drivers/staging/vboxvideo/TODO | 1 - + drivers/staging/vboxvideo/vbox_drv.c | 34 +- + drivers/staging/vboxvideo/vbox_drv.h | 2 +- + drivers/staging/vboxvideo/vbox_main.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 127 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + drivers/staging/vt6655/dpc.c | 4 +- + drivers/staging/vt6656/dpc.c | 4 +- + drivers/staging/vt6656/rxtx.c | 5 +- + drivers/staging/wilc1000/TODO | 5 - + drivers/staging/wilc1000/host_interface.c | 1554 ++-- + drivers/staging/wilc1000/host_interface.h | 7 +- + drivers/staging/wilc1000/linux_wlan.c | 2 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 16 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 9 +- + drivers/staging/wilc1000/wilc_wlan.c | 144 +- + drivers/staging/wilc1000/wilc_wlan.h | 5 +- + drivers/staging/wlan-ng/cfg80211.c | 44 +- + drivers/staging/wlan-ng/p80211hdr.h | 30 +- + drivers/staging/wlan-ng/prism2fw.c | 7 +- + drivers/staging/wlan-ng/prism2mgmt.c | 41 +- + drivers/staging/wlan-ng/prism2mib.c | 8 +- + include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 16 + + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 2 + + 312 files changed, 12700 insertions(+), 21842 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt + create mode 100644 drivers/input/touchscreen/resistive-adc-touch.c + create mode 100644 drivers/staging/gasket/Kconfig + create mode 100644 drivers/staging/gasket/Makefile + create mode 100644 drivers/staging/gasket/TODO + create mode 100644 drivers/staging/gasket/apex.h + create mode 100644 drivers/staging/gasket/apex_driver.c + create mode 100644 drivers/staging/gasket/gasket.h + create mode 100644 drivers/staging/gasket/gasket_constants.h + create mode 100644 drivers/staging/gasket/gasket_core.c + create mode 100644 drivers/staging/gasket/gasket_core.h + create mode 100644 drivers/staging/gasket/gasket_interrupt.c + create mode 100644 drivers/staging/gasket/gasket_interrupt.h + create mode 100644 drivers/staging/gasket/gasket_ioctl.c + create mode 100644 drivers/staging/gasket/gasket_ioctl.h + create mode 100644 drivers/staging/gasket/gasket_logging.h + create mode 100644 drivers/staging/gasket/gasket_page_table.c + create mode 100644 drivers/staging/gasket/gasket_page_table.h + create mode 100644 drivers/staging/gasket/gasket_sysfs.c + create mode 100644 drivers/staging/gasket/gasket_sysfs.h + delete mode 100644 drivers/staging/iio/gyro/Kconfig + delete mode 100644 drivers/staging/iio/gyro/Makefile + delete mode 100644 drivers/staging/iio/gyro/adis16060_core.c + delete mode 100644 drivers/staging/mt7621-gpio/Kconfig + delete mode 100644 drivers/staging/mt7621-gpio/Makefile + delete mode 100644 drivers/staging/mt7621-gpio/TODO + delete mode 100644 drivers/staging/mt7621-gpio/gpio-mt7621.c + delete mode 100644 drivers/staging/mt7621-gpio/mediatek,mt7621-gpio.txt + rename drivers/staging/rtl8188eu/hal/{Hal8188ERateAdaptive.c => hal8188e_rate_adaptive.c} (100%) + rename drivers/staging/rtl8188eu/include/{Hal8188EPhyCfg.h => hal8188e_phy_cfg.h} (92%) + rename drivers/staging/rtl8188eu/include/{Hal8188EPhyReg.h => hal8188e_phy_reg.h} (98%) + rename drivers/staging/rtl8188eu/include/{Hal8188ERateAdaptive.h => hal8188e_rate_adaptive.h} (100%) + delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_led.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8192c_rf.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_beamforming.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_br_ext.h + delete mode 100644 drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h + delete mode 100644 drivers/staging/rts5208/trace.c + delete mode 100644 drivers/staging/rts5208/trace.h + delete mode 100644 drivers/staging/skein/Kconfig + delete mode 100644 drivers/staging/skein/Makefile + delete mode 100644 drivers/staging/skein/TODO + delete mode 100644 drivers/staging/skein/skein_api.c + delete mode 100644 drivers/staging/skein/skein_api.h + delete mode 100644 drivers/staging/skein/skein_base.c + delete mode 100644 drivers/staging/skein/skein_base.h + delete mode 100644 drivers/staging/skein/skein_block.c + delete mode 100644 drivers/staging/skein/skein_block.h + delete mode 100644 drivers/staging/skein/skein_generic.c + delete mode 100644 drivers/staging/skein/skein_iv.h + delete mode 100644 drivers/staging/skein/threefish_api.c + delete mode 100644 drivers/staging/skein/threefish_api.h + delete mode 100644 drivers/staging/skein/threefish_block.c + create mode 100644 include/dt-bindings/iio/adc/at91-sama5d2_adc.h +$ git am -3 ../patches/0001-Revert-Revert-staging-r8188eu-Use-lib80211-to-suppor.patch +Applying: Revert "Revert "staging:r8188eu: Use lib80211 to support TKIP"" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/rtl8188eu/Kconfig +M drivers/staging/rtl8188eu/core/rtw_recv.c +M drivers/staging/rtl8188eu/core/rtw_security.c +$ git add -A . +$ git commit -v -a --amend +[master f17a4c8e2e2b] Merge remote-tracking branch 'staging/staging-next' + Date: Fri Jul 20 15:44:51 2018 +1000 +Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (443b3707bb46 Merge branch 'topic/intel' into next) +$ git merge slave-dma/next +Auto-merging sound/soc/soc-generic-dmaengine-pcm.c +Auto-merging drivers/dma/pl330.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 2 + + crypto/async_tx/async_pq.c | 10 +- + crypto/async_tx/raid6test.c | 4 +- + drivers/dma/Kconfig | 1 + + drivers/dma/dmaengine.c | 8 +- + drivers/dma/hsu/hsu.c | 8 + + drivers/dma/idma64.c | 8 + + drivers/dma/imx-sdma.c | 474 ++++++++++++--------- + drivers/dma/ioat/dma.c | 6 + + drivers/dma/nbpfaxi.c | 1 + + drivers/dma/pl330.c | 7 +- + drivers/dma/sh/rcar-dmac.c | 94 ++-- + drivers/dma/ste_dma40.c | 15 +- + drivers/dma/stm32-dma.c | 4 +- + drivers/dma/stm32-mdma.c | 8 +- + drivers/dma/xilinx/xilinx_dma.c | 22 + + include/linux/dma/xilinx_dma.h | 2 + + include/linux/dmaengine.h | 5 +- + sound/soc/soc-generic-dmaengine-pcm.c | 2 +- + 20 files changed, 408 insertions(+), 274 deletions(-) +Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin lock out of trace event handlers) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/cgroup-internal.h +Merge made by the 'recursive' strategy. + include/trace/events/cgroup.h | 47 ++++++++++++++++++++--------------------- + kernel/cgroup/cgroup-internal.h | 26 +++++++++++++++++++++++ + kernel/cgroup/cgroup-v1.c | 4 ++-- + kernel/cgroup/cgroup.c | 12 ++++++----- + 4 files changed, 58 insertions(+), 31 deletions(-) +Merging scsi/for-next (8b1ff4bab168 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +CONFLICT (modify/delete): lib/percpu_ida.c deleted in scsi/for-next and modified in HEAD. Version HEAD of lib/percpu_ida.c left in tree. +Auto-merging lib/Makefile +Removing include/linux/percpu_ida.h +Auto-merging include/linux/libata.h +Auto-merging drivers/xen/xen-scsiback.c +Auto-merging drivers/scsi/sg.c +Removing drivers/scsi/scsi_typedefs.h +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/cxlflash/ocxl_hw.c +Removing drivers/scsi/NCR_Q720.h +Removing drivers/scsi/NCR_Q720.c +Removing drivers/scsi/NCR_D700.h +Removing drivers/scsi/NCR_D700.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/ata/libata-core.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f lib/percpu_ida.c +lib/percpu_ida.c: needs merge +rm 'lib/percpu_ida.c' +$ git commit -v -a +[master 11653ed7842c] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 - + drivers/ata/libata-core.c | 3 + + drivers/ata/libata.h | 2 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 - + drivers/message/fusion/mptbase.c | 3 + + drivers/message/fusion/mptsas.c | 1 + + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/Kconfig | 33 +- + drivers/scsi/Makefile | 3 - + drivers/scsi/NCR_D700.c | 405 ----------------------- + drivers/scsi/NCR_D700.h | 30 -- + drivers/scsi/NCR_Q720.c | 376 ---------------------- + drivers/scsi/NCR_Q720.h | 29 -- + drivers/scsi/aacraid/aachba.c | 41 ++- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/aacraid/src.c | 6 +- + drivers/scsi/advansys.c | 10 +- + drivers/scsi/aha152x.c | 71 +++-- + drivers/scsi/aha1740.c | 9 +- + drivers/scsi/aha1740.h | 4 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 +- + drivers/scsi/be2iscsi/be_iscsi.c | 15 +- + drivers/scsi/be2iscsi/be_main.c | 23 +- + drivers/scsi/be2iscsi/be_mgmt.c | 23 +- + drivers/scsi/bfa/bfad_im.c | 19 +- + drivers/scsi/bfa/bfad_im.h | 1 - + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 + + drivers/scsi/ch.c | 2 +- + drivers/scsi/cxlflash/ocxl_hw.c | 5 +- + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/dc395x.c | 5 +- + drivers/scsi/gdth.c | 67 ++-- + drivers/scsi/gdth.h | 10 +- + drivers/scsi/gdth_proc.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 10 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 214 ++++++------- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +- + drivers/scsi/hosts.c | 32 ++ + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 - + drivers/scsi/imm.c | 2 +- + drivers/scsi/ipr.c | 25 ++ + drivers/scsi/ipr.h | 7 + + drivers/scsi/libfc/fc_disc.c | 39 +-- + drivers/scsi/libfc/fc_lport.c | 108 +++---- + drivers/scsi/libfc/fc_rport.c | 99 +++--- + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 47 +-- + drivers/scsi/libsas/sas_discover.c | 2 + + drivers/scsi/libsas/sas_scsi_host.c | 4 +- + drivers/scsi/lpfc/Makefile | 4 +- + drivers/scsi/lpfc/lpfc.h | 5 +- + drivers/scsi/lpfc/lpfc_attr.c | 452 +++++++++++++++----------- + drivers/scsi/lpfc/lpfc_attr.h | 4 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.h | 4 +- + drivers/scsi/lpfc/lpfc_compat.h | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/lpfc/lpfc_disc.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 66 ++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_hw.h | 20 +- + drivers/scsi/lpfc/lpfc_hw4.h | 46 ++- + drivers/scsi/lpfc/lpfc_ids.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 28 +- + drivers/scsi/lpfc/lpfc_logmsg.h | 4 +- + drivers/scsi/lpfc/lpfc_mbox.c | 2 +- + drivers/scsi/lpfc/lpfc_mem.c | 2 +- + drivers/scsi/lpfc/lpfc_nl.h | 4 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_nvme.c | 13 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 52 ++- + drivers/scsi/lpfc/lpfc_nvmet.h | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 63 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 34 +- + drivers/scsi/lpfc/lpfc_sli.h | 6 +- + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 4 +- + drivers/scsi/lpfc/lpfc_vport.h | 4 +- + drivers/scsi/megaraid.c | 29 +- + drivers/scsi/megaraid.h | 14 +- + drivers/scsi/megaraid/megaraid_sas.h | 33 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 61 +++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 36 ++- + drivers/scsi/mesh.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 437 +++++++++++-------------- + drivers/scsi/mpt3sas/mpt3sas_base.h | 30 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 81 +++-- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 395 ++++++++++++----------- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 459 ++++++++++----------------- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 62 ++-- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 - + drivers/scsi/ncr53c8xx.c | 10 +- + drivers/scsi/nsp32_debug.c | 2 +- + drivers/scsi/qedi/qedi_fw_api.c | 30 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/qla2xxx/qla_inline.h | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 14 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 12 +- + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi.c | 4 +- + drivers/scsi/scsi.h | 3 - + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 403 +++++++++++++---------- + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 4 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/scsi_typedefs.h | 2 - + drivers/scsi/sd.c | 15 +- + drivers/scsi/sd_zbc.c | 6 - + drivers/scsi/sg.c | 7 +- + drivers/scsi/smartpqi/smartpqi.h | 12 +- + drivers/scsi/smartpqi/smartpqi_init.c | 160 ++++++---- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 21 +- + drivers/scsi/ufs/ufshcd.c | 37 ++- + drivers/scsi/ufs/ufshcd.h | 3 + + drivers/target/iscsi/iscsi_target.c | 2 - + drivers/target/iscsi/iscsi_target_configfs.c | 7 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/target/iscsi/iscsi_target_tpg.c | 3 +- + drivers/target/iscsi/iscsi_target_util.c | 39 ++- + drivers/target/loopback/tcm_loop.c | 11 +- + drivers/target/sbp/sbp_target.c | 13 +- + drivers/target/target_core_configfs.c | 4 +- + drivers/target/target_core_device.c | 47 +-- + drivers/target/target_core_fabric_configfs.c | 2 +- + drivers/target/target_core_internal.h | 2 +- + drivers/target/target_core_sbc.c | 7 +- + drivers/target/target_core_tmr.c | 30 +- + drivers/target/target_core_transport.c | 262 +++++++-------- + drivers/target/target_core_ua.c | 43 ++- + drivers/target/target_core_ua.h | 3 +- + drivers/target/target_core_user.c | 218 +++++++++---- + drivers/target/target_core_xcopy.c | 5 +- + drivers/target/tcm_fc/tfc_cmd.c | 10 +- + drivers/target/tcm_fc/tfc_conf.c | 5 +- + drivers/usb/gadget/function/f_tcm.c | 15 +- + drivers/vhost/scsi.c | 12 +- + drivers/xen/xen-scsiback.c | 13 +- + include/linux/libata.h | 2 + + include/linux/percpu_ida.h | 83 ----- + include/linux/sbitmap.h | 2 + + include/scsi/libsas.h | 2 +- + include/scsi/scsi_host.h | 1 + + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_backend.h | 2 - + include/target/target_core_base.h | 16 +- + include/target/target_core_fabric.h | 5 +- + lib/Makefile | 2 +- + lib/klist.c | 10 +- + lib/percpu_ida.c | 370 --------------------- + 163 files changed, 2707 insertions(+), 3676 deletions(-) + delete mode 100644 drivers/scsi/NCR_D700.c + delete mode 100644 drivers/scsi/NCR_D700.h + delete mode 100644 drivers/scsi/NCR_Q720.c + delete mode 100644 drivers/scsi/NCR_Q720.h + delete mode 100644 drivers/scsi/scsi_typedefs.h + delete mode 100644 include/linux/percpu_ida.h + delete mode 100644 lib/percpu_ida.c +Merging scsi-mkp/for-next (f4e34f2a5dd9 scsi: hisi_sas: Add SATA FIS check for v3 hw) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/ufs/ufs-hisi.txt | 41 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 10 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 18 + + arch/arm64/configs/defconfig | 1 + + drivers/scsi/arcmsr/arcmsr.h | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 7 + + drivers/scsi/csiostor/csio_wr.c | 84 ++- + drivers/scsi/fcoe/fcoe_ctlr.c | 12 +- + drivers/scsi/hisi_sas/hisi_sas.h | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 113 ++-- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 18 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 274 +++++---- + drivers/scsi/libfc/fc_disc.c | 10 +- + drivers/scsi/libfc/fc_rport.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 12 +- + drivers/scsi/scsi_debug.c | 10 +- + drivers/scsi/snic/snic_debugfs.c | 10 +- + drivers/scsi/snic/snic_trc.c | 6 +- + drivers/scsi/ufs/Kconfig | 9 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufs-hisi.c | 619 +++++++++++++++++++++ + drivers/scsi/ufs/ufs-hisi.h | 115 ++++ + 23 files changed, 1167 insertions(+), 232 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ufs-hisi.txt + create mode 100644 drivers/scsi/ufs/ufs-hisi.c + create mode 100644 drivers/scsi/ufs/ufs-hisi.h +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (48ffb6b32df8 Merge branch 'for-4.18-fixes' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/pata_imx.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/ahci_platform.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/libata.rst | 3 +- + drivers/ata/ahci_platform.c | 11 ++++- + drivers/ata/libahci.c | 2 + + drivers/ata/libahci_platform.c | 94 +++++++++++++++++++++++++++---------- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/libata-sff.c | 30 ------------ + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_ftide010.c | 27 +++++++---- + drivers/ata/pata_icside.c | 2 +- + drivers/ata/pata_imx.c | 2 +- + drivers/ata/pata_legacy.c | 6 +-- + drivers/ata/pata_palmld.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/pata_via.c | 2 +- + include/linux/ahci_platform.h | 2 + + include/linux/libata.h | 2 - + 18 files changed, 113 insertions(+), 84 deletions(-) +$ git am -3 ../patches/0001-Revert-ata-ahci_platform-allow-disabling-of-hotplug-.patch +Applying: Revert "ata: ahci_platform: allow disabling of hotplug to save power" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/ata/ahci_platform.c +M drivers/ata/libahci_platform.c +M include/linux/ahci_platform.h +$ git add -A . +$ git commit -v -a --amend +[master bfb9bcb6317b] Merge remote-tracking branch 'libata/for-next' + Date: Fri Jul 20 15:57:38 2018 +1000 +Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (3d065621c921 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 7 +- + drivers/hwspinlock/hwspinlock_core.c | 223 +++++++- + drivers/remoteproc/Kconfig | 22 + + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/qcom_adsp_pil.c | 156 +----- + drivers/remoteproc/qcom_common.c | 26 +- + drivers/remoteproc/qcom_q6v5.c | 252 +++++++++ + drivers/remoteproc/qcom_q6v5.h | 46 ++ + drivers/remoteproc/qcom_q6v5_pil.c | 157 +----- + drivers/remoteproc/qcom_q6v5_wcss.c | 601 +++++++++++++++++++++ + drivers/remoteproc/qcom_sysmon.c | 5 +- + drivers/remoteproc/remoteproc_core.c | 110 +++- + drivers/rpmsg/qcom_smd.c | 1 + + drivers/soc/qcom/mdt_loader.c | 87 ++- + drivers/spi/spi-sprd-adi.c | 11 +- + include/linux/hwspinlock.h | 37 +- + include/linux/remoteproc.h | 19 +- + include/linux/soc/qcom/mdt_loader.h | 4 + + 18 files changed, 1409 insertions(+), 357 deletions(-) + create mode 100644 drivers/remoteproc/qcom_q6v5.c + create mode 100644 drivers/remoteproc/qcom_q6v5.h + create mode 100644 drivers/remoteproc/qcom_q6v5_wcss.c +Merging gpio/for-next (d166d33c1862 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/fsl-imx-gpio.txt | 3 + + .../bindings/gpio/mediatek,mt7621-gpio.txt | 35 ++ + .../bindings/gpio/nvidia,tegra186-gpio.txt | 4 + + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-aspeed.c | 426 ++++++++++++++++++--- + drivers/gpio/gpio-davinci.c | 70 ++-- + drivers/gpio/gpio-max732x.c | 12 + + drivers/gpio/gpio-menz127.c | 4 +- + drivers/gpio/gpio-mt7621.c | 332 ++++++++++++++++ + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pxa.c | 2 + + drivers/gpio/gpio-rc5t583.c | 2 +- + drivers/gpio/gpio-rcar.c | 10 +- + drivers/gpio/gpio-rdc321x.c | 2 +- + drivers/gpio/gpio-sa1100.c | 2 +- + drivers/gpio/gpio-sch.c | 11 +- + drivers/gpio/gpio-sch311x.c | 70 +++- + drivers/gpio/gpio-spear-spics.c | 2 +- + drivers/gpio/gpio-sta2x11.c | 41 +- + drivers/gpio/gpio-stmpe.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 18 +- + drivers/gpio/gpio-syscon.c | 2 +- + drivers/gpio/gpio-tegra186.c | 74 ++++ + drivers/gpio/gpio-uniphier.c | 6 +- + drivers/gpio/gpiolib-of.c | 3 +- + drivers/gpio/gpiolib.c | 53 ++- + drivers/gpio/gpiolib.h | 2 +- + drivers/w1/masters/Kconfig | 2 +- + include/linux/gpio/aspeed.h | 15 + + include/linux/gpio/consumer.h | 7 + + include/linux/platform_data/gpio-davinci.h | 3 +- + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 6 +- + 34 files changed, 1070 insertions(+), 164 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt + create mode 100644 drivers/gpio/gpio-mt7621.c + create mode 100644 include/linux/gpio/aspeed.h +Merging pinctrl/for-next (b283cec1c680 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-merrifield.c +Auto-merging drivers/pinctrl/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s900-pinctrl.txt | 10 + + .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 3 + + .../bindings/pinctrl/fsl,imx8mq-pinctrl.txt | 36 ++ + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 6 + + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 6 + + .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 6 + + .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 6 + + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 6 + + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 9 + + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 9 + + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 6 +- + drivers/pinctrl/Kconfig | 8 +- + drivers/pinctrl/actions/Kconfig | 1 + + drivers/pinctrl/actions/pinctrl-owl.c | 270 ++++++++++++- + drivers/pinctrl/actions/pinctrl-owl.h | 22 +- + drivers/pinctrl/actions/pinctrl-s900.c | 31 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 +- + drivers/pinctrl/core.c | 36 +- + drivers/pinctrl/core.h | 6 - + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 351 +++++++++++++++++ + drivers/pinctrl/intel/Kconfig | 12 +- + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 14 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 5 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 5 +- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 97 +++-- + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 5 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 5 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 436 +++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-intel.c | 5 +- + drivers/pinctrl/intel/pinctrl-intel.h | 5 +- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 5 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 5 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 5 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 9 + + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 8 + + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 118 ++++++ + drivers/pinctrl/pinctrl-at91-pio4.c | 46 ++- + drivers/pinctrl/pinctrl-gemini.c | 2 + + drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 +- + drivers/pinctrl/pinctrl-rza1.c | 24 +- + drivers/pinctrl/pinctrl-single.c | 127 +++--- + drivers/pinctrl/pinmux.c | 17 +- + drivers/pinctrl/pinmux.h | 7 - + drivers/pinctrl/qcom/pinctrl-msm.c | 14 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 +- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 333 ++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 69 +++- + include/dt-bindings/pinctrl/at91.h | 4 + + include/linux/pinctrl/pinconf.h | 3 +- + 60 files changed, 2080 insertions(+), 237 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.txt + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8mq.c + create mode 100644 drivers/pinctrl/intel/pinctrl-icelake.c +Merging pinctrl-samsung/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (19ad2b75c643 pwm: mxs: Switch to SPDX identifier) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 5 +- + drivers/pwm/pwm-berlin.c | 45 +++++++++-------- + drivers/pwm/pwm-cros-ec.c | 9 ++-- + drivers/pwm/pwm-fsl-ftm.c | 57 +++++++++++++++++++--- + drivers/pwm/pwm-imx.c | 5 +- + drivers/pwm/pwm-mxs.c | 8 +-- + drivers/pwm/pwm-tiehrpwm.c | 14 ++---- + 7 files changed, 87 insertions(+), 56 deletions(-) +Merging userns/for-next (04035aa33a12 proc: Don't change mount options on remount failure.) +$ git merge userns/for-next +Auto-merging fs/proc/root.c +CONFLICT (content): Merge conflict in fs/proc/root.c +Auto-merging fs/proc/internal.h +CONFLICT (content): Merge conflict in fs/proc/internal.h +Auto-merging fs/proc/inode.c +CONFLICT (content): Merge conflict in fs/proc/inode.c +Auto-merging fs/proc/base.c +Resolved 'fs/proc/inode.c' using previous resolution. +Resolved 'fs/proc/internal.h' using previous resolution. +Resolved 'fs/proc/root.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 78989f1c7afc] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/um/drivers/mconsole_kern.c | 4 ++-- + fs/proc/base.c | 36 +++++++++++++++++++++++++------- + fs/proc/root.c | 46 +++++++++++++---------------------------- + include/linux/pid_namespace.h | 3 +-- + include/linux/proc_ns.h | 7 ++----- + kernel/pid.c | 8 ------- + kernel/pid_namespace.c | 7 ------- + kernel/sysctl_binary.c | 5 ++--- + 8 files changed, 50 insertions(+), 66 deletions(-) +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (067954f27faa random: add a config option to trust the CPU's hwrng) +$ git merge random/dev +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 8 +++++ + drivers/char/Kconfig | 14 +++++++++ + drivers/char/random.c | 40 ++++++++++++++++++------- + include/linux/random.h | 2 +- + lib/vsprintf.c | 27 ++++++++++++++++- + 5 files changed, 78 insertions(+), 13 deletions(-) +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (d2d49495b5c0 selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/android/ion/ionapp_export.c | 1 + + tools/testing/selftests/vDSO/Makefile | 13 +++++++++---- + tools/testing/selftests/vDSO/vdso_test.c | 7 +++++-- + 3 files changed, 15 insertions(+), 6 deletions(-) +Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (0eb53cdd58f5 Merge branch 'for-4.19/upstream' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + kernel/livepatch/transition.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging coresight/next (1f0a504d39ae coresight: tpiu: Fix disabling timeouts) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (7e580769b79f rtc: ds1307: support m41t11 variant) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/rtc-ds1307.txt | 1 + + drivers/rtc/Kconfig | 12 - + drivers/rtc/class.c | 4 +- + drivers/rtc/rtc-armada38x.c | 23 + + drivers/rtc/rtc-bq4802.c | 4 + + drivers/rtc/rtc-ds1307.c | 16 +- + drivers/rtc/rtc-ds1685.c | 590 --------------------- + drivers/rtc/rtc-m48t59.c | 4 - + drivers/rtc/rtc-omap.c | 23 +- + drivers/rtc/rtc-pcf2127.c | 68 ++- + drivers/rtc/rtc-snvs.c | 105 ++-- + drivers/rtc/rtc-stmp3xxx.c | 20 +- + drivers/rtc/rtc-test.c | 2 +- + 13 files changed, 205 insertions(+), 667 deletions(-) +Merging nvdimm/libnvdimm-for-next (7daf201d7fe8 Linux 4.18-rc2) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) +$ git merge ntb/ntb-next +Auto-merging drivers/net/ntb_netdev.c +Merge made by the 'recursive' strategy. + drivers/net/ntb_netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (9edc4161661e Merge branch 'for-next/usercopy' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging kernel/Makefile +Auto-merging include/linux/sched.h +Auto-merging fs/proc/base.c +Auto-merging arch/x86/entry/entry_64_compat.S +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/security/self-protection.rst | 23 +- + Documentation/x86/x86_64/mm.txt | 2 + + arch/Kconfig | 147 +------- + arch/x86/Kconfig | 1 + + arch/x86/entry/calling.h | 14 + + arch/x86/entry/entry_32.S | 7 + + arch/x86/entry/entry_64.S | 3 + + arch/x86/entry/entry_64_compat.S | 5 + + arch/x86/kernel/dumpstack.c | 31 ++ + drivers/misc/lkdtm/Makefile | 3 + + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 5 + + drivers/misc/lkdtm/stackleak.c | 146 +++++++ + fs/proc/base.c | 18 + + include/linux/jump_label.h | 6 + + include/linux/sched.h | 5 + + include/linux/stackleak.h | 29 ++ + kernel/Makefile | 4 + + kernel/fork.c | 3 + + kernel/stackleak.c | 94 +++++ + mm/usercopy.c | 25 ++ + scripts/Makefile.gcc-plugins | 47 ++- + scripts/gcc-plugins/Kconfig | 185 +++++++++ + scripts/gcc-plugins/Makefile | 5 - + scripts/gcc-plugins/gcc-common.h | 26 +- + scripts/gcc-plugins/stackleak_plugin.c | 480 ++++++++++++++++++++++++ + security/Kconfig | 1 - + 28 files changed, 1150 insertions(+), 179 deletions(-) + create mode 100644 drivers/misc/lkdtm/stackleak.c + create mode 100644 include/linux/stackleak.h + create mode 100644 kernel/stackleak.c + create mode 100644 scripts/gcc-plugins/Kconfig + create mode 100644 scripts/gcc-plugins/stackleak_plugin.c +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge cisco/for-next +Already up to date. +Merging xarray/xarray (4c8e6fcba165 radix tree: Remove radix_tree_clear_tags) +$ git merge xarray/xarray +Auto-merging mm/shmem.c +Auto-merging mm/readahead.c +Auto-merging mm/memfd.c +Auto-merging mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/swap.h +Auto-merging include/linux/fs.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .clang-format | 1 - + .mailmap | 7 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/xarray.rst | 392 ++++++ + MAINTAINERS | 17 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 17 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/extent_io.c | 12 +- + fs/buffer.c | 14 +- + fs/dax.c | 801 +++++------ + fs/ext4/inode.c | 2 +- + fs/f2fs/data.c | 6 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/node.c | 6 +- + fs/fs-writeback.c | 25 +- + fs/gfs2/aops.c | 2 +- + fs/inode.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nilfs2/btnode.c | 26 +- + fs/nilfs2/page.c | 29 +- + fs/proc/task_mmu.c | 2 +- + include/linux/fs.h | 63 +- + include/linux/pagemap.h | 10 +- + include/linux/pagevec.h | 8 +- + include/linux/radix-tree.h | 136 +- + include/linux/swap.h | 22 +- + include/linux/swapops.h | 19 +- + include/linux/xarray.h | 1043 ++++++++++++++- + lib/Kconfig | 7 + + lib/Kconfig.debug | 3 + + lib/Makefile | 3 +- + lib/idr.c | 70 +- + lib/radix-tree.c | 592 ++------ + lib/test_xarray.c | 802 +++++++++++ + lib/xarray.c | 1782 +++++++++++++++++++++++++ + mm/filemap.c | 724 +++++----- + mm/huge_memory.c | 17 +- + mm/khugepaged.c | 177 +-- + mm/madvise.c | 2 +- + mm/memcontrol.c | 2 +- + mm/memfd.c | 105 +- + mm/migrate.c | 48 +- + mm/mincore.c | 2 +- + mm/page-writeback.c | 72 +- + mm/readahead.c | 10 +- + mm/shmem.c | 195 +-- + mm/swap.c | 6 +- + mm/swap_state.c | 119 +- + mm/truncate.c | 27 +- + mm/vmscan.c | 10 +- + mm/workingset.c | 70 +- + tools/include/asm-generic/bitops.h | 1 + + tools/include/asm-generic/bitops/atomic.h | 9 - + tools/include/asm-generic/bitops/non-atomic.h | 109 ++ + tools/include/linux/bitmap.h | 1 + + tools/include/linux/kernel.h | 1 + + tools/include/linux/spinlock.h | 12 +- + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 16 +- + tools/testing/radix-tree/benchmark.c | 91 -- + tools/testing/radix-tree/bitmap.c | 23 + + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/idr-test.c | 69 +- + tools/testing/radix-tree/linux/bug.h | 1 + + tools/testing/radix-tree/linux/kconfig.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 5 + + tools/testing/radix-tree/linux/lockdep.h | 11 + + tools/testing/radix-tree/linux/radix-tree.h | 1 - + tools/testing/radix-tree/linux/rcupdate.h | 2 + + tools/testing/radix-tree/linux/xarray.h | 2 + + tools/testing/radix-tree/main.c | 21 +- + tools/testing/radix-tree/multiorder.c | 272 +--- + tools/testing/radix-tree/regression1.c | 58 +- + tools/testing/radix-tree/regression3.c | 23 - + tools/testing/radix-tree/tag_check.c | 29 - + tools/testing/radix-tree/test.c | 8 +- + tools/testing/radix-tree/test.h | 1 + + tools/testing/radix-tree/xarray.c | 35 + + 82 files changed, 5657 insertions(+), 2677 deletions(-) + create mode 100644 Documentation/core-api/xarray.rst + create mode 100644 lib/test_xarray.c + create mode 100644 lib/xarray.c + create mode 100644 tools/include/asm-generic/bitops/non-atomic.h + create mode 100644 tools/testing/radix-tree/bitmap.c + create mode 100644 tools/testing/radix-tree/linux/kconfig.h + create mode 100644 tools/testing/radix-tree/linux/lockdep.h + create mode 100644 tools/testing/radix-tree/linux/xarray.h + create mode 100644 tools/testing/radix-tree/xarray.c +Merging fsi/master (fea9cf321c91 fsi: Move various master definitions to a common header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging ida/ida (eafb6e79625d ida: Convert to XArray) +$ git merge ida/ida +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/idr.h +Auto-merging fs/super.c +Auto-merging fs/namespace.c +Auto-merging fs/devpts/inode.c +Auto-merging drivers/target/iscsi/iscsi_target_login.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/media/media-device.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging arch/powerpc/mm/mmu_context_book3s64.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 19 +- + arch/powerpc/mm/mmu_context_book3s64.c | 44 +-- + arch/powerpc/platforms/powernv/vas-window.c | 26 +- + drivers/block/mtip32xx/mtip32xx.c | 29 +- + drivers/block/rsxx/core.c | 21 +- + drivers/dma/dmaengine.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 41 +-- + drivers/media/media-device.c | 16 +- + drivers/misc/cb710/core.c | 23 +- + drivers/scsi/osd/osd_uld.c | 22 +- + drivers/scsi/sd.c | 21 +- + drivers/target/iscsi/iscsi_target.c | 10 +- + drivers/target/iscsi/iscsi_target.h | 4 +- + drivers/target/iscsi/iscsi_target_login.c | 20 +- + fs/devpts/inode.c | 47 +-- + fs/namespace.c | 50 +--- + fs/super.c | 67 ++--- + include/linux/idr.h | 79 +++-- + include/linux/xarray.h | 6 + + lib/Kconfig.debug | 3 + + lib/Makefile | 1 + + lib/idr.c | 412 +++++++++++--------------- + lib/radix-tree.c | 40 +-- + lib/test_ida.c | 177 +++++++++++ + lib/test_xarray.c | 61 ++++ + lib/xarray.c | 120 ++++++-- + net/core/net_namespace.c | 16 +- + tools/testing/radix-tree/Makefile | 1 + + tools/testing/radix-tree/idr-test.c | 218 +++----------- + tools/testing/radix-tree/main.c | 3 +- + tools/testing/radix-tree/test.h | 3 +- + 31 files changed, 769 insertions(+), 854 deletions(-) + create mode 100644 lib/test_ida.c +Merging akpm-current/current (a1d8d12c793b ipc/util.c: update return value of ipc_getref from int to bool) +$ git merge --no-ff akpm-current/current +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/apparmor/lsm.c +Auto-merging scripts/checkpatch.pl +Auto-merging net/9p/client.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/workingset.c +CONFLICT (content): Merge conflict in mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +CONFLICT (content): Merge conflict in mm/swap_state.c +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/mmap.c +Auto-merging mm/mincore.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memblock.c +Auto-merging mm/khugepaged.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +Auto-merging lib/rhashtable.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/Makefile +Auto-merging kernel/printk/printk.c +Auto-merging kernel/module.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c +Auto-merging ipc/util.c +Auto-merging ipc/shm.c +Auto-merging ipc/sem.c +Auto-merging ipc/msg.c +Auto-merging init/do_mounts_initrd.c +Auto-merging init/do_mounts.c +Auto-merging init/Kconfig +Auto-merging include/linux/swapops.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched/sysctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/ipc_namespace.h +Auto-merging include/linux/fsnotify_backend.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging include/linux/bitops.h +CONFLICT (content): Merge conflict in include/linux/bitops.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/sysv/inode.c +Auto-merging fs/super.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/inode.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/namei.c +Auto-merging fs/mpage.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/hfsplus/super.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/fat/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/dcache.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/bfs/inode.c +Auto-merging fs/autofs/autofs_i.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/misc/ocxl/link.c +Auto-merging drivers/iommu/intel-svm.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/base/firmware_loader/fallback.c +Auto-merging block/genhd.c +Auto-merging arch/xtensa/kernel/pci-dma.c +Auto-merging arch/x86/purgatory/Makefile +Removing arch/x86/include/asm/export.h +Auto-merging arch/x86/boot/compressed/kaslr.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/ia64/kernel/perfmon.c +Auto-merging arch/h8300/include/asm/bitops.h +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'include/linux/bitops.h' using previous resolution. +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Resolved 'mm/swap_state.c' using previous resolution. +Resolved 'mm/workingset.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f552cb9fb712] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/accounting/psi.txt | 73 +++ + Documentation/admin-guide/cgroup-v2.rst | 92 +++ + .../admin-guide/mm/idle_page_tracking.rst | 5 + + Documentation/admin-guide/mm/pagemap.rst | 3 + + Documentation/filesystems/seq_file.txt | 63 +- + Documentation/sysctl/fs.txt | 36 ++ + Documentation/sysctl/kernel.txt | 18 +- + MAINTAINERS | 2 +- + arch/Kconfig | 10 + + arch/alpha/mm/fault.c | 3 +- + arch/arc/mm/fault.c | 4 +- + arch/arm/Kconfig | 4 + + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/process.c | 1 + + arch/arm/mm/dma-mapping.c | 5 +- + arch/arm/mm/fault.c | 7 +- + arch/arm64/Kconfig | 5 + + arch/arm64/mm/dma-mapping.c | 4 +- + arch/arm64/mm/fault.c | 6 +- + arch/h8300/include/asm/bitops.h | 2 +- + arch/hexagon/mm/vm_fault.c | 2 +- + arch/ia64/kernel/perfmon.c | 1 + + arch/ia64/mm/fault.c | 2 +- + arch/ia64/mm/init.c | 2 + + arch/m68k/mm/fault.c | 4 +- + arch/microblaze/mm/fault.c | 2 +- + arch/mips/mm/fault.c | 2 +- + arch/nds32/mm/fault.c | 2 +- + arch/nios2/mm/fault.c | 2 +- + arch/openrisc/mm/fault.c | 2 +- + arch/parisc/mm/fault.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/copro.h | 4 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- + arch/powerpc/mm/copro_fault.c | 2 +- + arch/powerpc/mm/fault.c | 7 +- + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 2 +- + arch/powerpc/platforms/cell/spufs/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 9 +- + arch/riscv/mm/fault.c | 3 +- + arch/s390/appldata/appldata_os.c | 4 - + arch/s390/mm/fault.c | 13 +- + arch/sh/boards/of-generic.c | 7 +- + arch/sh/mm/fault.c | 4 +- + arch/sparc/mm/fault_32.c | 3 +- + arch/sparc/mm/fault_64.c | 3 +- + arch/um/kernel/trap.c | 2 +- + arch/unicore32/mm/fault.c | 9 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/kaslr.c | 5 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/export.h | 5 - + arch/x86/kvm/mmu.c | 2 +- + arch/x86/mm/fault.c | 5 +- + arch/xtensa/kernel/pci-dma.c | 2 +- + arch/xtensa/mm/fault.c | 2 +- + block/genhd.c | 2 +- + drivers/base/firmware_loader/fallback.c | 5 - + drivers/base/memory.c | 2 - + drivers/base/node.c | 49 +- + drivers/char/mem.c | 1 + + drivers/cpuidle/governors/menu.c | 4 - + drivers/dax/device.c | 2 +- + drivers/firewire/core-cdev.c | 8 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 2 +- + drivers/iommu/amd_iommu_v2.c | 2 +- + drivers/iommu/intel-iommu.c | 3 +- + drivers/iommu/intel-svm.c | 4 +- + drivers/misc/cxl/fault.c | 2 +- + drivers/misc/ocxl/link.c | 3 +- + drivers/pci/quirks.c | 12 +- + drivers/s390/char/vmcp.c | 2 +- + drivers/staging/android/ion/ion_cma_heap.c | 2 +- + fs/adfs/inode.c | 11 +- + fs/autofs/autofs_i.h | 8 +- + fs/autofs/expire.c | 143 +++-- + fs/autofs/root.c | 33 +- + fs/bfs/inode.c | 9 +- + fs/binfmt_elf.c | 2 +- + fs/btrfs/extent_io.c | 2 +- + fs/buffer.c | 12 +- + fs/dcache.c | 3 +- + fs/exec.c | 2 + + fs/ext2/file.c | 1 - + fs/ext4/ext4.h | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 5 +- + fs/ext4/readpage.c | 5 +- + fs/f2fs/data.c | 5 + + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 7 +- + fs/fat/fatent.c | 102 +++ + fs/fat/file.c | 33 + + fs/fat/inode.c | 38 +- + fs/fat/misc.c | 12 +- + fs/fat/namei_msdos.c | 17 +- + fs/fat/namei_vfat.c | 20 +- + fs/hfs/brec.c | 7 +- + fs/hfs/hfs_fs.h | 31 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/brec.c | 7 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/extents.c | 18 +- + fs/hfsplus/hfsplus_fs.h | 30 +- + fs/hfsplus/inode.c | 12 +- + fs/hfsplus/super.c | 4 +- + fs/hostfs/hostfs.h | 2 +- + fs/hugetlbfs/inode.c | 1 + + fs/kernfs/file.c | 20 +- + fs/mpage.c | 115 ++-- + fs/namei.c | 53 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/super.c | 2 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 14 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 3 + + fs/notify/inotify/inotify_fsnotify.c | 7 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/ntfs/aops.c | 9 +- + fs/ntfs/compress.c | 28 +- + fs/ntfs/mft.c | 12 +- + fs/ocfs2/alloc.c | 60 +- + fs/ocfs2/buffer_head_io.c | 77 ++- + fs/ocfs2/cluster/heartbeat.c | 12 +- + fs/ocfs2/cluster/nodemanager.c | 6 +- + fs/ocfs2/cluster/tcp.c | 2 - + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlmglue.c | 30 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/inode.c | 5 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/localalloc.c | 9 +- + fs/ocfs2/quota_local.c | 15 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/base.c | 44 +- + fs/proc/generic.c | 4 +- + fs/proc/inode.c | 6 +- + fs/proc/internal.h | 21 +- + fs/proc/kcore.c | 4 +- + fs/proc/loadavg.c | 3 - + fs/proc/stat.c | 2 +- + fs/proc/task_mmu.c | 2 +- + fs/proc/uptime.c | 4 +- + fs/proc/vmcore.c | 2 +- + fs/reiserfs/item_ops.c | 16 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/procfs.c | 11 +- + fs/reiserfs/reiserfs.h | 4 +- + fs/seq_file.c | 54 +- + fs/super.c | 11 +- + fs/sysv/inode.c | 6 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/bug.h | 16 +- + include/asm-generic/export.h | 12 +- + include/asm-generic/pgtable.h | 18 + + include/linux/cgroup-defs.h | 9 + + include/linux/cgroup.h | 15 + + include/linux/cma.h | 2 +- + include/linux/compiler.h | 19 + + include/linux/delayacct.h | 23 + + include/linux/dma-contiguous.h | 4 +- + include/linux/export.h | 57 +- + include/linux/fs.h | 7 +- + include/linux/fsnotify_backend.h | 12 +- + include/linux/hugetlb.h | 3 - + include/linux/init.h | 44 +- + include/linux/ipc_namespace.h | 3 +- + include/linux/kasan.h | 13 +- + include/linux/kernel.h | 35 +- + include/linux/list_lru.h | 18 +- + include/linux/memblock.h | 2 + + include/linux/memcontrol.h | 99 ++- + include/linux/mm.h | 15 +- + include/linux/mm_types.h | 7 + + include/linux/mmzone.h | 17 + + include/linux/net_dim.h | 1 - + include/linux/node.h | 12 +- + include/linux/oom.h | 12 +- + include/linux/page-flags.h | 10 +- + include/linux/page_ext.h | 15 +- + include/linux/pci.h | 20 + + include/linux/proc_fs.h | 2 +- + include/linux/psi.h | 52 ++ + include/linux/psi_types.h | 90 +++ + include/linux/sched.h | 21 +- + include/linux/sched/loadavg.h | 24 +- + include/linux/sched/mm.h | 37 ++ + include/linux/sched/signal.h | 5 +- + include/linux/sched/stat.h | 10 +- + include/linux/sched/sysctl.h | 1 + + include/linux/shrinker.h | 11 +- + include/linux/signal.h | 4 +- + include/linux/slab.h | 2 +- + include/linux/swap.h | 15 +- + include/linux/swapops.h | 10 - + include/linux/tracepoint.h | 19 +- + include/trace/events/mmflags.h | 1 + + include/uapi/linux/auto_fs.h | 8 +- + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/taskstats.h | 6 +- + init/Kconfig | 49 +- + init/do_mounts.c | 10 - + init/do_mounts_initrd.c | 10 - + init/do_mounts_md.c | 10 - + init/do_mounts_rd.c | 10 - + init/initramfs.c | 10 - + init/main.c | 32 +- + ipc/msg.c | 38 +- + ipc/namespace.c | 20 +- + ipc/sem.c | 38 +- + ipc/shm.c | 65 +- + ipc/util.c | 214 +++---- + ipc/util.h | 33 +- + kernel/cgroup/cgroup.c | 65 +- + kernel/crash_core.c | 2 +- + kernel/cred.c | 1 + + kernel/debug/kdb/kdb_main.c | 7 +- + kernel/delayacct.c | 15 + + kernel/dma/contiguous.c | 6 +- + kernel/dma/direct.c | 3 +- + kernel/events/core.c | 2 +- + kernel/exit.c | 4 + + kernel/fork.c | 17 +- + kernel/hung_task.c | 15 +- + kernel/memremap.c | 10 + + kernel/module.c | 32 +- + kernel/printk/printk.c | 16 +- + kernel/sched/Makefile | 1 + + kernel/sched/core.c | 11 +- + kernel/sched/loadavg.c | 139 ++-- + kernel/sched/psi.c | 699 +++++++++++++++++++++ + kernel/sched/sched.h | 178 +++--- + kernel/sched/stats.h | 114 +++- + kernel/signal.c | 170 +++-- + kernel/sys.c | 11 + + kernel/sysctl.c | 37 +- + kernel/tracepoint.c | 49 +- + lib/Kconfig.kasan | 2 +- + lib/bitmap.c | 9 +- + lib/rhashtable.c | 21 +- + lib/test_debug_virtual.c | 2 +- + mm/Kconfig | 14 +- + mm/backing-dev.c | 35 ++ + mm/cma.c | 8 +- + mm/cma_debug.c | 2 +- + mm/compaction.c | 5 + + mm/fadvise.c | 8 +- + mm/filemap.c | 27 +- + mm/gup.c | 2 +- + mm/hmm.c | 14 +- + mm/huge_memory.c | 14 +- + mm/hugetlb.c | 52 +- + mm/kasan/kasan_init.c | 316 +++++++++- + mm/khugepaged.c | 60 +- + mm/ksm.c | 5 +- + mm/list_lru.c | 109 ++-- + mm/memblock.c | 133 +++- + mm/memcontrol.c | 602 ++++++++++++++++-- + mm/memory-failure.c | 44 +- + mm/memory.c | 162 +++-- + mm/memory_hotplug.c | 96 ++- + mm/mempolicy.c | 10 +- + mm/mempool.c | 12 +- + mm/migrate.c | 9 +- + mm/mincore.c | 12 +- + mm/mlock.c | 3 +- + mm/mmap.c | 62 +- + mm/mremap.c | 2 +- + mm/nommu.c | 17 +- + mm/oom_kill.c | 362 +++++++---- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 78 ++- + mm/page_ext.c | 4 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 4 +- + mm/slab.h | 8 +- + mm/slab_common.c | 8 +- + mm/slub.c | 80 ++- + mm/sparse-vmemmap.c | 61 +- + mm/sparse.c | 282 ++++----- + mm/swap_slots.c | 4 +- + mm/swap_state.c | 17 +- + mm/swapfile.c | 156 ++++- + mm/util.c | 12 + + mm/vmalloc.c | 4 - + mm/vmscan.c | 249 ++++++-- + mm/vmstat.c | 1 + + mm/workingset.c | 132 ++-- + mm/z3fold.c | 8 +- + mm/zsmalloc.c | 36 +- + scripts/checkpatch.pl | 126 ++-- + scripts/spdxcheck.py | 4 +- + scripts/spelling.txt | 88 +++ + security/apparmor/lsm.c | 1 + + security/security.c | 17 +- + security/selinux/hooks.c | 1 + + tools/accounting/getdelays.c | 8 +- + tools/testing/selftests/proc/.gitignore | 2 + + tools/testing/selftests/proc/Makefile | 3 + + tools/testing/selftests/proc/proc.h | 12 + + tools/testing/selftests/proc/self.c | 39 ++ + tools/testing/selftests/proc/thread-self.c | 64 ++ + tools/vm/page-types.c | 118 +++- + 307 files changed, 6324 insertions(+), 2488 deletions(-) + create mode 100644 Documentation/accounting/psi.txt + delete mode 100644 arch/x86/include/asm/export.h + create mode 100644 include/linux/psi.h + create mode 100644 include/linux/psi_types.h + create mode 100644 kernel/sched/psi.c + create mode 100644 tools/testing/selftests/proc/self.c + create mode 100644 tools/testing/selftests/proc/thread-self.c +$ git am -3 ../patches/0001-fixup-for-bit.h-bitops.h-merge.patch +Applying: fixup for bit.h/bitops.h merge +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/bits.h +$ git add -A . +$ git commit -v -a --amend +[master 804c052faa42] Merge branch 'akpm-current/current' + Date: Fri Jul 20 17:51:03 2018 +1000 +$ 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: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t +Applying: fs/nfs/file.c: use new return type vm_fault_t +Applying: fs/afs: use new return type vm_fault_t +Applying: treewide: correct "differenciate" and "instanciate" typos +Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds +Applying: drivers/gpu/drm/gma500/: change return type to vm_fault_t +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 + + 8078931aa1c4...90a8c406d322 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (90a8c406d322 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + .../bindings/reserved-memory/reserved-memory.txt | 2 +- + arch/powerpc/kvm/book3s_pr.c | 2 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 14 ++++------- + drivers/gpu/drm/gma500/gem.c | 27 ++++++++-------------- + drivers/gpu/drm/gma500/psb_drv.h | 3 ++- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/thermal/intel_powerclamp.c | 2 +- + fs/afs/internal.h | 3 ++- + fs/afs/write.c | 2 +- + fs/nfs/file.c | 4 ++-- + fs/proc/vmcore.c | 2 ++ + scripts/spelling.txt | 2 ++ + sound/soc/intel/common/sst-dsp-priv.h | 4 ++-- + 17 files changed, 37 insertions(+), 42 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..68999a69ea47 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.17 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..07ef7291bb32 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180720 |