diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-18 15:10:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-09-18 15:10:06 +1000 |
| commit | 3eb5358079d33efffe419ed8c32389bd6e6401d7 (patch) | |
| tree | 43539439b5c83c4312c3467ceb75ef6c67851b81 | |
| parent | f08d5586a4bc1b03ac03185b8b08a24634a1f7b9 (diff) | |
| download | linux-next-20180918.tar.gz linux-next-20180918.tar.xz | |
Add linux-next specific files for 20180918next-20180918
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 289 | ||||
| -rw-r--r-- | Next/Trees | 291 | ||||
| -rw-r--r-- | Next/merge.log | 6819 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7402 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..110d19b58369 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,289 @@ +Name SHA1 +---- ---- +origin 3918c21eacb06e3d9d43f718354cbce6703f4812 +fixes 72358c0b59b75623bec953078ce581ed6955137b +kbuild-current 11da3a7f84f19c26da6f86af878298694ede0804 +arc-current 7c2020c3022dfa6801d420b55ef0c507322d2c60 +arm-current afc9f65e01cd114cb2cedf544d22239116ce0cc6 +arm64-fixes 500dd232449e7c07500e713dc6970aa713f8e4f1 +m68k-current 0986b16ab49b18063d29a9e02e9c7fab1928bc8e +powerpc-fixes cca19f0b684f4ed6aabf6ad07ae3e15e77bfd78a +sparc df2def49c57b4146520a1f4ca37bc3f494e2cd67 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net c73480910e9686a5c25155cb4d418d594b678196 +bpf 4c3d795cb012a378855543a775408fba1ccff6f2 +ipsec 9e1437937807b0122e8da1ca8765be2adca9aee6 +netfilter 0376d5dce0aa174e5e4cd8b8644a9ea40b9657f9 +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers 3341ba9f0f2637a51738ef5de5114e13a1cd3eca +mac80211 c42055105785580563535e6d3143cad95c7ac7ee +rdma-fixes 67e3816842fe6414d629c7515b955952ec40c7d7 +sound-current 196f4eeeb78f53e0a598db8f9408b6f8b270c355 +sound-asoc-fixes c5c6a11f01a9476a4173c4c41a5927f8a966b841 +regmap-fixes 7876320f88802b22d4e2daf7eb027dd14175a0f8 +regulator-fixes 15aedbc095ab3c3eb4c577efb7d7504dcb235a7e +spi-fixes 973ec2006971866565e68ad64b22c7e6d331cfa2 +pci-current 9d27e39d309c93025ae6aa97236af15bef2a5f1f +driver-core.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +tty.current 7f2bf7840b74a160f908db83bc8829f8de10629b +usb.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +usb-gadget-fixes d9707490077bee0c7060ef5665a90656e1078b66 +usb-serial-fixes 35aecc02b5b621782111f64cbb032c7f6a90bb32 +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy 5b394b2ddf0347bef56e50c69a58773c94343ff3 +staging.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +char-misc.current 7876320f88802b22d4e2daf7eb027dd14175a0f8 +soundwire-fixes 8d6ccf5cebbc7ed1dee9986e36853a78dfb64084 +input-current 13fe7056bebb4015c6231a07a1be4d3aebbfe979 +crypto-current 24568b47d48ec8c906fd0f589489a08b17e1edca +ide df2def49c57b4146520a1f4ca37bc3f494e2cd67 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 111b009f7e8bcdfc8d565b1f0e3ee5072bb7490b +backlight-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +mtd-fixes 85516a9881a31e2c7a8d10f4697f3adcccc7cef1 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 10492ee8ed9188d6d420e1f79b2b9bdbc0624e65 +v4l-dvb-fixes 324493fba77500592bbaa66421729421f139d4b5 +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes 0f02cfbc3d9e413d450d8d0fd660077c23f67eff +at91-fixes 379e36d3f591cb62e781907edafea17d75e8c1fa +omap-fixes c265c0ca76fb70b226c27019245b724bcaf38dfc +kvm-fixes bdf7ffc89922a52a4f08a12f7421ea24bb7626a0 +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 55066354285b36ee09dc50e2527f43a97c567177 +nvdimm-fixes ee6581ceba7f8314b81b2f2a81f1cf3f67c679e2 +btrfs-fixes 675c168b2b92096a5dc6be968e81aaa3ddca3808 +vfs-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +dma-mapping-fixes 8c89ef7b6b64ba093239305f77a485905d03f7bf +drivers-x86-fixes ff0e9f26288d2daee4950f42b37a3d3d30d36ec1 +samsung-krzk-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +pinctrl-samsung-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +devicetree-fixes e54192b48da75f025ae4b277925eaf6aca1d13bd +scsi-fixes 83e32a5910772e1475d3640a429b7686695f04d1 +drm-fixes 2b6318a09fd346edea42a60f8d0c07b2eea2d079 +drm-intel-fixes 7876320f88802b22d4e2daf7eb027dd14175a0f8 +mmc-fixes 2ea15030c3f0554db695f85e4760da8621c183d3 +rtc-fixes 5b394b2ddf0347bef56e50c69a58773c94343ff3 +drm-misc-fixes 6ee67e351cdae68b4c9c7df74124b9f9fb81e966 +kbuild 0d91bf584fe55349193afa96a2f36d288f65b218 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 46053c73685411915d3de50c5a0045beef32806b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 6f6874f70c320f644dde934847c075ed8a9937de +arm-perf 5b394b2ddf0347bef56e50c69a58773c94343ff3 +arm-soc 20856bad5e7483d9f042d3450ea37503e18c6d65 +actions 35afadd11222dcec0f3c6b25be89195ccc582116 +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 8787854a1fbf73655ea378f5d7063932291fe0be +aspeed c224edaa4a46a84e82c1d7e7d3243ef5d39cad8f +at91 fb3cd261d0c878db395b8ad252eda5ee0bda1d35 +bcm2835 ca5b45b7c5cdb0bcebf60f99e9587ebe62354c49 +imx-mxs ceba5ca0e35a0f35c51a2eb9a1904a32824bec3c +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek b75253e66bc546bf2bef32d57d628f1da2fde94b +mvebu 23b7c60b80f6d43f61b0a9be6f8a1a4f61e2bbdd +omap a04606e5f3a784036c76d7b42d9b1f16e1ca0db0 +reset d903779b58be442f3afd2c51c46c7cf19c97684e +qcom 76b9e7f947f1ce3683754266321a653abb12f88d +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 2662ae94a639698401108c80a513ce0fa6f0812d +rockchip 41c83256353069c6040f90d412eb0158258e2082 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 4dcbc9cf5e6dac9817b73c23ed96e89870ef84f4 +sunxi 9266cf77f7597de2b3b900c5746a92c9a804ad1f +tegra 72cb7a878f5bd19bdb94b68b55316200e1d7ec09 +arm64 e4ba15debcfd27f60d43da940a58108783bff2a6 +clk 7be9338d38a646504943c9c66ab965f49627583a +clk-samsung 519570ff75a100cb054f63924e44205354228b60 +c6x 31b02fe54206541a2073d2fc41c574998ed91ff5 +csky da5734d918db4e9159d07bda477f502d1243df10 +h8300 4bdf61ccbe76ee0c14bf228e7277072179b36ba3 +m68k 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +m68knommu 9b340567a25cd106a48b218982e17b543218ea10 +microblaze c4347b05440f4d72f8084c82c86d16863f69c8a2 +mips bcec54bf3118a26422cd83675cb461ef4dea81ef +nds32 3350139c0ff3c95724b784f7109987d533cb3ecd +nios2 c7c09dc187f0323ad40b5b6c57a6db673a386a7f +openrisc 5600779ea5f3d29fadc62208e21feb0bb9b813aa +parisc-hd 7efbe131b5b02f555b3ad11485bb645d18a61b0b +powerpc 56d20861c027498b5a1112b4f9f05b56d906fdda +hvc 9f65b81f36e31563c5a5e4df3b3b8bc7550b6030 +fsl bd96461249bdded1f6ee50b25e8cd4ce3faaf581 +risc-v cdc7274029ca5984350a057a2399aaa340d3be2d +s390 c48e4c3f32a203054053159338c6154037ea007b +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml d9cbd0e8f667f8184be58c47f20df4760769ec71 +xtensa c9efd0d7beb32b41f8e074a922bd46dba1248878 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 89067b62df5b47072bf5998ad60259866cb1c059 +ceph e92c0eaf754310f9f31e9229a3f7274a67478f82 +cifs 3eb3f52e2478f23ce5ff69aea9b0e21788f5e7eb +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 50559ae2e6452ccdb0474f5470020b171a90c70f +ext4 cce6c9f7e6029caee45c459db5b3e78fec6973cb +f2fs 313ed62a3ddc2cbe16087630910b41a87bfd9a1f +fuse 30e0d0966c9cd04c9e1d96fefa2f2550e0ae7d50 +jfs 02645bcdfcc2d51f79d87ad346f07ef64ad1ea55 +nfs 11da3a7f84f19c26da6f86af878298694ede0804 +nfs-anna 9f0c5124f4a82503ee5d55c60b0b9c6afc3af68b +nfsd 108b833cde9c9b93204e6a4e455829a67f9785c3 +orangefs a3bb1b184669554c544ea3d8280c1f3d3ed70953 +overlayfs 8c25741aaad8be6fbe51510e917c740e0059cf83 +ubifs 6e5461d774bf42aae622ad0f3ff53e41962f886b +v9fs b4dc44b3cac9e8327e0655f530ed0c46f2e6214c +xfs 5b394b2ddf0347bef56e50c69a58773c94343ff3 +file-locks 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe +vfs 87a0a1536d35528abf93e8ba22673046dbb20585 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk a6ae928c25835ca18deb4a527079f169b68ed292 +pci 3ea7a150795ef7e172a8573ed225222750533b10 +pstore 831b624df1b420c8f9281ed1307a8db23afb72df +hid 9291a1dc62090e3150efd8395a87ab8a928ae19a +i2c fc9f90ddace238716cfcbd00d51428ee8baa12c7 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 05f39504bb2afabc3266d8dbc0fe1be6ae084f19 +jc_docs a7ddcea58ae22d85d94eabfdd3de75c3742e376b +v4l-dvb 985cdcb08a0488558d1005139596b64d73bee267 +v4l-dvb-next 357b50f3ccc882145aea7d83635d6ca0704515ab +fbdev f39684524b391c5a7ed0ac44db4fec3357af1c5d +pm c394940a72c5958b931603dd49e3e5a06fed1278 +cpupower 8a7e2d2ea080d10a189a1d611344b0330468ebc3 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp c5c2a97b3ac7d1ec19e7cff9e38caca6afefc3de +thermal d7a4303b8d1fa6f60b73ed91317a51764a2a412c +thermal-soc 152395fd03d4ce1e535a75cdbf58105e50587611 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma cb816cd22618b1822667a4c2c80023ffd0261777 +net-next ce5b127b172eac8adc5cb386dc19cf58acf5536c +bpf-next 70e88c758a6b8544b5e0d982e55d1e36f9aa0b85 +ipsec-next 4a132095dd64fefabdc5dad1cd9e9809b126e582 +mlx5-next 50acec06f3928fc29647aecf1270e54cae583afb +netfilter-next c8204cab9cb503bede29938785b3cdf26a275fa2 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next 43e2f2904160b9a95aad77df9cbc1622910b8598 +bluetooth 08d70c106258bab938e9d7e681b8a093400a67bc +mac80211-next ec5b8381e2fc479b4db7cae4ab89ad9a9edd41b6 +gfs2 4f36cb36c9d14340bb200d2ad9117b03ce992cfe +mtd 5b394b2ddf0347bef56e50c69a58773c94343ff3 +nand 9b2c0b94ae3243a7ebf22210998aa753237e51c6 +spi-nor bb276262e88dae52cc717bb636b7468f66bb234e +crypto 41a9aca6a2f359866552b06f19096d7fb77818dd +drm 2dc7bad71cd310dc94d1c9907909324dd2b0618f +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 2693efd99cad2509522a88722e04162b7e869333 +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 69fdf4206a8ba91a277b3d50a3a05b71247635b2 +drm-msm 2a56b5c8a7ca3d27c2cc003a2cd76be19b1cc851 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp e368fc75c190a4ad5853e4ec5a0c8acf86bd5119 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 5c41bb6071257ba668a2b8933a8654e69aea1cee +etnaviv 1a866306e0fbf3caab168c1389e4497702749441 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap fadf3e019411a960bb9ee4ddf702b3045da2b3d1 +sound 05e2ec3b00edb277b325489e0d1de3570ad16359 +sound-asoc 730428181850fa59af4d636390c60c098303568c +modules 9be936f4b3a2ec101f54cff9cf1a6abf67263c50 +input 100294cee9a98bfd4d6cb2d1c8a8aef0e959b0c4 +block 4e0cd84418eba77f1f0ae6a65daf35e4269c0596 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 10c5f0e7e97620d6bf322c157ea165f84b0a45ef +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc c42c3deae1a7c80d8dcf8ab3c0189289ac2eeb98 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 9a255eeb01dd603bfd5ab0b6ee5be0d2be3ec5f6 +mfd 92d6ba4ff7000a0e19c714178883c03de2aea61b +backlight 633786736ed53a53b8d0a630cc3ff57381027081 +battery cb90a2c6f77fe9b43d1e3f759bb2f13fe7fa1811 +regulator a09920026b536757faf7beeb6cdf584b02315345 +security 72934a2c220f7e7e241b8e747aaa5480a08e2d5a +apparmor 1f8266ff58840d698a1e96d2274189de1bdf7969 +integrity 3dd0f18c70d94ca2432c78c5735744429f071b0b +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 4458bba09788e70e8fb39ad003f087cd9dfbd6ac +tpmdd ec403d8ed08c8272cfeeeea154fdebcd289988c8 +watchdog 60c1f89241d49bacf71035470684a8d7b4bb46ea +iommu 6488a7f35eeab463f6c9c2ea34d30ca856f0bc8e +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 0dd0e297f0ec780b6b3484ba38b27d18c8ca7af9 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 57361846b52bc686112da6ca5368d11210796804 +devicetree 00b7d1cf46676ad5e6338e80dc6230e1b6e71b86 +mailbox 2bb7005696e2246baa88772341ca032ff09a63cb +spi 379d1d4dc1dfb194ad4f2f0367af95e91c6b531a +tip f267a29578f7d80aef0dc365e3d163484a556854 +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd c968ed08594dadb788a93dc2bc128ed4ef35c93e +irqchip 4110b5cbb014ebaaeb3d18ac8b98470b7251847d +ftrace bb730b5833b5bddf5cb226865e5f4496770d00b0 +rcu 9859adc81304c4f64e28ae94af5afb8a09366f36 +kvm 5b394b2ddf0347bef56e50c69a58773c94343ff3 +kvm-arm 976d34e2dab10ece5ea8fe7090b7692913f89084 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 46dec40fb741f00f1864580130779aeeaf24fb3d +kvms390 2b6d5b5ad11673be970b05a86eb932098592ad3b +xen-tip 58a57569904039d9ac38c0ff2a88396a43899689 +percpu 0b59c25f91002c1dec0d0d848e5aaefa5f213c85 +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 ff0e9f26288d2daee4950f42b37a3d3d30d36ec1 +chrome-platform 40291fb75123816b35ba06696e56b9cf2d96bf90 +hsi 5b394b2ddf0347bef56e50c69a58773c94343ff3 +leds 2d00f35c55e74fcb5626c9aa336c1ed697cd2ae9 +ipmi bc221b0f7ee30044c1bcad012ea6d78df25c0faa +driver-core 7876320f88802b22d4e2daf7eb027dd14175a0f8 +usb 1652a83fa494b12e20fc02a2cc3ddbcd75d53170 +usb-gadget 5b394b2ddf0347bef56e50c69a58773c94343ff3 +usb-serial 5b394b2ddf0347bef56e50c69a58773c94343ff3 +usb-chipidea-next 35a334659bccd07131bbee0eac0e489fcd033760 +phy-next 53706a1168631fa5bf2e6d47de4647ea7e69f270 +tty 30ecfff4de7cc222219f2cabcebfcd79604fc87f +char-misc f685fc6ab05192c7bb924288c8685b95e92a7c65 +extcon 2e464ff0a9b1ab0fbb56e2ca8b1f5ff8c9f4e02f +soundwire 502c00d9c3159e7dd3184b0e7c2cd0c0446d2546 +staging 7dc074348eb85d48f7a1fa96879458f4becf68a7 +mux 2c01260df661774f53478a79768adf7c63ce9420 +icc 3d46fda12a9dd6b5b9175fbbf51443ed5e4d7458 +slave-dma 1576f7e1ef9867ab4850db2882e28a26c611311d +cgroup e4f8d81c738db6d3ffdabfb8329aa2feaa310699 +scsi 08097a7777f86009d386d4e977ae48480d766622 +scsi-mkp 2b08adff433c85966ceb2cdb42a7986fad9040b5 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 1e05b62ae4bd4c1209229de367b0989b39644f88 +rpmsg 0205748ea6694fdd2713bed93c292f09905515c6 +gpio 72a8cedb84976acebc8131e53f60214f321bcb70 +pinctrl 1ab75c1a1deb779999cbbc1e9ceda0a770f56d05 +pinctrl-samsung 5b394b2ddf0347bef56e50c69a58773c94343ff3 +pwm 8cdc43afbb2cb58692c49fab0b13e2d9439c0642 +userns fb50f5a4011c499bc1b1fae77299cfcb3945e51b +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 9b25436662d5fb4c66eb527ead53cab15f596ee0 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest a987785dcd6c8ae2915460582aebd6481c81eb67 +y2038 67314ec7b0250290cc85eaa7a2f88a8ddb9e8547 +livepatching c72a7f5153292f241aecd290d103c39a9ace4a23 +coresight 327c7ebeb14fdfa6e533440f477d8e63cd56cdad +rtc 03df75dd03301307ec578ccd4e8c1c0117b8e65c +nvdimm be5ba2ca053d99b8b4e52044817ca93a267a2897 +at24 5b394b2ddf0347bef56e50c69a58773c94343ff3 +ntb b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 +kspp 6fcde90466738b84a073e4f4d18c50015ee29fb2 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco ce397d215ccd07b8ae3f71db689aedb85d56ab40 +fsi 15e2a7218c2788d79c5633336d17cb9428c221e7 +siox 1e4b044d22517cae7047c99038abb444423243ca +akpm-current c6247557bc4ee571c05cac69e433809e693a816f +akpm ec769499cb48eb95a5cdfb03ba0ffe7647947be4 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..424d65a46673 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,291 @@ +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 +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 +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..80565eaa3fda --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6819 @@ +$ date -R +Tue, 18 Sep 2018 07:53:31 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 96eddb810b14 Merge tag 'riscv-for-linus-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux +Merging origin/master (3918c21eacb0 Merge tag 'spi-fix-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge origin/master +Updating 96eddb810b14..3918c21eacb0 +Fast-forward + .../ABI/stable/sysfs-devices-system-xen_memory | 9 + + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/device-mapper/dm-raid.txt | 4 + + Documentation/filesystems/vfs.txt | 21 +- + Documentation/process/code-of-conduct.rst | 81 ++++++++ + Documentation/process/code-of-conflict.rst | 28 --- + Documentation/process/index.rst | 2 +- + Documentation/x86/earlyprintk.txt | 25 ++- + MAINTAINERS | 26 ++- + Makefile | 24 +-- + arch/arm64/include/asm/jump_label.h | 4 +- + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/crash_core.c | 19 ++ + arch/arm64/kernel/machine_kexec.c | 11 - + arch/hexagon/include/asm/bitops.h | 4 +- + arch/hexagon/kernel/dma.c | 2 +- + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 1 + + arch/mips/lantiq/xway/dma.c | 4 +- + arch/s390/crypto/paes_s390.c | 2 +- + arch/x86/events/intel/lbr.c | 4 + + arch/x86/include/asm/pgtable-2level.h | 9 - + arch/x86/kernel/apm_32.c | 2 + + arch/x86/kernel/eisa.c | 10 +- + arch/x86/kernel/topology.c | 4 +- + arch/x86/platform/efi/efi_32.c | 3 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/Makefile | 4 - + arch/xtensa/platforms/iss/setup.c | 25 ++- + block/blk-cgroup.c | 4 +- + drivers/android/binder_alloc.c | 43 +++- + drivers/base/firmware_loader/main.c | 30 +-- + drivers/block/null_blk.h | 17 +- + drivers/block/null_blk_main.c | 45 +++- + drivers/block/null_blk_zoned.c | 34 ++- + drivers/char/ipmi/ipmi_bt_sm.c | 92 +++++---- + drivers/char/ipmi/ipmi_msghandler.c | 53 ++--- + drivers/char/ipmi/ipmi_si_intf.c | 17 +- + drivers/char/ipmi/ipmi_ssif.c | 32 +-- + drivers/char/ipmi/kcs_bmc.c | 7 +- + drivers/dma/mic_x100_dma.c | 4 +- + drivers/fpga/dfl-fme-pr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 10 +- + drivers/gpu/drm/i915/gvt/opregion.c | 20 +- + drivers/gpu/drm/i915/intel_display.c | 8 +- + drivers/gpu/drm/i915/intel_overlay.c | 228 +++++++-------------- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 67 ++++-- + drivers/gpu/drm/nouveau/nouveau_connector.c | 110 +++++----- + drivers/gpu/drm/nouveau/nouveau_display.c | 44 ++-- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 57 ++++++ + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 5 + + drivers/gpu/drm/nouveau/nouveau_vga.c | 2 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 14 ++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 54 ++++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 5 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 24 ++- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- + drivers/hv/vmbus_drv.c | 3 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 13 +- + drivers/iio/temperature/maxim_thermocouple.c | 1 - + drivers/infiniband/hw/hfi1/pcie.c | 11 +- + drivers/md/dm-crypt.c | 10 +- + drivers/md/dm-integrity.c | 4 +- + drivers/md/dm-raid.c | 154 ++++++-------- + drivers/md/dm-thin-metadata.c | 36 +++- + drivers/md/dm-thin.c | 73 ++++++- + drivers/md/dm-verity-target.c | 24 ++- + drivers/misc/hmc6352.c | 2 + + drivers/misc/ibmvmc.c | 2 +- + drivers/misc/mei/bus.c | 12 +- + drivers/misc/mei/client.c | 2 +- + drivers/misc/mei/hbm.c | 9 +- + drivers/mmc/host/meson-mx-sdio.c | 8 +- + drivers/mmc/host/omap_hsmmc.c | 1 + + drivers/net/ethernet/amazon/ena/ena_com.c | 24 +-- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 6 + + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 8 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 82 ++++---- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 11 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 22 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 76 +++---- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 16 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 6 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 1 + + drivers/net/ethernet/netronome/nfp/flower/match.c | 2 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 11 + + drivers/net/ethernet/qualcomm/qca_7k.c | 76 ++++--- + drivers/net/ethernet/qualcomm/qca_spi.c | 110 +++++----- + drivers/net/ethernet/qualcomm/qca_spi.h | 5 - + drivers/net/ethernet/realtek/r8169.c | 11 +- + drivers/net/ethernet/renesas/Kconfig | 1 + + drivers/net/ethernet/renesas/Makefile | 1 + + drivers/net/ethernet/renesas/ravb_ptp.c | 6 +- + drivers/net/usb/qmi_wwan.c | 30 ++- + drivers/net/xen-netfront.c | 24 +-- + drivers/nvme/target/rdma.c | 27 ++- + drivers/of/base.c | 3 + + drivers/pci/hotplug/pciehp_hpc.c | 18 +- + drivers/pci/pci.c | 3 +- + drivers/pci/probe.c | 5 +- + drivers/pci/quirks.c | 6 - + drivers/pci/switch/switchtec.c | 4 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 24 +++ + drivers/s390/crypto/ap_bus.c | 86 +++----- + drivers/s390/net/qeth_core_main.c | 11 +- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 6 + + drivers/spi/spi.c | 13 +- + drivers/staging/erofs/Kconfig | 2 +- + drivers/staging/erofs/super.c | 4 +- + drivers/staging/fbtft/TODO | 4 + + drivers/staging/gasket/TODO | 13 ++ + drivers/staging/vboxvideo/vbox_drv.c | 7 + + drivers/staging/vboxvideo/vbox_mode.c | 5 + + drivers/staging/wilc1000/Makefile | 3 +- + drivers/staging/wilc1000/linux_wlan.c | 6 +- + drivers/staging/wilc1000/wilc_debugfs.c | 7 +- + drivers/staging/wilc1000/wilc_wlan.c | 6 + + drivers/staging/wilc1000/wilc_wlan_if.h | 2 - + drivers/tty/hvc/hvc_console.c | 38 +++- + drivers/usb/class/cdc-acm.c | 73 ------- + drivers/usb/class/cdc-acm.h | 1 - + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/common/common.c | 25 +++ + drivers/usb/core/hcd-pci.c | 2 - + drivers/usb/core/message.c | 11 + + drivers/usb/core/of.c | 26 --- + drivers/usb/core/quirks.c | 7 + + drivers/usb/dwc2/platform.c | 4 +- + drivers/usb/dwc3/dwc3-of-simple.c | 10 +- + drivers/usb/dwc3/dwc3-pci.c | 4 +- + drivers/usb/dwc3/gadget.c | 1 - + drivers/usb/gadget/udc/fotg210-udc.c | 15 +- + drivers/usb/gadget/udc/net2280.c | 16 +- + drivers/usb/gadget/udc/renesas_usb3.c | 5 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/xhci-mem.c | 4 + + drivers/usb/host/xhci-plat.c | 27 ++- + drivers/usb/host/xhci.c | 30 +++ + drivers/usb/misc/uss720.c | 4 +- + drivers/usb/misc/yurex.c | 8 +- + drivers/usb/mtu3/mtu3_core.c | 6 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 1 + + drivers/usb/serial/io_ti.h | 2 +- + drivers/usb/serial/ti_usb_3410_5052.c | 2 +- + drivers/usb/storage/scsiglue.c | 9 + + drivers/usb/storage/uas.c | 21 ++ + drivers/usb/storage/unusual_devs.h | 7 + + drivers/usb/typec/bus.c | 7 +- + drivers/usb/typec/class.c | 1 - + drivers/xen/Kconfig | 10 +- + drivers/xen/cpu_hotplug.c | 15 +- + drivers/xen/events/events_base.c | 2 +- + drivers/xen/gntdev.c | 26 ++- + drivers/xen/manage.c | 6 +- + drivers/xen/mem-reservation.c | 4 + + drivers/xen/xen-balloon.c | 3 + + fs/cifs/Kconfig | 1 + + fs/cifs/cifssmb.c | 11 +- + fs/cifs/misc.c | 8 + + fs/cifs/readdir.c | 11 +- + fs/cifs/smb2pdu.c | 29 +-- + fs/ext4/dir.c | 20 +- + fs/ext4/ext4.h | 20 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 20 +- + fs/ext4/mmp.c | 1 - + fs/ext4/namei.c | 6 + + fs/ext4/resize.c | 23 ++- + fs/ext4/super.c | 4 + + fs/nfs/nfs4proc.c | 31 +-- + fs/nfs/nfs4state.c | 2 + + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/pnfs.c | 26 ++- + fs/overlayfs/file.c | 23 ++- + fs/overlayfs/inode.c | 10 + + fs/overlayfs/super.c | 26 +-- + fs/pstore/ram_core.c | 17 +- + include/asm-generic/io.h | 3 +- + include/linux/blkdev.h | 2 +- + include/linux/fs.h | 5 + + include/linux/mlx5/driver.h | 8 +- + include/linux/mm_types.h | 2 +- + include/linux/mm_types_task.h | 2 +- + include/linux/mod_devicetable.h | 1 + + include/linux/pci.h | 3 + + include/linux/vm_event_item.h | 1 - + include/linux/vmacache.h | 5 - + include/net/netfilter/nf_conntrack_timeout.h | 2 +- + include/uapi/linux/perf_event.h | 2 +- + include/xen/mem-reservation.h | 7 +- + kernel/events/core.c | 15 +- + kernel/events/hw_breakpoint.c | 13 +- + kernel/jump_label.c | 2 +- + kernel/locking/lockdep.c | 1 - + kernel/locking/mutex.c | 3 +- + kernel/locking/test-ww_mutex.c | 2 +- + kernel/printk/printk.c | 12 +- + kernel/sched/debug.c | 6 +- + kernel/sched/fair.c | 26 ++- + kernel/sched/topology.c | 5 +- + mm/Makefile | 3 +- + mm/debug.c | 4 +- + mm/fadvise.c | 81 +++++--- + mm/readahead.c | 45 ++-- + mm/vmacache.c | 38 ---- + net/core/skbuff.c | 3 - + net/ipv4/ip_fragment.c | 1 + + net/ipv4/ip_gre.c | 5 + + net/ipv4/netfilter/Kconfig | 8 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_input.c | 4 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/iucv/af_iucv.c | 38 ++-- + net/iucv/iucv.c | 2 +- + net/netfilter/Kconfig | 12 +- + net/netfilter/nf_conntrack_proto.c | 26 +++ + net/netfilter/nf_conntrack_proto_dccp.c | 19 +- + net/netfilter/nf_conntrack_proto_generic.c | 8 +- + net/netfilter/nf_conntrack_proto_gre.c | 8 +- + net/netfilter/nf_conntrack_proto_icmp.c | 8 +- + net/netfilter/nf_conntrack_proto_icmpv6.c | 8 +- + net/netfilter/nf_conntrack_proto_sctp.c | 21 +- + net/netfilter/nf_conntrack_proto_tcp.c | 19 +- + net/netfilter/nf_conntrack_proto_udp.c | 21 +- + net/netfilter/nf_tables_api.c | 1 + + net/netfilter/nfnetlink_cttimeout.c | 6 +- + net/netfilter/nfnetlink_queue.c | 1 + + net/netfilter/nft_ct.c | 59 +++--- + net/netfilter/xt_CHECKSUM.c | 22 +- + net/netfilter/xt_cluster.c | 14 +- + net/netfilter/xt_hashlimit.c | 18 +- + net/rds/bind.c | 5 +- + net/sched/act_tunnel_key.c | 28 ++- + net/tipc/netlink_compat.c | 5 + + net/tipc/socket.c | 18 +- + net/tipc/socket.h | 1 + + net/tls/tls_sw.c | 6 + + scripts/subarch.include | 13 ++ + security/Kconfig | 2 +- + tools/arch/arm/include/uapi/asm/kvm.h | 13 ++ + tools/arch/arm64/include/uapi/asm/kvm.h | 13 ++ + tools/arch/s390/include/uapi/asm/kvm.h | 5 +- + tools/arch/x86/include/uapi/asm/kvm.h | 37 ++++ + tools/hv/hv_kvp_daemon.c | 2 +- + tools/include/linux/lockdep.h | 3 + + tools/include/linux/nmi.h | 0 + tools/include/uapi/asm-generic/unistd.h | 4 +- + tools/include/uapi/drm/drm.h | 9 + + tools/include/uapi/linux/if_link.h | 17 ++ + tools/include/uapi/linux/kvm.h | 6 + + tools/include/uapi/linux/perf_event.h | 2 +- + tools/include/uapi/linux/vhost.h | 18 ++ + tools/perf/Makefile.perf | 14 +- + tools/perf/arch/arm64/Makefile | 5 +- + tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 6 +- + tools/perf/arch/powerpc/util/sym-handling.c | 4 +- + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 1 + + tools/perf/arch/x86/tests/arch-tests.c | 6 + + tools/perf/arch/x86/tests/bp-modify.c | 213 +++++++++++++++++++ + tools/perf/util/annotate.c | 32 ++- + tools/perf/util/annotate.h | 1 + + tools/perf/util/evsel.c | 5 +- + tools/perf/util/map.c | 11 + + tools/perf/util/trace-event-info.c | 2 +- + tools/perf/util/trace-event-parse.c | 7 +- + tools/testing/selftests/android/Makefile | 2 +- + tools/testing/selftests/android/{ion => }/config | 0 + tools/testing/selftests/android/ion/Makefile | 2 + + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/cgroup_util.c | 38 +++- + tools/testing/selftests/cgroup/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_memcontrol.c | 205 ++++++++++++++++++ + tools/testing/selftests/efivarfs/config | 1 + + tools/testing/selftests/futex/functional/Makefile | 1 + + tools/testing/selftests/gpio/Makefile | 7 +- + tools/testing/selftests/kselftest.h | 1 - + tools/testing/selftests/kvm/Makefile | 7 +- + tools/testing/selftests/lib.mk | 12 ++ + tools/testing/selftests/memory-hotplug/config | 1 + + tools/testing/selftests/net/Makefile | 1 + + .../selftests/networking/timestamping/Makefile | 1 + + tools/testing/selftests/vm/Makefile | 4 - + 302 files changed, 3150 insertions(+), 1671 deletions(-) + create mode 100644 Documentation/process/code-of-conduct.rst + delete mode 100644 Documentation/process/code-of-conflict.rst + create mode 100644 arch/arm64/kernel/crash_core.c + create mode 100644 scripts/subarch.include + create mode 100644 tools/include/linux/nmi.h + create mode 100644 tools/perf/arch/x86/tests/bp-modify.c + rename tools/testing/selftests/android/{ion => }/config (100%) + create mode 100644 tools/testing/selftests/efivarfs/config +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 (11da3a7f84f1 Linux 4.19-rc3) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7c2020c3022d ARC: fix spelling mistake "entires" -> "entries") +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 2 +- + arch/arc/Makefile | 16 +--------------- + 2 files changed, 2 insertions(+), 16 deletions(-) +Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (500dd232449e asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +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 (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) +$ 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 (c73480910e96 net: ethernet: Fix a unused function warning.) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/macb.txt | 1 + + arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- + drivers/bluetooth/hci_ldisc.c | 2 + + drivers/net/appletalk/ipddp.c | 8 ++- + drivers/net/dsa/mv88e6xxx/global1.h | 2 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 9 +-- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 8 +++ + drivers/net/ethernet/hp/hp100.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 21 ++----- + drivers/net/ethernet/microchip/lan743x_main.c | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 +- + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/hyperv/netvsc.c | 3 + + drivers/net/hyperv/netvsc_drv.c | 67 ++++++++++++---------- + drivers/net/ppp/pppoe.c | 3 + + drivers/net/veth.c | 4 +- + drivers/net/xen-netfront.c | 8 ++- + drivers/pci/controller/pci-hyperv.c | 37 ++++++++++++ + include/net/tls.h | 19 +++--- + kernel/bpf/btf.c | 2 +- + kernel/bpf/verifier.c | 2 +- + net/bluetooth/smp.c | 16 +++++- + net/core/filter.c | 3 +- + net/core/neighbour.c | 13 +++-- + net/core/rtnetlink.c | 2 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/udp.c | 49 ++++++++-------- + net/ipv6/ip6_offload.c | 1 + + net/ipv6/ip6_output.c | 6 +- + net/ipv6/route.c | 42 ++++++++++---- + net/ipv6/udp.c | 65 ++++++++++++--------- + net/sched/act_sample.c | 2 +- + net/sched/cls_api.c | 2 + + net/socket.c | 22 ++++--- + net/tls/tls_device.c | 6 +- + net/tls/tls_device_fallback.c | 2 +- + net/tls/tls_main.c | 22 +++++-- + net/tls/tls_sw.c | 21 ++++--- + tools/testing/selftests/net/tls.c | 49 ++++++++++++++++ + 42 files changed, 365 insertions(+), 184 deletions(-) +Merging bpf/master (4c3d795cb012 bpf: use __GFP_COMP while allocating page) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (9e1437937807 xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry.) +$ 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 | 12 ++++++++++++ + 9 files changed, 27 insertions(+), 6 deletions(-) +Merging netfilter/master (0376d5dce0aa Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge netfilter/master +Already up to date. +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 (3341ba9f0f26 mt76x0: fix remove_interface) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging mac80211/master (c42055105785 mac80211: fix TX status reporting for ieee80211s) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + 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/wireless/reg.c | 1 + + net/wireless/scan.c | 58 ++++++++++++++++++++++++++++++++++++++++-------- + 7 files changed, 69 insertions(+), 27 deletions(-) +Merging rdma-fixes/for-rc (67e3816842fe RDMA/uverbs: Atomically flush and mark closed the comp event queue) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging sound-current/for-linus (196f4eeeb78f Merge tag 'asoc-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + drivers/gpu/vga/vga_switcheroo.c | 2 + + include/linux/vga_switcheroo.h | 3 + + include/sound/hdaudio.h | 1 + + include/sound/soc-dapm.h | 1 + + include/uapi/sound/skl-tplg-interface.h | 106 ++++++++++++++-------------- + sound/firewire/bebob/bebob.c | 2 + + sound/firewire/bebob/bebob_maudio.c | 28 ++++---- + sound/firewire/digi00x/digi00x.c | 1 + + sound/firewire/fireface/ff-protocol-ff400.c | 9 ++- + sound/firewire/fireworks/fireworks.c | 2 + + sound/firewire/oxfw/oxfw.c | 10 +++ + sound/firewire/tascam/tascam.c | 1 + + sound/hda/hdac_controller.c | 15 ++-- + sound/pci/emu10k1/emufx.c | 2 +- + sound/pci/hda/hda_intel.c | 86 ++++++++++++++++------ + sound/pci/hda/hda_intel.h | 1 + + sound/soc/amd/acp-pcm-dma.c | 21 ++++++ + sound/soc/codecs/cs4265.c | 4 +- + sound/soc/codecs/max98373.c | 3 + + sound/soc/codecs/rt5514.c | 8 +-- + sound/soc/codecs/rt5682.c | 8 +-- + sound/soc/codecs/sigmadsp.c | 3 +- + sound/soc/codecs/tas6424.c | 12 +++- + sound/soc/codecs/wm8804-i2c.c | 15 +++- + sound/soc/codecs/wm9712.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 26 +++++++ + sound/soc/intel/skylake/skl.c | 2 +- + sound/soc/qcom/qdsp6/q6routing.c | 4 +- + sound/soc/sh/rcar/adg.c | 5 ++ + sound/soc/sh/rcar/core.c | 21 +++++- + sound/soc/sh/rcar/dma.c | 4 ++ + sound/soc/sh/rcar/rsnd.h | 7 ++ + sound/soc/sh/rcar/ssi.c | 16 +++-- + sound/soc/soc-core.c | 4 +- + sound/soc/soc-dapm.c | 4 ++ + 36 files changed, 314 insertions(+), 128 deletions(-) +Merging sound-asoc-fixes/for-linus (c5c6a11f01a9 Merge branch 'asoc-4.19' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/rt5514-spi.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 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 (15aedbc095ab Merge branch 'regulator-4.19' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/bd71837-regulator.c | 19 +++++++++++++++++++ + drivers/regulator/core.c | 2 +- + drivers/regulator/of_regulator.c | 2 -- + include/linux/mfd/da9063/pdata.h | 16 +++++++++------- + include/linux/mfd/rohm-bd718x7.h | 33 ++++++++++++++++++++++++++++++--- + include/linux/regulator/machine.h | 6 +++--- + 6 files changed, 62 insertions(+), 16 deletions(-) +Merging spi-fixes/for-linus (973ec2006971 Merge branch 'spi-4.19' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + 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 +++++++++++++++++++++++-------- + 4 files changed, 82 insertions(+), 15 deletions(-) +Merging pci-current/for-linus (9d27e39d309c PCI: Fix enabling of PASID on RC integrated endpoints) +$ git merge pci-current/for-linus +Already up to date. +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 (7f2bf7840b74 tty: hvc: hvc_write() fix break condition) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7876320f8880 Linux 4.19-rc4) +$ 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 (35aecc02b5b6 USB: serial: option: add two-endpoints device-id flag) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 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 (7876320f8880 Linux 4.19-rc4) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (8d6ccf5cebbc soundwire: Fix acquiring bus lock twice during master release) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/stream.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) +Merging input-current/for-linus (13fe7056bebb Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (24568b47d48e crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/aegis128-aesni-glue.c | 1 - + arch/x86/crypto/aegis128l-aesni-glue.c | 1 - + arch/x86/crypto/aegis256-aesni-glue.c | 1 - + arch/x86/crypto/morus1280-sse2-glue.c | 1 - + arch/x86/crypto/morus640-sse2-glue.c | 1 - + drivers/crypto/ccp/psp-dev.c | 46 ++++++++++++++++++++++++++++++---- + 6 files changed, 41 insertions(+), 10 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 (5b394b2ddf03 Linux 4.19-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (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 (85516a9881a3 mtd: partitions: fix unbalanced of_node_get/put()) +$ git merge mtd-fixes/master +Merge made by the 'recursive' strategy. + drivers/mtd/mtdpart.c | 5 ++++- + drivers/mtd/nand/raw/denali.c | 6 ++++++ + drivers/mtd/nand/raw/marvell_nand.c | 4 +++- + 3 files changed, 13 insertions(+), 2 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/mfd/omap-usb-host.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) +Merging v4l-dvb-fixes/fixes (324493fba775 media: platform: fix cros-ec-cec build error) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + .../media/uapi/dvb/video_function_calls.rst | 1 - + drivers/media/i2c/mt9v111.c | 41 +++++++--------------- + drivers/media/platform/Kconfig | 2 ++ + drivers/media/platform/qcom/camss/camss-csid.c | 1 + + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 1 + + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 1 + + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + + drivers/media/platform/qcom/camss/camss-ispif.c | 5 +-- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 1 + + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 1 + + drivers/media/platform/qcom/camss/camss.c | 15 ++++---- + drivers/media/usb/dvb-usb-v2/af9035.c | 6 ++-- + drivers/staging/media/mt9t031/Kconfig | 6 ---- + 13 files changed, 36 insertions(+), 46 deletions(-) +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 (0f02cfbc3d9e MIPS: VDSO: Match data page cache colouring when D$ aliases) +$ git merge mips-fixes/mips-fixes +Already up to date. +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 (bdf7ffc89922 KVM: LAPIC: Fix pv ipis out-of-bounds access) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 3 ++- + arch/s390/kvm/kvm-s390.c | 4 ++-- + arch/s390/mm/gmap.c | 4 +++- + 3 files changed, 7 insertions(+), 4 deletions(-) +Merging hwmon-fixes/hwmon (55066354285b hwmon: (nct6775) Use different register to get fan RPM for fan7) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct6775.c | 72 +++++++++++++++++++++++++++++++++---------------- + 1 file changed, 49 insertions(+), 23 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dereference in acpi_nfit_ctl) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (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 (5b394b2ddf03 Linux 4.19-rc1) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (8c89ef7b6b64 of/platform: initialise AMBA default DMA masks) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (ff0e9f26288d platform/x86: alienware-wmi: Correct a memory leak) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/x86/alienware-wmi.c | 1 + + drivers/platform/x86/dell-smbios-wmi.c | 1 + + 2 files changed, 2 insertions(+) +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 (83e32a591077 scsi: sd: Contribute to randomness when running rotational device) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 ++--- + drivers/scsi/qla2xxx/qla_target.h | 4 ++-- + drivers/scsi/sd.c | 3 +++ + drivers/target/iscsi/iscsi_target.c | 22 ++++++++++++++-------- + 4 files changed, 21 insertions(+), 13 deletions(-) +Merging drm-fixes/drm-fixes (2b6318a09fd3 Merge branch 'linux-4.19' of git://github.com/skeggsb/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (7876320f8880 Linux 4.19-rc4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (2ea15030c3f0 mmc: sdhi: sys_dmac: check for all Gen3 types when whitelisting) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (6ee67e351cda drm/fb-helper: Remove set but not used variable 'connector_funcs') +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_fb_helper.c | 3 --- + drivers/gpu/drm/pl111/pl111_vexpress.c | 3 ++- + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 - + drivers/gpu/drm/sun4i/sun8i_mixer.c | 24 ------------------------ + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 1 - + drivers/gpu/drm/udl/udl_fb.c | 8 +++++--- + drivers/gpu/drm/vc4/vc4_plane.c | 25 ++++++++++++------------- + 7 files changed, 19 insertions(+), 46 deletions(-) +Merging kbuild/for-next (0d91bf584fe5 kbuild: remove old check for CFLAGS use) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + kernel/kallsyms.c | 4 ++-- + scripts/Kbuild.include | 2 +- + scripts/Makefile.build | 10 ---------- + scripts/kallsyms.c | 6 ++---- + 4 files changed, 5 insertions(+), 17 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 (46053c736854 dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops) +$ git merge dma-mapping/for-next +Auto-merging arch/hexagon/kernel/dma.c +Removing arch/hexagon/include/asm/dma-mapping.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 2 + + arch/arm/mm/dma-mapping-nommu.c | 4 - + arch/arm64/include/asm/dma-mapping.h | 5 -- + arch/arm64/mm/dma-mapping.c | 5 -- + arch/hexagon/Kconfig | 2 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/dma-mapping.h | 40 --------- + arch/hexagon/kernel/dma.c | 143 ++------------------------------- + drivers/acpi/arm64/iort.c | 2 +- + drivers/acpi/scan.c | 10 --- + drivers/base/dd.c | 12 +-- + drivers/of/device.c | 12 --- + include/acpi/acpi_bus.h | 1 - + include/linux/acpi.h | 2 - + include/linux/dma-mapping.h | 17 +--- + include/linux/of_device.h | 3 - + kernel/dma/mapping.c | 16 ---- + 17 files changed, 25 insertions(+), 252 deletions(-) + delete mode 100644 arch/hexagon/include/asm/dma-mapping.h +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 (6f6874f70c32 Merge branch 'clkdev' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (20856bad5e74 arm-soc: Document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-u300/dummyspichip.c +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 26 ++ + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 12 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 22 +- + ...ockit.dts => socfpga_cyclone5_de0_nano_soc.dts} | 0 + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 3 +- + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 3 +- + arch/arm/mach-u300/Kconfig | 13 - + arch/arm/mach-u300/Makefile | 1 - + arch/arm/mach-u300/dummyspichip.c | 276 --------------------- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 + + drivers/tee/optee/core.c | 2 +- + drivers/tee/tee_core.c | 113 ++++++++- + include/linux/tee_drv.h | 73 ++++++ + 14 files changed, 242 insertions(+), 306 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + rename arch/arm/boot/dts/{socfpga_cyclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} (100%) + delete mode 100644 arch/arm/mach-u300/dummyspichip.c +Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next) +$ git merge actions/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar.dtsi | 3 +-- + arch/arm/boot/dts/owl-s500.dtsi | 3 +-- + arch/arm64/boot/dts/actions/Makefile | 2 ++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 11 ++--------- + arch/arm64/boot/dts/actions/s900.dtsi | 23 +++++++++++++++++++++-- + drivers/soc/actions/Makefile | 2 ++ + drivers/soc/actions/owl-sps-helper.c | 6 +----- + drivers/soc/actions/owl-sps.c | 6 +----- + 11 files changed, 36 insertions(+), 29 deletions(-) +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (8787854a1fbf Merge branch 'v4.20/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/soc/amlogic/amlogic,canvas.txt | 29 + + arch/arm/boot/dts/meson8.dtsi | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 2 +- + 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-gx.dtsi | 19 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- + arch/arm64/configs/defconfig | 4 + + drivers/firmware/meson/meson_sm.c | 56 + + drivers/soc/amlogic/Kconfig | 7 + + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-canvas.c | 185 +++ + include/linux/firmware/meson/meson_sm.h | 1 + + include/linux/soc/amlogic/meson-canvas.h | 65 + + 14 files changed, 1506 insertions(+), 850 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt + create mode 100644 drivers/soc/amlogic/meson-canvas.c + create mode 100644 include/linux/soc/amlogic/meson-canvas.h +Merging aspeed/for-next (c224edaa4a46 Merge branches 'defconfig-for-v4.19' and 'dt-for-v4.19' into for-next) +$ git merge aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 38 +++++++-- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 + + arch/arm/boot/dts/ibm-power8-cfam.dtsi | 31 +++++++ + arch/arm/boot/dts/ibm-power9-cfam.dtsi | 104 +++++++++++++++++++++++ + arch/arm/boot/dts/ibm-power9-dual.dtsi | 57 +++++++++++++ + 8 files changed, 240 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/boot/dts/ibm-power8-cfam.dtsi + create mode 100644 arch/arm/boot/dts/ibm-power9-cfam.dtsi + create mode 100644 arch/arm/boot/dts/ibm-power9-dual.dtsi +Merging at91/at91-next (fb3cd261d0c8 Merge branch 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 196 +++++++++++++++------------- + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 103 ++++++++------- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 30 +++++ + arch/arm/boot/dts/at91-tse850-3.dts | 32 ++--- + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 106 +++++++++------ + arch/arm/boot/dts/sama5d4.dtsi | 8 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 2 + + arch/arm/mach-at91/pm.c | 9 +- + drivers/memory/atmel-ebi.c | 3 +- + 11 files changed, 286 insertions(+), 207 deletions(-) +Merging bcm2835/for-next (ca5b45b7c5cd Merge branch 'bcm2835-defconfig-next' into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 8 ++ + arch/arm/boot/dts/Makefile | 1 + + 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/configs/bcm2835_defconfig | 2 +- + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 + + 8 files changed, 167 insertions(+), 2 deletions(-) + 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/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts +Merging imx-mxs/for-next (ceba5ca0e35a 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 | 40 +++ + .../devicetree/bindings/clock/imx6q-clock.txt | 8 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx51-babbage.dts | 1 + + arch/arm/boot/dts/imx53-qsb-common.dtsi | 11 + + 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/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/imx6sll.dtsi | 31 ++ + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 + + 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 | 12 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 2 +- + arch/arm/boot/dts/imx6ull-pinfunc.h | 39 ++- + arch/arm/boot/dts/imx7d-sdb.dts | 2 + + arch/arm/boot/dts/imx7d.dtsi | 1 + + arch/arm/boot/dts/imx7s-warp.dts | 53 +-- + arch/arm/boot/dts/imx7s.dtsi | 41 ++- + 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 | 6 + + arch/arm/boot/dts/vf610-zii-cfu1.dts | 27 ++ + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 44 ++- + 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/mmdc.c | 14 + + arch/arm/mach-imx/pm-imx6.c | 25 ++ + 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 | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 + + drivers/bus/imx-weim.c | 3 - + drivers/soc/imx/gpc.c | 18 +- + drivers/soc/imx/gpcv2.c | 92 ++--- + 57 files changed, 1012 insertions(+), 669 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6qdl-icore-1.5.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts +Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/keystone/ti,sci.txt | 4 ++++ + drivers/firmware/ti_sci.c | 24 ++++++++++++++++++---- + 2 files changed, 24 insertions(+), 4 deletions(-) +Merging mediatek/for-next (b75253e66bc5 Merge branch 'v4.18-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (a04606e5f3a7 Merge branch 'omap-for-v4.20/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am571x-idk.dts | 80 ++++++++++ + arch/arm/boot/dts/am572x-idk-common.dtsi | 76 ++++++++++ + arch/arm/boot/dts/omap3-gta04.dtsi | 248 +++++++++++++++++++++++++++---- + 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/mach-omap2/omap_hwmod.c | 88 ++++++----- + 8 files changed, 669 insertions(+), 70 deletions(-) + create mode 100644 arch/arm/boot/dts/omap3-gta04a5one.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 (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' into all-for-4.19) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (2662ae94a639 Merge branches 'arm-soc-for-v4.20', 'arm64-defconfig-for-v4.20', 'arm64-dt-for-v4.20' and 'drivers-for-v4.20' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 16 +- + .../bindings/power/renesas,rcar-sysc.txt | 3 + + .../devicetree/bindings/reset/renesas,rst.txt | 3 + + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 12 + + arch/arm/boot/dts/r8a77470.dtsi | 123 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 4 +- + arch/arm/boot/dts/r8a7790-stout.dts | 4 + + arch/arm/boot/dts/r8a7790.dtsi | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 4 +- + arch/arm/boot/dts/r8a7792.dtsi | 1 - + arch/arm/boot/dts/r8a7793-gose.dts | 16 + + arch/arm/boot/dts/r8a7794-silk.dts | 25 + + arch/arm/boot/dts/r8a7794.dtsi | 1 - + arch/arm/boot/dts/r9a06g032.dtsi | 88 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 7 +- + 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/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/arm64/Kconfig.platforms | 58 +- + 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 | 105 +- + 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 | 87 +- + .../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 | 156 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 26 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 36 +- + 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 | 580 ++++++- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 110 ++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 478 +++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 276 ++-- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 14 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 7 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/configs/defconfig | 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 +- + include/dt-bindings/power/r8a7744-sysc.h | 24 + + include/dt-bindings/power/r8a774a1-sysc.h | 31 + + include/dt-bindings/power/r8a774c0-sysc.h | 25 + + 83 files changed, 4233 insertions(+), 578 deletions(-) + create mode 100644 arch/arm/mach-shmobile/setup-r7s9210.c + 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 drivers/soc/renesas/r8a774a1-sysc.c + create mode 100644 drivers/soc/renesas/r8a774c0-sysc.c + 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 +Merging rockchip/for-next (41c832563530 Merge branch 'v4.20-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 8 + + .../devicetree/bindings/soc/rockchip/grf.txt | 2 + + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3188.dtsi | 82 + + 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 + + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- + 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 + + drivers/clk/rockchip/clk-rk3288.c | 29 +- + 16 files changed, 3192 insertions(+), 26 deletions(-) + 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 +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (4dcbc9cf5e6d Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/Samsung/Bootloader-interface.txt | 1 + + .../devicetree/bindings/arm/samsung/exynos.txt | 26 ++++ + 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/s5pv210.dtsi | 2 +- + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/firmware.c | 14 +- + arch/arm/mach-exynos/suspend.c | 34 +++-- + arch/arm/mach-s3c24xx/mach-gta02.c | 42 ------ + arch/arm/mach-s3c24xx/mach-mini2440.c | 113 ++++++++------- + 23 files changed, 556 insertions(+), 180 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos.txt +Merging sunxi/sunxi/for-next (9266cf77f759 Merge branch 'sunxi/dt-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 | 1 + + .../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 ++ + 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.dtsi | 231 +++++++++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 3 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 59 +++++- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 72 ++++++- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 149 ++++++++++++- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 13 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 9 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 27 ++- + .../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 + + 49 files changed, 1253 insertions(+), 310 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts + 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.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +Merging tegra/for-next (72cb7a878f5b Merge branch for-4.20/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 93 ++++ + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 103 +++++ + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 76 +++ + 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 +++ + drivers/soc/tegra/pmc.c | 513 +++++++++++++++------ + include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h | 18 + + include/soc/tegra/pmc.h | 20 +- + 9 files changed, 734 insertions(+), 159 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h +Merging arm64/for-next/core (e4ba15debcfd arm64: fix for bad_mode() handler to always result in panic) +$ git merge arm64/for-next/core +Auto-merging mm/Makefile +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 13 ++ + arch/arm64/Kconfig | 2 + + arch/arm64/include/asm/cpucaps.h | 4 +- + arch/arm64/include/asm/cpufeature.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 11 ++ + arch/arm64/include/asm/pgtable.h | 10 +- + arch/arm64/include/asm/processor.h | 11 +- + arch/arm64/include/asm/ptrace.h | 1 + + arch/arm64/include/asm/sysreg.h | 19 ++- + arch/arm64/include/asm/tlb.h | 34 ++--- + arch/arm64/include/asm/tlbflush.h | 112 +++++++++------ + arch/arm64/include/asm/uaccess.h | 61 ++++++-- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/ptrace.h | 1 + + arch/arm64/kernel/cpu_errata.c | 32 ++++- + arch/arm64/kernel/cpufeature.c | 101 ++++++++++++-- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/process.c | 4 + + arch/arm64/kernel/ssbd.c | 24 +++- + arch/arm64/kernel/traps.c | 20 +-- + arch/arm64/kvm/hyp/sysreg-sr.c | 11 ++ + arch/arm64/lib/Makefile | 2 + + arch/arm64/lib/crc32.S | 60 ++++++++ + arch/arm64/mm/dump.c | 6 +- + arch/arm64/mm/fault.c | 14 -- + include/asm-generic/tlb.h | 86 ++++++++++-- + lib/crc32.c | 11 +- + mm/Makefile | 6 +- + mm/memory.c | 247 --------------------------------- + mm/mmu_gather.c | 261 +++++++++++++++++++++++++++++++++++ + 31 files changed, 773 insertions(+), 397 deletions(-) + create mode 100644 arch/arm64/lib/crc32.S + create mode 100644 mm/mmu_gather.c +Merging clk/clk-next (7be9338d38a6 Merge branch 'clk-mvebu-periph-pm' 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 | 9 +- + 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/mvebu/armada-37xx-periph.c | 58 +- + 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 | 5 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/clk-div6.c | 17 +- + drivers/clk/renesas/clk-emev2.c | 8 +- + drivers/clk/renesas/clk-mstp.c | 8 +- + drivers/clk/renesas/clk-r8a73a4.c | 4 +- + drivers/clk/renesas/clk-r8a7740.c | 4 +- + drivers/clk/renesas/clk-r8a7778.c | 4 +- + drivers/clk/renesas/clk-r8a7779.c | 4 +- + drivers/clk/renesas/clk-rcar-gen2.c | 4 +- + drivers/clk/renesas/clk-rz.c | 4 +- + drivers/clk/renesas/clk-sh73a0.c | 4 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 323 ++++ + 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/r8a77980-cpg-mssr.c | 28 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 13 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 17 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 45 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 24 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 5 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 16 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 9 +- + 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/r8a774a1-cpg-mssr.h | 58 + + include/dt-bindings/clock/samsung,s2mps11.h | 5 +- + include/dt-bindings/clock/samsung,s3c64xx-clock.h | 7 +- + 84 files changed, 3305 insertions(+), 494 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/r8a774a1-cpg-mssr.c + create mode 100644 include/dt-bindings/clock/qcom,camcc-sdm845.h + create mode 100644 include/dt-bindings/clock/r8a774a1-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 (da5734d918db dt-bindings: Add vendor prefix for csky) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/csky/cpus.txt | 70 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + 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 | 19 + + arch/csky/abiv1/bswapsi.c | 15 + + arch/csky/abiv1/cacheflush.c | 51 +++ + arch/csky/abiv1/inc/abi/cacheflush.h | 43 +++ + 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 | 281 +++++++++++++++ + 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 | 69 ++++ + 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 | 282 +++++++++++++++ + 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 | 70 ++++ + 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/irq.h | 9 + + 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 | 26 ++ + 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 | 234 ++++++++++++ + 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 | 254 +++++++++++++ + 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, 10911 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/irq.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 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 (9b340567a25c 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 (bcec54bf3118 mips: switch to NO_BOOTMEM) +$ git merge mips/mips-next +Removing arch/mips/lib/iomap.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 3 +- + arch/mips/Makefile | 9 +- + arch/mips/bcm47xx/workarounds.c | 8 +- + 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/include/asm/io.h | 49 +---- + arch/mips/kernel/relocate.c | 2 +- + arch/mips/kernel/setup.c | 144 +++++--------- + arch/mips/kernel/traps.c | 5 +- + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/iomap-pci.c | 7 - + arch/mips/lib/iomap.c | 227 ----------------------- + 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 | 10 +- + arch/mips/netlogic/common/irq.c | 14 +- + 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 +- + 32 files changed, 266 insertions(+), 449 deletions(-) + 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 (7efbe131b5b0 parisc: remove the dead ccio-rm-dma driver) +$ 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/kernel/entry.S | 2 +- + drivers/parisc/Makefile | 3 - + drivers/parisc/ccio-rm-dma.c | 202 ------------------------------------------- + 4 files changed, 1 insertion(+), 215 deletions(-) + delete mode 100644 drivers/parisc/ccio-rm-dma.c +Merging powerpc/next (56d20861c027 powerpc/vdso: Correct call frame information) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/setup_64.c | 18 ++++++++++++------ + 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 + + 5 files changed, 16 insertions(+), 6 deletions(-) +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 (cdc7274029ca riscv: Do not overwrite initrd_start and initrd_end) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. +Merging s390/features (c48e4c3f32a2 s390/tape: fix spelling mistake "partion" -> "partition") +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/sclp.h | 1 + + drivers/s390/block/dasd.c | 6 ++---- + drivers/s390/char/sclp_pci.c | 10 ++++++++-- + drivers/s390/char/tape_3590.c | 2 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 9 +++------ + 6 files changed, 16 insertions(+), 14 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 (3eb3f52e2478 cifs: protect against server returning invalid file system block size) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 3 + + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifssmb.c | 21 ++++ + fs/cifs/connect.c | 10 +- + fs/cifs/ioctl.c | 2 - + fs/cifs/smb2glob.h | 2 +- + fs/cifs/smb2inode.c | 327 +++++++++++++++++++++++++++++++++++-------------- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2ops.c | 14 ++- + fs/cifs/smb2pdu.c | 205 ++++++++++--------------------- + fs/cifs/smb2pdu.h | 9 ++ + fs/cifs/smb2proto.h | 25 ++-- + fs/cifs/trace.h | 30 +++++ + fs/cifs/transport.c | 21 +++- + 14 files changed, 420 insertions(+), 252 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 (50559ae2e645 Pull UDF mount fixes.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/ext2/acl.c | 4 ++ + fs/notify/fanotify/fanotify_user.c | 42 +++++++++-- + fs/notify/fdinfo.c | 5 ++ + 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/fs.h | 5 ++ + include/linux/fsnotify_backend.h | 17 ++++- + include/uapi/linux/fanotify.h | 16 +++-- + 13 files changed, 194 insertions(+), 123 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 (313ed62a3ddc f2fs: cache NULL when both default_acl and acl are NULL) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 7 +++++ + fs/f2fs/checkpoint.c | 2 ++ + fs/f2fs/data.c | 20 ++++++++----- + fs/f2fs/debug.c | 3 +- + fs/f2fs/f2fs.h | 24 ++++++++++----- + fs/f2fs/file.c | 5 ++-- + fs/f2fs/recovery.c | 14 +++++---- + fs/f2fs/segment.c | 85 ++++++++++++++++++++++++++-------------------------- + fs/f2fs/super.c | 40 +++++++++++++++---------- + 9 files changed, 117 insertions(+), 83 deletions(-) +Merging fuse/for-next (30e0d0966c9c fuse: add support for copy_file_range()) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 77 ++++++++++++++++++++++++++++++++++ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 104 ++++++++++++++++++++++++++-------------------- + 3 files changed, 139 insertions(+), 45 deletions(-) +Merging jfs/jfs-next (02645bcdfcc2 jfs: remove quota option from ignore list) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 4 ++++ + fs/jfs/super.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging nfs/linux-next (11da3a7f84f1 Linux 4.19-rc3) +$ git merge nfs/linux-next +Already up to date. +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 (108b833cde9c sunrpc: Add comment defining gssd upcall API keywords) +$ git merge nfsd/nfsd-next +Already up to date. +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 (8c25741aaad8 ovl: fix oopses in ovl_fill_super() failure paths) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (6e5461d774bf ubifs: Remove empty file.h) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (b4dc44b3cac9 9p locks: fix glock.client_id leak in do_lock) +$ 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 (5b394b2ddf03 Linux 4.19-rc1) +$ git merge xfs/for-next +Already up to date. +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 (87a0a1536d35 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 include/linux/fs.h +Auto-merging fs/udf/super.c +Auto-merging fs/super.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/jfs/super.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/staging/erofs/super.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/mount_api.txt | 737 +++++++++++++++++++++++++ + 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 | 785 +++++++++++++++++++++++++++ + 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 | 18 +- + 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 | 871 ++++++++++++++++++++++-------- + 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 | 248 ++++++--- + 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 | 482 +++++++++++++---- + 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 | 120 +++- + 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 | 285 +++++++--- + 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 | 8 +- + samples/Makefile | 2 +- + samples/statx/Makefile | 7 - + samples/vfs/Makefile | 16 + + samples/vfs/test-fs-query.c | 138 +++++ + samples/vfs/test-fsinfo.c | 586 ++++++++++++++++++++ + 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, 9811 insertions(+), 2332 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%) +$ git am -3 ../patches/0001-disable-building-the-VFS-sample-programs.patch +Applying: disable building the VFS sample programs +$ git reset HEAD^ +Unstaged changes after reset: +M samples/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master e224ddaee3b3] Merge remote-tracking branch 'vfs/for-next' + Date: Tue Sep 18 09:24:59 2018 +1000 +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 (3ea7a150795e Merge branch 'pci/hotplug') +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/arm64/kernel/pci.c | 5 ++--- + arch/x86/pci/acpi.c | 2 +- + drivers/pci/hotplug/pciehp.h | 2 +- + drivers/pci/hotplug/pciehp_ctrl.c | 22 +++++++++++++--------- + drivers/pci/hotplug/pciehp_pci.c | 23 ++++++++++++++++++++--- + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/remove.c | 4 +--- + 7 files changed, 39 insertions(+), 21 deletions(-) +Merging pstore/for-next/pstore (831b624df1b4 pstore: Fix incorrect persistent ram buffer mapping) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (9291a1dc6209 Merge branch 'for-4.19/fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + Documentation/input/event-codes.rst | 11 +- + drivers/hid/Kconfig | 1 + + drivers/hid/hid-core.c | 2 +- + drivers/hid/hid-cougar.c | 66 +++++-- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 64 ++++++- + drivers/hid/hid-logitech-hidpp.c | 311 ++++++++++++++++++++++++++++++--- + drivers/hid/hid-microsoft.c | 141 ++++++++++++++- + drivers/hid/hid-multitouch.c | 72 ++++---- + drivers/hid/i2c-hid/i2c-hid.c | 11 +- + include/linux/hid.h | 28 +++ + include/uapi/linux/input-event-codes.h | 1 + + 12 files changed, 610 insertions(+), 99 deletions(-) +Merging i2c/i2c/for-next (fc9f90ddace2 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-designware.txt | 7 +- + drivers/i2c/busses/i2c-aspeed.c | 131 ++++++++++++--------- + 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-mt65xx.c | 62 ++++++++-- + 8 files changed, 201 insertions(+), 99 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (05f39504bb2a hwmon: (lm92) Fix whitespace issues) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/ltc2978.txt | 2 ++ + Documentation/hwmon/lm75 | 6 +++--- + Documentation/hwmon/ltc2978 | 5 +++++ + Documentation/hwmon/mc13783-adc | 8 ++++---- + 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/k10temp.c | 5 +++-- + drivers/hwmon/lm75.c | 18 ++++++++++++++++-- + drivers/hwmon/lm92.c | 14 ++++++++------ + drivers/hwmon/mc13783-adc.c | 14 +------------- + drivers/hwmon/nct6775.c | 3 +-- + drivers/hwmon/npcm750-pwm-fan.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 3 ++- + drivers/hwmon/pmbus/ltc2978.c | 9 ++++++++- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/hwmon/sht15.c | 5 +---- + 18 files changed, 68 insertions(+), 60 deletions(-) +Merging jc_docs/docs-next (a7ddcea58ae2 Drop all 00-INDEX files from Documentation/) +$ 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 +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/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/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/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/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 | 9 +- + README | 1 - + drivers/firewire/core-iso.c | 7 + + drivers/firewire/core-transaction.c | 10 + + include/uapi/linux/firewire-cdev.h | 22 +- + scripts/check_00index.sh | 67 ----- + 68 files changed, 152 insertions(+), 1937 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 + 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 (985cdcb08a04 media: ov5640: fix restore of last mode set) +$ git merge v4l-dvb/master +Auto-merging fs/compat_ioctl.c +Auto-merging drivers/media/platform/Kconfig +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/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 | 1 + + MAINTAINERS | 24 +- + drivers/gpu/drm/panel/panel-lvds.c | 6 +- + drivers/media/cec/cec-api.c | 5 +- + drivers/media/cec/cec-core.c | 2 +- + 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-core.c | 11 +- + 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/adv7842.c | 9 + + 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/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 | 10 +- + 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/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/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-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 | 8 +- + drivers/media/platform/davinci/vpbe_display.c | 8 +- + 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 | 1752 ++++++++++++++++++++ + 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/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 | 14 +- + drivers/media/platform/via-camera.c | 10 +- + 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 | 325 ++++ + drivers/media/platform/vicodec/codec-v4l2-fwht.h | 50 + + drivers/media/platform/vicodec/vicodec-core.c | 501 +++--- + 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-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 | 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 | 12 +- + 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 | 39 + + 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-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 +- + fs/compat_ioctl.c | 131 -- + include/linux/platform_data/shmob_drm.h | 6 +- + include/media/media-entity.h | 48 + + include/media/rcar-fcp.h | 6 +- + include/media/v4l2-common.h | 12 + + include/media/v4l2-dv-timings.h | 11 + + include/media/v4l2-mc.h | 78 - + include/media/v4l2-rect.h | 26 + + include/media/vsp1.h | 8 +- + include/uapi/linux/videodev2.h | 8 + + 445 files changed, 7418 insertions(+), 2463 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 + 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 (f39684524b39 Documentation/fb: corrections for fbcon.txt) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (c394940a72c5 Merge branches 'acpi-bus', 'acpi-misc', 'acpi-soc', 'acpi-cppc', 'acpi-pmic' and 'acpi-property' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-power | 2 +- + Documentation/power/swsusp.txt | 2 +- + drivers/acpi/acpi_lpss.c | 2 + + 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.c | 2 +- + drivers/cpufreq/s5pv210-cpufreq.c | 4 +- + drivers/idle/intel_idle.c | 75 ++++++++++++++++----------------- + drivers/mailbox/pcc.c | 7 ++- + drivers/powercap/intel_rapl.c | 73 +++++++++++++++----------------- + include/linux/platform_device.h | 1 + + kernel/power/process.c | 2 +- + 19 files changed, 100 insertions(+), 136 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 (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq) +$ git merge opp/opp/linux-next +Already up to date. +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 (cb816cd22618 RDMA: Remove duplicated include from ib_addr.h) +$ 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/infiniband/hw/hfi1/pcie.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net | 18 + + drivers/infiniband/core/addr.c | 400 +++++++++++------- + drivers/infiniband/core/cache.c | 33 ++ + drivers/infiniband/core/cma.c | 15 +- + drivers/infiniband/core/core_priv.h | 9 +- + drivers/infiniband/core/cq.c | 8 +- + drivers/infiniband/core/device.c | 71 ++-- + drivers/infiniband/core/mad.c | 78 ++-- + drivers/infiniband/core/sa_query.c | 40 -- + drivers/infiniband/core/sysfs.c | 65 ++- + drivers/infiniband/core/umem_odp.c | 6 - + drivers/infiniband/core/uverbs.h | 11 +- + drivers/infiniband/core/uverbs_cmd.c | 32 +- + drivers/infiniband/core/uverbs_ioctl.c | 137 ++++++ + drivers/infiniband/core/uverbs_main.c | 84 ++-- + .../infiniband/core/uverbs_std_types_flow_action.c | 7 +- + drivers/infiniband/core/uverbs_uapi.c | 12 + + drivers/infiniband/core/verbs.c | 2 +- + 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/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/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/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/hns_roce_hw_v2.c | 1 + + drivers/infiniband/hw/mlx5/devx.c | 6 +- + drivers/infiniband/hw/mlx5/flow.c | 380 ++++++++++++++++- + drivers/infiniband/hw/mlx5/main.c | 160 +++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 33 +- + drivers/infiniband/hw/mlx5/qp.c | 67 ++- + drivers/infiniband/hw/nes/nes.c | 3 - + drivers/infiniband/hw/nes/nes.h | 9 - + drivers/infiniband/hw/nes/nes_nic.c | 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/sw/rdmavt/qp.c | 14 +- + 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 | 38 +- + 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_verbs.h | 4 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 36 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 12 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 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 +- + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 5 +- + include/linux/mlx5/fs.h | 20 +- + include/linux/mlx5/mlx5_ifc.h | 70 ++-- + include/rdma/ib_addr.h | 8 +- + include/rdma/ib_verbs.h | 35 +- + include/rdma/rdma_cm.h | 6 +- + include/rdma/rdma_vt.h | 10 +- + include/rdma/uverbs_ioctl.h | 111 ++++- + include/rdma/uverbs_std_types.h | 51 +++ + 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 +- + 87 files changed, 2768 insertions(+), 1517 deletions(-) + create mode 100644 drivers/infiniband/hw/hfi1/msix.c + create mode 100644 drivers/infiniband/hw/hfi1/msix.h +Merging net-next/master (ce5b127b172e Merge branch 's390-qeth-next') +$ git merge net-next/master +Auto-merging tools/testing/selftests/net/tls.c +CONFLICT (content): Merge conflict in tools/testing/selftests/net/tls.c +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging tools/include/uapi/linux/if_link.h +Auto-merging net/xfrm/xfrm_output.c +Removing net/xdp/xdp_umem_props.h +Auto-merging net/wireless/reg.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/sched/act_sample.c +Auto-merging net/mac80211/tx.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/core/rtnetlink.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/net/tls.h +Auto-merging include/linux/mlx5/driver.h +Removing drivers/staging/fsl-dpaa2/ethernet/TODO +Auto-merging drivers/net/veth.c +Auto-merging drivers/net/ethernet/microchip/lan743x_main.c +Auto-merging drivers/net/ethernet/cadence/macb_main.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 +Recorded preimage for 'tools/testing/selftests/net/tls.c' +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 +Recorded resolution for 'tools/testing/selftests/net/tls.c'. +[master 52adf6674d22] 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/dsa/lantiq-gswip.txt | 143 ++ + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 + + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 21 +- + .../devicetree/bindings/soc/fsl/cpm_qe/network.txt | 6 + + .../networking/dpaa2}/ethernet-driver.rst | 0 + Documentation/networking/dpaa2/index.rst | 1 + + Documentation/networking/tcp.txt | 101 -- + MAINTAINERS | 13 +- + arch/mips/lantiq/xway/dma.c | 1 - + arch/mips/lantiq/xway/sysctrl.c | 14 +- + drivers/infiniband/hw/nes/nes_mgt.c | 8 +- + drivers/net/can/rx-offload.c | 8 +- + drivers/net/dsa/Kconfig | 8 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/Kconfig | 9 + + drivers/net/dsa/b53/Makefile | 1 + + drivers/net/dsa/b53/b53_common.c | 246 +++- + drivers/net/dsa/b53/b53_priv.h | 36 + + drivers/net/dsa/b53/b53_serdes.c | 217 +++ + 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/allwinner/sun4i-emac.c | 3 +- + drivers/net/ethernet/altera/altera_tse_main.c | 5 +- + drivers/net/ethernet/amd/au1000_eth.c | 12 +- + 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 | 36 +- + .../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/aurora/nb8800.c | 9 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 17 +- + drivers/net/ethernet/broadcom/bgmac.c | 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 | 16 +- + drivers/net/ethernet/broadcom/tg3.c | 71 +- + 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 | 399 +++--- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 224 +-- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 47 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 31 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 3 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 9 +- + .../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/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 | 25 +- + 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 | 20 +- + drivers/net/ethernet/freescale/Kconfig | 8 + + drivers/net/ethernet/freescale/Makefile | 2 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 11 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 27 +- + .../ethernet/freescale/dpaa2}/Makefile | 0 + .../ethernet/freescale/dpaa2}/dpaa2-eth-trace.h | 0 + .../ethernet/freescale/dpaa2}/dpaa2-eth.c | 71 +- + .../ethernet/freescale/dpaa2}/dpaa2-eth.h | 0 + .../ethernet/freescale/dpaa2}/dpaa2-ethtool.c | 0 + .../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/fsl_pq_mdio.c | 4 +- + drivers/net/ethernet/freescale/gianfar.c | 4 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 55 +- + drivers/net/ethernet/freescale/ucc_geth.c | 7 +- + 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/hns3_enet.c | 13 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 102 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 139 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 6 +- + drivers/net/ethernet/ibm/emac/core.h | 3 + + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/intel/i40e/Makefile | 3 +- + drivers/net/ethernet/intel/i40e/i40e.h | 19 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 429 +++--- + drivers/net/ethernet/intel/i40e/i40e_main.c | 368 ++++- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 182 +-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 90 ++ + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 832 +++++++++++ + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 25 + + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 344 ++++- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 15 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 43 +- + drivers/net/ethernet/intel/ice/ice.h | 7 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 99 +- + drivers/net/ethernet/intel/ice/ice_common.c | 525 ++++++- + drivers/net/ethernet/intel/ice/ice_common.h | 17 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 3 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 801 ++++++++++- + 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_main.c | 964 ++++++++++--- + drivers/net/ethernet/intel/ice/ice_nvm.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 161 +-- + 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 | 50 +- + 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/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 | 41 + + 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 | 78 +- + 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 | 11 +- + 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 | 13 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 45 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 50 +- + 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/fs_core.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 184 +-- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 60 +- + .../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/microchip/lan743x_main.c | 7 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + 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 | 30 +- + .../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_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 ++-- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 6 +- + drivers/net/ethernet/rdc/r6040.c | 12 +- + drivers/net/ethernet/renesas/ravb_main.c | 3 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/sni_ave.c | 20 +- + 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/sunhme.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 22 +- + drivers/net/ethernet/ti/netcp_ethss.c | 42 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 +- + drivers/net/geneve.c | 41 +- + drivers/net/loopback.c | 6 - + 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/mscc.c | 113 +- + drivers/net/phy/phy_device.c | 118 ++ + drivers/net/phy/ste10Xp.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/tap.c | 88 +- + drivers/net/thunderbolt.c | 5 +- + drivers/net/tun.c | 267 +++- + drivers/net/usb/lan78xx.c | 43 +- + drivers/net/usb/lan78xx.h | 14 +- + drivers/net/usb/usbnet.c | 1 + + drivers/net/veth.c | 15 + + drivers/net/vsockmon.c | 14 +- + drivers/net/vxlan.c | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 26 +- + drivers/net/wan/fsl_ucc_hdlc.h | 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/netback.c | 3 +- + drivers/net/xen-netback/xenbus.c | 3 +- + drivers/s390/net/qeth_core.h | 17 +- + drivers/s390/net/qeth_core_main.c | 307 ++-- + drivers/s390/net/qeth_l2_main.c | 116 +- + drivers/s390/net/qeth_l3_main.c | 340 ++--- + 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 | 181 ++- + include/linux/avf/virtchnl.h | 2 +- + 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 | 11 +- + include/linux/netdevice.h | 33 + + include/linux/phy.h | 8 + + include/linux/qed/common_hsi.h | 10 +- + include/linux/qed/iscsi_common.h | 2 +- + include/linux/skbuff.h | 22 + + include/net/act_api.h | 3 +- + include/net/cfg80211.h | 15 +- + include/net/dsa.h | 1 + + include/net/genetlink.h | 2 +- + include/net/ieee80211_radiotap.h | 21 + + include/net/ip6_fib.h | 20 +- + include/net/llc.h | 1 + + include/net/mac80211.h | 84 +- + include/net/rtnetlink.h | 1 + + include/net/sch_generic.h | 22 +- + include/net/sock.h | 1 + + include/net/tls.h | 2 + + include/net/vxlan.h | 1 - + include/net/xdp.h | 6 +- + include/net/xdp_sock.h | 51 +- + include/uapi/linux/ethtool.h | 15 +- + include/uapi/linux/if_addr.h | 1 + + 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 | 24 + + kernel/bpf/hashtab.c | 31 + + kernel/bpf/syscall.c | 1 - + kernel/bpf/verifier.c | 216 +-- + net/bridge/br_fdb.c | 19 +- + net/bridge/br_if.c | 5 +- + net/bridge/br_private.h | 1 + + net/bridge/br_vlan.c | 5 +- + net/core/dev.c | 13 +- + net/core/ethtool.c | 158 +-- + net/core/filter.c | 25 +- + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 51 +- + net/core/sock.c | 2 +- + net/core/xdp.c | 53 +- + 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 | 2 +- + net/ipv4/devinet.c | 62 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/gre_demux.c | 7 +- + net/ipv4/ip_fragment.c | 23 +- + net/ipv4/ip_gre.c | 9 +- + net/ipv4/ip_input.c | 6 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/tcp.c | 2 + + net/ipv4/tcp_input.c | 13 + + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/addrconf.c | 126 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/ip6_gre.c | 26 +- + 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 | 2 +- + net/ipv6/route.c | 29 - + 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/nfnetlink_queue.c | 2 +- + net/netlink/af_netlink.c | 11 +- + net/openvswitch/flow.c | 22 +- + 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 | 6 +- + net/sched/act_bpf.c | 3 +- + net/sched/act_connmark.c | 14 +- + net/sched/act_csum.c | 3 +- + net/sched/act_gact.c | 3 +- + net/sched/act_ife.c | 3 +- + net/sched/act_ipt.c | 6 +- + net/sched/act_mirred.c | 3 +- + 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_flower.c | 5 +- + net/sched/sch_api.c | 7 - + net/sched/sch_cake.c | 6 +- + net/sched/sch_fq.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_generic.c | 4 +- + net/sched/sch_hhf.c | 2 +- + net/sched/sch_htb.c | 116 +- + net/sched/sch_netem.c | 14 +- + net/sched/sch_tbf.c | 2 +- + net/sctp/ulpqueue.c | 2 +- + net/tipc/bearer.c | 2 +- + net/tipc/topsrv.c | 10 +- + net/tls/tls_sw.c | 230 ++- + 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 | 6 +- + net/xdp/xdp_umem.h | 10 - + net/xdp/xdp_umem_props.h | 14 - + net/xdp/xsk.c | 34 +- + net/xdp/xsk_queue.c | 5 +- + net/xdp/xsk_queue.h | 13 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_output.c | 2 +- + samples/bpf/Makefile | 1 + + samples/bpf/tcp_tos_reflect_kern.c | 87 ++ + samples/bpf/xdpsock_kern.c | 2 +- + samples/bpf/xdpsock_user.c | 15 +- + tools/bpf/bpftool/map.c | 33 +- + tools/include/uapi/linux/if_link.h | 2 + + tools/testing/selftests/bpf/test_btf.c | 179 ++- + 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/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 4 +- + tools/testing/selftests/net/ip_defrag.c | 313 +++++ + tools/testing/selftests/net/ip_defrag.sh | 28 + + tools/testing/selftests/net/tls.c | 40 +- + 453 files changed, 18709 insertions(+), 6075 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%) + 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 (99%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-eth.h (100%) + rename drivers/{staging/fsl-dpaa2/ethernet => net/ethernet/freescale/dpaa2}/dpaa2-ethtool.c (100%) + 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 + 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/staging/fsl-dpaa2/ethernet/TODO + 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/testing/selftests/net/ip_defrag.c + create mode 100755 tools/testing/selftests/net/ip_defrag.sh +Merging bpf-next/master (70e88c758a6b selftests/bpf: fix bpf_flow.c build) +$ git merge bpf-next/master +Auto-merging tools/include/uapi/linux/if_link.h +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/net/sch_generic.h +Auto-merging include/linux/skbuff.h +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 1 + + include/linux/bpf_types.h | 1 + + include/linux/skbuff.h | 7 + + include/net/net_namespace.h | 3 + + include/net/sch_generic.h | 12 +- + include/uapi/linux/bpf.h | 26 + + kernel/bpf/arraymap.c | 25 +- + kernel/bpf/syscall.c | 8 + + kernel/bpf/verifier.c | 48 +- + net/core/filter.c | 139 +++- + net/core/flow_dissector.c | 134 ++++ + tools/bpf/bpftool/Documentation/bpftool-net.rst | 133 ++++ + 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 | 7 + + tools/bpf/bpftool/map.c | 11 +- + tools/bpf/bpftool/net.c | 233 ++++++ + tools/bpf/bpftool/netlink_dumper.c | 181 +++++ + tools/bpf/bpftool/netlink_dumper.h | 103 +++ + tools/bpf/bpftool/prog.c | 1 + + tools/include/uapi/linux/bpf.h | 26 + + 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_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/with_addr.sh | 54 ++ + tools/testing/selftests/bpf/with_tunnels.sh | 36 + + 40 files changed, 3001 insertions(+), 213 deletions(-) + 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 +Merging ipsec-next/master (4a132095dd64 xfrm: allow driver to quietly refuse offload) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_device.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 (50acec06f392 net/mlx5: Export packet reformat alloc/dealloc functions) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (c8204cab9cb5 netfilter: nat: remove unnecessary rcu_read_lock in nf_nat_redirect_ipv{4/6}) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/nf_conntrack_common.h | 3 - + include/net/netfilter/nf_tables.h | 9 +- + include/uapi/linux/netfilter/nf_tables.h | 31 +++ + include/uapi/linux/netfilter/xt_cgroup.h | 16 ++ + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 1 - + net/ipv6/netfilter/ip6t_ipv6header.c | 5 +- + net/ipv6/netfilter/ip6t_rt.c | 10 +- + net/netfilter/Kconfig | 7 + + net/netfilter/Makefile | 1 + + net/netfilter/nf_conntrack_netlink.c | 50 +++-- + net/netfilter/nf_conntrack_standalone.c | 7 - + net/netfilter/nf_nat_redirect.c | 4 - + net/netfilter/nf_tables_api.c | 120 +++++++++-- + net/netfilter/nfnetlink_cttimeout.c | 48 ++--- + net/netfilter/nft_cmp.c | 6 +- + net/netfilter/nft_ct.c | 3 - + net/netfilter/nft_dynset.c | 21 +- + net/netfilter/nft_lookup.c | 20 +- + net/netfilter/nft_objref.c | 20 +- + net/netfilter/nft_reject.c | 6 +- + net/netfilter/nft_rt.c | 11 + + net/netfilter/nft_xfrm.c | 293 ++++++++++++++++++++++++++ + net/netfilter/xt_IDLETIMER.c | 4 - + net/netfilter/xt_SECMARK.c | 2 - + net/netfilter/xt_cgroup.c | 72 +++++++ + 25 files changed, 663 insertions(+), 107 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/hci/core.c | 10 ++++++++++ + net/nfc/netlink.c | 6 ++++-- + 7 files changed, 39 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 (43e2f2904160 Merge wireless-drivers into wireless-drivers-next) +$ git merge wireless-drivers-next/master +Removing drivers/net/wireless/mediatek/mt76/mt76x0/regs.h +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/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/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/dma.c | 2 +- + 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/pcie.c | 1 + + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 1 + + 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 | 69 +- + 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 | 4 - + 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/mac-cfg.h | 49 ++ + 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 | 199 +++++- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 120 ++-- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 23 +- + 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 | 30 +- + 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 +- + 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 | 14 +- + .../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 | 4 - + 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 | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 162 +++-- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 5 - + 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 | 66 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 49 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 34 +- + 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 | 49 +- + 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 | 20 +- + 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 | 711 ++++++++++++--------- + 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 | 5 - + 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 | 115 +++- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 26 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 60 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 94 +-- + 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 | 88 +-- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 124 ++-- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 16 +- + .../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 | 6 + + drivers/net/wireless/mediatek/mt76/Makefile | 3 + + drivers/net/wireless/mediatek/mt76/dma.h | 10 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 3 + + drivers/net/wireless/mediatek/mt76/mt76.h | 27 + + drivers/net/wireless/mediatek/mt76/mt76x0/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/core.c | 34 - + drivers/net/wireless/mediatek/mt76/mt76x0/dma.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 44 +- + drivers/net/wireless/mediatek/mt76/mt76x0/mac.c | 126 +--- + drivers/net/wireless/mediatek/mt76/mt76x0/mac.h | 8 +- + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 127 ++-- + drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c | 347 ++-------- + drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 56 +- + drivers/net/wireless/mediatek/mt76/mt76x0/regs.h | 651 ------------------- + drivers/net/wireless/mediatek/mt76/mt76x0/trace.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x0/tx.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 218 +------ + drivers/net/wireless/mediatek/mt76/mt76x0/usb.h | 15 - + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 157 +++++ + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 85 +++ + .../mt76/{mt76x2_regs.h => mt76x02_regs.h} | 78 ++- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 55 ++ + drivers/net/wireless/mediatek/mt76/mt76x02_util.h | 25 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 50 +- + drivers/net/wireless/mediatek/mt76/mt76x2_common.c | 99 +-- + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 15 +- + .../wireless/mediatek/mt76/mt76x2_init_common.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 21 +- + .../net/wireless/mediatek/mt76/mt76x2_mac_common.c | 130 +--- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 47 +- + .../net/wireless/mediatek/mt76/mt76x2_phy_common.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2_tx.c | 8 +- + .../net/wireless/mediatek/mt76/mt76x2_tx_common.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x2_usb.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt76x2u.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x2u_core.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_init.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_main.c | 29 +- + drivers/net/wireless/mediatek/mt76/mt76x2u_mcu.c | 8 - + drivers/net/wireless/mediatek/mt76/usb_mcu.c | 78 ++- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 18 +- + .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + .../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_usb.c | 11 +- + drivers/net/wireless/rsi/rsi_common.h | 1 - + drivers/net/wireless/st/cw1200/txrx.c | 4 +- + 217 files changed, 3410 insertions(+), 3429 deletions(-) + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/core.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/regs.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_mac.h + rename drivers/net/wireless/mediatek/mt76/{mt76x2_regs.h => mt76x02_regs.h} (89%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_util.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_util.h +Merging bluetooth/master (08d70c106258 Bluetooth: hci_serdev: Add protocol check in hci_uart_dequeue().) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hidp/core.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_qca.c | 17 +++++++++-------- + drivers/bluetooth/hci_serdev.c | 8 +++++--- + net/bluetooth/bnep/core.c | 7 ++++--- + net/bluetooth/cmtp/core.c | 14 ++++++++------ + net/bluetooth/hidp/core.c | 13 ++++++++----- + 5 files changed, 34 insertions(+), 25 deletions(-) +Merging mac80211-next/master (ec5b8381e2fc cfg80211: combine duplicate wdev init code) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + net/mac80211/util.c | 3 +++ + net/wireless/core.c | 42 ++++++++++++++++++++++++------------------ + net/wireless/core.h | 3 +++ + net/wireless/nl80211.c | 13 ++----------- + 4 files changed, 32 insertions(+), 29 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 (9b2c0b94ae32 mtd: rawnand: Do not treat !maxchips specially in nand_scan_with_ids()) +$ 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 | 4 +- + Documentation/mtd/nand/pxa3xx-nand.txt | 113 -- + arch/arm/mach-ep93xx/snappercl15.c | 7 +- + arch/arm/mach-ep93xx/ts72xx.c | 7 +- + arch/arm/mach-imx/mach-qong.c | 11 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 3 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-nand.c | 3 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/common.h | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 18 +- + arch/arm/mach-pxa/balloon3.c | 8 +- + arch/arm/mach-pxa/em-x270.c | 5 +- + arch/arm/mach-pxa/palmtreo.c | 31 - + arch/arm/mach-pxa/palmtx.c | 5 +- + arch/mips/alchemy/devboards/db1200.c | 5 +- + arch/mips/alchemy/devboards/db1300.c | 5 +- + arch/mips/alchemy/devboards/db1550.c | 5 +- + arch/mips/netlogic/xlr/platform-flash.c | 4 +- + arch/mips/pnx833x/common/platform.c | 3 +- + arch/mips/rb532/devices.c | 5 +- + arch/sh/boards/mach-migor/setup.c | 6 +- + drivers/mtd/nand/raw/Kconfig | 20 - + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/ams-delta.c | 24 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 87 +- + drivers/mtd/nand/raw/au1550nd.c | 85 +- + drivers/mtd/nand/raw/bcm47xxnflash/main.c | 2 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 38 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 78 +- + drivers/mtd/nand/raw/cafe_nand.c | 56 +- + drivers/mtd/nand/raw/cmx270_nand.c | 20 +- + drivers/mtd/nand/raw/cs553x_nand.c | 33 +- + drivers/mtd/nand/raw/davinci_nand.c | 59 +- + drivers/mtd/nand/raw/denali.c | 114 +- + 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 | 116 +- + drivers/mtd/nand/raw/docg4.c | 1442 ---------------------- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 52 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 82 +- + drivers/mtd/nand/raw/fsl_upm.c | 38 +- + drivers/mtd/nand/raw/fsmc_nand.c | 42 +- + drivers/mtd/nand/raw/gpio.c | 13 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 3 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 99 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 2 +- + drivers/mtd/nand/raw/hisi504_nand.c | 54 +- + drivers/mtd/nand/raw/jz4740_nand.c | 39 +- + drivers/mtd/nand/raw/jz4780_nand.c | 32 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 47 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 67 +- + drivers/mtd/nand/raw/marvell_nand.c | 271 ++-- + drivers/mtd/nand/raw/mpc5121_nfc.c | 51 +- + drivers/mtd/nand/raw/mtk_nand.c | 81 +- + drivers/mtd/nand/raw/mxc_nand.c | 98 +- + drivers/mtd/nand/raw/nand_base.c | 683 +++++----- + drivers/mtd/nand/raw/nand_bbt.c | 21 +- + drivers/mtd/nand/raw/nand_bch.c | 10 +- + drivers/mtd/nand/raw/nand_ecc.c | 14 +- + drivers/mtd/nand/raw/nand_hynix.c | 12 +- + drivers/mtd/nand/raw/nand_micron.c | 16 +- + drivers/mtd/nand/raw/nand_toshiba.c | 88 ++ + drivers/mtd/nand/raw/nandsim.c | 38 +- + drivers/mtd/nand/raw/ndfc.c | 29 +- + drivers/mtd/nand/raw/nuc900_nand.c | 27 +- + drivers/mtd/nand/raw/omap2.c | 148 +-- + drivers/mtd/nand/raw/orion_nand.c | 14 +- + drivers/mtd/nand/raw/oxnas_nand.c | 19 +- + drivers/mtd/nand/raw/pasemi_nand.c | 19 +- + drivers/mtd/nand/raw/plat_nand.c | 6 +- + drivers/mtd/nand/raw/qcom_nandc.c | 53 +- + drivers/mtd/nand/raw/r852.c | 54 +- + drivers/mtd/nand/raw/s3c2410.c | 72 +- + drivers/mtd/nand/raw/sh_flctl.c | 50 +- + drivers/mtd/nand/raw/sharpsl.c | 24 +- + drivers/mtd/nand/raw/sm_common.c | 5 +- + drivers/mtd/nand/raw/socrates_nand.c | 44 +- + drivers/mtd/nand/raw/sunxi_nand.c | 82 +- + drivers/mtd/nand/raw/tango_nand.c | 67 +- + drivers/mtd/nand/raw/tegra_nand.c | 36 +- + drivers/mtd/nand/raw/tmio_nand.c | 53 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 38 +- + drivers/mtd/nand/raw/vf610_nfc.c | 43 +- + drivers/mtd/nand/raw/xway_nand.c | 27 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 33 +- + include/linux/fsl_ifc.h | 2 + + include/linux/mtd/nand_bch.h | 11 +- + include/linux/mtd/nand_ecc.h | 8 +- + include/linux/mtd/rawnand.h | 144 ++- + 93 files changed, 1905 insertions(+), 3621 deletions(-) + delete mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt + delete mode 100644 drivers/mtd/nand/raw/docg4.c +Merging spi-nor/spi-nor/next (bb276262e88d mtd: spi-nor: only apply reset hacks to broken hardware) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (41a9aca6a2f3 crypto: cavium/nitrox - Added support for SR-IOV configuration.) +$ git merge crypto/master +Auto-merging include/uapi/linux/fs.h +Removing include/crypto/speck.h +Removing include/crypto/mcryptd.h +Auto-merging drivers/md/dm-integrity.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/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 | 1 - + arch/arm64/crypto/Kconfig | 11 - + arch/arm64/crypto/Makefile | 6 - + arch/arm64/crypto/aes-modes.S | 16 +- + 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/defconfig | 1 - + arch/x86/crypto/Makefile | 3 - + arch/x86/crypto/aesni-intel_glue.c | 2 +- + 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 | 76 -- + crypto/Makefile | 2 - + crypto/ahash.c | 4 +- + crypto/algapi.c | 9 +- + crypto/algboss.c | 2 + + crypto/algif_hash.c | 2 +- + crypto/ccm.c | 9 +- + crypto/internal.h | 8 - + crypto/mcryptd.c | 675 ------------- + crypto/shash.c | 33 +- + crypto/speck.c | 307 ------ + crypto/testmgr.c | 24 - + crypto/testmgr.h | 738 -------------- + crypto/xcbc.c | 8 +- + 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/caam/caamalg.c | 729 +++++--------- + drivers/crypto/caam/caamalg_desc.c | 142 +-- + drivers/crypto/caam/caamalg_desc.h | 28 +- + drivers/crypto/caam/caamalg_qi.c | 626 ++++-------- + drivers/crypto/caam/compat.h | 1 + + drivers/crypto/caam/qi.h | 1 - + drivers/crypto/cavium/nitrox/Makefile | 2 + + drivers/crypto/cavium/nitrox/nitrox_common.h | 14 - + drivers/crypto/cavium/nitrox/nitrox_dev.h | 36 +- + drivers/crypto/cavium/nitrox/nitrox_hal.c | 12 +- + drivers/crypto/cavium/nitrox/nitrox_hal.h | 22 + + drivers/crypto/cavium/nitrox/nitrox_isr.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 29 +- + drivers/crypto/cavium/nitrox/nitrox_sriov.c | 150 +++ + drivers/crypto/qat/qat_common/qat_algs.c | 8 +- + drivers/md/dm-integrity.c | 23 +- + drivers/md/dm-verity-fec.c | 5 +- + fs/crypto/fscrypt_private.h | 4 - + fs/crypto/keyinfo.c | 10 - + include/crypto/algapi.h | 14 +- + include/crypto/cbc.h | 2 +- + include/crypto/hash.h | 6 +- + include/crypto/mcryptd.h | 114 --- + include/crypto/speck.h | 62 -- + include/linux/compiler_types.h | 1 - + include/linux/crc-t10dif.h | 1 + + include/uapi/linux/fs.h | 4 +- + lib/crc-t10dif.c | 57 +- + 111 files changed, 1373 insertions(+), 13487 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 + delete mode 100644 crypto/mcryptd.c + delete mode 100644 crypto/speck.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_hal.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_sriov.c + delete mode 100644 include/crypto/mcryptd.h + delete mode 100644 include/crypto/speck.h +Merging drm/drm-next (2dc7bad71cd3 Merge tag 'drm-misc-next-2018-09-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_tcon_top.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_mixer.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/gvt/opregion.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio_context.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9f6603e3e441] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/atmel/hlcdc-dc.txt | 23 + + .../bindings/display/bridge/lvds-transmitter.txt | 8 +- + .../bindings/display/bridge/ti,sn65dsi86.txt | 87 ++ + .../bindings/display/bridge/toshiba,tc358764.txt | 35 + + .../devicetree/bindings/display/mipi-dsi-bus.txt | 153 +- + .../bindings/display/rockchip/rockchip-vop.txt | 3 + + .../bindings/display/sunxi/sun4i-drm.txt | 9 + + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-kms.rst | 18 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/todo.rst | 71 +- + Documentation/gpu/vkms.rst | 24 + + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 8 + + drivers/dma-buf/Kconfig | 9 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-buf.c | 1 - + drivers/dma-buf/udmabuf.c | 291 ++++ + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 + + 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 | 21 +- + drivers/gpu/drm/bochs/bochs_drv.c | 64 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 79 +- + drivers/gpu/drm/bochs/bochs_hw.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 7 +- + 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/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 | 35 +- + 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_connector.c | 6 +- + drivers/gpu/drm/drm_crtc.c | 5 +- + 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 | 3 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_fb_cma_helper.c | 26 +- + drivers/gpu/drm/drm_fb_helper.c | 26 +- + drivers/gpu/drm/drm_fourcc.c | 37 +- + drivers/gpu/drm/drm_framebuffer.c | 49 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 4 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 + + drivers/gpu/drm/drm_internal.h | 5 + + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_panel.c | 2 + + drivers/gpu/drm/drm_plane.c | 13 +- + drivers/gpu/drm/drm_plane_helper.c | 1 + + drivers/gpu/drm/drm_syncobj.c | 88 +- + drivers/gpu/drm/drm_vblank.c | 6 +- + drivers/gpu/drm/drm_vma_manager.c | 3 - + drivers/gpu/drm/gma500/psb_drv.h | 1 - + 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 | 88 +- + drivers/gpu/drm/i915/i915_drv.c | 194 +-- + drivers/gpu/drm/i915/i915_drv.h | 64 +- + drivers/gpu/drm/i915/i915_gem.c | 65 +- + 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 | 232 ++- + drivers/gpu/drm/i915/i915_gem_context.h | 26 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 45 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 52 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 23 +- + drivers/gpu/drm/i915/i915_gem_object.h | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 36 +- + drivers/gpu/drm/i915/i915_pci.c | 16 +- + drivers/gpu/drm/i915/i915_perf.c | 55 +- + drivers/gpu/drm/i915/i915_reg.h | 723 +++++----- + drivers/gpu/drm/i915/i915_request.c | 9 +- + drivers/gpu/drm/i915/i915_request.h | 39 +- + drivers/gpu/drm/i915/i915_vma.c | 5 +- + drivers/gpu/drm/i915/i915_vma.h | 10 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 6 +- + drivers/gpu/drm/i915/intel_csr.c | 33 +- + drivers/gpu/drm/i915/intel_ddi.c | 223 ++- + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_display.c | 167 ++- + drivers/gpu/drm/i915/intel_display.h | 30 +- + drivers/gpu/drm/i915/intel_dp.c | 501 ++++++- + drivers/gpu/drm/i915/intel_dp_link_training.c | 25 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + 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 | 52 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 93 +- + 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 | 35 +- + 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 | 159 ++- + 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_pipe_crc.c | 119 +- + drivers/gpu/drm/i915/intel_pm.c | 101 +- + drivers/gpu/drm/i915/intel_psr.c | 277 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 110 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 1003 ++++++++----- + drivers/gpu/drm/i915/intel_sprite.c | 13 +- + 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 | 11 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 221 +++ + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 38 +- + 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_sw_fence.c | 8 - + drivers/gpu/drm/i915/selftests/intel_guc.c | 38 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 101 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 + + 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/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/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/radeon_drv.c | 23 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 149 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 3 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 5 +- + 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/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 | 19 +- + 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_mixer.c | 24 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 4 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 6 +- + drivers/gpu/drm/v3d/v3d_gem.c | 6 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 20 +- + drivers/gpu/drm/vc4/vc4_gem.c | 4 +- + 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 | 7 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 13 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 39 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 57 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + drivers/gpu/drm/vkms/vkms_crc.c | 261 ++++ + 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/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_dp_helper.h | 5 +- + include/drm/drm_drv.h | 1 - + 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 | 22 + + 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/i915_pciids.h | 1 + + include/linux/console_struct.h | 1 - + include/linux/fb.h | 11 +- + include/linux/vt_kern.h | 7 - + include/uapi/drm/drm_fourcc.h | 39 + + include/uapi/drm/drm_mode.h | 3 +- + include/uapi/drm/i915_drm.h | 22 + + include/uapi/linux/udmabuf.h | 33 + + tools/testing/selftests/drivers/dma-buf/Makefile | 5 + + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 96 ++ + 312 files changed, 12879 insertions(+), 8516 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/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/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 (2693efd99cad drm/i915/audio: Hook up component bindings even if displays are disabled) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Merge made by the 'recursive' strategy. +Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (69fdf4206a8b drm: Differentiate the lack of an interface from invalid parameter) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_drv.c +Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.c'. +[master 00795ba0b940] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/dma-buf/udmabuf.c | 4 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 ++++-------- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + 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 | 2 +- + drivers/gpu/drm/drm_context.c | 16 ++++++++-------- + drivers/gpu/drm/drm_crtc.c | 4 ++-- + drivers/gpu/drm/drm_drv.c | 3 +++ + drivers/gpu/drm/drm_encoder.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 13 ++++++++----- + drivers/gpu/drm/drm_gem.c | 6 +++--- + drivers/gpu/drm/drm_ioctl.c | 4 ++-- + 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_pci.c | 4 ++-- + drivers/gpu/drm/drm_plane.c | 10 +++++----- + 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 | 14 +++++++------- + drivers/gpu/drm/drm_vblank.c | 4 ++-- + drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- + include/drm/drm_device.h | 10 ++++++++++ + include/drm/drm_drv.h | 8 ++++---- + 29 files changed, 110 insertions(+), 97 deletions(-) +Merging drm-msm/msm-next (2a56b5c8a7ca drm/msm/dpu: remove RM topology definition) +$ 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/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 + + 37 files changed, 339 insertions(+), 2013 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 (e368fc75c190 drm/arm/malidp: Added the late system pm functions) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (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 +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) +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 (05e2ec3b00ed ALSA: atiixp: fix fall-through annotations) +$ 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 | 2 +- + 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 +------ + 42 files changed, 183 insertions(+), 353 deletions(-) + rename {sound/pci/hda => include/sound}/hda_codec.h (100%) +Merging sound-asoc/for-next (730428181850 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/es8328.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 + + .../bindings/sound/mikroe,mikroe-proto.txt | 23 + + .../devicetree/bindings/sound/pcm3060.txt | 17 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 4 +- + .../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.h | 18 +- + 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 | 11 + + 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 | 7 +- + 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 | 9 +- + 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/rt5668.c | 10 +- + sound/soc/codecs/rt5670.c | 12 + + sound/soc/codecs/rt5682.c | 22 +- + 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/davinci/davinci-mcasp.c | 37 ++ + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_utils.c | 4 +- + sound/soc/generic/audio-graph-card.c | 18 +- + sound/soc/generic/audio-graph-scu-card.c | 55 +- + sound/soc/generic/simple-card-utils.c | 47 +- + 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/boards/Kconfig | 9 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 5 + + 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 | 182 ++++++ + 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-wm8960.c | 1 - + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 1 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 5 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 5 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 5 +- + sound/soc/meson/Kconfig | 13 + + sound/soc/meson/Makefile | 2 + + sound/soc/meson/axg-card.c | 13 +- + 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 | 5 +- + sound/soc/pxa/pxa2xx-ac97.c | 48 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 3 +- + sound/soc/qcom/qdsp6/q6core.c | 8 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 1 - + sound/soc/rockchip/rockchip_pcm.c | 3 +- + sound/soc/sh/hac.c | 3 +- + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/sh/rcar/core.c | 124 ++-- + sound/soc/sh/rcar/dma.c | 102 ++-- + sound/soc/sh/rcar/gen.c | 33 +- + sound/soc/sh/rcar/rsnd.h | 63 +- + sound/soc/sh/rcar/ssi.c | 89 +-- + sound/soc/sh/rcar/ssiu.c | 92 ++- + sound/soc/soc-core.c | 310 +++++----- + sound/soc/soc-dapm.c | 429 +++++++------- + sound/soc/soc-ops.c | 4 +- + sound/soc/soc-pcm.c | 156 +++-- + sound/soc/soc-topology.c | 11 - + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 7 +- + sound/soc/txx9/txx9aclc-ac97.c | 3 +- + 106 files changed, 4140 insertions(+), 976 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-pdm.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 (100294cee9a9 Input: do not use WARN() in input_alloc_absinfo()) +$ git merge input/next +Already up to date. +Merging block/for-next (4e0cd84418eb Merge branch 'for-4.20/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 6 +- + block/bfq-iosched.c | 78 +++++++++++++++++++--- + block/bfq-iosched.h | 26 ++++++++ + block/bfq-wf2q.c | 13 +++- + block/bio-integrity.c | 12 ++-- + block/bio.c | 1 - + block/blk-iolatency.c | 5 -- + drivers/ata/ahci.h | 2 + + 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/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/rsxx/cregs.c | 2 +- + drivers/block/umem.c | 4 +- + include/linux/bio.h | 22 ++---- + include/linux/bvec.h | 3 - + 22 files changed, 267 insertions(+), 149 deletions(-) +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 (10c5f0e7e976 dm raid: remove bogus const from decipher_sync_action() return type) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-mpath.c | 14 ++++++++------ + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-thin-metadata.c | 6 ++---- + 3 files changed, 11 insertions(+), 11 deletions(-) +Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- + drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- + drivers/scsi/pcmcia/nsp_cs.h | 4 ---- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 6 files changed, 5 insertions(+), 59 deletions(-) +Merging mmc/next (c42c3deae1a7 mmc: sdhci: fix __sdhci_adma_write_desc) +$ 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/sdhci-sprd.txt | 41 ++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 5 +- + .../devicetree/bindings/mmc/uniphier-sd.txt | 55 ++ + MAINTAINERS | 1 + + 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/mxcmmc.c | 5 +- + 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-pltfm.c | 68 +- + drivers/mmc/host/sdhci-pltfm.h | 7 +- + 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/mmc/host.h | 5 + + 36 files changed, 2689 insertions(+), 322 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 (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (9a255eeb01dd raid5: block failing device if raid will be failed) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid5.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +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 (cb90a2c6f77f power: supply: max8998-charger: Fix platform data retrieval) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq25890.txt | 3 + + arch/arm/mach-at91/pm_suspend.S | 8 ++ + drivers/power/reset/at91-sama5d2_shdwc.c | 119 ++++++++++++++------- + drivers/power/reset/rmobile-reset.c | 5 +- + drivers/power/supply/ab8500_fg.c | 52 ++++----- + drivers/power/supply/bq25890_charger.c | 62 ++++++++--- + 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 +- + include/linux/mfd/cros_ec_commands.h | 10 ++ + 15 files changed, 320 insertions(+), 207 deletions(-) +Merging regulator/for-next (a09920026b53 Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next) +$ git merge regulator/for-next +Auto-merging arch/arm/mach-pxa/em-x270.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/pfuze100.txt | 5 + + 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/regulator/bd71837-regulator.c | 3 +- + drivers/regulator/core.c | 119 +++++++++++---------- + drivers/regulator/fixed-helper.c | 1 - + drivers/regulator/fixed.c | 33 +++--- + drivers/regulator/helpers.c | 13 +-- + 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/s5m8767.c | 12 +-- + include/linux/regulator/fixed.h | 3 - + kernel/reboot.c | 1 + + 33 files changed, 398 insertions(+), 168 deletions(-) +Merging security/next-testing (72934a2c220f Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Merge made by the 'recursive' strategy. + kernel/seccomp.c | 4 ++-- + security/commoncap.c | 3 --- + security/tomoyo/common.c | 3 ++- + 3 files changed, 4 insertions(+), 6 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 (ec403d8ed08c ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (60c1f89241d4 Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (6488a7f35eea Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (0dd0e297f0ec vfio-pci: Disable binding to PFs with SR-IOV enabled) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (57361846b52b Linux 4.19-rc2) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (00b7d1cf4667 of: make default address and size cells sizes private) +$ git merge devicetree/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/device.c +Auto-merging drivers/of/base.c +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/prom.h | 3 --- + drivers/of/base.c | 2 +- + drivers/of/device.c | 5 +++-- + drivers/of/of_mdio.c | 12 ++++++------ + drivers/of/of_numa.c | 4 ++-- + drivers/of/of_private.h | 8 ++++++++ + drivers/of/overlay.c | 4 ++-- + drivers/of/platform.c | 8 ++++---- + drivers/of/unittest.c | 29 ++++++++++++++++++----------- + include/linux/of.h | 6 ------ + lib/vsprintf.c | 7 ++++++- + 11 files changed, 50 insertions(+), 38 deletions(-) +Merging mailbox/mailbox-for-next (2bb7005696e2 mailbox: Add support for i.MX messaging unit) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (379d1d4dc1df Merge branch 'spi-4.20' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 5 +- + Documentation/devicetree/bindings/spi/spi-sprd.txt | 26 + + drivers/spi/Kconfig | 6 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 10 +- + drivers/spi/spi-davinci.c | 22 +- + 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 | 15 + + drivers/spi/spi-orion.c | 22 +- + drivers/spi/spi-pic32-sqi.c | 2 +- + drivers/spi/spi-pic32.c | 2 +- + 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-sprd.c | 745 +++++++++++++++++++++ + drivers/spi/spi.c | 31 +- + include/linux/platform_data/spi-davinci.h | 4 - + include/linux/spi/spi.h | 5 +- + tools/spi/spidev_test.c | 6 +- + 25 files changed, 902 insertions(+), 134 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-sprd.txt + create mode 100644 drivers/spi/spi-sprd.c +Merging tip/auto-latest (f267a29578f7 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging fs/namespace.c +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/paravirt.h | 9 +- + arch/arm/include/asm/topology.h | 3 + + arch/arm/kernel/paravirt.c | 4 +- + arch/arm/xen/enlighten.c | 34 - + arch/arm64/include/asm/paravirt.h | 9 +- + arch/arm64/include/asm/topology.h | 3 + + arch/arm64/kernel/paravirt.c | 4 +- + arch/x86/Kconfig | 4 + + arch/x86/boot/compressed/kaslr.c | 18 +- + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/entry/entry_32.S | 8 +- + arch/x86/entry/entry_64.S | 125 +- + arch/x86/events/core.c | 8 +- + arch/x86/events/intel/pt.c | 2 +- + arch/x86/hyperv/mmu.c | 4 +- + arch/x86/include/asm/asm.h | 10 +- + 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/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/mmu_context.h | 4 +- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/paravirt.h | 415 +++--- + arch/x86/include/asm/paravirt_types.h | 82 +- + 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 | 10 +- + 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/kernel/alternative.c | 2 +- + 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/common.c | 17 +- + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- + arch/x86/kernel/cpu/microcode/core.c | 4 +- + arch/x86/kernel/cpu/vmware.c | 4 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/kprobes/core.c | 48 +- + arch/x86/kernel/kvm.c | 19 +- + arch/x86/kernel/kvmclock.c | 4 +- + 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/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/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 | 26 +- + arch/x86/mm/mem_encrypt_identity.c | 1 + + arch/x86/mm/pti.c | 33 +- + 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/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 +- + drivers/base/arch_topology.c | 26 + + drivers/misc/lkdtm/core.c | 1 + + drivers/misc/lkdtm/lkdtm.h | 1 + + drivers/misc/lkdtm/usercopy.c | 13 + + drivers/xen/time.c | 2 +- + fs/namespace.c | 2 + + include/linux/arch_topology.h | 1 + + include/linux/rwsem.h | 4 +- + include/linux/sched.h | 6 + + include/linux/sched/topology.h | 6 +- + include/trace/events/sched.h | 11 +- + include/xen/events.h | 2 + + include/xen/interface/memory.h | 6 - + include/xen/xen-ops.h | 133 +- + kernel/cpu.c | 28 + + kernel/jump_label.c | 7 +- + 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/sched/fair.c | 185 ++- + kernel/sched/sched.h | 18 +- + kernel/sched/topology.c | 106 +- + mm/maccess.c | 6 + + tools/lib/traceevent/event-parse.c | 1 + + tools/lib/traceevent/event-parse.h | 46 +- + tools/lib/traceevent/event-plugin.c | 1 + + tools/lib/traceevent/plugin_function.c | 1 + + tools/lib/traceevent/plugin_hrtimer.c | 1 + + tools/lib/traceevent/plugin_jbd2.c | 1 + + tools/lib/traceevent/plugin_kmem.c | 1 + + tools/lib/traceevent/plugin_kvm.c | 1 + + tools/lib/traceevent/plugin_mac80211.c | 1 + + tools/lib/traceevent/plugin_sched_switch.c | 1 + + 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/perf/Makefile.perf | 4 +- + tools/perf/arch/arm64/annotate/instructions.c | 59 +- + tools/perf/arch/s390/annotate/instructions.c | 2 - + tools/perf/builtin-record.c | 2 +- + tools/perf/builtin-script.c | 8 +- + tools/perf/builtin-stat.c | 1440 ++------------------ + tools/perf/builtin-trace.c | 163 ++- + 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 + + .../tests/shell/record+probe_libc_inet_pton.sh | 2 +- + 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/evsel.c | 29 + + tools/perf/util/evsel.h | 1 + + tools/perf/util/header.c | 6 +- + tools/perf/util/header.h | 2 +- + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/map.c | 15 +- + tools/perf/util/s390-cpumsf.c | 94 +- + tools/perf/util/stat-display.c | 1166 ++++++++++++++++ + tools/perf/util/stat-shadow.c | 147 +- + tools/perf/util/stat.c | 95 ++ + tools/perf/util/stat.h | 72 +- + tools/perf/util/trace-event.h | 1 + + 161 files changed, 4116 insertions(+), 3051 deletions(-) + 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/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 (c968ed08594d EDAC, sb_edac: Fix signedness bugs in *_get_ha() functions) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + drivers/edac/amd64_edac.c | 14 ++++ + drivers/edac/amd64_edac.h | 3 + + drivers/edac/sb_edac.c | 201 +++++++++++++++++++++++++++++++++++----------- + 4 files changed, 171 insertions(+), 50 deletions(-) +Merging irqchip/irq/irqchip-next (4110b5cbb014 irqchip/gic-v3: Allow interrupt to be configured as wake-up sources) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (bb730b5833b5 tracing: Fix SPDX format headers to use C++ style comments) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (9859adc81304 rcutorture: Make use of nolibc when available) +$ git merge rcu/rcu/next +Auto-merging scripts/checkpatch.pl +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 | 322 +-- + Documentation/RCU/stallwarn.txt | 13 +- + Documentation/RCU/whatisRCU.txt | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 49 +- + 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/srcu.h | 3 + + 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 | 626 ++++-- + 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 | 15 +- + scripts/checkpatch.pl | 42 + + 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 - + tools/testing/selftests/rcutorture/bin/kvm.sh | 8 + + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 136 ++ + tools/testing/selftests/rcutorture/bin/nolibc.h | 2197 +++++++++++++++++++ + .../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 - + tools/testing/selftests/rcutorture/doc/initrd.txt | 99 +- + 65 files changed, 5996 insertions(+), 3093 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 + create mode 100755 tools/testing/selftests/rcutorture/bin/mkinitrd.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/nolibc.h +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 (2b6d5b5ad116 s390/mm: optimize locking without huge pages in gmap_pmd_op_walk()) +$ git merge kvms390/next +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 6 +++++- + arch/s390/kvm/kvm-s390.c | 2 ++ + arch/s390/kvm/vsie.c | 19 +++++++++++-------- + arch/s390/mm/gmap.c | 10 ++++++++-- + 4 files changed, 26 insertions(+), 11 deletions(-) +Merging xen-tip/linux-next (58a575699040 xen/gntdev: fix up blockable calls to mn_invl_range_start) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (0b59c25f9100 mm: percpu: remove unnecessary unlikely()) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 2 +- + 1 file changed, 1 insertion(+), 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 (ff0e9f26288d platform/x86: alienware-wmi: Correct a memory leak) +$ git merge drivers-x86/for-next +Already up to date. +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 (bc221b0f7ee3 ipmi: Remove platform driver overrides and use the id_table) +$ git merge ipmi/for-next +Auto-merging include/linux/pci_ids.h +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_ipmi.c | 4 +- + drivers/char/ipmi/ipmi_bt_sm.c | 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 | 88 +++++++++++++++++++----------------- + 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 ++ + 22 files changed, 259 insertions(+), 262 deletions(-) +Merging driver-core/driver-core-next (7876320f8880 Linux 4.19-rc4) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (1652a83fa494 Merge 4.19-rc4 into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/media/usb/tm6000/tm6000-video.c +Auto-merging drivers/media/usb/em28xx/em28xx-audio.c +Merge made by the 'recursive' strategy. + 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/usb/core/buffer.c | 8 ++------ + drivers/usb/core/hcd.c | 14 -------------- + drivers/usb/core/phy.c | 7 ++++--- + drivers/usb/host/fotg210-hcd.c | 33 +++++++++++++++++++++++++++++---- + drivers/usb/host/fotg210.h | 3 +++ + drivers/usb/host/pci-quirks.c | 12 +++--------- + 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/storage/Kconfig | 23 ++++------------------- + drivers/usb/typec/fusb302/fusb302.c | 11 ----------- + drivers/usb/wusbcore/wa-rpipe.c | 6 ++---- + include/linux/platform_data/ehci-sh.h | 16 ++-------------- + 17 files changed, 79 insertions(+), 103 deletions(-) +Merging usb-gadget/next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge usb-serial/usb-next +Already up to date. +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 (53706a116863 phy: add Rockchip Innosilicon hdmi phy) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/phy-cadence-dp.txt | 30 + + .../bindings/phy/phy-rockchip-inno-hdmi.txt | 43 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 19 +- + .../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/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 | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qusb2.c | 4 +- + drivers/phy/renesas/phy-rcar-gen2.c | 5 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 5 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 5 +- + drivers/phy/rockchip/Kconfig | 8 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 1277 ++++++++++++++++++++ + drivers/phy/socionext/Kconfig | 25 + + drivers/phy/socionext/Makefile | 7 + + drivers/phy/socionext/phy-uniphier-usb2.c | 244 ++++ + drivers/phy/socionext/phy-uniphier-usb3hs.c | 422 +++++++ + drivers/phy/socionext/phy-uniphier-usb3ss.c | 349 ++++++ + 26 files changed, 3155 insertions(+), 28 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-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-usb2.c + create mode 100644 drivers/phy/socionext/phy-uniphier-usb3hs.c + create mode 100644 drivers/phy/socionext/phy-uniphier-usb3ss.c +Merging tty/tty-next (30ecfff4de7c Merge tag 'ib-mfd-spi-tty-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into tty-next) +$ git merge tty/tty-next +Auto-merging drivers/spi/Makefile +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/mfd/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/{serial => mfd}/atmel-usart.txt | 25 +- + MAINTAINERS | 16 + + drivers/mfd/Kconfig | 9 + + drivers/mfd/Makefile | 1 + + drivers/mfd/at91-usart.c | 72 ++++ + drivers/spi/Kconfig | 8 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-at91-usart.c | 432 +++++++++++++++++++++ + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/atmel_serial.c | 42 +- + include/dt-bindings/mfd/at91-usart.h | 17 + + 11 files changed, 607 insertions(+), 17 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 (f685fc6ab051 Merge b4.19-rc4 into char-misc-next) +$ 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 ++ + 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/fpga/dfl-afu-dma-region.c | 2 +- + drivers/fpga/dfl-fme-mgr.c | 2 +- + drivers/hv/hv.c | 15 +- + drivers/hv/vmbus_drv.c | 115 +++++- + 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/lkdtm/usercopy.c | 2 +- + drivers/misc/sgi-xp/xpc_partition.c | 3 +- + drivers/nvmem/core.c | 2 +- + drivers/platform/goldfish/goldfish_pipe.c | 299 +++++++-------- + drivers/platform/goldfish/goldfish_pipe_qemu.h | 112 ++++++ + drivers/slimbus/qcom-ngd-ctrl.c | 6 +- + drivers/uio/uio.c | 11 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 3 +- + drivers/uio/uio_hv_generic.c | 7 +- + drivers/vme/vme.c | 1 - + include/linux/hyperv.h | 1 + + include/uapi/linux/android/binder.h | 10 + + 33 files changed, 856 insertions(+), 633 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 (7dc074348eb8 Merge 4.19-rc4 into staging-next) +$ git merge staging/staging-next +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 +Recorded preimage for 'MAINTAINERS' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master b9b54d29ad28] 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 - + 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/erofs/Kconfig | 9 + + drivers/staging/erofs/data.c | 74 +- + drivers/staging/erofs/dir.c | 15 +- + drivers/staging/erofs/erofs_fs.h | 11 + + drivers/staging/erofs/inode.c | 7 +- + drivers/staging/erofs/internal.h | 66 +- + drivers/staging/erofs/namei.c | 28 +- + drivers/staging/erofs/super.c | 10 +- + drivers/staging/erofs/unzip_vle.c | 199 ++--- + drivers/staging/erofs/unzip_vle_lz4.c | 69 +- + drivers/staging/erofs/utils.c | 2 +- + drivers/staging/erofs/xattr.c | 171 ++-- + drivers/staging/fbtft/fbtft.h | 2 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 +- + 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 | 105 +-- + drivers/staging/gasket/gasket_interrupt.h | 24 +- + drivers/staging/gasket/gasket_page_table.c | 24 +- + drivers/staging/greybus/audio_codec.c | 1 - + 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/core.c | 27 +- + drivers/staging/most/net/net.c | 2 +- + 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 | 23 - + drivers/staging/mt7621-mmc/sd.c | 378 ++------ + drivers/staging/mt7621-pci/pci-mt7621.c | 26 +- + drivers/staging/octeon-usb/octeon-hcd.c | 58 +- + 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 | 2 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 240 ++--- + drivers/staging/rtl8188eu/core/rtw_recv.c | 35 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 69 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 35 +- + drivers/staging/rtl8188eu/hal/odm.c | 17 +- + 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/wifi.h | 8 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 - + 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 | 15 +- + 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 | 37 +- + 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/rtl871x_ioctl_linux.c | 7 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 7 +- + drivers/staging/rtlwifi/efuse.c | 3 +- + drivers/staging/vboxvideo/vbox_main.c | 5 +- + .../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/wilc1000/coreconfigurator.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 215 +---- + drivers/staging/wilc1000/host_interface.h | 13 +- + drivers/staging/wilc1000/linux_wlan.c | 88 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 197 ++--- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 41 +- + drivers/staging/wilc1000/wilc_wlan.c | 174 ++-- + drivers/staging/wilc1000/wilc_wlan.h | 5 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 - + drivers/staging/wlan-ng/prism2fw.c | 5 +- + include/dt-bindings/iio/qcom,spmi-vadc.h | 125 ++- + 189 files changed, 6010 insertions(+), 4183 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 + 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 +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 (3d46fda12a9d MAINTAINERS: add a maintainer for the interconnect API) +$ 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 | 729 +++++++++++++++++++++ + drivers/interconnect/qcom/Kconfig | 22 + + drivers/interconnect/qcom/Makefile | 7 + + drivers/interconnect/qcom/msm8916.c | 510 ++++++++++++++ + 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, 1907 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 (e4f8d81c738d cgroup/tracing: Move taking of spin lock out of trace event handlers) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (08097a7777f8 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- + drivers/message/fusion/mptbase.c | 8 +- + drivers/message/fusion/mptsas.c | 8 +- + drivers/scsi/53c700.h | 2 +- + drivers/scsi/aacraid/aachba.c | 7 - + drivers/scsi/aacraid/commsup.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 | 6 - + 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/libfc/fc_fcp.c | 6 +- + 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 | 15 +- + 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/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 | 37 +- + drivers/scsi/pm8001/pm8001_sas.h | 3 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 94 +++- + 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 | 512 ++++++--------------- + drivers/scsi/qla2xxx/qla_init.c | 334 +++++++++----- + drivers/scsi/qla2xxx/qla_inline.h | 23 +- + drivers/scsi/qla2xxx/qla_iocb.c | 41 +- + drivers/scsi/qla2xxx/qla_isr.c | 84 ++-- + drivers/scsi/qla2xxx/qla_mbx.c | 49 +- + drivers/scsi/qla2xxx/qla_nvme.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 311 ++++++++----- + drivers/scsi/qla2xxx/qla_target.c | 531 ++++++++++++++------- + drivers/scsi/qla2xxx/qla_target.h | 8 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 49 +- + drivers/scsi/raid_class.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +- + 68 files changed, 2850 insertions(+), 1211 deletions(-) +Merging scsi-mkp/for-next (2b08adff433c scsi: qla2xxx: Remove set but not used variable 'ptr_dma') +$ git merge scsi-mkp/for-next +Auto-merging drivers/target/iscsi/iscsi_target_login.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Merge made by the 'recursive' strategy. + drivers/scsi/aic7xxx/aic79xx_pci.c | 2 -- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 3 -- + drivers/scsi/lpfc/lpfc_nvme.c | 4 +-- + drivers/scsi/pm8001/pm8001_sas.c | 4 --- + drivers/scsi/pm8001/pm80xx_hwi.c | 3 +- + drivers/scsi/qla2xxx/qla_iocb.c | 2 -- + drivers/scsi/scsi_lib.c | 4 +-- + drivers/scsi/ufs/ufshcd.c | 53 ++++++++++++++++++++----------- + 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 +- + 12 files changed, 42 insertions(+), 41 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 (0205748ea669 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 | 2 ++ + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/qcom_adsp_pil.c | 12 ++++++++++ + drivers/rpmsg/qcom_glink_native.c | 3 --- + drivers/rpmsg/qcom_glink_smem.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 27 +++++++++++++--------- + 7 files changed, 33 insertions(+), 17 deletions(-) +Merging gpio/for-next (72a8cedb8497 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Removing include/linux/platform_data/gpio-ts5500.h +Auto-merging drivers/pinctrl/pinctrl-ingenic.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 | 8 +- + .../devicetree/bindings/gpio/ingenic,gpio.txt | 46 -- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 64 +-- + .../bindings/pinctrl/ingenic,pinctrl.txt | 39 +- + Documentation/driver-api/gpio/driver.rst | 23 +- + MAINTAINERS | 6 + + arch/arm/mach-ep93xx/core.c | 9 + + arch/mips/include/asm/vr41xx/giu.h | 8 - + arch/x86/platform/ts5500/ts5500.c | 1 - + drivers/gpio/Kconfig | 13 +- + drivers/gpio/Makefile | 1 - + 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-ep93xx.c | 297 +++++++------ + drivers/gpio/gpio-ftgpio010.c | 115 ++++- + drivers/gpio/gpio-ingenic.c | 392 ----------------- + drivers/gpio/gpio-mxs.c | 4 +- + drivers/gpio/gpio-pxa.c | 6 + + drivers/gpio/gpio-rcar.c | 6 + + 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 | 1 - + drivers/gpio/gpiolib-of.c | 54 ++- + drivers/gpio/gpiolib-sysfs.c | 10 +- + drivers/gpio/gpiolib.c | 187 ++++++--- + drivers/gpio/gpiolib.h | 1 + + drivers/pinctrl/Kconfig | 6 +- + drivers/pinctrl/pinctrl-ingenic.c | 462 ++++++++++++++++++++- + include/linux/gpio/driver.h | 26 +- + include/linux/platform_data/gpio-ts5500.h | 27 -- + include/uapi/linux/gpio.h | 2 +- + 49 files changed, 1222 insertions(+), 1046 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/ingenic,gpio.txt + delete mode 100644 drivers/gpio/gpio-ingenic.c + delete mode 100644 include/linux/platform_data/gpio-ts5500.h +Merging pinctrl/for-next (1ab75c1a1deb Merge branch 'devel' into for-next) +$ 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 ++ + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/berlin/berlin.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 8 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 7 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 12 +- + drivers/pinctrl/intel/pinctrl-intel.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 1404 +++++++++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/nuvoton/Kconfig | 12 + + drivers/pinctrl/nuvoton/Makefile | 4 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2072 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-at91.c | 8 +- + drivers/pinctrl/pinctrl-lantiq.c | 8 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 6 + + drivers/pinctrl/pinctrl-rockchip.c | 8 +- + drivers/pinctrl/pinctrl-rza1.c | 8 +- + drivers/pinctrl/pinctrl-single.c | 32 +- + drivers/pinctrl/pinctrl-st.c | 6 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 53 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 8 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 5 +- + include/dt-bindings/gpio/meson-g12a-gpio.h | 114 ++ + 33 files changed, 3965 insertions(+), 77 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt + 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 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 (fb50f5a4011c signal: Pair exports with their functions) +$ git merge userns/for-next +Auto-merging mm/oom_kill.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/uprobes.c | 2 +- + 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/sched/signal.h | 5 ++-- + 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 +-- + 14 files changed, 42 insertions(+), 46 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 (a987785dcd6c Add tests for memory.oom.group) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls) +$ git merge y2038/y2038 +Auto-merging net/socket.c +Auto-merging kernel/signal.c +Auto-merging ipc/shm.c +Auto-merging ipc/mqueue.c +Auto-merging include/linux/timekeeping.h +Auto-merging include/linux/syscalls.h +Removing include/linux/compat_time.h +Removing include/asm-generic/unistd.h +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/unistd.h | 2 + + arch/arc/include/uapi/asm/unistd.h | 1 + + arch/arm/include/asm/unistd.h | 4 +- + arch/arm64/include/asm/compat.h | 26 ++------ + arch/arm64/include/asm/stat.h | 2 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/uapi/asm/unistd.h | 1 + + 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/include/asm/compat.h | 18 +----- + arch/s390/include/asm/unistd.h | 3 +- + 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/include/asm/compat.h | 19 +----- + arch/x86/include/asm/unistd.h | 3 +- + arch/xtensa/include/asm/unistd.h | 2 +- + fs/aio.c | 8 +-- + fs/compat_binfmt_elf.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/linux/compat.h | 101 ++++++++++++++----------------- + include/linux/compat_time.h | 32 ---------- + include/linux/elfcore-compat.h | 8 +-- + include/linux/restart_block.h | 4 +- + 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/uapi/asm-generic/unistd.h | 2 + + 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/futex_compat.c | 2 +- + kernel/sched/core.c | 8 +-- + kernel/signal.c | 19 +++--- + kernel/time/hrtimer.c | 8 +-- + kernel/time/posix-stubs.c | 18 +++--- + kernel/time/posix-timers.c | 30 ++++----- + kernel/time/time.c | 97 ++++++++++++----------------- + kernel/time/timekeeping.c | 24 -------- + net/compat.c | 10 +-- + net/socket.c | 18 +++--- + 72 files changed, 398 insertions(+), 601 deletions(-) + delete mode 100644 include/asm-generic/unistd.h + delete mode 100644 include/linux/compat_time.h +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 (327c7ebeb14f coreisght: tmc: Claim device before use) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 95 ++--- + 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 | 265 +++++++++----- + include/linux/coresight.h | 41 ++- + 20 files changed, 1261 insertions(+), 545 deletions(-) +Merging rtc/rtc-next (03df75dd0330 rtc: isl1208: avoid possible sysfs race) +$ 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 | 3 +- + drivers/rtc/class.c | 12 ++-- + drivers/rtc/interface.c | 3 - + drivers/rtc/rtc-abx80x.c | 143 ++++++++++++++++++++++++++++++++++++++++++---- + drivers/rtc/rtc-isl1208.c | 11 +--- + 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-rv8803.c | 7 ++- + drivers/rtc/rtc-sun6i.c | 3 +- + drivers/rtc/rtc-sysfs.c | 4 +- + include/linux/rtc.h | 5 -- + 17 files changed, 203 insertions(+), 84 deletions(-) +Merging nvdimm/libnvdimm-for-next (be5ba2ca053d dax: Fix use of zero page) +$ git merge nvdimm/libnvdimm-for-next +Merge made by the 'recursive' strategy. + fs/dax.c | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) +Merging at24/at24/for-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) +$ git merge ntb/ntb-next +Auto-merging drivers/net/ntb_netdev.c +Merge made by the 'recursive' strategy. + drivers/net/ntb_netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (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 +Resolved 'drivers/misc/lkdtm/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fd5e34e4575f] 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 (ce397d215ccd Linux 4.18-rc1) +$ git merge cisco/for-next +Already up to date. +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 akpm-current/current (c6247557bc4e ipc: conserve sequence numbers in extended IPCMNI mode) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging mm/shmem.c +Auto-merging mm/oom_kill.c +Auto-merging mm/memory.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/util.h +Auto-merging init/do_mounts.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/cgroup.h +Auto-merging fs/read_write.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/bfs/inode.c +Auto-merging block/blk-iolatency.c +Removing arch/xtensa/include/asm/vga.h +Auto-merging arch/x86/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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f28a20a193c5] 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/c6x/include/asm/processor.h | 11 - + arch/h8300/include/asm/processor.h | 6 - + arch/hexagon/Kconfig | 3 + + 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 | 78 ++- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlmglue.c | 28 +- + 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/kcore.c | 1 + + fs/proc/loadavg.c | 3 - + fs/proc/meminfo.c | 16 +- + 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/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/radix-tree.h | 2 +- + include/linux/sched.h | 17 + + 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/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/pid.c | 2 +- + 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 +++ + kernel/sys.c | 3 - + lib/Kconfig.debug | 6 + + lib/bitmap.c | 22 +- + lib/parser.c | 16 +- + lib/sg_pool.c | 7 +- + lib/zlib_inflate/inflate.c | 12 + + mm/Kconfig | 4 + + mm/backing-dev.c | 35 ++ + mm/compaction.c | 5 + + mm/filemap.c | 31 +- + mm/huge_memory.c | 1 + + mm/hugetlb.c | 90 ++- + mm/kmemleak.c | 42 +- + mm/list_lru.c | 7 + + mm/memblock.c | 51 ++ + mm/memcontrol.c | 2 + + mm/memory.c | 126 ++-- + mm/mempolicy.c | 24 +- + mm/migrate.c | 2 + + mm/mincore.c | 12 +- + mm/mmu_notifier.c | 31 - + mm/oom_kill.c | 19 + + mm/page_alloc.c | 206 +++---- + mm/page_owner.c | 4 +- + mm/rmap.c | 42 +- + mm/shmem.c | 2 + + mm/slab.c | 4 +- + mm/slab_common.c | 103 ++-- + mm/slub.c | 33 +- + mm/swap_state.c | 17 +- + mm/swapfile.c | 225 ++++--- + mm/util.c | 3 +- + mm/vmscan.c | 27 +- + mm/vmstat.c | 7 +- + mm/workingset.c | 113 ++-- + mm/z3fold.c | 8 +- + scripts/checkpatch.pl | 11 - + tools/accounting/getdelays.c | 8 +- + virt/kvm/kvm_main.c | 1 - + 178 files changed, 3143 insertions(+), 1530 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: 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 + + 568e39651081...ec769499cb48 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (ec769499cb48 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + fs/inode.c | 4 +++- + include/asm-generic/percpu.h | 4 ---- + include/linux/percpu-defs.h | 6 ++---- + 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0eafe9618e00 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180918 |