diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-10-02 19:14:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-10-02 19:14:24 +1000 |
| commit | 62f3d25900c9a597db7bf3808de4bc8451d04306 (patch) | |
| tree | be3728ab89323d9181d37ff671d0f026262fc924 | |
| parent | 73fe259d48f48936ce213a4772d726211cf514ae (diff) | |
| download | linux-62f3d25900c9a597db7bf3808de4bc8451d04306.tar.gz linux-62f3d25900c9a597db7bf3808de4bc8451d04306.tar.xz | |
Add linux-next specific files for 20181002next-20181002
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 291 | ||||
| -rw-r--r-- | Next/Trees | 293 | ||||
| -rw-r--r-- | Next/merge.log | 10578 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11165 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1d5a03f54e82 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,291 @@ +Name SHA1 +---- ---- +origin 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +fixes 72358c0b59b75623bec953078ce581ed6955137b +kbuild-current ef8c4ed9db80261f397f0c0bf723684601ae3b52 +arc-current 40660f1fcee8d524a60b5101538e42b1f39f106d +arm-current 3a58ac65e2d7969bcdf1b6acb70fa4d12a88e53e +arm64-fixes 2a3f93459d689d990b3ecfbe782fec89b97d3279 +m68k-current 0986b16ab49b18063d29a9e02e9c7fab1928bc8e +powerpc-fixes 7e0cf1c983b5b24426d130fd949a055d520acc9a +sparc df2def49c57b4146520a1f4ca37bc3f494e2cd67 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 43955a45dc0b4f3be7f0c3afc0e080ed59bb5280 +bpf 4288ea006c73e37c2a4f60dfaef20dd167b8df31 +ipsec 32bf94fb5c2ec4ec842152d0e5937cd4bb6738fa +netfilter 40e4f26e6a14fc1496eabb8b0004a547303114e6 +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers 3baafeffa48a12b3cec9a0b6d4049fba02d53cea +mac80211 848e616e66d4592fe9afc40743d3504deb7632b4 +rdma-fixes 5c5702e259dc66e6fceed5117effab79c186e87a +sound-current b3a5402cbcebaf5a9db4d6a3268070e4a099355d +sound-asoc-fixes 6f450574b28ff5cd3d07c49b3d736ba6a5d8068f +regmap-fixes 7876320f88802b22d4e2daf7eb027dd14175a0f8 +regulator-fixes 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +spi-fixes 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +pci-current 95375f2ab2960c135484d83ea9f8f357cb1be26a +driver-core.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +tty.current 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +usb.current 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +usb-gadget-fixes d9707490077bee0c7060ef5665a90656e1078b66 +usb-serial-fixes f5fad711c06e652f90f581fc7c2caee327c33d31 +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy 5b394b2ddf0347bef56e50c69a58773c94343ff3 +staging.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +char-misc.current 7012040576c6ae25a47035659ee48673612c2c27 +soundwire-fixes 8d6ccf5cebbc7ed1dee9986e36853a78dfb64084 +input-current 4fef1250eafddc5182cd5c3c354a6971bcf7520d +crypto-current ba439a6cbfa2936a6713f64cb499de7943673fe3 +ide df2def49c57b4146520a1f4ca37bc3f494e2cd67 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes ce01a1575f45bf319e374592656441021a7f5823 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 111b009f7e8bcdfc8d565b1f0e3ee5072bb7490b +backlight-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +mtd-fixes 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 10492ee8ed9188d6d420e1f79b2b9bdbc0624e65 +v4l-dvb-fixes 324493fba77500592bbaa66421729421f139d4b5 +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes e7e86f42fa68c70cab4e964017273da32a77af07 +at91-fixes 379e36d3f591cb62e781907edafea17d75e8c1fa +omap-fixes c265c0ca76fb70b226c27019245b724bcaf38dfc +kvm-fixes 26b471c7e2f7befd0f59c35b257749ca57e0ed70 +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 234b69e3e089d850a98e7b3145bd00e9b52b1111 +nvdimm-fixes f52afc93cd018fe6910133a05d44671192d1aeb0 +btrfs-fixes 675c168b2b92096a5dc6be968e81aaa3ddca3808 +vfs-fixes ffc4c92227db5699493e43eb140b4cb5904c30ff +dma-mapping-fixes 46bbeb69ff2f73f50ba92110a4b6c70c85ae5bec +drivers-x86-fixes 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 +samsung-krzk-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +pinctrl-samsung-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +devicetree-fixes e54192b48da75f025ae4b277925eaf6aca1d13bd +scsi-fixes 3cc5746e5ad7688e274e193fa71278d98aa52759 +drm-fixes fcb1349a2af5a3c4a1d789bb5d1a9b3e582652a3 +drm-intel-fixes 4ca8ca9fe7dc792000c3762de5081a4d6dc33667 +mmc-fixes 1b09d9c232cdaea59fb50ac437d3921ed1f1eafb +rtc-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +drm-misc-fixes d6a77ba0eb92d8ffa4b05a442fc20d0a9b11c4c4 +kbuild 7163c4dce0536909f0bdd461d346eba55af20a38 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 9d7a224b463e1cf1178570b57b6497240fd79bc3 +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm db2add3369998e9850dfe8948f973ffe8bed0596 +arm-perf 5b394b2ddf0347bef56e50c69a58773c94343ff3 +arm-soc bf05961936beebed2c295c92a138e9c40fd61c92 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 6c61c0e7d95aa10138182ca62abcaa790db64f26 +aspeed 3368e06e2a91a65cff59e520acc51b9adf4900bf +at91 4a2a8be2f29df91909e97f15af72070c35bf9c65 +bcm2835 ca5b45b7c5cdb0bcebf60f99e9587ebe62354c49 +imx-mxs 2ed85963b996719e9b54489cc879e88e8a62e277 +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek 42ac5fee3a132f27a6df5507c96cc1e98c21ec95 +mvebu f933898998926405e94c4fbaba6a495ee609d416 +omap 88f222be04a7f5bd24767724c5e648797138781f +reset d903779b58be442f3afd2c51c46c7cf19c97684e +qcom 6252f3298861c1d3d9b907f67ed02582ceb3cdb2 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 2586035c01f6644a929699ee28c954ee2696ec99 +rockchip 276647f89f9cb6f661e21b314f7b1352e147a3a6 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk b9acde832ba891d2cb5ffe762bc40ec3d01f9fdc +sunxi 25c5fc5a4923646876bda06ba08113f2e73b4b46 +tegra 22fed951fe3bea71ac8317bc18153923d126eff3 +arm64 c219bc4e920518feb025749bdf9623aa57e94b64 +clk 173861bea8a1a582dc305c06ce680d092fe8c171 +clk-samsung 519570ff75a100cb054f63924e44205354228b60 +c6x 31b02fe54206541a2073d2fc41c574998ed91ff5 +csky c4b17dd4a3cc9aee7d7399c56856d2fdb8a613a2 +h8300 4bdf61ccbe76ee0c14bf228e7277072179b36ba3 +ia64 02b4da5f84d157f6a27e05ca017bdb74bcf01bee +m68k 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +m68knommu bbd4744f8a2715c4aa57a46f6d360000e645d5c3 +microblaze c4347b05440f4d72f8084c82c86d16863f69c8a2 +mips 2f0b649b3b4a4fcda3a898d07254d164f082752e +nds32 3350139c0ff3c95724b784f7109987d533cb3ecd +nios2 c7c09dc187f0323ad40b5b6c57a6db673a386a7f +openrisc 5600779ea5f3d29fadc62208e21feb0bb9b813aa +parisc-hd 2c18d35d677d572e376b7934fa8e66d3d09eb5bf +powerpc 0823c68b054bca9dc321adea829af5cf36afb30b +hvc 9f65b81f36e31563c5a5e4df3b3b8bc7550b6030 +fsl bd96461249bdded1f6ee50b25e8cd4ce3faaf581 +risc-v 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 +s390 ccc413f621432fcb5dabb751d42148795f59a816 +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml d9cbd0e8f667f8184be58c47f20df4760769ec71 +xtensa c9efd0d7beb32b41f8e074a922bd46dba1248878 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 89067b62df5b47072bf5998ad60259866cb1c059 +ceph e92c0eaf754310f9f31e9229a3f7274a67478f82 +cifs 07f9750589c73d6efcce2cbeb4759912f8351657 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 12f0d3d810c054c2d23f67750e7399615b5fdf0a +ext4 cce6c9f7e6029caee45c459db5b3e78fec6973cb +f2fs 61f7725aa148ee870436a29d3a24d5c00ab7e9af +fuse e52a8250480acd3b26534793c61816e30d85fbb6 +jfs 1390643d1d5c539be4d7031a0c507565cb1168a0 +nfs c7944ebb9ce9461079659e9e6ec5baaf73724b3b +nfs-anna 9f0c5124f4a82503ee5d55c60b0b9c6afc3af68b +nfsd 7d20b6a2728fe3ea9fa8f4fc49cd438fcc781dd1 +orangefs a3bb1b184669554c544ea3d8280c1f3d3ed70953 +overlayfs 69383c5913a5d74b4aa7e2b78a5cf14ebfbba538 +ubifs f061c1cc404a618858a77aea233fde0aeaad2f2d +v9fs 76b600d469118e4a009ec777b388fbcfbf3d56fe +xfs e55ec4ddbef9897199c307dfb23167e3801fdaf5 +file-locks 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe +vfs f022b08a0a9b3a4f062a067a91d9042f8f3117db +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk a6ae928c25835ca18deb4a527079f169b68ed292 +pci b51b273e4c5e3de2a650c400d4ad29d8bf85f0ba +pstore bac6f6cda206ad7cbe0c73c35e494377ce9c4749 +hid c05be11e7762533e4c096383547ea739c5573a06 +i2c 210932079eb97aae318fabace7a4d5c9c52cedb8 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 7de1ab9dac8eec0adea08febfc3ccd2d02c8abac +jc_docs ff348763775e9ed39ca8f354b67f9ba62ec27f2c +v4l-dvb 4158757395b300b6eb308fc20b96d1d231484413 +v4l-dvb-next 357b50f3ccc882145aea7d83635d6ca0704515ab +fbdev 7c968791f7753bf0e52a21729498509ea3dd751b +pm 2eb458f5f636d3538599d7f301f9af01174f65b5 +cpupower 8a7e2d2ea080d10a189a1d611344b0330468ebc3 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 5ed4cecd75e90232a19afa502cf477925854561e +thermal d7a4303b8d1fa6f60b73ed91317a51764a2a412c +thermal-soc 152395fd03d4ce1e535a75cdbf58105e50587611 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma c8b53d0c5eb89a5831b7a25f4bd5e742a85c293b +net-next 3bd09b05b0689497d8f2e33ae983b1ee10d15eeb +bpf-next cb86d0f878be6d699dfd26c63f8ff03dfff1f9ba +ipsec-next 4a132095dd64fefabdc5dad1cd9e9809b126e582 +mlx5-next bd37197554eb28a7fc38e44e005e303c77f788ed +netfilter-next a2d88182d28df33346f18a97dd1ede3bc053ee26 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next 08b0109eea36d71f87b863045d91bbcee98758bd +bluetooth 30d65e0804d58a03d1a8ea4e12c6fc07ed08218b +mac80211-next fe80610bedf203c3847906895a6b593f6f279473 +gfs2 4f36cb36c9d14340bb200d2ad9117b03ce992cfe +mtd 5b394b2ddf0347bef56e50c69a58773c94343ff3 +nand 40667c037a3d60b9086b0279a7eb0e181e2bc915 +spi-nor af8b35f392bb383ae81ce392ea0dfb4dfafc8eec +crypto 79517e8f8e6dddd2a90517123ffdb366828b69f5 +drm 87c2ee740c07f1edae9eec8bc45cb9b32a68f323 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 87c2ee740c07f1edae9eec8bc45cb9b32a68f323 +drm-tegra 5ac93f81096a2065adb99defdb8f04ae2c19cc11 +drm-misc 87c2ee740c07f1edae9eec8bc45cb9b32a68f323 +drm-msm 96ab39afea7b33fa347c6376742e5215e9e1ac39 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp bfde4538e64c0178d604603fa86da3489aa90553 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 5c41bb6071257ba668a2b8933a8654e69aea1cee +etnaviv 1a866306e0fbf3caab168c1389e4497702749441 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap fadf3e019411a960bb9ee4ddf702b3045da2b3d1 +sound edb1b3abdb20597d92a68c34afba9b01848b2acf +sound-asoc dce5c4639f319a2d7cd97f1716efa376a77a097f +modules 9be936f4b3a2ec101f54cff9cf1a6abf67263c50 +input d2587800598c119664b22fef55ffa51aeb1da802 +block 72915e1a096c21552b835f828b75b4c19ed2a149 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper cd3085739323cca934b5593f56c38092e1807c99 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc a1d467600ca611b6885a72fb9f518e4289029133 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md d595567dc4f0c1d90685ec1e2e296e2cad2643ac +mfd 92d6ba4ff7000a0e19c714178883c03de2aea61b +backlight 633786736ed53a53b8d0a630cc3ff57381027081 +battery a4ac1f5ced58b0782252d5a8b2dfe28a1d7a5e19 +regulator 77ca23434f3fd32939dee099a410f6ee36979839 +security ad33b870a66b2ec3699d659010c728a5ec6deabb +apparmor 1f8266ff58840d698a1e96d2274189de1bdf7969 +integrity 3dd0f18c70d94ca2432c78c5735744429f071b0b +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 4458bba09788e70e8fb39ad003f087cd9dfbd6ac +tpmdd 8abac8d7b90d860a7fac4f4dba640ae1d03fe895 +watchdog 17b57b1883c1285f3d0dc2266e8f79286a7bef38 +iommu dae804ddad96b83db486d0e99f45e6287998d5a2 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio cf3f98c7f466a7c79458cdeb779afb9309e243e0 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 57361846b52bc686112da6ca5368d11210796804 +devicetree b2efb5b045919e8690530e1408ae42cbb82063d5 +mailbox 9f0a0a381c5db56e7922dbeea6831f27db58372f +spi 2de6642ce7f394de17f7e4883a7d37ba12092439 +tip 3b78dbfb8fbe53460beb3bfbe47ad9250bd571b2 +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 432de7fd7630c84ad24f1c2acd1e3bb4ce3741ca +irqchip b4bf3d7ad3daf0841a7dc6641924267bc1f75c01 +ftrace 5a5e3d3ceae2121590d67258a4e658d938b4a46d +rcu 0b1aba265b93b25c072883ca84b68f4d3049c95c +kvm 5b394b2ddf0347bef56e50c69a58773c94343ff3 +kvm-arm 976d34e2dab10ece5ea8fe7090b7692913f89084 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 46dec40fb741f00f1864580130779aeeaf24fb3d +kvms390 55d09dd4c86060fbbc74ab2b1bfaed401cd0163a +xen-tip 811e0345cfc1b32257de9c25b06bacccea82e81a +percpu b5bb425871186303e6936fa2581521bdd1964a58 +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 7eccb5edba24cec9bb0a2b990ac66e755456303a +chrome-platform 40291fb75123816b35ba06696e56b9cf2d96bf90 +hsi 5b394b2ddf0347bef56e50c69a58773c94343ff3 +leds 2d00f35c55e74fcb5626c9aa336c1ed697cd2ae9 +ipmi 10042504ed92c06077b8a20a4edd67ba784847d4 +driver-core a75e78f21f9ad4b810868c89dbbabcc3931591ca +usb 29f79155b9b331167497efb0407de082d8750862 +usb-gadget 5b394b2ddf0347bef56e50c69a58773c94343ff3 +usb-serial ba93cc7da8965bd513a7393db0f030e51bff4b60 +usb-chipidea-next 35a334659bccd07131bbee0eac0e489fcd033760 +phy-next 566b388440bb61447df7cdf5f4508a0fce493e00 +tty 669c5d8d5f2be781d411ad8d52274038c795f257 +char-misc 29c222d1a9f503de4d26d8de8e955be190526adf +extcon 2e464ff0a9b1ab0fbb56e2ca8b1f5ff8c9f4e02f +soundwire 502c00d9c3159e7dd3184b0e7c2cd0c0446d2546 +staging e2c3860ba27d21f991bf9b81d64589f7c9e087c1 +mux 2c01260df661774f53478a79768adf7c63ce9420 +icc 8f023d0cb757295f55fc5440a2b014740335fa8e +slave-dma 1576f7e1ef9867ab4850db2882e28a26c611311d +cgroup 808c43b7c7f70360ed7b9e43e2cf980f388e71fa +scsi 257f0d4d404cae1bcf5ae572ff4f2302109b6c98 +scsi-mkp ef801f07e7b3cc1786d8ab1b4fdf069cc2a136d2 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 1e05b62ae4bd4c1209229de367b0989b39644f88 +rpmsg 3c33104936366b44b140ef2ea57107c1c14b7f15 +gpio e6248f37f7d0cfbfd84f2367852aba12c51420e6 +pinctrl 54a58185bfafb5af5045fb8388c45daa373f90f3 +pinctrl-samsung 5b394b2ddf0347bef56e50c69a58773c94343ff3 +pwm 8cdc43afbb2cb58692c49fab0b13e2d9439c0642 +userns f040d23c81860e59deef2089669f8ef330541f69 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 9b25436662d5fb4c66eb527ead53cab15f596ee0 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest b76c2bbcb0498ec63fc4743195fdd73c3b6d1e75 +y2038 67314ec7b0250290cc85eaa7a2f88a8ddb9e8547 +livepatching c72a7f5153292f241aecd290d103c39a9ace4a23 +coresight 29c222d1a9f503de4d26d8de8e955be190526adf +rtc 9a90a5bcc73e4805989ad791cdd075a81f1a23ef +nvdimm be5ba2ca053d99b8b4e52044817ca93a267a2897 +at24 523b3213561fa33b0eb49b6dcaa7fffad8be31e5 +ntb b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 +kspp 6fcde90466738b84a073e4f4d18c50015ee29fb2 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco ff6401301656f50853dafcc814ebb86905d47372 +fsi 15e2a7218c2788d79c5633336d17cb9428c221e7 +siox 1e4b044d22517cae7047c99038abb444423243ca +xarray f176eda90aeb18fb0289bdf306722687cfceaa45 +akpm-current ac6c789471e521cea5b2f6aac2d9a94010ca7b32 +akpm 3bb04576efeaa0156ee9eb1eb51ba4afa1498234 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5a7cc8ba8641 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,293 @@ +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 +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.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 +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +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/at91/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +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 +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +hvc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/hvc +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/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/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 +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +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 +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 +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 +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +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..fd33994ff500 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10578 @@ +$ date -R +Tue, 02 Oct 2018 07:52:57 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ad0371482b1e Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma +Merging origin/master (17b57b1883c1 Linux 4.19-rc6) +$ git merge origin/master +Updating ad0371482b1e..17b57b1883c1 +Fast-forward + .../devicetree/bindings/input/gpio-keys.txt | 2 +- + MAINTAINERS | 22 ++-- + Makefile | 2 +- + arch/powerpc/include/asm/setup.h | 1 + + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/tm.S | 20 ++- + arch/powerpc/lib/checksum_64.S | 3 + + arch/powerpc/lib/code-patching.c | 6 + + arch/powerpc/mm/mem.c | 2 + + arch/powerpc/mm/numa.c | 7 +- + arch/powerpc/mm/pkeys.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- + arch/riscv/include/asm/asm-prototypes.h | 7 ++ + arch/x86/boot/compressed/mem_encrypt.S | 19 --- + block/blk-mq-tag.c | 13 +- + block/blk-mq.c | 4 +- + block/elevator.c | 2 +- + drivers/block/xen-blkfront.c | 4 +- + drivers/clocksource/timer-atmel-pit.c | 20 ++- + drivers/clocksource/timer-fttmr010.c | 18 +-- + drivers/clocksource/timer-ti-32k.c | 3 + + drivers/cpufreq/qcom-cpufreq-kryo.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 139 ++++++++++++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 5 - + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 12 -- + drivers/gpu/drm/arm/malidp_drv.c | 1 + + drivers/gpu/drm/arm/malidp_hw.c | 25 +++- + drivers/gpu/drm/arm/malidp_hw.h | 3 +- + drivers/gpu/drm/arm/malidp_mw.c | 25 +++- + drivers/gpu/drm/arm/malidp_regs.h | 2 + + drivers/gpu/drm/drm_panel.c | 10 -- + drivers/gpu/drm/drm_syncobj.c | 5 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 27 +++- + drivers/input/keyboard/atakbd.c | 74 +++++------ + drivers/input/misc/uinput.c | 2 +- + drivers/input/mouse/elantech.c | 2 + + drivers/input/touchscreen/egalax_ts.c | 6 + + drivers/md/bcache/bcache.h | 1 + + drivers/md/bcache/journal.c | 6 +- + drivers/md/bcache/super.c | 8 ++ + drivers/nvme/host/multipath.c | 6 +- + drivers/pci/controller/dwc/pcie-designware.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.h | 3 +- + drivers/pci/hotplug/acpiphp_glue.c | 11 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 33 +++-- + drivers/pinctrl/intel/pinctrl-intel.c | 32 ----- + drivers/pinctrl/pinctrl-amd.c | 33 +++-- + drivers/regulator/bd71837-regulator.c | 19 +++ + drivers/regulator/core.c | 4 +- + drivers/regulator/of_regulator.c | 2 - + drivers/spi/spi-gpio.c | 4 +- + drivers/spi/spi-rspi.c | 34 ++++- + drivers/spi/spi-sh-msiof.c | 28 ++++- + drivers/spi/spi-tegra20-slink.c | 31 +++-- + fs/dax.c | 1 + + include/drm/drm_panel.h | 1 - + include/linux/mfd/rohm-bd718x7.h | 33 ++++- + include/linux/regulator/machine.h | 6 +- + include/linux/spi/spi-mem.h | 7 +- + kernel/dma/Kconfig | 3 + + kernel/events/core.c | 6 + + tools/testing/selftests/powerpc/alignment/Makefile | 1 + + .../testing/selftests/powerpc/benchmarks/Makefile | 1 + + .../testing/selftests/powerpc/cache_shape/Makefile | 1 + + tools/testing/selftests/powerpc/copyloops/Makefile | 1 + + tools/testing/selftests/powerpc/dscr/Makefile | 1 + + tools/testing/selftests/powerpc/math/Makefile | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 1 + + tools/testing/selftests/powerpc/pmu/Makefile | 1 + + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 1 + + .../testing/selftests/powerpc/primitives/Makefile | 1 + + tools/testing/selftests/powerpc/ptrace/Makefile | 1 + + tools/testing/selftests/powerpc/signal/Makefile | 1 + + .../testing/selftests/powerpc/stringloops/Makefile | 1 + + .../selftests/powerpc/switch_endian/Makefile | 1 + + tools/testing/selftests/powerpc/syscalls/Makefile | 1 + + tools/testing/selftests/powerpc/tm/Makefile | 1 + + tools/testing/selftests/powerpc/vphn/Makefile | 1 + + 83 files changed, 591 insertions(+), 265 deletions(-) + create mode 100644 arch/riscv/include/asm/asm-prototypes.h +Merging fixes/master (72358c0b59b7 linux-next: build warnings from the build of Linus' tree) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/arm/kernel/vmlinux.lds.h | 1 + + include/asm-generic/vmlinux.lds.h | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging kbuild-current/fixes (ef8c4ed9db80 kbuild: allow to use GCC toolchain not in Clang search path) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 +++++--- + scripts/Makefile.build | 2 +- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging arc-current/for-curr (40660f1fcee8 ARC: build: Don't set CROSS_COMPILE in arch's Makefile) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 2 +- + arch/arc/Makefile | 26 ++------------------------ + 2 files changed, 3 insertions(+), 25 deletions(-) +Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() offset check) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/ioremap.c | 2 +- + arch/arm/tools/syscall.tbl | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (2a3f93459d68 arm64: KVM: Sanitize PSTATE.M when being set from userspace) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kvm/guest.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- + arch/arm64/mm/hugetlbpage.c | 50 +++++++++++++++++++++++++++++++++++------ + 2 files changed, 97 insertions(+), 8 deletions(-) +Merging m68k-current/for-linus (0986b16ab49b m68k/mac: Use correct PMU response format) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (7e0cf1c983b5 selftests/powerpc: Fix Makefiles for headers_install change) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ 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 (43955a45dc0b netlink: fix typo in nla_parse_nested() comment) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 2 +- + MAINTAINERS | 8 +- + drivers/net/bonding/bond_main.c | 64 ++++++++------- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 22 ------ + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +++- + drivers/net/ethernet/cadence/macb_main.c | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 48 +++++------- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 20 ----- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 ---- + drivers/net/ethernet/ibm/ibmvnic.c | 16 ---- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 23 ------ + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 15 +--- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 12 +-- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 45 ----------- + drivers/net/ethernet/realtek/r8169.c | 5 ++ + drivers/net/ethernet/sfc/efx.c | 26 ------- + drivers/net/ethernet/sfc/falcon/efx.c | 26 ------- + drivers/net/ieee802154/adf7242.c | 3 +- + drivers/net/ieee802154/ca8210.c | 6 +- + drivers/net/ieee802154/mcr20a.c | 8 +- + drivers/net/phy/phy_device.c | 12 ++- + drivers/net/phy/sfp.c | 7 +- + drivers/net/usb/asix_common.c | 3 + + drivers/net/usb/ax88179_178a.c | 3 + + drivers/net/usb/lan78xx.c | 17 +--- + drivers/net/usb/r8152.c | 3 + + drivers/net/usb/smsc75xx.c | 3 + + drivers/net/usb/smsc95xx.c | 3 + + drivers/net/usb/sr9800.c | 3 + + drivers/net/virtio_net.c | 14 ---- + drivers/net/vxlan.c | 3 + + drivers/net/wimax/i2400m/control.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 36 ++++----- + drivers/net/xen-netback/common.h | 3 +- + drivers/net/xen-netback/hash.c | 51 ++++++++---- + drivers/net/xen-netback/interface.c | 3 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_core_mpc.c | 33 ++++---- + drivers/s390/net/qeth_core_mpc.h | 4 +- + include/linux/netdevice.h | 3 + + include/net/bonding.h | 7 +- + include/net/cfg80211.h | 2 - + include/net/netlink.h | 2 +- + include/trace/events/rxrpc.h | 4 +- + net/core/ethtool.c | 9 ++- + net/core/netpoll.c | 20 +---- + net/ipv4/sysctl_net_ipv4.c | 6 +- + net/ipv6/route.c | 5 -- + net/mac80211/iface.c | 3 +- + net/mac80211/mesh.h | 3 +- + net/mac80211/mesh_hwmp.c | 9 +-- + net/mac80211/status.c | 11 ++- + net/mac80211/tdls.c | 8 +- + net/mac80211/tx.c | 6 +- + net/rxrpc/ar-internal.h | 36 +++++---- + net/rxrpc/call_accept.c | 45 ++++------- + net/rxrpc/call_object.c | 2 +- + net/rxrpc/conn_client.c | 4 +- + net/rxrpc/conn_object.c | 14 ++-- + net/rxrpc/input.c | 90 +++++++++++++++------- + net/rxrpc/local_object.c | 32 +++++--- + net/rxrpc/output.c | 54 ++++++++----- + net/rxrpc/peer_event.c | 46 +++-------- + net/rxrpc/peer_object.c | 52 +++---------- + net/rxrpc/protocol.h | 15 ---- + net/tipc/bearer.c | 12 +-- + net/tipc/link.c | 42 +++++++++- + net/tipc/link.h | 3 + + net/tipc/node.c | 11 +++ + net/tipc/socket.c | 4 +- + net/wireless/nl80211.c | 20 +++-- + net/wireless/reg.c | 1 + + net/wireless/scan.c | 58 +++++++++++--- + 83 files changed, 586 insertions(+), 668 deletions(-) +Merging bpf/master (4288ea006c73 bpf: harden flags check in cgroup_storage_update_elem()) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/local_storage.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (32bf94fb5c2e xfrm: validate template mode) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_output.c +Auto-merging net/xfrm/xfrm_input.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_input.c | 1 + + net/ipv4/xfrm4_mode_transport.c | 4 +--- + net/ipv6/xfrm6_input.c | 1 + + net/ipv6/xfrm6_mode_transport.c | 4 +--- + net/ipv6/xfrm6_output.c | 2 ++ + net/xfrm/xfrm_input.c | 1 + + net/xfrm/xfrm_output.c | 4 ++++ + net/xfrm/xfrm_policy.c | 4 ++++ + net/xfrm/xfrm_user.c | 15 +++++++++++++++ + 9 files changed, 30 insertions(+), 6 deletions(-) +Merging netfilter/master (40e4f26e6a14 netfilter: xt_socket: check sk before checking for netns.) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/linux/netfilter.h | 2 ++ + net/bridge/br_netfilter_hooks.c | 3 ++- + net/netfilter/nf_conntrack_proto_tcp.c | 4 ++-- + net/netfilter/nft_osf.c | 2 +- + net/netfilter/nft_set_rbtree.c | 28 ++++++++++++++-------------- + net/netfilter/xt_socket.c | 4 ++-- + 6 files changed, 23 insertions(+), 20 deletions(-) +Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (3baafeffa48a iwlwifi: 1000: set the TFD queue size) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/b43/dma.c | 6 ++++-- + drivers/net/wireless/intel/iwlwifi/cfg/1000.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 3 +-- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging mac80211/master (848e616e66d4 cfg80211: fix wext-compat memory leak) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-compat.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging rdma-fixes/for-rc (5c5702e259dc RDMA/core: Set right entry state before releasing reference) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (b3a5402cbceb ALSA: hda: Fix the audio-component completion timeout) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/hda/hdac_i915.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (6f450574b28f Merge branch 'asoc-4.19' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/acp-pcm-dma.c | 22 ++++++++++++++-------- + sound/soc/codecs/rt5514-spi.c | 14 ++++++++------ + sound/soc/codecs/rt5682.c | 5 ----- + 3 files changed, 22 insertions(+), 19 deletions(-) +Merging regmap-fixes/for-linus (7876320f8880 Linux 4.19-rc4) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (95375f2ab296 PCI: mvebu: Fix PCI I/O mapping creation sequence) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/pci/controller/pci-mvebu.c | 52 +++++++++++++++++++++++++++++++++++--- + drivers/pci/pci.c | 27 ++++++++++++++------ + 3 files changed, 67 insertions(+), 13 deletions(-) +Merging driver-core.current/driver-core-linus (7876320f8880 Linux 4.19-rc4) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (17b57b1883c1 Linux 4.19-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (17b57b1883c1 Linux 4.19-rc6) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f5fad711c06e USB: serial: simple: add Motorola Tetra MTP6550 id) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 15 +++++++++++++-- + drivers/usb/serial/usb-serial-simple.c | 3 ++- + 2 files changed, 15 insertions(+), 3 deletions(-) +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 (5b394b2ddf03 Linux 4.19-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (7876320f8880 Linux 4.19-rc4) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (7012040576c6 firmware: Always initialize the fw_priv list object) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + Documentation/driver-api/fpga/fpga-mgr.rst | 5 +++++ + drivers/base/firmware_loader/main.c | 7 +++++-- + drivers/fpga/dfl-fme-region.c | 4 +++- + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/of-fpga-region.c | 3 ++- + drivers/hv/connection.c | 8 +++++--- + include/linux/fpga/fpga-mgr.h | 20 ++++++++++++++------ + tools/hv/hv_fcopy_daemon.c | 1 + + 8 files changed, 36 insertions(+), 14 deletions(-) +Merging soundwire-fixes/fixes (8d6ccf5cebbc soundwire: Fix acquiring bus lock twice during master release) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging input-current/for-linus (4fef1250eafd Input: uinput - allow for max == min during input_absinfo validation) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (ba439a6cbfa2 crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/caam/caamalg.c | 8 ++--- + drivers/crypto/chelsio/chcr_algo.c | 32 +++++++++++------ + drivers/crypto/chelsio/chcr_crypto.h | 2 ++ + drivers/crypto/mxs-dcp.c | 53 ++++++++++++++++------------- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 6 ++-- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 ++-- + drivers/crypto/qat/qat_c62x/adf_drv.c | 6 ++-- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 ++-- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 ++-- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 ++-- + 10 files changed, 76 insertions(+), 55 deletions(-) +Merging ide/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ 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 +Already up to date. +Merging kselftest-fixes/fixes (ce01a1575f45 rseq/selftests: fix parametrized test with -fpie) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/rseq/param_test.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (111b009f7e8b dmaengine: mic_x100_dma: use devm_kzalloc to fix an issue) +$ 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 (6bf4ca7fbc85 Linux 4.19-rc5) +$ 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 (10492ee8ed91 mfd: omap-usb-host: Fix dts probe of children) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (324493fba775 media: platform: fix cros-ec-cec build error) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (e7e86f42fa68 MAINTAINERS: MIPS/LOONGSON2 ARCHITECTURE - Use the normal wildcard style) +$ git merge mips-fixes/mips-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + arch/mips/include/asm/processor.h | 10 ++++---- + arch/mips/kernel/process.c | 25 ++++++++++++++++++++ + arch/mips/kernel/setup.c | 48 +++++++++++++++++++++++---------------- + arch/mips/kernel/vdso.c | 18 ++++++++++++++- + 5 files changed, 77 insertions(+), 27 deletions(-) +Merging at91-fixes/at91-fixes (379e36d3f591 ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl) +$ git merge at91-fixes/at91-fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 ++ + 1 file changed, 2 insertions(+) +Merging omap-fixes/fixes (c265c0ca76fb ARM: dts: logicpd-som-lv: Fix OMAP35/DM37 Compatibility issues) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 15 +++++++++ + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 15 +++++++++ + arch/arm/boot/dts/logicpd-som-lv.dtsi | 43 +++++++++--------------- + 3 files changed, 45 insertions(+), 28 deletions(-) +Merging kvm-fixes/master (26b471c7e2f7 KVM: nVMX: Fix bad cleanup on error of get/set nested state IOCTLs) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (234b69e3e089 ocfs2: fix ocfs2 read block panic) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (f52afc93cd01 dax: Fix deadlock in dax_lock_mapping_entry()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (675c168b2b92 Merge branch 'misc-4.19' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/tree-log.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging vfs-fixes/fixes (ffc4c92227db sysfs: Do not return POSIX ACL xattrs via listxattr) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/xattr.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) +Merging dma-mapping-fixes/for-linus (46bbeb69ff2f dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration) +$ git merge dma-mapping-fixes/for-linus +Merge made by the 'recursive' strategy. +Merging drivers-x86-fixes/fixes (6bf4ca7fbc85 Linux 4.19-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5b394b2ddf03 Linux 4.19-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (e54192b48da7 of: fix phandle cache creation for DTs with no phandles) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (3cc5746e5ad7 scsi: qedi: Initialize the stats mutex lock) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/qedi/qedi_main.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-fixes/drm-fixes (fcb1349a2af5 Merge branch 'drm-fixes-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (4ca8ca9fe7dc drm/i915: Avoid compiler warning for maybe unused gu_misc_iir) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_irq.c | 33 ++++++++++++--------------------- + drivers/gpu/drm/i915/i915_pci.c | 1 - + 2 files changed, 12 insertions(+), 22 deletions(-) +Merging mmc-fixes/fixes (1b09d9c232cd mmc: slot-gpio: Fix debounce time to use miliseconds again) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/host.c | 2 +- + drivers/mmc/core/slot-gpio.c | 2 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (5b394b2ddf03 Linux 4.19-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (d6a77ba0eb92 Revert "drm/panel: Add device_link from panel device to DRM device") +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (7163c4dce053 Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 25 ++++++++++++++----------- + kernel/kallsyms.c | 4 ++-- + scripts/Kbuild.include | 2 +- + scripts/Makefile.build | 30 ++---------------------------- + scripts/kallsyms.c | 6 ++---- + scripts/mkmakefile | 22 ++++------------------ + 6 files changed, 25 insertions(+), 64 deletions(-) +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 (9d7a224b463e dma-direct: always allow dma mask <= physiscal memory size) +$ git merge dma-mapping/for-next +Removing kernel/dma/noncoherent.c +Auto-merging kernel/dma/Kconfig +CONFLICT (content): Merge conflict in kernel/dma/Kconfig +Auto-merging arch/xtensa/Kconfig +Removing arch/unicore32/include/asm/dma-mapping.h +Auto-merging arch/mips/kernel/setup.c +Removing arch/mips/include/asm/device.h +Auto-merging arch/hexagon/kernel/dma.c +Removing arch/hexagon/include/asm/dma-mapping.h +Auto-merging arch/arc/Kconfig +Resolved 'kernel/dma/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f697173801ea] Merge remote-tracking branch 'dma-mapping/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arc/Kconfig | 4 +- + arch/arc/mm/dma.c | 41 ++---- + arch/arm/include/asm/dma-mapping.h | 2 + + arch/arm/mm/dma-mapping-nommu.c | 11 +- + arch/c6x/Kconfig | 2 +- + arch/hexagon/Kconfig | 2 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/dma-mapping.h | 40 ------ + arch/hexagon/kernel/dma.c | 143 ++------------------- + arch/ia64/include/asm/dma-mapping.h | 2 - + arch/ia64/include/asm/machvec.h | 7 -- + arch/ia64/include/asm/machvec_init.h | 1 - + arch/ia64/include/asm/machvec_sn2.h | 2 - + arch/ia64/pci/pci.c | 26 ---- + arch/ia64/sn/pci/pci_dma.c | 4 +- + arch/m68k/Kconfig | 2 +- + arch/microblaze/Kconfig | 4 +- + arch/microblaze/include/asm/pgtable.h | 2 - + arch/microblaze/kernel/dma.c | 22 ---- + arch/microblaze/mm/consistent.c | 3 +- + arch/mips/Kconfig | 7 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/device.h | 19 --- + arch/mips/include/asm/dma-coherence.h | 6 + + arch/mips/include/asm/dma-mapping.h | 4 +- + arch/mips/jazz/jazzdma.c | 7 +- + arch/mips/kernel/setup.c | 2 +- + arch/mips/mm/c-r4k.c | 17 ++- + arch/mips/mm/dma-noncoherent.c | 79 +++--------- + arch/nds32/Kconfig | 2 +- + arch/nios2/Kconfig | 2 +- + arch/openrisc/Kconfig | 2 +- + arch/parisc/Kconfig | 2 +- + arch/parisc/kernel/setup.c | 2 +- + arch/sh/Kconfig | 3 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/dma-mapping.h | 4 +- + arch/unicore32/Kconfig | 2 +- + arch/unicore32/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/dma-mapping.h | 22 ---- + arch/unicore32/mm/init.c | 3 - + arch/x86/kernel/amd_gart_64.c | 6 +- + arch/xtensa/Kconfig | 2 +- + drivers/acpi/arm64/iort.c | 2 +- + drivers/acpi/scan.c | 10 -- + drivers/base/dd.c | 12 +- + drivers/base/platform.c | 13 +- + drivers/of/device.c | 12 -- + drivers/pci/controller/vmd.c | 4 - + drivers/xen/swiotlb-xen.c | 4 +- + include/acpi/acpi_bus.h | 1 - + include/asm-generic/dma-mapping.h | 9 -- + include/linux/acpi.h | 2 - + include/linux/device.h | 7 ++ + include/linux/dma-direct.h | 8 +- + include/linux/dma-mapping.h | 27 ++-- + include/linux/dma-noncoherent.h | 27 +++- + include/linux/of_device.h | 3 - + kernel/dma/Kconfig | 16 +-- + kernel/dma/Makefile | 1 - + kernel/dma/contiguous.c | 6 +- + kernel/dma/direct.c | 210 +++++++++++++++++++++++++------ + kernel/dma/mapping.c | 71 ++++++----- + kernel/dma/noncoherent.c | 106 ---------------- + 64 files changed, 376 insertions(+), 693 deletions(-) + delete mode 100644 arch/hexagon/include/asm/dma-mapping.h + delete mode 100644 arch/mips/include/asm/device.h + delete mode 100644 arch/unicore32/include/asm/dma-mapping.h + delete mode 100644 kernel/dma/noncoherent.c +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 (db2add336999 Merge branches 'fixes', 'misc' and 'spectre' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 5 --- + arch/arm/Makefile | 4 -- + arch/arm/boot/compressed/head.S | 43 ++++++++++++++++++++ + arch/arm/include/asm/assembler.h | 11 ++++++ + arch/arm/include/asm/cputype.h | 1 + + arch/arm/include/asm/ftrace.h | 3 -- + arch/arm/include/asm/proc-fns.h | 49 +++++++++++++++++------ + arch/arm/include/asm/thread_info.h | 4 +- + arch/arm/include/asm/uaccess.h | 49 ++++++++++++++++++++--- + arch/arm/kernel/armksyms.c | 3 -- + arch/arm/kernel/bugs.c | 4 +- + arch/arm/kernel/entry-ftrace.S | 75 ++--------------------------------- + arch/arm/kernel/ftrace.c | 51 ------------------------ + arch/arm/kernel/head-common.S | 6 +-- + arch/arm/kernel/setup.c | 40 ++++++++++++------- + arch/arm/kernel/signal.c | 80 +++++++++++++++++++++----------------- + arch/arm/kernel/smp.c | 31 +++++++++++++++ + arch/arm/kernel/sys_oabi-compat.c | 8 +++- + arch/arm/lib/copy_from_user.S | 6 +-- + arch/arm/lib/copy_to_user.S | 6 ++- + arch/arm/lib/uaccess_with_memcpy.c | 3 +- + arch/arm/mm/proc-v7-bugs.c | 17 +------- + arch/arm/vfp/vfpmodule.c | 20 ++++------ + 23 files changed, 271 insertions(+), 248 deletions(-) +Merging arm-perf/for-next/perf (5b394b2ddf03 Linux 4.19-rc1) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (bf05961936be arm-soc: document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-u300/dummyspichip.c +Auto-merging arch/arm/Kconfig.debug +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/arm/Samsung/Bootloader-interface.txt | 1 + + Documentation/devicetree/bindings/arm/amlogic.txt | 7 + + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 8 + + .../bindings/arm/hisilicon/hisilicon.txt | 8 + + .../devicetree/bindings/arm/keystone/ti,sci.txt | 4 + + Documentation/devicetree/bindings/arm/rockchip.txt | 8 + + Documentation/devicetree/bindings/arm/scu.txt | 2 +- + Documentation/devicetree/bindings/arm/shmobile.txt | 16 +- + .../arm/{marvell/marvell,berlin.txt => syna.txt} | 11 +- + Documentation/devicetree/bindings/arm/tegra.txt | 9 +- + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 93 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 103 + + .../devicetree/bindings/arm/ux500/boards.txt | 2 +- + .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 29 + + Documentation/devicetree/bindings/net/dsa/b53.txt | 36 + + .../devicetree/bindings/power/renesas,apmu.txt | 2 + + .../bindings/power/renesas,rcar-sysc.txt | 3 + + .../devicetree/bindings/reset/renesas,rst.txt | 3 + + .../bindings/soc/amlogic/amlogic,canvas.txt | 29 + + .../devicetree/bindings/soc/rockchip/grf.txt | 2 + + .../devicetree/bindings/timer/renesas,tmu.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 237 ++- + arch/arm/Kconfig | 1 + + arch/arm/Kconfig.debug | 9 +- + arch/arm/arm-soc-for-next-contents.txt | 142 ++ + arch/arm/boot/dts/Makefile | 9 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 6 +- + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 5 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 6 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 6 +- + arch/arm/boot/dts/am335x-evm.dts | 12 +- + arch/arm/boot/dts/am335x-evmsk.dts | 12 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 13 +- + arch/arm/boot/dts/am335x-lxm.dts | 12 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 12 +- + arch/arm/boot/dts/am335x-nano.dts | 12 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +- + arch/arm/boot/dts/am335x-pdu001.dts | 14 +- + arch/arm/boot/dts/am335x-pepper.dts | 12 +- + arch/arm/boot/dts/am335x-shc.dts | 1 - + arch/arm/boot/dts/am3517-evm-ui.dtsi | 220 +++ + arch/arm/boot/dts/am3517-evm.dts | 1 + + arch/arm/boot/dts/am4372.dtsi | 2 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 12 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 6 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 6 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 12 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 6 +- + arch/arm/boot/dts/am571x-idk.dts | 84 +- + arch/arm/boot/dts/am572x-idk-common.dtsi | 76 + + arch/arm/boot/dts/am572x-idk.dts | 4 - + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 14 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 18 +- + arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- + .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 207 ++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 146 ++ + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 47 + + arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- + arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 4 +- + arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 4 +- + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 103 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 42 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 30 + + arch/arm/boot/dts/at91-tse850-3.dts | 32 +- + arch/arm/boot/dts/at91-vinco.dts | 2 +- + arch/arm/boot/dts/at91sam9260ek.dts | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 33 +- + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 87 + + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 52 + + arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 14 + + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 28 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 31 + + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 28 + + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 + + arch/arm/boot/dts/bcm5301x.dtsi | 5 +- + arch/arm/boot/dts/bcm63138.dtsi | 14 +- + arch/arm/boot/dts/bcm958625hr.dts | 26 + + arch/arm/boot/dts/dm8148-evm.dts | 14 +- + arch/arm/boot/dts/dm8148-t410.dts | 14 +- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 14 +- + arch/arm/boot/dts/dra7-evm.dts | 14 +- + arch/arm/boot/dts/dra7.dtsi | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 4 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 4 +- + arch/arm/boot/dts/dra72-evm.dts | 8 +- + arch/arm/boot/dts/dra76-evm.dts | 4 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 7 + + arch/arm/boot/dts/exynos4210-origen.dts | 9 + + arch/arm/boot/dts/exynos4210-trats.dts | 15 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 11 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 3 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 3 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 102 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 11 + + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 + + arch/arm/boot/dts/exynos5250.dtsi | 152 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 157 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 + + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 6 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/boot/dts/hip04.dtsi | 346 ++-- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 4 - + arch/arm/boot/dts/keystone-k2g.dtsi | 2 +- + arch/arm/boot/dts/lpc32xx.dtsi | 4 +- + arch/arm/boot/dts/meson8.dtsi | 2 +- + arch/arm/boot/dts/meson8b-ec100.dts | 248 +++ + arch/arm/boot/dts/meson8b-odroidc1.dts | 109 ++ + arch/arm/boot/dts/meson8b.dtsi | 47 +- + arch/arm/boot/dts/omap2.dtsi | 4 +- + arch/arm/boot/dts/omap2430.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 17 +- + arch/arm/boot/dts/omap3-beagle.dts | 17 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 262 ++- + arch/arm/boot/dts/omap3-gta04a3.dts | 2 +- + arch/arm/boot/dts/omap3-gta04a4.dts | 2 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 129 +- + arch/arm/boot/dts/omap3-gta04a5one.dts | 114 ++ + arch/arm/boot/dts/omap3-n9.dts | 2 +- + arch/arm/boot/dts/pxa25x.dtsi | 4 + + arch/arm/boot/dts/pxa27x.dtsi | 6 +- + arch/arm/boot/dts/pxa2xx.dtsi | 27 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts | 4 + + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 4 + + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 12 + + arch/arm/boot/dts/r8a77470.dtsi | 168 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 4 +- + arch/arm/boot/dts/r8a7790-stout.dts | 4 + + arch/arm/boot/dts/r8a7790.dtsi | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 6 +- + arch/arm/boot/dts/r8a7792.dtsi | 3 +- + arch/arm/boot/dts/r8a7793-gose.dts | 16 + + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 25 + + arch/arm/boot/dts/r8a7794.dtsi | 3 +- + arch/arm/boot/dts/r9a06g032.dtsi | 88 +- + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 123 +- + arch/arm/boot/dts/sama5d4.dtsi | 8 +- + arch/arm/boot/dts/socfpga.dtsi | 20 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 30 +- + ...ockit.dts => socfpga_cyclone5_de0_nano_soc.dts} | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 3 +- + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 3 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 80 +- + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 +- + arch/arm/boot/dts/ste-href.dtsi | 1 + + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-snowball.dts | 3 +- + arch/arm/boot/dts/ste-u300.dts | 2 +- + arch/arm/boot/dts/stih410-b2260.dts | 5 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 11 +- + arch/arm/boot/dts/stm32429i-eval.dts | 3 +- + arch/arm/boot/dts/stm32f429.dtsi | 2 +- + arch/arm/boot/dts/stm32f469-disco.dts | 3 +- + arch/arm/boot/dts/stm32f746-disco.dts | 3 +- + arch/arm/boot/dts/stm32f769-disco.dts | 3 +- + arch/arm/boot/dts/stm32h743.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 73 +- + arch/arm/boot/dts/stm32mp157c.dtsi | 2 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 3 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 40 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 43 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 452 ++--- + arch/arm/boot/dts/tegra124-apalis.dtsi | 451 ++--- + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 262 +++ + arch/arm/boot/dts/tegra20-colibri-iris.dts | 200 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 657 ++++--- + arch/arm/boot/dts/tegra20-paz00.dts | 12 +- + arch/arm/boot/dts/tegra20.dtsi | 28 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 148 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 266 +++ + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 1189 ++++++++++++ + arch/arm/boot/dts/tegra30-apalis.dtsi | 705 +++++-- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 130 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 780 ++++++-- + arch/arm/boot/dts/tegra30.dtsi | 10 +- + arch/arm/boot/dts/versatile-ab.dts | 2 +- + arch/arm/boot/dts/zynq-zc702.dts | 12 +- + arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +- + arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 10 + + arch/arm/configs/sama5_defconfig | 2 + + arch/arm/configs/shmobile_defconfig | 8 +- + arch/arm/mach-at91/pm.c | 9 +- + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/firmware.c | 14 +- + arch/arm/mach-exynos/suspend.c | 34 +- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 12 +- + arch/arm/mach-omap1/board-ams-delta.c | 161 +- + arch/arm/mach-omap1/include/mach/board-ams-delta.h | 7 - + arch/arm/mach-omap2/omap_hwmod.c | 88 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 42 - + arch/arm/mach-s3c24xx/mach-mini2440.c | 113 +- + arch/arm/mach-shmobile/Kconfig | 16 +- + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/headsmp-scu.S | 13 +- + arch/arm/mach-shmobile/headsmp.S | 7 +- + arch/arm/mach-shmobile/platsmp-scu.c | 5 +- + arch/arm/mach-shmobile/platsmp.c | 5 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 5 +- + arch/arm/mach-shmobile/pm-rmobile.c | 7 +- + arch/arm/mach-shmobile/pm-rmobile.h | 7 +- + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 139 +- + arch/arm/mach-shmobile/setup-r7s9210.c | 27 + + arch/arm/mach-shmobile/setup-r8a7779.c | 2 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + + arch/arm/mach-shmobile/smp-sh73a0.c | 10 +- + arch/arm/mach-shmobile/suspend.c | 5 +- + arch/arm/mach-shmobile/timer.c | 10 +- + arch/arm/mach-u300/Kconfig | 13 - + arch/arm/mach-u300/Makefile | 1 - + arch/arm/mach-u300/dummyspichip.c | 276 --- + arch/arm/mach-zynq/slcr.c | 2 +- + arch/arm64/Kconfig.platforms | 1 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 + + arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 368 +++- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1615 ++++++++-------- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 29 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 172 ++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 19 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 162 +- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 52 +- + arch/arm64/boot/dts/arm/juno.dts | 13 +- + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 + + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 +- + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/Makefile | 1 + + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 35 + + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 162 ++ + .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 181 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 7 + + arch/arm64/boot/dts/lg/lg1312.dtsi | 4 +- + arch/arm64/boot/dts/lg/lg1313.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 76 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1 - + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 57 + + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 1663 ++++++++++++++++ + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 18 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 3 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 17 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 137 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 103 +- + .../arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts | 16 + + arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts | 33 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 14 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 417 +++- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 26 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 116 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 123 ++ + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 134 ++ + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 677 ++++++- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 272 +++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 681 ++++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 362 ++-- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 82 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 9 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 4 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 231 +++ + arch/arm64/boot/dts/rockchip/px30.dtsi | 2031 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 30 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 36 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 680 +++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 44 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 + + arch/arm64/boot/dts/synaptics/as370.dtsi | 173 ++ + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 51 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 18 + + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 46 + + arch/arm64/boot/dts/ti/k3-am65.dtsi | 54 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 5 + + arch/arm64/configs/defconfig | 6 + + drivers/firmware/Kconfig | 1 + + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_scmi/base.c | 2 +- + drivers/firmware/arm_scmi/clock.c | 2 +- + drivers/firmware/arm_scmi/perf.c | 30 +- + drivers/firmware/arm_scmi/power.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 2 +- + drivers/firmware/meson/meson_sm.c | 56 + + drivers/firmware/ti_sci.c | 24 +- + drivers/firmware/xilinx/Kconfig | 23 + + drivers/firmware/xilinx/Makefile | 5 + + drivers/firmware/xilinx/zynqmp-debug.c | 250 +++ + drivers/firmware/xilinx/zynqmp-debug.h | 24 + + drivers/firmware/xilinx/zynqmp.c | 523 +++++ + drivers/memory/atmel-ebi.c | 3 +- + drivers/soc/amlogic/Kconfig | 7 + + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-canvas.c | 185 ++ + drivers/soc/fsl/dpio/dpio-driver.c | 3 - + drivers/soc/fsl/qbman/qman.c | 3 + + drivers/soc/fsl/qe/qe.c | 6 +- + drivers/soc/fsl/qe/ucc.c | 2 +- + drivers/soc/renesas/Kconfig | 19 +- + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a7743-sysc.c | 5 +- + drivers/soc/renesas/r8a7745-sysc.c | 5 +- + drivers/soc/renesas/r8a774a1-sysc.c | 45 + + drivers/soc/renesas/r8a774c0-sysc.c | 68 + + drivers/soc/renesas/r8a7779-sysc.c | 5 +- + drivers/soc/renesas/r8a7790-sysc.c | 5 +- + drivers/soc/renesas/r8a7791-sysc.c | 5 +- + drivers/soc/renesas/r8a7792-sysc.c | 5 +- + drivers/soc/renesas/r8a7794-sysc.c | 5 +- + drivers/soc/renesas/r8a7795-sysc.c | 5 +- + drivers/soc/renesas/r8a7796-sysc.c | 5 +- + drivers/soc/renesas/r8a77970-sysc.c | 5 +- + drivers/soc/renesas/r8a77995-sysc.c | 5 +- + drivers/soc/renesas/rcar-rst.c | 11 +- + drivers/soc/renesas/rcar-sysc.c | 13 +- + drivers/soc/renesas/rcar-sysc.h | 9 +- + drivers/soc/renesas/renesas-soc.c | 100 +- + drivers/soc/tegra/pmc.c | 513 +++-- + drivers/soc/ti/knav_dma.c | 4 +- + drivers/soc/ti/knav_qmss.h | 6 +- + drivers/tee/optee/core.c | 2 +- + drivers/tee/tee_core.c | 113 +- + include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h | 18 + + include/dt-bindings/power/r8a7744-sysc.h | 24 + + include/dt-bindings/power/r8a774a1-sysc.h | 31 + + include/dt-bindings/power/r8a774c0-sysc.h | 25 + + include/linux/firmware/meson/meson_sm.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 113 ++ + include/linux/platform_data/gpio-omap.h | 4 + + include/linux/scmi_protocol.h | 4 + + include/linux/soc/amlogic/meson-canvas.h | 65 + + include/linux/tee_drv.h | 73 + + include/soc/tegra/pmc.h | 20 +- + 360 files changed, 20928 insertions(+), 4400 deletions(-) + rename Documentation/devicetree/bindings/arm/{marvell/marvell,berlin.txt => syna.txt} (89%) + create mode 100644 Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.txt + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am3517-evm-ui.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi + create mode 100644 arch/arm/boot/dts/meson8b-ec100.dts + create mode 100644 arch/arm/boot/dts/omap3-gta04a5one.dts + rename arch/arm/boot/dts/{socfpga_cyclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} (98%) + create mode 100644 arch/arm/boot/dts/tegra20-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts + create mode 100644 arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi + create mode 100644 arch/arm/mach-shmobile/setup-r7s9210.c + delete mode 100644 arch/arm/mach-u300/dummyspichip.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3670.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-evb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/synaptics/as370.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi + create mode 100644 drivers/firmware/xilinx/Kconfig + create mode 100644 drivers/firmware/xilinx/Makefile + create mode 100644 drivers/firmware/xilinx/zynqmp-debug.c + create mode 100644 drivers/firmware/xilinx/zynqmp-debug.h + create mode 100644 drivers/firmware/xilinx/zynqmp.c + create mode 100644 drivers/soc/amlogic/meson-canvas.c + create mode 100644 drivers/soc/renesas/r8a774a1-sysc.c + create mode 100644 drivers/soc/renesas/r8a774c0-sysc.c + create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h + create mode 100644 include/dt-bindings/power/r8a7744-sysc.h + create mode 100644 include/dt-bindings/power/r8a774a1-sysc.h + create mode 100644 include/dt-bindings/power/r8a774c0-sysc.h + create mode 100644 include/linux/firmware/xlnx-zynqmp.h + create mode 100644 include/linux/soc/amlogic/meson-canvas.h +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/actions,owl-sps.txt | 2 + + MAINTAINERS | 7 + + 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/Kconfig.platforms | 1 + + arch/arm64/boot/dts/actions/Makefile | 2 + + arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 7 - + arch/arm64/boot/dts/actions/s700.dtsi | 21 ++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 224 ++++++++++++++++++++- + arch/arm64/boot/dts/actions/s900.dtsi | 118 ++++++++++- + drivers/soc/actions/Kconfig | 2 +- + drivers/soc/actions/Makefile | 2 + + drivers/soc/actions/owl-sps-helper.c | 6 +- + drivers/soc/actions/owl-sps.c | 64 +++++- + include/dt-bindings/power/owl-s900-powergate.h | 23 +++ + 17 files changed, 456 insertions(+), 35 deletions(-) + create mode 100644 include/dt-bindings/power/owl-s900-powergate.h +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (6c61c0e7d95a Merge branch 'v4.20/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging aspeed/for-next (3368e06e2a91 ARM: dts: aspeed: Adding Facebook TiogaPass BMC) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (4a2a8be2f29d Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (ca5b45b7c5cd Merge branch 'bcm2835-defconfig-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (2ed85963b996 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. + Documentation/devicetree/bindings/arm/fsl.txt | 44 +++ + .../devicetree/bindings/clock/imx6q-clock.txt | 8 + + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/imx1.dtsi | 4 +- + arch/arm/boot/dts/imx23-evk.dts | 2 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 4 +- + arch/arm/boot/dts/imx23-sansa.dts | 4 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +- + arch/arm/boot/dts/imx23-xfi3.dts | 4 +- + arch/arm/boot/dts/imx23.dtsi | 4 +- + arch/arm/boot/dts/imx25.dtsi | 6 +- + arch/arm/boot/dts/imx27.dtsi | 6 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 4 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 4 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 4 +- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 4 +- + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 4 +- + arch/arm/boot/dts/imx28-duckbill-2.dts | 4 +- + arch/arm/boot/dts/imx28-duckbill.dts | 4 +- + arch/arm/boot/dts/imx28-evk.dts | 6 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 4 +- + arch/arm/boot/dts/imx28-m28evk.dts | 4 +- + arch/arm/boot/dts/imx28-sps1.dts | 4 +- + arch/arm/boot/dts/imx28-ts4600.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 8 +- + arch/arm/boot/dts/imx31.dtsi | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 6 +- + arch/arm/boot/dts/imx51-babbage.dts | 1 + + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 8 + + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 4 + + arch/arm/boot/dts/imx51.dtsi | 8 +- + arch/arm/boot/dts/imx53-ppd.dts | 1 - + arch/arm/boot/dts/imx53-qsb-common.dtsi | 11 + + arch/arm/boot/dts/imx53.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/imx6dl-icore-mipi.dts | 2 +- + arch/arm/boot/dts/imx6dl-icore-rqs.dts | 38 +- + arch/arm/boot/dts/imx6dl-icore.dts | 38 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 5 + + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 + + arch/arm/boot/dts/imx6q-icore-mipi.dts | 6 +- + arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 38 +- + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 38 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 39 +-- + arch/arm/boot/dts/imx6q-icore.dts | 38 +- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 - + arch/arm/boot/dts/imx6qdl-icore-1.5.dtsi | 34 ++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 41 +-- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 42 +-- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 67 ++++ + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 4 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 4 + + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6sl.dtsi | 8 +- + arch/arm/boot/dts/imx6sll.dtsi | 31 ++ + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 + + arch/arm/boot/dts/imx6sx.dtsi | 14 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 390 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ul-geam.dts | 40 +-- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 61 +--- + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 63 +--- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 90 +++-- + arch/arm/boot/dts/imx6ul.dtsi | 28 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 2 +- + arch/arm/boot/dts/imx6ull-pinfunc.h | 39 ++- + arch/arm/boot/dts/imx6ull.dtsi | 2 +- + arch/arm/boot/dts/imx6ulz-14x14-evk.dts | 20 ++ + arch/arm/boot/dts/imx6ulz.dtsi | 38 ++ + arch/arm/boot/dts/imx7d-sdb.dts | 2 + + arch/arm/boot/dts/imx7d.dtsi | 15 +- + arch/arm/boot/dts/imx7s-warp.dts | 53 +-- + arch/arm/boot/dts/imx7s.dtsi | 131 ++++--- + arch/arm/boot/dts/imx7ulp-pinfunc.h | 16 +- + arch/arm/boot/dts/ls1021a-qds.dts | 2 + + arch/arm/boot/dts/ls1021a-twr.dts | 2 + + arch/arm/boot/dts/ls1021a.dtsi | 12 +- + arch/arm/boot/dts/vf500.dtsi | 43 +-- + arch/arm/boot/dts/vf610-twr.dts | 43 +-- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 30 ++ + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 44 ++- + arch/arm/boot/dts/vf610.dtsi | 44 +-- + arch/arm/boot/dts/vfxxx.dtsi | 55 +-- + arch/arm/configs/imx_v4_v5_defconfig | 18 +- + arch/arm/configs/imx_v6_v7_defconfig | 41 ++- + arch/arm/configs/mxs_defconfig | 19 +- + arch/arm/mach-imx/anatop.c | 20 ++ + arch/arm/mach-imx/cpu.c | 3 + + arch/arm/mach-imx/mmdc.c | 14 + + arch/arm/mach-imx/mxc.h | 7 + + arch/arm/mach-imx/pm-imx6.c | 29 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 20 +- + drivers/bus/imx-weim.c | 3 - + drivers/soc/imx/gpc.c | 27 +- + drivers/soc/imx/gpcv2.c | 100 +++--- + 107 files changed, 1303 insertions(+), 1005 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6qdl-icore-1.5.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts + create mode 100644 arch/arm/boot/dts/imx6ulz-14x14-evk.dts + create mode 100644 arch/arm/boot/dts/imx6ulz.dtsi +Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (42ac5fee3a13 Merge branch 'v4.19-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/pwrap.txt | 2 + + arch/arm/boot/dts/mt7623.dtsi | 124 +++++ + arch/arm/configs/mediatek_v7_defconfig | 319 +++++++++++++ + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 11 + + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 530 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 196 ++++---- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 62 +++ + drivers/soc/mediatek/mtk-pmic-wrap.c | 519 +++++++++++++++----- + 9 files changed, 1544 insertions(+), 220 deletions(-) + create mode 100644 arch/arm/configs/mediatek_v7_defconfig + create mode 100644 arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +Merging mvebu/for-next (f93389899892 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/marvell,prestera.txt | 4 +- + MAINTAINERS | 8 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-385-db-88f6820-amc.dts | 157 ++++++++ + arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 4 +- + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 18 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 18 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 6 +- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- + arch/arm/mach-mvebu/board-v7.c | 14 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 13 + + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 434 +++++++++++++++++++++ + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 74 +++- + arch/arm64/boot/dts/marvell/armada-common.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 64 ++- + 20 files changed, 775 insertions(+), 52 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-385-db-88f6820-amc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +Merging omap/for-next (88f222be04a7 Merge branch 'omap-for-v4.20/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 249 ++++++++++++++++ + arch/arm/boot/dts/am335x-moxa-uc-2101.dts | 69 +++++ + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 6 +- + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 6 +- + arch/arm/boot/dts/dra7.dtsi | 4 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 4 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-omap2/pm24xx.c | 7 +- + arch/arm/mach-omap2/pm34xx.c | 14 +- + drivers/bus/ti-sysc.c | 154 ++++++---- + drivers/gpio/gpio-omap.c | 331 +++++++++++++++------- + include/linux/platform_data/gpio-omap.h | 14 +- + include/linux/platform_data/ti-sysc.h | 1 - + 14 files changed, 667 insertions(+), 194 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-2101.dts +Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (6252f3298861 Merge tag 'qcom-arm64-defconfig-for-4.20' into 4.20-tagged) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.txt | 19 +- + .../devicetree/bindings/firmware/qcom,scm.txt | 33 +- + MAINTAINERS | 8 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 71 ++- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 143 +++-- + arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 83 +-- + arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 125 ++++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 286 +++++++++ + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 83 +++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 198 +++--- + arch/arm/configs/qcom_defconfig | 1 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 14 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 2 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 14 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 98 +-- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 15 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 13 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 243 ++++++++ + arch/arm64/boot/dts/qcom/msm8998.dtsi | 690 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/pm8916.dtsi | 18 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 18 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 75 ++- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 40 ++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 382 ++++++++++++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 300 +++++++++ + arch/arm64/configs/defconfig | 3 + + drivers/edac/Kconfig | 14 + + drivers/edac/Makefile | 1 + + drivers/edac/qcom_edac.c | 414 +++++++++++++ + drivers/firmware/qcom_scm.c | 74 ++- + drivers/soc/qcom/Kconfig | 21 +- + drivers/soc/qcom/apr.c | 6 +- + drivers/soc/qcom/llcc-slice.c | 74 ++- + drivers/soc/qcom/qcom-geni-se.c | 41 +- + drivers/soc/qcom/rmtfs_mem.c | 5 + + drivers/soc/qcom/rpmh-rsc.c | 2 + + drivers/soc/qcom/smem.c | 174 +++--- + drivers/soc/qcom/spm.c | 3 + + drivers/soc/qcom/wcnss_ctrl.c | 2 +- + include/linux/qcom-geni-se.h | 13 +- + include/linux/soc/qcom/llcc-qcom.h | 30 +- + 42 files changed, 3325 insertions(+), 525 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8998.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi8998.dtsi + create mode 100644 drivers/edac/qcom_edac.c +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 (2586035c01f6 Merge branches 'arm-defconfig-for-v4.20', 'arm-dt-for-v4.20', 'arm-soc-for-v4.20', 'arm64-dt-for-v4.20' and 'drivers-for-v4.20' into next) +$ git merge renesas/next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 58 ++++++++++++++++++++++++++------------------ + 1 file changed, 34 insertions(+), 24 deletions(-) +Merging rockchip/for-next (276647f89f9c Merge branch 'v4.20-armsoc/defconfig64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + Documentation/devicetree/bindings/usb/dwc2.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 8 + + arch/arm/boot/dts/rk3188.dtsi | 82 +++ + arch/arm/boot/dts/rk3288-tinker-s.dts | 26 + + arch/arm/boot/dts/rk3288-tinker.dts | 498 +-------------- + arch/arm/boot/dts/rk3288-tinker.dtsi | 502 +++++++++++++++ + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 4 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 16 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 57 ++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 67 ++ + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 524 +--------------- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 52 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 542 ++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 692 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 24 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 + + arch/arm64/configs/defconfig | 1 + + drivers/clk/rockchip/clk-rk3288.c | 29 +- + 23 files changed, 2126 insertions(+), 1022 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-tinker-s.dts + create mode 100644 arch/arm/boot/dts/rk3288-tinker.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (b9acde832ba8 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5410-odroidxu.dts | 10 +++++++++- + arch/arm/plat-samsung/Kconfig | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 18 +++++++++++++++--- + 3 files changed, 25 insertions(+), 5 deletions(-) +Merging sunxi/sunxi/for-next (25c5fc5a4923 Merge branch 'sunxi/h3-h5-for-4.20' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 + + .../devicetree/bindings/sram/sunxi-sram.txt | 4 + + arch/arm/boot/dts/Makefile | 2 + + .../boot/dts/sun5i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun5i.dtsi | 26 +++ + arch/arm/boot/dts/sun7i-a20.dtsi | 26 +++ + arch/arm/boot/dts/sun8i-a33.dtsi | 26 +++ + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 5 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 18 ++ + .../boot/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts | 13 ++ + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 190 +---------------- + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 140 +++++++++++++ + arch/arm/boot/dts/sun8i-h3.dtsi | 30 +++ + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 21 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 13 ++ + .../boot/dts/sun8i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 31 +++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 231 +++++++++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 4 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 30 ++- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 85 +++++++- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 99 ++++++++- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 175 +++++++++++++++- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 13 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 28 ++- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 9 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 28 ++- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 193 ++++++++++++++++- + .../allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts | 11 + + .../dts/allwinner/sun50i-h5-bananapi-m2-plus.dts | 11 + + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 48 +++++ + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 150 +++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 23 ++ + arch/arm64/configs/defconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 10 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 48 +++-- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 53 ++--- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 2 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 25 +-- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 52 ++--- + drivers/clk/sunxi-ng/ccu_nkmp.c | 7 + + drivers/clk/sunxi-ng/ccu_nkmp.h | 1 + + drivers/clk/sunxi-ng/ccu_nm.c | 7 + + drivers/clk/sunxi-ng/ccu_nm.h | 30 +++ + drivers/soc/Makefile | 2 +- + include/dt-bindings/clock/sun50i-a64-ccu.h | 1 + + 52 files changed, 1633 insertions(+), 310 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts + create mode 100644 arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +Merging tegra/for-next (22fed951fe3b Merge branch for-4.20/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) +Merging arm64/for-next/core (c219bc4e9205 arm64: Trap WFI executed in userspace) +$ git merge arm64/for-next/core +Auto-merging mm/Makefile +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Removing arch/arm64/include/asm/compiler.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/arm64/elf_hwcaps.txt | 12 +- + MAINTAINERS | 13 ++ + arch/arm/include/asm/kvm_arm.h | 1 + + arch/arm/include/asm/kvm_mmu.h | 5 + + arch/arm64/Kconfig | 33 +++- + arch/arm64/include/asm/assembler.h | 7 +- + arch/arm64/include/asm/compat.h | 1 + + arch/arm64/include/asm/compiler.h | 30 ---- + arch/arm64/include/asm/cpucaps.h | 7 +- + arch/arm64/include/asm/cpufeature.h | 9 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/esr.h | 77 ++++++++++ + arch/arm64/include/asm/kernel-pgtable.h | 2 +- + arch/arm64/include/asm/kvm_arm.h | 1 + + arch/arm64/include/asm/kvm_emulate.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 11 ++ + arch/arm64/include/asm/kvm_mmu.h | 5 + + arch/arm64/include/asm/mmu.h | 3 + + arch/arm64/include/asm/mmu_context.h | 17 ++- + arch/arm64/include/asm/page.h | 2 - + arch/arm64/include/asm/pgtable-hwdef.h | 2 + + arch/arm64/include/asm/pgtable.h | 44 +++++- + arch/arm64/include/asm/processor.h | 11 +- + arch/arm64/include/asm/ptrace.h | 1 + + arch/arm64/include/asm/sysreg.h | 44 ++++-- + arch/arm64/include/asm/tlb.h | 34 ++--- + arch/arm64/include/asm/tlbflush.h | 112 +++++++++----- + arch/arm64/include/asm/uaccess.h | 62 ++++++-- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/ptrace.h | 1 + + arch/arm64/kernel/cpu_errata.c | 55 +++++-- + arch/arm64/kernel/cpufeature.c | 160 +++++++++++++++++--- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry.S | 18 ++- + arch/arm64/kernel/head.S | 40 ++--- + arch/arm64/kernel/probes/kprobes.c | 2 +- + arch/arm64/kernel/process.c | 4 + + arch/arm64/kernel/psci.c | 1 - + arch/arm64/kernel/setup.c | 4 - + arch/arm64/kernel/sleep.S | 1 + + arch/arm64/kernel/ssbd.c | 24 ++- + arch/arm64/kernel/suspend.c | 4 + + arch/arm64/kernel/traps.c | 211 ++++++++++++++++++++++++-- + arch/arm64/kernel/vmlinux.lds.S | 35 +++-- + arch/arm64/kvm/hyp-init.S | 3 + + arch/arm64/kvm/hyp/sysreg-sr.c | 11 ++ + arch/arm64/lib/Makefile | 4 +- + arch/arm64/lib/crc32.S | 60 ++++++++ + arch/arm64/mm/context.c | 3 + + arch/arm64/mm/dump.c | 6 +- + arch/arm64/mm/fault.c | 33 ++-- + arch/arm64/mm/init.c | 2 - + arch/arm64/mm/mmu.c | 46 +++--- + arch/arm64/mm/numa.c | 13 +- + arch/arm64/mm/proc.S | 11 +- + drivers/clocksource/arm_arch_timer.c | 15 ++ + drivers/perf/arm_pmu_platform.c | 6 +- + include/asm-generic/tlb.h | 86 +++++++++-- + include/linux/compat.h | 3 + + kernel/signal.c | 14 +- + lib/crc32.c | 11 +- + mm/Makefile | 6 +- + mm/memory.c | 247 ------------------------------ + mm/mmu_gather.c | 261 ++++++++++++++++++++++++++++++++ + virt/kvm/arm/arm.c | 4 +- + 65 files changed, 1379 insertions(+), 578 deletions(-) + delete mode 100644 arch/arm64/include/asm/compiler.h + create mode 100644 arch/arm64/lib/crc32.S + create mode 100644 mm/mmu_gather.c +Merging clk/clk-next (173861bea8a1 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,camcc.txt | 18 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 17 +- + drivers/clk/axs10x/pll_clock.c | 4 +- + drivers/clk/bcm/clk-kona-setup.c | 22 +- + drivers/clk/clk-asm9260.c | 4 +- + drivers/clk/clk-cdce925.c | 11 +- + drivers/clk/clk-fixed-factor.c | 8 +- + drivers/clk/clk-gpio.c | 8 +- + drivers/clk/clk-hsdk-pll.c | 4 +- + drivers/clk/clk-max77686.c | 27 +- + drivers/clk/clk-nomadik.c | 4 +- + drivers/clk/clk-npcm7xx.c | 2 +- + drivers/clk/clk-palmas.c | 4 +- + drivers/clk/clk-qoriq.c | 14 +- + drivers/clk/clk-s2mps11.c | 28 +- + drivers/clk/clk-scmi.c | 2 +- + drivers/clk/clk-scpi.c | 6 +- + drivers/clk/clk-si5351.c | 4 +- + drivers/clk/clk-stm32f4.c | 2 +- + drivers/clk/clk-stm32h7.c | 2 +- + drivers/clk/clk-stm32mp1.c | 2 +- + drivers/clk/clk-tango4.c | 10 +- + drivers/clk/hisilicon/reset.c | 5 +- + drivers/clk/keystone/gate.c | 2 +- + drivers/clk/keystone/pll.c | 2 +- + drivers/clk/mediatek/clk-mt2701.c | 5 - + drivers/clk/meson/axg-audio.c | 34 +- + drivers/clk/meson/axg.c | 332 ++-- + drivers/clk/meson/axg.h | 8 +- + drivers/clk/meson/clk-pll.c | 156 +- + drivers/clk/meson/clkc.h | 16 +- + drivers/clk/meson/gxbb.c | 518 +++--- + drivers/clk/meson/gxbb.h | 10 +- + drivers/clk/meson/meson8b.c | 280 ++-- + drivers/clk/meson/meson8b.h | 5 +- + drivers/clk/mvebu/ap806-system-controller.c | 5 +- + drivers/clk/mvebu/armada-370.c | 4 +- + drivers/clk/mvebu/armada-375.c | 4 +- + drivers/clk/mvebu/armada-37xx-periph.c | 58 +- + drivers/clk/mvebu/armada-37xx-tbg.c | 5 +- + drivers/clk/mvebu/armada-37xx-xtal.c | 4 +- + drivers/clk/mvebu/armada-38x.c | 4 +- + drivers/clk/mvebu/armada-39x.c | 4 +- + drivers/clk/mvebu/armada-xp.c | 4 +- + drivers/clk/mvebu/clk-corediv.c | 4 +- + drivers/clk/mvebu/clk-cpu.c | 4 +- + drivers/clk/mvebu/common.c | 4 +- + drivers/clk/mvebu/common.h | 4 +- + drivers/clk/mvebu/cp110-system-controller.c | 4 +- + drivers/clk/mvebu/dove.c | 4 +- + drivers/clk/mvebu/kirkwood.c | 4 +- + drivers/clk/mvebu/mv98dx3236.c | 4 +- + drivers/clk/mvebu/orion.c | 4 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/camcc-sdm845.c | 1745 ++++++++++++++++++++ + drivers/clk/qcom/clk-branch.c | 2 +- + drivers/clk/qcom/clk-rcg.h | 11 + + drivers/clk/qcom/clk-rcg2.c | 195 +++ + drivers/clk/qcom/gcc-msm8996.c | 152 ++ + drivers/clk/qcom/gcc-sdm845.c | 305 ++-- + drivers/clk/renesas/Kconfig | 19 +- + drivers/clk/renesas/Makefile | 3 + + drivers/clk/renesas/clk-div6.c | 17 +- + drivers/clk/renesas/clk-emev2.c | 22 +- + drivers/clk/renesas/clk-mstp.c | 13 +- + drivers/clk/renesas/clk-r8a73a4.c | 9 +- + drivers/clk/renesas/clk-r8a7740.c | 9 +- + drivers/clk/renesas/clk-r8a7778.c | 9 +- + drivers/clk/renesas/clk-r8a7779.c | 9 +- + drivers/clk/renesas/clk-rcar-gen2.c | 9 +- + drivers/clk/renesas/clk-rz.c | 9 +- + drivers/clk/renesas/clk-sh73a0.c | 9 +- + drivers/clk/renesas/r7s9210-cpg-mssr.c | 217 +++ + drivers/clk/renesas/r8a7743-cpg-mssr.c | 18 +- + drivers/clk/renesas/r8a7745-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 323 ++++ + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 286 ++++ + drivers/clk/renesas/r8a7790-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a7791-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a7792-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a7794-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 72 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 72 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 69 +- + drivers/clk/renesas/r8a77970-cpg-mssr.c | 81 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 32 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 17 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 17 +- + drivers/clk/renesas/r9a06g032-clocks.c | 3 +- + drivers/clk/renesas/rcar-gen2-cpg.c | 5 +- + drivers/clk/renesas/rcar-gen2-cpg.h | 7 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 45 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 33 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 5 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 205 ++- + drivers/clk/renesas/renesas-cpg-mssr.h | 38 +- + drivers/clk/st/clkgen-fsyn.c | 2 +- + drivers/clk/sunxi/clk-mod0.c | 6 +- + drivers/clk/sunxi/clk-sun9i-core.c | 20 +- + drivers/clk/sunxi/clk-sunxi.c | 4 +- + drivers/clk/ti/apll.c | 18 +- + drivers/clk/ti/clk-dra7-atl.c | 4 +- + drivers/clk/ti/clk.c | 23 +- + drivers/clk/ti/clkctrl.c | 14 +- + drivers/clk/ti/composite.c | 14 +- + drivers/clk/ti/divider.c | 4 +- + drivers/clk/ti/dpll.c | 12 +- + drivers/clk/ti/fapll.c | 8 +- + drivers/clk/ti/fixed-factor.c | 4 +- + drivers/clk/ti/gate.c | 2 +- + drivers/clk/ti/interface.c | 2 +- + drivers/clk/ti/mux.c | 4 +- + drivers/clk/zynq/clkc.c | 4 +- + include/dt-bindings/clock/maxim,max77686.h | 5 +- + include/dt-bindings/clock/maxim,max77802.h | 5 +- + include/dt-bindings/clock/qcom,camcc-sdm845.h | 116 ++ + include/dt-bindings/clock/qcom,gcc-msm8996.h | 9 + + include/dt-bindings/clock/qcom,gcc-sdm845.h | 3 + + include/dt-bindings/clock/r7s72100-clock.h | 7 +- + include/dt-bindings/clock/r7s9210-cpg-mssr.h | 20 + + include/dt-bindings/clock/r8a7743-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7744-cpg-mssr.h | 39 + + include/dt-bindings/clock/r8a7745-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a774a1-cpg-mssr.h | 58 + + include/dt-bindings/clock/r8a774c0-cpg-mssr.h | 60 + + include/dt-bindings/clock/r8a7790-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7791-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7792-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7793-clock.h | 12 +- + include/dt-bindings/clock/r8a7793-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7794-clock.h | 8 +- + include/dt-bindings/clock/r8a7794-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7795-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a7796-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a77970-cpg-mssr.h | 8 +- + include/dt-bindings/clock/r8a77995-cpg-mssr.h | 8 +- + include/dt-bindings/clock/renesas-cpg-mssr.h | 8 +- + include/dt-bindings/clock/samsung,s2mps11.h | 5 +- + include/dt-bindings/clock/samsung,s3c64xx-clock.h | 7 +- + include/linux/clk/renesas.h | 8 +- + 141 files changed, 5031 insertions(+), 1402 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,camcc.txt + create mode 100644 drivers/clk/qcom/camcc-sdm845.c + create mode 100644 drivers/clk/renesas/r7s9210-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a774a1-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a774c0-cpg-mssr.c + create mode 100644 include/dt-bindings/clock/qcom,camcc-sdm845.h + create mode 100644 include/dt-bindings/clock/r7s9210-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a7744-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a774a1-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a774c0-cpg-mssr.h +Merging clk-samsung/for-next (519570ff75a1 clk: samsung: exynos5433: Keep sclk_uart clocks enabled in suspend) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos-audss.c | 1 - + drivers/clk/samsung/clk-exynos3250.c | 1 - + drivers/clk/samsung/clk-exynos4.c | 226 ++------------------------------- + drivers/clk/samsung/clk-exynos5250.c | 42 +----- + drivers/clk/samsung/clk-exynos5420.c | 72 +---------- + drivers/clk/samsung/clk-exynos5433.c | 33 ++++- + drivers/clk/samsung/clk-s3c2410.c | 43 +------ + drivers/clk/samsung/clk-s3c2412.c | 43 +------ + drivers/clk/samsung/clk-s3c2443.c | 43 +------ + drivers/clk/samsung/clk-s3c64xx.c | 66 +--------- + drivers/clk/samsung/clk-s5pv210.c | 41 +----- + drivers/clk/samsung/clk.c | 23 ++-- + drivers/clk/samsung/clk.h | 18 ++- + include/dt-bindings/clock/exynos4.h | 30 ----- + 14 files changed, 97 insertions(+), 585 deletions(-) +Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM) +$ git merge c6x/for-linux-next +Auto-merging arch/c6x/Kconfig +Merge made by the 'recursive' strategy. + arch/c6x/Kconfig | 1 + + arch/c6x/kernel/setup.c | 26 +------------------------- + 2 files changed, 2 insertions(+), 25 deletions(-) +Merging csky/linux-next (c4b17dd4a3cc csky: remove NSIGXXX in abiv2/fpu.c) +$ git merge csky/linux-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/csky/cpus.txt | 70 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + arch/csky/Kconfig | 204 +++++++++++ + arch/csky/Kconfig.debug | 8 + + arch/csky/Makefile | 92 +++++ + arch/csky/abiv1/Makefile | 8 + + arch/csky/abiv1/alignment.c | 332 +++++++++++++++++ + arch/csky/abiv1/bswapdi.c | 13 + + arch/csky/abiv1/bswapsi.c | 12 + + arch/csky/abiv1/cacheflush.c | 51 +++ + arch/csky/abiv1/inc/abi/cacheflush.h | 47 +++ + arch/csky/abiv1/inc/abi/ckmmu.h | 75 ++++ + arch/csky/abiv1/inc/abi/entry.h | 160 +++++++++ + arch/csky/abiv1/inc/abi/page.h | 27 ++ + arch/csky/abiv1/inc/abi/pgtable-bits.h | 37 ++ + arch/csky/abiv1/inc/abi/reg_ops.h | 27 ++ + arch/csky/abiv1/inc/abi/regdef.h | 26 ++ + arch/csky/abiv1/inc/abi/string.h | 13 + + arch/csky/abiv1/inc/abi/tlb.h | 12 + + arch/csky/abiv1/inc/abi/vdso.h | 18 + + arch/csky/abiv1/memcpy.S | 345 ++++++++++++++++++ + arch/csky/abiv1/memset.c | 37 ++ + arch/csky/abiv1/mmap.c | 66 ++++ + arch/csky/abiv1/strksyms.c | 7 + + arch/csky/abiv2/Makefile | 10 + + arch/csky/abiv2/cacheflush.c | 59 +++ + arch/csky/abiv2/fpu.c | 267 ++++++++++++++ + arch/csky/abiv2/inc/abi/cacheflush.h | 40 +++ + arch/csky/abiv2/inc/abi/ckmmu.h | 87 +++++ + arch/csky/abiv2/inc/abi/entry.h | 157 ++++++++ + arch/csky/abiv2/inc/abi/fpu.h | 66 ++++ + arch/csky/abiv2/inc/abi/page.h | 14 + + arch/csky/abiv2/inc/abi/pgtable-bits.h | 37 ++ + arch/csky/abiv2/inc/abi/reg_ops.h | 17 + + arch/csky/abiv2/inc/abi/regdef.h | 26 ++ + arch/csky/abiv2/inc/abi/string.h | 28 ++ + arch/csky/abiv2/inc/abi/tlb.h | 13 + + arch/csky/abiv2/inc/abi/vdso.h | 24 ++ + arch/csky/abiv2/memcmp.S | 152 ++++++++ + arch/csky/abiv2/memcpy.S | 110 ++++++ + arch/csky/abiv2/memcpy.c | 40 +++ + arch/csky/abiv2/memmove.S | 108 ++++++ + arch/csky/abiv2/memset.S | 83 +++++ + arch/csky/abiv2/strcmp.S | 168 +++++++++ + arch/csky/abiv2/strcpy.S | 123 +++++++ + arch/csky/abiv2/strksyms.c | 12 + + arch/csky/abiv2/strlen.S | 97 +++++ + arch/csky/abiv2/sysdep.h | 30 ++ + arch/csky/boot/Makefile | 24 ++ + arch/csky/boot/dts/Makefile | 13 + + arch/csky/boot/dts/include/dt-bindings | 1 + + arch/csky/configs/defconfig | 61 ++++ + arch/csky/include/asm/Kbuild | 70 ++++ + arch/csky/include/asm/addrspace.h | 10 + + arch/csky/include/asm/atomic.h | 213 +++++++++++ + arch/csky/include/asm/barrier.h | 45 +++ + arch/csky/include/asm/bitops.h | 81 +++++ + arch/csky/include/asm/bug.h | 26 ++ + arch/csky/include/asm/cache.h | 28 ++ + arch/csky/include/asm/cacheflush.h | 9 + + arch/csky/include/asm/checksum.h | 55 +++ + arch/csky/include/asm/cmpxchg.h | 71 ++++ + arch/csky/include/asm/compat.h | 11 + + arch/csky/include/asm/elf.h | 150 ++++++++ + arch/csky/include/asm/fixmap.h | 27 ++ + arch/csky/include/asm/highmem.h | 51 +++ + arch/csky/include/asm/io.h | 24 ++ + arch/csky/include/asm/irqflags.h | 50 +++ + arch/csky/include/asm/mmu.h | 12 + + arch/csky/include/asm/mmu_context.h | 149 ++++++++ + arch/csky/include/asm/page.h | 101 ++++++ + arch/csky/include/asm/pgalloc.h | 109 ++++++ + arch/csky/include/asm/pgtable.h | 300 ++++++++++++++++ + arch/csky/include/asm/processor.h | 121 +++++++ + arch/csky/include/asm/reg_ops.h | 22 ++ + arch/csky/include/asm/segment.h | 19 + + arch/csky/include/asm/shmparam.h | 11 + + arch/csky/include/asm/smp.h | 28 ++ + arch/csky/include/asm/spinlock.h | 272 ++++++++++++++ + arch/csky/include/asm/spinlock_types.h | 35 ++ + arch/csky/include/asm/string.h | 13 + + arch/csky/include/asm/switch_to.h | 36 ++ + arch/csky/include/asm/syscall.h | 69 ++++ + arch/csky/include/asm/syscalls.h | 15 + + arch/csky/include/asm/thread_info.h | 75 ++++ + arch/csky/include/asm/tlb.h | 20 ++ + arch/csky/include/asm/tlbflush.h | 23 ++ + arch/csky/include/asm/traps.h | 40 +++ + arch/csky/include/asm/uaccess.h | 399 +++++++++++++++++++++ + arch/csky/include/asm/unistd.h | 4 + + arch/csky/include/asm/vdso.h | 13 + + arch/csky/include/uapi/asm/Kbuild | 33 ++ + arch/csky/include/uapi/asm/byteorder.h | 9 + + arch/csky/include/uapi/asm/cachectl.h | 14 + + arch/csky/include/uapi/asm/ptrace.h | 104 ++++++ + arch/csky/include/uapi/asm/sigcontext.h | 14 + + arch/csky/include/uapi/asm/unistd.h | 10 + + arch/csky/kernel/Makefile | 8 + + arch/csky/kernel/asm-offsets.c | 86 +++++ + arch/csky/kernel/atomic.S | 87 +++++ + arch/csky/kernel/cpu-probe.c | 79 ++++ + arch/csky/kernel/dumpstack.c | 65 ++++ + arch/csky/kernel/entry.S | 397 ++++++++++++++++++++ + arch/csky/kernel/head.S | 78 ++++ + arch/csky/kernel/irq.c | 22 ++ + arch/csky/kernel/module.c | 83 +++++ + arch/csky/kernel/platform.c | 17 + + arch/csky/kernel/power.c | 30 ++ + arch/csky/kernel/process.c | 135 +++++++ + arch/csky/kernel/ptrace.c | 318 ++++++++++++++++ + arch/csky/kernel/setup.c | 151 ++++++++ + arch/csky/kernel/signal.c | 351 ++++++++++++++++++ + arch/csky/kernel/smp.c | 245 +++++++++++++ + arch/csky/kernel/syscall.c | 42 +++ + arch/csky/kernel/syscall_table.c | 14 + + arch/csky/kernel/time.c | 11 + + arch/csky/kernel/traps.c | 168 +++++++++ + arch/csky/kernel/vdso.c | 85 +++++ + arch/csky/kernel/vmlinux.lds.S | 64 ++++ + arch/csky/lib/Makefile | 1 + + arch/csky/lib/delay.c | 40 +++ + arch/csky/lib/usercopy.c | 271 ++++++++++++++ + arch/csky/mm/Makefile | 13 + + arch/csky/mm/cachev1.c | 127 +++++++ + arch/csky/mm/cachev2.c | 80 +++++ + arch/csky/mm/dma-mapping.c | 248 +++++++++++++ + arch/csky/mm/fault.c | 221 ++++++++++++ + arch/csky/mm/highmem.c | 196 ++++++++++ + arch/csky/mm/init.c | 119 ++++++ + arch/csky/mm/ioremap.c | 49 +++ + arch/csky/mm/syscache.c | 29 ++ + arch/csky/mm/tlb.c | 215 +++++++++++ + 133 files changed, 10700 insertions(+) + create mode 100644 Documentation/devicetree/bindings/csky/cpus.txt + create mode 100644 arch/csky/Kconfig + create mode 100644 arch/csky/Kconfig.debug + create mode 100644 arch/csky/Makefile + create mode 100644 arch/csky/abiv1/Makefile + create mode 100644 arch/csky/abiv1/alignment.c + create mode 100644 arch/csky/abiv1/bswapdi.c + create mode 100644 arch/csky/abiv1/bswapsi.c + create mode 100644 arch/csky/abiv1/cacheflush.c + create mode 100644 arch/csky/abiv1/inc/abi/cacheflush.h + create mode 100644 arch/csky/abiv1/inc/abi/ckmmu.h + create mode 100644 arch/csky/abiv1/inc/abi/entry.h + create mode 100644 arch/csky/abiv1/inc/abi/page.h + create mode 100644 arch/csky/abiv1/inc/abi/pgtable-bits.h + create mode 100644 arch/csky/abiv1/inc/abi/reg_ops.h + create mode 100644 arch/csky/abiv1/inc/abi/regdef.h + create mode 100644 arch/csky/abiv1/inc/abi/string.h + create mode 100644 arch/csky/abiv1/inc/abi/tlb.h + create mode 100644 arch/csky/abiv1/inc/abi/vdso.h + create mode 100644 arch/csky/abiv1/memcpy.S + create mode 100644 arch/csky/abiv1/memset.c + create mode 100644 arch/csky/abiv1/mmap.c + create mode 100644 arch/csky/abiv1/strksyms.c + create mode 100644 arch/csky/abiv2/Makefile + create mode 100644 arch/csky/abiv2/cacheflush.c + create mode 100644 arch/csky/abiv2/fpu.c + create mode 100644 arch/csky/abiv2/inc/abi/cacheflush.h + create mode 100644 arch/csky/abiv2/inc/abi/ckmmu.h + create mode 100644 arch/csky/abiv2/inc/abi/entry.h + create mode 100644 arch/csky/abiv2/inc/abi/fpu.h + create mode 100644 arch/csky/abiv2/inc/abi/page.h + create mode 100644 arch/csky/abiv2/inc/abi/pgtable-bits.h + create mode 100644 arch/csky/abiv2/inc/abi/reg_ops.h + create mode 100644 arch/csky/abiv2/inc/abi/regdef.h + create mode 100644 arch/csky/abiv2/inc/abi/string.h + create mode 100644 arch/csky/abiv2/inc/abi/tlb.h + create mode 100644 arch/csky/abiv2/inc/abi/vdso.h + create mode 100644 arch/csky/abiv2/memcmp.S + create mode 100644 arch/csky/abiv2/memcpy.S + create mode 100644 arch/csky/abiv2/memcpy.c + create mode 100644 arch/csky/abiv2/memmove.S + create mode 100644 arch/csky/abiv2/memset.S + create mode 100644 arch/csky/abiv2/strcmp.S + create mode 100644 arch/csky/abiv2/strcpy.S + create mode 100644 arch/csky/abiv2/strksyms.c + create mode 100644 arch/csky/abiv2/strlen.S + create mode 100644 arch/csky/abiv2/sysdep.h + create mode 100644 arch/csky/boot/Makefile + create mode 100644 arch/csky/boot/dts/Makefile + create mode 120000 arch/csky/boot/dts/include/dt-bindings + create mode 100644 arch/csky/configs/defconfig + create mode 100644 arch/csky/include/asm/Kbuild + create mode 100644 arch/csky/include/asm/addrspace.h + create mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/include/asm/barrier.h + create mode 100644 arch/csky/include/asm/bitops.h + create mode 100644 arch/csky/include/asm/bug.h + create mode 100644 arch/csky/include/asm/cache.h + create mode 100644 arch/csky/include/asm/cacheflush.h + create mode 100644 arch/csky/include/asm/checksum.h + create mode 100644 arch/csky/include/asm/cmpxchg.h + create mode 100644 arch/csky/include/asm/compat.h + create mode 100644 arch/csky/include/asm/elf.h + create mode 100644 arch/csky/include/asm/fixmap.h + create mode 100644 arch/csky/include/asm/highmem.h + create mode 100644 arch/csky/include/asm/io.h + create mode 100644 arch/csky/include/asm/irqflags.h + create mode 100644 arch/csky/include/asm/mmu.h + create mode 100644 arch/csky/include/asm/mmu_context.h + create mode 100644 arch/csky/include/asm/page.h + create mode 100644 arch/csky/include/asm/pgalloc.h + create mode 100644 arch/csky/include/asm/pgtable.h + create mode 100644 arch/csky/include/asm/processor.h + create mode 100644 arch/csky/include/asm/reg_ops.h + create mode 100644 arch/csky/include/asm/segment.h + create mode 100644 arch/csky/include/asm/shmparam.h + create mode 100644 arch/csky/include/asm/smp.h + create mode 100644 arch/csky/include/asm/spinlock.h + create mode 100644 arch/csky/include/asm/spinlock_types.h + create mode 100644 arch/csky/include/asm/string.h + create mode 100644 arch/csky/include/asm/switch_to.h + create mode 100644 arch/csky/include/asm/syscall.h + create mode 100644 arch/csky/include/asm/syscalls.h + create mode 100644 arch/csky/include/asm/thread_info.h + create mode 100644 arch/csky/include/asm/tlb.h + create mode 100644 arch/csky/include/asm/tlbflush.h + create mode 100644 arch/csky/include/asm/traps.h + create mode 100644 arch/csky/include/asm/uaccess.h + create mode 100644 arch/csky/include/asm/unistd.h + create mode 100644 arch/csky/include/asm/vdso.h + create mode 100644 arch/csky/include/uapi/asm/Kbuild + create mode 100644 arch/csky/include/uapi/asm/byteorder.h + create mode 100644 arch/csky/include/uapi/asm/cachectl.h + create mode 100644 arch/csky/include/uapi/asm/ptrace.h + create mode 100644 arch/csky/include/uapi/asm/sigcontext.h + create mode 100644 arch/csky/include/uapi/asm/unistd.h + create mode 100644 arch/csky/kernel/Makefile + create mode 100644 arch/csky/kernel/asm-offsets.c + create mode 100644 arch/csky/kernel/atomic.S + create mode 100644 arch/csky/kernel/cpu-probe.c + create mode 100644 arch/csky/kernel/dumpstack.c + create mode 100644 arch/csky/kernel/entry.S + create mode 100644 arch/csky/kernel/head.S + create mode 100644 arch/csky/kernel/irq.c + create mode 100644 arch/csky/kernel/module.c + create mode 100644 arch/csky/kernel/platform.c + create mode 100644 arch/csky/kernel/power.c + create mode 100644 arch/csky/kernel/process.c + create mode 100644 arch/csky/kernel/ptrace.c + create mode 100644 arch/csky/kernel/setup.c + create mode 100644 arch/csky/kernel/signal.c + create mode 100644 arch/csky/kernel/smp.c + create mode 100644 arch/csky/kernel/syscall.c + create mode 100644 arch/csky/kernel/syscall_table.c + create mode 100644 arch/csky/kernel/time.c + create mode 100644 arch/csky/kernel/traps.c + create mode 100644 arch/csky/kernel/vdso.c + create mode 100644 arch/csky/kernel/vmlinux.lds.S + create mode 100644 arch/csky/lib/Makefile + create mode 100644 arch/csky/lib/delay.c + create mode 100644 arch/csky/lib/usercopy.c + create mode 100644 arch/csky/mm/Makefile + create mode 100644 arch/csky/mm/cachev1.c + create mode 100644 arch/csky/mm/cachev2.c + create mode 100644 arch/csky/mm/dma-mapping.c + create mode 100644 arch/csky/mm/fault.c + create mode 100644 arch/csky/mm/highmem.c + create mode 100644 arch/csky/mm/init.c + create mode 100644 arch/csky/mm/ioremap.c + create mode 100644 arch/csky/mm/syscache.c + create mode 100644 arch/csky/mm/tlb.c +Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no) +$ git merge h8300/h8300-next +Already up to date. +Merging ia64/next (02b4da5f84d1 intel-iommu: mark intel_dma_ops static) +$ git merge ia64/next +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging arch/ia64/sn/pci/pci_dma.c +Auto-merging arch/ia64/include/asm/dma-mapping.h +Merge made by the 'recursive' strategy. + arch/ia64/hp/common/sba_iommu.c | 4 --- + arch/ia64/include/asm/dma-mapping.h | 5 ---- + arch/ia64/include/asm/iommu.h | 2 -- + arch/ia64/kernel/efi.c | 1 - + arch/ia64/kernel/machvec.c | 16 ----------- + arch/ia64/kernel/pci-dma.c | 55 ------------------------------------- + arch/ia64/sn/pci/pci_dma.c | 29 ------------------- + drivers/iommu/intel-iommu.c | 4 +-- + 8 files changed, 1 insertion(+), 115 deletions(-) +Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/emu/nfeth.c | 4 ---- + arch/m68k/kernel/sun3-head.S | 6 ------ + 2 files changed, 10 deletions(-) +Merging m68knommu/for-next (bbd4744f8a27 m68k: fix command-line parsing when passed from u-boot) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/uboot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (c4347b05440f microblaze/PCI: Remove stale pcibios_align_resource() comment) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (2f0b649b3b4a MIPS: stop using _PTRS_PER_PGD) +$ git merge mips/mips-next +Removing arch/mips/lib/iomap.c +Auto-merging arch/mips/kernel/setup.c +Removing arch/mips/generic/kexec.c +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 42 +++- + arch/mips/Makefile | 9 +- + arch/mips/bcm47xx/workarounds.c | 8 +- + arch/mips/bmips/setup.c | 9 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 19 ++ + arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 6 + + arch/mips/cavium-octeon/octeon-irq.c | 16 +- + arch/mips/cavium-octeon/setup.c | 9 +- + arch/mips/cavium-octeon/smp.c | 7 + + arch/mips/generic/Makefile | 1 - + arch/mips/generic/kexec.c | 44 ---- + arch/mips/include/asm/io.h | 51 +---- + arch/mips/include/asm/kexec.h | 11 +- + .../asm/mach-loongson64/kernel-entry-init.h | 16 +- + arch/mips/include/asm/r4kcache.h | 73 ------- + arch/mips/include/asm/smp-ops.h | 3 + + arch/mips/include/asm/smp.h | 16 ++ + arch/mips/kernel/crash.c | 7 +- + arch/mips/kernel/head.S | 18 +- + arch/mips/kernel/machine_kexec.c | 143 ++++++++++++- + arch/mips/kernel/mips-mt.c | 59 ------ + arch/mips/kernel/relocate.c | 2 +- + arch/mips/kernel/setup.c | 144 ++++--------- + arch/mips/kernel/smp-bmips.c | 7 + + arch/mips/kernel/smp-cps.c | 80 +++++--- + arch/mips/kernel/traps.c | 5 +- + arch/mips/kernel/unaligned.c | 47 +++-- + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/iomap-pci.c | 7 - + arch/mips/lib/iomap.c | 227 --------------------- + arch/mips/lib/memcpy.S | 10 +- + arch/mips/lib/memset.S | 12 +- + arch/mips/loongson64/common/Makefile | 1 - + arch/mips/loongson64/fuloong-2e/Makefile | 2 +- + arch/mips/loongson64/fuloong-2e/dma.c | 12 ++ + arch/mips/loongson64/lemote-2f/Makefile | 2 +- + arch/mips/loongson64/{common => lemote-2f}/dma.c | 4 - + arch/mips/loongson64/loongson-3/numa.c | 34 ++- + arch/mips/loongson64/loongson-3/smp.c | 14 +- + arch/mips/mm/init.c | 7 +- + arch/mips/netlogic/common/irq.c | 14 +- + arch/mips/pci/ops-loongson3.c | 34 ++- + arch/mips/pci/pci-legacy.c | 4 + + arch/mips/pci/pci-rt2880.c | 2 + + arch/mips/pmcs-msp71xx/msp_usb.c | 4 +- + arch/mips/ralink/cevt-rt3352.c | 6 +- + arch/mips/ralink/ill_acc.c | 2 +- + arch/mips/ralink/rt305x.c | 5 + + arch/mips/sgi-ip22/ip28-berr.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 11 +- + arch/mips/tools/.gitignore | 1 + + arch/mips/tools/Makefile | 5 + + arch/mips/tools/elf-entry.c | 96 +++++++++ + arch/mips/txx9/generic/setup.c | 5 +- + 54 files changed, 633 insertions(+), 744 deletions(-) + delete mode 100644 arch/mips/generic/kexec.c + delete mode 100644 arch/mips/lib/iomap.c + create mode 100644 arch/mips/loongson64/fuloong-2e/dma.c + rename arch/mips/loongson64/{common => lemote-2f}/dma.c (75%) + create mode 100644 arch/mips/tools/.gitignore + create mode 100644 arch/mips/tools/Makefile + create mode 100644 arch/mips/tools/elf-entry.c +Merging nds32/next (3350139c0ff3 nds32: linker script: GCOV kernel may refers data in __exit) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (c7c09dc187f0 nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (2c18d35d677d parisc: Remove PTE load and fault check from L2_ptep macro) +$ git merge parisc-hd/for-next +Removing drivers/parisc/ccio-rm-dma.c +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 9 -- + arch/parisc/include/asm/pgtable.h | 24 ++-- + arch/parisc/include/uapi/asm/posix_types.h | 3 - + arch/parisc/kernel/cache.c | 18 +-- + arch/parisc/kernel/entry.S | 18 ++- + drivers/parisc/Makefile | 3 - + drivers/parisc/ccio-rm-dma.c | 202 ----------------------------- + 7 files changed, 30 insertions(+), 247 deletions(-) + delete mode 100644 drivers/parisc/ccio-rm-dma.c +Merging powerpc/next (0823c68b054b powerpc/fadump: re-register firmware-assisted dump if already registered) +$ git merge powerpc/next +Removing arch/powerpc/mm/slb_low.S +Auto-merging arch/powerpc/kernel/tm.S +Auto-merging arch/powerpc/kernel/iommu.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 47 +- + arch/powerpc/boot/crt0.S | 4 +- + arch/powerpc/configs/powernv_defconfig | 3 + + arch/powerpc/configs/ppc64_defconfig | 3 + + arch/powerpc/configs/skiroot_defconfig | 154 +++-- + arch/powerpc/include/asm/asm-prototypes.h | 2 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 12 +- + arch/powerpc/include/asm/drmem.h | 5 + + arch/powerpc/include/asm/exception-64s.h | 8 - + arch/powerpc/include/asm/firmware.h | 3 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/machdep.h | 1 + + arch/powerpc/include/asm/mce.h | 3 + + arch/powerpc/include/asm/paca.h | 25 +- + arch/powerpc/include/asm/processor.h | 1 + + arch/powerpc/include/asm/rtas.h | 13 + + arch/powerpc/include/asm/slice.h | 1 + + arch/powerpc/include/asm/thread_info.h | 11 + + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/kernel/Makefile | 8 +- + arch/powerpc/kernel/asm-offsets.c | 11 +- + arch/powerpc/kernel/entry_64.S | 2 + + arch/powerpc/kernel/exceptions-64s.S | 244 +++----- + arch/powerpc/kernel/fadump.c | 4 +- + arch/powerpc/kernel/iommu.c | 2 +- + arch/powerpc/kernel/mce.c | 9 +- + arch/powerpc/kernel/mce_power.c | 2 +- + arch/powerpc/kernel/paca.c | 22 - + arch/powerpc/kernel/process.c | 16 + + arch/powerpc/kernel/prom_init.c | 7 +- + arch/powerpc/kernel/rtas.c | 2 + + arch/powerpc/kernel/rtasd.c | 17 +- + arch/powerpc/kernel/setup_64.c | 18 +- + arch/powerpc/kernel/tm.S | 10 +- + arch/powerpc/kernel/trace/Makefile | 2 +- + arch/powerpc/kernel/traps.c | 16 +- + arch/powerpc/kernel/vdso32/datapage.S | 1 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + + arch/powerpc/kernel/vdso64/datapage.S | 1 + + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + + arch/powerpc/lib/mem_64.S | 4 +- + arch/powerpc/mm/Makefile | 2 +- + arch/powerpc/mm/hash_utils_64.c | 46 +- + arch/powerpc/mm/mmu_context.c | 3 +- + arch/powerpc/mm/mmu_context_book3s64.c | 9 + + arch/powerpc/mm/slb.c | 661 ++++++++++++++------- + arch/powerpc/mm/slb_low.S | 335 ----------- + arch/powerpc/mm/slice.c | 43 +- + arch/powerpc/platforms/powermac/Makefile | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 5 - + arch/powerpc/platforms/powernv/memtrace.c | 21 +- + arch/powerpc/platforms/powernv/opal.c | 2 + + arch/powerpc/platforms/powernv/setup.c | 11 + + arch/powerpc/platforms/pseries/dlpar.c | 37 +- + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/hotplug-memory.c | 55 +- + arch/powerpc/platforms/pseries/lpar.c | 241 +++++++- + arch/powerpc/platforms/pseries/lparcfg.c | 5 +- + arch/powerpc/platforms/pseries/mobility.c | 18 +- + arch/powerpc/platforms/pseries/pseries.h | 6 +- + arch/powerpc/platforms/pseries/ras.c | 305 +++++++++- + arch/powerpc/platforms/pseries/setup.c | 14 + + arch/powerpc/sysdev/xive/native.c | 11 +- + arch/powerpc/xmon/Makefile | 2 +- + arch/powerpc/xmon/xmon.c | 37 +- + drivers/misc/ocxl/config.c | 4 +- + tools/testing/selftests/powerpc/tm/tm-tmspr.c | 27 +- + .../testing/selftests/powerpc/tm/tm-unavailable.c | 9 +- + tools/testing/selftests/powerpc/tm/tm.h | 9 + + 69 files changed, 1518 insertions(+), 1106 deletions(-) + delete mode 100644 arch/powerpc/mm/slb_low.S +Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush operation for hvc drivers) +$ git merge hvc/topic/hvc +Already up to date. +Merging fsl/next (bd96461249bd powerpc/dts/fsl: t2080rdb: use the Cortina PHY driver compatible) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (6bf4ca7fbc85 Linux 4.19-rc5) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (ccc413f62143 s390/qdio: clean up AOB handling) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/boot/compressed/head.S | 4 ++-- + arch/s390/boot/head.S | 6 ++++-- + arch/s390/include/asm/mmu.h | 2 ++ + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/qdio.h | 2 -- + arch/s390/include/asm/sclp.h | 4 +++- + arch/s390/kernel/early_printk.c | 2 +- + arch/s390/kernel/head64.S | 6 +++--- + arch/s390/kernel/swsusp.S | 8 ++------ + arch/s390/kernel/vdso.c | 8 +++++--- + arch/s390/kernel/vdso32/clock_gettime.S | 19 ++++++++++--------- + arch/s390/kernel/vdso32/gettimeofday.S | 3 ++- + arch/s390/kernel/vdso64/clock_gettime.S | 25 +++++++++++++------------ + arch/s390/kernel/vdso64/gettimeofday.S | 3 ++- + arch/s390/purgatory/head.S | 4 ++-- + drivers/s390/block/dasd.c | 6 ++---- + drivers/s390/char/sclp_early_core.c | 11 ++++++++--- + drivers/s390/char/sclp_pci.c | 10 ++++++++-- + drivers/s390/char/tape_3590.c | 2 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/cio/qdio_main.c | 15 ++------------- + drivers/s390/cio/qdio_setup.c | 1 - + drivers/s390/crypto/ap_bus.c | 18 ++++++------------ + drivers/s390/crypto/zcrypt_msgtype6.c | 9 +++------ + 24 files changed, 83 insertions(+), 88 deletions(-) +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 (d9cbd0e8f667 um: NULL check before kfree is not needed) +$ git merge uml/linux-next +Removing arch/um/os-Linux/aio.c +Removing arch/um/include/shared/aio.h +Merge made by the 'recursive' strategy. + arch/um/drivers/vector_kern.c | 15 +- + arch/um/drivers/vector_user.c | 6 +- + arch/um/include/shared/aio.h | 28 --- + arch/um/kernel/irq.c | 3 +- + arch/um/os-Linux/Makefile | 8 +- + arch/um/os-Linux/aio.c | 390 ---------------------------------- + arch/um/os-Linux/skas/process.c | 5 + + arch/x86/um/shared/sysdep/ptrace_32.h | 12 -- + 8 files changed, 15 insertions(+), 452 deletions(-) + delete mode 100644 arch/um/include/shared/aio.h + delete mode 100644 arch/um/os-Linux/aio.c +Merging xtensa/xtensa-for-next (c9efd0d7beb3 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/platforms/xtfpga/setup.c | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) +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 (89067b62df5b Merge branch 'for-next-next-v4.20-20180914' into for-next-20180914) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 48 ++--- + fs/btrfs/btrfs_inode.h | 8 +- + fs/btrfs/check-integrity.c | 6 +- + fs/btrfs/compression.c | 2 - + fs/btrfs/ctree.c | 15 +- + fs/btrfs/ctree.h | 52 ++--- + fs/btrfs/delayed-inode.c | 38 ++-- + fs/btrfs/delayed-inode.h | 4 +- + fs/btrfs/delayed-ref.c | 55 ++--- + fs/btrfs/delayed-ref.h | 5 +- + fs/btrfs/dev-replace.c | 153 +++++--------- + fs/btrfs/dev-replace.h | 13 -- + fs/btrfs/dir-item.c | 8 +- + fs/btrfs/disk-io.c | 27 ++- + fs/btrfs/export.c | 4 +- + fs/btrfs/extent-tree.c | 423 +++++++++++++++++++++++--------------- + fs/btrfs/extent_io.c | 44 ++-- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/extent_map.c | 32 +-- + fs/btrfs/extent_map.h | 4 +- + fs/btrfs/file.c | 34 ++- + fs/btrfs/free-space-cache.c | 6 +- + fs/btrfs/inode.c | 154 +++++++------- + fs/btrfs/ioctl.c | 18 +- + fs/btrfs/qgroup.c | 378 ++++++++++++++++++++++++++++++++-- + fs/btrfs/qgroup.h | 11 + + fs/btrfs/reada.c | 16 +- + fs/btrfs/ref-verify.c | 8 +- + fs/btrfs/relocation.c | 22 +- + fs/btrfs/scrub.c | 49 ++--- + fs/btrfs/send.c | 24 +-- + fs/btrfs/super.c | 6 +- + fs/btrfs/tests/btrfs-tests.c | 6 +- + fs/btrfs/tests/extent-io-tests.c | 10 +- + fs/btrfs/tests/extent-map-tests.c | 4 +- + fs/btrfs/transaction.c | 21 +- + fs/btrfs/tree-log.c | 5 +- + fs/btrfs/tree-log.h | 2 +- + fs/btrfs/volumes.c | 135 ++++++------ + fs/btrfs/volumes.h | 9 +- + include/trace/events/btrfs.h | 36 +++- + 41 files changed, 1162 insertions(+), 737 deletions(-) +Merging ceph/master (e92c0eaf7543 rbd: support cloning across namespaces) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (07f9750589c7 smb3: add tracepoint for sending lease break responses to server) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 13 +- + fs/cifs/cifs_dfs_ref.c | 7 +- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsfs.c | 21 +++- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 4 + + fs/cifs/cifssmb.c | 21 ++++ + fs/cifs/connect.c | 26 +++- + fs/cifs/file.c | 8 +- + fs/cifs/inode.c | 6 +- + fs/cifs/ioctl.c | 2 - + fs/cifs/smb2glob.h | 2 +- + fs/cifs/smb2inode.c | 327 +++++++++++++++++++++++++++++++++++-------------- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2ops.c | 79 ++++++++++-- + fs/cifs/smb2pdu.c | 215 ++++++++++++-------------------- + fs/cifs/smb2pdu.h | 13 +- + fs/cifs/smb2proto.h | 25 ++-- + fs/cifs/trace.h | 109 +++++++++++++++++ + fs/cifs/transport.c | 36 +++++- + 20 files changed, 640 insertions(+), 279 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +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 (12f0d3d810c0 Merge fanotify support for reporting PID instead of TGID.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/ext2/acl.c | 4 ++ + fs/ext2/ext2.h | 4 -- + fs/ext2/super.c | 5 +- + fs/notify/fanotify/fanotify.c | 9 ++- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fanotify/fanotify_user.c | 52 +++++++++++--- + fs/notify/fdinfo.c | 29 ++------ + fs/notify/fsnotify.c | 32 ++++++--- + fs/notify/fsnotify.h | 11 +++ + fs/notify/mark.c | 4 ++ + fs/super.c | 2 +- + fs/udf/balloc.c | 30 +------- + fs/udf/super.c | 139 ++++++++++++++++++++----------------- + fs/udf/udf_sb.h | 10 +-- + include/linux/fanotify.h | 4 ++ + include/linux/fs.h | 5 ++ + include/linux/fsnotify_backend.h | 21 ++++-- + include/uapi/linux/fanotify.h | 25 +++++-- + 18 files changed, 221 insertions(+), 167 deletions(-) +Merging ext4/dev (cce6c9f7e602 ext4, dax: set ext4_dax_aops for dax files) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (61f7725aa148 f2fs: return correct errno in f2fs_gc) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 17 ++++- + Documentation/filesystems/f2fs.txt | 3 +- + fs/f2fs/acl.c | 12 ++-- + fs/f2fs/acl.h | 5 +- + fs/f2fs/checkpoint.c | 17 +++-- + fs/f2fs/data.c | 50 ++++++++------ + fs/f2fs/debug.c | 8 +-- + fs/f2fs/dir.c | 27 +++++--- + fs/f2fs/extent_cache.c | 56 +++++++++------- + fs/f2fs/f2fs.h | 72 ++++++++++++++------ + fs/f2fs/file.c | 70 +++++++++++--------- + fs/f2fs/gc.c | 21 ++++-- + fs/f2fs/gc.h | 5 +- + fs/f2fs/hash.c | 5 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/namei.c | 11 ++- + fs/f2fs/node.c | 49 ++++++++++---- + fs/f2fs/node.h | 5 +- + fs/f2fs/recovery.c | 41 +++++++++--- + fs/f2fs/segment.c | 95 +++++++++++++------------- + fs/f2fs/segment.h | 5 +- + fs/f2fs/shrinker.c | 5 +- + fs/f2fs/super.c | 114 +++++++++++++++++++++++--------- + fs/f2fs/sysfs.c | 10 +-- + fs/f2fs/trace.c | 5 +- + fs/f2fs/trace.h | 5 +- + fs/f2fs/xattr.c | 5 +- + fs/f2fs/xattr.h | 5 +- + include/linux/f2fs_fs.h | 5 +- + 30 files changed, 440 insertions(+), 297 deletions(-) +Merging fuse/for-next (e52a8250480a fuse: realloc page array) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/Makefile | 2 +- + fs/fuse/control.c | 34 ++- + fs/fuse/dev.c | 221 +++++++++++------- + fs/fuse/dir.c | 293 +++--------------------- + fs/fuse/file.c | 156 ++++++++++--- + fs/fuse/fuse_i.h | 118 ++++++++-- + fs/fuse/inode.c | 49 ++-- + fs/fuse/readdir.c | 569 ++++++++++++++++++++++++++++++++++++++++++++++ + include/uapi/linux/fuse.h | 116 ++++++---- + 9 files changed, 1094 insertions(+), 464 deletions(-) + create mode 100644 fs/fuse/readdir.c +Merging jfs/jfs-next (1390643d1d5c jfs: remove redundant dquot_initialize() in jfs_evict_inode()) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 4 ++++ + fs/jfs/inode.c | 1 - + fs/jfs/super.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging nfs/linux-next (c7944ebb9ce9 NFSv4: Fix lookup revalidate of regular files) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/delegation.c | 11 +- + fs/nfs/dir.c | 295 ++++---- + fs/nfs/filelayout/filelayout.c | 1 + + fs/nfs/flexfilelayout/flexfilelayout.c | 1 + + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 +- + fs/nfs/inode.c | 70 +- + fs/nfs/nfs3proc.c | 5 + + fs/nfs/nfs3xdr.c | 10 +- + fs/nfs/nfs4_fs.h | 3 +- + fs/nfs/nfs4client.c | 16 +- + fs/nfs/nfs4proc.c | 53 +- + fs/nfs/nfs4state.c | 254 ++++--- + fs/nfs/pagelist.c | 13 +- + fs/nfs/pnfs.c | 16 +- + fs/nfs/pnfs.h | 1 + + fs/nfs/read.c | 10 +- + include/linux/nfs_fs.h | 2 + + include/linux/nfs_fs_sb.h | 3 + + include/linux/nfs_xdr.h | 28 +- + include/linux/sunrpc/auth.h | 2 + + include/linux/sunrpc/auth_gss.h | 1 + + include/linux/sunrpc/bc_xprt.h | 1 + + include/linux/sunrpc/gss_krb5.h | 3 +- + include/linux/sunrpc/sched.h | 10 +- + include/linux/sunrpc/svc_xprt.h | 1 - + include/linux/sunrpc/xdr.h | 11 +- + include/linux/sunrpc/xprt.h | 35 +- + include/linux/sunrpc/xprtsock.h | 36 +- + include/trace/events/sunrpc.h | 37 +- + net/sunrpc/auth.c | 138 ++-- + net/sunrpc/auth_gss/auth_gss.c | 41 ++ + net/sunrpc/auth_gss/gss_krb5_seal.c | 37 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +- + net/sunrpc/auth_gss/gss_mech_switch.c | 28 +- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 1 + + net/sunrpc/backchannel_rqst.c | 1 - + net/sunrpc/clnt.c | 174 +++-- + net/sunrpc/sched.c | 178 +++-- + net/sunrpc/socklib.c | 10 +- + net/sunrpc/svc_xprt.c | 2 - + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xdr.c | 34 + + net/sunrpc/xprt.c | 894 ++++++++++++++++------- + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 12 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 14 +- + net/sunrpc/xprtrdma/transport.c | 10 +- + net/sunrpc/xprtsock.c | 1063 ++++++++++++---------------- + 48 files changed, 2028 insertions(+), 1558 deletions(-) +Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (7d20b6a2728f nfsd: remove set but not used variable 'dirp') +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/netns.h | 8 ++ + fs/nfsd/nfs4callback.c | 98 +++++++++++++++++ + fs/nfsd/nfs4proc.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++--- + fs/nfsd/nfs4state.c | 38 ++++++- + fs/nfsd/nfs4xdr.c | 50 +++++++-- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/state.h | 10 ++ + fs/nfsd/vfs.c | 2 - + fs/nfsd/xdr4.h | 28 +++++ + fs/nfsd/xdr4cb.h | 10 ++ + 10 files changed, 508 insertions(+), 26 deletions(-) +Merging orangefs/for-next (a3bb1b184669 Orangefs: some error code paths missed kmem_cache_free to bad effect.) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/acl.c | 4 ++++ + fs/orangefs/namei.c | 6 +++--- + fs/orangefs/orangefs-sysfs.c | 2 +- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging overlayfs/overlayfs-next (69383c5913a5 ovl: make symbol 'ovl_aops' static) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/vfs.c +Merge made by the 'recursive' strategy. + fs/ioctl.c | 2 +- + fs/nfsd/vfs.c | 3 ++- + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/file.c | 2 ++ + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/util.c | 3 ++- + fs/read_write.c | 17 +++++++++++++++-- + include/linux/fs.h | 17 +++-------------- + 8 files changed, 27 insertions(+), 21 deletions(-) +Merging ubifs/linux-next (f061c1cc404a Revert "ubifs: xattr: Don't operate on deleted inodes") +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (76b600d46911 9p: potential NULL dereference) +$ git merge v9fs/9p-next +Removing net/9p/util.c +Merge made by the 'recursive' strategy. + fs/9p/acl.c | 2 +- + fs/9p/v9fs.c | 21 ++ + fs/9p/v9fs.h | 1 + + fs/9p/vfs_dir.c | 19 +- + fs/9p/vfs_file.c | 24 ++- + include/net/9p/9p.h | 12 +- + include/net/9p/client.h | 71 +++---- + net/9p/Makefile | 1 - + net/9p/client.c | 551 ++++++++++++++++++++++++------------------------ + net/9p/mod.c | 9 +- + net/9p/protocol.c | 20 +- + net/9p/trans_fd.c | 45 ++-- + net/9p/trans_rdma.c | 37 ++-- + net/9p/trans_virtio.c | 44 ++-- + net/9p/trans_xen.c | 17 +- + net/9p/util.c | 140 ------------ + 16 files changed, 466 insertions(+), 548 deletions(-) + delete mode 100644 net/9p/util.c +Merging xfs/for-next (e55ec4ddbef9 xfs: fix error handling in xfs_bmap_extents_to_btree) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/iomap.c | 2 +- + fs/xfs/libxfs/xfs_attr.c | 28 +++----- + fs/xfs/libxfs/xfs_attr_remote.c | 10 +-- + fs/xfs/libxfs/xfs_bmap.c | 24 +++---- + fs/xfs/libxfs/xfs_format.h | 2 + + fs/xfs/libxfs/xfs_inode_buf.c | 30 +++++++++ + fs/xfs/scrub/alloc.c | 1 - + fs/xfs/scrub/inode.c | 4 +- + fs/xfs/xfs_bmap_util.c | 20 ++---- + fs/xfs/xfs_buf_item.c | 119 ++++++++++++++++++---------------- + fs/xfs/xfs_buf_item.h | 1 + + fs/xfs/xfs_inode.c | 10 +-- + fs/xfs/xfs_iops.c | 12 +++- + fs/xfs/xfs_log_recover.c | 10 --- + fs/xfs/xfs_reflink.c | 137 ++++++++++++++++++++++++---------------- + fs/xfs/xfs_trace.h | 1 - + fs/xfs/xfs_trans.c | 10 ++- + fs/xfs/xfs_trans_buf.c | 99 +++++++---------------------- + 18 files changed, 256 insertions(+), 264 deletions(-) +Merging file-locks/locks-next (10f3e23f07cb Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (f022b08a0a9b Merge branches 'work.mount', 'work.alpha' and 'work.compat' into for-next) +$ git merge vfs/for-next +Removing samples/statx/Makefile +Auto-merging net/socket.c +Auto-merging mm/shmem.c +Auto-merging include/linux/fs.h +Auto-merging fs/udf/super.c +Auto-merging fs/ubifs/super.c +Auto-merging fs/super.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/jfs/super.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/control.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/cifs/cifs_dfs_ref.c +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/staging/erofs/super.c +Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/mount_api.txt | 741 +++++++++++++++++++++++++ + arch/alpha/kernel/entry.S | 53 +- + arch/alpha/kernel/systbls.S | 318 +++++------ + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/arm/kvm/Kconfig | 1 - + arch/arm64/kvm/Kconfig | 1 - + arch/ia64/kernel/perfmon.c | 3 +- + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/s390/hypfs/inode.c | 7 +- + arch/s390/kvm/Kconfig | 1 - + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/x86/Kconfig | 1 - + arch/x86/entry/syscalls/syscall_32.tbl | 7 + + arch/x86/entry/syscalls/syscall_64.tbl | 7 + + arch/x86/kernel/cpu/intel_rdt.h | 15 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 183 +++--- + arch/x86/kernel/setup.c | 1 + + arch/x86/kvm/Kconfig | 1 - + drivers/base/Kconfig | 1 - + drivers/base/devtmpfs.c | 7 +- + drivers/char/tpm/Kconfig | 1 - + drivers/dax/super.c | 2 +- + drivers/dma-buf/Kconfig | 1 - + drivers/gpio/Kconfig | 1 - + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/i915/i915_gemfs.c | 2 +- + drivers/iio/Kconfig | 1 - + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/hw/qib/qib_fs.c | 7 +- + drivers/misc/cxl/api.c | 3 +- + drivers/misc/ibmasm/ibmasmfs.c | 11 +- + drivers/mtd/mtdsuper.c | 26 +- + drivers/oprofile/oprofilefs.c | 8 +- + drivers/scsi/cxlflash/ocxl_hw.c | 2 +- + drivers/staging/erofs/super.c | 13 +- + drivers/usb/gadget/function/f_fs.c | 7 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + drivers/vfio/Kconfig | 1 - + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/xenfs/super.c | 7 +- + fs/9p/vfs_super.c | 2 +- + fs/Kconfig | 7 + + fs/Makefile | 5 +- + fs/adfs/super.c | 9 +- + fs/affs/super.c | 13 +- + fs/afs/internal.h | 10 +- + fs/afs/mntpt.c | 147 ++--- + fs/afs/super.c | 634 ++++++++++++++------- + fs/afs/volume.c | 4 +- + fs/aio.c | 3 +- + fs/anon_inodes.c | 3 +- + fs/autofs/autofs_i.h | 2 +- + fs/autofs/init.c | 4 +- + fs/autofs/inode.c | 3 +- + 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/super.c | 3 +- + fs/cifs/cifs_dfs_ref.c | 3 +- + fs/cifs/cifsfs.c | 18 +- + fs/coda/inode.c | 11 +- + fs/compat_ioctl.c | 70 +-- + fs/configfs/mount.c | 7 +- + fs/cramfs/inode.c | 17 +- + 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 | 9 +- + fs/filesystems.c | 4 + + fs/freevxfs/vxfs_super.c | 12 +- + fs/fs_context.c | 792 ++++++++++++++++++++++++++ + fs/fs_parser.c | 555 +++++++++++++++++++ + fs/fsopen.c | 563 +++++++++++++++++++ + fs/fuse/control.c | 9 +- + fs/fuse/inode.c | 16 +- + 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 | 454 +++++++++------ + fs/internal.h | 19 +- + fs/isofs/inode.c | 11 +- + fs/jffs2/super.c | 10 +- + fs/jfs/super.c | 11 +- + fs/kernfs/mount.c | 103 ++-- + fs/libfs.c | 20 +- + fs/minix/inode.c | 14 +- + fs/namei.c | 4 +- + fs/namespace.c | 888 ++++++++++++++++++++++-------- + fs/nfs/internal.h | 4 +- + fs/nfs/namespace.c | 3 +- + fs/nfs/nfs4namespace.c | 3 +- + fs/nfs/nfs4super.c | 27 +- + fs/nfs/super.c | 22 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nilfs2/super.c | 10 +- + fs/notify/fanotify/Kconfig | 1 - + fs/notify/inotify/Kconfig | 1 - + 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/openpromfs/inode.c | 11 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/super.c | 5 +- + fs/overlayfs/super.c | 11 +- + fs/pipe.c | 3 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 49 +- + fs/proc/internal.h | 5 +- + fs/proc/root.c | 253 +++++++-- + 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 | 587 ++++++++++++++++++++ + fs/super.c | 486 ++++++++++++---- + 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/debugfs.h | 8 +- + include/linux/errno.h | 1 + + include/linux/fs.h | 52 +- + include/linux/fs_context.h | 215 ++++++++ + include/linux/fs_parser.h | 119 ++++ + include/linux/fsinfo.h | 41 ++ + include/linux/kernfs.h | 43 +- + include/linux/lsm_hooks.h | 84 ++- + 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 | 70 ++- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 13 + + include/uapi/linux/fcntl.h | 2 + + include/uapi/linux/fs.h | 82 ++- + include/uapi/linux/fsinfo.h | 303 ++++++++++ + include/uapi/linux/mount.h | 75 +++ + init/Kconfig | 10 - + init/do_mounts.c | 5 +- + init/do_mounts_initrd.c | 1 + + ipc/mqueue.c | 106 +++- + ipc/namespace.c | 2 +- + kernel/bpf/inode.c | 7 +- + kernel/cgroup/cgroup-internal.h | 50 +- + kernel/cgroup/cgroup-v1.c | 413 ++++++++------ + kernel/cgroup/cgroup.c | 291 +++++++--- + kernel/cgroup/cpuset.c | 68 ++- + kernel/trace/trace.c | 7 +- + mm/shmem.c | 10 +- + mm/zsmalloc.c | 3 +- + net/bluetooth/bnep/sock.c | 19 +- + net/bluetooth/cmtp/sock.c | 19 +- + net/bluetooth/hidp/core.c | 10 +- + net/bluetooth/hidp/hidp.h | 2 +- + net/bluetooth/hidp/sock.c | 79 ++- + net/socket.c | 3 +- + net/sunrpc/rpc_pipe.c | 7 +- + samples/Kconfig | 10 +- + samples/Makefile | 2 +- + samples/statx/Makefile | 7 - + samples/vfs/Makefile | 16 + + samples/vfs/test-fs-query.c | 138 +++++ + samples/vfs/test-fsinfo.c | 589 ++++++++++++++++++++ + samples/vfs/test-fsmount.c | 118 ++++ + samples/{statx => vfs}/test-statx.c | 0 + security/apparmor/apparmorfs.c | 8 +- + security/apparmor/include/mount.h | 11 +- + security/apparmor/lsm.c | 111 +++- + security/apparmor/mount.c | 47 ++ + security/inode.c | 7 +- + security/security.c | 64 ++- + security/selinux/hooks.c | 388 +++++++++---- + security/selinux/include/security.h | 16 +- + security/selinux/selinuxfs.c | 8 +- + security/smack/smack.h | 21 +- + security/smack/smack_lsm.c | 367 ++++++++++-- + security/smack/smackfs.c | 9 +- + security/tomoyo/common.h | 3 + + security/tomoyo/mount.c | 46 ++ + security/tomoyo/tomoyo.c | 19 +- + 211 files changed, 9848 insertions(+), 2330 deletions(-) + create mode 100644 Documentation/filesystems/mount_api.txt + create mode 100644 fs/fs_context.c + create mode 100644 fs/fs_parser.c + create mode 100644 fs/fsopen.c + create mode 100644 include/linux/fs_context.h + create mode 100644 include/linux/fs_parser.h + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 include/uapi/linux/mount.h + delete mode 100644 samples/statx/Makefile + create mode 100644 samples/vfs/Makefile + create mode 100644 samples/vfs/test-fs-query.c + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-fsmount.c + rename samples/{statx => vfs}/test-statx.c (100%) +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 (a6ae928c2583 Revert "printk: make sure to print log on console.") +$ git merge printk/for-next +Already up to date. +Merging pci/next (b51b273e4c5e Merge branch 'remotes/lorenzo/pci/mediatek') +$ git merge pci/next +Auto-merging include/linux/acpi.h +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/net/ethernet/sfc/falcon/efx.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_pci.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Merge made by the 'recursive' strategy. + Documentation/PCI/pci-error-recovery.txt | 35 +-- + Documentation/devicetree/bindings/pci/ti-pci.txt | 5 + + arch/arm64/kernel/pci.c | 5 +- + arch/powerpc/include/asm/pnv-pci.h | 2 +- + arch/x86/pci/acpi.c | 2 +- + drivers/acpi/pci_root.c | 17 +- + drivers/acpi/property.c | 97 +++++-- + drivers/acpi/x86/apple.c | 2 +- + drivers/crypto/qat/qat_common/adf_aer.c | 1 - + drivers/dma/ioat/init.c | 6 - + drivers/gpio/gpiolib-acpi.c | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 1 - + drivers/infiniband/hw/qib/qib_pcie.c | 1 - + drivers/net/ethernet/atheros/alx/main.c | 2 - + drivers/net/ethernet/broadcom/bnx2.c | 7 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 - + drivers/net/ethernet/emulex/benet/be_main.c | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 2 - + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 - + drivers/net/ethernet/intel/igb/igb_main.c | 9 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - + drivers/net/ethernet/sfc/efx.c | 7 - + drivers/net/ethernet/sfc/falcon/efx.c | 7 - + drivers/nvme/host/pci.c | 1 - + drivers/pci/controller/dwc/pci-dra7xx.c | 11 +- + drivers/pci/controller/dwc/pci-imx6.c | 152 ++++++++++- + drivers/pci/controller/dwc/pcie-qcom.c | 56 ++-- + drivers/pci/controller/pci-host-common.c | 8 - + drivers/pci/controller/pcie-cadence-host.c | 7 - + drivers/pci/controller/pcie-cadence.c | 20 +- + drivers/pci/controller/pcie-iproc.c | 8 - + drivers/pci/controller/pcie-mediatek.c | 4 +- + drivers/pci/controller/pcie-mobiveil.c | 7 - + drivers/pci/controller/pcie-xilinx-nwl.c | 9 - + drivers/pci/controller/pcie-xilinx.c | 7 - + drivers/pci/hotplug/TODO | 74 ++++++ + drivers/pci/hotplug/acpiphp.h | 10 +- + drivers/pci/hotplug/acpiphp_core.c | 36 +-- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpci_hotplug.h | 11 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 105 ++------ + drivers/pci/hotplug/cpci_hotplug_pci.c | 6 +- + drivers/pci/hotplug/cpqphp.h | 9 +- + drivers/pci/hotplug/cpqphp_core.c | 61 +---- + drivers/pci/hotplug/cpqphp_ctrl.c | 31 +-- + drivers/pci/hotplug/ibmphp.h | 9 +- + drivers/pci/hotplug/ibmphp_core.c | 121 +++------ + drivers/pci/hotplug/ibmphp_ebda.c | 70 +---- + drivers/pci/hotplug/pci_hotplug_core.c | 53 ++-- + drivers/pci/hotplug/pciehp.h | 133 +++++----- + drivers/pci/hotplug/pciehp_core.c | 168 ++++++------ + drivers/pci/hotplug/pciehp_ctrl.c | 263 +++++++++---------- + drivers/pci/hotplug/pciehp_hpc.c | 184 ++++++-------- + drivers/pci/hotplug/pciehp_pci.c | 41 +-- + drivers/pci/hotplug/pnv_php.c | 38 ++- + drivers/pci/hotplug/rpaphp.h | 10 +- + drivers/pci/hotplug/rpaphp_core.c | 20 +- + drivers/pci/hotplug/rpaphp_pci.c | 11 +- + drivers/pci/hotplug/rpaphp_slot.c | 22 +- + drivers/pci/hotplug/s390_pci_hpc.c | 44 +--- + drivers/pci/hotplug/sgi_hotplug.c | 63 ++--- + drivers/pci/hotplug/shpchp.h | 8 +- + drivers/pci/hotplug/shpchp_core.c | 48 +--- + drivers/pci/hotplug/shpchp_ctrl.c | 21 +- + drivers/pci/msi.c | 9 +- + drivers/pci/pci-acpi.c | 62 ++++- + drivers/pci/pci.c | 112 ++++++-- + drivers/pci/pci.h | 77 +++++- + drivers/pci/pcie/aer.c | 25 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/pcie/dpc.c | 72 +++++- + drivers/pci/pcie/err.c | 281 +++++---------------- + drivers/pci/pcie/pme.c | 30 ++- + drivers/pci/pcie/portdrv.h | 28 ++ + drivers/pci/pcie/portdrv_core.c | 20 ++ + drivers/pci/pcie/portdrv_pci.c | 31 ++- + drivers/pci/probe.c | 3 +- + drivers/pci/quirks.c | 2 - + drivers/pci/remove.c | 4 +- + drivers/pci/setup-bus.c | 28 +- + drivers/pci/slot.c | 3 +- + drivers/platform/x86/asus-wmi.c | 39 +-- + drivers/platform/x86/eeepc-laptop.c | 43 +--- + drivers/scsi/aacraid/linit.c | 2 - + drivers/scsi/be2iscsi/be_main.c | 1 - + drivers/scsi/bfa/bfad.c | 2 - + drivers/scsi/csiostor/csio_init.c | 1 - + drivers/scsi/lpfc/lpfc_init.c | 8 - + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - + drivers/scsi/qla2xxx/qla_os.c | 2 - + drivers/scsi/qla4xxx/ql4_os.c | 1 - + include/acpi/acpi_bus.h | 8 +- + include/linux/acpi.h | 9 + + include/linux/pci.h | 2 + + include/linux/pci_hotplug.h | 43 +--- + include/linux/pci_ids.h | 2 - + include/uapi/linux/pci_regs.h | 1 + + 103 files changed, 1550 insertions(+), 1622 deletions(-) + create mode 100644 drivers/pci/hotplug/TODO +Merging pstore/for-next/pstore (bac6f6cda206 pstore/ram: Fix failure-path memory leak in ramoops_init) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) +Merging hid/for-next (c05be11e7762 Merge branch 'for-4.20/i2c-hid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + Documentation/input/event-codes.rst | 11 +- + drivers/hid/Kconfig | 14 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-bigbenff.c | 414 ++++++++++++++++++++++ + drivers/hid/hid-core.c | 2 +- + drivers/hid/hid-cougar.c | 66 +++- + drivers/hid/hid-ids.h | 5 +- + drivers/hid/hid-input.c | 64 +++- + drivers/hid/hid-logitech-hidpp.c | 309 ++++++++++++++-- + drivers/hid/hid-microsoft.c | 141 +++++++- + drivers/hid/hid-multitouch.c | 72 ++-- + drivers/hid/i2c-hid/Makefile | 3 + + drivers/hid/i2c-hid/{i2c-hid.c => i2c-hid-core.c} | 87 +++-- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 376 ++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.h | 20 ++ + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/ipc.c | 32 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 76 ++-- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 41 +-- + drivers/hid/intel-ish-hid/ishtp/bus.c | 52 +++ + drivers/hid/intel-ish-hid/ishtp/bus.h | 5 + + drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 49 +++ + drivers/hid/intel-ish-hid/ishtp/client.c | 24 ++ + drivers/hid/intel-ish-hid/ishtp/client.h | 5 + + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 +- + include/linux/hid.h | 28 ++ + include/uapi/linux/input-event-codes.h | 1 + + 27 files changed, 1670 insertions(+), 231 deletions(-) + create mode 100644 drivers/hid/hid-bigbenff.c + rename drivers/hid/i2c-hid/{i2c-hid.c => i2c-hid-core.c} (95%) + create mode 100644 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid.h +Merging i2c/i2c/for-next (210932079eb9 Merge branch 'i2c/for-4.20' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-designware.txt | 7 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 2 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + drivers/i2c/busses/i2c-aspeed.c | 205 +++++++++++++-------- + drivers/i2c/busses/i2c-designware-baytrail.c | 2 +- + drivers/i2c/busses/i2c-designware-common.c | 2 + + drivers/i2c/busses/i2c-designware-core.h | 8 +- + drivers/i2c/busses/i2c-designware-master.c | 2 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 86 +++++---- + drivers/i2c/busses/i2c-isch.c | 2 +- + drivers/i2c/busses/i2c-mt65xx.c | 62 ++++++- + drivers/i2c/busses/i2c-qcom-geni.c | 22 ++- + drivers/i2c/busses/i2c-scmi.c | 1 + + drivers/i2c/busses/i2c-synquacer.c | 2 +- + 14 files changed, 277 insertions(+), 127 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (7de1ab9dac8e hwmon: (ina3221) Add suspend and resume functions) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc2978.txt | 2 + + Documentation/hwmon/lm75 | 6 +- + Documentation/hwmon/ltc2978 | 5 + + Documentation/hwmon/mc13783-adc | 8 +- + MAINTAINERS | 26 +- + drivers/hwmon/aspeed-pwm-tacho.c | 2 +- + drivers/hwmon/asus_atk0110.c | 4 +- + drivers/hwmon/ibmpowernv.c | 10 +- + drivers/hwmon/iio_hwmon.c | 16 +- + drivers/hwmon/ina3221.c | 71 ++++- + drivers/hwmon/k10temp.c | 5 +- + drivers/hwmon/lm75.c | 18 +- + drivers/hwmon/lm92.c | 14 +- + drivers/hwmon/mc13783-adc.c | 14 +- + drivers/hwmon/nct6775.c | 302 +++++++++++++++------ + drivers/hwmon/npcm750-pwm-fan.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 3 +- + drivers/hwmon/pmbus/ltc2978.c | 9 +- + drivers/hwmon/pwm-fan.c | 20 +- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/hwmon/scpi-hwmon.c | 4 +- + drivers/hwmon/sht15.c | 5 +- + 22 files changed, 384 insertions(+), 164 deletions(-) +Merging jc_docs/docs-next (ff348763775e doc: Fix acronym "FEKEK" in ecryptfs) +$ git merge jc_docs/docs-next +Removing scripts/check_00index.sh +Auto-merging MAINTAINERS +Removing Documentation/x86/x86_64/00-INDEX +Removing Documentation/x86/00-INDEX +Removing Documentation/w1/slaves/00-INDEX +Removing Documentation/w1/masters/00-INDEX +Removing Documentation/w1/00-INDEX +Removing Documentation/vm/00-INDEX +Removing Documentation/virtual/kvm/00-INDEX +Removing Documentation/virtual/00-INDEX +Removing Documentation/timers/00-INDEX +Removing Documentation/sysctl/00-INDEX +Removing Documentation/spi/00-INDEX +Removing Documentation/serial/00-INDEX +Removing Documentation/scsi/00-INDEX +Removing Documentation/scheduler/00-INDEX +Removing Documentation/s390/00-INDEX +Auto-merging Documentation/process/index.rst +Removing Documentation/powerpc/00-INDEX +Removing Documentation/power/00-INDEX +Removing Documentation/parisc/00-INDEX +Removing Documentation/networking/00-INDEX +Removing Documentation/netlabel/00-INDEX +Removing Documentation/mmc/00-INDEX +Removing Documentation/mips/00-INDEX +Removing Documentation/m68k/00-INDEX +Removing Documentation/locking/00-INDEX +Removing Documentation/leds/00-INDEX +Removing Documentation/laptops/00-INDEX +Removing Documentation/kbuild/00-INDEX +Removing Documentation/isdn/00-INDEX +Removing Documentation/ioctl/00-INDEX +Removing Documentation/ide/00-INDEX +Removing Documentation/gpio/00-INDEX +Removing Documentation/fmc/00-INDEX +Removing Documentation/filesystems/nfs/00-INDEX +Removing Documentation/filesystems/00-INDEX +Removing Documentation/fb/00-INDEX +Removing Documentation/devicetree/00-INDEX +Removing Documentation/cgroup-v1/00-INDEX +Removing Documentation/cdrom/00-INDEX +Removing Documentation/blockdev/00-INDEX +Removing Documentation/block/00-INDEX +Removing Documentation/arm/00-INDEX +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/00-INDEX +Removing Documentation/PCI/00-INDEX +Removing Documentation/00-INDEX +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 428 ------------------------ + Documentation/PCI/00-INDEX | 26 -- + Documentation/RCU/00-INDEX | 34 -- + Documentation/RCU/rcu.txt | 4 - + Documentation/admin-guide/README.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/l1tf.rst | 2 +- + Documentation/arm/00-INDEX | 50 --- + Documentation/block/00-INDEX | 34 -- + Documentation/blockdev/00-INDEX | 18 - + Documentation/cdrom/00-INDEX | 11 - + Documentation/cgroup-v1/00-INDEX | 26 -- + Documentation/core-api/boot-time-mm.rst | 4 +- + Documentation/core-api/gfp_mask-from-fs-io.rst | 2 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/memory-allocation.rst | 122 +++++++ + Documentation/core-api/mm-api.rst | 2 + + Documentation/dev-tools/coccinelle.rst | 23 +- + Documentation/dev-tools/kselftest.rst | 2 +- + Documentation/devicetree/00-INDEX | 12 - + Documentation/driver-api/firewire.rst | 48 +++ + Documentation/driver-api/index.rst | 1 + + Documentation/efi-stub.txt | 17 +- + Documentation/fb/00-INDEX | 75 ----- + Documentation/fb/vesafb.txt | 4 +- + Documentation/filesystems/00-INDEX | 153 --------- + Documentation/filesystems/dax.txt | 2 +- + Documentation/filesystems/ext2.txt | 2 +- + Documentation/filesystems/nfs/00-INDEX | 26 -- + Documentation/fmc/00-INDEX | 38 --- + Documentation/gpio/00-INDEX | 4 - + Documentation/ide/00-INDEX | 14 - + Documentation/index.rst | 5 +- + Documentation/ioctl/00-INDEX | 12 - + Documentation/isdn/00-INDEX | 42 --- + Documentation/kbuild/00-INDEX | 14 - + Documentation/laptops/00-INDEX | 16 - + Documentation/leds/00-INDEX | 32 -- + Documentation/locking/00-INDEX | 16 - + Documentation/m68k/00-INDEX | 7 - + Documentation/mips/00-INDEX | 4 - + Documentation/mmc/00-INDEX | 10 - + Documentation/netlabel/00-INDEX | 10 - + Documentation/netlabel/cipso_ipv4.txt | 11 +- + Documentation/netlabel/introduction.txt | 2 +- + Documentation/networking/00-INDEX | 234 ------------- + Documentation/parisc/00-INDEX | 6 - + Documentation/power/00-INDEX | 44 --- + Documentation/powerpc/00-INDEX | 34 -- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/howto.rst | 13 +- + Documentation/process/index.rst | 1 + + Documentation/process/license-rules.rst | 2 + + Documentation/s390/00-INDEX | 28 -- + Documentation/scheduler/00-INDEX | 18 - + Documentation/scsi/00-INDEX | 108 ------ + Documentation/security/keys/ecryptfs.rst | 8 +- + Documentation/serial/00-INDEX | 16 - + Documentation/spi/00-INDEX | 16 - + Documentation/sysctl/00-INDEX | 16 - + Documentation/timers/00-INDEX | 16 - + Documentation/trace/ftrace.rst | 3 + + Documentation/virtual/00-INDEX | 11 - + Documentation/virtual/kvm/00-INDEX | 35 -- + Documentation/vm/00-INDEX | 50 --- + Documentation/vm/hmm.rst | 14 +- + Documentation/w1/00-INDEX | 10 - + Documentation/w1/masters/00-INDEX | 12 - + Documentation/w1/slaves/00-INDEX | 14 - + Documentation/x86/00-INDEX | 20 -- + Documentation/x86/x86_64/00-INDEX | 16 - + MAINTAINERS | 13 +- + README | 1 - + drivers/firewire/core-iso.c | 7 + + drivers/firewire/core-transaction.c | 10 + + include/uapi/linux/firewire-cdev.h | 22 +- + net/bridge/Kconfig | 2 +- + scripts/check_00index.sh | 67 ---- + 78 files changed, 291 insertions(+), 1949 deletions(-) + delete mode 100644 Documentation/00-INDEX + delete mode 100644 Documentation/PCI/00-INDEX + delete mode 100644 Documentation/RCU/00-INDEX + delete mode 100644 Documentation/arm/00-INDEX + delete mode 100644 Documentation/block/00-INDEX + delete mode 100644 Documentation/blockdev/00-INDEX + delete mode 100644 Documentation/cdrom/00-INDEX + delete mode 100644 Documentation/cgroup-v1/00-INDEX + create mode 100644 Documentation/core-api/memory-allocation.rst + delete mode 100644 Documentation/devicetree/00-INDEX + create mode 100644 Documentation/driver-api/firewire.rst + delete mode 100644 Documentation/fb/00-INDEX + delete mode 100644 Documentation/filesystems/00-INDEX + delete mode 100644 Documentation/filesystems/nfs/00-INDEX + delete mode 100644 Documentation/fmc/00-INDEX + delete mode 100644 Documentation/gpio/00-INDEX + delete mode 100644 Documentation/ide/00-INDEX + delete mode 100644 Documentation/ioctl/00-INDEX + delete mode 100644 Documentation/isdn/00-INDEX + delete mode 100644 Documentation/kbuild/00-INDEX + delete mode 100644 Documentation/laptops/00-INDEX + delete mode 100644 Documentation/leds/00-INDEX + delete mode 100644 Documentation/locking/00-INDEX + delete mode 100644 Documentation/m68k/00-INDEX + delete mode 100644 Documentation/mips/00-INDEX + delete mode 100644 Documentation/mmc/00-INDEX + delete mode 100644 Documentation/netlabel/00-INDEX + delete mode 100644 Documentation/networking/00-INDEX + delete mode 100644 Documentation/parisc/00-INDEX + delete mode 100644 Documentation/power/00-INDEX + delete mode 100644 Documentation/powerpc/00-INDEX + delete mode 100644 Documentation/s390/00-INDEX + delete mode 100644 Documentation/scheduler/00-INDEX + delete mode 100644 Documentation/scsi/00-INDEX + delete mode 100644 Documentation/serial/00-INDEX + delete mode 100644 Documentation/spi/00-INDEX + delete mode 100644 Documentation/sysctl/00-INDEX + delete mode 100644 Documentation/timers/00-INDEX + delete mode 100644 Documentation/virtual/00-INDEX + delete mode 100644 Documentation/virtual/kvm/00-INDEX + delete mode 100644 Documentation/vm/00-INDEX + delete mode 100644 Documentation/w1/00-INDEX + delete mode 100644 Documentation/w1/masters/00-INDEX + delete mode 100644 Documentation/w1/slaves/00-INDEX + delete mode 100644 Documentation/x86/00-INDEX + delete mode 100644 Documentation/x86/x86_64/00-INDEX + delete mode 100755 scripts/check_00index.sh +Merging v4l-dvb/master (4158757395b3 media: davinci: Fix implicit enum conversion warning) +$ git merge v4l-dvb/master +Auto-merging fs/compat_ioctl.c +Auto-merging drivers/media/platform/Kconfig +Removing drivers/media/cec/cec-edid.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/fsl-pxp.txt | 26 + + .../devicetree/bindings/media/i2c/adv748x.txt | 20 +- + .../devicetree/bindings/media/i2c/adv7604.txt | 2 +- + ...dongwoon,dw9807.txt => dongwoon,dw9807-vcm.txt} | 0 + Documentation/media/uapi/cec/cec-func-poll.rst | 3 +- + .../media/uapi/mediactl/media-ioc-device-info.rst | 1 + + .../uapi/mediactl/media-ioc-enum-entities.rst | 1 + + .../media/uapi/mediactl/media-ioc-enum-links.rst | 1 + + .../media/uapi/mediactl/media-ioc-g-topology.rst | 1 + + .../media/uapi/mediactl/media-ioc-setup-link.rst | 1 + + Documentation/media/uapi/v4l/biblio.rst | 10 - + Documentation/media/uapi/v4l/colorspaces-defs.rst | 8 +- + .../media/uapi/v4l/colorspaces-details.rst | 13 +- + Documentation/media/uapi/v4l/func-poll.rst | 3 +- + Documentation/media/uapi/v4l/meta-formats.rst | 1 + + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst | 210 +++ + Documentation/media/uapi/v4l/vidioc-cropcap.rst | 2 +- + Documentation/media/uapi/v4l/vidioc-g-crop.rst | 2 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 27 +- + Documentation/media/videodev2.h.rst.exceptions | 7 +- + MAINTAINERS | 24 +- + drivers/gpu/drm/panel/panel-lvds.c | 6 +- + drivers/media/cec/Makefile | 2 +- + drivers/media/cec/cec-adap.c | 13 + + drivers/media/cec/cec-api.c | 24 +- + drivers/media/cec/cec-core.c | 2 +- + drivers/media/cec/cec-edid.c | 155 -- + drivers/media/common/b2c2/flexcop-i2c.c | 12 +- + drivers/media/common/cx2341x.c | 2 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 8 +- + drivers/media/common/siano/smscoreapi.c | 4 +- + drivers/media/common/siano/smsir.c | 2 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 262 +-- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 11 +- + drivers/media/common/videobuf2/videobuf2-core.c | 9 + + drivers/media/dvb-core/dmxdev.c | 1 + + drivers/media/dvb-core/dvb_frontend.c | 2 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 23 +- + drivers/media/dvb-frontends/Kconfig | 10 + + drivers/media/dvb-frontends/Makefile | 1 + + drivers/media/dvb-frontends/au8522_decoder.c | 10 +- + drivers/media/dvb-frontends/au8522_priv.h | 9 +- + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 3 +- + drivers/media/dvb-frontends/cxd2099.h | 1 + + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/dvb-frontends/dibx000_common.c | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 10 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/lnbh29.c | 168 ++ + drivers/media/dvb-frontends/lnbh29.h | 36 + + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mt312.c | 9 +- + drivers/media/dvb-frontends/mxl5xx.c | 5 +- + drivers/media/dvb-frontends/mxl5xx.h | 22 + + drivers/media/dvb-frontends/mxl5xx_defs.h | 1 + + drivers/media/dvb-frontends/mxl5xx_regs.h | 1 + + drivers/media/dvb-frontends/rtl2832_sdr.c | 10 +- + drivers/media/dvb-frontends/s5h1420.c | 2 +- + drivers/media/dvb-frontends/stv0910.c | 3 +- + drivers/media/dvb-frontends/stv0910.h | 18 + + drivers/media/dvb-frontends/stv0910_regs.h | 1 + + drivers/media/dvb-frontends/stv6111.c | 4 +- + drivers/media/dvb-frontends/stv6111.h | 16 + + drivers/media/dvb-frontends/tc90522.c | 2 +- + drivers/media/dvb-frontends/ts2020.c | 2 +- + drivers/media/dvb-frontends/zd1301_demod.c | 3 +- + drivers/media/dvb-frontends/zl10039.c | 5 +- + drivers/media/firewire/firedtv-fe.c | 2 +- + drivers/media/i2c/Kconfig | 2 + + drivers/media/i2c/ad5820.c | 2 +- + drivers/media/i2c/adv7180.c | 11 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 6 +- + drivers/media/i2c/adv748x/adv748x-core.c | 8 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 6 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 6 +- + drivers/media/i2c/adv748x/adv748x.h | 6 +- + drivers/media/i2c/adv7511.c | 6 +- + drivers/media/i2c/adv7604.c | 6 +- + drivers/media/i2c/adv7842.c | 13 +- + drivers/media/i2c/cs53l32a.c | 2 +- + drivers/media/i2c/dw9807-vcm.c | 1 - + drivers/media/i2c/imx274.c | 165 +- + drivers/media/i2c/lm3560.c | 3 +- + drivers/media/i2c/lm3646.c | 3 +- + drivers/media/i2c/m5mols/m5mols_core.c | 2 +- + drivers/media/i2c/max2175.c | 12 +- + drivers/media/i2c/max2175.h | 12 +- + drivers/media/i2c/msp3400-driver.c | 8 +- + drivers/media/i2c/msp3400-driver.h | 8 +- + drivers/media/i2c/noon010pc30.c | 2 +- + drivers/media/i2c/ov13858.c | 12 +- + drivers/media/i2c/ov2680.c | 16 +- + drivers/media/i2c/ov2685.c | 2 +- + drivers/media/i2c/ov5640.c | 296 ++-- + drivers/media/i2c/ov5670.c | 12 +- + drivers/media/i2c/ov5695.c | 2 +- + drivers/media/i2c/ov772x.c | 193 +-- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/ov9650.c | 159 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +- + drivers/media/i2c/s5k4ecgx.c | 2 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/saa7115.c | 24 +- + drivers/media/i2c/saa7127.c | 4 +- + drivers/media/i2c/smiapp/smiapp-core.c | 10 +- + drivers/media/i2c/sr030pc30.c | 3 +- + drivers/media/i2c/tc358743.c | 6 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp5150.c | 557 +++++-- + drivers/media/i2c/tvp5150_reg.h | 3 + + drivers/media/i2c/video-i2c.c | 8 +- + drivers/media/media-device.c | 28 +- + drivers/media/media-entity.c | 26 + + drivers/media/pci/bt8xx/bttv-driver.c | 11 +- + drivers/media/pci/bt8xx/bttv-i2c.c | 6 +- + drivers/media/pci/bt8xx/bttv-input.c | 2 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 3 +- + drivers/media/pci/cobalt/cobalt-alsa-main.c | 2 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 4 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 23 +- + drivers/media/pci/cx18/cx18-alsa-main.c | 2 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 2 +- + drivers/media/pci/cx18/cx18-cards.c | 8 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-i2c.c | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 8 +- + drivers/media/pci/cx23885/altera-ci.c | 10 + + drivers/media/pci/cx23885/cx23885-417.c | 8 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 4 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 54 +- + drivers/media/pci/cx23885/cx23885-i2c.c | 4 +- + drivers/media/pci/cx23885/cx23885-ioctl.c | 4 +- + drivers/media/pci/cx23885/cx23885-video.c | 15 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 8 +- + drivers/media/pci/cx25821/cx25821-i2c.c | 2 +- + drivers/media/pci/cx25821/cx25821-video.c | 10 +- + drivers/media/pci/cx88/cx88-alsa.c | 6 +- + drivers/media/pci/cx88/cx88-blackbird.c | 6 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-i2c.c | 4 +- + drivers/media/pci/cx88/cx88-input.c | 4 +- + drivers/media/pci/cx88/cx88-video.c | 12 +- + drivers/media/pci/cx88/cx88-vp3054-i2c.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-ci.c | 4 +- + drivers/media/pci/ddbridge/ddbridge-ci.h | 4 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 6 +- + drivers/media/pci/ddbridge/ddbridge-hw.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-hw.h | 2 +- + drivers/media/pci/ddbridge/ddbridge-i2c.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-i2c.h | 4 +- + drivers/media/pci/ddbridge/ddbridge-io.h | 2 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 4 +- + drivers/media/pci/ddbridge/ddbridge-max.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-max.h | 2 +- + drivers/media/pci/ddbridge/ddbridge-regs.h | 5 +- + drivers/media/pci/ddbridge/ddbridge-sx8.c | 4 +- + drivers/media/pci/ddbridge/ddbridge.h | 5 +- + drivers/media/pci/dm1105/dm1105.c | 5 +- + drivers/media/pci/dt3155/dt3155.c | 8 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 14 +- + drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 2 +- + drivers/media/pci/ivtv/ivtv-cards.c | 12 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 4 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 42 +- + drivers/media/pci/ivtv/ivtv-streams.c | 9 + + drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/media/pci/meye/meye.c | 12 +- + drivers/media/pci/ngene/ngene-i2c.c | 2 +- + drivers/media/pci/pluto2/pluto2.c | 2 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/pt3/pt3.c | 2 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 8 +- + drivers/media/pci/saa7134/saa7134-cards.c | 15 + + drivers/media/pci/saa7134/saa7134-core.c | 9 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7134/saa7134-i2c.c | 2 +- + drivers/media/pci/saa7134/saa7134-input.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 15 +- + drivers/media/pci/saa7134/saa7134.h | 8 +- + drivers/media/pci/saa7146/mxb.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 10 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 10 +- + drivers/media/pci/saa7164/saa7164-i2c.c | 2 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 4 +- + drivers/media/pci/smipcie/smipcie-main.c | 12 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 8 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 6 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 6 +- + drivers/media/pci/ttpci/av7110.c | 3 +- + drivers/media/pci/ttpci/av7110_av.c | 58 +- + drivers/media/pci/ttpci/av7110_v4l.c | 2 +- + drivers/media/pci/ttpci/budget-core.c | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 2 +- + drivers/media/pci/tw68/tw68-video.c | 6 +- + drivers/media/pci/tw686x/tw686x-audio.c | 8 +- + drivers/media/pci/tw686x/tw686x-video.c | 4 +- + drivers/media/platform/Kconfig | 9 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/am437x/am437x-vpfe.c | 9 +- + drivers/media/platform/atmel/atmel-isc.c | 8 +- + drivers/media/platform/atmel/atmel-isi.c | 10 +- + drivers/media/platform/coda/coda-common.c | 14 +- + drivers/media/platform/davinci/vpbe_display.c | 10 +- + drivers/media/platform/davinci/vpbe_venc.c | 2 +- + drivers/media/platform/davinci/vpfe_capture.c | 6 +- + drivers/media/platform/davinci/vpif_capture.c | 15 +- + drivers/media/platform/davinci/vpif_display.c | 9 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- + drivers/media/platform/exynos4-is/common.c | 4 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 6 +- + drivers/media/platform/exynos4-is/media-dev.c | 8 +- + drivers/media/platform/fsl-viu.c | 8 +- + drivers/media/platform/imx-pxp.c | 1753 ++++++++++++++++++++ + drivers/media/platform/imx-pxp.h | 1685 +++++++++++++++++++ + drivers/media/platform/m2m-deinterlace.c | 8 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 12 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 5 +- + drivers/media/platform/mx2_emmaprp.c | 2 +- + drivers/media/platform/omap/omap_vout.c | 10 +- + drivers/media/platform/omap3isp/isp.c | 2 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/ispccp2.c | 2 +- + drivers/media/platform/omap3isp/ispcsi2.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 2 +- + drivers/media/platform/omap3isp/ispresizer.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 8 +- + drivers/media/platform/pxa_camera.c | 8 +- + drivers/media/platform/qcom/camss/camss-video.c | 8 +- + drivers/media/platform/qcom/camss/camss.c | 2 +- + drivers/media/platform/qcom/venus/helpers.c | 2 +- + drivers/media/platform/qcom/venus/vdec.c | 8 +- + drivers/media/platform/qcom/venus/venc.c | 8 +- + drivers/media/platform/rcar-vin/rcar-core.c | 4 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 8 +- + drivers/media/platform/rcar_drif.c | 4 +- + drivers/media/platform/rcar_fdp1.c | 6 +- + drivers/media/platform/rcar_jpu.c | 10 +- + drivers/media/platform/renesas-ceu.c | 6 +- + drivers/media/platform/rockchip/rga/rga.c | 6 +- + drivers/media/platform/s3c-camif/camif-capture.c | 10 +- + drivers/media/platform/s3c-camif/camif-core.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 10 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 6 +- + drivers/media/platform/sh_veu.c | 9 +- + drivers/media/platform/sh_vou.c | 10 +- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 6 +- + drivers/media/platform/soc_camera/soc_camera.c | 8 +- + .../platform/soc_camera/soc_camera_platform.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 4 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 4 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 10 +- + drivers/media/platform/ti-vpe/cal.c | 26 +- + drivers/media/platform/via-camera.c | 10 +- + drivers/media/platform/vicodec/Kconfig | 2 +- + drivers/media/platform/vicodec/Makefile | 2 +- + .../vicodec/{vicodec-codec.c => codec-fwht.c} | 160 +- + .../vicodec/{vicodec-codec.h => codec-fwht.h} | 82 +- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 332 ++++ + drivers/media/platform/vicodec/codec-v4l2-fwht.h | 47 + + drivers/media/platform/vicodec/vicodec-core.c | 520 +++--- + drivers/media/platform/video-mux.c | 2 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vimc/vimc-capture.c | 6 +- + drivers/media/platform/vimc/vimc-common.c | 2 +- + drivers/media/platform/vimc/vimc-core.c | 4 +- + drivers/media/platform/vimc/vimc-sensor.c | 20 + + drivers/media/platform/vivid/vivid-cec.c | 4 +- + drivers/media/platform/vivid/vivid-core.c | 4 +- + drivers/media/platform/vivid/vivid-core.h | 2 +- + drivers/media/platform/vivid/vivid-ctrls.c | 6 +- + drivers/media/platform/vivid/vivid-osd.c | 2 +- + drivers/media/platform/vivid/vivid-radio-common.c | 4 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 2 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 2 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 4 +- + drivers/media/platform/vivid/vivid-sdr-cap.c | 4 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 6 +- + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/platform/vivid/vivid-vid-out.c | 2 +- + drivers/media/platform/vsp1/vsp1_brx.c | 4 +- + drivers/media/platform/vsp1/vsp1_drm.c | 11 +- + drivers/media/platform/vsp1/vsp1_drv.c | 8 +- + drivers/media/platform/vsp1/vsp1_entity.c | 2 +- + drivers/media/platform/vsp1/vsp1_histo.c | 4 +- + drivers/media/platform/vsp1/vsp1_lif.c | 29 +- + drivers/media/platform/vsp1/vsp1_regs.h | 2 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 4 +- + drivers/media/platform/vsp1/vsp1_sru.c | 7 +- + drivers/media/platform/vsp1/vsp1_uds.c | 14 +- + drivers/media/platform/vsp1/vsp1_video.c | 13 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- + drivers/media/platform/xilinx/xilinx-dma.c | 14 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 2 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 2 +- + drivers/media/radio/dsbr100.c | 9 +- + drivers/media/radio/radio-cadet.c | 12 +- + drivers/media/radio/radio-isa.c | 10 +- + drivers/media/radio/radio-keene.c | 8 +- + drivers/media/radio/radio-ma901.c | 8 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-miropcm20.c | 10 +- + drivers/media/radio/radio-mr800.c | 8 +- + drivers/media/radio/radio-raremono.c | 8 +- + drivers/media/radio/radio-sf16fmi.c | 12 +- + drivers/media/radio/radio-sf16fmr2.c | 6 +- + drivers/media/radio/radio-shark.c | 2 +- + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/radio/radio-si476x.c | 12 +- + drivers/media/radio/radio-tea5764.c | 6 +- + drivers/media/radio/radio-tea5777.c | 12 +- + drivers/media/radio/radio-timb.c | 8 +- + drivers/media/radio/radio-wl1273.c | 12 +- + drivers/media/radio/si470x/radio-si470x-common.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 4 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- + drivers/media/radio/si4713/radio-platform-si4713.c | 6 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 6 +- + drivers/media/radio/tea575x.c | 10 +- + drivers/media/radio/tef6862.c | 2 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 13 +- + drivers/media/rc/ati_remote.c | 2 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/rc/streamzap.c | 2 +- + drivers/media/tuners/e4000.c | 2 +- + drivers/media/tuners/fc2580.c | 2 +- + drivers/media/tuners/msi001.c | 2 +- + drivers/media/tuners/mt20xx.c | 2 +- + drivers/media/tuners/si2157.c | 13 +- + drivers/media/tuners/si2157_priv.h | 9 +- + drivers/media/tuners/tuner-simple.c | 2 +- + drivers/media/usb/airspy/airspy.c | 10 +- + drivers/media/usb/au0828/au0828-core.c | 17 +- + drivers/media/usb/au0828/au0828-i2c.c | 2 +- + drivers/media/usb/au0828/au0828-video.c | 22 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 12 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-input.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 27 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 2 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 18 +- + drivers/media/usb/dvb-usb-v2/zd1301.c | 2 +- + drivers/media/usb/dvb-usb/cxusb.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 4 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 5 +- + drivers/media/usb/em28xx/em28xx-audio.c | 16 +- + drivers/media/usb/em28xx/em28xx-cards.c | 33 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 3 +- + drivers/media/usb/em28xx/em28xx-video.c | 124 +- + drivers/media/usb/em28xx/em28xx.h | 8 +- + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/go7007/go7007-v4l2.c | 16 +- + drivers/media/usb/go7007/snd-go7007.c | 8 +- + drivers/media/usb/gspca/gspca.c | 10 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sq930x.c | 2 +- + drivers/media/usb/hackrf/hackrf.c | 12 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 9 +- + drivers/media/usb/msi2500/msi2500.c | 8 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 10 +- + drivers/media/usb/pwc/pwc-if.c | 2 +- + drivers/media/usb/pwc/pwc-v4l.c | 12 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 3 +- + drivers/media/usb/s2255/s2255drv.c | 10 +- + drivers/media/usb/stk1160/stk1160-i2c.c | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 6 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 16 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 6 +- + drivers/media/usb/tm6000/tm6000-i2c.c | 4 +- + drivers/media/usb/tm6000/tm6000-video.c | 13 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 2 +- + drivers/media/usb/usbtv/usbtv-audio.c | 6 +- + drivers/media/usb/usbtv/usbtv-video.c | 14 +- + drivers/media/usb/usbvision/usbvision-core.c | 3 - + drivers/media/usb/usbvision/usbvision-video.c | 26 +- + drivers/media/usb/usbvision/usbvision.h | 1 - + drivers/media/usb/uvc/uvc_ctrl.c | 18 +- + drivers/media/usb/uvc/uvc_debugfs.c | 6 +- + drivers/media/usb/uvc/uvc_driver.c | 75 +- + drivers/media/usb/uvc/uvc_entity.c | 2 +- + drivers/media/usb/uvc/uvc_metadata.c | 11 +- + drivers/media/usb/uvc/uvc_v4l2.c | 10 +- + drivers/media/usb/uvc/uvcvideo.h | 10 +- + drivers/media/usb/zr364xx/zr364xx.c | 10 +- + drivers/media/v4l2-core/tuner-core.c | 54 +- + drivers/media/v4l2-core/v4l2-common.c | 25 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 8 +- + drivers/media/v4l2-core/v4l2-device.c | 2 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 202 ++- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 8 +- + drivers/media/v4l2-core/v4l2-mc.c | 147 +- + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 6 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 3 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 6 +- + drivers/staging/media/imx/imx-media-capture.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 5 +- + drivers/staging/media/imx/imx-media-dev.c | 4 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- + drivers/staging/media/omap4iss/Kconfig | 2 + + drivers/staging/media/omap4iss/Makefile | 3 + + drivers/staging/media/omap4iss/iss.c | 8 +- + drivers/staging/media/omap4iss/iss.h | 6 +- + drivers/staging/media/omap4iss/iss_csi2.c | 6 +- + drivers/staging/media/omap4iss/iss_csi2.h | 6 +- + drivers/staging/media/omap4iss/iss_csiphy.c | 6 +- + drivers/staging/media/omap4iss/iss_csiphy.h | 6 +- + drivers/staging/media/omap4iss/iss_ipipe.c | 8 +- + drivers/staging/media/omap4iss/iss_ipipe.h | 6 +- + drivers/staging/media/omap4iss/iss_ipipeif.c | 8 +- + drivers/staging/media/omap4iss/iss_ipipeif.h | 6 +- + drivers/staging/media/omap4iss/iss_regs.h | 6 +- + drivers/staging/media/omap4iss/iss_resizer.c | 8 +- + drivers/staging/media/omap4iss/iss_resizer.h | 6 +- + drivers/staging/media/omap4iss/iss_video.c | 16 +- + drivers/staging/media/omap4iss/iss_video.h | 6 +- + drivers/staging/media/zoran/zoran_card.c | 6 +- + drivers/staging/media/zoran/zoran_driver.c | 4 +- + drivers/video/backlight/as3711_bl.c | 7 +- + drivers/video/fbdev/sh7760fb.c | 7 +- + drivers/video/hdmi.c | 8 +- + fs/compat_ioctl.c | 131 -- + include/linux/hdmi.h | 4 +- + include/linux/platform_data/shmob_drm.h | 6 +- + include/media/cec.h | 150 +- + include/media/media-entity.h | 48 + + include/media/rcar-fcp.h | 6 +- + include/media/v4l2-common.h | 14 +- + include/media/v4l2-dv-timings.h | 17 + + include/media/v4l2-mc.h | 78 - + include/media/v4l2-rect.h | 26 + + include/media/vsp1.h | 8 +- + include/uapi/linux/videodev2.h | 31 +- + 469 files changed, 7934 insertions(+), 2924 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/fsl-pxp.txt + rename Documentation/devicetree/bindings/media/i2c/{dongwoon,dw9807.txt => dongwoon,dw9807-vcm.txt} (100%) + create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst + delete mode 100644 drivers/media/cec/cec-edid.c + create mode 100644 drivers/media/dvb-frontends/lnbh29.c + create mode 100644 drivers/media/dvb-frontends/lnbh29.h + create mode 100644 drivers/media/platform/imx-pxp.c + create mode 100644 drivers/media/platform/imx-pxp.h + rename drivers/media/platform/vicodec/{vicodec-codec.c => codec-fwht.c} (84%) + rename drivers/media/platform/vicodec/{vicodec-codec.h => codec-fwht.h} (63%) + create mode 100644 drivers/media/platform/vicodec/codec-v4l2-fwht.c + create mode 100644 drivers/media/platform/vicodec/codec-v4l2-fwht.h +Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled) +$ git merge v4l-dvb-next/master +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/display/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging fbdev/fbdev-for-next (7c968791f775 video/fbdev/stifb: Fix spelling mistake in fall-through annotation) +$ git merge fbdev/fbdev-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/fb/uvesafb.txt | 5 +++-- + MAINTAINERS | 2 +- + drivers/video/fbdev/efifb.c | 6 ++++++ + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 5 ++++- + drivers/video/fbdev/pxa168fb.c | 6 +++--- + drivers/video/fbdev/stifb.c | 2 +- + 6 files changed, 18 insertions(+), 8 deletions(-) +Merging pm/linux-next (2eb458f5f636 Merge branches 'acpi-debug' and 'acpi-soc' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/acpi/x86/apple.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-power | 2 +- + Documentation/power/swsusp.txt | 2 +- + drivers/acpi/acpi_lpss.c | 118 ++++++++++++++++++++++++++++---- + drivers/acpi/custom_method.c | 3 +- + drivers/acpi/glue.c | 2 +- + drivers/acpi/pmic/intel_pmic_bxtwc.c | 12 +--- + drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 1 + + drivers/acpi/pmic/intel_pmic_chtwc.c | 10 +-- + drivers/acpi/pmic/intel_pmic_crc.c | 16 ++--- + drivers/acpi/pmic/intel_pmic_xpower.c | 16 ++--- + drivers/acpi/pmic/tps68470_pmic.c | 2 +- + drivers/acpi/x86/apple.c | 4 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/s5pv210-cpufreq.c | 4 +- + drivers/cpuidle/cpuidle.c | 16 ++--- + drivers/cpuidle/governors/ladder.c | 2 +- + drivers/cpuidle/governors/menu.c | 2 +- + drivers/idle/intel_idle.c | 75 ++++++++++---------- + drivers/mailbox/pcc.c | 7 +- + drivers/powercap/intel_rapl.c | 73 +++++++++----------- + include/linux/acpi.h | 5 +- + include/linux/cpuidle.h | 10 --- + include/linux/platform_device.h | 1 + + kernel/power/process.c | 2 +- + 25 files changed, 213 insertions(+), 175 deletions(-) +Merging cpupower/cpupower (8a7e2d2ea080 cpupower: remove stringop-truncation waring) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/bench/parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (5ed4cecd75e9 OPP: Pass OPP table to _of_add_opp_table_v{1|2}()) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/mvebu-cpufreq.c | 9 +- + drivers/opp/core.c | 147 ++++++++++++++++++++----------- + drivers/opp/cpu.c | 15 ++-- + drivers/opp/of.c | 188 +++++++++++++++++++++------------------- + drivers/opp/opp.h | 19 ++-- + include/linux/pm_opp.h | 6 ++ + 6 files changed, 226 insertions(+), 158 deletions(-) +Merging thermal/next (d7a4303b8d1f dt-bindings: thermal: Allow multiple devices to share cooling map) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (152395fd03d4 thermal: of-thermal: disable passive polling when thermal zone is disabled) +$ git merge thermal-soc/next +Already up to date. +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 (c8b53d0c5eb8 IB/sa: simplify return code logic for ib_nl_send_msg()) +$ git merge rdma/for-next +Auto-merging include/linux/mlx5/driver.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 +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/hfi1/user_sdma.c +Auto-merging drivers/infiniband/hw/hfi1/pio.c +Auto-merging drivers/infiniband/hw/hfi1/pcie.c +Auto-merging drivers/infiniband/hw/hfi1/chip.c +Auto-merging drivers/infiniband/hw/bnxt_re/main.c +Auto-merging drivers/infiniband/core/uverbs_uapi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cache.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/cache.c +Resolved 'drivers/infiniband/core/cache.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6abe1900c142] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net | 18 + + drivers/infiniband/core/addr.c | 401 ++++++++----- + drivers/infiniband/core/cache.c | 79 ++- + drivers/infiniband/core/cm.c | 2 +- + drivers/infiniband/core/cma.c | 26 +- + drivers/infiniband/core/cma_configfs.c | 2 +- + drivers/infiniband/core/core_priv.h | 9 +- + drivers/infiniband/core/cq.c | 8 +- + drivers/infiniband/core/device.c | 145 +++-- + drivers/infiniband/core/fmr_pool.c | 5 +- + drivers/infiniband/core/iwcm.c | 2 +- + drivers/infiniband/core/mad.c | 78 +-- + drivers/infiniband/core/nldev.c | 3 +- + drivers/infiniband/core/rdma_core.c | 56 +- + drivers/infiniband/core/rdma_core.h | 1 + + drivers/infiniband/core/restrack.c | 3 +- + drivers/infiniband/core/sa_query.c | 55 +- + drivers/infiniband/core/security.c | 7 +- + drivers/infiniband/core/sysfs.c | 67 +-- + drivers/infiniband/core/umem.c | 122 ++-- + drivers/infiniband/core/umem_odp.c | 621 ++++++++++----------- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs.h | 15 +- + drivers/infiniband/core/uverbs_cmd.c | 43 +- + drivers/infiniband/core/uverbs_ioctl.c | 137 +++++ + drivers/infiniband/core/uverbs_main.c | 328 +++++++++-- + .../infiniband/core/uverbs_std_types_flow_action.c | 7 +- + drivers/infiniband/core/uverbs_uapi.c | 12 + + drivers/infiniband/core/verbs.c | 12 +- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 130 ++--- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 51 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 29 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 57 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 3 +- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/cxgb4/provider.c | 3 +- + drivers/infiniband/hw/cxgb4/qp.c | 10 +- + drivers/infiniband/hw/hfi1/Makefile | 41 +- + drivers/infiniband/hw/hfi1/affinity.c | 4 +- + drivers/infiniband/hw/hfi1/chip.c | 460 ++++----------- + drivers/infiniband/hw/hfi1/chip.h | 71 ++- + drivers/infiniband/hw/hfi1/chip_registers.h | 4 + + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/hfi1/hfi.h | 47 +- + drivers/infiniband/hw/hfi1/init.c | 107 ++-- + drivers/infiniband/hw/hfi1/msix.c | 363 ++++++++++++ + drivers/infiniband/hw/hfi1/msix.h | 64 +++ + drivers/infiniband/hw/hfi1/pcie.c | 74 +-- + drivers/infiniband/hw/hfi1/pio.c | 8 - + drivers/infiniband/hw/hfi1/qp.c | 12 +- + drivers/infiniband/hw/hfi1/sdma.c | 4 +- + drivers/infiniband/hw/hfi1/sdma.h | 13 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 123 ++-- + drivers/infiniband/hw/hfi1/user_sdma.h | 20 +- + drivers/infiniband/hw/hfi1/verbs.h | 3 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 12 +- + drivers/infiniband/hw/hns/Kconfig | 1 + + drivers/infiniband/hw/hns/hns_roce_ah.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 32 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 391 +++++++------ + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 22 + + drivers/infiniband/hw/hns/hns_roce_main.c | 116 ++-- + drivers/infiniband/hw/hns/hns_roce_mr.c | 120 ++++ + drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 3 +- + drivers/infiniband/hw/mlx4/Kconfig | 1 + + drivers/infiniband/hw/mlx4/main.c | 145 +---- + drivers/infiniband/hw/mlx4/mcg.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 5 - + drivers/infiniband/hw/mlx5/cmd.c | 129 +++++ + drivers/infiniband/hw/mlx5/cmd.h | 14 + + drivers/infiniband/hw/mlx5/cq.c | 1 + + drivers/infiniband/hw/mlx5/devx.c | 101 +++- + drivers/infiniband/hw/mlx5/flow.c | 380 ++++++++++++- + drivers/infiniband/hw/mlx5/main.c | 426 +++++++------- + drivers/infiniband/hw/mlx5/mem.c | 9 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 82 ++- + drivers/infiniband/hw/mlx5/mr.c | 12 +- + drivers/infiniband/hw/mlx5/odp.c | 123 ++-- + drivers/infiniband/hw/mlx5/qp.c | 256 ++++++--- + drivers/infiniband/hw/mlx5/srq.c | 1 + + drivers/infiniband/hw/mthca/mthca_mad.c | 5 +- + drivers/infiniband/hw/mthca/mthca_main.c | 3 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 3 +- + drivers/infiniband/hw/nes/nes.c | 3 - + drivers/infiniband/hw/nes/nes.h | 9 - + drivers/infiniband/hw/nes/nes_hw.c | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 2 - + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 3 +- + drivers/infiniband/hw/qedr/main.c | 4 +- + drivers/infiniband/hw/qedr/qedr.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 2 - + drivers/infiniband/hw/qib/qib_qp.c | 17 +- + drivers/infiniband/hw/qib/qib_verbs.h | 3 +- + drivers/infiniband/hw/usnic/usnic_debugfs.c | 3 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 37 +- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 16 +- + drivers/infiniband/hw/usnic/usnic_transport.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 91 ++- + drivers/infiniband/hw/usnic/usnic_uiom.h | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 5 +- + drivers/infiniband/sw/rdmavt/qp.c | 14 +- + drivers/infiniband/sw/rdmavt/vt.c | 3 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 39 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 3 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 35 +- + drivers/infiniband/sw/rxe/rxe_net.c | 44 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 55 +- + drivers/infiniband/sw/rxe/rxe_pool.h | 6 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 10 + + drivers/infiniband/sw/rxe/rxe_recv.c | 4 +- + drivers/infiniband/sw/rxe/rxe_req.c | 17 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 10 +- + drivers/infiniband/sw/rxe/rxe_sysfs.c | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 4 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 36 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 9 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 10 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 4 + + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 87 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 73 ++- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 81 ++- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 30 +- + include/linux/mlx5/cq.h | 1 + + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/fs.h | 20 +- + include/linux/mlx5/mlx5_ifc.h | 209 ++++--- + include/linux/mlx5/qp.h | 1 + + include/linux/mlx5/srq.h | 1 + + include/rdma/ib_addr.h | 8 +- + include/rdma/ib_umem.h | 9 +- + include/rdma/ib_umem_odp.h | 75 +-- + include/rdma/ib_verbs.h | 116 ++-- + include/rdma/rdma_cm.h | 6 +- + include/rdma/rdma_vt.h | 21 +- + include/rdma/uverbs_ioctl.h | 111 +++- + include/rdma/uverbs_std_types.h | 51 ++ + include/uapi/rdma/ib_user_verbs.h | 20 +- + include/uapi/rdma/mlx5-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 20 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 12 + + include/uapi/rdma/rdma_user_ioctl_cmds.h | 7 +- + 161 files changed, 4927 insertions(+), 3081 deletions(-) + create mode 100644 drivers/infiniband/hw/hfi1/msix.c + create mode 100644 drivers/infiniband/hw/hfi1/msix.h +Merging net-next/master (3bd09b05b068 Merge tag 'mlx5e-updates-2018-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge net-next/master +Auto-merging net/xfrm/xfrm_output.c +Removing net/xdp/xdp_umem_props.h +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/tipc/socket.c +Auto-merging net/tipc/bearer.c +Auto-merging net/rxrpc/input.c +Auto-merging net/mac80211/tx.c +Auto-merging net/ipv6/route.c +Auto-merging net/core/ethtool.c +Auto-merging net/bridge/br_netfilter_hooks.c +Auto-merging include/net/netlink.h +Auto-merging include/net/cfg80211.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mlx5/driver.h +Removing drivers/staging/fsl-dpaa2/ethernet/TODO +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/xen-netback/interface.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_iwarp.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_hsi.h +Removing drivers/net/ethernet/mscc/ocelot_dev_gmii.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/srq.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Removing drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c +Removing drivers/net/ethernet/intel/i40evf/i40evf.h +Removing drivers/net/ethernet/intel/i40evf/i40e_type.h +Removing drivers/net/ethernet/intel/i40evf/i40e_register.h +Removing drivers/net/ethernet/intel/i40evf/i40e_prototype.h +Removing drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h +Removing drivers/net/ethernet/intel/i40evf/i40e_hmc.h +Removing drivers/net/ethernet/intel/i40evf/i40e_devids.h +Removing drivers/net/ethernet/intel/i40evf/i40e_common.c +Removing drivers/net/ethernet/intel/i40evf/i40e_alloc.h +Removing drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +Removing drivers/net/ethernet/intel/i40evf/Makefile +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/cadence/macb_main.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c +Auto-merging MAINTAINERS +Removing Documentation/networking/tcp.txt +CONFLICT (modify/delete): Documentation/networking/00-INDEX deleted in HEAD and modified in net-next/master. Version net-next/master of Documentation/networking/00-INDEX left in tree. +Auto-merging Documentation/ABI/testing/sysfs-class-net +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/networking/00-INDEX +Documentation/networking/00-INDEX: needs merge +rm 'Documentation/networking/00-INDEX' +$ git commit -v -a +[master e47742c6bc83] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net | 4 +- + Documentation/ABI/testing/sysfs-class-net-dsa | 7 + + .../devicetree/bindings/net/brcm,unimac-mdio.txt | 3 + + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 143 + + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 + + .../devicetree/bindings/net/marvell-pp2.txt | 45 +- + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 21 +- + .../devicetree/bindings/net/renesas,ravb.txt | 1 + + .../devicetree/bindings/soc/fsl/cpm_qe/network.txt | 6 + + .../networking/dpaa2}/ethernet-driver.rst | 0 + Documentation/networking/dpaa2/index.rst | 1 + + Documentation/networking/{i40evf.txt => iavf.txt} | 16 +- + Documentation/networking/netvsc.txt | 9 + + Documentation/networking/tcp.txt | 101 - + MAINTAINERS | 15 +- + arch/mips/lantiq/xway/dma.c | 1 - + arch/mips/lantiq/xway/sysctrl.c | 14 +- + drivers/infiniband/hw/nes/nes_mgt.c | 8 +- + drivers/isdn/hisax/w6692.c | 2 +- + drivers/isdn/mISDN/socket.c | 3 +- + drivers/net/can/rx-offload.c | 8 +- + drivers/net/dsa/Kconfig | 8 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/Kconfig | 10 + + drivers/net/dsa/b53/Makefile | 1 + + drivers/net/dsa/b53/b53_common.c | 248 +- + drivers/net/dsa/b53/b53_priv.h | 36 + + drivers/net/dsa/b53/b53_serdes.c | 214 ++ + drivers/net/dsa/b53/b53_serdes.h | 128 + + drivers/net/dsa/b53/b53_srab.c | 215 ++ + drivers/net/dsa/bcm_sf2.c | 3 +- + drivers/net/dsa/lantiq_gswip.c | 1167 +++++++ + drivers/net/dsa/lantiq_pce.h | 153 + + drivers/net/dsa/mv88e6xxx/chip.c | 24 +- + drivers/net/dsa/mv88e6xxx/phy.c | 3 + + drivers/net/dsa/mv88e6xxx/serdes.c | 105 + + drivers/net/dsa/mv88e6xxx/serdes.h | 16 + + drivers/net/ethernet/8390/ax88796.c | 4 +- + drivers/net/ethernet/8390/etherh.c | 35 +- + drivers/net/ethernet/Kconfig | 7 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/aeroflex/greth.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 12 +- + drivers/net/ethernet/alacritech/slic.h | 1 - + drivers/net/ethernet/allwinner/sun4i-emac.c | 3 +- + drivers/net/ethernet/altera/altera_tse_main.c | 5 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 - + drivers/net/ethernet/amd/am79c961a.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 6 +- + drivers/net/ethernet/amd/au1000_eth.c | 12 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/ni65.c | 4 +- + drivers/net/ethernet/amd/sun3lance.c | 6 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 4 +- + .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 30 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 10 +- + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 5 + + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 113 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 13 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 24 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 4 + + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 41 +- + .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 6 - + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 35 +- + .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 6 - + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 + + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 + + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 163 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 130 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 233 +- + drivers/net/ethernet/aquantia/atlantic/ver.h | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 22 +- + drivers/net/ethernet/aurora/nb8800.c | 9 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 22 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 81 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 15 - + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 - + drivers/net/ethernet/broadcom/genet/bcmmii.c | 9 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 20 +- + drivers/net/ethernet/broadcom/tg3.c | 71 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 4 +- + drivers/net/ethernet/cadence/macb_main.c | 9 +- + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 547 +-- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 342 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 401 ++- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 226 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 53 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 31 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 3 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 12 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 7 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 122 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 5 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 17 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 98 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 35 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 61 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 9 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 125 +- + .../ethernet/cavium/liquidio/response_manager.c | 82 +- + .../ethernet/cavium/liquidio/response_manager.h | 4 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 42 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 238 ++ + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h | 106 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 8 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 4 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 27 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 26 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 + + drivers/net/ethernet/cortina/gemini.c | 5 +- + drivers/net/ethernet/dnet.c | 8 +- + drivers/net/ethernet/ethoc.c | 5 +- + drivers/net/ethernet/faraday/ftgmac100.c | 24 +- + drivers/net/ethernet/faraday/ftmac100.c | 7 +- + drivers/net/ethernet/freescale/Kconfig | 8 + + drivers/net/ethernet/freescale/Makefile | 2 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 14 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 28 +- + .../ethernet/freescale/dpaa2}/Makefile | 0 + .../ethernet/freescale/dpaa2}/dpaa2-eth-trace.h | 0 + .../ethernet/freescale/dpaa2}/dpaa2-eth.c | 96 +- + .../ethernet/freescale/dpaa2}/dpaa2-eth.h | 2 + + .../ethernet/freescale/dpaa2}/dpaa2-ethtool.c | 19 + + .../ethernet/freescale/dpaa2}/dpkg.h | 0 + .../ethernet/freescale/dpaa2}/dpni-cmd.h | 0 + .../ethernet/freescale/dpaa2}/dpni.c | 0 + .../ethernet/freescale/dpaa2}/dpni.h | 0 + drivers/net/ethernet/freescale/fec_main.c | 23 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 3 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 4 +- + drivers/net/ethernet/freescale/gianfar.c | 10 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 55 +- + drivers/net/ethernet/freescale/ucc_geth.c | 10 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 3 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 12 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 23 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 210 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 157 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 1 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 14 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 634 +--- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 105 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 18 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 6 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 12 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 123 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 13 +- + drivers/net/ethernet/ibm/emac/core.h | 3 + + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 1 - + drivers/net/ethernet/ibm/ibmvnic.c | 4 +- + drivers/net/ethernet/intel/Kconfig | 15 +- + drivers/net/ethernet/intel/Makefile | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 5 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- + drivers/net/ethernet/intel/i40e/Makefile | 3 +- + drivers/net/ethernet/intel/i40e/i40e.h | 19 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 437 ++- + drivers/net/ethernet/intel/i40e/i40e_main.c | 389 ++- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 201 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 94 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 443 +-- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 967 ++++++ + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 25 + + drivers/net/ethernet/intel/i40evf/Makefile | 16 - + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2717 --------------- + drivers/net/ethernet/intel/i40evf/i40e_alloc.h | 35 - + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1320 ------- + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 34 - + drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 215 -- + drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 158 - + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 130 - + drivers/net/ethernet/intel/i40evf/i40e_register.h | 313 -- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1496 -------- + drivers/net/ethernet/intel/i40evf/i40evf.h | 427 --- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 820 ----- + drivers/net/ethernet/intel/iavf/Makefile | 15 + + .../ethernet/intel/{i40evf => iavf}/i40e_adminq.c | 311 +- + .../ethernet/intel/{i40evf => iavf}/i40e_adminq.h | 35 +- + drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 530 +++ + drivers/net/ethernet/intel/iavf/iavf.h | 418 +++ + drivers/net/ethernet/intel/iavf/iavf_alloc.h | 31 + + .../{i40evf/i40evf_client.c => iavf/iavf_client.c} | 224 +- + .../{i40evf/i40evf_client.h => iavf/iavf_client.h} | 30 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 955 +++++ + drivers/net/ethernet/intel/iavf/iavf_devids.h | 12 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 1036 ++++++ + .../{i40evf/i40evf_main.c => iavf/iavf_main.c} | 1734 +++++----- + .../{i40evf/i40e_osdep.h => iavf/iavf_osdep.h} | 28 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 67 + + drivers/net/ethernet/intel/iavf/iavf_register.h | 68 + + .../{i40evf/i40e_status.h => iavf/iavf_status.h} | 8 +- + .../{i40evf/i40e_trace.h => iavf/iavf_trace.h} | 86 +- + .../intel/{i40evf/i40e_txrx.c => iavf/iavf_txrx.c} | 812 ++--- + .../intel/{i40evf/i40e_txrx.h => iavf/iavf_txrx.h} | 359 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 688 ++++ + .../i40evf_virtchnl.c => iavf/iavf_virtchnl.c} | 530 +-- + drivers/net/ethernet/intel/ice/Makefile | 1 + + drivers/net/ethernet/intel/ice/ice.h | 13 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 104 +- + drivers/net/ethernet/intel/ice/ice_common.c | 636 +++- + drivers/net/ethernet/intel/ice/ice_common.h | 21 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 43 +- + drivers/net/ethernet/intel/ice/ice_devids.h | 10 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 818 ++++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 456 ++- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 24 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 2379 +++++++++++++ + drivers/net/ethernet/intel/ice/ice_lib.h | 74 + + drivers/net/ethernet/intel/ice/ice_main.c | 3645 +++++--------------- + drivers/net/ethernet/intel/ice/ice_nvm.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 228 +- + drivers/net/ethernet/intel/ice/ice_status.h | 1 + + drivers/net/ethernet/intel/ice/ice_switch.c | 1459 ++++---- + drivers/net/ethernet/intel/ice/ice_switch.h | 53 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 1 + + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_type.h | 52 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 11 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 9 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 282 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h | 13 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 43 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 17 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 15 + + drivers/net/ethernet/intel/ixgbevf/Makefile | 1 + + drivers/net/ethernet/intel/ixgbevf/defines.h | 10 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 + + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 673 ++++ + drivers/net/ethernet/intel/ixgbevf/ipsec.h | 66 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 33 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 80 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 5 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 4 + + drivers/net/ethernet/lantiq_etop.c | 12 +- + drivers/net/ethernet/lantiq_xrx200.c | 567 +++ + drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +- + drivers/net/ethernet/marvell/mvneta.c | 43 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 28 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 443 ++- + drivers/net/ethernet/marvell/pxa168_eth.c | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 24 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 51 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 56 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 106 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 213 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 56 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 184 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 66 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 1 + + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 1 + + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 34 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 9 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 22 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 488 +-- + drivers/net/ethernet/micrel/ks8695net.c | 2 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 7 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 4 +- + drivers/net/ethernet/mscc/ocelot_dev_gmii.h | 154 - + drivers/net/ethernet/neterion/s2io.c | 7 +- + drivers/net/ethernet/neterion/s2io.h | 22 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 + + drivers/net/ethernet/neterion/vxge/vxge-config.h | 20 - + drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 3 +- + drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 32 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 34 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 44 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 46 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 50 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 8 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 50 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 12 +- + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 36 + + .../ethernet/netronome/nfp/nfpcore/nfp_cpplib.c | 12 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 32 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h | 38 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 330 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 12 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c | 269 +- + .../ethernet/netronome/nfp/nfpcore/nfp_target.c | 12 +- + drivers/net/ethernet/ni/Kconfig | 3 +- + drivers/net/ethernet/ni/nixge.c | 168 +- + drivers/net/ethernet/nxp/lpc_eth.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 248 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 11 + + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 297 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 14 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 6 +- + drivers/net/ethernet/qualcomm/qca_7k.c | 34 +- + drivers/net/ethernet/qualcomm/qca_7k.h | 2 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 1 + + drivers/net/ethernet/qualcomm/qca_spi.c | 28 +- + drivers/net/ethernet/qualcomm/qca_spi.h | 1 + + drivers/net/ethernet/rdc/r6040.c | 12 +- + drivers/net/ethernet/realtek/r8169.c | 32 +- + drivers/net/ethernet/renesas/ravb.h | 6 +- + drivers/net/ethernet/renesas/ravb_main.c | 150 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + drivers/net/ethernet/smsc/smc911x.c | 3 +- + drivers/net/ethernet/smsc/smc91x.c | 3 +- + drivers/net/ethernet/smsc/smsc911x.c | 9 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/sni_ave.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 12 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 19 + + drivers/net/ethernet/stmicro/stmmac/hwif.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +- + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 3 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 14 +- + drivers/net/ethernet/sun/sunvnet_common.h | 7 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/netcp_core.c | 22 +- + drivers/net/ethernet/ti/netcp_ethss.c | 42 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 9 +- + drivers/net/ethernet/toshiba/spider_net.c | 4 +- + drivers/net/ethernet/toshiba/tc35815.c | 8 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 12 +- + drivers/net/fddi/skfp/ecm.c | 3 - + drivers/net/fddi/skfp/h/cmtdef.h | 1 - + drivers/net/fddi/skfp/pcmplc.c | 11 - + drivers/net/geneve.c | 41 +- + drivers/net/hyperv/hyperv_net.h | 51 +- + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/hyperv/netvsc_drv.c | 58 +- + drivers/net/hyperv/rndis_filter.c | 97 +- + drivers/net/loopback.c | 6 - + drivers/net/macsec.c | 18 +- + drivers/net/net_failover.c | 8 +- + drivers/net/nlmon.c | 6 - + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/et1011c.c | 3 +- + drivers/net/phy/marvell.c | 63 +- + drivers/net/phy/mdio-bcm-unimac.c | 83 +- + drivers/net/phy/mdio_bus.c | 1 - + drivers/net/phy/mscc.c | 113 +- + drivers/net/phy/phy.c | 10 +- + drivers/net/phy/phy_device.c | 120 +- + drivers/net/phy/phylink.c | 3 + + drivers/net/phy/ste10Xp.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/tap.c | 94 +- + drivers/net/thunderbolt.c | 5 +- + drivers/net/tun.c | 267 +- + drivers/net/usb/lan78xx.c | 49 +- + drivers/net/usb/lan78xx.h | 14 +- + drivers/net/usb/usbnet.c | 1 + + drivers/net/veth.c | 37 +- + drivers/net/vsockmon.c | 14 +- + drivers/net/vxlan.c | 2 +- + drivers/net/wan/c101.c | 1 - + drivers/net/wan/fsl_ucc_hdlc.c | 26 +- + drivers/net/wan/fsl_ucc_hdlc.h | 1 + + drivers/net/wan/pci200syn.c | 1 - + drivers/net/wireless/ath/wil6210/debugfs.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 - + drivers/net/wireless/intersil/p54/txrx.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 18 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 13 +- + drivers/net/xen-netback/interface.c | 3 +- + drivers/net/xen-netback/netback.c | 3 +- + drivers/net/xen-netback/xenbus.c | 3 +- + drivers/s390/net/qeth_core.h | 38 +- + drivers/s390/net/qeth_core_main.c | 680 ++-- + drivers/s390/net/qeth_core_sys.c | 15 +- + drivers/s390/net/qeth_l2_main.c | 128 +- + drivers/s390/net/qeth_l3_main.c | 364 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 5 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 - + drivers/staging/fsl-dpaa2/Makefile | 1 - + drivers/staging/fsl-dpaa2/ethernet/TODO | 18 - + drivers/staging/mt7621-eth/mdio.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/vhost/net.c | 327 +- + drivers/vhost/vhost.c | 24 +- + include/linux/avf/virtchnl.h | 2 +- + include/linux/bpf.h | 1 + + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 8 +- + include/linux/ethtool.h | 33 +- + include/linux/ieee80211.h | 111 +- + include/linux/if_tun.h | 14 + + include/linux/ipv6.h | 3 +- + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/vport.h | 2 + + include/linux/netdevice.h | 34 +- + include/linux/phy.h | 8 + + include/linux/qed/common_hsi.h | 10 +- + include/linux/qed/iscsi_common.h | 2 +- + include/linux/rtnetlink.h | 7 + + include/linux/skbuff.h | 44 +- + include/linux/tcp.h | 2 + + include/net/act_api.h | 11 +- + include/net/cfg80211.h | 15 +- + include/net/dsa.h | 1 + + include/net/gen_stats.h | 4 + + include/net/genetlink.h | 2 +- + include/net/ieee80211_radiotap.h | 21 + + include/net/ip6_fib.h | 20 +- + include/net/ip_fib.h | 1 + + include/net/iucv/af_iucv.h | 5 + + include/net/llc.h | 1 + + include/net/mac80211.h | 84 +- + include/net/neighbour.h | 15 + + include/net/net_namespace.h | 3 + + include/net/netlink.h | 53 +- + include/net/pkt_cls.h | 2 +- + include/net/pkt_sched.h | 1 + + include/net/route.h | 5 +- + include/net/rtnetlink.h | 1 + + include/net/sch_generic.h | 54 +- + include/net/sock.h | 1 + + include/net/tcp.h | 26 +- + include/net/tls.h | 66 +- + include/net/vxlan.h | 1 - + include/net/xdp.h | 6 +- + include/net/xdp_sock.h | 120 +- + include/trace/events/tcp.h | 7 +- + include/uapi/linux/bpf.h | 26 + + include/uapi/linux/ethtool.h | 15 +- + include/uapi/linux/gen_stats.h | 1 + + include/uapi/linux/if_addr.h | 1 + + include/uapi/linux/if_arp.h | 18 +- + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/in6.h | 1 + + include/uapi/linux/neighbour.h | 1 + + include/uapi/linux/nl80211.h | 26 +- + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/pkt_sched.h | 6 +- + kernel/bpf/arraymap.c | 49 +- + kernel/bpf/hashtab.c | 31 + + kernel/bpf/sockmap.c | 6 +- + kernel/bpf/syscall.c | 9 +- + kernel/bpf/verifier.c | 264 +- + lib/nlattr.c | 152 +- + net/batman-adv/Kconfig | 11 + + net/batman-adv/Makefile | 3 + + net/batman-adv/bat_iv_ogm.c | 330 +- + net/batman-adv/debugfs.c | 37 + + net/batman-adv/debugfs.h | 6 + + net/batman-adv/hard-interface.c | 47 +- + net/batman-adv/icmp_socket.c | 3 + + net/batman-adv/log.c | 20 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/originator.c | 107 - + net/batman-adv/originator.h | 4 - + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/trace.c | 22 + + net/batman-adv/trace.h | 78 + + net/batman-adv/types.h | 62 +- + net/bridge/br.c | 16 + + net/bridge/br_arp_nd_proxy.c | 15 +- + net/bridge/br_device.c | 6 +- + net/bridge/br_fdb.c | 20 +- + net/bridge/br_if.c | 9 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_mdb.c | 6 +- + net/bridge/br_multicast.c | 54 +- + net/bridge/br_netfilter_hooks.c | 7 +- + net/bridge/br_netlink.c | 31 +- + net/bridge/br_private.h | 67 +- + net/bridge/br_sysfs_br.c | 32 +- + net/bridge/br_vlan.c | 35 +- + net/caif/cfrfml.c | 3 - + net/core/dev.c | 13 +- + net/core/ethtool.c | 158 +- + net/core/filter.c | 160 +- + net/core/flow_dissector.c | 150 +- + net/core/gen_stats.c | 73 +- + net/core/link_watch.c | 2 +- + net/core/neighbour.c | 16 +- + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 57 +- + net/core/sock.c | 2 +- + net/core/xdp.c | 53 +- + net/decnet/dn_dev.c | 2 +- + net/dsa/Kconfig | 3 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 49 + + net/dsa/dsa_priv.h | 4 + + net/dsa/legacy.c | 3 +- + net/dsa/slave.c | 28 + + net/dsa/tag_gswip.c | 109 + + net/ieee802154/6lowpan/reassembly.c | 3 +- + net/ipv4/ah4.c | 4 +- + net/ipv4/cipso_ipv4.c | 11 +- + net/ipv4/devinet.c | 62 +- + net/ipv4/esp4.c | 4 +- + net/ipv4/fib_frontend.c | 44 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/gre_demux.c | 7 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_fragment.c | 27 +- + net/ipv4/ip_gre.c | 15 +- + net/ipv4/ip_input.c | 6 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/ip_vti.c | 4 +- + net/ipv4/ipcomp.c | 4 +- + net/ipv4/ipip.c | 5 +- + net/ipv4/netfilter/ipt_rpfilter.c | 17 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 27 +- + net/ipv4/route.c | 12 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 8 +- + net/ipv4/tcp_bbr.c | 7 +- + net/ipv4/tcp_input.c | 51 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/tcp_output.c | 93 +- + net/ipv4/tcp_rate.c | 15 +- + net/ipv4/tcp_recovery.c | 5 +- + net/ipv4/tcp_timer.c | 4 +- + net/ipv6/addrconf.c | 127 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/ip6_gre.c | 26 +- + net/ipv6/ip6_input.c | 3 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ipv6_sockglue.c | 11 + + net/ipv6/mcast.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/reassembly.c | 14 +- + net/ipv6/route.c | 32 +- + net/ipv6/sit.c | 6 +- + net/iucv/af_iucv.c | 44 +- + net/llc/llc_core.c | 4 +- + net/mac80211/cfg.c | 57 +- + net/mac80211/debugfs.c | 4 + + net/mac80211/debugfs_sta.c | 364 +- + net/mac80211/driver-ops.h | 10 + + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 10 +- + net/mac80211/key.c | 111 +- + net/mac80211/main.c | 69 + + net/mac80211/mesh.c | 5 +- + net/mac80211/mlme.c | 23 +- + net/mac80211/rx.c | 43 +- + net/mac80211/spectmgmt.c | 5 +- + net/mac80211/sta_info.c | 27 +- + net/mac80211/tx.c | 75 +- + net/mac80211/util.c | 158 +- + net/mac80211/vht.c | 20 + + net/ncsi/ncsi-netlink.c | 1 - + net/netfilter/ipvs/ip_vs_core.c | 3 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netlink/af_netlink.c | 11 +- + net/nfc/nci/uart.c | 6 +- + net/openvswitch/datapath.c | 20 +- + net/openvswitch/flow.c | 22 +- + net/openvswitch/vport-internal_dev.c | 5 +- + net/packet/af_packet.c | 17 + + net/rds/rds.h | 2 +- + net/rds/recv.c | 19 +- + net/rfkill/core.c | 4 +- + net/rxrpc/input.c | 2 +- + net/sched/act_api.c | 40 +- + net/sched/act_bpf.c | 3 +- + net/sched/act_connmark.c | 14 +- + net/sched/act_csum.c | 3 +- + net/sched/act_gact.c | 9 +- + net/sched/act_ife.c | 3 +- + net/sched/act_ipt.c | 6 +- + net/sched/act_mirred.c | 8 +- + net/sched/act_nat.c | 18 +- + net/sched/act_pedit.c | 3 +- + net/sched/act_police.c | 189 +- + net/sched/act_sample.c | 3 +- + net/sched/act_simple.c | 3 +- + net/sched/act_skbedit.c | 26 +- + net/sched/act_skbmod.c | 3 +- + net/sched/act_tunnel_key.c | 3 +- + net/sched/act_vlan.c | 3 +- + net/sched/cls_api.c | 242 +- + net/sched/cls_flower.c | 20 +- + net/sched/sch_api.c | 31 +- + net/sched/sch_atm.c | 2 +- + net/sched/sch_cake.c | 6 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_cbs.c | 2 +- + net/sched/sch_drr.c | 4 +- + net/sched/sch_dsmark.c | 2 +- + net/sched/sch_fifo.c | 2 +- + net/sched/sch_fq.c | 87 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_generic.c | 52 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_hhf.c | 2 +- + net/sched/sch_htb.c | 116 +- + net/sched/sch_mq.c | 4 +- + net/sched/sch_mqprio.c | 4 +- + net/sched/sch_multiq.c | 6 +- + net/sched/sch_netem.c | 16 +- + net/sched/sch_prio.c | 6 +- + net/sched/sch_qfq.c | 4 +- + net/sched/sch_red.c | 4 +- + net/sched/sch_sfb.c | 4 +- + net/sched/sch_tbf.c | 6 +- + net/sctp/ulpqueue.c | 2 +- + net/tipc/bearer.c | 2 +- + net/tipc/msg.c | 78 +- + net/tipc/msg.h | 11 + + net/tipc/node.h | 12 +- + net/tipc/socket.c | 207 +- + net/tipc/topsrv.c | 10 +- + net/tls/tls_main.c | 54 +- + net/tls/tls_sw.c | 796 ++++- + net/wireless/nl80211.c | 10 +- + net/wireless/reg.c | 112 +- + net/wireless/trace.h | 2 +- + net/wireless/util.c | 160 +- + net/xdp/xdp_umem.c | 8 +- + net/xdp/xdp_umem.h | 10 - + net/xdp/xdp_umem_props.h | 14 - + net/xdp/xsk.c | 34 +- + net/xdp/xsk_queue.c | 60 +- + net/xdp/xsk_queue.h | 16 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_interface.c | 4 +- + net/xfrm/xfrm_output.c | 2 +- + samples/bpf/Makefile | 1 + + samples/bpf/bpf_load.c | 1 - + samples/bpf/sampleip_user.c | 1 - + samples/bpf/sockex2_kern.c | 11 +- + samples/bpf/sockex3_kern.c | 8 +- + samples/bpf/sockex3_user.c | 4 +- + samples/bpf/tcp_tos_reflect_kern.c | 87 + + samples/bpf/test_current_task_under_cgroup_user.c | 1 - + samples/bpf/xdpsock_kern.c | 2 +- + samples/bpf/xdpsock_user.c | 15 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 139 + + tools/bpf/bpftool/Documentation/bpftool.rst | 6 +- + tools/bpf/bpftool/bash-completion/bpftool | 17 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 8 + + tools/bpf/bpftool/map.c | 45 +- + tools/bpf/bpftool/net.c | 272 ++ + tools/bpf/bpftool/netlink_dumper.c | 174 + + tools/bpf/bpftool/netlink_dumper.h | 95 + + tools/bpf/bpftool/prog.c | 1 + + tools/include/uapi/linux/bpf.h | 26 + + tools/include/uapi/linux/if_link.h | 2 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 129 - + tools/lib/bpf/libbpf.c | 4 +- + tools/lib/bpf/libbpf.h | 16 + + tools/lib/bpf/libbpf_errno.c | 1 + + tools/lib/bpf/netlink.c | 331 ++ + tools/lib/bpf/nlattr.c | 33 +- + tools/lib/bpf/nlattr.h | 38 + + tools/testing/selftests/bpf/.gitignore | 6 + + tools/testing/selftests/bpf/Makefile | 8 +- + tools/testing/selftests/bpf/bpf_flow.c | 373 ++ + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/flow_dissector_load.c | 140 + + tools/testing/selftests/bpf/test_btf.c | 179 +- + tools/testing/selftests/bpf/test_flow_dissector.c | 782 +++++ + tools/testing/selftests/bpf/test_flow_dissector.sh | 115 + + tools/testing/selftests/bpf/test_progs.c | 20 +- + tools/testing/selftests/bpf/test_sockmap.c | 56 +- + tools/testing/selftests/bpf/test_tcpbpf_kern.c | 38 +- + tools/testing/selftests/bpf/test_tcpbpf_user.c | 31 +- + tools/testing/selftests/bpf/with_addr.sh | 54 + + tools/testing/selftests/bpf/with_tunnels.sh | 36 + + .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 347 ++ + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 4 +- + .../selftests/net/forwarding/bridge_sticky_fdb.sh | 69 + + tools/testing/selftests/net/forwarding/lib.sh | 25 + + tools/testing/selftests/net/ip_defrag.c | 394 +++ + tools/testing/selftests/net/ip_defrag.sh | 39 + + tools/testing/selftests/net/tls.c | 41 +- + 739 files changed, 35647 insertions(+), 22308 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-net-dsa + create mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt + rename {drivers/staging/fsl-dpaa2/ethernet => Documentation/networking/dpaa2}/ethernet-driver.rst (100%) + rename Documentation/networking/{i40evf.txt => iavf.txt} (72%) + delete mode 100644 Documentation/networking/tcp.txt + create mode 100644 drivers/net/dsa/b53/b53_serdes.c + create mode 100644 drivers/net/dsa/b53/b53_serdes.h + create mode 100644 drivers/net/dsa/lantiq_gswip.c + create mode 100644 drivers/net/dsa/lantiq_pce.h + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/Makefile (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-eth-trace.h (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-eth.c (98%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-eth.h (99%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-ethtool.c (95%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpkg.h (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpni-cmd.h (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpni.c (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpni.h (100%) + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_txrx_common.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_xsk.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_xsk.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/Makefile + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_alloc.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_common.c + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_devids.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_hmc.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_prototype.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_register.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_type.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40evf.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c + create mode 100644 drivers/net/ethernet/intel/iavf/Makefile + rename drivers/net/ethernet/intel/{i40evf => iavf}/i40e_adminq.c (74%) + rename drivers/net/ethernet/intel/{i40evf => iavf}/i40e_adminq.h (82%) + create mode 100644 drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_alloc.h + rename drivers/net/ethernet/intel/{i40evf/i40evf_client.c => iavf/iavf_client.c} (63%) + rename drivers/net/ethernet/intel/{i40evf/i40evf_client.h => iavf/iavf_client.h} (87%) + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_common.c + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_devids.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_ethtool.c + rename drivers/net/ethernet/intel/{i40evf/i40evf_main.c => iavf/iavf_main.c} (62%) + rename drivers/net/ethernet/intel/{i40evf/i40e_osdep.h => iavf/iavf_osdep.h} (56%) + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_prototype.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_register.h + rename drivers/net/ethernet/intel/{i40evf/i40e_status.h => iavf/iavf_status.h} (95%) + rename drivers/net/ethernet/intel/{i40evf/i40e_trace.h => iavf/iavf_trace.h} (66%) + rename drivers/net/ethernet/intel/{i40evf/i40e_txrx.c => iavf/iavf_txrx.c} (72%) + rename drivers/net/ethernet/intel/{i40evf/i40e_txrx.h => iavf/iavf_txrx.h} (52%) + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_type.h + rename drivers/net/ethernet/intel/{i40evf/i40evf_virtchnl.c => iavf/iavf_virtchnl.c} (72%) + create mode 100644 drivers/net/ethernet/intel/ice/ice_lib.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_lib.h + create mode 100644 drivers/net/ethernet/intel/ixgbevf/ipsec.c + create mode 100644 drivers/net/ethernet/intel/ixgbevf/ipsec.h + create mode 100644 drivers/net/ethernet/lantiq_xrx200.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_dev_gmii.h + delete mode 100644 drivers/staging/fsl-dpaa2/ethernet/TODO + create mode 100644 net/batman-adv/trace.c + create mode 100644 net/batman-adv/trace.h + create mode 100644 net/dsa/tag_gswip.c + delete mode 100644 net/xdp/xdp_umem_props.h + create mode 100644 samples/bpf/tcp_tos_reflect_kern.c + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-net.rst + create mode 100644 tools/bpf/bpftool/net.c + create mode 100644 tools/bpf/bpftool/netlink_dumper.c + create mode 100644 tools/bpf/bpftool/netlink_dumper.h + create mode 100644 tools/lib/bpf/netlink.c + create mode 100644 tools/testing/selftests/bpf/bpf_flow.c + create mode 100644 tools/testing/selftests/bpf/flow_dissector_load.c + create mode 100644 tools/testing/selftests/bpf/test_flow_dissector.c + create mode 100755 tools/testing/selftests/bpf/test_flow_dissector.sh + create mode 100755 tools/testing/selftests/bpf/with_addr.sh + create mode 100755 tools/testing/selftests/bpf/with_tunnels.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_sticky_fdb.sh + create mode 100644 tools/testing/selftests/net/ip_defrag.c + create mode 100755 tools/testing/selftests/net/ip_defrag.sh +Merging bpf-next/master (cb86d0f878be Merge branch 'bpf-per-cpu-cgroup-storage') +$ git merge bpf-next/master +Auto-merging kernel/bpf/local_storage.c +Merge made by the 'recursive' strategy. + include/linux/bpf-cgroup.h | 55 ++++-- + include/linux/bpf.h | 12 +- + include/linux/bpf_types.h | 1 + + include/uapi/linux/bpf.h | 1 + + kernel/bpf/cgroup.c | 76 +++++--- + kernel/bpf/helpers.c | 25 ++- + kernel/bpf/local_storage.c | 169 +++++++++++++++--- + kernel/bpf/map_in_map.c | 3 +- + kernel/bpf/syscall.c | 20 ++- + kernel/bpf/verifier.c | 23 ++- + lib/test_bpf.c | 1 + + net/bpf/test_run.c | 20 ++- + samples/bpf/test_cgrp2_attach2.c | 19 +- + tools/bpf/bpftool/map.c | 4 +- + tools/bpf/bpftool/netlink_dumper.h | 18 +- + tools/include/uapi/linux/bpf.h | 1 + + tools/lib/bpf/libbpf.c | 129 ++++++++++---- + tools/lib/bpf/libbpf.h | 2 + + tools/testing/selftests/bpf/Makefile | 6 +- + tools/testing/selftests/bpf/netcnt_common.h | 24 +++ + tools/testing/selftests/bpf/netcnt_prog.c | 71 ++++++++ + tools/testing/selftests/bpf/test_cgroup_storage.c | 60 ++++++- + tools/testing/selftests/bpf/test_netcnt.c | 158 ++++++++++++++++ + tools/testing/selftests/bpf/test_section_names.c | 208 ++++++++++++++++++++++ + tools/testing/selftests/bpf/test_socket_cookie.c | 6 +- + tools/testing/selftests/bpf/test_verifier.c | 139 ++++++++++++++- + 26 files changed, 1099 insertions(+), 152 deletions(-) + create mode 100644 tools/testing/selftests/bpf/netcnt_common.h + create mode 100644 tools/testing/selftests/bpf/netcnt_prog.c + create mode 100644 tools/testing/selftests/bpf/test_netcnt.c + create mode 100644 tools/testing/selftests/bpf/test_section_names.c +Merging ipsec-next/master (4a132095dd64 xfrm: allow driver to quietly refuse offload) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/xfrm/xfrm_device.c +Auto-merging net/ipv4/esp4.c +Merge made by the 'recursive' strategy. + Documentation/networking/xfrm_device.txt | 4 ++++ + net/ipv4/esp4.c | 7 +++---- + net/ipv6/esp6.c | 7 +++---- + net/xfrm/xfrm_device.c | 6 +++++- + net/xfrm/xfrm_interface.c | 2 +- + 5 files changed, 16 insertions(+), 10 deletions(-) +Merging mlx5-next/mlx5-next (bd37197554eb net/mlx5: Update mlx5_ifc with DEVX UID bits) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (a2d88182d28d netfilter: nf_tables: use rhashtable_lookup() instead of rhashtable_lookup_fast()) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_conntrack_proto_tcp.c +Merge made by the 'recursive' strategy. + include/linux/netfilter/nf_conntrack_common.h | 3 - + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 13 +- + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 13 -- + include/net/netfilter/nf_conntrack_core.h | 3 +- + include/net/netfilter/nf_conntrack_l4proto.h | 36 ++- + include/net/netfilter/nf_tables.h | 9 +- + include/net/netfilter/nf_tables_core.h | 4 + + include/uapi/linux/netfilter/nf_tables.h | 49 ++++- + include/uapi/linux/netfilter/xt_cgroup.h | 16 ++ + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 1 - + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 22 +- + net/ipv6/netfilter/ip6t_ipv6header.c | 5 +- + net/ipv6/netfilter/ip6t_rt.c | 10 +- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 19 +- + net/netfilter/Kconfig | 7 + + net/netfilter/Makefile | 1 + + net/netfilter/nf_conntrack_core.c | 105 +++++---- + net/netfilter/nf_conntrack_expect.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 73 +++--- + net/netfilter/nf_conntrack_proto.c | 117 +++------- + net/netfilter/nf_conntrack_proto_dccp.c | 155 +++++-------- + net/netfilter/nf_conntrack_proto_generic.c | 28 +-- + net/netfilter/nf_conntrack_proto_gre.c | 44 ++-- + net/netfilter/nf_conntrack_proto_icmp.c | 78 +++---- + net/netfilter/nf_conntrack_proto_icmpv6.c | 80 +++---- + net/netfilter/nf_conntrack_proto_sctp.c | 253 +++++++++------------ + net/netfilter/nf_conntrack_proto_tcp.c | 251 +++++++++------------ + net/netfilter/nf_conntrack_proto_udp.c | 236 +++++++++----------- + net/netfilter/nf_conntrack_standalone.c | 9 +- + net/netfilter/nf_flow_table_core.c | 41 ++-- + net/netfilter/nf_flow_table_ip.c | 6 +- + net/netfilter/nf_nat_helper.c | 4 +- + net/netfilter/nf_nat_redirect.c | 4 - + net/netfilter/nf_tables_api.c | 120 ++++++++-- + net/netfilter/nf_tables_core.c | 28 ++- + net/netfilter/nfnetlink_cttimeout.c | 59 ++--- + net/netfilter/nft_cmp.c | 6 +- + net/netfilter/nft_ct.c | 22 +- + net/netfilter/nft_dynset.c | 21 +- + net/netfilter/nft_lookup.c | 20 +- + net/netfilter/nft_meta.c | 116 ++++++++++ + net/netfilter/nft_objref.c | 20 +- + net/netfilter/nft_reject.c | 6 +- + net/netfilter/nft_rt.c | 11 + + net/netfilter/nft_set_hash.c | 38 +--- + net/netfilter/nft_xfrm.c | 293 +++++++++++++++++++++++++ + net/netfilter/xt_CT.c | 2 +- + net/netfilter/xt_IDLETIMER.c | 4 - + net/netfilter/xt_SECMARK.c | 2 - + net/netfilter/xt_cgroup.c | 72 ++++++ + net/openvswitch/conntrack.c | 8 +- + 51 files changed, 1528 insertions(+), 1018 deletions(-) + create mode 100644 net/netfilter/nft_xfrm.c +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/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT") +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (08b0109eea36 Merge tag 'iwlwifi-next-for-kalle-2018-09-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Removing drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h +Removing drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c +Removing drivers/net/wireless/mediatek/mt76/mt76x0/util.c +Removing drivers/net/wireless/mediatek/mt76/mt76x0/usb.h +Removing drivers/net/wireless/mediatek/mt76/mt76x0/regs.h +Removing drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c +Removing drivers/net/wireless/mediatek/mt76/mt76x0/dma.c +Removing drivers/net/wireless/mediatek/mt76/mt76x0/core.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/cfg/1000.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +Auto-merging drivers/net/wireless/broadcom/b43/dma.c +Auto-merging drivers/net/wireless/ath/wil6210/debugfs.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/ahb.c | 4 +- + drivers/net/wireless/ath/ath10k/ce.c | 24 +- + drivers/net/wireless/ath/ath10k/core.c | 17 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 4 +- + drivers/net/wireless/ath/ath10k/hw.h | 5 + + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 6 + + drivers/net/wireless/ath/ath5k/debug.c | 2 - + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 4 - + drivers/net/wireless/ath/ath9k/ath9k.h | 1 - + drivers/net/wireless/ath/ath9k/debug_sta.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/ath/ath9k/tx99.c | 9 - + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 4 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 19 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 4 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 333 ++++- + drivers/net/wireless/ath/wil6210/debugfs.c | 47 +- + drivers/net/wireless/ath/wil6210/main.c | 13 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + + drivers/net/wireless/ath/wil6210/rx_reorder.c | 12 +- + drivers/net/wireless/ath/wil6210/txrx.c | 98 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 26 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 19 + + drivers/net/wireless/ath/wil6210/wmi.c | 350 ++++- + drivers/net/wireless/ath/wil6210/wmi.h | 2 + + drivers/net/wireless/broadcom/b43/b43.h | 2 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 8 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/debug.c | 3 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 6 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 34 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 3 + + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/1000.c | 4 - + drivers/net/wireless/intel/iwlwifi/cfg/2000.c | 4 - + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 71 +- + drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 4 - + drivers/net/wireless/intel/iwlwifi/cfg/6000.c | 4 - + drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 5 - + drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 5 - + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/calib.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/led.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/led.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/power.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/power.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 5 - + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 - + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 3 - + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 3 + + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 89 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 32 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 49 + + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 14 + + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 30 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 78 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 189 ++- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 337 ++--- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 97 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 124 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 3 - + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 32 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 5 - + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c | 5 - + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h | 5 - + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 18 +- + .../net/wireless/intel/iwlwifi/iwl-context-info.h | 25 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 6 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 4 - + .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h | 10 +- + .../net/wireless/intel/iwlwifi/iwl-devtrace-io.h | 4 - + .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 69 +- + .../net/wireless/intel/iwlwifi/iwl-devtrace-msg.h | 4 - + .../wireless/intel/iwlwifi/iwl-devtrace-ucode.h | 4 - + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 5 - + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 7 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 - + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 5 - + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 - + drivers/net/wireless/intel/iwlwifi/iwl-io.h | 4 - + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 3 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-scd.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 41 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 183 ++- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 37 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 70 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 5 - + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 69 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 721 ++++++---- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 3 - + drivers/net/wireless/intel/iwlwifi/mvm/testmode.h | 5 - + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 162 ++- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 27 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 4 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 28 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 60 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 109 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 20 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 9 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 267 ++-- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 182 ++- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 93 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 6 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 5 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 13 + + drivers/net/wireless/mediatek/mt76/Kconfig | 29 +- + drivers/net/wireless/mediatek/mt76/Makefile | 10 +- + drivers/net/wireless/mediatek/mt76/dma.c | 16 +- + drivers/net/wireless/mediatek/mt76/dma.h | 51 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 6 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 94 +- + drivers/net/wireless/mediatek/mt76/mt76x0/Makefile | 13 +- + drivers/net/wireless/mediatek/mt76/mt76x0/core.c | 34 - + drivers/net/wireless/mediatek/mt76/mt76x0/dma.c | 522 ------- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 3 - + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 400 ++---- + drivers/net/wireless/mediatek/mt76/mt76x0/mac.c | 437 +----- + drivers/net/wireless/mediatek/mt76/mt76x0/mac.h | 136 +- + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 271 +--- + drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c | 656 --------- + drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h | 61 +- + drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 181 +-- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 81 ++ + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 37 +- + drivers/net/wireless/mediatek/mt76/mt76x0/regs.h | 651 --------- + drivers/net/wireless/mediatek/mt76/mt76x0/trace.h | 14 +- + drivers/net/wireless/mediatek/mt76/mt76x0/tx.c | 245 +--- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 382 +++-- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.h | 61 - + drivers/net/wireless/mediatek/mt76/mt76x0/util.c | 42 - + drivers/net/wireless/mediatek/mt76/mt76x02_dma.h | 60 + + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 504 +++++++ + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 205 +++ + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 213 +++ + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h | 100 ++ + .../mt76/{mt76x2_regs.h => mt76x02_regs.h} | 78 +- + .../mediatek/mt76/{mt76x2_dma.h => mt76x02_usb.h} | 22 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 72 + + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 359 +++++ + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 456 ++++++ + drivers/net/wireless/mediatek/mt76/mt76x02_util.h | 54 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 88 +- + drivers/net/wireless/mediatek/mt76/mt76x2_common.c | 318 +---- + drivers/net/wireless/mediatek/mt76/mt76x2_dma.c | 55 +- + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 27 +- + .../wireless/mediatek/mt76/mt76x2_init_common.c | 48 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 19 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 131 +- + .../net/wireless/mediatek/mt76/mt76x2_mac_common.c | 488 +------ + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 93 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c | 261 +--- + drivers/net/wireless/mediatek/mt76/mt76x2_mcu.h | 68 +- + .../net/wireless/mediatek/mt76/mt76x2_mcu_common.c | 124 ++ + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 65 +- + .../net/wireless/mediatek/mt76/mt76x2_phy_common.c | 53 +- + drivers/net/wireless/mediatek/mt76/mt76x2_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2_tx.c | 13 +- + .../net/wireless/mediatek/mt76/mt76x2_tx_common.c | 49 +- + drivers/net/wireless/mediatek/mt76/mt76x2_usb.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt76x2u.h | 17 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_core.c | 69 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_init.c | 23 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_main.c | 47 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_mcu.c | 218 +-- + drivers/net/wireless/mediatek/mt76/mt76x2u_phy.c | 67 +- + drivers/net/wireless/mediatek/mt76/tx.c | 16 + + drivers/net/wireless/mediatek/mt76/usb.c | 105 +- + drivers/net/wireless/mediatek/mt76/usb_mcu.c | 204 +-- + drivers/net/wireless/quantenna/qtnfmac/Makefile | 3 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 5 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 - + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 391 +++++ + .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h | 85 ++ + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 1262 +++++++++++++++++ + .../{pearl/pcie_ipc.h => pcie/pearl_pcie_ipc.h} | 58 - + .../pcie_regs_pearl.h => pcie/pearl_pcie_regs.h} | 0 + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 1494 -------------------- + .../quantenna/qtnfmac/pearl/pcie_bus_priv.h | 91 -- + .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h | 14 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 154 ++ + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 3 + + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 277 ++-- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.h | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 143 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 3 + + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 18 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 4 + + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 + + .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 4 - + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 11 +- + drivers/net/wireless/rsi/rsi_common.h | 1 - + drivers/net/wireless/st/cw1200/txrx.c | 4 +- + 276 files changed, 8620 insertions(+), 9948 deletions(-) + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/core.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/dma.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/pci.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/regs.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/usb.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/util.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_dma.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h + rename drivers/net/wireless/mediatek/mt76/{mt76x2_regs.h => mt76x02_regs.h} (89%) + rename drivers/net/wireless/mediatek/mt76/{mt76x2_dma.h => mt76x02_usb.h} (58%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_util.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_util.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_mcu_common.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c + rename drivers/net/wireless/quantenna/qtnfmac/{pearl/pcie_ipc.h => pcie/pearl_pcie_ipc.h} (68%) + rename drivers/net/wireless/quantenna/qtnfmac/{pearl/pcie_regs_pearl.h => pcie/pearl_pcie_regs.h} (100%) + delete mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c + delete mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h +Merging bluetooth/master (30d65e0804d5 Bluetooth: Fix debugfs NULL pointer dereference) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hidp/core.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 11 ++++--- + drivers/bluetooth/bt3c_cs.c | 9 ++++-- + drivers/bluetooth/btbcm.c | 1 + + drivers/bluetooth/btrsi.c | 13 +++++++- + drivers/bluetooth/btrtl.c | 10 +++++- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_qca.c | 50 +++++++++++++++++++++++++----- + drivers/bluetooth/hci_serdev.c | 10 +++--- + include/net/bluetooth/hci.h | 14 +++++++++ + include/net/bluetooth/hci_core.h | 17 +++++++++++ + include/net/bluetooth/l2cap.h | 3 -- + net/bluetooth/bnep/core.c | 7 +++-- + net/bluetooth/cmtp/core.c | 14 +++++---- + net/bluetooth/hci_core.c | 65 +++++++++++++++++++++++++++++++++++++++ + net/bluetooth/hci_event.c | 47 ++++++++++++++++++++++++++++ + net/bluetooth/hidp/core.c | 13 +++++--- + net/bluetooth/l2cap_core.c | 66 ++++++++++++++++++++++++++-------------- + net/bluetooth/smp.c | 23 ++++++-------- + 18 files changed, 299 insertions(+), 75 deletions(-) +Merging mac80211-next/master (fe80610bedf2 mac80211: Remove unused initialization) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging include/net/cfg80211.h +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 52 +++++++++++++ + include/uapi/linux/nl80211.h | 90 ++++++++++++++++++++++ + net/mac80211/main.c | 4 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/util.c | 3 + + net/wireless/core.c | 42 ++++++----- + net/wireless/core.h | 3 + + net/wireless/nl80211.c | 162 +++++++++++++++++++++++++++++++++------- + net/wireless/rdev-ops.h | 15 ++++ + net/wireless/trace.h | 45 +++++++++-- + 10 files changed, 368 insertions(+), 50 deletions(-) +Merging gfs2/for-next (4f36cb36c9d1 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/rgrp.c | 43 +++++++++++++++++++++++++++++++++++++------ + fs/gfs2/util.c | 3 +++ + 2 files changed, 40 insertions(+), 6 deletions(-) +Merging mtd/mtd/next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (40667c037a3d mtd: rawnand: Allow selection of ECC byte ordering at runtime) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Removing drivers/mtd/nand/raw/docg4.c +Auto-merging drivers/mtd/nand/raw/denali.c +Removing Documentation/mtd/nand/pxa3xx-nand.txt +Merge made by the 'recursive' strategy. + Documentation/driver-api/mtdnand.rst | 34 +- + Documentation/mtd/nand/pxa3xx-nand.txt | 113 -- + arch/arm/mach-ep93xx/snappercl15.c | 15 +- + arch/arm/mach-ep93xx/ts72xx.c | 16 +- + arch/arm/mach-imx/mach-qong.c | 17 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 5 +- + arch/arm/mach-omap1/board-fsample.c | 5 +- + arch/arm/mach-omap1/board-h2.c | 5 +- + arch/arm/mach-omap1/board-h3.c | 4 +- + arch/arm/mach-omap1/board-nand.c | 5 +- + arch/arm/mach-omap1/board-perseus2.c | 5 +- + arch/arm/mach-omap1/common.h | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 27 +- + arch/arm/mach-pxa/balloon3.c | 13 +- + arch/arm/mach-pxa/em-x270.c | 14 +- + arch/arm/mach-pxa/palmtreo.c | 31 - + arch/arm/mach-pxa/palmtx.c | 10 +- + arch/mips/alchemy/devboards/db1200.c | 14 +- + arch/mips/alchemy/devboards/db1300.c | 14 +- + arch/mips/alchemy/devboards/db1550.c | 14 +- + arch/mips/netlogic/xlr/platform-flash.c | 7 +- + arch/mips/pnx833x/common/platform.c | 8 +- + arch/mips/rb532/devices.c | 10 +- + arch/sh/boards/mach-migor/setup.c | 14 +- + drivers/mtd/nand/raw/Kconfig | 20 - + drivers/mtd/nand/raw/Makefile | 6 +- + drivers/mtd/nand/raw/ams-delta.c | 249 ++-- + drivers/mtd/nand/raw/atmel/nand-controller.c | 111 +- + drivers/mtd/nand/raw/au1550nd.c | 124 +- + drivers/mtd/nand/raw/bcm47xxnflash/main.c | 2 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 58 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 93 +- + drivers/mtd/nand/raw/cafe_nand.c | 74 +- + drivers/mtd/nand/raw/cmx270_nand.c | 48 +- + drivers/mtd/nand/raw/cs553x_nand.c | 75 +- + drivers/mtd/nand/raw/davinci_nand.c | 93 +- + drivers/mtd/nand/raw/denali.c | 137 +- + drivers/mtd/nand/raw/denali.h | 10 +- + drivers/mtd/nand/raw/denali_dt.c | 12 +- + drivers/mtd/nand/raw/denali_pci.c | 10 +- + drivers/mtd/nand/raw/diskonchip.c | 156 +- + drivers/mtd/nand/raw/docg4.c | 1442 ------------------ + drivers/mtd/nand/raw/fsl_elbc_nand.c | 70 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 106 +- + drivers/mtd/nand/raw/fsl_upm.c | 66 +- + drivers/mtd/nand/raw/fsmc_nand.c | 44 +- + drivers/mtd/nand/raw/gpio.c | 29 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 3 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 111 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 2 +- + drivers/mtd/nand/raw/hisi504_nand.c | 68 +- + drivers/mtd/nand/raw/internals.h | 115 ++ + drivers/mtd/nand/raw/jz4740_nand.c | 53 +- + drivers/mtd/nand/raw/jz4780_nand.c | 42 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 59 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 83 +- + drivers/mtd/nand/raw/marvell_nand.c | 273 ++-- + drivers/mtd/nand/raw/mpc5121_nfc.c | 65 +- + drivers/mtd/nand/raw/mtk_nand.c | 93 +- + drivers/mtd/nand/raw/mxc_nand.c | 114 +- + drivers/mtd/nand/raw/nand_amd.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 1721 +++++----------------- + drivers/mtd/nand/raw/nand_bbt.c | 24 +- + drivers/mtd/nand/raw/nand_bch.c | 10 +- + drivers/mtd/nand/raw/nand_ecc.c | 99 +- + drivers/mtd/nand/raw/nand_esmt.c | 47 + + drivers/mtd/nand/raw/nand_hynix.c | 15 +- + drivers/mtd/nand/raw/nand_ids.c | 26 +- + drivers/mtd/nand/raw/nand_jedec.c | 113 ++ + drivers/mtd/nand/raw/nand_legacy.c | 642 ++++++++ + drivers/mtd/nand/raw/nand_macronix.c | 2 +- + drivers/mtd/nand/raw/nand_micron.c | 19 +- + drivers/mtd/nand/raw/nand_onfi.c | 305 ++++ + drivers/mtd/nand/raw/nand_samsung.c | 2 +- + drivers/mtd/nand/raw/nand_timings.c | 18 +- + drivers/mtd/nand/raw/nand_toshiba.c | 90 +- + drivers/mtd/nand/raw/nandsim.c | 50 +- + drivers/mtd/nand/raw/ndfc.c | 43 +- + drivers/mtd/nand/raw/nuc900_nand.c | 47 +- + drivers/mtd/nand/raw/omap2.c | 200 +-- + drivers/mtd/nand/raw/orion_nand.c | 26 +- + drivers/mtd/nand/raw/oxnas_nand.c | 29 +- + drivers/mtd/nand/raw/pasemi_nand.c | 51 +- + drivers/mtd/nand/raw/plat_nand.c | 23 +- + drivers/mtd/nand/raw/qcom_nandc.c | 92 +- + drivers/mtd/nand/raw/r852.c | 66 +- + drivers/mtd/nand/raw/s3c2410.c | 106 +- + drivers/mtd/nand/raw/sh_flctl.c | 68 +- + drivers/mtd/nand/raw/sharpsl.c | 36 +- + drivers/mtd/nand/raw/sm_common.c | 7 +- + drivers/mtd/nand/raw/socrates_nand.c | 60 +- + drivers/mtd/nand/raw/sunxi_nand.c | 96 +- + drivers/mtd/nand/raw/tango_nand.c | 77 +- + drivers/mtd/nand/raw/tegra_nand.c | 36 +- + drivers/mtd/nand/raw/tmio_nand.c | 78 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 53 +- + drivers/mtd/nand/raw/vf610_nfc.c | 43 +- + drivers/mtd/nand/raw/xway_nand.c | 39 +- + drivers/mtd/sm_ftl.c | 20 +- + drivers/mtd/tests/mtd_nandecctest.c | 21 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 47 +- + include/linux/fsl_ifc.h | 2 + + include/linux/mtd/jedec.h | 91 ++ + include/linux/mtd/nand_bch.h | 11 +- + include/linux/mtd/nand_ecc.h | 12 +- + include/linux/mtd/onfi.h | 178 +++ + include/linux/mtd/platnand.h | 74 + + include/linux/mtd/rawnand.h | 635 ++------ + 108 files changed, 4287 insertions(+), 5783 deletions(-) + delete mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt + delete mode 100644 drivers/mtd/nand/raw/docg4.c + create mode 100644 drivers/mtd/nand/raw/internals.h + create mode 100644 drivers/mtd/nand/raw/nand_esmt.c + create mode 100644 drivers/mtd/nand/raw/nand_jedec.c + create mode 100644 drivers/mtd/nand/raw/nand_legacy.c + create mode 100644 drivers/mtd/nand/raw/nand_onfi.c + create mode 100644 include/linux/mtd/jedec.h + create mode 100644 include/linux/mtd/onfi.h + create mode 100644 include/linux/mtd/platnand.h +Merging spi-nor/spi-nor/next (af8b35f392bb mtd: spi-nor: cadence-quadspi: Use proper enum for dma_[un]map_single) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/cadence-quadspi.c | 4 +- + drivers/mtd/spi-nor/spi-nor.c | 918 +++++++++++++++++++++++++++++++--- + include/linux/mtd/spi-nor.h | 119 +++++ + 3 files changed, 981 insertions(+), 60 deletions(-) +Merging crypto/master (79517e8f8e6d crypto: cavium - remove redundant null pointer check before kfree) +$ git merge crypto/master +Auto-merging net/sunrpc/auth_gss/gss_krb5_wrap.c +Auto-merging net/rxrpc/ar-internal.h +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/sunrpc/gss_krb5.h +Auto-merging include/linux/compiler_types.h +Removing include/crypto/speck.h +Removing include/crypto/mcryptd.h +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/crypto/mxs-dcp.c +Auto-merging drivers/crypto/chelsio/chcr_crypto.h +Auto-merging drivers/crypto/chelsio/chcr_algo.c +Auto-merging drivers/char/random.c +Removing crypto/speck.c +Removing crypto/mcryptd.c +Removing arch/x86/crypto/sha512-mb/sha512_x4_avx2.S +Removing arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S +Removing arch/x86/crypto/sha512-mb/sha512_mb_mgr_init_avx2.c +Removing arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S +Removing arch/x86/crypto/sha512-mb/sha512_mb_mgr_datastruct.S +Removing arch/x86/crypto/sha512-mb/sha512_mb_mgr.h +Removing arch/x86/crypto/sha512-mb/sha512_mb_ctx.h +Removing arch/x86/crypto/sha512-mb/sha512_mb.c +Removing arch/x86/crypto/sha512-mb/Makefile +Removing arch/x86/crypto/sha256-mb/sha256_x8_avx2.S +Removing arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S +Removing arch/x86/crypto/sha256-mb/sha256_mb_mgr_init_avx2.c +Removing arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S +Removing arch/x86/crypto/sha256-mb/sha256_mb_mgr_datastruct.S +Removing arch/x86/crypto/sha256-mb/sha256_mb_mgr.h +Removing arch/x86/crypto/sha256-mb/sha256_mb_ctx.h +Removing arch/x86/crypto/sha256-mb/sha256_mb.c +Removing arch/x86/crypto/sha256-mb/Makefile +Removing arch/x86/crypto/sha1-mb/sha1_x8_avx2.S +Removing arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S +Removing arch/x86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c +Removing arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S +Removing arch/x86/crypto/sha1-mb/sha1_mb_mgr_datastruct.S +Removing arch/x86/crypto/sha1-mb/sha1_mb_mgr.h +Removing arch/x86/crypto/sha1-mb/sha1_mb_ctx.h +Removing arch/x86/crypto/sha1-mb/sha1_mb.c +Removing arch/x86/crypto/sha1-mb/Makefile +Removing arch/arm64/crypto/speck-neon-glue.c +Removing arch/arm64/crypto/speck-neon-core.S +Removing arch/arm64/crypto/crc32-ce-glue.c +Removing arch/arm64/crypto/crc32-ce-core.S +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm/crypto/speck-neon-glue.c +Removing arch/arm/crypto/speck-neon-core.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 10 - + MAINTAINERS | 8 - + arch/arm/crypto/Kconfig | 7 +- + arch/arm/crypto/Makefile | 2 - + arch/arm/crypto/chacha20-neon-core.S | 277 +- + arch/arm/crypto/crc32-ce-glue.c | 2 +- + arch/arm/crypto/ghash-ce-core.S | 108 +- + arch/arm/crypto/ghash-ce-glue.c | 38 +- + arch/arm/crypto/speck-neon-core.S | 434 -- + arch/arm/crypto/speck-neon-glue.c | 288 -- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/crypto/Kconfig | 11 - + arch/arm64/crypto/Makefile | 6 - + arch/arm64/crypto/aes-ce.S | 5 + + arch/arm64/crypto/aes-glue.c | 212 +- + arch/arm64/crypto/aes-modes.S | 416 +- + arch/arm64/crypto/aes-neon.S | 6 + + arch/arm64/crypto/crc32-ce-core.S | 287 -- + arch/arm64/crypto/crc32-ce-glue.c | 244 - + arch/arm64/crypto/crct10dif-ce-core.S | 314 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 14 +- + arch/arm64/crypto/speck-neon-core.S | 352 -- + arch/arm64/crypto/speck-neon-glue.c | 282 -- + arch/m68k/configs/amiga_defconfig | 2 - + arch/m68k/configs/apollo_defconfig | 2 - + arch/m68k/configs/atari_defconfig | 2 - + arch/m68k/configs/bvme6000_defconfig | 2 - + arch/m68k/configs/hp300_defconfig | 2 - + arch/m68k/configs/mac_defconfig | 2 - + arch/m68k/configs/multi_defconfig | 2 - + arch/m68k/configs/mvme147_defconfig | 2 - + arch/m68k/configs/mvme16x_defconfig | 2 - + arch/m68k/configs/q40_defconfig | 2 - + arch/m68k/configs/sun3_defconfig | 2 - + arch/m68k/configs/sun3x_defconfig | 2 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/performance_defconfig | 1 - + arch/s390/crypto/aes_s390.c | 48 +- + arch/s390/defconfig | 1 - + arch/x86/crypto/Makefile | 3 - + arch/x86/crypto/aesni-intel_glue.c | 2 +- + arch/x86/crypto/fpu.c | 30 +- + arch/x86/crypto/sha1-mb/Makefile | 14 - + arch/x86/crypto/sha1-mb/sha1_mb.c | 1011 ---- + arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 134 - + arch/x86/crypto/sha1-mb/sha1_mb_mgr.h | 110 - + arch/x86/crypto/sha1-mb/sha1_mb_mgr_datastruct.S | 287 -- + arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S | 304 -- + arch/x86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c | 64 - + arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S | 209 - + arch/x86/crypto/sha1-mb/sha1_x8_avx2.S | 492 -- + arch/x86/crypto/sha256-mb/Makefile | 14 - + arch/x86/crypto/sha256-mb/sha256_mb.c | 1013 ---- + arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 134 - + arch/x86/crypto/sha256-mb/sha256_mb_mgr.h | 108 - + .../crypto/sha256-mb/sha256_mb_mgr_datastruct.S | 304 -- + .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 307 -- + .../x86/crypto/sha256-mb/sha256_mb_mgr_init_avx2.c | 65 - + .../crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S | 214 - + arch/x86/crypto/sha256-mb/sha256_x8_avx2.S | 598 --- + arch/x86/crypto/sha512-mb/Makefile | 12 - + arch/x86/crypto/sha512-mb/sha512_mb.c | 1047 ---- + arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 128 - + arch/x86/crypto/sha512-mb/sha512_mb_mgr.h | 104 - + .../crypto/sha512-mb/sha512_mb_mgr_datastruct.S | 281 -- + .../crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S | 297 -- + .../x86/crypto/sha512-mb/sha512_mb_mgr_init_avx2.c | 69 - + .../crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S | 224 - + arch/x86/crypto/sha512-mb/sha512_x4_avx2.S | 531 -- + crypto/Kconfig | 99 +- + crypto/Makefile | 4 +- + crypto/ahash.c | 25 +- + crypto/algapi.c | 17 +- + crypto/algboss.c | 2 + + crypto/algif_aead.c | 12 +- + crypto/algif_hash.c | 2 +- + crypto/authenc.c | 8 +- + crypto/authencesn.c | 8 +- + crypto/ccm.c | 9 +- + crypto/chacha20_generic.c | 7 +- + crypto/cryptd.c | 32 +- + crypto/crypto_null.c | 11 +- + crypto/{crypto_user.c => crypto_user_base.c} | 9 +- + crypto/crypto_user_stat.c | 463 ++ + crypto/echainiv.c | 4 +- + crypto/gcm.c | 8 +- + crypto/internal.h | 8 - + crypto/lrw.c | 342 +- + crypto/mcryptd.c | 675 --- + crypto/ofb.c | 225 + + crypto/rng.c | 1 + + crypto/rsa-pkcs1pad.c | 9 - + crypto/seqiv.c | 4 +- + crypto/shash.c | 33 +- + crypto/skcipher.c | 24 + + crypto/speck.c | 307 -- + crypto/tcrypt.c | 27 +- + crypto/tcrypt.h | 1 + + crypto/testmgr.c | 36 +- + crypto/testmgr.h | 863 +--- + crypto/xcbc.c | 8 +- + crypto/xts.c | 269 +- + drivers/block/cryptoloop.c | 22 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 5 + + drivers/char/random.c | 24 +- + drivers/crypto/Makefile | 2 +- + drivers/crypto/atmel-aes.c | 5 +- + drivers/crypto/atmel-authenc.h | 13 +- + drivers/crypto/atmel-ecc.c | 11 +- + drivers/crypto/atmel-ecc.h | 14 +- + drivers/crypto/atmel-sha.c | 5 +- + drivers/crypto/atmel-tdes.c | 5 +- + drivers/crypto/axis/artpec6_crypto.c | 19 +- + drivers/crypto/caam/Kconfig | 55 +- + drivers/crypto/caam/Makefile | 10 +- + drivers/crypto/caam/caamalg.c | 727 +-- + drivers/crypto/caam/caamalg_desc.c | 142 +- + drivers/crypto/caam/caamalg_desc.h | 28 +- + drivers/crypto/caam/caamalg_qi.c | 626 +-- + drivers/crypto/caam/caamalg_qi2.c | 5165 ++++++++++++++++++++ + drivers/crypto/caam/caamalg_qi2.h | 223 + + drivers/crypto/caam/caamhash.c | 79 +- + drivers/crypto/caam/caamhash_desc.c | 80 + + drivers/crypto/caam/caamhash_desc.h | 21 + + drivers/crypto/caam/compat.h | 2 + + drivers/crypto/caam/dpseci.c | 426 ++ + drivers/crypto/caam/dpseci.h | 333 ++ + drivers/crypto/caam/dpseci_cmd.h | 149 + + drivers/crypto/caam/error.c | 79 +- + drivers/crypto/caam/error.h | 6 +- + drivers/crypto/caam/qi.h | 1 - + drivers/crypto/caam/regs.h | 30 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 20 +- + drivers/crypto/cavium/nitrox/Makefile | 3 + + drivers/crypto/cavium/nitrox/nitrox_common.h | 14 - + drivers/crypto/cavium/nitrox/nitrox_csr.h | 111 + + drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 113 + + drivers/crypto/cavium/nitrox/nitrox_dev.h | 73 +- + drivers/crypto/cavium/nitrox/nitrox_hal.c | 69 +- + drivers/crypto/cavium/nitrox/nitrox_hal.h | 23 + + drivers/crypto/cavium/nitrox/nitrox_isr.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_lib.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 183 +- + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 9 +- + drivers/crypto/cavium/nitrox/nitrox_sriov.c | 150 + + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 13 +- + drivers/crypto/ccp/ccp-crypto.h | 2 +- + drivers/crypto/ccp/psp-dev.c | 46 +- + drivers/crypto/chelsio/chcr_algo.c | 27 +- + drivers/crypto/chelsio/chcr_crypto.h | 2 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 3 +- + drivers/crypto/mxs-dcp.c | 21 +- + drivers/crypto/omap-aes.c | 17 +- + drivers/crypto/omap-aes.h | 2 +- + drivers/crypto/picoxcell_crypto.c | 21 +- + drivers/crypto/qat/qat_common/qat_algs.c | 8 +- + drivers/crypto/qce/ablkcipher.c | 13 +- + drivers/crypto/qce/cipher.h | 2 +- + drivers/crypto/s5p-sss.c | 113 +- + drivers/crypto/sahara.c | 31 +- + drivers/crypto/vmx/aes_cbc.c | 22 +- + drivers/crypto/vmx/aes_ctr.c | 18 +- + drivers/crypto/vmx/aes_xts.c | 18 +- + drivers/md/dm-integrity.c | 23 +- + drivers/md/dm-verity-fec.c | 5 +- + drivers/net/ppp/ppp_mppe.c | 27 +- + drivers/soc/fsl/dpio/dpio-service.c | 58 + + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 34 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 28 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 34 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 26 +- + drivers/usb/wusbcore/crypto.c | 16 +- + fs/crypto/fscrypt_private.h | 4 - + fs/crypto/keyinfo.c | 10 - + include/crypto/acompress.h | 38 +- + include/crypto/aead.h | 51 +- + include/crypto/akcipher.h | 76 +- + include/crypto/algapi.h | 14 +- + include/crypto/cbc.h | 2 +- + include/crypto/chacha20.h | 3 +- + include/crypto/hash.h | 38 +- + include/crypto/internal/cryptouser.h | 8 + + include/crypto/internal/geniv.h | 2 +- + include/crypto/kpp.h | 51 +- + include/crypto/mcryptd.h | 114 - + include/crypto/null.h | 2 +- + include/crypto/rng.h | 29 +- + include/crypto/skcipher.h | 118 +- + include/crypto/speck.h | 62 - + include/linux/compiler_types.h | 1 - + include/linux/cpufeature.h | 2 +- + include/linux/crc-t10dif.h | 1 + + include/linux/crypto.h | 110 +- + include/linux/fsl/mc.h | 6 + + include/linux/sunrpc/gss_krb5.h | 30 +- + include/soc/fsl/dpaa2-fd.h | 242 + + include/soc/fsl/dpaa2-global.h | 15 + + include/soc/fsl/dpaa2-io.h | 4 + + include/uapi/linux/cryptouser.h | 52 + + include/uapi/linux/fs.h | 4 +- + lib/chacha20.c | 6 +- + lib/crc-t10dif.c | 57 +- + net/ceph/crypto.c | 12 +- + net/ceph/crypto.h | 2 +- + net/mac802154/llsec.c | 16 +- + net/mac802154/llsec.h | 2 +- + net/rxrpc/ar-internal.h | 2 +- + net/rxrpc/rxkad.c | 44 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 87 +- + net/sunrpc/auth_gss/gss_krb5_keys.c | 9 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 53 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 18 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 20 +- + net/wireless/lib80211_crypt_tkip.c | 34 +- + net/wireless/lib80211_crypt_wep.c | 28 +- + tools/crypto/getstat.c | 294 ++ + 217 files changed, 11493 insertions(+), 15055 deletions(-) + delete mode 100644 arch/arm/crypto/speck-neon-core.S + delete mode 100644 arch/arm/crypto/speck-neon-glue.c + delete mode 100644 arch/arm64/crypto/crc32-ce-core.S + delete mode 100644 arch/arm64/crypto/crc32-ce-glue.c + delete mode 100644 arch/arm64/crypto/speck-neon-core.S + delete mode 100644 arch/arm64/crypto/speck-neon-glue.c + delete mode 100644 arch/x86/crypto/sha1-mb/Makefile + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb.c + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_ctx.h + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_mgr.h + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_mgr_datastruct.S + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S + delete mode 100644 arch/x86/crypto/sha1-mb/sha1_x8_avx2.S + delete mode 100644 arch/x86/crypto/sha256-mb/Makefile + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb.c + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_ctx.h + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr.h + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_datastruct.S + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_init_avx2.c + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S + delete mode 100644 arch/x86/crypto/sha256-mb/sha256_x8_avx2.S + delete mode 100644 arch/x86/crypto/sha512-mb/Makefile + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb.c + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_ctx.h + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr.h + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_datastruct.S + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_init_avx2.c + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S + delete mode 100644 arch/x86/crypto/sha512-mb/sha512_x4_avx2.S + rename crypto/{crypto_user.c => crypto_user_base.c} (97%) + create mode 100644 crypto/crypto_user_stat.c + delete mode 100644 crypto/mcryptd.c + create mode 100644 crypto/ofb.c + delete mode 100644 crypto/speck.c + create mode 100644 drivers/crypto/caam/caamalg_qi2.c + create mode 100644 drivers/crypto/caam/caamalg_qi2.h + create mode 100644 drivers/crypto/caam/caamhash_desc.c + create mode 100644 drivers/crypto/caam/caamhash_desc.h + create mode 100644 drivers/crypto/caam/dpseci.c + create mode 100644 drivers/crypto/caam/dpseci.h + create mode 100644 drivers/crypto/caam/dpseci_cmd.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_debugfs.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_hal.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_sriov.c + create mode 100644 include/crypto/internal/cryptouser.h + delete mode 100644 include/crypto/mcryptd.h + delete mode 100644 include/crypto/speck.h + create mode 100644 tools/crypto/getstat.c +Merging drm/drm-next (87c2ee740c07 Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Auto-merging include/drm/drm_panel.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging drivers/gpu/drm/drm_panel.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_link.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +Auto-merging drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/atmel/hlcdc-dc.txt | 23 + + .../bindings/display/bridge/lvds-transmitter.txt | 8 +- + .../bindings/display/bridge/renesas,lvds.txt | 14 +- + .../bindings/display/bridge/ti,sn65dsi86.txt | 87 + + .../bindings/display/bridge/toshiba,tc358764.txt | 35 + + .../devicetree/bindings/display/mipi-dsi-bus.txt | 153 +- + .../devicetree/bindings/display/renesas,du.txt | 4 + + .../bindings/display/rockchip/rockchip-vop.txt | 3 + + .../bindings/display/sunxi/sun4i-drm.txt | 16 +- + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-kms.rst | 18 +- + Documentation/gpu/drm-mm.rst | 6 +- + Documentation/gpu/todo.rst | 71 +- + Documentation/gpu/vkms.rst | 24 + + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 18 +- + drivers/dma-buf/Kconfig | 9 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-buf.c | 1 - + drivers/dma-buf/udmabuf.c | 293 + + drivers/gpu/drm/Kconfig | 2 - + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 655 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 207 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 319 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 262 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 88 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 375 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 166 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 92 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 352 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 216 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 71 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 239 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 261 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 316 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 44 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 101 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 224 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 35 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 190 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1476 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 119 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 26 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 315 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 335 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 53 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 157 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 259 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 7 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 248 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 31 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 598 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 26 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 130 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 24 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_enums.h | 20 + + drivers/gpu/drm/amd/amdgpu/si_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sid.h | 20 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 122 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 22 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 349 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 45 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 53 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 88 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 68 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 55 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 122 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 23 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 23 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 22 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 48 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + + drivers/gpu/drm/amd/display/Kconfig | 6 + + drivers/gpu/drm/amd/display/Makefile | 3 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 774 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 41 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 6 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 83 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 89 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 14 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1181 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 312 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 3 + + .../amd/display/dc/bios/command_table_helper2.c | 5 + + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 6 +- + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 8 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 296 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 208 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 247 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 - + drivers/gpu/drm/amd/display/dc/dc.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 64 - + drivers/gpu/drm/amd/display/dc/dc_helper.c | 9 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 - + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 42 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 23 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 441 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 11 + + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 71 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 60 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.h | 38 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 676 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 301 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 541 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h | 57 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 34 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 6 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 24 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 57 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 127 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 58 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 58 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 72 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 124 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 26 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 31 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 85 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 561 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 98 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dm_event_log.h | 38 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 92 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 5 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 5 + + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 1 + + .../display/dc/i2caux/dce110/aux_engine_dce110.c | 8 +- + .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c | 7 + + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 4 + + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 6 +- + .../gpu/drm/amd/display/dc/inc/hw/display_clock.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + + .../drm/amd/display/include/bios_parser_types.h | 2 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 7 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../gpu/drm/amd/display/include/logger_interface.h | 6 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 9 +- + .../gpu/drm/amd/display/include/set_mode_types.h | 12 - + drivers/gpu/drm/amd/display/include/signal_types.h | 5 + + .../drm/amd/display/modules/color/color_gamma.c | 13 +- + .../drm/amd/display/modules/color/color_gamma.h | 5 +- + .../drm/amd/display/modules/freesync/freesync.c | 2024 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 160 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 40 + + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 49 + + .../drm/amd/display/modules/info_packet/Makefile | 31 + + .../amd/display/modules/info_packet/info_packet.c | 329 + + drivers/gpu/drm/amd/display/modules/stats/stats.c | 8 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h | 4 +- + .../drm/amd/include/asic_reg/mp/mp_11_0_offset.h | 358 + + .../drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h | 534 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4627 ++ + .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 48436 +++++++++++++++++++ + .../amd/include/asic_reg/sdma0/sdma0_4_2_offset.h | 1047 + + .../amd/include/asic_reg/sdma0/sdma0_4_2_sh_mask.h | 2992 ++ + .../amd/include/asic_reg/sdma1/sdma1_4_2_offset.h | 1039 + + .../amd/include/asic_reg/sdma1/sdma1_4_2_sh_mask.h | 2948 ++ + .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 37 + + .../amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h | 86 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 10 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h | 27 + + drivers/gpu/drm/amd/include/atomfirmware.h | 106 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 49 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 18 + + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 4 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 194 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 30 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 42 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 47 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 58 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 43 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 - + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 1 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 14 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3452 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 575 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 35 + + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 70 + + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h | 32 + + .../gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h | 142 + + .../amd/powerplay/hwmgr/vega20_processpptables.c | 964 + + .../amd/powerplay/hwmgr/vega20_processpptables.h | 31 + + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 209 + + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h | 64 + + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 +- + .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 831 + + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 128 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 10 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 18 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 22 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h | 4 - + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 588 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 60 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + + drivers/gpu/drm/arm/hdlcd_drv.c | 11 +- + drivers/gpu/drm/arm/malidp_drv.c | 11 +- + drivers/gpu/drm/arm/malidp_planes.c | 7 +- + drivers/gpu/drm/armada/armada_overlay.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 100 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 92 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 5 +- + drivers/gpu/drm/bochs/bochs.h | 25 +- + drivers/gpu/drm/bochs/bochs_drv.c | 64 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 91 +- + drivers/gpu/drm/bochs/bochs_hw.c | 66 +- + drivers/gpu/drm/bochs/bochs_kms.c | 47 +- + drivers/gpu/drm/bochs/bochs_mm.c | 76 +- + drivers/gpu/drm/bridge/Kconfig | 18 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +- + drivers/gpu/drm/bridge/synopsys/Makefile | 2 - + drivers/gpu/drm/bridge/tc358764.c | 499 + + drivers/gpu/drm/bridge/thc63lvd1024.c | 18 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 779 + + drivers/gpu/drm/cirrus/cirrus_drv.c | 27 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 51 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 1506 +- + drivers/gpu/drm/drm_atomic_helper.c | 33 +- + drivers/gpu/drm/drm_atomic_uapi.c | 1393 + + drivers/gpu/drm/drm_blend.c | 145 + + drivers/gpu/drm/drm_bridge.c | 4 + + drivers/gpu/drm/drm_bufs.c | 32 +- + drivers/gpu/drm/drm_client.c | 2 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + drivers/gpu/drm/drm_connector.c | 8 +- + drivers/gpu/drm/drm_context.c | 16 +- + drivers/gpu/drm/drm_crtc.c | 9 +- + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_crtc_internal.h | 19 +- + drivers/gpu/drm/drm_debugfs_crc.c | 92 +- + drivers/gpu/drm/drm_dp_cec.c | 18 +- + drivers/gpu/drm/drm_dp_helper.c | 20 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_drv.c | 3 + + drivers/gpu/drm/drm_encoder.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 26 +- + drivers/gpu/drm/drm_fb_helper.c | 34 +- + drivers/gpu/drm/drm_fourcc.c | 72 +- + drivers/gpu/drm/drm_framebuffer.c | 49 +- + drivers/gpu/drm/drm_gem.c | 6 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 4 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 5 +- + drivers/gpu/drm/drm_internal.h | 5 + + drivers/gpu/drm/drm_ioctl.c | 12 +- + drivers/gpu/drm/drm_irq.c | 4 +- + drivers/gpu/drm/drm_lease.c | 8 +- + drivers/gpu/drm/drm_lock.c | 4 +- + drivers/gpu/drm/drm_mode_config.c | 3 +- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_panel.c | 2 + + drivers/gpu/drm/drm_pci.c | 4 +- + drivers/gpu/drm/drm_plane.c | 23 +- + drivers/gpu/drm/drm_plane_helper.c | 1 + + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_property.c | 8 +- + drivers/gpu/drm/drm_scatter.c | 8 +- + drivers/gpu/drm/drm_syncobj.c | 132 +- + drivers/gpu/drm/drm_vblank.c | 10 +- + drivers/gpu/drm/drm_vma_manager.c | 3 - + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 8 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 26 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 +- + drivers/gpu/drm/i915/Kconfig.debug | 12 + + drivers/gpu/drm/i915/gvt/cfg_space.c | 12 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 11 +- + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 9 + + drivers/gpu/drm/i915/gvt/gtt.c | 9 +- + drivers/gpu/drm/i915/gvt/gvt.c | 3 +- + drivers/gpu/drm/i915/gvt/handlers.c | 34 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/gvt/mmio.c | 3 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 13 - + drivers/gpu/drm/i915/gvt/mmio_context.h | 3 + + drivers/gpu/drm/i915/gvt/opregion.c | 1 - + drivers/gpu/drm/i915/gvt/page_track.c | 2 + + drivers/gpu/drm/i915/gvt/reg.h | 18 + + drivers/gpu/drm/i915/gvt/scheduler.c | 64 +- + drivers/gpu/drm/i915/i915_debugfs.c | 99 +- + drivers/gpu/drm/i915/i915_drv.c | 500 +- + drivers/gpu/drm/i915/i915_drv.h | 97 +- + drivers/gpu/drm/i915/i915_gem.c | 93 +- + drivers/gpu/drm/i915/i915_gem.h | 6 - + drivers/gpu/drm/i915/i915_gem_clflush.c | 7 - + drivers/gpu/drm/i915/i915_gem_context.c | 252 +- + drivers/gpu/drm/i915/i915_gem_context.h | 59 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 52 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 102 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 23 +- + drivers/gpu/drm/i915/i915_gem_object.h | 10 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 20 +- + drivers/gpu/drm/i915/i915_irq.c | 36 +- + drivers/gpu/drm/i915/i915_pci.c | 15 +- + drivers/gpu/drm/i915/i915_perf.c | 178 +- + drivers/gpu/drm/i915/i915_reg.h | 777 +- + drivers/gpu/drm/i915/i915_request.c | 23 +- + drivers/gpu/drm/i915/i915_request.h | 47 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 13 +- + drivers/gpu/drm/i915/i915_vma.c | 5 +- + drivers/gpu/drm/i915/i915_vma.h | 10 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 53 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 6 +- + drivers/gpu/drm/i915/intel_csr.c | 40 +- + drivers/gpu/drm/i915/intel_ddi.c | 225 +- + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_display.c | 823 +- + drivers/gpu/drm/i915/intel_display.h | 32 +- + drivers/gpu/drm/i915/intel_dp.c | 509 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 25 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 16 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 62 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 1 + + drivers/gpu/drm/i915/intel_drv.h | 97 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 96 +- + drivers/gpu/drm/i915/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/intel_fbdev.c | 6 +- + drivers/gpu/drm/i915/intel_guc.c | 102 +- + drivers/gpu/drm/i915/intel_guc.h | 12 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 2 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 7 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 1 + + drivers/gpu/drm/i915/intel_guc_log.c | 2 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 115 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 4 + + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdcp.c | 6 +- + drivers/gpu/drm/i915/intel_hdmi.c | 10 +- + drivers/gpu/drm/i915/intel_huc.c | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 16 +- + drivers/gpu/drm/i915/intel_lrc.c | 216 +- + drivers/gpu/drm/i915/intel_lrc.h | 2 - + drivers/gpu/drm/i915/intel_lrc_reg.h | 2 +- + drivers/gpu/drm/i915/intel_mocs.c | 11 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 147 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 119 +- + drivers/gpu/drm/i915/intel_pm.c | 120 +- + drivers/gpu/drm/i915/intel_psr.c | 277 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 133 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 1005 +- + drivers/gpu/drm/i915/intel_sdvo.c | 101 +- + drivers/gpu/drm/i915/intel_sprite.c | 503 +- + drivers/gpu/drm/i915/intel_uc.c | 4 + + drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 130 +- + drivers/gpu/drm/i915/intel_wopcm.c | 6 + + drivers/gpu/drm/i915/selftests/huge_pages.c | 13 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 221 + + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 40 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 202 + + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 2 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 8 + + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 8 - + drivers/gpu/drm/i915/selftests/intel_guc.c | 42 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 101 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 8 + + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 5 + + drivers/gpu/drm/i915/selftests/mock_context.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 + + drivers/gpu/drm/imx/imx-drm-core.c | 19 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 9 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 + + drivers/gpu/drm/msm/msm_atomic.c | 2 + + drivers/gpu/drm/msm/msm_fence.c | 8 - + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 53 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 40 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/nouveau/nouveau_fence.c | 1 - + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 139 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 175 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 277 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 132 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 187 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 197 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 88 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 247 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 103 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 146 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 101 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 165 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 102 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 192 +- + drivers/gpu/drm/omapdrm/dss/base.c | 217 +- + drivers/gpu/drm/omapdrm/dss/core.c | 26 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 26 +- + drivers/gpu/drm/omapdrm/dss/display.c | 134 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 192 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 569 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 47 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 45 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 351 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 334 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 8 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 306 +- + drivers/gpu/drm/omapdrm/dss/output.c | 208 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 149 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 291 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 371 +- + drivers/gpu/drm/omapdrm/omap_connector.h | 7 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 111 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 302 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 19 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 159 +- + drivers/gpu/drm/omapdrm/omap_encoder.h | 6 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 6 +- + drivers/gpu/drm/qxl/qxl_display.c | 117 +- + drivers/gpu/drm/qxl/qxl_draw.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.c | 28 +- + drivers/gpu/drm/qxl/qxl_drv.h | 32 +- + drivers/gpu/drm/qxl/qxl_fb.c | 197 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 80 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 25 + + drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/r600_reg.h | 31 +- + drivers/gpu/drm/radeon/radeon_drv.c | 23 +- + drivers/gpu/drm/radeon/radeon_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_test.c | 10 +- + drivers/gpu/drm/radeon/si.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 1 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 466 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 85 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 94 +- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 99 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 360 +- + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 48 +- + drivers/gpu/drm/rockchip/Kconfig | 25 +- + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 104 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 48 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + + drivers/gpu/drm/rockchip/rockchip_rgb.c | 173 + + drivers/gpu/drm/rockchip/rockchip_rgb.h | 33 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 215 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 99 + + drivers/gpu/drm/scheduler/Makefile | 2 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 24 + + drivers/gpu/drm/scheduler/sched_entity.c | 525 + + .../scheduler/{gpu_scheduler.c => sched_main.c} | 407 +- + drivers/gpu/drm/shmobile/Kconfig | 1 + + drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_backlight.h | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.h | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.h | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 6 +- + drivers/gpu/drm/sti/sti_drv.c | 8 +- + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/sti/sti_hdmi.c | 1 - + drivers/gpu/drm/sun4i/sun4i_backend.c | 81 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 3 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 20 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 203 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 27 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 17 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 + + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 12 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 48 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/tegra/dc.c | 73 + + drivers/gpu/drm/tegra/dc.h | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 47 +- + drivers/gpu/drm/tegra/drm.h | 4 - + drivers/gpu/drm/tegra/fb.c | 24 +- + drivers/gpu/drm/tegra/hub.c | 19 +- + drivers/gpu/drm/tegra/hub.h | 1 + + drivers/gpu/drm/tegra/sor.c | 110 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 91 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 5 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +- + drivers/gpu/drm/tve200/tve200_drv.c | 14 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/v3d/v3d_gem.c | 6 +- + drivers/gpu/drm/v3d/v3d_sched.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 25 +- + drivers/gpu/drm/vc4/vc4_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 6 - + drivers/gpu/drm/vc4/vc4_plane.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/vgem/vgem_fence.c | 13 - + drivers/gpu/drm/virtio/virtgpu_display.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 30 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 19 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 60 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 11 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 39 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 79 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + drivers/gpu/drm/vkms/vkms_crc.c | 262 + + drivers/gpu/drm/vkms/vkms_crtc.c | 114 +- + drivers/gpu/drm/vkms/vkms_drv.c | 14 + + drivers/gpu/drm/vkms/vkms_drv.h | 75 +- + drivers/gpu/drm/vkms/vkms_gem.c | 83 +- + drivers/gpu/drm/vkms/vkms_output.c | 19 +- + drivers/gpu/drm/vkms/vkms_plane.c | 175 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 19 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/gpu/host1x/dev.c | 13 +- + drivers/staging/vboxvideo/vbox_fb.c | 3 +- + drivers/tty/vt/vt.c | 12 +- + drivers/video/fbdev/core/fbcon.c | 4 +- + drivers/video/fbdev/core/fbmem.c | 67 +- + include/drm/drmP.h | 3 - + include/drm/drm_atomic.h | 23 +- + include/drm/drm_atomic_helper.h | 3 + + include/drm/drm_atomic_uapi.h | 58 + + include/drm/drm_blend.h | 6 + + include/drm/drm_color_mgmt.h | 1 + + include/drm/drm_connector.h | 1 + + include/drm/drm_crtc.h | 41 +- + include/drm/drm_device.h | 10 + + include/drm/drm_dp_helper.h | 11 +- + include/drm/drm_drv.h | 9 +- + include/drm/drm_encoder.h | 1 + + include/drm/drm_fb_cma_helper.h | 1 - + include/drm/drm_fb_helper.h | 34 + + include/drm/drm_fourcc.h | 24 + + include/drm/drm_mode_config.h | 15 + + include/drm/drm_panel.h | 1 + + include/drm/drm_plane.h | 19 + + include/drm/drm_print.h | 2 +- + include/drm/drm_property.h | 2 + + include/drm/drm_syncobj.h | 9 +- + include/drm/drm_util.h | 32 + + include/drm/gpu_scheduler.h | 48 +- + include/drm/i915_pciids.h | 1 + + include/drm/ttm/ttm_bo_api.h | 16 +- + include/drm/ttm/ttm_bo_driver.h | 28 + + include/linux/console_struct.h | 1 - + include/linux/fb.h | 11 +- + include/linux/vt_kern.h | 7 - + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/drm/drm_fourcc.h | 39 + + include/uapi/drm/drm_mode.h | 3 +- + include/uapi/drm/i915_drm.h | 22 + + include/uapi/linux/kfd_ioctl.h | 13 +- + include/uapi/linux/udmabuf.h | 33 + + tools/testing/selftests/drivers/dma-buf/Makefile | 5 + + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 96 + + 724 files changed, 99656 insertions(+), 19014 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt + create mode 100644 Documentation/gpu/vkms.rst + create mode 100644 drivers/dma-buf/udmabuf.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dm_event_log.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_info_packet.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_shared.h + create mode 100644 drivers/gpu/drm/amd/display/modules/info_packet/Makefile + create mode 100644 drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h + create mode 100644 drivers/gpu/drm/bridge/tc358764.c + create mode 100644 drivers/gpu/drm/bridge/ti-sn65dsi86.c + create mode 100644 drivers/gpu/drm/drm_atomic_uapi.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_rgb.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_rgb.h + create mode 100644 drivers/gpu/drm/scheduler/sched_entity.c + rename drivers/gpu/drm/scheduler/{gpu_scheduler.c => sched_main.c} (59%) + create mode 100644 drivers/gpu/drm/vkms/vkms_crc.c + create mode 100644 include/drm/drm_atomic_uapi.h + create mode 100644 include/drm/drm_util.h + create mode 100644 include/uapi/linux/udmabuf.h + create mode 100644 tools/testing/selftests/drivers/dma-buf/Makefile + create mode 100644 tools/testing/selftests/drivers/dma-buf/udmabuf.c +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 (87c2ee740c07 Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (87c2ee740c07 Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (96ab39afea7b drm/msm/A6xx: Send the right perf index value to GMU) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +Removing drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h +Removing drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 1 - + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 501 ++++----------------- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 115 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 248 ++-------- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 23 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 48 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 125 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 109 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 56 --- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 323 ------------- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 139 ------ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 14 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 4 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 29 -- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 7 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 29 -- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 7 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 33 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 18 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 17 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 3 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 16 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 45 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 43 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 285 ++---------- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 44 -- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 1 - + drivers/gpu/drm/msm/dsi/dsi.c | 10 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 2 + + drivers/gpu/drm/msm/msm_rd.c | 6 +- + 39 files changed, 343 insertions(+), 2017 deletions(-) + delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c + delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (bfde4538e64c drm/arm/malidp: Validate rotations for compressed/uncompressed framebuffers for each layer) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging drivers/gpu/drm/arm/malidp_regs.h +Auto-merging drivers/gpu/drm/arm/malidp_hw.h +Auto-merging drivers/gpu/drm/arm/malidp_hw.c +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 28 +-- + drivers/gpu/drm/arm/malidp_drv.h | 9 + + drivers/gpu/drm/arm/malidp_hw.c | 54 ++++-- + drivers/gpu/drm/arm/malidp_hw.h | 8 + + drivers/gpu/drm/arm/malidp_planes.c | 340 +++++++++++++++++++++++++++++++----- + drivers/gpu/drm/arm/malidp_regs.h | 11 ++ + 6 files changed, 378 insertions(+), 72 deletions(-) +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 (5c41bb607125 gpu: ipu-v3: add support for XRGB32 and XBGR32 V4L2 pixel formats) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (1a866306e0fb drm/etnaviv: add DMA configuration for etnaviv platform device) +$ 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 (fadf3e019411 Merge remote-tracking branch 'regmap/topic/single-rw' into regmap-next) +$ git merge regmap/for-next +Auto-merging sound/soc/codecs/rt5682.c +Auto-merging sound/soc/codecs/rt5514.c +Auto-merging drivers/hwmon/lm75.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 2 +- + drivers/base/regmap/regmap.c | 4 ++-- + drivers/edac/altera_edac.c | 3 ++- + drivers/hwmon/lm75.c | 3 ++- + drivers/hwmon/lm95245.c | 3 ++- + drivers/hwmon/tmp102.c | 3 ++- + drivers/hwmon/tmp108.c | 3 ++- + drivers/iio/light/apds9960.c | 3 ++- + drivers/iio/light/max44000.c | 23 ++++++++++++----------- + drivers/iio/temperature/mlx90632.c | 3 ++- + drivers/input/touchscreen/tsc200x-core.c | 3 ++- + drivers/mfd/altera-a10sr.c | 3 ++- + drivers/mfd/da9052-spi.c | 3 ++- + drivers/mfd/mc13xxx-spi.c | 3 ++- + drivers/mfd/twl6040.c | 3 ++- + drivers/regulator/ltc3589.c | 3 ++- + drivers/regulator/ltc3676.c | 3 ++- + include/linux/regmap.h | 12 ++++++++---- + sound/hda/hdac_regmap.c | 3 ++- + sound/soc/codecs/cs35l33.c | 3 ++- + sound/soc/codecs/cs35l35.c | 3 ++- + sound/soc/codecs/cs43130.c | 4 +++- + sound/soc/codecs/es8328.c | 3 ++- + sound/soc/codecs/rt1305.c | 3 ++- + sound/soc/codecs/rt5514.c | 3 ++- + sound/soc/codecs/rt5616.c | 3 ++- + sound/soc/codecs/rt5640.c | 3 ++- + sound/soc/codecs/rt5645.c | 9 ++++++--- + sound/soc/codecs/rt5651.c | 3 ++- + sound/soc/codecs/rt5660.c | 3 ++- + sound/soc/codecs/rt5663.c | 9 ++++++--- + sound/soc/codecs/rt5665.c | 3 ++- + sound/soc/codecs/rt5668.c | 3 ++- + sound/soc/codecs/rt5670.c | 3 ++- + sound/soc/codecs/rt5682.c | 3 ++- + 35 files changed, 94 insertions(+), 53 deletions(-) +Merging sound/for-next (edb1b3abdb20 ALSA: hda/ca0132 - Add AE-5 exit function) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + {sound/pci/hda => include/sound}/hda_codec.h | 0 + include/sound/memalloc.h | 3 + + sound/aoa/soundbus/i2sbus/core.c | 15 +- + sound/core/memalloc.c | 40 +- + sound/core/oss/pcm_plugin.c | 4 +- + sound/core/pcm_lib.c | 21 +- + sound/core/seq/seq_system.c | 22 +- + sound/core/sgbuf.c | 15 +- + sound/mips/hal2.c | 13 +- + sound/pci/atiixp.c | 6 +- + sound/pci/cs46xx/cs46xx_lib.c | 6 +- + sound/pci/emu10k1/emupcm.c | 3 +- + sound/pci/hda/hda_auto_parser.c | 2 +- + sound/pci/hda/hda_beep.h | 2 +- + sound/pci/hda/hda_bind.c | 2 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 36 +- + sound/pci/hda/hda_controller.h | 20 +- + sound/pci/hda/hda_eld.c | 2 +- + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/hda/hda_hwdep.c | 2 +- + sound/pci/hda/hda_intel.c | 108 +-- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/hda/hda_proc.c | 2 +- + sound/pci/hda/hda_sysfs.c | 2 +- + sound/pci/hda/hda_tegra.c | 20 +- + sound/pci/hda/patch_analog.c | 2 +- + sound/pci/hda/patch_ca0110.c | 2 +- + sound/pci/hda/patch_ca0132.c | 1285 +++++++++++++++++++++----- + sound/pci/hda/patch_cirrus.c | 2 +- + sound/pci/hda/patch_cmedia.c | 2 +- + sound/pci/hda/patch_conexant.c | 2 +- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 2 +- + sound/pci/hda/patch_si3054.c | 2 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/pci/hda/patch_via.c | 2 +- + sound/pci/intel8x0.c | 89 +- + sound/pci/intel8x0m.c | 20 +- + sound/pci/rme32.c | 22 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/x86/intel_hdmi_audio.c | 29 +- + sound/xen/xen_snd_front_alsa.c | 46 +- + 43 files changed, 1244 insertions(+), 621 deletions(-) + rename {sound/pci/hda => include/sound}/hda_codec.h (100%) +Merging sound-asoc/for-next (dce5c4639f31 Merge branch 'asoc-4.20' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/codecs/rt5682.c +Auto-merging sound/soc/codecs/rt5670.c +Auto-merging sound/soc/codecs/rt5668.c +Auto-merging sound/soc/codecs/rt5663.c +Auto-merging sound/soc/codecs/rt5651.c +Auto-merging sound/soc/codecs/es8328.c +Auto-merging sound/pci/hda/patch_ca0132.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,axg-pdm.txt | 24 + + .../devicetree/bindings/sound/maxim,max98088.txt | 15 + + .../bindings/sound/mikroe,mikroe-proto.txt | 23 + + .../devicetree/bindings/sound/pcm3060.txt | 17 + + .../devicetree/bindings/sound/qcom,q6afe.txt | 18 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 5 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 7 + + include/sound/simple_card_utils.h | 27 +- + include/sound/soc-acpi-intel-match.h | 6 + + include/sound/soc-dapm.h | 9 - + include/sound/soc-dpcm.h | 10 + + include/sound/soc.h | 45 +- + sound/arm/Kconfig | 1 - + sound/pci/hda/hda_bind.c | 12 + + sound/pci/hda/patch_ca0132.c | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 75 ++- + sound/soc/amd/acp-pcm-dma.c | 8 +- + sound/soc/amd/acp.h | 3 +- + sound/soc/atmel/Kconfig | 12 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/atmel_ssc_dai.c | 13 +- + sound/soc/atmel/mikroe-proto.c | 165 ++++++ + sound/soc/atmel/tse850-pcm5142.c | 78 ++- + sound/soc/bcm/cygnus-ssp.c | 13 +- + sound/soc/codecs/Kconfig | 28 +- + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/adau17x1.c | 86 ++- + sound/soc/codecs/adau17x1.h | 4 - + sound/soc/codecs/cs4265.c | 12 +- + sound/soc/codecs/dmic.c | 1 + + sound/soc/codecs/es8328.c | 4 +- + sound/soc/codecs/hdac_hda.c | 483 +++++++++++++++ + sound/soc/codecs/hdac_hda.h | 24 + + sound/soc/codecs/hdac_hdmi.c | 11 +- + sound/soc/codecs/max98088.c | 10 + + sound/soc/codecs/max98373.c | 1 + + sound/soc/codecs/pcm3060-i2c.c | 60 ++ + sound/soc/codecs/pcm3060-spi.c | 59 ++ + sound/soc/codecs/pcm3060.c | 295 ++++++++++ + sound/soc/codecs/pcm3060.h | 88 +++ + sound/soc/codecs/rt5651.c | 1 - + sound/soc/codecs/rt5663.c | 7 +- + sound/soc/codecs/rt5668.c | 10 +- + sound/soc/codecs/rt5670.c | 12 + + sound/soc/codecs/rt5677-spi.c | 1 - + sound/soc/codecs/rt5682.c | 81 ++- + sound/soc/codecs/rt5682.h | 14 + + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/tas5720.c | 103 +++- + sound/soc/codecs/tas6424.c | 58 +- + sound/soc/codecs/tas6424.h | 10 + + sound/soc/codecs/tlv320aic31xx.c | 85 +++ + sound/soc/codecs/tlv320aic31xx.h | 23 + + sound/soc/codecs/tscs454.c | 2 +- + sound/soc/codecs/wm8904.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/davinci/davinci-mcasp.c | 37 ++ + sound/soc/fsl/fsl_asrc_dma.c | 2 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_utils.c | 4 +- + sound/soc/fsl/pcm030-audio-fabric.c | 5 +- + sound/soc/generic/audio-graph-card.c | 18 +- + sound/soc/generic/audio-graph-scu-card.c | 55 +- + sound/soc/generic/simple-card-utils.c | 53 +- + sound/soc/generic/simple-card.c | 30 +- + sound/soc/generic/simple-scu-card.c | 54 +- + sound/soc/hisilicon/hi6210-i2s.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +- + sound/soc/intel/boards/Kconfig | 9 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/broadwell.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 9 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 5 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 5 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 127 ++++ + sound/soc/intel/boards/skl_hda_dsp_common.h | 38 ++ + sound/soc/intel/boards/skl_hda_dsp_generic.c | 183 ++++++ + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 40 ++ + sound/soc/intel/skylake/skl-pcm.c | 70 ++- + sound/soc/intel/skylake/skl-topology.c | 3 +- + sound/soc/intel/skylake/skl.c | 96 ++- + sound/soc/intel/skylake/skl.h | 12 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 14 +- + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 14 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 12 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- + sound/soc/meson/Kconfig | 13 + + sound/soc/meson/Makefile | 2 + + sound/soc/meson/axg-card.c | 16 +- + sound/soc/meson/axg-fifo.c | 2 + + sound/soc/meson/axg-pdm.c | 654 +++++++++++++++++++++ + sound/soc/meson/axg-tdm-interface.c | 50 +- + sound/soc/nuc900/nuc900-ac97.c | 4 +- + sound/soc/omap/omap-hdmi-audio.c | 4 +- + sound/soc/pxa/Kconfig | 13 +- + sound/soc/pxa/pxa2xx-ac97.c | 48 +- + sound/soc/qcom/apq8096.c | 7 +- + sound/soc/qcom/qdsp6/q6adm.c | 17 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 3 +- + sound/soc/qcom/qdsp6/q6asm.c | 1 - + sound/soc/qcom/qdsp6/q6core.c | 9 +- + sound/soc/qcom/sdm845.c | 7 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 1 - + sound/soc/rockchip/rockchip_pcm.c | 3 +- + sound/soc/samsung/tm2_wm5110.c | 13 +- + sound/soc/sh/hac.c | 3 +- + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/sh/rcar/core.c | 124 ++-- + sound/soc/sh/rcar/ctu.c | 2 +- + sound/soc/sh/rcar/dma.c | 109 ++-- + sound/soc/sh/rcar/gen.c | 33 +- + sound/soc/sh/rcar/rsnd.h | 63 +- + sound/soc/sh/rcar/src.c | 2 +- + sound/soc/sh/rcar/ssi.c | 89 +-- + sound/soc/sh/rcar/ssiu.c | 92 ++- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 438 +++++++------- + sound/soc/soc-dapm.c | 432 +++++++------- + sound/soc/soc-ops.c | 4 +- + sound/soc/soc-pcm.c | 253 ++++---- + sound/soc/soc-topology.c | 11 - + sound/soc/soc-utils.c | 4 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 7 +- + sound/soc/txx9/txx9aclc-ac97.c | 3 +- + 134 files changed, 4499 insertions(+), 1204 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98088.txt + create mode 100644 Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm3060.txt + create mode 100644 sound/soc/atmel/mikroe-proto.c + create mode 100644 sound/soc/codecs/hdac_hda.c + create mode 100644 sound/soc/codecs/hdac_hda.h + create mode 100644 sound/soc/codecs/pcm3060-i2c.c + create mode 100644 sound/soc/codecs/pcm3060-spi.c + create mode 100644 sound/soc/codecs/pcm3060.c + create mode 100644 sound/soc/codecs/pcm3060.h + create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c + create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h + create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-hda-match.c + create mode 100644 sound/soc/meson/axg-pdm.c +Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy) +$ git merge modules/modules-next +Already up to date. +Merging input/next (d2587800598c Input: atmel_mxt_ts - fix multiple <linux/property.h> includes) +$ git merge input/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/input/pwm-vibrator.txt | 4 ++-- + drivers/input/keyboard/sun4i-lradc-keys.c | 6 +++--- + drivers/input/touchscreen/atmel_mxt_ts.c | 1 - + 3 files changed, 5 insertions(+), 6 deletions(-) +Merging block/for-next (72915e1a096c Merge branch 'for-4.20/libata' into for-next) +$ git merge block/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 8 +- + .../devicetree/bindings/ata/ahci-platform.txt | 6 +- + .../devicetree/bindings/ata/brcm,sata-brcm.txt | 1 + + arch/arm/include/asm/io.h | 15 - + arch/arm64/include/asm/io.h | 9 - + arch/m68k/emu/nfblock.c | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/x86/include/asm/io.h | 12 - + arch/x86/include/asm/xen/events.h | 2 + + arch/x86/xen/enlighten.c | 1 + + arch/x86/xen/enlighten_pvh.c | 1 + + arch/x86/xen/platform-pci-unplug.c | 1 + + arch/x86/xen/pmu.c | 1 + + block/Kconfig | 3 + + block/Makefile | 1 + + block/bfq-cgroup.c | 4 +- + block/bfq-iosched.c | 80 ++- + block/bfq-iosched.h | 26 + + block/bfq-wf2q.c | 13 +- + block/bio-integrity.c | 12 +- + block/bio.c | 202 +++++--- + block/blk-cgroup.c | 123 +++-- + block/blk-core.c | 270 ++-------- + block/blk-integrity.c | 12 +- + block/blk-iolatency.c | 230 ++++++--- + block/blk-merge.c | 88 +++- + block/blk-mq-debugfs.c | 10 +- + block/blk-mq-sched.h | 4 +- + block/blk-mq-tag.c | 69 ++- + block/blk-mq.c | 9 +- + block/blk-pm.c | 216 ++++++++ + block/blk-pm.h | 69 +++ + block/blk-stat.c | 1 + + block/blk-throttle.c | 54 +- + block/blk.h | 71 ++- + block/bounce.c | 4 +- + block/cfq-iosched.c | 4 +- + block/elevator.c | 22 +- + block/genhd.c | 19 +- + block/kyber-iosched.c | 547 ++++++++++++--------- + drivers/ata/Kconfig | 3 +- + drivers/ata/ahci.h | 2 + + drivers/ata/ahci_brcm.c | 8 + + drivers/ata/ahci_platform.c | 15 +- + drivers/ata/ahci_sunxi.c | 3 +- + drivers/ata/libahci_platform.c | 54 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/pata_atiixp.c | 2 +- + drivers/block/aoe/aoe.h | 1 - + drivers/block/aoe/aoeblk.c | 21 +- + drivers/block/aoe/aoedev.c | 1 - + drivers/block/drbd/drbd_int.h | 13 +- + drivers/block/drbd/drbd_main.c | 14 +- + drivers/block/drbd/drbd_nl.c | 39 +- + drivers/block/drbd/drbd_receiver.c | 35 +- + drivers/block/drbd/drbd_worker.c | 63 +-- + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 5 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/ps3disk.c | 2 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/rsxx/cregs.c | 2 +- + drivers/block/rsxx/dev.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/block/sunvdc.c | 2 +- + drivers/block/umem.c | 4 +- + drivers/block/virtio_blk.c | 68 +-- + drivers/block/xen-blkfront.c | 2 +- + drivers/block/zram/zram_drv.c | 28 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-gd.c | 2 +- + drivers/md/raid0.c | 2 +- + drivers/memstick/core/ms_block.c | 2 +- + drivers/memstick/core/mspro_block.c | 2 +- + drivers/mmc/core/block.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/nvdimm/blk.c | 2 +- + drivers/nvdimm/btt.c | 2 +- + drivers/nvdimm/pmem.c | 2 +- + drivers/nvme/host/core.c | 21 +- + drivers/nvme/host/lightnvm.c | 105 ++-- + drivers/nvme/host/multipath.c | 15 +- + drivers/nvme/host/nvme.h | 10 +- + drivers/s390/block/dasd_genhd.c | 2 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/block/scm_blk.c | 2 +- + drivers/scsi/scsi_lib.c | 11 +- + drivers/scsi/scsi_pm.c | 1 + + drivers/scsi/sd.c | 3 +- + drivers/scsi/sr.c | 3 +- + drivers/xen/biomerge.c | 3 +- + drivers/xen/xen-acpi-pad.c | 1 + + fs/buffer.c | 10 +- + fs/ext4/page-io.c | 2 +- + include/linux/bio.h | 75 +-- + include/linux/blk-cgroup.h | 145 ++++-- + include/linux/blk-pm.h | 24 + + include/linux/blk_types.h | 1 - + include/linux/blkdev.h | 156 +----- + include/linux/bvec.h | 3 - + include/linux/cgroup.h | 2 + + include/linux/elevator.h | 2 +- + include/linux/genhd.h | 5 +- + include/linux/percpu-refcount.h | 1 + + include/linux/writeback.h | 5 +- + include/trace/events/kyber.h | 96 ++++ + include/xen/xen.h | 4 + + kernel/cgroup/cgroup.c | 48 +- + kernel/trace/blktrace.c | 4 +- + lib/percpu-refcount.c | 28 +- + mm/page_io.c | 2 +- + 111 files changed, 2030 insertions(+), 1407 deletions(-) + create mode 100644 block/blk-pm.c + create mode 100644 block/blk-pm.h + create mode 100644 include/linux/blk-pm.h + create mode 100644 include/trace/events/kyber.h +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 (cd3085739323 dm cache: fix resize crash if user doesn't reload cache table) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-metadata.c | 17 ++++++++++++++++- + drivers/md/dm-cache-metadata.h | 3 ++- + drivers/md/dm-cache-target.c | 11 ++++++++--- + drivers/md/dm-mpath.c | 14 ++++++++------ + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-thin-metadata.c | 6 ++---- + 6 files changed, 37 insertions(+), 16 deletions(-) +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4000_cs.c | 4 ++-- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 4 ++-- + drivers/pcmcia/ricoh.h | 35 +++++++++++++++++++++++++++++++++++ + drivers/pcmcia/yenta_socket.c | 3 ++- + 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 | 19 ++++++------------- + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 10 files changed, 51 insertions(+), 65 deletions(-) +Merging mmc/next (a1d467600ca6 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/jz4740.txt | 1 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 72 +++ + .../devicetree/bindings/mmc/renesas,mmcif.txt | 4 +- + .../devicetree/bindings/mmc/sdhci-sprd.txt | 41 ++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 6 +- + .../devicetree/bindings/mmc/uniphier-sd.txt | 55 ++ + MAINTAINERS | 1 + + arch/arm/mach-integrator/integrator_cp.c | 2 - + arch/arm/mach-omap2/hsmmc.h | 2 - + arch/arm/mach-omap2/pdata-quirks.c | 2 - + arch/arm/mach-versatile/versatile_dt.c | 4 - + drivers/mmc/core/Kconfig | 2 +- + drivers/mmc/host/Kconfig | 26 +- + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/dw_mmc-hi3798cv200.c | 8 + + drivers/mmc/host/jz4740_mmc.c | 5 +- + drivers/mmc/host/mmci.c | 86 +-- + drivers/mmc/host/mmci.h | 2 - + drivers/mmc/host/mxcmmc.c | 5 +- + drivers/mmc/host/omap_hsmmc.c | 171 +---- + drivers/mmc/host/renesas_sdhi.h | 5 +- + drivers/mmc/host/renesas_sdhi_core.c | 66 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 21 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- + drivers/mmc/host/sdhci-acpi.c | 68 ++ + drivers/mmc/host/sdhci-esdhc.h | 1 + + drivers/mmc/host/sdhci-iproc.c | 59 +- + drivers/mmc/host/sdhci-of-arasan.c | 3 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 39 ++ + drivers/mmc/host/sdhci-of-esdhc.c | 44 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 3 + + drivers/mmc/host/sdhci-pltfm.c | 68 +- + drivers/mmc/host/sdhci-pltfm.h | 7 +- + drivers/mmc/host/sdhci-pxav3.c | 14 - + drivers/mmc/host/sdhci-sirf.c | 28 +- + drivers/mmc/host/sdhci-spear.c | 33 +- + drivers/mmc/host/sdhci-sprd.c | 498 +++++++++++++++ + drivers/mmc/host/sdhci-tegra.c | 675 ++++++++++++++++++-- + drivers/mmc/host/sdhci-xenon-phy.c | 4 +- + drivers/mmc/host/sdhci.c | 289 ++++++--- + drivers/mmc/host/sdhci.h | 37 +- + drivers/mmc/host/sh_mmcif.c | 7 +- + drivers/mmc/host/sunxi-mmc.c | 24 +- + drivers/mmc/host/tmio_mmc.c | 56 +- + drivers/mmc/host/tmio_mmc.h | 10 +- + drivers/mmc/host/tmio_mmc_core.c | 101 +-- + drivers/mmc/host/uniphier-sd.c | 693 +++++++++++++++++++++ + drivers/mmc/host/usdhi6rol0.c | 5 +- + include/linux/amba/mmci.h | 11 +- + include/linux/mmc/host.h | 5 + + include/linux/platform_data/hsmmc-omap.h | 3 - + include/linux/platform_data/pxa_sdhci.h | 4 - + 52 files changed, 2742 insertions(+), 641 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-sprd.txt + create mode 100644 Documentation/devicetree/bindings/mmc/uniphier-sd.txt + create mode 100644 drivers/mmc/host/sdhci-sprd.c + create mode 100644 drivers/mmc/host/uniphier-sd.c +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_bt.c | 4 ++-- + kernel/debug/kdb/kdb_main.c | 14 +++++++------- + kernel/debug/kdb/kdb_support.c | 12 ++++++------ + 3 files changed, 15 insertions(+), 15 deletions(-) +Merging md/for-next (d595567dc4f0 MD: fix invalid stored role for a disk) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 4 ++++ + drivers/md/raid10.c | 27 ++++++++++++++------------- + drivers/md/raid5.c | 12 ++++++++++++ + 3 files changed, 30 insertions(+), 13 deletions(-) +Merging mfd/for-mfd-next (92d6ba4ff700 mfd: ti-lmu: constify mfd_cell tables) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++ + drivers/mfd/Kconfig | 17 +++++-- + drivers/mfd/adp5520.c | 2 +- + drivers/mfd/arizona-core.c | 10 ++-- + drivers/mfd/cros_ec.c | 3 +- + drivers/mfd/intel_msic.c | 49 +++++--------------- + drivers/mfd/intel_soc_pmic_bxtwc.c | 56 ++++++++++++++--------- + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 5 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 5 +- + drivers/mfd/intel_soc_pmic_core.c | 25 ++++------ + drivers/mfd/intel_soc_pmic_core.h | 12 +---- + drivers/mfd/intel_soc_pmic_crc.c | 78 +++++++------------------------- + drivers/mfd/madera-core.c | 33 ++++++++------ + drivers/mfd/max14577.c | 28 ++++-------- + drivers/mfd/max77620.c | 2 +- + drivers/mfd/max77686.c | 32 ++++--------- + drivers/mfd/max77693.c | 34 ++++---------- + drivers/mfd/max77843.c | 19 +++----- + drivers/mfd/max8997-irq.c | 30 ++++-------- + drivers/mfd/max8997.c | 40 +++++----------- + drivers/mfd/max8998-irq.c | 18 +++----- + drivers/mfd/max8998.c | 28 +++--------- + drivers/mfd/mc13xxx-core.c | 3 +- + drivers/mfd/motorola-cpcap.c | 51 ++++++++++++++++++++- + drivers/mfd/sec-core.c | 16 ++----- + drivers/mfd/sec-irq.c | 24 +++++----- + drivers/mfd/ti-lmu.c | 14 +++--- + include/linux/mfd/ingenic-tcu.h | 56 +++++++++++++++++++++++ + include/linux/mfd/intel_msic.h | 7 +-- + include/linux/mfd/intel_soc_pmic.h | 13 ++---- + include/linux/mfd/intel_soc_pmic_bxtwc.h | 10 +--- + include/linux/mfd/madera/pdata.h | 1 - + include/linux/mfd/max14577-private.h | 11 +---- + include/linux/mfd/max14577.h | 11 +---- + include/linux/mfd/max77686-private.h | 15 +----- + include/linux/mfd/max77686.h | 15 +----- + include/linux/mfd/max77693-common.h | 6 +-- + include/linux/mfd/max77693-private.h | 15 +----- + include/linux/mfd/max77693.h | 15 +----- + include/linux/mfd/max77843-private.h | 6 +-- + include/linux/mfd/max8997-private.h | 15 +----- + include/linux/mfd/max8997.h | 16 +------ + include/linux/mfd/max8998-private.h | 15 +----- + include/linux/mfd/max8998.h | 15 +----- + include/linux/mfd/mc13xxx.h | 1 + + include/linux/mfd/samsung/core.h | 11 +---- + include/linux/mfd/samsung/irq.h | 10 +--- + include/linux/mfd/samsung/rtc.h | 15 +----- + include/linux/mfd/samsung/s2mpa01.h | 7 +-- + include/linux/mfd/samsung/s2mps11.h | 9 +--- + include/linux/mfd/samsung/s2mps13.h | 14 +----- + include/linux/mfd/samsung/s2mps14.h | 14 +----- + include/linux/mfd/samsung/s2mps15.h | 11 +---- + include/linux/mfd/samsung/s2mpu02.h | 14 +----- + include/linux/mfd/samsung/s5m8763.h | 10 +--- + include/linux/mfd/samsung/s5m8767.h | 10 +--- + 56 files changed, 357 insertions(+), 653 deletions(-) + create mode 100644 include/linux/mfd/ingenic-tcu.h +Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (a4ac1f5ced58 power: reset: qcom-pon: Add pms405 pon support) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/reset/qcom,pon.txt | 5 +- + .../devicetree/bindings/power/supply/bq25890.txt | 3 + + .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + + .../bindings/power/supply/sc2731_charger.txt | 40 ++ + arch/arm/mach-at91/pm_suspend.S | 8 + + drivers/power/reset/at91-sama5d2_shdwc.c | 119 +++-- + drivers/power/reset/qcom-pon.c | 1 + + drivers/power/reset/rmobile-reset.c | 5 +- + drivers/power/supply/Kconfig | 7 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500_fg.c | 52 ++- + drivers/power/supply/bq25890_charger.c | 62 ++- + drivers/power/supply/bq27xxx_battery.c | 9 + + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/cros_usbpd-charger.c | 117 ++++- + drivers/power/supply/max14577_charger.c | 22 +- + drivers/power/supply/max17040_battery.c | 18 +- + drivers/power/supply/max17042_battery.c | 32 +- + drivers/power/supply/max77693_charger.c | 22 +- + drivers/power/supply/max8997_charger.c | 26 +- + drivers/power/supply/max8998_charger.c | 28 +- + drivers/power/supply/power_supply_sysfs.c | 3 +- + drivers/power/supply/sc2731_charger.c | 504 +++++++++++++++++++++ + drivers/power/supply/twl4030_charger.c | 30 +- + include/linux/mfd/cros_ec_commands.h | 10 + + include/linux/power/bq27xxx_battery.h | 1 + + 26 files changed, 918 insertions(+), 210 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/sc2731_charger.txt + create mode 100644 drivers/power/supply/sc2731_charger.c +Merging regulator/for-next (77ca23434f3f Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next) +$ git merge regulator/for-next +Removing drivers/regulator/bd71837-regulator.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 17 +- + .../devicetree/bindings/regulator/pfuze100.txt | 5 + + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 23 + + .../bindings/regulator/rohm,bd71837-regulator.txt | 12 +- + arch/arm/mach-imx/mach-mx21ads.c | 12 +- + arch/arm/mach-imx/mach-mx27ads.c | 12 +- + arch/arm/mach-mmp/brownstone.c | 12 +- + arch/arm/mach-omap1/board-ams-delta.c | 12 +- + arch/arm/mach-omap2/pdata-quirks.c | 16 +- + arch/arm/mach-pxa/em-x270.c | 1 - + arch/arm/mach-pxa/ezx.c | 33 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 12 +- + arch/arm/mach-pxa/zeus.c | 23 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-sa1100/assabet.c | 21 +- + arch/arm/mach-sa1100/generic.c | 5 +- + arch/arm/mach-sa1100/generic.h | 3 +- + arch/arm/mach-sa1100/shannon.c | 4 +- + arch/sh/boards/mach-ecovec24/setup.c | 27 +- + .../intel-mid/device_libs/platform_bcm43xx.c | 17 +- + drivers/mfd/rohm-bd718x7.c | 162 ++- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/Makefile | 2 +- + drivers/regulator/bd71837-regulator.c | 645 ----------- + drivers/regulator/bd718x7-regulator.c | 1138 ++++++++++++++++++++ + drivers/regulator/core.c | 124 ++- + drivers/regulator/da9052-regulator.c | 2 +- + drivers/regulator/da9055-regulator.c | 2 +- + drivers/regulator/fixed-helper.c | 1 - + drivers/regulator/fixed.c | 33 +- + drivers/regulator/helpers.c | 243 ++++- + drivers/regulator/isl9305.c | 4 + + drivers/regulator/max8997-regulator.c | 4 +- + drivers/regulator/mc13xxx-regulator-core.c | 2 +- + drivers/regulator/of_regulator.c | 44 +- + drivers/regulator/pfuze100-regulator.c | 91 ++ + drivers/regulator/qcom-rpmh-regulator.c | 17 +- + drivers/regulator/qcom_smd-regulator.c | 77 ++ + drivers/regulator/s5m8767.c | 12 +- + include/linux/mfd/rohm-bd718x7.h | 333 +++--- + include/linux/regulator/driver.h | 20 +- + include/linux/regulator/fixed.h | 3 - + kernel/reboot.c | 1 + + 45 files changed, 2144 insertions(+), 1089 deletions(-) + delete mode 100644 drivers/regulator/bd71837-regulator.c + create mode 100644 drivers/regulator/bd718x7-regulator.c +Merging security/next-testing (ad33b870a66b Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/smack/smackfs.c +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. + include/uapi/linux/keyctl.h | 7 ++++++- + kernel/seccomp.c | 4 ++-- + security/commoncap.c | 3 --- + security/smack/smack_lsm.c | 15 +++++++++++---- + security/smack/smackfs.c | 3 --- + security/tomoyo/common.c | 3 ++- + 6 files changed, 21 insertions(+), 14 deletions(-) +Merging apparmor/apparmor-next (1f8266ff5884 apparmor: don't try to replace stale label in ptrace access check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'recursive' strategy. + security/apparmor/include/cred.h | 2 ++ + security/apparmor/lsm.c | 4 ++-- + security/apparmor/net.c | 15 +++++++++------ + 3 files changed, 13 insertions(+), 8 deletions(-) +Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check in evm_write_xattrs()) +$ git merge integrity/next-integrity +Already up to date. +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 (4458bba09788 selinux: Add __GFP_NOWARN to allocation at str_read()) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 5 ++ + security/selinux/ss/mls.c | 178 ++++++++++++++++++----------------------- + security/selinux/ss/mls.h | 2 +- + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/services.c | 12 +-- + 5 files changed, 88 insertions(+), 111 deletions(-) +Merging tpmdd/next (8abac8d7b90d tpm: Restore functionality to xen vtpm driver.) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/Kconfig +Merge made by the 'recursive' strategy. + drivers/char/tpm/Kconfig | 2 +- + drivers/char/tpm/tpm-dev-common.c | 147 ++++++++++++++++++++++++++++---------- + drivers/char/tpm/tpm-dev.c | 11 +-- + drivers/char/tpm/tpm-dev.h | 18 +++-- + drivers/char/tpm/tpm-interface.c | 30 ++++++-- + drivers/char/tpm/tpm.h | 2 + + drivers/char/tpm/tpm2-cmd.c | 4 +- + drivers/char/tpm/tpmrm-dev.c | 15 +--- + drivers/char/tpm/xen-tpmfront.c | 2 +- + 9 files changed, 157 insertions(+), 74 deletions(-) +Merging watchdog/master (17b57b1883c1 Linux 4.19-rc6) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (dae804ddad96 Merge branches 'iommu/fixes', 'arm/renesas', 'ppc/pamu', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/fsl/mc.h +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 39 +++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 7 +- + arch/arm64/mm/dma-mapping.c | 10 +- + arch/x86/include/asm/irq_remapping.h | 2 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 16 +- + drivers/iommu/Kconfig | 13 + + drivers/iommu/Makefile | 1 + + drivers/iommu/arm-smmu.c | 7 + + drivers/iommu/dma-iommu.c | 23 +- + drivers/iommu/fsl_pamu_domain.c | 119 ++++---- + drivers/iommu/intel-iommu-debugfs.c | 314 +++++++++++++++++++++ + drivers/iommu/intel-iommu.c | 32 +-- + drivers/iommu/intel_irq_remapping.c | 2 +- + drivers/iommu/iommu.c | 44 +-- + drivers/iommu/iova.c | 22 +- + drivers/iommu/ipmmu-vmsa.c | 5 +- + drivers/iommu/of_iommu.c | 25 +- + drivers/of/base.c | 102 +++++++ + drivers/of/irq.c | 5 +- + drivers/pci/of.c | 101 ------- + include/linux/fsl/mc.h | 8 + + include/linux/intel-iommu.h | 72 +++++ + include/linux/iommu.h | 9 +- + include/linux/iova.h | 1 + + include/linux/of.h | 11 + + include/linux/of_pci.h | 10 - + 26 files changed, 734 insertions(+), 266 deletions(-) + create mode 100644 drivers/iommu/intel-iommu-debugfs.c +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (cf3f98c7f466 drivers/vfio: Allow type-1 IOMMU instantiation with all ARM/ARM64 IOMMUs) +$ git merge vfio/next +Auto-merging drivers/vfio/Kconfig +CONFLICT (content): Merge conflict in drivers/vfio/Kconfig +Resolved 'drivers/vfio/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5a77cc55f7f2] Merge remote-tracking branch 'vfio/next' +$ git diff -M --stat --summary HEAD^.. + drivers/vfio/Kconfig | 2 +- + drivers/vfio/pci/vfio_pci.c | 8 ++++++-- + drivers/vfio/pci/vfio_pci_config.c | 31 ++++++++++++++++++++++++++++++- + 3 files changed, 37 insertions(+), 4 deletions(-) +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (57361846b52b Linux 4.19-rc2) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (b2efb5b04591 soc: Convert to using %pOFn instead of device_node.name) +$ git merge devicetree/for-next +Auto-merging include/linux/of.h +Auto-merging drivers/soc/ti/knav_dma.c +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/soc/qcom/apr.c +CONFLICT (content): Merge conflict in drivers/soc/qcom/apr.c +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/device.c +Auto-merging drivers/of/base.c +Auto-merging drivers/clk/mvebu/clk-cpu.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging arch/xtensa/platforms/xtfpga/setup.c +Auto-merging arch/c6x/kernel/setup.c +Auto-merging arch/arm/mach-shmobile/timer.c +Auto-merging arch/arm/mach-shmobile/pm-rmobile.c +Auto-merging arch/arm/mach-shmobile/pm-rcar-gen2.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Recorded preimage for 'drivers/soc/qcom/apr.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/soc/qcom/apr.c'. +[master d4c029b52c77] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.txt | 4 +- + .../bindings/crypto/hisilicon,hip07-sec.txt | 2 +- + .../devicetree/bindings/fpga/fpga-region.txt | 4 +- + Documentation/devicetree/bindings/i2c/i2c.txt | 2 +- + Documentation/devicetree/bindings/mfd/arizona.txt | 2 +- + .../devicetree/bindings/reset/fsl,imx7-src.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/compressed/libfdt_env.h | 2 + + arch/arm/kernel/devtree.c | 5 +- + arch/arm/kernel/topology.c | 6 - + arch/arm/mach-shmobile/pm-rcar-gen2.c | 8 +- + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm/mach-shmobile/timer.c | 10 +- + arch/arm64/kernel/smp.c | 2 +- + arch/c6x/kernel/setup.c | 11 +- + arch/microblaze/kernel/cpu/cpuinfo.c | 6 +- + arch/nios2/kernel/cpuinfo.c | 4 +- + arch/nios2/kernel/time.c | 4 +- + arch/openrisc/kernel/setup.c | 3 +- + arch/powerpc/boot/libfdt_env.h | 2 + + arch/powerpc/platforms/4xx/soc.c | 2 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 5 +- + arch/powerpc/platforms/powermac/feature.c | 51 ++--- + arch/powerpc/platforms/powermac/setup.c | 15 +- + arch/sh/boards/of-generic.c | 2 +- + arch/sparc/include/asm/prom.h | 3 - + arch/x86/kernel/devicetree.c | 2 +- + arch/xtensa/platforms/xtfpga/setup.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +- + drivers/bus/mvebu-mbus.c | 2 +- + drivers/clk/mvebu/clk-cpu.c | 4 +- + drivers/devfreq/event/exynos-ppmu.c | 4 +- + drivers/edac/cpc925_edac.c | 20 +- + drivers/firmware/scpi_pm_domain.c | 2 +- + drivers/iommu/fsl_pamu.c | 2 +- + drivers/macintosh/macio_asic.c | 8 +- + drivers/macintosh/macio_sysfs.c | 8 +- + drivers/macintosh/windfarm_smu_controls.c | 4 +- + drivers/of/base.c | 45 +++- + drivers/of/device.c | 5 +- + drivers/of/of_mdio.c | 12 +- + drivers/of/of_numa.c | 19 +- + drivers/of/of_private.h | 8 + + drivers/of/overlay.c | 4 +- + drivers/of/platform.c | 8 +- + drivers/of/unittest-data/overlay_15.dts | 4 +- + drivers/of/unittest-data/tests-overlay.dtsi | 4 +- + drivers/of/unittest.c | 55 +++-- + drivers/soc/dove/pmu.c | 8 +- + drivers/soc/fsl/qe/qe_tdm.c | 4 +- + drivers/soc/qcom/apr.c | 2 +- + drivers/soc/rockchip/pm_domains.c | 44 ++-- + drivers/soc/tegra/pmc.c | 12 +- + drivers/soc/ti/knav_dma.c | 8 +- + drivers/soc/ti/knav_qmss_queue.c | 8 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + include/linux/libfdt_env.h | 1 + + include/linux/of.h | 17 +- + lib/vsprintf.c | 7 +- + scripts/dtc/Makefile | 7 + + scripts/dtc/Makefile.dtc | 4 + + scripts/dtc/checks.c | 143 ++++++++++++ + scripts/dtc/data.c | 4 +- + scripts/dtc/dtc-parser.y | 16 +- + scripts/dtc/dtc.c | 11 + + scripts/dtc/dtc.h | 13 ++ + scripts/dtc/flattree.c | 2 +- + scripts/dtc/libfdt/fdt.c | 81 ++++++- + scripts/dtc/libfdt/fdt_addresses.c | 35 ++- + scripts/dtc/libfdt/fdt_overlay.c | 6 +- + scripts/dtc/libfdt/fdt_ro.c | 199 ++++++++++++++--- + scripts/dtc/libfdt/fdt_rw.c | 28 +-- + scripts/dtc/libfdt/fdt_sw.c | 109 +++++++-- + scripts/dtc/libfdt/libfdt.h | 76 ++++++- + scripts/dtc/libfdt/libfdt_env.h | 1 + + scripts/dtc/libfdt/libfdt_internal.h | 5 +- + scripts/dtc/livetree.c | 12 +- + scripts/dtc/treesource.c | 225 +++++++++++-------- + scripts/dtc/update-dtc-source.sh | 2 +- + scripts/dtc/util.c | 23 +- + scripts/dtc/util.h | 20 +- + scripts/dtc/version_gen.h | 2 +- + scripts/dtc/yamltree.c | 247 +++++++++++++++++++++ + 83 files changed, 1300 insertions(+), 476 deletions(-) + create mode 100644 scripts/dtc/yamltree.c +Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt | 1 + + drivers/mailbox/Kconfig | 8 ++++---- + drivers/mailbox/bcm-flexrm-mailbox.c | 6 +++--- + drivers/mailbox/mtk-cmdq-mailbox.c | 3 +++ + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 1 + + drivers/mailbox/ti-msgmgr.c | 4 ++-- + 6 files changed, 14 insertions(+), 9 deletions(-) +Merging spi/for-next (2de6642ce7f3 Merge remote-tracking branch 'spi/topic/of' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 6 +- + Documentation/devicetree/bindings/spi/spi-rspi.txt | 4 +- + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 32 + + Documentation/devicetree/bindings/spi/spi-sprd.txt | 26 + + drivers/spi/Kconfig | 16 + + drivers/spi/Makefile | 2 + + drivers/spi/spi-atmel.c | 10 +- + drivers/spi/spi-bcm63xx-hsspi.c | 20 +- + drivers/spi/spi-davinci.c | 19 +- + drivers/spi/spi-dw-mmio.c | 29 +- + drivers/spi/spi-dw.c | 22 +- + drivers/spi/spi-fsl-espi.c | 4 +- + drivers/spi/spi-gpio.c | 12 +- + drivers/spi/spi-mem.c | 69 +- + drivers/spi/spi-mt65xx.c | 37 +- + drivers/spi/spi-orion.c | 22 +- + drivers/spi/spi-pic32-sqi.c | 2 +- + drivers/spi/spi-pic32.c | 6 +- + drivers/spi/spi-pl022.c | 10 +- + drivers/spi/spi-pxa2xx.c | 17 +- + drivers/spi/spi-rspi.c | 10 +- + drivers/spi/spi-sh-hspi.c | 12 +- + drivers/spi/spi-sh-msiof.c | 6 +- + drivers/spi/spi-sh.c | 12 +- + drivers/spi/spi-slave-mt27xx.c | 554 +++++++++++++++ + drivers/spi/spi-sprd.c | 745 +++++++++++++++++++++ + drivers/spi/spi.c | 51 +- + include/linux/platform_data/spi-davinci.h | 4 - + include/linux/spi/spi.h | 35 +- + tools/spi/spidev_test.c | 6 +- + 30 files changed, 1613 insertions(+), 187 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-slave-mt27xx.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sprd.txt + create mode 100644 drivers/spi/spi-slave-mt27xx.c + create mode 100644 drivers/spi/spi-sprd.c +Merging tip/auto-latest (3b78dbfb8fbe Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Removing tools/perf/pmu-events/arch/arm64/ampere/emag/core-imp-def.json +Auto-merging net/socket.c +Auto-merging kernel/signal.c +Auto-merging ipc/mqueue.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/pci_ids.h +Removing include/linux/compat_time.h +Auto-merging include/linux/compat.h +Auto-merging include/asm-generic/vmlinux.lds.h +Removing include/asm-generic/unistd.h +Auto-merging fs/read_write.c +Auto-merging fs/namespace.c +Auto-merging fs/aio.c +Auto-merging arch/x86/xen/pmu.c +Auto-merging arch/x86/xen/platform-pci-unplug.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/compat.h +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/x86/intel_rdt_ui.txt | 22 +- + MAINTAINERS | 6 + + arch/Kconfig | 3 + + arch/alpha/include/asm/unistd.h | 2 + + arch/arc/include/uapi/asm/unistd.h | 1 + + arch/arm/include/asm/paravirt.h | 9 +- + arch/arm/include/asm/topology.h | 3 + + arch/arm/include/asm/unistd.h | 4 +- + arch/arm/kernel/paravirt.c | 4 +- + arch/arm/xen/enlighten.c | 34 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/compat.h | 26 +- + arch/arm64/include/asm/jump_label.h | 38 +- + arch/arm64/include/asm/paravirt.h | 9 +- + arch/arm64/include/asm/stat.h | 2 +- + arch/arm64/include/asm/topology.h | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/jump_label.c | 6 +- + arch/arm64/kernel/paravirt.c | 4 +- + arch/c6x/include/uapi/asm/unistd.h | 1 + + arch/h8300/include/uapi/asm/unistd.h | 1 + + arch/hexagon/include/uapi/asm/unistd.h | 1 + + arch/ia64/include/asm/unistd.h | 3 + + arch/m68k/include/asm/unistd.h | 2 +- + arch/microblaze/include/asm/unistd.h | 2 +- + arch/mips/include/asm/compat.h | 28 +- + arch/mips/include/asm/unistd.h | 3 +- + arch/mips/kernel/binfmt_elfn32.c | 14 +- + arch/mips/kernel/binfmt_elfo32.c | 14 +- + arch/nds32/include/uapi/asm/unistd.h | 1 + + arch/nios2/include/uapi/asm/unistd.h | 1 + + arch/openrisc/include/uapi/asm/unistd.h | 1 + + arch/parisc/include/asm/compat.h | 24 +- + arch/parisc/include/asm/unistd.h | 3 +- + arch/powerpc/include/asm/compat.h | 24 +- + arch/powerpc/include/asm/unistd.h | 3 +- + arch/powerpc/kernel/asm-offsets.c | 8 +- + arch/powerpc/oprofile/backtrace.c | 2 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/compat.h | 18 +- + arch/s390/include/asm/jump_label.h | 40 +- + arch/s390/include/asm/unistd.h | 3 +- + arch/s390/kernel/jump_label.c | 11 +- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/include/asm/unistd.h | 2 +- + arch/sparc/include/asm/compat.h | 25 +- + arch/sparc/include/asm/unistd.h | 3 +- + arch/unicore32/include/uapi/asm/unistd.h | 1 + + arch/x86/Kconfig | 13 + + arch/x86/Kconfig.cpu | 14 + + arch/x86/boot/compressed/eboot.c | 10 + + arch/x86/boot/compressed/kaslr.c | 18 +- + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/boot/tools/build.c | 7 + + arch/x86/entry/entry_32.S | 8 +- + arch/x86/entry/entry_64.S | 125 +- + arch/x86/events/amd/core.c | 4 + + arch/x86/events/amd/uncore.c | 20 +- + arch/x86/events/core.c | 33 +- + arch/x86/events/intel/pt.c | 2 +- + arch/x86/hyperv/hv_apic.c | 1 - + arch/x86/hyperv/hv_init.c | 19 + + arch/x86/hyperv/mmu.c | 4 +- + arch/x86/include/asm/amd_nb.h | 3 + + arch/x86/include/asm/asm.h | 10 +- + arch/x86/include/asm/cacheinfo.h | 1 + + arch/x86/include/asm/compat.h | 19 +- + arch/x86/include/asm/cpu_entry_area.h | 2 - + arch/x86/include/asm/debugreg.h | 2 +- + arch/x86/include/asm/desc.h | 4 +- + arch/x86/include/asm/efi.h | 1 + + arch/x86/include/asm/elf.h | 3 +- + arch/x86/include/asm/extable.h | 3 +- + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu/internal.h | 2 +- + arch/x86/include/asm/futex.h | 6 +- + arch/x86/include/asm/irqflags.h | 16 +- + arch/x86/include/asm/jump_label.h | 24 +- + arch/x86/include/asm/kvm_emulate.h | 4 + + arch/x86/include/asm/mce.h | 55 +- + arch/x86/include/asm/mmu_context.h | 4 +- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/nospec-branch.h | 17 +- + arch/x86/include/asm/paravirt.h | 415 +++--- + arch/x86/include/asm/paravirt_types.h | 82 +- + arch/x86/include/asm/perf_event.h | 1 + + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/pgtable-3level_types.h | 2 +- + arch/x86/include/asm/pgtable.h | 7 +- + arch/x86/include/asm/processor.h | 13 +- + arch/x86/include/asm/ptrace.h | 4 +- + arch/x86/include/asm/sections.h | 1 - + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/special_insns.h | 4 +- + arch/x86/include/asm/string_64.h | 20 +- + arch/x86/include/asm/uaccess.h | 22 +- + arch/x86/include/asm/unistd.h | 3 +- + arch/x86/include/asm/virtext.h | 5 +- + arch/x86/kernel/alternative.c | 6 +- + arch/x86/kernel/amd_nb.c | 49 +- + arch/x86/kernel/apic/apic.c | 7 + + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/vector.c | 9 +- + arch/x86/kernel/asm-offsets.c | 18 +- + arch/x86/kernel/asm-offsets_64.c | 9 +- + arch/x86/kernel/check.c | 28 +- + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/bugs.c | 62 +- + arch/x86/kernel/cpu/cacheinfo.c | 31 +- + arch/x86/kernel/cpu/common.c | 25 +- + arch/x86/kernel/cpu/cpu.h | 1 + + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/hygon.c | 408 ++++++ + arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 369 +++-- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 + + arch/x86/kernel/cpu/mcheck/mce-severity.c | 3 +- + arch/x86/kernel/cpu/mcheck/mce.c | 22 +- + arch/x86/kernel/cpu/microcode/core.c | 4 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 3 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 + + arch/x86/kernel/cpu/vmware.c | 4 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/jump_label.c | 62 +- + arch/x86/kernel/kprobes/core.c | 48 +- + arch/x86/kernel/kvm.c | 19 +- + arch/x86/kernel/kvmclock.c | 4 +- + arch/x86/kernel/module.c | 6 + + arch/x86/kernel/paravirt-spinlocks.c | 15 +- + arch/x86/kernel/paravirt.c | 316 ++--- + arch/x86/kernel/paravirt_patch_32.c | 87 +- + arch/x86/kernel/paravirt_patch_64.c | 97 +- + arch/x86/kernel/process_64.c | 2 - + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/traps.c | 20 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 10 - + arch/x86/kernel/vsmp_64.c | 26 +- + arch/x86/kvm/emulate.c | 11 +- + arch/x86/lib/checksum_32.S | 4 +- + arch/x86/lib/copy_user_64.S | 90 +- + arch/x86/lib/csum-copy_64.S | 8 +- + arch/x86/lib/getuser.S | 12 +- + arch/x86/lib/putuser.S | 10 +- + arch/x86/lib/usercopy_32.c | 126 +- + arch/x86/lib/usercopy_64.c | 8 +- + arch/x86/mm/cpu_entry_area.c | 36 - + arch/x86/mm/extable.c | 114 +- + arch/x86/mm/fault.c | 35 +- + arch/x86/mm/init_32.c | 23 +- + arch/x86/mm/mem_encrypt_identity.c | 1 + + arch/x86/mm/pageattr.c | 627 ++++++--- + arch/x86/mm/pti.c | 33 +- + arch/x86/mm/tlb.c | 31 +- + arch/x86/pci/amd_bus.c | 6 +- + arch/x86/platform/efi/early_printk.c | 8 +- + arch/x86/platform/efi/efi_64.c | 10 +- + arch/x86/platform/efi/quirks.c | 78 ++ + arch/x86/tools/relocs.c | 10 + + arch/x86/um/asm/elf.h | 3 +- + arch/x86/xen/Kconfig | 1 + + arch/x86/xen/Makefile | 41 +- + arch/x86/xen/efi.c | 14 +- + arch/x86/xen/enlighten.c | 2 + + arch/x86/xen/enlighten_hvm.c | 2 + + arch/x86/xen/enlighten_pv.c | 31 +- + arch/x86/xen/grant-table.c | 25 +- + arch/x86/xen/irq.c | 2 +- + arch/x86/xen/mmu.c | 188 +-- + arch/x86/xen/mmu_hvm.c | 2 +- + arch/x86/xen/mmu_pv.c | 168 ++- + arch/x86/xen/p2m.c | 2 + + arch/x86/xen/pci-swiotlb-xen.c | 2 + + arch/x86/xen/platform-pci-unplug.c | 18 +- + arch/x86/xen/pmu.c | 12 +- + arch/x86/xen/spinlock.c | 11 +- + arch/x86/xen/time.c | 4 +- + arch/x86/xen/vdso.h | 2 + + arch/x86/xen/xen-asm_64.S | 8 +- + arch/x86/xen/xen-pvh.S | 15 +- + arch/xtensa/include/asm/unistd.h | 2 +- + drivers/acpi/acpi_pad.c | 1 + + drivers/acpi/processor_idle.c | 1 + + drivers/base/arch_topology.c | 26 + + drivers/cpufreq/acpi-cpufreq.c | 5 + + drivers/cpufreq/amd_freq_sensitivity.c | 9 +- + drivers/firmware/efi/efi.c | 59 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/firmware/efi/libstub/arm-stub.c | 27 + + drivers/firmware/efi/runtime-wrappers.c | 61 +- + drivers/firmware/efi/test/efi_test.c | 27 + + drivers/firmware/efi/test/efi_test.h | 10 + + drivers/misc/lkdtm/core.c | 1 + + drivers/misc/lkdtm/lkdtm.h | 1 + + drivers/misc/lkdtm/usercopy.c | 13 + + drivers/xen/time.c | 2 +- + fs/aio.c | 8 +- + fs/compat_binfmt_elf.c | 2 +- + fs/namespace.c | 2 + + fs/read_write.c | 2 +- + fs/select.c | 20 +- + fs/stat.c | 3 + + fs/timerfd.c | 12 +- + fs/utimes.c | 73 +- + include/asm-generic/compat.h | 24 +- + include/asm-generic/unistd.h | 13 - + include/asm-generic/vmlinux.lds.h | 11 +- + include/linux/arch_topology.h | 1 + + include/linux/compat.h | 101 +- + include/linux/compat_time.h | 32 - + include/linux/efi.h | 51 + + include/linux/elfcore-compat.h | 8 +- + include/linux/irq.h | 3 +- + include/linux/jump_label.h | 65 +- + include/linux/pci_ids.h | 2 + + include/linux/ptrace.h | 21 +- + include/linux/restart_block.h | 4 +- + include/linux/rwsem.h | 4 +- + include/linux/sched.h | 6 + + include/linux/sched/topology.h | 6 +- + include/linux/socket.h | 4 +- + include/linux/syscalls.h | 21 +- + include/linux/time32.h | 78 +- + include/linux/timekeeping.h | 12 - + include/linux/timekeeping32.h | 53 +- + include/trace/events/sched.h | 11 +- + include/uapi/asm-generic/unistd.h | 2 + + include/xen/events.h | 2 + + include/xen/interface/memory.h | 6 - + include/xen/xen-ops.h | 133 +- + init/main.c | 1 - + ipc/mqueue.c | 8 +- + ipc/msg.c | 6 +- + ipc/sem.c | 10 +- + ipc/shm.c | 6 +- + ipc/syscall.c | 2 +- + ipc/util.h | 2 +- + kernel/compat.c | 8 +- + kernel/cpu.c | 39 +- + kernel/events/ring_buffer.c | 14 +- + kernel/futex_compat.c | 2 +- + kernel/irq/matrix.c | 82 +- + kernel/jump_label.c | 107 +- + kernel/kprobes.c | 39 +- + kernel/locking/rtmutex.c | 4 +- + kernel/locking/rwsem-xadd.c | 15 +- + kernel/locking/rwsem.c | 7 +- + kernel/locking/rwsem.h | 95 +- + kernel/module.c | 9 + + kernel/ptrace.c | 10 + + kernel/sched/core.c | 8 +- + kernel/sched/fair.c | 185 ++- + kernel/sched/sched.h | 18 +- + kernel/sched/topology.c | 106 +- + kernel/signal.c | 19 +- + kernel/time/hrtimer.c | 8 +- + kernel/time/posix-stubs.c | 18 +- + kernel/time/posix-timers.c | 30 +- + kernel/time/tick-broadcast.c | 2 - + kernel/time/time.c | 97 +- + kernel/time/timekeeping.c | 24 - + mm/maccess.c | 6 + + net/compat.c | 10 +- + net/socket.c | 18 +- + tools/include/linux/err.h | 7 + + tools/lib/subcmd/pager.c | 11 +- + tools/lib/subcmd/pager.h | 1 + + tools/lib/traceevent/event-parse.c | 1185 ++++++++-------- + tools/lib/traceevent/event-parse.h | 578 ++++---- + tools/lib/traceevent/event-plugin.c | 19 +- + tools/lib/traceevent/parse-filter.c | 646 ++++----- + tools/lib/traceevent/plugin_function.c | 3 +- + tools/lib/traceevent/plugin_hrtimer.c | 5 +- + tools/lib/traceevent/plugin_jbd2.c | 1 + + tools/lib/traceevent/plugin_kmem.c | 5 +- + tools/lib/traceevent/plugin_kvm.c | 15 +- + tools/lib/traceevent/plugin_mac80211.c | 7 +- + tools/lib/traceevent/plugin_sched_switch.c | 11 +- + tools/lib/traceevent/plugin_scsi.c | 1 + + tools/lib/traceevent/plugin_xen.c | 1 + + tools/lib/traceevent/trace-seq.c | 2 + + tools/lib/traceevent/trace-seq.h | 55 + + tools/objtool/check.c | 38 +- + tools/objtool/check.h | 4 +- + tools/objtool/elf.c | 1 + + tools/objtool/elf.h | 3 +- + tools/objtool/special.c | 4 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm64/annotate/instructions.c | 59 +- + tools/perf/arch/s390/annotate/instructions.c | 2 - + tools/perf/builtin-annotate.c | 7 +- + tools/perf/builtin-inject.c | 40 +- + tools/perf/builtin-record.c | 53 +- + tools/perf/builtin-report.c | 11 +- + tools/perf/builtin-script.c | 110 +- + tools/perf/builtin-stat.c | 1463 ++------------------ + tools/perf/builtin-trace.c | 179 ++- + tools/perf/command-list.txt | 1 + + tools/perf/examples/bpf/augmented_syscalls.c | 154 ++- + tools/perf/examples/bpf/etcsnoop.c | 80 ++ + tools/perf/include/bpf/bpf.h | 3 + + tools/perf/include/bpf/linux/socket.h | 24 + + .../pmu-events/arch/arm64/ampere/emag/branch.json | 23 + + .../pmu-events/arch/arm64/ampere/emag/bus.json | 26 + + .../pmu-events/arch/arm64/ampere/emag/cache.json | 191 +++ + .../pmu-events/arch/arm64/ampere/emag/clock.json | 20 + + .../arch/arm64/ampere/emag/core-imp-def.json | 32 - + .../arch/arm64/ampere/emag/exception.json | 50 + + .../arch/arm64/ampere/emag/instruction.json | 89 ++ + .../arch/arm64/ampere/emag/intrinsic.json | 14 + + .../pmu-events/arch/arm64/ampere/emag/memory.json | 29 + + .../arch/arm64/ampere/emag/pipeline.json | 50 + + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 9 + + tools/perf/tests/evsel-tp-sched.c | 4 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 2 +- + tools/perf/tests/tests.h | 3 + + tools/perf/tests/wp.c | 229 +++ + tools/perf/trace/beauty/Build | 1 + + tools/perf/trace/beauty/beauty.h | 34 + + tools/perf/trace/beauty/sockaddr.c | 76 + + tools/perf/util/Build | 1 + + tools/perf/util/auxtrace.c | 30 +- + tools/perf/util/auxtrace.h | 40 +- + tools/perf/util/bpf-loader.c | 2 +- + tools/perf/util/data-convert-bt.c | 58 +- + tools/perf/util/db-export.c | 22 + + tools/perf/util/evsel.c | 39 +- + tools/perf/util/evsel.h | 11 +- + tools/perf/util/evsel_fprintf.c | 2 +- + tools/perf/util/header.c | 24 +- + tools/perf/util/header.h | 17 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 34 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 + + tools/perf/util/intel-pt.c | 5 + + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/map.c | 15 +- + tools/perf/util/mmap.c | 6 +- + tools/perf/util/mmap.h | 2 +- + tools/perf/util/ordered-events.c | 87 +- + tools/perf/util/ordered-events.h | 37 +- + tools/perf/util/python.c | 20 +- + tools/perf/util/s390-cpumsf.c | 94 +- + .../perf/util/scripting-engines/trace-event-perl.c | 66 +- + .../util/scripting-engines/trace-event-python.c | 100 +- + tools/perf/util/session.c | 75 +- + tools/perf/util/session.h | 5 +- + tools/perf/util/setup.py | 2 +- + tools/perf/util/sort.c | 22 +- + tools/perf/util/stat-display.c | 1166 ++++++++++++++++ + tools/perf/util/stat-shadow.c | 147 +- + tools/perf/util/stat.c | 100 +- + tools/perf/util/stat.h | 77 +- + tools/perf/util/thread-stack.c | 51 +- + tools/perf/util/tool.h | 7 +- + tools/perf/util/trace-event-parse.c | 18 +- + tools/perf/util/trace-event-read.c | 4 +- + tools/perf/util/trace-event.c | 8 +- + tools/perf/util/trace-event.h | 21 +- + tools/perf/util/util.c | 2 +- + tools/perf/util/util.h | 2 + + 363 files changed, 9164 insertions(+), 6086 deletions(-) + create mode 100644 arch/x86/kernel/cpu/hygon.c + delete mode 100644 include/asm-generic/unistd.h + delete mode 100644 include/linux/compat_time.h + create mode 100644 tools/lib/traceevent/trace-seq.h + create mode 100644 tools/perf/examples/bpf/etcsnoop.c + create mode 100644 tools/perf/include/bpf/linux/socket.h + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/clock.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/core-imp-def.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json + create mode 100644 tools/perf/tests/wp.c + create mode 100644 tools/perf/trace/beauty/sockaddr.c + create mode 100644 tools/perf/util/stat-display.c +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 (432de7fd7630 EDAC, {i7core,sb,skx}_edac: Fix uncorrected error counting) +$ git merge edac-amd/for-next +Auto-merging drivers/edac/altera_edac.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 37 +- + drivers/edac/altera_edac.c | 667 +++++++--------------- + drivers/edac/altera_edac.h | 73 +-- + drivers/edac/amd64_edac.c | 24 +- + drivers/edac/amd64_edac.h | 3 + + drivers/edac/ghes_edac.c | 23 + + drivers/edac/i3200_edac.c | 2 +- + drivers/edac/i7core_edac.c | 5 +- + drivers/edac/mce_amd.c | 4 +- + drivers/edac/sb_edac.c | 204 +++++-- + drivers/edac/skx_edac.c | 5 +- + include/linux/edac.h | 5 +- + 13 files changed, 501 insertions(+), 554 deletions(-) +Merging irqchip/irq/irqchip-next (b4bf3d7ad3da dt-bindings: irqchip: renesas-irqc: Document r8a7744 support) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/renesas,irqc.txt | 5 +- + drivers/irqchip/irq-gic-v3-its.c | 247 ++++++++++++++++----- + drivers/irqchip/irq-gic-v3.c | 20 +- + drivers/irqchip/qcom-pdc.c | 1 + + include/linux/irqchip/arm-gic-v3.h | 4 +- + 5 files changed, 212 insertions(+), 65 deletions(-) +Merging ftrace/for-next (5a5e3d3ceae2 perf probe: Support SDT markers having reference counter (semaphore)) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Merge made by the 'recursive' strategy. + include/linux/uprobes.h | 5 + + kernel/events/uprobes.c | 278 ++++++++++++++++++++++++++++++++++++++++-- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_kprobe.c | 9 +- + kernel/trace/trace_uprobe.c | 75 +++++++++++- + tools/perf/util/probe-event.c | 39 +++++- + tools/perf/util/probe-event.h | 1 + + tools/perf/util/probe-file.c | 34 +++++- + tools/perf/util/probe-file.h | 1 + + tools/perf/util/symbol-elf.c | 46 +++++-- + tools/perf/util/symbol.h | 7 ++ + 11 files changed, 459 insertions(+), 38 deletions(-) +Merging rcu/rcu/next (0b1aba265b93 Merge LKMM and RCU branches) +$ git merge rcu/rcu/next +Auto-merging include/linux/sched.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/Data-Structures.html | 31 +- + .../Expedited-Grace-Periods.html | 9 +- + .../RCU/Design/Requirements/Requirements.html | 214 +- + Documentation/RCU/stallwarn.txt | 13 +- + Documentation/RCU/whatisRCU.txt | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 31 +- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/memory-barriers.txt | 3 +- + include/linux/rculist.h | 32 +- + include/linux/rcupdate.h | 154 +- + include/linux/rcupdate_wait.h | 14 +- + include/linux/rcutiny.h | 53 +- + include/linux/rcutree.h | 31 +- + include/linux/sched.h | 6 +- + include/linux/srcutree.h | 13 +- + include/linux/torture.h | 2 +- + include/trace/events/rcu.h | 25 +- + kernel/rcu/Kconfig | 14 +- + kernel/rcu/rcu.h | 67 +- + kernel/rcu/rcuperf.c | 66 +- + kernel/rcu/rcutorture.c | 397 ++-- + kernel/rcu/srcutiny.c | 29 +- + kernel/rcu/srcutree.c | 31 +- + kernel/rcu/tiny.c | 154 +- + kernel/rcu/tree.c | 2213 ++++++++------------ + kernel/rcu/tree.h | 132 +- + kernel/rcu/tree_exp.h | 426 ++-- + kernel/rcu/tree_plugin.h | 790 +++---- + kernel/rcu/update.c | 70 +- + kernel/softirq.c | 3 +- + kernel/torture.c | 3 +- + tools/memory-model/.gitignore | 1 + + tools/memory-model/Documentation/explanation.txt | 186 +- + tools/memory-model/Documentation/recipes.txt | 2 +- + tools/memory-model/README | 41 + + tools/memory-model/linux-kernel.cat | 8 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 7 +- + tools/memory-model/litmus-tests/README | 104 +- + tools/memory-model/scripts/README | 70 + + tools/memory-model/scripts/checkalllitmus.sh | 53 +- + tools/memory-model/scripts/checkghlitmus.sh | 65 + + tools/memory-model/scripts/checklitmus.sh | 74 +- + tools/memory-model/scripts/checklitmushist.sh | 60 + + tools/memory-model/scripts/cmplitmushist.sh | 87 + + tools/memory-model/scripts/initlitmushist.sh | 68 + + tools/memory-model/scripts/judgelitmus.sh | 78 + + tools/memory-model/scripts/newlitmushist.sh | 61 + + tools/memory-model/scripts/parseargs.sh | 136 ++ + tools/memory-model/scripts/runlitmushist.sh | 87 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 - + .../selftests/rcutorture/configs/rcu/CFLIST | 2 - + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-u.boot | 1 + + .../selftests/rcutorture/configs/rcu/TINY02.boot | 2 - + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE05.boot | 3 +- + .../selftests/rcutorture/configs/rcu/TREE06.boot | 2 - + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 - + 59 files changed, 3336 insertions(+), 2901 deletions(-) + create mode 100644 tools/memory-model/.gitignore + create mode 100644 tools/memory-model/scripts/README + create mode 100755 tools/memory-model/scripts/checkghlitmus.sh + create mode 100755 tools/memory-model/scripts/checklitmushist.sh + create mode 100644 tools/memory-model/scripts/cmplitmushist.sh + create mode 100755 tools/memory-model/scripts/initlitmushist.sh + create mode 100755 tools/memory-model/scripts/judgelitmus.sh + create mode 100755 tools/memory-model/scripts/newlitmushist.sh + create mode 100755 tools/memory-model/scripts/parseargs.sh + create mode 100755 tools/memory-model/scripts/runlitmushist.sh +Merging kvm/linux-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (976d34e2dab1 KVM: arm/arm64: Skip updating PTE entry if no change) +$ 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 (46dec40fb741 KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (55d09dd4c860 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext) +$ git merge kvms390/next +Auto-merging drivers/iommu/Kconfig +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/s390/vfio-ap.txt | 837 +++++++++++++++++++++++++++++ + MAINTAINERS | 12 + + arch/s390/Kconfig | 11 + + arch/s390/include/asm/kvm_host.h | 13 +- + arch/s390/include/uapi/asm/kvm.h | 2 + + arch/s390/kvm/kvm-s390.c | 135 +++-- + arch/s390/kvm/kvm-s390.h | 1 + + arch/s390/kvm/vsie.c | 210 +++++++- + arch/s390/mm/gmap.c | 10 +- + arch/s390/tools/gen_facilities.c | 2 + + drivers/iommu/Kconfig | 8 + + drivers/s390/crypto/Makefile | 4 + + drivers/s390/crypto/vfio_ap_drv.c | 157 ++++++ + drivers/s390/crypto/vfio_ap_ops.c | 968 ++++++++++++++++++++++++++++++++++ + drivers/s390/crypto/vfio_ap_private.h | 88 ++++ + include/uapi/linux/vfio.h | 2 + + 16 files changed, 2397 insertions(+), 63 deletions(-) + create mode 100644 Documentation/s390/vfio-ap.txt + create mode 100644 drivers/s390/crypto/vfio_ap_drv.c + create mode 100644 drivers/s390/crypto/vfio_ap_ops.c + create mode 100644 drivers/s390/crypto/vfio_ap_private.h +Merging xen-tip/linux-next (811e0345cfc1 xen/balloon: Grammar s/Is it/It is/) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/Kconfig | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging percpu/for-next (b5bb42587118 arm64: percpu: Initialize ret in the default case) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/percpu.h | 3 +++ + mm/percpu.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (7eccb5edba24 platform/x86: intel-wmi-thunderbolt: Add dynamic debugging) +$ git merge drivers-x86/for-next +Auto-merging drivers/firmware/Makefile +Auto-merging drivers/firmware/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 13 ++- + drivers/firmware/Kconfig | 28 ------ + drivers/firmware/Makefile | 2 - + drivers/platform/x86/Kconfig | 33 ++++++- + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/acerhdf.c | 68 ++++++++++---- + drivers/{firmware => platform/x86}/dcdbas.c | 123 +++++++++++++++++++++++-- + drivers/{firmware => platform/x86}/dcdbas.h | 10 ++ + drivers/platform/x86/dell-smbios-smm.c | 2 +- + drivers/{firmware => platform/x86}/dell_rbu.c | 8 ++ + drivers/platform/x86/ideapad-laptop.c | 2 +- + drivers/platform/x86/intel-hid.c | 12 +-- + drivers/platform/x86/intel-rst.c | 23 +---- + drivers/platform/x86/intel-smartconnect.c | 22 +---- + drivers/platform/x86/intel-wmi-thunderbolt.c | 18 ++-- + drivers/platform/x86/intel_bxtwc_tmu.c | 13 +-- + drivers/platform/x86/intel_cht_int33fe.c | 7 +- + drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 1 + + drivers/platform/x86/intel_int0002_vgpio.c | 29 ++++-- + drivers/platform/x86/intel_ips.c | 15 +-- + drivers/platform/x86/intel_ips.h | 13 +-- + drivers/platform/x86/intel_menlow.c | 28 ++---- + drivers/platform/x86/intel_mid_powerbtn.c | 18 +--- + drivers/platform/x86/intel_mid_thermal.c | 30 ++---- + drivers/platform/x86/intel_oaktrail.c | 32 ++----- + drivers/platform/x86/intel_pmc_core.c | 11 +-- + drivers/platform/x86/intel_pmc_core.h | 11 +-- + drivers/platform/x86/intel_pmc_ipc.c | 35 +++---- + drivers/platform/x86/intel_punit_ipc.c | 12 +-- + drivers/platform/x86/intel_scu_ipc.c | 16 ++-- + drivers/platform/x86/intel_scu_ipcutil.c | 24 ++--- + drivers/platform/x86/intel_telemetry_core.c | 12 +-- + drivers/platform/x86/intel_telemetry_debugfs.c | 12 +-- + drivers/platform/x86/intel_telemetry_pltdrv.c | 12 +-- + drivers/platform/x86/intel_turbo_max_3.c | 18 +--- + kernel/trace/trace_printk.c | 2 +- + 36 files changed, 346 insertions(+), 371 deletions(-) + rename drivers/{firmware => platform/x86}/dcdbas.c (82%) + rename drivers/{firmware => platform/x86}/dcdbas.h (93%) + rename drivers/{firmware => platform/x86}/dell_rbu.c (98%) +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 +Already up to date. +Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (2d00f35c55e7 leds: add Panasonic AN30259A support) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-an30259a.txt | 43 +++ + drivers/leds/Kconfig | 10 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-an30259a.c | 368 +++++++++++++++++++++ + drivers/leds/leds-as3645a.c | 4 +- + drivers/leds/leds-gpio.c | 92 ++++-- + drivers/leds/leds-pwm.c | 5 +- + 7 files changed, 489 insertions(+), 34 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-an30259a.txt + create mode 100644 drivers/leds/leds-an30259a.c +Merging ipmi/for-next (10042504ed92 ipmi:ssif: Add support for multi-part transmit messages > 2 parts) +$ git merge ipmi/for-next +Auto-merging include/linux/pci_ids.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/acpi/acpi_ipmi.c | 4 +- + drivers/char/ipmi/ipmi_bt_sm.c | 66 ++++---- + drivers/char/ipmi/ipmi_devintf.c | 11 +- + drivers/char/ipmi/ipmi_dmi.c | 31 ++-- + drivers/char/ipmi/ipmi_kcs_sm.c | 4 +- + drivers/char/ipmi/ipmi_msghandler.c | 53 +++---- + 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 | 26 +-- + drivers/char/ipmi/ipmi_smic_sm.c | 26 ++- + drivers/char/ipmi/ipmi_ssif.c | 297 ++++++++++++++++++++++++----------- + drivers/char/ipmi/ipmi_watchdog.c | 52 +++--- + 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, 419 insertions(+), 312 deletions(-) +Merging driver-core/driver-core-next (a75e78f21f9a kernfs: Fix range checks in kernfs_get_target_path) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/kernfs.h +Auto-merging drivers/base/devtmpfs.c +Merge made by the 'recursive' strategy. + drivers/base/component.c | 6 +++--- + drivers/base/devtmpfs.c | 2 +- + fs/kernfs/symlink.c | 5 ++++- + include/linux/kernfs.h | 9 +++++---- + 4 files changed, 13 insertions(+), 9 deletions(-) +Merging usb/usb-next (29f79155b9b3 Merge 4.19-rc6 into usb-next) +$ git merge usb/usb-next +Auto-merging include/linux/device.h +Removing drivers/usb/typec/fusb302/Makefile +Removing drivers/usb/typec/fusb302/Kconfig +Auto-merging drivers/platform/x86/intel_cht_int33fe.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/media/usb/tm6000/tm6000-video.c +Auto-merging drivers/media/usb/em28xx/em28xx-audio.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 35 - + Documentation/ABI/testing/sysfs-bus-usb | 9 +- + .../bindings/connector/usb-connector.txt | 8 +- + Documentation/devicetree/bindings/usb/ehci-mv.txt | 23 + + .../devicetree/bindings/usb/fcs,fusb302.txt | 32 +- + .../devicetree/bindings/usb/renesas_usb3.txt | 5 +- + .../devicetree/bindings/usb/renesas_usbhs.txt | 10 +- + Documentation/devicetree/bindings/usb/usb-ehci.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-ohci.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- + Documentation/ioctl/ioctl-number.txt | 2 +- + MAINTAINERS | 6 + + arch/arm/mach-mmp/devices.c | 11 +- + drivers/media/usb/em28xx/em28xx-audio.c | 5 +- + drivers/media/usb/em28xx/em28xx-core.c | 5 +- + drivers/media/usb/tm6000/tm6000-video.c | 5 +- + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/intel_cht_int33fe.c | 27 +- + drivers/usb/class/usbtmc.c | 1585 +++++++++++++++----- + drivers/usb/core/buffer.c | 8 +- + drivers/usb/core/generic.c | 27 + + drivers/usb/core/hcd.c | 14 - + drivers/usb/core/hub.c | 36 + + drivers/usb/core/phy.c | 7 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-hcd.c | 11 +- + drivers/usb/host/ehci-mv.c | 181 ++- + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/ehci-timer.c | 2 +- + drivers/usb/host/ehci.h | 4 +- + drivers/usb/host/fotg210-hcd.c | 50 +- + drivers/usb/host/fotg210.h | 7 +- + drivers/usb/host/pci-quirks.c | 12 +- + drivers/usb/host/xhci-hub.c | 5 + + drivers/usb/host/xhci-mtk-sch.c | 429 +++++- + drivers/usb/host/xhci-mtk.h | 23 + + drivers/usb/host/xhci-pci.c | 24 + + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 20 + + drivers/usb/host/xhci-tegra.c | 52 +- + drivers/usb/host/xhci.h | 3 + + drivers/usb/misc/iowarrior.c | 4 +- + drivers/usb/misc/trancevibrator.c | 4 +- + drivers/usb/mtu3/mtu3_core.c | 4 +- + drivers/usb/mtu3/mtu3_gadget.c | 22 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 113 +- + drivers/usb/renesas_usbhs/common.h | 5 +- + drivers/usb/renesas_usbhs/rcar3.c | 27 +- + drivers/usb/storage/Kconfig | 23 +- + drivers/usb/storage/isd200.c | 2 +- + drivers/usb/typec/Kconfig | 45 +- + drivers/usb/typec/Makefile | 6 +- + drivers/usb/typec/class.c | 38 +- + drivers/usb/typec/fusb302/Kconfig | 7 - + drivers/usb/typec/fusb302/Makefile | 2 - + drivers/usb/typec/tcpm/Kconfig | 52 + + drivers/usb/typec/tcpm/Makefile | 7 + + drivers/usb/typec/{fusb302 => tcpm}/fusb302.c | 75 +- + drivers/usb/typec/{fusb302 => tcpm}/fusb302_reg.h | 0 + drivers/usb/typec/{ => tcpm}/tcpci.c | 0 + drivers/usb/typec/{ => tcpm}/tcpci.h | 0 + drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c | 0 + drivers/usb/typec/{ => tcpm}/tcpm.c | 0 + drivers/usb/typec/{typec_wcove.c => tcpm/wcove.c} | 0 + drivers/usb/wusbcore/wa-rpipe.c | 6 +- + include/dt-bindings/usb/pd.h | 26 + + include/linux/device.h | 24 + + include/linux/platform_data/ehci-sh.h | 16 +- + include/linux/platform_data/mv_usb.h | 1 - + include/uapi/linux/usb/tmc.h | 41 + + 72 files changed, 2346 insertions(+), 917 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ehci-mv.txt + delete mode 100644 drivers/usb/typec/fusb302/Kconfig + delete mode 100644 drivers/usb/typec/fusb302/Makefile + create mode 100644 drivers/usb/typec/tcpm/Kconfig + create mode 100644 drivers/usb/typec/tcpm/Makefile + rename drivers/usb/typec/{fusb302 => tcpm}/fusb302.c (98%) + rename drivers/usb/typec/{fusb302 => tcpm}/fusb302_reg.h (100%) + rename drivers/usb/typec/{ => tcpm}/tcpci.c (100%) + rename drivers/usb/typec/{ => tcpm}/tcpci.h (100%) + rename drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c (100%) + rename drivers/usb/typec/{ => tcpm}/tcpm.c (100%) + rename drivers/usb/typec/{typec_wcove.c => tcpm/wcove.c} (100%) +Merging usb-gadget/next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (ba93cc7da896 USB: serial: ftdi_sio: implement GPIO support for FT-X devices) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cypress_m8.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 360 +++++++++++++++++++++++++++++++++++++++- + drivers/usb/serial/ftdi_sio.h | 27 ++- + 3 files changed, 386 insertions(+), 3 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (35a334659bcc usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++------------ + drivers/usb/chipidea/usbmisc_imx.c | 4 +++- + 2 files changed, 10 insertions(+), 13 deletions(-) +Merging phy-next/next (566b388440bb phy: renesas: convert to SPDX identifiers) +$ git merge phy-next/next +Removing include/linux/phy/phy-qcom-ufs.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/brcm-sata-phy.txt | 1 + + .../devicetree/bindings/phy/phy-cadence-dp.txt | 30 + + .../bindings/phy/phy-rockchip-inno-hdmi.txt | 43 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 23 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 11 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 10 +- + .../devicetree/bindings/phy/uniphier-pcie-phy.txt | 31 + + .../devicetree/bindings/phy/uniphier-usb2-phy.txt | 45 + + .../bindings/phy/uniphier-usb3-hsphy.txt | 69 ++ + .../bindings/phy/uniphier-usb3-ssphy.txt | 57 + + drivers/phy/Kconfig | 2 + + drivers/phy/Makefile | 2 + + drivers/phy/broadcom/Kconfig | 3 +- + drivers/phy/broadcom/phy-bcm-cygnus-pcie.c | 4 +- + drivers/phy/broadcom/phy-brcm-sata.c | 74 +- + drivers/phy/broadcom/phy-brcm-usb.c | 4 +- + drivers/phy/cadence/Kconfig | 10 + + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/phy-cadence-dp.c | 541 +++++++++ + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 5 +- + drivers/phy/marvell/phy-berlin-sata.c | 6 +- + drivers/phy/qualcomm/Kconfig | 17 + + drivers/phy/qualcomm/Makefile | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 222 +++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 15 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 4 +- + drivers/phy/qualcomm/phy-qcom-ufs-i.h | 2 +- + drivers/phy/qualcomm/phy-qcom-ufs.c | 50 - + drivers/phy/renesas/Kconfig | 1 + + drivers/phy/renesas/Makefile | 1 + + drivers/phy/renesas/phy-rcar-gen2.c | 5 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 86 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 5 +- + drivers/phy/rockchip/Kconfig | 8 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-emmc.c | 4 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 1277 ++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 8 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 8 +- + drivers/phy/rockchip/phy-rockchip-usb.c | 145 ++- + drivers/phy/socionext/Kconfig | 34 + + drivers/phy/socionext/Makefile | 8 + + drivers/phy/socionext/phy-uniphier-pcie.c | 240 ++++ + drivers/phy/socionext/phy-uniphier-usb2.c | 244 ++++ + drivers/phy/socionext/phy-uniphier-usb3hs.c | 422 +++++++ + drivers/phy/socionext/phy-uniphier-usb3ss.c | 349 ++++++ + drivers/phy/tegra/xusb.c | 4 +- + drivers/phy/ti/phy-twl4030-usb.c | 29 + + drivers/scsi/ufs/ufs-qcom.c | 28 +- + drivers/scsi/ufs/ufs-qcom.h | 5 - + include/linux/phy/phy-qcom-ufs.h | 38 - + 51 files changed, 3954 insertions(+), 282 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-dp.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-inno-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt + create mode 100644 drivers/phy/cadence/Kconfig + create mode 100644 drivers/phy/cadence/Makefile + create mode 100644 drivers/phy/cadence/phy-cadence-dp.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-hdmi.c + create mode 100644 drivers/phy/socionext/Kconfig + create mode 100644 drivers/phy/socionext/Makefile + create mode 100644 drivers/phy/socionext/phy-uniphier-pcie.c + create mode 100644 drivers/phy/socionext/phy-uniphier-usb2.c + create mode 100644 drivers/phy/socionext/phy-uniphier-usb3hs.c + create mode 100644 drivers/phy/socionext/phy-uniphier-usb3ss.c + delete mode 100644 include/linux/phy/phy-qcom-ufs.h +Merging tty/tty-next (669c5d8d5f2b Merge 4.19-rc6 into tty-next) +$ git merge tty/tty-next +Auto-merging include/linux/of.h +Auto-merging drivers/spi/Makefile +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/of/base.c +Auto-merging drivers/mfd/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/{serial => mfd}/atmel-usart.txt | 25 +- + Documentation/serial/driver | 2 +- + MAINTAINERS | 16 + + drivers/mfd/Kconfig | 9 + + drivers/mfd/Makefile | 1 + + drivers/mfd/at91-usart.c | 72 ++++ + drivers/of/base.c | 52 +++ + drivers/spi/Kconfig | 8 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-at91-usart.c | 432 +++++++++++++++++++++ + drivers/tty/ehv_bytechan.c | 12 +- + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/8250/8250_of.c | 22 +- + drivers/tty/serial/8250/8250_port.c | 29 +- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/atmel_serial.c | 42 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 8 +- + drivers/tty/serial/imx.c | 38 +- + drivers/tty/serial/kgdboc.c | 46 ++- + drivers/tty/serial/mxs-auart.c | 3 +- + drivers/tty/serial/pmac_zilog.c | 8 +- + drivers/tty/serial/qcom_geni_serial.c | 69 ++-- + drivers/tty/serial/samsung.c | 8 + + drivers/tty/serial/sc16is7xx.c | 47 ++- + drivers/tty/serial/sh-sci.c | 63 ++- + drivers/tty/serial/sprd_serial.c | 98 +++-- + drivers/tty/serial/uartlite.c | 71 ++-- + drivers/tty/serial/xilinx_uartps.c | 299 +++++++++----- + drivers/tty/tty_buffer.c | 7 +- + drivers/tty/tty_port.c | 7 - + include/dt-bindings/mfd/at91-usart.h | 17 + + include/linux/of.h | 10 + + include/linux/serial_sci.h | 1 + + 34 files changed, 1192 insertions(+), 340 deletions(-) + rename Documentation/devicetree/bindings/{serial => mfd}/atmel-usart.txt (76%) + create mode 100644 drivers/mfd/at91-usart.c + create mode 100644 drivers/spi/spi-at91-usart.c + create mode 100644 include/dt-bindings/mfd/at91-usart.h +Merging char-misc/char-misc-next (29c222d1a9f5 Merge 4.19-rc6) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/lkdtm/usercopy.c +Removing drivers/firmware/google/coreboot_table-of.c +Removing drivers/firmware/google/coreboot_table-acpi.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-vmbus | 21 + + .../devicetree/bindings/arm/coresight.txt | 120 +- + Documentation/nvmem/nvmem.txt | 31 + + drivers/android/Kconfig | 2 +- + drivers/android/binder.c | 489 ++++-- + drivers/android/binder_trace.h | 36 +- + drivers/firmware/google/Kconfig | 26 +- + drivers/firmware/google/Makefile | 2 - + drivers/firmware/google/coreboot_table-acpi.c | 88 - + drivers/firmware/google/coreboot_table-of.c | 82 - + drivers/firmware/google/coreboot_table.c | 126 +- + drivers/firmware/google/coreboot_table.h | 6 - + drivers/firmware/google/gsmi.c | 2 +- + drivers/firmware/google/vpd.c | 2 +- + drivers/fpga/dfl-afu-dma-region.c | 2 +- + drivers/fpga/dfl-fme-mgr.c | 2 +- + drivers/hv/channel.c | 276 +-- + drivers/hv/channel_mgmt.c | 17 +- + drivers/hv/hv.c | 15 +- + drivers/hv/ring_buffer.c | 1 + + drivers/hv/vmbus_drv.c | 118 +- + drivers/hwtracing/coresight/coresight-catu.c | 6 + + .../coresight/coresight-dynamic-replicator.c | 81 +- + drivers/hwtracing/coresight/coresight-etb10.c | 183 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 132 +- + drivers/hwtracing/coresight/coresight-etm-perf.h | 26 + + drivers/hwtracing/coresight/coresight-etm3x.c | 58 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 93 +- + drivers/hwtracing/coresight/coresight-funnel.c | 28 +- + drivers/hwtracing/coresight/coresight-priv.h | 9 +- + drivers/hwtracing/coresight/coresight-replicator.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 198 +-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 385 ++++- + drivers/hwtracing/coresight/coresight-tmc.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc.h | 4 + + drivers/hwtracing/coresight/coresight-tpiu.c | 6 +- + drivers/hwtracing/coresight/coresight.c | 184 +- + drivers/hwtracing/coresight/of_coresight.c | 262 ++- + drivers/misc/ad525x_dpot-i2c.c | 2 +- + drivers/misc/ad525x_dpot-spi.c | 2 +- + drivers/misc/ad525x_dpot.c | 6 +- + drivers/misc/apds990x.c | 1 - + drivers/misc/bh1770glc.c | 3 - + drivers/misc/cxl/flash.c | 4 +- + drivers/misc/echo/echo.c | 2 +- + drivers/misc/eeprom/at25.c | 3 +- + drivers/misc/eeprom/eeprom_93xx46.c | 19 +- + drivers/misc/genwqe/card_base.c | 1 - + drivers/misc/genwqe/card_ddcb.c | 1 - + drivers/misc/genwqe/card_utils.c | 13 +- + drivers/misc/kgdbts.c | 16 +- + drivers/misc/lkdtm/usercopy.c | 2 +- + drivers/misc/mei/bus-fixup.c | 1 - + drivers/misc/mic/scif/scif_dma.c | 4 +- + drivers/misc/sgi-gru/grukservices.c | 4 +- + drivers/misc/sgi-xp/xpc_partition.c | 3 +- + drivers/misc/sram.c | 6 +- + drivers/misc/vmw_balloon.c | 1802 ++++++++++++-------- + drivers/misc/vmw_vmci/vmci_host.c | 1 - + drivers/nvmem/core.c | 530 ++++-- + drivers/nvmem/lpc18xx_eeprom.c | 6 +- + drivers/nvmem/mxs-ocotp.c | 4 +- + drivers/nvmem/sunxi_sid.c | 22 +- + drivers/platform/goldfish/goldfish_pipe.c | 323 ++-- + drivers/platform/goldfish/goldfish_pipe_qemu.h | 98 ++ + drivers/slimbus/core.c | 37 +- + drivers/slimbus/qcom-ngd-ctrl.c | 34 +- + drivers/uio/uio.c | 35 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 3 +- + drivers/uio/uio_hv_generic.c | 116 +- + drivers/vme/vme.c | 1 - + include/linux/coresight.h | 41 +- + include/linux/hyperv.h | 14 +- + include/linux/nvmem-consumer.h | 100 +- + include/linux/nvmem-provider.h | 50 +- + include/linux/uio_driver.h | 1 + + include/uapi/linux/android/binder.h | 10 + + 78 files changed, 4035 insertions(+), 2417 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-vmbus + delete mode 100644 drivers/firmware/google/coreboot_table-acpi.c + delete mode 100644 drivers/firmware/google/coreboot_table-of.c + create mode 100644 drivers/platform/goldfish/goldfish_pipe_qemu.h +Merging extcon/extcon-next (2e464ff0a9b1 extcon: int3496: Convert to use SPDX identifier) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 60 +++++++++++++++++------------------ + drivers/extcon/extcon-intel-int3496.c | 12 ++----- + drivers/extcon/extcon-max14577.c | 24 ++++---------- + drivers/extcon/extcon-max77693.c | 22 ++++--------- + drivers/extcon/extcon-max77843.c | 19 ++++------- + drivers/extcon/extcon-max8997.c | 22 ++++--------- + drivers/extcon/extcon.c | 15 +++------ + 7 files changed, 61 insertions(+), 113 deletions(-) +Merging soundwire/next (502c00d9c315 Documentation: soundwire: fix stream.rst markup warnings) +$ git merge soundwire/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 36 ++ + MAINTAINERS | 2 +- + drivers/soundwire/bus.c | 6 + + drivers/soundwire/bus.h | 4 + + drivers/soundwire/intel.c | 68 +++- + drivers/soundwire/intel_init.c | 2 +- + drivers/soundwire/stream.c | 488 +++++++++++++++++++------- + include/linux/soundwire/sdw.h | 12 +- + 8 files changed, 482 insertions(+), 136 deletions(-) +Merging staging/staging-next (e2c3860ba27d staging: vboxvideo: Use more drm_fb_helper functions) +$ git merge staging/staging-next +Removing drivers/staging/wilc1000/wilc_debugfs.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion +Auto-merging drivers/staging/vboxvideo/vbox_fb.c +Removing drivers/staging/rtl8188eu/include/rtw_qos.h +Removing drivers/staging/rtl8188eu/include/odm_reg.h +Auto-merging drivers/staging/mt7621-eth/mdio.c +Auto-merging drivers/staging/media/imx/imx-media-dev.c +Auto-merging drivers/staging/erofs/super.c +Auto-merging drivers/iio/light/max44000.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/filesystems/pohmelfs/network_protocol.txt +Removing Documentation/filesystems/pohmelfs/info.txt +Removing Documentation/filesystems/pohmelfs/design_notes.txt +CONFLICT (modify/delete): Documentation/filesystems/00-INDEX deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of Documentation/filesystems/00-INDEX left in tree. +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/filesystems/00-INDEX +Documentation/filesystems/00-INDEX: needs merge +rm 'Documentation/filesystems/00-INDEX' +$ git commit -v -a +[master 539971531c43] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 2 +- + .../devicetree/bindings/iio/accel/adxl372.txt | 33 + + .../devicetree/bindings/iio/adc/mcp3911.txt | 30 + + .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 81 +- + .../bindings/iio/adc/sprd,sc27xx-adc.txt | 4 + + .../devicetree/bindings/iio/dac/ad5758.txt | 5 + + .../devicetree/bindings/iio/dac/ltc1660.txt | 21 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 1 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 1 + + .../devicetree/bindings/iio/light/tsl2772.txt | 42 + + .../devicetree/bindings/trivial-devices.txt | 10 - + .../filesystems/pohmelfs/design_notes.txt | 72 -- + Documentation/filesystems/pohmelfs/info.txt | 99 --- + .../filesystems/pohmelfs/network_protocol.txt | 227 ----- + MAINTAINERS | 27 +- + drivers/iio/accel/Kconfig | 27 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adxl345_i2c.c | 5 +- + drivers/iio/accel/adxl372.c | 975 +++++++++++++++++++++ + drivers/iio/accel/adxl372.h | 17 + + drivers/iio/accel/adxl372_i2c.c | 61 ++ + drivers/iio/accel/adxl372_spi.c | 52 ++ + drivers/iio/adc/Kconfig | 30 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7298.c | 2 +- + drivers/iio/adc/ad7476.c | 2 +- + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/ad7887.c | 2 +- + drivers/iio/adc/ad7923.c | 2 +- + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/envelope-detector.c | 5 +- + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/adc/mcp3911.c | 363 ++++++++ + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 4 +- + drivers/iio/adc/qcom-spmi-adc5.c | 793 +++++++++++++++++ + drivers/iio/adc/qcom-vadc-common.c | 189 +++- + drivers/iio/adc/qcom-vadc-common.h | 54 ++ + drivers/iio/adc/rcar-gyroadc.c | 12 +- + drivers/iio/adc/sc27xx_adc.c | 154 +++- + drivers/iio/amplifiers/ad8366.c | 2 +- + drivers/iio/chemical/bme680.h | 19 +- + drivers/iio/chemical/bme680_core.c | 154 ++-- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/dac/ad5758.c | 26 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/dpot-dac.c | 5 +- + drivers/iio/dac/ltc1660.c | 250 ++++++ + drivers/iio/dac/max517.c | 11 +- + drivers/iio/dac/max5821.c | 11 +- + drivers/iio/dac/mcp4725.c | 12 +- + drivers/iio/dac/mcp4922.c | 11 +- + drivers/iio/dac/ti-dac5571.c | 1 + + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/health/max30102.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 62 ++ + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 18 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 166 +++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 51 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/light/bh1750.c | 14 +- + drivers/iio/light/max44000.c | 1 - + drivers/iio/light/tsl2772.c | 194 +++- + drivers/iio/multiplexer/iio-mux.c | 5 +- + drivers/iio/potentiometer/max5481.c | 7 +- + drivers/iio/potentiometer/mcp4018.c | 9 +- + drivers/iio/potentiometer/mcp4531.c | 14 +- + drivers/iio/pressure/ms5611.h | 5 +- + drivers/iio/pressure/ms5611_core.c | 5 +- + drivers/iio/pressure/ms5611_i2c.c | 7 +- + drivers/iio/pressure/ms5611_spi.c | 7 +- + drivers/iio/proximity/isl29501.c | 12 +- + drivers/iio/trigger/iio-trig-sysfs.c | 2 +- + drivers/staging/android/ion/ion.h | 5 - + drivers/staging/android/ion/ion_system_heap.c | 24 - + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 24 +- + drivers/staging/erofs/Kconfig | 9 + + drivers/staging/erofs/data.c | 105 ++- + drivers/staging/erofs/dir.c | 15 +- + drivers/staging/erofs/erofs_fs.h | 11 + + drivers/staging/erofs/include/trace/events/erofs.h | 20 +- + drivers/staging/erofs/inode.c | 13 +- + drivers/staging/erofs/internal.h | 96 +- + drivers/staging/erofs/namei.c | 28 +- + drivers/staging/erofs/super.c | 83 +- + drivers/staging/erofs/unzip_vle.c | 445 +++++----- + drivers/staging/erofs/unzip_vle.h | 12 +- + drivers/staging/erofs/unzip_vle_lz4.c | 69 +- + drivers/staging/erofs/utils.c | 2 +- + drivers/staging/erofs/xattr.c | 196 +++-- + drivers/staging/fbtft/fbtft.h | 2 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 +- + drivers/staging/gasket/Kconfig | 5 +- + drivers/staging/gasket/apex_driver.c | 3 - + drivers/staging/gasket/gasket_core.c | 138 +-- + drivers/staging/gasket/gasket_core.h | 19 +- + drivers/staging/gasket/gasket_interrupt.c | 110 +-- + drivers/staging/gasket/gasket_interrupt.h | 24 +- + drivers/staging/gasket/gasket_page_table.c | 85 +- + drivers/staging/greybus/audio_codec.c | 1 - + drivers/staging/greybus/tools/README.loopback | 2 +- + drivers/staging/greybus/tools/loopback_test.c | 2 +- + drivers/staging/iio/adc/ad7192.c | 2 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + drivers/staging/iio/adc/ad7606.c | 2 +- + drivers/staging/iio/adc/ad7606_par.c | 2 +- + drivers/staging/iio/adc/ad7606_spi.c | 2 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/cdc/ad7746.c | 2 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- + drivers/staging/media/imx/imx-media-dev.c | 15 +- + drivers/staging/media/imx/imx-media-of.c | 4 +- + drivers/staging/most/cdev/cdev.c | 12 +- + drivers/staging/most/core.c | 49 +- + drivers/staging/most/net/net.c | 2 +- + drivers/staging/most/usb/usb.c | 46 +- + drivers/staging/most/video/video.c | 4 +- + drivers/staging/mt7621-eth/gsw_mt7621.c | 1 - + drivers/staging/mt7621-eth/mdio.c | 4 +- + drivers/staging/mt7621-eth/mtk_eth_soc.c | 1 - + drivers/staging/mt7621-mmc/dbg.c | 4 +- + drivers/staging/mt7621-mmc/dbg.h | 35 - + drivers/staging/mt7621-mmc/sd.c | 402 ++------- + drivers/staging/mt7621-pci/pci-mt7621.c | 26 +- + drivers/staging/octeon-usb/octeon-hcd.c | 58 +- + drivers/staging/olpc_dcon/Kconfig | 1 + + drivers/staging/olpc_dcon/olpc_dcon.c | 5 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 5 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 5 +- + drivers/staging/pi433/rf69.c | 3 +- + drivers/staging/rtl8188eu/TODO | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 25 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 25 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 76 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 142 ++- + drivers/staging/rtl8188eu/core/rtw_led.c | 240 ++--- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 39 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 21 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 39 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 71 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 35 +- + drivers/staging/rtl8188eu/hal/odm.c | 19 +- + drivers/staging/rtl8188eu/hal/phy.c | 27 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 98 +-- + drivers/staging/rtl8188eu/include/drv_types.h | 7 +- + drivers/staging/rtl8188eu/include/odm_precomp.h | 2 +- + drivers/staging/rtl8188eu/include/odm_reg.h | 106 --- + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/phy.h | 1 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - + drivers/staging/rtl8188eu/include/rtw_qos.h | 18 - + drivers/staging/rtl8188eu/include/wifi.h | 8 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 - + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 16 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 108 +-- + drivers/staging/rtl8192u/ieee80211/dot11d.h | 77 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 18 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 5 + + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 12 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 84 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 184 ++-- + drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 161 ++-- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 138 +-- + drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 16 +- + drivers/staging/rtl8192u/r8180_93cx6.h | 19 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 33 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 11 +- + drivers/staging/rtl8192u/r8192U.h | 46 +- + drivers/staging/rtl8192u/r8192U_core.c | 105 +-- + drivers/staging/rtl8192u/r8192U_hw.h | 204 +---- + drivers/staging/rtl8192u/r819xU_firmware.c | 4 +- + drivers/staging/rtl8192u/r819xU_firmware.h | 11 +- + drivers/staging/rtl8192u/r819xU_phy.c | 31 +- + drivers/staging/rtl8192u/r819xU_phy.h | 6 +- + drivers/staging/rtl8712/hal_init.c | 10 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 7 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_debug.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 11 +- + drivers/staging/rtl8723bs/include/drv_types.h | 2 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 10 +- + drivers/staging/rtlwifi/efuse.c | 3 +- + drivers/staging/rtlwifi/regd.c | 2 +- + drivers/staging/rts5208/ms.c | 619 +++++-------- + drivers/staging/rts5208/rtsx_card.c | 92 +- + drivers/staging/rts5208/rtsx_card.h | 3 +- + drivers/staging/rts5208/rtsx_chip.c | 396 +++------ + drivers/staging/rts5208/rtsx_scsi.c | 108 +-- + drivers/staging/rts5208/sd.c | 649 +++++--------- + drivers/staging/rts5208/spi.c | 141 +-- + drivers/staging/rts5208/xd.c | 210 ++--- + drivers/staging/sm750fb/sm750.c | 10 +- + drivers/staging/vboxvideo/TODO | 1 - + drivers/staging/vboxvideo/vbox_drv.c | 165 ++-- + drivers/staging/vboxvideo/vbox_drv.h | 86 +- + drivers/staging/vboxvideo/vbox_fb.c | 152 +--- + drivers/staging/vboxvideo/vbox_irq.c | 8 +- + drivers/staging/vboxvideo/vbox_main.c | 185 +--- + drivers/staging/vboxvideo/vbox_mode.c | 921 ++++++++++--------- + drivers/staging/vboxvideo/vbox_ttm.c | 78 +- + .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 235 ++--- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 338 ++----- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 893 +++++-------------- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 222 ++--- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 85 +- + drivers/staging/vc04_services/bcm2835-camera/TODO | 6 - + .../vc04_services/bcm2835-camera/controls.c | 2 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.c | 1 - + .../staging/vc04_services/interface/vchi/vchi.h | 208 ++--- + .../vc04_services/interface/vchi/vchi_cfg.h | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 35 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 5 + + .../interface/vchiq_arm/vchiq_genversion | 88 -- + drivers/staging/wilc1000/Makefile | 5 +- + drivers/staging/wilc1000/coreconfigurator.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 277 ++---- + drivers/staging/wilc1000/host_interface.h | 19 +- + drivers/staging/wilc1000/linux_mon.c | 3 +- + drivers/staging/wilc1000/linux_wlan.c | 129 ++- + drivers/staging/wilc1000/wilc_debugfs.c | 115 --- + drivers/staging/wilc1000/wilc_sdio.c | 56 +- + drivers/staging/wilc1000/wilc_spi.c | 57 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 281 +++--- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 4 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 55 +- + drivers/staging/wilc1000/wilc_wlan.c | 208 ++--- + drivers/staging/wilc1000/wilc_wlan.h | 8 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 294 +++---- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 26 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 4 - + drivers/staging/wlan-ng/cfg80211.c | 49 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 46 +- + drivers/staging/wlan-ng/p80211metadef.h | 121 ++- + drivers/staging/wlan-ng/p80211metastruct.h | 3 +- + drivers/staging/wlan-ng/p80211netdev.c | 12 +- + drivers/staging/wlan-ng/p80211req.c | 36 +- + drivers/staging/wlan-ng/prism2fw.c | 37 +- + drivers/staging/wlan-ng/prism2mib.c | 76 +- + drivers/staging/wlan-ng/prism2sta.c | 86 +- + include/dt-bindings/iio/qcom,spmi-vadc.h | 125 ++- + 265 files changed, 8729 insertions(+), 8600 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/accel/adxl372.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/mcp3911.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ltc1660.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2772.txt + delete mode 100644 Documentation/filesystems/pohmelfs/design_notes.txt + delete mode 100644 Documentation/filesystems/pohmelfs/info.txt + delete mode 100644 Documentation/filesystems/pohmelfs/network_protocol.txt + create mode 100644 drivers/iio/accel/adxl372.c + create mode 100644 drivers/iio/accel/adxl372.h + create mode 100644 drivers/iio/accel/adxl372_i2c.c + create mode 100644 drivers/iio/accel/adxl372_spi.c + create mode 100644 drivers/iio/adc/mcp3911.c + create mode 100644 drivers/iio/adc/qcom-spmi-adc5.c + create mode 100644 drivers/iio/dac/ltc1660.c + delete mode 100644 drivers/staging/rtl8188eu/include/odm_reg.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_qos.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion + delete mode 100644 drivers/staging/wilc1000/wilc_debugfs.c +Merging mux/for-next (2c01260df661 mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Auto-merging Documentation/driver-model/devres.txt +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 icc/icc-next (8f023d0cb757 interconnect: core: Fix unused variable compiler warning) +$ git merge icc/icc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/interconnect/interconnect.txt | 60 ++ + .../bindings/interconnect/qcom-msm8916.txt | 41 ++ + .../devicetree/bindings/interconnect/qcom-smd.txt | 32 + + Documentation/interconnect/interconnect.rst | 94 +++ + MAINTAINERS | 10 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/interconnect/Kconfig | 15 + + drivers/interconnect/Makefile | 6 + + drivers/interconnect/core.c | 723 +++++++++++++++++++++ + drivers/interconnect/qcom/Kconfig | 22 + + drivers/interconnect/qcom/Makefile | 7 + + drivers/interconnect/qcom/msm8916.c | 509 +++++++++++++++ + drivers/interconnect/qcom/smd-rpm.c | 91 +++ + drivers/interconnect/qcom/smd-rpm.h | 15 + + include/dt-bindings/interconnect/qcom.h | 98 +++ + include/linux/interconnect-provider.h | 125 ++++ + include/linux/interconnect.h | 49 ++ + 18 files changed, 1900 insertions(+) + create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom-msm8916.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom-smd.txt + create mode 100644 Documentation/interconnect/interconnect.rst + create mode 100644 drivers/interconnect/Kconfig + create mode 100644 drivers/interconnect/Makefile + create mode 100644 drivers/interconnect/core.c + create mode 100644 drivers/interconnect/qcom/Kconfig + create mode 100644 drivers/interconnect/qcom/Makefile + create mode 100644 drivers/interconnect/qcom/msm8916.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.h + create mode 100644 include/dt-bindings/interconnect/qcom.h + create mode 100644 include/linux/interconnect-provider.h + create mode 100644 include/linux/interconnect.h +Merging slave-dma/next (1576f7e1ef98 Merge branch 'topic/jz' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/jz4780-dma.txt | 14 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 15 ++ + arch/mips/boot/dts/ingenic/jz4770.dtsi | 30 +++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 3 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/at_xdmac.c | 4 +- + drivers/dma/dma-jz4780.c | 289 +++++++++++++++------ + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 +- + drivers/dma/dw/platform.c | 2 + + drivers/dma/fsldma.c | 4 +- + drivers/dma/idma64.c | 5 +- + drivers/dma/mmp_tdma.c | 7 +- + drivers/dma/mv_xor.c | 4 +- + drivers/dma/mxs-dma.c | 3 +- + drivers/dma/nbpfaxi.c | 9 +- + drivers/dma/pxa_dma.c | 5 +- + drivers/dma/sh/shdma-arm.h | 5 +- + drivers/dma/sh/shdma-base.c | 5 +- + drivers/dma/sh/shdma-of.c | 5 +- + drivers/dma/sh/shdma-r8a73a4.c | 5 +- + drivers/dma/sh/shdma.h | 6 +- + drivers/dma/sh/shdmac.c | 6 +- + drivers/dma/sh/sudmac.c | 5 +- + drivers/dma/sh/usb-dmac.c | 5 +- + drivers/dma/sprd-dma.c | 81 +++++- + drivers/dma/st_fdma.c | 7 +- + drivers/dma/ste_dma40.c | 14 +- + drivers/dma/stm32-mdma.c | 4 +- + include/linux/dma/sprd-dma.h | 69 +++++ + 29 files changed, 441 insertions(+), 176 deletions(-) +Merging cgroup/for-next (808c43b7c7f7 cgroup: Simplify cgroup_ancestor) +$ git merge cgroup/for-next +Auto-merging include/linux/cgroup.h +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) +Merging scsi/for-next (257f0d4d404c Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- + drivers/message/fusion/mptbase.c | 12 +- + drivers/message/fusion/mptsas.c | 8 +- + drivers/scsi/53c700.h | 2 +- + drivers/scsi/FlashPoint.c | 6 +- + drivers/scsi/NCR5380.c | 167 ++++--- + drivers/scsi/NCR5380.h | 2 +- + drivers/scsi/aacraid/aachba.c | 7 - + drivers/scsi/aacraid/commsup.c | 2 - + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aic7xxx/aic7770.c | 6 - + drivers/scsi/aic7xxx/aic79xx.h | 6 - + drivers/scsi/aic7xxx/aic79xx_core.c | 44 -- + drivers/scsi/aic7xxx/aic79xx_pci.c | 8 - + drivers/scsi/aic7xxx/aic7xxx.h | 6 - + drivers/scsi/aic7xxx/aic7xxx_93cx6.c | 6 - + drivers/scsi/aic7xxx/aic7xxx_core.c | 41 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 7 - + drivers/scsi/aic7xxx/aicasm/aicasm.h | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.l | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 4 - + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 4 - + drivers/scsi/arcmsr/arcmsr_hba.c | 20 +- + drivers/scsi/be2iscsi/be_main.c | 2 - + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 3 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +- + drivers/scsi/hpsa.c | 12 +- + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 22 +- + drivers/scsi/lpfc/lpfc.h | 29 +- + drivers/scsi/lpfc/lpfc_attr.c | 111 ++++- + drivers/scsi/lpfc/lpfc_bsg.c | 341 +++++++++++++- + drivers/scsi/lpfc/lpfc_bsg.h | 36 ++ + drivers/scsi/lpfc/lpfc_crtn.h | 7 + + drivers/scsi/lpfc/lpfc_ct.c | 11 +- + drivers/scsi/lpfc/lpfc_els.c | 3 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_hw4.h | 45 ++ + drivers/scsi/lpfc/lpfc_init.c | 101 +++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 3 + + drivers/scsi/lpfc/lpfc_nvme.c | 19 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 20 +- + drivers/scsi/lpfc/lpfc_scsi.c | 34 +- + drivers/scsi/lpfc/lpfc_sli.c | 303 +++++++++++- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 14 +- + drivers/scsi/megaraid/megaraid_mbox.c | 4 +- + drivers/scsi/megaraid/megaraid_mbox.h | 2 +- + drivers/scsi/pm8001/pm8001_defs.h | 8 + + drivers/scsi/pm8001/pm8001_hwi.c | 9 +- + drivers/scsi/pm8001/pm8001_hwi.h | 4 - + drivers/scsi/pm8001/pm8001_init.c | 3 +- + drivers/scsi/pm8001/pm8001_sas.c | 41 +- + drivers/scsi/pm8001/pm8001_sas.h | 3 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 97 +++- + drivers/scsi/pm8001/pm80xx_hwi.h | 9 +- + drivers/scsi/qla2xxx/qla_attr.c | 587 +++++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 32 +- + drivers/scsi/qla2xxx/qla_gbl.h | 17 +- + drivers/scsi/qla2xxx/qla_gs.c | 536 ++++++---------------- + drivers/scsi/qla2xxx/qla_init.c | 411 ++++++++++------- + drivers/scsi/qla2xxx/qla_inline.h | 23 +- + drivers/scsi/qla2xxx/qla_iocb.c | 43 +- + drivers/scsi/qla2xxx/qla_isr.c | 84 ++-- + drivers/scsi/qla2xxx/qla_mbx.c | 51 +- + drivers/scsi/qla2xxx/qla_nvme.c | 7 +- + drivers/scsi/qla2xxx/qla_os.c | 317 ++++++++----- + drivers/scsi/qla2xxx/qla_target.c | 534 ++++++++++++++------- + drivers/scsi/qla2xxx/qla_target.h | 8 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 49 +- + drivers/scsi/qla4xxx/ql4_init.c | 10 +- + drivers/scsi/raid_class.c | 4 +- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/scsi_transport_sas.c | 2 - + drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +- + drivers/scsi/ufs/ufshcd.c | 53 ++- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 23 +- + drivers/target/iscsi/iscsi_target.c | 2 +- + drivers/target/iscsi/iscsi_target_erl2.c | 2 +- + drivers/target/iscsi/iscsi_target_erl2.h | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/target/target_core_iblock.c | 54 ++- + 90 files changed, 3141 insertions(+), 1443 deletions(-) +Merging scsi-mkp/for-next (ef801f07e7b3 scsi: qla2xxx: Return switch command on a timeout) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_init.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) +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 vhost/linux-next (1e05b62ae4bd sh: use the the PCI channels's io_map_base) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (3c3310493636 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,adsp.txt | 5 ++++ + drivers/remoteproc/Kconfig | 35 +++++++++++----------- + drivers/remoteproc/Makefile | 4 +-- + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/qcom_q6v5.c | 12 ++++++++ + .../{qcom_q6v5_pil.c => qcom_q6v5_mss.c} | 6 ++-- + .../{qcom_adsp_pil.c => qcom_q6v5_pas.c} | 28 +++++++++++++++-- + drivers/rpmsg/qcom_glink_native.c | 3 -- + drivers/rpmsg/qcom_glink_smem.c | 2 +- + drivers/rpmsg/qcom_smd.c | 9 ++++-- + drivers/rpmsg/rpmsg_char.c | 27 ++++++++++------- + 11 files changed, 90 insertions(+), 43 deletions(-) + rename drivers/remoteproc/{qcom_q6v5_pil.c => qcom_q6v5_mss.c} (99%) + rename drivers/remoteproc/{qcom_adsp_pil.c => qcom_q6v5_pas.c} (90%) +Merging gpio/for-next (e6248f37f7d0 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Removing include/linux/platform_data/gpio-ts5500.h +Auto-merging drivers/staging/iio/adc/ad7606.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Removing drivers/gpio/gpio-ingenic.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/ingenic,gpio.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/gpio.txt | 142 +++--- + .../devicetree/bindings/gpio/ingenic,gpio.txt | 46 -- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 65 ++- + .../bindings/pinctrl/ingenic,pinctrl.txt | 39 +- + Documentation/driver-api/gpio/board.rst | 24 + + Documentation/driver-api/gpio/consumer.rst | 64 ++- + Documentation/driver-api/gpio/driver.rst | 23 +- + MAINTAINERS | 7 + + arch/arm/mach-davinci/board-neuros-osd2.c | 8 +- + arch/arm/mach-ep93xx/core.c | 9 + + arch/mips/include/asm/vr41xx/giu.h | 8 - + arch/x86/platform/ts5500/ts5500.c | 1 - + drivers/auxdisplay/hd44780.c | 61 +-- + drivers/bus/ts-nbus.c | 20 +- + drivers/gpio/Kconfig | 21 +- + drivers/gpio/Makefile | 4 +- + drivers/gpio/gpio-adp5520.c | 2 +- + drivers/gpio/gpio-adp5588.c | 2 +- + drivers/gpio/gpio-bcm-kona.c | 14 +- + drivers/gpio/gpio-brcmstb.c | 15 +- + drivers/gpio/gpio-davinci.c | 60 ++- + drivers/gpio/gpio-ep93xx.c | 297 ++++++----- + drivers/gpio/gpio-ftgpio010.c | 115 ++++- + drivers/gpio/gpio-htc-egpio.c | 10 +- + drivers/gpio/gpio-ingenic.c | 392 --------------- + drivers/gpio/gpio-max3191x.c | 16 +- + drivers/gpio/gpio-mmio.c | 6 +- + drivers/gpio/gpio-mxs.c | 4 +- + drivers/gpio/gpio-omap.c | 31 +- + drivers/gpio/gpio-pxa.c | 6 + + drivers/gpio/gpio-rcar.c | 6 + + drivers/gpio/gpio-siox.c | 293 +++++++++++ + drivers/gpio/gpio-tb10x.c | 123 ++--- + drivers/gpio/gpio-tps65086.c | 12 +- + drivers/gpio/gpio-tps6586x.c | 15 +- + drivers/gpio/gpio-tps65910.c | 9 +- + drivers/gpio/gpio-tps65912.c | 16 +- + drivers/gpio/gpio-ts5500.c | 13 +- + drivers/gpio/gpio-twl4030.c | 59 ++- + drivers/gpio/gpio-twl6040.c | 31 +- + drivers/gpio/gpio-vf610.c | 13 +- + drivers/gpio/gpio-viperboard.c | 10 +- + drivers/gpio/gpio-vr41xx.c | 55 +-- + drivers/gpio/gpio-vx855.c | 20 +- + drivers/gpio/gpio-wm831x.c | 8 +- + drivers/gpio/gpio-wm8350.c | 8 +- + drivers/gpio/gpio-wm8994.c | 8 +- + drivers/gpio/gpio-xlp.c | 12 +- + drivers/gpio/gpio-xtensa.c | 7 +- + drivers/gpio/gpio-zevio.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 6 +- + drivers/gpio/gpiolib-devprop.c | 26 +- + drivers/gpio/{devres.c => gpiolib-devres.c} | 12 +- + drivers/gpio/gpiolib-legacy.c | 1 + + drivers/gpio/gpiolib-of.c | 60 ++- + drivers/gpio/gpiolib-sysfs.c | 11 +- + drivers/gpio/gpiolib.c | 545 ++++++++++++++++----- + drivers/gpio/gpiolib.h | 25 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 14 +- + drivers/mmc/core/pwrseq_simple.c | 13 +- + drivers/mux/gpio.c | 12 +- + drivers/net/phy/mdio-mux-gpio.c | 11 +- + drivers/pcmcia/soc_common.c | 9 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 19 +- + drivers/pinctrl/Kconfig | 6 +- + drivers/pinctrl/pinctrl-ingenic.c | 462 ++++++++++++++++- + drivers/staging/iio/adc/ad7606.c | 8 +- + drivers/tty/serial/serial_mctrl_gpio.c | 7 +- + include/linux/gpio/consumer.h | 79 ++- + include/linux/gpio/driver.h | 32 +- + include/linux/platform_data/gpio-davinci.h | 34 -- + include/linux/platform_data/gpio-ts5500.h | 27 - + include/uapi/linux/gpio.h | 2 +- + 73 files changed, 2179 insertions(+), 1474 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/ingenic,gpio.txt + delete mode 100644 drivers/gpio/gpio-ingenic.c + create mode 100644 drivers/gpio/gpio-siox.c + rename drivers/gpio/{devres.c => gpiolib-devres.c} (96%) + delete mode 100644 include/linux/platform_data/gpio-ts5500.h +Merging pinctrl/for-next (54a58185bfaf pinctrl: core: make sure strcmp() doesn't get a null parameter) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt | 216 ++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 + + .../bindings/pinctrl/qcom,qcs404-pinctrl.txt | 199 ++ + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 3 + + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 2 +- + drivers/pinctrl/berlin/berlin.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 8 +- + drivers/pinctrl/core.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 7 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 12 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 1 - + drivers/pinctrl/intel/pinctrl-baytrail.c | 29 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 48 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 19 +- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 7 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 81 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 7 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 32 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 7 +- + drivers/pinctrl/intel/pinctrl-intel.c | 47 + + drivers/pinctrl/intel/pinctrl-intel.h | 10 + + drivers/pinctrl/intel/pinctrl-lewisburg.c | 7 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 56 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 19 +- + drivers/pinctrl/mediatek/Kconfig | 48 +- + drivers/pinctrl/mediatek/Makefile | 5 + + drivers/pinctrl/mediatek/mtk-eint.c | 2 +- + drivers/pinctrl/mediatek/mtk-eint.h | 4 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 690 +++++++ + drivers/pinctrl/mediatek/pinctrl-moore.h | 51 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 1108 +++++++++++ + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 1407 +++---------- + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 1441 ++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 544 +++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 670 +++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 291 +++ + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h | 1754 +++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h | 1916 ++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 907 +++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.h | 63 + + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 1404 +++++++++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson.h | 2 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 6 +- + drivers/pinctrl/nomadik/pinctrl-ab8500.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 12 +- + drivers/pinctrl/nuvoton/Kconfig | 12 + + drivers/pinctrl/nuvoton/Makefile | 4 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2072 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 29 +- + drivers/pinctrl/pinctrl-at91.c | 40 +- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-digicolor.c | 1 - + drivers/pinctrl/pinctrl-falcon.c | 2 +- + drivers/pinctrl/pinctrl-lantiq.c | 8 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 6 + + drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 1 - + drivers/pinctrl/pinctrl-rockchip.c | 10 +- + drivers/pinctrl/pinctrl-rza1.c | 13 +- + drivers/pinctrl/pinctrl-single.c | 32 +- + drivers/pinctrl/pinctrl-st.c | 6 +- + drivers/pinctrl/qcom/Kconfig | 17 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm.c | 171 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 4 + + drivers/pinctrl/qcom/pinctrl-qcs404.c | 1697 ++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sdm660.c | 1455 ++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 29 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 30 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 +- + drivers/pinctrl/sh-pfc/Kconfig | 16 + + drivers/pinctrl/sh-pfc/Makefile | 3 + + drivers/pinctrl/sh-pfc/core.c | 23 +- + drivers/pinctrl/sh-pfc/core.h | 7 +- + drivers/pinctrl/sh-pfc/gpio.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-emev2.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 15 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 15 +- + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 408 ++++ + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 10 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 14 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 15 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 43 +- + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 842 ++++---- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 419 ++++ + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 921 ++++++++- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 370 +++- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 15 +- + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 5 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 5 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 10 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 11 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear.h | 2 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 13 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 23 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 1 - + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 8 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 5 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 6 +- + drivers/pinctrl/vt8500/pinctrl-wmt.h | 2 +- + include/dt-bindings/gpio/meson-g12a-gpio.h | 114 ++ + 132 files changed, 19975 insertions(+), 2293 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.txt + create mode 100644 drivers/pinctrl/mediatek/pinctrl-moore.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-moore.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6765.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8183.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-paris.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-paris.h + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-g12a.c + create mode 100644 drivers/pinctrl/nuvoton/Kconfig + create mode 100644 drivers/pinctrl/nuvoton/Makefile + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-qcs404.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdm660.c + create mode 100644 include/dt-bindings/gpio/meson-g12a-gpio.h +Merging pinctrl-samsung/for-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (8cdc43afbb2c pwm: mediatek: Add MT7628 support) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (f040d23c8186 signal/unicore32: Use force_sig_fault where appropriate) +$ git merge userns/for-next +Auto-merging virt/kvm/arm/mmu.c +Auto-merging mm/oom_kill.c +Auto-merging kernel/signal.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/events/uprobes.c +Auto-merging include/linux/ptrace.h +Auto-merging drivers/tty/tty_io.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/kernel/traps.c +CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c +Auto-merging arch/x86/include/asm/ptrace.h +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c +Auto-merging arch/arm/vfp/vfpmodule.c +Resolved 'arch/arm64/kernel/traps.c' using previous resolution. +Resolved 'arch/x86/kernel/traps.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2b7e0954a09a] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/traps.c | 22 ++-- + arch/arc/mm/fault.c | 20 +-- + arch/arm/include/asm/bug.h | 4 +- + arch/arm/kernel/ptrace.c | 11 +- + arch/arm/kernel/swp_emulate.c | 16 ++- + arch/arm/kernel/traps.c | 63 +++------- + arch/arm/mm/alignment.c | 10 +- + arch/arm/mm/fault.c | 28 +---- + arch/arm/vfp/vfpmodule.c | 11 +- + arch/arm64/include/asm/system_misc.h | 3 +- + arch/arm64/include/asm/traps.h | 5 +- + arch/arm64/kernel/debug-monitors.c | 11 +- + arch/arm64/kernel/fpsimd.c | 10 +- + arch/arm64/kernel/ptrace.c | 16 ++- + arch/arm64/kernel/sys_compat.c | 13 +- + arch/arm64/kernel/traps.c | 67 +++++----- + arch/arm64/mm/fault.c | 94 +++++--------- + arch/ia64/kernel/brl_emu.c | 31 +---- + arch/ia64/kernel/signal.c | 60 ++------- + arch/ia64/kernel/traps.c | 144 ++++++---------------- + arch/ia64/kernel/unaligned.c | 12 +- + arch/ia64/mm/fault.c | 12 +- + arch/powerpc/include/asm/bug.h | 2 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/kernel/process.c | 9 +- + arch/powerpc/kernel/traps.c | 34 +++--- + arch/powerpc/mm/fault.c | 55 +++++---- + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/cell/spufs/fault.c | 26 ++-- + arch/unicore32/include/asm/bug.h | 3 +- + arch/unicore32/kernel/fpu-ucf64.c | 12 +- + arch/unicore32/kernel/traps.c | 5 +- + arch/unicore32/mm/fault.c | 27 +--- + arch/x86/entry/vsyscall/vsyscall_64.c | 9 +- + arch/x86/include/asm/mpx.h | 12 +- + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/trace/mpx.h | 4 +- + arch/x86/kernel/ptrace.c | 29 ++--- + arch/x86/kernel/traps.c | 176 +++++++++++---------------- + arch/x86/kernel/umip.c | 8 +- + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/kvm/mmu.c | 11 +- + arch/x86/mm/fault.c | 167 +++++++++---------------- + arch/x86/mm/mpx.c | 30 ++--- + drivers/misc/genwqe/card_base.h | 2 +- + drivers/misc/genwqe/card_dev.c | 9 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/tty_io.c | 6 +- + drivers/usb/gadget/function/f_mass_storage.c | 4 +- + fs/jffs2/background.c | 2 +- + include/linux/ptrace.h | 17 ++- + include/linux/sched/signal.h | 5 +- + include/linux/tracehook.h | 13 +- + include/trace/events/signal.h | 3 +- + kernel/events/uprobes.c | 4 +- + kernel/pid_namespace.c | 2 +- + kernel/ptrace.c | 4 +- + kernel/signal.c | 39 +++--- + mm/oom_kill.c | 4 +- + virt/kvm/arm/mmu.c | 14 +-- + 60 files changed, 496 insertions(+), 926 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 (9b25436662d5 random: make CPU trust a boot parameter) +$ git merge random/dev +Already up to date. +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 (b76c2bbcb049 selftests: watchdog: Fix ioctl SET* error paths to take oneshot exit path) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/ftrace/config | 6 +++ + tools/testing/selftests/ftrace/ftracetest | 32 ++++++++++-- + .../ftrace/test.d/00basic/ringbuffer_size.tc | 22 ++++++++ + .../selftests/ftrace/test.d/00basic/trace_pipe.tc | 16 ++++++ + .../selftests/ftrace/test.d/event/event-enable.tc | 10 ---- + .../selftests/ftrace/test.d/event/event-pid.tc | 8 +-- + .../ftrace/test.d/event/subsystem-enable.tc | 10 ---- + .../ftrace/test.d/event/toplevel-enable.tc | 10 ---- + .../selftests/ftrace/test.d/event/trace_printk.tc | 27 ++++++++++ + .../ftrace/test.d/ftrace/fgraph-filter-stack.tc | 4 -- + .../ftrace/test.d/ftrace/fgraph-filter.tc | 9 ---- + .../ftrace/test.d/ftrace/func-filter-pid.tc | 10 ---- + .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 12 +++++ + .../selftests/ftrace/test.d/ftrace/func_cpumask.tc | 42 +++++++++++++++ + .../ftrace/test.d/ftrace/func_event_triggers.tc | 3 -- + .../ftrace/test.d/ftrace/func_mod_trace.tc | 24 +++++++++ + .../ftrace/test.d/ftrace/func_profile_stat.tc | 22 ++++++++ + .../ftrace/test.d/ftrace/func_profiler.tc | 4 -- + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 13 ----- + .../ftrace/test.d/ftrace/func_stack_tracer.tc | 39 ++++++++++++++ + .../test.d/ftrace/func_traceonoff_triggers.tc | 11 ---- + tools/testing/selftests/ftrace/test.d/functions | 11 ++++ + .../ftrace/test.d/kprobe/add_and_remove.tc | 3 -- + .../selftests/ftrace/test.d/kprobe/busy_check.tc | 3 -- + .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 8 +-- + .../ftrace/test.d/kprobe/kprobe_args_comm.tc | 17 ++++++ + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 5 -- + .../ftrace/test.d/kprobe/kprobe_args_symbol.tc | 39 ++++++++++++++ + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 8 ++- + .../ftrace/test.d/kprobe/kprobe_args_type.tc | 52 +++++++++++------- + .../ftrace/test.d/kprobe/kprobe_eventname.tc | 5 -- + .../ftrace/test.d/kprobe/kprobe_ftrace.tc | 9 ---- + .../ftrace/test.d/kprobe/kprobe_module.tc | 36 ++++++++++--- + .../ftrace/test.d/kprobe/kretprobe_args.tc | 9 ++-- + .../ftrace/test.d/kprobe/kretprobe_maxactive.tc | 4 -- + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 5 -- + .../selftests/ftrace/test.d/kprobe/probepoint.tc | 4 -- + .../selftests/ftrace/test.d/kprobe/profile.tc | 15 ++++++ + tools/testing/selftests/ftrace/test.d/template | 1 + + .../selftests/ftrace/test.d/tracer/wakeup.tc | 25 +++++++++ + .../selftests/ftrace/test.d/tracer/wakeup_rt.tc | 25 +++++++++ + .../inter-event/trigger-extended-error-support.tc | 12 ----- + .../inter-event/trigger-field-variable-support.tc | 15 +----- + .../trigger-inter-event-combined-hist.tc | 15 +----- + .../inter-event/trigger-multi-actions-accept.tc | 14 ----- + .../inter-event/trigger-onmatch-action-hist.tc | 16 +----- + .../trigger-onmatch-onmax-action-hist.tc | 16 +----- + .../inter-event/trigger-onmax-action-hist.tc | 16 +----- + .../trigger-synthetic-event-createremove.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-eventonoff.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-filter.tc | 14 ----- + .../ftrace/test.d/trigger/trigger-hist-mod.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-hist.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-multihist.tc | 16 ------ + .../ftrace/test.d/trigger/trigger-snapshot.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-stacktrace.tc | 12 ----- + .../test.d/trigger/trigger-trace-marker-hist.tc | 11 ---- + .../trigger/trigger-trace-marker-snapshot.tc | 16 +----- + .../trigger-trace-marker-synthetic-kernel.tc | 12 ----- + .../trigger/trigger-trace-marker-synthetic.tc | 12 ----- + .../ftrace/test.d/trigger/trigger-traceonoff.tc | 12 ----- + tools/testing/selftests/watchdog/watchdog-test.c | 61 +++++++++++++++++++--- + 62 files changed, 513 insertions(+), 435 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/ringbuffer_size.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/trace_pipe.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/event/trace_printk.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_profile_stat.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_comm.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_symbol.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/profile.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc +Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (29c222d1a9f5 Merge 4.19-rc6) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (9a90a5bcc73e rtc: ab8500: remove useless check) +$ git merge rtc/rtc-next +Auto-merging drivers/char/Kconfig +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 2 +- + drivers/char/Kconfig | 2 +- + drivers/mfd/menelaus.c | 13 ++- + drivers/rtc/Kconfig | 14 +--- + drivers/rtc/Makefile | 12 +-- + drivers/rtc/class.c | 12 ++- + drivers/rtc/interface.c | 3 - + drivers/rtc/rtc-ab8500.c | 96 +++++----------------- + drivers/rtc/rtc-abx80x.c | 143 ++++++++++++++++++++++++++++++--- + drivers/rtc/rtc-armada38x.c | 46 +++++------ + drivers/rtc/rtc-core.h | 14 ---- + drivers/rtc/rtc-ds1307.c | 144 +++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-ds1685.c | 191 ++++++-------------------------------------- + drivers/rtc/rtc-isl1208.c | 34 +++----- + drivers/rtc/rtc-lib.c | 2 +- + drivers/rtc/rtc-mrst.c | 5 +- + drivers/rtc/rtc-mt6397.c | 13 +-- + drivers/rtc/rtc-omap.c | 28 ++++--- + drivers/rtc/rtc-pl030.c | 15 ++-- + drivers/rtc/rtc-pl031.c | 18 ++--- + drivers/rtc/rtc-rs5c348.c | 65 +++++++-------- + drivers/rtc/rtc-rv8803.c | 7 +- + drivers/rtc/rtc-sun6i.c | 3 +- + drivers/rtc/rtc-sysfs.c | 4 +- + drivers/rtc/rtc-test.c | 7 +- + drivers/rtc/rtc-tx4939.c | 4 +- + include/linux/rtc.h | 21 +++-- + 27 files changed, 480 insertions(+), 438 deletions(-) +Merging nvdimm/libnvdimm-for-next (be5ba2ca053d dax: Fix use of zero page) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (523b3213561f eeprom: at24: fix unexpected timeout under high load) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 43 ++++++++++++++++++++++--------------------- + 1 file changed, 22 insertions(+), 21 deletions(-) +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 (6fcde9046673 arm64: Drop unneeded stackleak_check_alloca()) +$ git merge kspp/for-next/kspp +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging drivers/misc/lkdtm/lkdtm.h +Auto-merging drivers/misc/lkdtm/core.c +CONFLICT (content): Merge conflict in drivers/misc/lkdtm/core.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/Kconfig +Resolved 'drivers/misc/lkdtm/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 268a0c6de4c3] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/self-protection.rst | 10 +- + Documentation/sysctl/kernel.txt | 18 ++ + Documentation/x86/x86_64/mm.txt | 2 + + arch/Kconfig | 7 + + arch/arm64/kernel/process.c | 22 -- + 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 + + drivers/misc/lkdtm/Makefile | 2 + + drivers/misc/lkdtm/core.c | 1 + + drivers/misc/lkdtm/lkdtm.h | 3 + + drivers/misc/lkdtm/stackleak.c | 73 +++++ + fs/proc/base.c | 18 ++ + include/linux/sched.h | 5 + + include/linux/stackleak.h | 35 +++ + kernel/Makefile | 4 + + kernel/fork.c | 3 + + kernel/stackleak.c | 132 +++++++++ + kernel/sysctl.c | 15 +- + scripts/Makefile.gcc-plugins | 10 + + scripts/gcc-plugins/Kconfig | 51 ++++ + scripts/gcc-plugins/stackleak_plugin.c | 427 +++++++++++++++++++++++++++++ + 24 files changed, 840 insertions(+), 28 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/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 (ff6401301656 Merge branch 'for-powerpc' into for-next) +$ git merge cisco/for-next +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/prom_init.c +Recorded preimage for 'arch/x86/kernel/setup.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/setup.c'. +[master ab7b52320a86] Merge remote-tracking branch 'cisco/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 23 +---------- + arch/powerpc/kernel/prom.c | 4 ++ + arch/powerpc/kernel/prom_init.c | 8 ++-- + arch/powerpc/kernel/prom_init_check.sh | 2 +- + arch/x86/Kconfig | 44 +-------------------- + arch/x86/kernel/setup.c | 19 ++------- + include/linux/cmdline.h | 70 ++++++++++++++++++++++++++++++++++ + init/Kconfig | 68 +++++++++++++++++++++++++++++++++ + 8 files changed, 152 insertions(+), 86 deletions(-) + create mode 100644 include/linux/cmdline.h +Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length) +$ 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 xarray/xarray (f176eda90aeb radix tree: Remove multiorder support) +$ git merge xarray/xarray +Auto-merging mm/shmem.c +Auto-merging include/linux/fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/staging/erofs/utils.c +Auto-merging drivers/pci/hotplug/acpiphp_core.c +Auto-merging drivers/pci/hotplug/acpiphp.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/index.rst +Recorded preimage for 'fs/dax.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/dax.c'. +[master 6fa83cd4f41b] Merge remote-tracking branch 'xarray/xarray' +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 - + .mailmap | 7 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/xarray.rst | 424 ++++++ + MAINTAINERS | 17 +- + arch/parisc/kernel/syscall.S | 2 +- + 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 +- + drivers/input/keyboard/hilkbd.c | 2 +- + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_core.c | 4 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/staging/erofs/utils.c | 18 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/extent_io.c | 12 +- + fs/buffer.c | 14 +- + fs/dax.c | 908 +++++------ + 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/isofs/dir.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/idr.h | 19 +- + include/linux/pagemap.h | 10 +- + include/linux/pagevec.h | 8 +- + include/linux/radix-tree.h | 178 +-- + include/linux/swap.h | 22 +- + include/linux/swapops.h | 19 +- + include/linux/xarray.h | 1138 +++++++++++++- + kernel/memremap.c | 76 +- + lib/Kconfig | 5 +- + lib/Kconfig.debug | 3 + + lib/Makefile | 3 +- + lib/idr.c | 401 ++--- + lib/radix-tree.c | 834 ++-------- + lib/test_xarray.c | 1218 +++++++++++++++ + lib/xarray.c | 2022 +++++++++++++++++++++++++ + mm/Kconfig | 4 +- + mm/filemap.c | 724 ++++----- + mm/huge_memory.c | 17 +- + mm/khugepaged.c | 178 +-- + 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 | 193 +-- + 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 | 11 +- + tools/testing/radix-tree/benchmark.c | 141 +- + tools/testing/radix-tree/bitmap.c | 23 + + tools/testing/radix-tree/generated/autoconf.h | 2 +- + tools/testing/radix-tree/idr-test.c | 71 +- + tools/testing/radix-tree/iteration_check.c | 109 +- + 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/main.c | 66 +- + tools/testing/radix-tree/multiorder.c | 609 +------- + tools/testing/radix-tree/regression1.c | 75 +- + tools/testing/radix-tree/regression2.c | 8 +- + tools/testing/radix-tree/regression3.c | 23 - + tools/testing/radix-tree/tag_check.c | 33 +- + tools/testing/radix-tree/test.c | 131 +- + tools/testing/radix-tree/test.h | 13 +- + tools/testing/radix-tree/xarray.c | 35 + + 93 files changed, 6855 insertions(+), 3813 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/xarray.c +Merging akpm-current/current (ac6c789471e5 lib/lz4: update LZ4 decompressor module) +$ git merge --no-ff akpm-current/current +Auto-merging mm/workingset.c +CONFLICT (content): Merge conflict in mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/swap_state.c +CONFLICT (content): Merge conflict in mm/swap_state.c +Auto-merging mm/swap.c +Auto-merging mm/mincore.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/util.h +Auto-merging ipc/shm.c +Auto-merging init/do_mounts.c +Auto-merging init/Kconfig +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/radix-tree.h +CONFLICT (content): Merge conflict in include/linux/radix-tree.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/cgroup.h +Auto-merging fs/read_write.c +Auto-merging fs/iomap.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/bfs/inode.c +Auto-merging drivers/cpuidle/governors/menu.c +Auto-merging block/genhd.c +Auto-merging block/blk-iolatency.c +CONFLICT (content): Merge conflict in block/blk-iolatency.c +Removing arch/xtensa/include/asm/vga.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/unicore32/mm/init.c +Auto-merging arch/unicore32/Kconfig +Auto-merging arch/powerpc/include/asm/processor.h +Auto-merging arch/nios2/Kconfig +Auto-merging arch/mips/include/asm/processor.h +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Recorded preimage for 'block/blk-iolatency.c' +Recorded preimage for 'include/linux/radix-tree.h' +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'mm/swap_state.c' using previous resolution. +Recorded preimage for 'mm/workingset.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'block/blk-iolatency.c'. +Recorded resolution for 'include/linux/radix-tree.h'. +Recorded resolution for 'mm/workingset.c'. +[master e39dcb3ccaa5] 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 | 18 + + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/filesystems/proc.txt | 4 + + Documentation/x86/pat.txt | 4 +- + arch/alpha/Kconfig | 2 + + arch/alpha/include/asm/processor.h | 6 - + arch/alpha/kernel/core_irongate.c | 4 +- + arch/alpha/kernel/setup.c | 98 +-- + arch/alpha/mm/numa.c | 113 +--- + arch/arc/include/asm/processor.h | 8 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/processor.h | 6 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/processor.h | 7 - + arch/arm64/include/asm/string.h | 14 +- + arch/arm64/kernel/arm64ksyms.c | 7 +- + arch/arm64/lib/memchr.S | 2 +- + arch/arm64/lib/memcmp.S | 2 +- + arch/arm64/lib/strchr.S | 2 +- + arch/arm64/lib/strcmp.S | 2 +- + arch/arm64/lib/strlen.S | 2 +- + arch/arm64/lib/strncmp.S | 2 +- + arch/arm64/lib/strnlen.S | 2 +- + arch/arm64/lib/strrchr.S | 2 +- + arch/c6x/include/asm/processor.h | 11 - + arch/h8300/include/asm/processor.h | 6 - + arch/hexagon/Kconfig | 5 +- + arch/hexagon/include/asm/processor.h | 3 - + arch/hexagon/mm/init.c | 20 +- + arch/ia64/include/asm/pgtable.h | 1 - + arch/ia64/include/asm/processor.h | 6 - + arch/m68k/include/asm/processor.h | 6 - + arch/microblaze/include/asm/processor.h | 12 - + arch/mips/include/asm/processor.h | 5 - + arch/nds32/include/asm/processor.h | 6 - + arch/nios2/Kconfig | 3 + + arch/nios2/include/asm/processor.h | 6 - + arch/nios2/kernel/prom.c | 17 - + arch/nios2/kernel/setup.c | 39 +- + arch/openrisc/include/asm/processor.h | 5 - + arch/parisc/include/asm/processor.h | 11 - + arch/powerpc/include/asm/processor.h | 6 - + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 9 +- + arch/riscv/include/asm/processor.h | 6 - + arch/s390/appldata/appldata_os.c | 4 - + arch/s390/include/asm/processor.h | 6 - + arch/sh/include/asm/processor_32.h | 6 - + arch/sh/include/asm/processor_64.h | 15 - + arch/sparc/include/asm/processor_32.h | 6 - + arch/sparc/include/asm/processor_64.h | 6 - + arch/um/Kconfig | 2 + + arch/um/kernel/physmem.c | 22 +- + arch/unicore32/Kconfig | 1 + + arch/unicore32/include/asm/processor.h | 6 - + arch/unicore32/mm/init.c | 54 +- + arch/x86/entry/vdso/vma.c | 24 +- + arch/x86/include/asm/kexec.h | 3 +- + arch/x86/include/asm/processor.h | 12 - + arch/x86/um/asm/processor_32.h | 8 - + arch/x86/um/asm/processor_64.h | 3 - + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/processor.h | 8 - + arch/xtensa/include/asm/vga.h | 19 - + block/blk-iolatency.c | 7 +- + block/genhd.c | 2 +- + drivers/base/node.c | 19 +- + drivers/cpuidle/governors/menu.c | 4 - + drivers/infiniband/hw/hfi1/mmu_rb.c | 1 - + drivers/iommu/amd_iommu_v2.c | 1 - + drivers/iommu/intel-svm.c | 1 - + drivers/misc/sgi-gru/grutlbpurge.c | 1 - + drivers/of/fdt.c | 11 +- + drivers/staging/android/ion/ion_page_pool.c | 8 +- + fs/bfs/inode.c | 9 +- + fs/buffer.c | 50 +- + fs/cramfs/inode.c | 5 +- + fs/dcache.c | 38 +- + fs/hfs/brec.c | 5 + + fs/hfs/btree.c | 41 +- + fs/hfs/btree.h | 1 + + fs/hfs/catalog.c | 16 + + fs/hfs/extent.c | 4 + + fs/hfsplus/attributes.c | 10 + + fs/hfsplus/brec.c | 5 + + fs/hfsplus/btree.c | 44 +- + fs/hfsplus/catalog.c | 24 + + fs/hfsplus/extents.c | 4 + + fs/hfsplus/hfsplus_fs.h | 2 + + fs/iomap.c | 2 +- + fs/ocfs2/buffer_head_io.c | 77 ++- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlmglue.c | 30 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/move_extents.c | 57 +- + fs/ocfs2/refcounttree.c | 16 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/loadavg.c | 3 - + fs/proc/meminfo.c | 16 +- + fs/proc/vmcore.c | 2 +- + fs/read_write.c | 18 +- + fs/reiserfs/xattr.c | 7 + + include/asm-generic/pgtable.h | 4 +- + include/linux/bitmap.h | 37 +- + include/linux/cgroup-defs.h | 4 + + include/linux/cgroup.h | 15 + + include/linux/compiler-gcc.h | 7 +- + include/linux/compiler_types.h | 4 + + include/linux/delayacct.h | 23 + + include/linux/hmm.h | 2 +- + include/linux/hugetlb.h | 14 + + include/linux/iomap.h | 4 +- + include/linux/ipc_namespace.h | 1 + + include/linux/linkage.h | 1 + + include/linux/math64.h | 3 + + include/linux/memcontrol.h | 13 +- + include/linux/mm.h | 38 +- + include/linux/mmu_notifier.h | 27 +- + include/linux/mmzone.h | 12 +- + include/linux/page-flags.h | 5 +- + include/linux/psi.h | 53 ++ + include/linux/psi_types.h | 92 +++ + include/linux/sched.h | 20 +- + include/linux/sched/loadavg.h | 24 +- + include/linux/slab.h | 56 +- + include/linux/swap.h | 15 +- + include/trace/events/mmflags.h | 1 + + include/uapi/linux/taskstats.h | 6 +- + init/Kconfig | 19 + + init/do_mounts.c | 31 + + ipc/ipc_sysctl.c | 42 +- + ipc/shm.c | 2 +- + ipc/util.c | 29 +- + ipc/util.h | 51 +- + kernel/cgroup/cgroup.c | 45 +- + kernel/debug/kdb/kdb_main.c | 7 +- + kernel/delayacct.c | 15 + + kernel/fork.c | 59 +- + kernel/sched/Makefile | 1 + + kernel/sched/core.c | 16 +- + kernel/sched/loadavg.c | 139 ++--- + kernel/sched/psi.c | 759 ++++++++++++++++++++++++ + kernel/sched/sched.h | 178 +++--- + kernel/sched/stats.h | 86 +++ + lib/Kconfig.debug | 6 + + lib/bitmap.c | 22 +- + lib/lz4/lz4_decompress.c | 481 ++++++++++----- + lib/lz4/lz4defs.h | 9 +- + lib/parser.c | 16 +- + lib/sg_pool.c | 7 +- + lib/test_kasan.c | 70 +++ + lib/zlib_inflate/inflate.c | 12 + + mm/Kconfig | 3 + + mm/backing-dev.c | 35 ++ + mm/compaction.c | 5 + + mm/filemap.c | 33 +- + mm/huge_memory.c | 3 +- + mm/hugetlb.c | 90 ++- + mm/kmemleak.c | 42 +- + mm/list_lru.c | 7 + + mm/memblock.c | 51 ++ + mm/memcontrol.c | 26 +- + mm/memory.c | 126 ++-- + mm/memory_hotplug.c | 153 ++--- + mm/mempolicy.c | 35 +- + mm/migrate.c | 5 + + mm/mincore.c | 12 +- + mm/mmap.c | 50 +- + mm/mmu_notifier.c | 31 - + mm/page_alloc.c | 206 +++---- + mm/page_owner.c | 4 +- + mm/rmap.c | 42 +- + mm/slab.c | 4 +- + mm/slab_common.c | 103 ++-- + mm/slub.c | 33 +- + mm/swap.c | 1 - + mm/swap_state.c | 17 +- + mm/swapfile.c | 225 ++++--- + mm/util.c | 5 +- + mm/vmalloc.c | 4 + + mm/vmscan.c | 16 +- + mm/vmstat.c | 7 +- + mm/workingset.c | 113 ++-- + mm/z3fold.c | 8 +- + scripts/checkpatch.pl | 11 - + scripts/tags.sh | 2 +- + tools/accounting/getdelays.c | 8 +- + virt/kvm/kvm_main.c | 1 - + 193 files changed, 3666 insertions(+), 1828 deletions(-) + create mode 100644 Documentation/accounting/psi.txt + delete mode 100644 arch/xtensa/include/asm/vga.h + create mode 100644 include/linux/psi.h + create mode 100644 include/linux/psi_types.h + create mode 100644 kernel/sched/psi.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: percpu: remove PER_CPU_DEF_ATTRIBUTES macro +Applying: mm: remove CONFIG_NO_BOOTMEM +.git/rebase-apply/patch:22: space before tab in indent. + select ODD_RT_SIGACTION +.git/rebase-apply/patch:23: space before tab in indent. + select OLD_SIGSUSPEND +.git/rebase-apply/patch:24: space before tab in indent. + select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67 +.git/rebase-apply/patch:26: space before tab in indent. + help +.git/rebase-apply/patch:27: space before tab in indent. + The Alpha is a 64-bit general-purpose processor designed and +warning: squelched 58 whitespace errors +warning: 63 lines add whitespace errors. +Using index info to reconstruct a base tree... +M arch/arm/Kconfig +M arch/arm64/Kconfig +M arch/powerpc/Kconfig +M arch/s390/Kconfig +M arch/unicore32/Kconfig +M arch/x86/Kconfig +M mm/Kconfig +Falling back to patching base and 3-way merge... +Auto-merging mm/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/unicore32/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Applying: mm: remove CONFIG_HAVE_MEMBLOCK +Using index info to reconstruct a base tree... +M arch/arm/Kconfig +M arch/arm64/Kconfig +M arch/powerpc/Kconfig +M arch/s390/Kconfig +M arch/unicore32/Kconfig +M arch/x86/Kconfig +M lib/Kconfig.debug +M mm/Kconfig +Falling back to patching base and 3-way merge... +Removing mm/Makefile.rej +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Removing include/linux/bootmem.h.rej +Auto-merging arch/x86/Kconfig +Removing arch/unicore32/Kconfig.rej +Auto-merging arch/unicore32/Kconfig +CONFLICT (content): Merge conflict in arch/unicore32/Kconfig +Removing arch/um/Kconfig.rej +Removing arch/sparc/Kconfig.rej +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/Kconfig.rej +Removing arch/microblaze/Kconfig.rej +Removing arch/hexagon/Kconfig.rej +Removing arch/h8300/Kconfig.rej +Removing arch/c6x/Kconfig.rej +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Removing arch/alpha/Kconfig.rej +error: Failed to merge in the changes. +Patch failed at 0003 mm: remove CONFIG_HAVE_MEMBLOCK +Use 'git am --show-current-patch' to see the failed patch + +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". + +$ git rebase --continue +Applying: of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config option +Applying: mm: remove bootmem allocator implementation. +Applying: mm: nobootmem: remove dead code +Applying: memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc* +Applying: memblock: remove _virt from APIs returning virtual address +Applying: memblock: replace alloc_bootmem_align with memblock_alloc +Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low +Applying: memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic +Applying: memblock: replace alloc_bootmem_pages_nopanic with memblock_alloc_nopanic +Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low (2) +Applying: memblock: replace __alloc_bootmem_nopanic with memblock_alloc_from_nopanic +Applying: memblock: add align parameter to memblock_alloc_node() +Applying: memblock: replace alloc_bootmem_pages_node with memblock_alloc_node +Applying: memblock: replace __alloc_bootmem_node with appropriate memblock_ API +Applying: memblock: replace alloc_bootmem_node with memblock_alloc_node +Applying: memblock: replace alloc_bootmem_low_pages with memblock_alloc_low +Applying: memblock: replace alloc_bootmem_pages with memblock_alloc +Applying: memblock: replace __alloc_bootmem with memblock_alloc_from +Applying: memblock: replace alloc_bootmem with memblock_alloc +Applying: mm: nobootmem: remove bootmem allocation APIs +Applying: memblock: replace free_bootmem{_node} with memblock_free +Applying: memblock: replace free_bootmem_late with memblock_free_late +Applying: memblock: rename free_all_bootmem to memblock_free_all +Applying: memblock: rename __free_pages_bootmem to memblock_free_pages +Applying: mm: remove nobootmem +Applying: memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants +Applying: mm: remove include/linux/bootmem.h +Applying: docs/boot-time-mm: remove bootmem documentation +Applying: drivers/android/binder_alloc.c: replace vm_insert_page with vmf_insert_page +Applying: vfs: replace current_kernel_time64 with ktime equivalent +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 + + 1e66098cbef4...3bb04576efea akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3bb04576efea drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Removing mm/nobootmem.c +Removing mm/bootmem.c +Removing include/linux/bootmem.h +Merge made by the 'recursive' strategy. + Documentation/core-api/boot-time-mm.rst | 69 +-- + arch/alpha/Kconfig | 2 - + arch/alpha/kernel/core_cia.c | 4 +- + arch/alpha/kernel/core_irongate.c | 4 +- + arch/alpha/kernel/core_marvel.c | 6 +- + arch/alpha/kernel/core_titan.c | 2 +- + arch/alpha/kernel/core_tsunami.c | 2 +- + arch/alpha/kernel/pci-noop.c | 6 +- + arch/alpha/kernel/pci.c | 6 +- + arch/alpha/kernel/pci_iommu.c | 14 +- + arch/alpha/kernel/setup.c | 3 +- + arch/alpha/kernel/sys_nautilus.c | 2 +- + arch/alpha/mm/init.c | 4 +- + arch/alpha/mm/numa.c | 1 - + arch/arc/Kconfig | 2 - + arch/arc/kernel/unwind.c | 6 +- + arch/arc/mm/highmem.c | 4 +- + arch/arc/mm/init.c | 3 +- + arch/arm/Kconfig | 2 - + arch/arm/kernel/devtree.c | 1 - + arch/arm/kernel/setup.c | 5 +- + arch/arm/mach-omap2/omap_hwmod.c | 8 +- + arch/arm/mm/dma-mapping.c | 1 - + arch/arm/mm/init.c | 3 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/xen/mm.c | 1 - + arch/arm/xen/p2m.c | 2 +- + arch/arm64/Kconfig | 2 - + arch/arm64/kernel/acpi.c | 1 - + arch/arm64/kernel/acpi_numa.c | 1 - + arch/arm64/kernel/setup.c | 3 +- + arch/arm64/mm/dma-mapping.c | 2 +- + arch/arm64/mm/init.c | 5 +- + arch/arm64/mm/kasan_init.c | 3 +- + arch/arm64/mm/mmu.c | 2 +- + arch/arm64/mm/numa.c | 5 +- + arch/c6x/Kconfig | 2 - + arch/c6x/kernel/setup.c | 1 - + arch/c6x/mm/dma-coherent.c | 4 +- + arch/c6x/mm/init.c | 7 +- + arch/h8300/Kconfig | 2 - + arch/h8300/kernel/setup.c | 1 - + arch/h8300/mm/init.c | 6 +- + arch/hexagon/Kconfig | 2 - + arch/hexagon/kernel/dma.c | 2 +- + arch/hexagon/kernel/setup.c | 2 +- + arch/hexagon/mm/init.c | 3 +- + arch/ia64/Kconfig | 2 - + arch/ia64/kernel/crash.c | 2 +- + arch/ia64/kernel/efi.c | 2 +- + arch/ia64/kernel/ia64_ksyms.c | 2 +- + arch/ia64/kernel/iosapic.c | 2 +- + arch/ia64/kernel/mca.c | 10 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/setup.c | 1 - + arch/ia64/kernel/smpboot.c | 2 +- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/kernel/unwind.c | 2 +- + arch/ia64/mm/contig.c | 6 +- + arch/ia64/mm/discontig.c | 7 +- + arch/ia64/mm/init.c | 11 +- + arch/ia64/mm/numa.c | 2 +- + arch/ia64/mm/tlb.c | 6 +- + arch/ia64/pci/pci.c | 2 +- + arch/ia64/sn/kernel/bte.c | 2 +- + arch/ia64/sn/kernel/io_common.c | 9 +- + arch/ia64/sn/kernel/setup.c | 6 +- + arch/m68k/Kconfig | 2 - + arch/m68k/atari/stram.c | 5 +- + arch/m68k/coldfire/m54xx.c | 2 +- + arch/m68k/kernel/setup_mm.c | 1 - + arch/m68k/kernel/setup_no.c | 1 - + arch/m68k/kernel/uboot.c | 2 +- + arch/m68k/mm/init.c | 6 +- + arch/m68k/mm/mcfmmu.c | 5 +- + arch/m68k/mm/motorola.c | 8 +- + arch/m68k/mm/sun3mmu.c | 6 +- + arch/m68k/sun3/config.c | 2 +- + arch/m68k/sun3/dvma.c | 2 +- + arch/m68k/sun3/mmu_emu.c | 2 +- + arch/m68k/sun3/sun3dvma.c | 5 +- + arch/m68k/sun3x/dvma.c | 2 +- + arch/microblaze/Kconfig | 2 - + arch/microblaze/mm/consistent.c | 2 +- + arch/microblaze/mm/init.c | 7 +- + arch/microblaze/pci/pci-common.c | 2 +- + arch/mips/Kconfig | 2 - + arch/mips/ar7/memory.c | 2 +- + arch/mips/ath79/setup.c | 2 +- + arch/mips/bcm63xx/prom.c | 2 +- + arch/mips/bcm63xx/setup.c | 2 +- + arch/mips/bmips/setup.c | 2 +- + arch/mips/cavium-octeon/dma-octeon.c | 4 +- + arch/mips/dec/prom/memory.c | 2 +- + arch/mips/emma/common/prom.c | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/mips/kernel/crash.c | 2 +- + arch/mips/kernel/crash_dump.c | 2 +- + arch/mips/kernel/prom.c | 2 +- + arch/mips/kernel/setup.c | 7 +- + arch/mips/kernel/traps.c | 3 +- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/kvm/commpage.c | 2 +- + arch/mips/kvm/dyntrans.c | 2 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/interrupt.c | 2 +- + arch/mips/kvm/mips.c | 2 +- + arch/mips/lantiq/prom.c | 2 +- + arch/mips/lasat/prom.c | 2 +- + arch/mips/loongson64/common/init.c | 2 +- + arch/mips/loongson64/loongson-3/numa.c | 3 +- + arch/mips/mm/init.c | 7 +- + arch/mips/mm/pgtable-32.c | 2 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/netlogic/xlp/dt.c | 2 +- + arch/mips/pci/pci-legacy.c | 2 +- + arch/mips/pci/pci.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 3 +- + arch/mips/sibyte/common/cfe.c | 2 +- + arch/mips/sibyte/swarm/setup.c | 2 +- + arch/mips/txx9/rbtx4938/prom.c | 2 +- + arch/nds32/Kconfig | 2 - + arch/nds32/kernel/setup.c | 3 +- + arch/nds32/mm/highmem.c | 2 +- + arch/nds32/mm/init.c | 13 +- + arch/nios2/Kconfig | 2 - + arch/nios2/kernel/prom.c | 2 +- + arch/nios2/kernel/setup.c | 1 - + arch/nios2/mm/init.c | 4 +- + arch/openrisc/Kconfig | 2 - + arch/openrisc/kernel/setup.c | 3 +- + arch/openrisc/mm/init.c | 7 +- + arch/openrisc/mm/ioremap.c | 2 +- + arch/parisc/Kconfig | 2 - + arch/parisc/mm/init.c | 3 +- + arch/powerpc/Kconfig | 2 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/pci_32.c | 4 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/setup-common.c | 3 +- + arch/powerpc/kernel/setup_32.c | 10 +- + arch/powerpc/kernel/setup_64.c | 11 +- + arch/powerpc/lib/alloc.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 1 - + arch/powerpc/mm/mem.c | 5 +- + arch/powerpc/mm/mmu_context_nohash.c | 8 +- + arch/powerpc/mm/numa.c | 5 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/mm/ppc_mmu_32.c | 2 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/powermac/nvram.c | 4 +- + arch/powerpc/platforms/powernv/opal.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 9 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/msi_bitmap.c | 4 +- + arch/riscv/Kconfig | 2 - + arch/riscv/mm/init.c | 5 +- + arch/s390/Kconfig | 2 - + arch/s390/kernel/crash_dump.c | 5 +- + arch/s390/kernel/setup.c | 16 +- + arch/s390/kernel/smp.c | 5 +- + arch/s390/kernel/topology.c | 6 +- + arch/s390/kernel/vdso.c | 2 +- + arch/s390/mm/extmem.c | 2 +- + arch/s390/mm/init.c | 5 +- + arch/s390/mm/vmem.c | 7 +- + arch/s390/numa/mode_emu.c | 3 +- + arch/s390/numa/numa.c | 3 +- + arch/s390/numa/toptree.c | 4 +- + arch/sh/Kconfig | 2 - + arch/sh/mm/init.c | 9 +- + arch/sh/mm/ioremap_fixed.c | 2 +- + arch/sparc/Kconfig | 2 - + arch/sparc/kernel/mdesc.c | 7 +- + arch/sparc/kernel/prom_32.c | 4 +- + arch/sparc/kernel/prom_64.c | 2 +- + arch/sparc/kernel/setup_64.c | 12 +- + arch/sparc/kernel/smp_64.c | 18 +- + arch/sparc/mm/init_32.c | 5 +- + arch/sparc/mm/init_64.c | 27 +- + arch/sparc/mm/srmmu.c | 12 +- + arch/um/Kconfig | 2 - + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 4 +- + arch/um/kernel/initrd.c | 4 +- + arch/um/kernel/mem.c | 16 +- + arch/um/kernel/physmem.c | 1 - + arch/unicore32/Kconfig | 2 - + arch/unicore32/kernel/hibernate.c | 2 +- + arch/unicore32/kernel/setup.c | 5 +- + arch/unicore32/mm/init.c | 7 +- + arch/unicore32/mm/mmu.c | 3 +- + arch/x86/Kconfig | 4 - + arch/x86/kernel/acpi/boot.c | 5 +- + arch/x86/kernel/acpi/sleep.c | 1 - + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/e820.c | 5 +- + arch/x86/kernel/mpparse.c | 1 - + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/kernel/pvclock.c | 2 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/setup_percpu.c | 14 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/tce_64.c | 6 +- + arch/x86/mm/amdtopology.c | 1 - + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/highmem_32.c | 4 +- + arch/x86/mm/init.c | 1 - + arch/x86/mm/init_32.c | 5 +- + arch/x86/mm/init_64.c | 7 +- + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/kasan_init_64.c | 11 +- + arch/x86/mm/numa.c | 3 +- + arch/x86/mm/numa_32.c | 1 - + arch/x86/mm/numa_64.c | 2 +- + arch/x86/mm/numa_emulation.c | 1 - + arch/x86/mm/pageattr-test.c | 2 +- + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/pat.c | 2 +- + arch/x86/mm/physaddr.c | 2 +- + arch/x86/pci/i386.c | 2 +- + arch/x86/platform/efi/efi.c | 3 +- + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/platform/efi/quirks.c | 7 +- + arch/x86/platform/olpc/olpc_dt.c | 4 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/p2m.c | 6 +- + arch/xtensa/Kconfig | 2 - + arch/xtensa/kernel/pci.c | 2 +- + arch/xtensa/mm/cache.c | 2 +- + arch/xtensa/mm/init.c | 4 +- + arch/xtensa/mm/kasan_init.c | 5 +- + arch/xtensa/mm/mmu.c | 4 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/iss/setup.c | 2 +- + block/blk-settings.c | 2 +- + block/bounce.c | 2 +- + drivers/acpi/numa.c | 1 - + drivers/acpi/tables.c | 3 +- + drivers/android/binder_alloc.c | 5 +- + drivers/base/platform.c | 2 +- + drivers/clk/ti/clk.c | 4 +- + drivers/firmware/dmi_scan.c | 2 +- + drivers/firmware/efi/apple-properties.c | 4 +- + drivers/firmware/efi/memmap.c | 2 +- + drivers/firmware/iscsi_ibft_find.c | 2 +- + drivers/firmware/memmap.c | 4 +- + drivers/iommu/mtk_iommu.c | 2 +- + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/macintosh/smu.c | 7 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/mtd/ar7part.c | 2 +- + drivers/net/arcnet/arc-rimi.c | 2 +- + drivers/net/arcnet/com20020-isa.c | 2 +- + drivers/net/arcnet/com90io.c | 2 +- + drivers/of/fdt.c | 24 +- + drivers/of/of_reserved_mem.c | 13 +- + drivers/of/unittest.c | 4 +- + drivers/s390/char/fs3270.c | 2 +- + drivers/s390/char/tty3270.c | 2 +- + drivers/s390/cio/cmf.c | 2 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + drivers/sfi/sfi_core.c | 2 +- + drivers/staging/android/ion/Kconfig | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 2 +- + drivers/usb/early/xhci-dbc.c | 14 +- + drivers/xen/balloon.c | 2 +- + drivers/xen/events/events_base.c | 2 +- + drivers/xen/grant-table.c | 2 +- + drivers/xen/swiotlb-xen.c | 8 +- + drivers/xen/xen-selfballoon.c | 2 +- + fs/dcache.c | 2 +- + fs/inode.c | 6 +- + fs/namespace.c | 2 +- + fs/proc/kcore.c | 2 +- + fs/proc/page.c | 2 +- + fs/proc/vmcore.c | 2 +- + fs/pstore/Kconfig | 1 - + include/asm-generic/percpu.h | 4 - + include/linux/bootmem.h | 404 ------------- + include/linux/memblock.h | 159 +++++- + include/linux/mm.h | 2 +- + include/linux/mmzone.h | 5 +- + include/linux/percpu-defs.h | 6 +- + init/main.c | 12 +- + kernel/dma/swiotlb.c | 10 +- + kernel/futex.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 2 +- + kernel/pid.c | 2 +- + kernel/power/snapshot.c | 4 +- + kernel/printk/printk.c | 5 +- + kernel/profile.c | 2 +- + lib/Kconfig.debug | 3 +- + lib/cpumask.c | 4 +- + mm/Kconfig | 8 +- + mm/Makefile | 8 +- + mm/bootmem.c | 811 --------------------------- + mm/hugetlb.c | 6 +- + mm/internal.h | 2 +- + mm/kasan/kasan_init.c | 7 +- + mm/kmemleak.c | 2 +- + mm/memblock.c | 153 ++++- + mm/memory_hotplug.c | 1 - + mm/nobootmem.c | 445 --------------- + mm/page_alloc.c | 17 +- + mm/page_ext.c | 6 +- + mm/page_idle.c | 2 +- + mm/page_owner.c | 2 +- + mm/page_poison.c | 2 +- + mm/percpu.c | 30 +- + mm/sparse-vmemmap.c | 6 +- + mm/sparse.c | 18 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/udp.c | 2 +- + net/sctp/protocol.c | 2 +- + net/xfrm/xfrm_hash.c | 2 +- + 330 files changed, 831 insertions(+), 2470 deletions(-) + delete mode 100644 include/linux/bootmem.h + delete mode 100644 mm/bootmem.c + delete mode 100644 mm/nobootmem.c +$ git am -3 ../patches/0001-dma-direct-fix-up-for-the-removal-of-linux-bootmem.h.patch +Applying: dma-direct: fix up for the removal of linux/bootmem.h +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/dma/direct.c +$ git add -A . +$ git commit -v -a --amend +[master 73fe259d48f4] Merge branch 'akpm/master' + Date: Tue Oct 2 18:28:32 2018 +1000 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..46cb7ea52dff --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20181002 |