diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-13 16:31:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-13 16:31:00 +1100 |
| commit | 41d8c16909ebda40f7b4982a7f5e2ad102705ade (patch) | |
| tree | c63f02f62e9d2ee49f432e96722cec329ac437f3 | |
| parent | dc2234ac929a2de36784d17ee4a9495404fc4afb (diff) | |
| download | linux-41d8c16909ebda40f7b4982a7f5e2ad102705ade.tar.gz linux-41d8c16909ebda40f7b4982a7f5e2ad102705ade.tar.xz | |
Add linux-next specific files for 20171213next-20171213
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 253 | ||||
| -rw-r--r-- | Next/Trees | 255 | ||||
| -rw-r--r-- | Next/merge.log | 6813 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7324 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a9de55408435 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,253 @@ +Name SHA1 +---- ---- +origin a638349bf6c29433b938141f99225b160551ff48 +fixes 820bf5c419e4b85298e5c3001bd1b5be46d60765 +kbuild-current cfe17c9bbe6a673fdafdab179c32b355ed447f66 +arc-current 799ab4a2c85bb62a96735f477306a64c09c7180a +arm-current 3aaf33bebda8d4ffcc0fc8ef39e6c1ac68823b11 +m68k-current 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes d8104182087319fd753d6d8e0afcd95d84c2aa2f +sparc a0908a1b7d68706ee52ed4a039756e70c8e956e9 +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 30791ac41927ebd3e75486f9504b6d2280463bf0 +bpf 9dbd2d948e7345595e5b90e44795c1e8ca3e5728 +ipsec 732706afe1cc46ef48493b3d2b69c98f36314ae4 +netfilter 23715275e4fb6f64358a499d20928a9e93819f2f +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers a41886f56b7bbb88e6a23b5d738a94f2632142a4 +mac80211 4564b187c16327045d87596e8980c65ba7b84c50 +sound-current 2b4584d00a6bc02b63ab3c7213060d41a74bdff1 +pci-current a19e2696135efb471981c1ae1ec3cb2b70c41a2e +driver-core.current 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +tty.current 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +usb.current 32fd87b3bbf5f7a045546401dfe2894dbbf4d8c3 +usb-gadget-fixes 9dbe416b656bb015fc49fc17961000ffa418838a +usb-serial-fixes 762ff4678e89a5e3f8b2237533e04d3ef2737e78 +usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d +phy 521e84ab2507008fd9f823147ce19318f64bd9ab +staging.current 202fc673c626e4ffe6b888c469b248ecc6d50265 +char-misc.current 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +input-current 4c83c071b7849ca3e8072284a8587669d8ba6a3d +crypto-current d53c5135792319e095bb126bc43b2ee98586f7fe +ide 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c +vfio-fixes e41dd1556d4d22c4b51c9003552af36e1d3e9b4a +kselftest-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 10a6a6975691775bbcc677a04c6fd3120b5c1160 +mfd-fixes b860b419d970f286294fbfb2b21a4028fd8ee442 +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes b084116f8587b222a2c5ef6dcd846f40f24b9420 +kvm-fixes 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +kvms390-fixes ca76ec9ca871e67d8cd0b6caba24aca3d3ac4546 +drm-intel-fixes 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +drm-misc-fixes babc8110057cb9ca542c3c1666cbda4e8ccf9250 +kbuild 49ef51835a36fb85f6b4bc32037e2cca1ba1461b +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping c9eb6172c328dde7e14812f94f8da87b691e41b5 +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 383f07dc0a84ee4b9bfd2f5376f70283ab932ac6 +arm-perf 07141342149a62db780c02f6352a0610a535eee1 +arm-soc 8be0b9886b6470a1261c9c2d0cfc1f0f89bf21b9 +actions a15f031b73615eab6094595c1407aee03fcb9b71 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 293db547c4a5ff262b4f447a0c3e5715c081b697 +aspeed 9c9ae757dc8b8c5f7ca676587e58af3e63d4c766 +at91 bee152d6af7d735f177ad1398ed9bbe84dfb6d63 +bcm2835 a6189bcc00123f47a256d5a6a46d93c9a2cab52e +imx-mxs 3d48b83d1ab5b471199a1a42b3279455eeba8f71 +keystone f594d414d4f4285699a9f823d26e81341f8eb2f6 +mvebu c6c5ff72be36b321c9da7de1ecd4d1daf938ff31 +omap ac54e2fb21c68044dae6d4f69b44a4c131c73826 +reset 0e5721f76252d69d424ec87a391d5ea37414b641 +qcom e7048ed58ed960c5355138ee7db740ab28ec4d4e +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 19e03b156dab61f25d666832c1f16972b2ad232e +rockchip c73d733c75151b31c3a7d09e2041f8f678c639f1 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 565acee8f57039510b35d972b125f9234e7ec27b +sunxi 68865e126ffbbbcbd204468405f3c8b2eaad036c +tegra ec0c973f47c74920bc8731f7355b5bf9a3f38de4 +arm64 6aef0fdd35ead88cd651391dcc03562938a7612c +clk 90552a6f9312861ff2481fc9802c4cf6be02e338 +clk-samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +c6x 62016565bb04cb9f138510e87c9e4da95e00fdfb +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +m68k 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 +m68knommu 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +mips e0c5f36b2a638fc3298200c385af7f196d3b5cd4 +nios2 65d1e3ddeae117f6a224535e10a09145f0f96508 +openrisc 610f01b9a88a9ef8b506709a825c17395c56a62a +parisc-hd bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +powerpc f36dbfe1a504b85c7b3bf89fdd99991afbaa0f74 +fsl a4e89ffb59235fd11d27107dea3efa4562ac0a12 +risc-v 8943d9736821fa4eab5bce56f5de008ca8d663ca +s390 a8ddea3d9b9ac804c050751317eba56d428fdf30 +sparc-next 1deab8ce2c91e3b16563b7a7ea150f82334262ec +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 02eb0b11eab56b47bcc36aa04dd522786c8faab9 +xtensa a5840bee73a37b013bc9425e77b2b54077b9773a +fscrypt a0b3bc855374c50b5ea85273553485af48caf2f7 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 5226fcac7841f66e5c141d27f0d099b5fd0d626f +btrfs-kdave eccfa5b02330112b262f3f8c50de60d3ab56918a +ceph 040d786032bf59002d374b86d75b04d97624005c +cifs 5702591fc6a3f409f460def104ee149330dac82d +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 88bc0ede8d35edc969350852894dc864a2dc1859 +ext4 e243560f12d7e0b176b32d9fdebc0c9818ba7b05 +f2fs 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs a638349bf6c29433b938141f99225b160551ff48 +nfs-anna c54c14ba000d769b7f5e4a33f915f0171b378437 +nfsd a14fbdff76badb2a12883d22c1bae5f076995e1a +orangefs db0267e7afc72e04d92b845a00928e39be211d6a +overlayfs 7879cb43f9a75710af439c6bd81c94de1aa3d740 +ubifs 15e5178339b9a95bc60c6bcfcae1b8f48afedd23 +xfs b7e0b6ff54dd92febbb1914ab93cd6a21622e169 +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs 18c4468d431be9ad5c13c4088fa3d0114f335184 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 926adbad732013a21df657d0e09456eaf3ec3b79 +pci 329c863b0c1dae89e1075caeef35be95a3b10465 +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid 421f664d5eb44dc9eb3b7af013a3ecec9f3b7968 +i2c 7f361814eb1f44e809835a72b117f9bac486b719 +dmi 0bcea5c474d1a86736b0fb3c7dbff9d8d2fbeace +hwmon-staging ccdb35594d7b394692f4a596de2f6af3baa48136 +jc_docs 241f67c8cccc94d79166173197bd6117cfa94ae9 +v4l-dvb 330dada5957e3ca0c8811b14c45e3ac42c694651 +v4l-dvb-next ba815f198ca28764d3702d4401af91acf78d74c1 +fbdev 5f215d252496543ba22299bccef5062d30d63cfe +pm 6424368125cb9d72980bf8c17362b8bda79bb6d8 +cpupower ae64f9bd1d3621b5e60d7363bc20afb46aede215 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +thermal 1e032393d9680c1f3b5238ec0f3f4eb006ee83d2 +thermal-soc fd6d2e506ce6f850d45342a15c896591291b77b5 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 48d79b49e16831e613b67dccd4c7886081161656 +bpf-next 97c50589229f32457792e2c364d90185f86fd9c5 +ipsec-next 9b7e14dba0c087e950fc024b486e8f729c1ee672 +netfilter-next e02538c6458b54c135cb8626c05e989b16550cb0 +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next 53ac793593275a7d9cf9cd3d88e730f6c2521730 +bluetooth 0be8666f8ee70f1710396ef5b3c12aa8da98ef4f +mac80211-next b0d52ad821843a6c5badebd80feef9f871904fa6 +rdma c058ecf6e455fac7346d46197a02398ead90851f +gfs2 850d2d915fa69011bef9bd668499cce889fdd8b3 +mtd 36de80740008e6a4a55115b4a92e2059e47c1cba +l2-mtd 1530578abdac4edce9244c7a1962ded3ffdb58ce +nand d47eeb213c8b444fb3a4f7dbce09feb19580e5e6 +spi-nor 59b356ffd0b00ed986c0aa1b401dd9b466ee619d +crypto 65cd9588c597753ab2e567af6e5e32e3f6645e5d +drm 9428088c90b6f7d5edd2a1b0d742c75339b36f6e +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 59e4b19d622ab22d138862ba287859e3aacd5478 +drm-tegra e1335e2f0cfcd36ffa1b709ac58096134eb6e779 +drm-misc d3820952ea1b49f46e340e2d366b080d3ddeea65 +drm-msm ad9d50c790434a27920044d6d493c2df05e450ef +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm d6661185683218715460bc73d8cc89784152621d +etnaviv 49b82c389d2a40eaef1355aaa35868b367aec9d1 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap a7821505a87c3f2d995e71593ca3523ff84f6018 +sound 108884e6c5aa731c6704000e27444d51d090078b +sound-asoc f47eee0b26a63b023a76845de79d5eb2ac69f4f3 +modules ece1996a21eeb344b49200e627c6660111009c10 +input c1b433e04ef9c0a1c4d65bfe918472ffa334dff4 +block 50da70ed9c48b7a758a3f57fe1d31fd2748db1e8 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 496cc64f4d10ba112aa0679a3bf29ae6ea74ff3d +mmc e828b53afd7f631365e0d668c1fc720843d9af06 +md 474beb575c03e0e7f1a704ac428916898f81b3cd +mfd 15a94ce2b7ae62a3fe362584dd91adfecdf93634 +backlight 29fae2c1db242a39c5c7c49434fb183f990df2f8 +battery 70a39e1075019eef753649ac01ed594ac9016be6 +regulator 0cbd8b5da17640bcf8610ba93704f7d53cc71598 +security 457e594528bf593c039b5a9d9203e399d40b1d76 +integrity e87dafe70acc3872395a208e7e33758a00984446 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 4b14752ec4e0d87126e636384cf37c8dd9df157c +tpmdd db3248e8a036c39141c8f7e9f1cf5c5ae6815f76 +watchdog 14807b07a7d86b7e43eb044f859ae78c57366927 +iommu a593472591a5cf2d91244bc3f319c9dd91119343 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio d0422298337986e63714df6637093e4153d7dab9 +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit 42d5e37654e4cdb9fb2e2f3ab30045fee35c42d8 +devicetree aa199b746678e22ce986505c52e796b8481c555e +mailbox 1f90a2162fb3cdfd9c44380bf16209af00f7acbe +spi 0cf25e29d0bbec3a30110618f99419d5b415fa71 +tip 638250bd465e75690295b78b480f9c44ed1b53f2 +clockevents 8a7507eea818d829e2ac9fce3ba769458681ef02 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 86a18ee21e5eecf56ca02aec24807ffa87bb57b6 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace a96a5037ed0f52e2d86739f4a1ef985bd036e575 +rcu b9623f0e768f9384797464f3e6f8993c3f833b86 +kvm 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 +kvm-arm 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 432953b4455d8a48af0500a77826c71871671161 +kvms390 da9a1446d248f673a8560ce46251ff620214ab7b +xen-tip c4f9d9cb2c29ff04c6b4bb09b72802d8aedfc7cb +percpu abee210500ed15a22787009d9210b9a34911afcc +workqueues 01dfee9582d9b4403c4902df096ed8b43d55181c +drivers-x86 c454a99d4ce1cebb5b4dc742309187c05b4b17ee +chrome-platform 859eb05676f67d4960130dff36d3368006716110 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds eb17720378a0bd878a107482511573d8bca72b7c +ipmi 174134ac760275457bb0d1560a0dbe6cf8a12ad6 +driver-core 73cf7e111ed69d8e1b59a3ae41b14bc77215e9ee +usb 16e791e7659645e6d8ea6286d210a24ee473d6c2 +usb-gadget ce2b21a4e5ce042c0a42c9db8fa9e0f849427d5e +usb-serial d8a42b1ff8a3755cc710785c7e4b5e59636399ca +usb-chipidea-next 2a53e060a053d5d7627dcde5b06b5950902d9ce6 +phy-next 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +tty 42e64571d516ef761d9f330c80493637cbf3bdda +char-misc 2fc10246766fce0b560f015e1c0b6ff29fb4ced0 +extcon 4f65b63ecc4c3476c6a5ecc077eba8592287fbe3 +staging 93d3ad90c2d470804b16f79e7e872408747d3e77 +mux 6cd361c99ef2bbe23edd554079c4187321a21219 +slave-dma f1b8ae7accebdf4f2982a8608d18e5b6c9c5e64b +cgroup e7fd37ba12170cc414be8b639dfc2c5f7172fac2 +scsi a9417e74ff41eacd872202f311e0c209754ac7e8 +scsi-mkp ed123b6e474039483ffdb0a621184e3c3b4f9bce +target-updates 97488c73190bb785cba818bf31e7361a27aded41 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata ebb82e3c79d2a956366d0848304a53648bd6350b +vhost e073f74a5a39c6dc45f28a5006c21aa94490d9b8 +rpmsg aae5207dd9c4ba604d1957aeea74580f0d21d119 +gpio 1cb26d26cc0f304d996e4969eac21797b6f642da +pinctrl 353c2e005e379f7818607aa61b498b9f70804421 +pinctrl-samsung 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns 116ceac9741e5ab0337b0c855ba80966bfc899e2 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest ae64f9bd1d3621b5e60d7363bc20afb46aede215 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +livepatching c99a2be790b07752d8cc694434d3450afd4c5a00 +coresight 2bbe5ac62413e971961d3d05c4fd6574e769fb67 +rtc 9f33399c90741196be71cc4637e623a7d33f8c7f +nvdimm 4247f24c23589bcc3bc3490515ef8c9497e9ae55 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 a53593d9621c5b38befcf10c3ba3081419391c28 +ntb c47963de520462c5058badf94e015220c93d6a14 +kspp 589cde432c02376f863fca98c3e7549f64d78559 +akpm-current 677a4801e2b708580c82b5ebebbb071ea58a1f6e +akpm 439811df7cfc41e6f9b6ef80581f44ddbb38c22d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..de83215d972c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,255 @@ +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 +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +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 it://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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 +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-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 +uuid git git://git.infradead.org/users/hch/uuid.git#for-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +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 +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-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 +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.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/jhogan/mips.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git#for-linux-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 +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-2.6.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 +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 +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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://git.infradead.org/l2-mtd.git#nand/next +spi-nor git git://git.infradead.org/l2-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://people.freedesktop.org/~airlied/linux.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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#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 +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +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.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +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 +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..fb568147df54 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6813 @@ +$ date -R +Wed, 13 Dec 2017 09:54:00 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 50c4c4e268a2 Linux 4.15-rc3 +Merging origin/master (a638349bf6c2 Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) +$ git merge origin/master +Updating 50c4c4e268a2..a638349bf6c2 +Fast-forward + Documentation/cgroup-v2.txt | 7 ++++++ + arch/x86/crypto/salsa20_glue.c | 7 ------ + crypto/af_alg.c | 13 +++++------ + crypto/algif_aead.c | 2 +- + crypto/hmac.c | 6 +++++- + crypto/rsa_helper.c | 2 +- + crypto/salsa20_generic.c | 7 ------ + crypto/shash.c | 5 +++-- + drivers/ata/ahci_mtk.c | 6 +++--- + drivers/ata/ahci_qoriq.c | 12 +++++++++++ + drivers/ata/libata-core.c | 12 ++++++++--- + drivers/ata/pata_pdc2027x.c | 16 ++++++-------- + drivers/char/ipmi/ipmi_si_intf.c | 44 ++++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_si_parisc.c | 2 ++ + drivers/char/ipmi/ipmi_si_pci.c | 7 ++++-- + include/crypto/internal/hash.h | 8 +++++++ + init/main.c | 7 +++++- + kernel/cgroup/debug.c | 4 ++-- + kernel/cgroup/stat.c | 8 +++++-- + kernel/workqueue.c | 33 +++++++++++----------------- + mm/percpu.c | 4 ++++ + 21 files changed, 122 insertions(+), 90 deletions(-) +Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (cfe17c9bbe6a kbuild: move cc-option and cc-disable-warning after incl. arch Makefile) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 43 +++++++++++++++++++++++-------------------- + 1 file changed, 23 insertions(+), 20 deletions(-) +Merging arc-current/for-curr (799ab4a2c85b arc: do not use __print_symbol()) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/configs/hsdk_defconfig | 5 +++-- + arch/arc/include/asm/uaccess.h | 5 +++-- + arch/arc/kernel/setup.c | 8 +++++++- + arch/arc/kernel/stacktrace.c | 2 +- + 4 files changed, 14 insertions(+), 6 deletions(-) +Merging arm-current/fixes (3aaf33bebda8 ARM: avoid faulting on qemu) +$ git merge arm-current/fixes +Already up to date. +Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) +$ git merge m68k-current/for-linus +Already up to date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up to date. +Merging powerpc-fixes/fixes (d81041820873 powerpc/xmon: Don't print hashed pointers in xmon) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew)) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (30791ac41927 tcp md5sig: Use skb's saddr when replying to an incoming segment) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/renesas/sh_eth.c | 10 +++++ + drivers/net/phy/meson-gxl.c | 74 ++++++++++++++++++++++++++++++++++- + include/linux/ptr_ring.h | 9 +++++ + include/net/gue.h | 18 ++++----- + net/ipv4/raw.c | 15 ++++--- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/mac80211/ht.c | 5 +-- + net/netlink/af_netlink.c | 3 ++ + net/sctp/socket.c | 6 ++- + net/wireless/Makefile | 48 ++++++++++++++++++----- + 11 files changed, 161 insertions(+), 31 deletions(-) +Merging bpf/master (9dbd2d948e73 Merge branch 'bpf-misc-fixes') +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/um/include/asm/Kbuild | 1 + + kernel/trace/bpf_trace.c | 19 ++++++++++++------- + tools/include/uapi/asm/bpf_perf_event.h | 7 +++++++ + tools/testing/selftests/bpf/Makefile | 13 +------------ + 4 files changed, 21 insertions(+), 19 deletions(-) + create mode 100644 tools/include/uapi/asm/bpf_perf_event.h +Merging ipsec/master (732706afe1cc xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies.) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_input.c | 12 +++++++++++- + net/xfrm/xfrm_policy.c | 8 +++++++- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 26 +++++++++++++++++++++++++- + 4 files changed, 44 insertions(+), 3 deletions(-) +Merging netfilter/master (23715275e4fb netfilter: ip6t_MASQUERADE: add dependency on conntrack module) +$ git merge netfilter/master +Auto-merging net/netfilter/nfnetlink_log.c +Merge made by the 'recursive' strategy. + net/ipv4/netfilter/arp_tables.c | 1 - + net/ipv4/netfilter/ip_tables.c | 1 - + net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 +- + net/ipv6/netfilter/ip6_tables.c | 1 - + net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 ++- + net/netfilter/nf_conntrack_h323_asn1.c | 128 +++++++++++++++++++++++++-------- + net/netfilter/nf_conntrack_netlink.c | 12 +++- + net/netfilter/nf_conntrack_proto_tcp.c | 3 + + net/netfilter/nf_tables_api.c | 7 ++ + net/netfilter/nfnetlink_cthelper.c | 10 +++ + net/netfilter/nfnetlink_log.c | 5 ++ + net/netfilter/nfnetlink_queue.c | 5 ++ + net/netfilter/nft_exthdr.c | 2 + + net/netfilter/x_tables.c | 9 +++ + net/netfilter/xt_bpf.c | 6 ++ + net/netfilter/xt_osf.c | 7 ++ + 16 files changed, 170 insertions(+), 38 deletions(-) +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a41886f56b7b Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (4564b187c163 nl80211: fix nl80211_send_iface() error paths) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/nl80211.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (2b4584d00a6b ALSA: hda - Add vendor id for Cannonlake HDMI codec) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_hdmi.c | 6 ++++-- + sound/usb/quirks.c | 7 ++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (a19e2696135e x86/PCI: Only enable a 64bit BAR on single-socket AMD Family 15h) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/x86/pci/fixup.c | 27 +++++++++++++++++++++------ + include/linux/pci.h | 3 +++ + 2 files changed, 24 insertions(+), 6 deletions(-) +Merging driver-core.current/driver-core-linus (50c4c4e268a2 Linux 4.15-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (50c4c4e268a2 Linux 4.15-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (32fd87b3bbf5 USB: core: only clean up what we allocated) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/config.c | 9 ++++--- + drivers/usb/dwc2/core.h | 4 +++ + drivers/usb/dwc2/gadget.c | 42 ++--------------------------- + drivers/usb/dwc2/params.c | 29 +++++++++++++------- + drivers/usb/dwc3/dwc3-of-simple.c | 5 +++- + drivers/usb/dwc3/gadget.c | 4 +-- + drivers/usb/gadget/Kconfig | 4 +-- + drivers/usb/gadget/legacy/Kconfig | 12 +-------- + drivers/usb/host/xhci-mem.c | 15 ++++++++--- + drivers/usb/host/xhci-ring.c | 6 ++--- + drivers/usb/musb/da8xx.c | 10 ++++++- + drivers/usb/storage/unusual_devs.h | 7 +++++ + drivers/usb/storage/unusual_uas.h | 7 +++++ + drivers/usb/usbip/stub_rx.c | 51 +++++++++++++++++++++++++++++------- + drivers/usb/usbip/stub_tx.c | 7 +++++ + drivers/usb/usbip/usbip_common.h | 1 + + drivers/usb/usbip/vhci_sysfs.c | 25 +++++++++++------- + tools/usb/usbip/libsrc/vhci_driver.c | 10 +++---- + 18 files changed, 147 insertions(+), 101 deletions(-) +Merging usb-gadget-fixes/fixes (9dbe416b656b Revert "usb: gadget: allow to enable legacy drivers without USB_ETH") +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (762ff4678e89 USB: serial: usb_debug: add new USB device id) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (521e84ab2507 phy: rcar-gen3-usb2: select USB_COMMON) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/renesas/Kconfig | 2 + + drivers/phy/rockchip/phy-rockchip-typec.c | 2 + + drivers/phy/samsung/phy-exynos5-usbdrd.c | 183 ++++++++++++++++++++++++++++++ + drivers/phy/tegra/xusb.c | 58 +++++----- + drivers/usb/dwc3/core.c | 2 + + 6 files changed, 219 insertions(+), 30 deletions(-) +Merging staging.current/staging-linus (202fc673c626 staging: pi433: Fixes issue with bit shift in rf69_get_modulation) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/ccree/ssi_hash.c | 2 +- + drivers/staging/pi433/rf69.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging char-misc.current/char-misc-linus (50c4c4e268a2 Linux 4.15-rc3) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (4c83c071b784 Input: elants_i2c - do not clobber interrupt trigger on x86) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/analog.c | 2 +- + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 10 +++++++--- + 4 files changed, 10 insertions(+), 6 deletions(-) +Merging crypto-current/master (d53c51357923 crypto: af_alg - fix race accessing cipher request) +$ git merge crypto-current/master +Auto-merging crypto/algif_aead.c +Auto-merging crypto/af_alg.c +Merge made by the 'recursive' strategy. + crypto/af_alg.c | 6 ------ + crypto/algif_aead.c | 16 +++++++++++----- + crypto/algif_skcipher.c | 16 +++++++++++----- + crypto/mcryptd.c | 23 ++++++++++------------- + crypto/skcipher.c | 10 ++++------ + include/crypto/mcryptd.h | 1 + + 6 files changed, 37 insertions(+), 35 deletions(-) +Merging ide/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (e41dd1556d4d Merge branch 'iommu-fixes/vt-d' into for-linus) +$ git merge vfio-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging kselftest-fixes/fixes (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 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 (10a6a6975691 Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list") +$ git merge spi-nor-fixes/spi-nor/fixes +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 2 -- + 1 file changed, 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (b860b419d970 mfd: Fix RTS5227 (and others) powermanagement) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/cros_ec_spi.c | 53 +++++++++++++++++++++----------------------- + drivers/mfd/twl4030-audio.c | 9 ++++++-- + drivers/mfd/twl6040.c | 12 ++++++---- + include/linux/mfd/rtsx_pci.h | 2 +- + 4 files changed, 41 insertions(+), 35 deletions(-) +Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (b084116f8587 MIPS: AR7: Ensure that serial ports are properly set up) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (50c4c4e268a2 Linux 4.15-rc3) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (ca76ec9ca871 KVM: s390: Fix skey emulation permission check) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (50c4c4e268a2 Linux 4.15-rc3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (babc8110057c drm/vc4: Release fence after signalling) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_gem.c | 4 +++- + drivers/gpu/drm/vc4/vc4_irq.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging kbuild/for-next (49ef51835a36 Merge branches 'kconfig' and 'misc' into for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + .gitignore | 5 +++ + scripts/kconfig/expr.h | 90 +++++++++++++++++++++++++++++++++++++- + scripts/kconfig/menu.c | 10 +++++ + scripts/kconfig/zconf.y | 2 +- + scripts/package/Makefile | 26 +++++++++-- + scripts/package/snapcraft.template | 14 ++++++ + 6 files changed, 142 insertions(+), 5 deletions(-) + create mode 100644 scripts/package/snapcraft.template +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 (c9eb6172c328 dma-mapping: turn dma_cache_sync into a dma_map_ops method) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ 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 (383f07dc0a84 Merge branches 'fixes', 'misc' and 'sa1111' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 7 +- + arch/arm/Makefile | 6 +- + arch/arm/boot/compressed/vmlinux.lds.S | 8 + + arch/arm/common/sa1111.c | 328 ++++++++++++++++----------------- + arch/arm/include/asm/exception.h | 3 +- + arch/arm/include/asm/hardware/sa1111.h | 32 +--- + arch/arm/include/asm/sections.h | 21 +++ + arch/arm/include/asm/traps.h | 12 -- + arch/arm/include/asm/unified.h | 77 +------- + arch/arm/kernel/entry-armv.S | 6 +- + arch/arm/kernel/entry-common.S | 1 + + arch/arm/kernel/stacktrace.c | 14 +- + arch/arm/kernel/traps.c | 4 +- + arch/arm/kernel/vmlinux-xip.lds.S | 6 +- + arch/arm/kernel/vmlinux.lds.S | 6 +- + arch/arm/mm/fault.c | 5 +- + arch/arm/probes/kprobes/core.c | 14 +- + 17 files changed, 228 insertions(+), 322 deletions(-) +Merging arm-perf/for-next/perf (07141342149a arm64: MAINTAINERS: hisi: Add HiSilicon SoC PMU support) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (8be0b9886b64 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Already up to date. +Merging actions/for-next (a15f031b7361 Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/actions.txt | 16 ++++++++ + .../devicetree/bindings/power/actions,owl-sps.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/owl-s500-sparky.dts | 44 ++++++++++++++++++++++ + drivers/soc/actions/owl-sps.c | 42 +++++++++++++++++++++ + include/dt-bindings/power/owl-s700-powergate.h | 19 ++++++++++ + 7 files changed, 126 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/owl-s500-sparky.dts + create mode 100644 include/dt-bindings/power/owl-s700-powergate.h +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (293db547c4a5 Merge branch 'v4.16/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson8.dtsi | 29 ++++++++++---- + arch/arm/boot/dts/meson8b.dtsi | 24 +++++++---- + arch/arm/mach-meson/Kconfig | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 12 ++++++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 19 +++++++-- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 32 +++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 46 +++++++++++++++++++++- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 ++++++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 12 ++++++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 46 +++++++++++++++++++++- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 15 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 3 +- + 15 files changed, 232 insertions(+), 25 deletions(-) +Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++-- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++-- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 ++-- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- + drivers/firmware/raspberrypi.c | 2 +- + 8 files changed, 11 insertions(+), 11 deletions(-) +Merging imx-mxs/for-next (3d48b83d1ab5 Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl-sr-som.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 8 + + arch/arm/boot/dts/imx25.dtsi | 2 + + arch/arm/boot/dts/imx27-pdk.dts | 1 + + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 + + arch/arm/boot/dts/imx35.dtsi | 2 + + arch/arm/boot/dts/imx51-babbage.dts | 1 + + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 + + arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +- + arch/arm/boot/dts/imx51.dtsi | 1 + + arch/arm/boot/dts/imx53-cx9020.dts | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 14 +- + arch/arm/boot/dts/imx53.dtsi | 2 + + arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts | 52 +++++++ + arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts | 51 ++++++ + arch/arm/boot/dts/imx6dl-cubox-i.dts | 2 + + .../boot/dts/imx6dl-hummingboard-emmc-som-v15.dts | 53 +++++++ + arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts | 52 +++++++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 2 + + arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts | 60 +++++++ + arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts | 59 +++++++ + arch/arm/boot/dts/imx6q-cubox-i.dts | 2 + + arch/arm/boot/dts/imx6q-h100.dts | 4 +- + .../boot/dts/imx6q-hummingboard-emmc-som-v15.dts | 61 ++++++++ + arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts | 60 +++++++ + arch/arm/boot/dts/imx6q-hummingboard.dts | 2 + + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 72 ++++----- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 103 +++++++----- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 17 ++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 9 ++ + ...6qdl-microsom.dtsi => imx6qdl-sr-som-brcm.dtsi} | 41 ++--- + arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi | 70 +++++++++ + arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi | 170 ++++++++++++++++++++ + ...dl-microsom-ar8035.dtsi => imx6qdl-sr-som.dtsi} | 36 ++++- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 25 ++- + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl.dtsi | 1 + + arch/arm/boot/dts/imx6sx-sdb.dtsi | 172 ++++++++++++--------- + arch/arm/boot/dts/imx6sx.dtsi | 27 ++-- + arch/arm/boot/dts/imx6ul.dtsi | 2 + + arch/arm/boot/dts/imx7d.dtsi | 7 +- + arch/arm/boot/dts/imx7s.dtsi | 8 +- + arch/arm/boot/dts/ls1021a-twr.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 16 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 +- + arch/arm/mach-imx/mmdc.c | 11 -- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 77 +++++++++ + 48 files changed, 1161 insertions(+), 233 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts + rename arch/arm/boot/dts/{imx6qdl-microsom.dtsi => imx6qdl-sr-som-brcm.dtsi} (85%) + create mode 100644 arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi + rename arch/arm/boot/dts/{imx6qdl-microsom-ar8035.dtsi => imx6qdl-sr-som.dtsi} (84%) +Merging keystone/next (f594d414d4f4 Merge branch 'for_4.16/keystone-config' into next) +$ git merge keystone/next +Auto-merging Documentation/devicetree/bindings/memory-controllers/ti/emif.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/ti/emif.txt | 17 +- + arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 103 ++++++- + arch/arm/boot/dts/keystone-k2g-ice.dts | 336 +++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 44 ++- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2l.dtsi | 44 +++ + arch/arm/configs/keystone_defconfig | 7 + + arch/arm/configs/multi_v7_defconfig | 334 +++++++++----------- + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 8 + + drivers/memory/Makefile.asm-offsets | 5 + + drivers/memory/emif-asm-offsets.c | 92 ++++++ + drivers/memory/emif.h | 17 ++ + drivers/memory/ti-emif-pm.c | 324 ++++++++++++++++++++ + drivers/memory/ti-emif-sram-pm.S | 334 ++++++++++++++++++++ + include/linux/ti-emif-sram.h | 69 +++++ + 18 files changed, 1537 insertions(+), 213 deletions(-) + create mode 100644 drivers/memory/Makefile.asm-offsets + create mode 100644 drivers/memory/emif-asm-offsets.c + create mode 100644 drivers/memory/ti-emif-pm.c + create mode 100644 drivers/memory/ti-emif-sram-pm.S + create mode 100644 include/linux/ti-emif-sram.h +Merging mvebu/for-next (c6c5ff72be36 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 (ac54e2fb21c6 Merge branch 'omap-for-v4.16/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-pepper.dts | 2 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 205 ++-- + arch/arm/boot/dts/am33xx.dtsi | 14 +- + arch/arm/boot/dts/am4372.dtsi | 16 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 230 ++--- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- + arch/arm/boot/dts/dm814x-clocks.dtsi | 30 + + arch/arm/boot/dts/dm814x.dtsi | 4 + + arch/arm/boot/dts/dm816x-clocks.dtsi | 30 + + arch/arm/boot/dts/dm816x.dtsi | 9 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra7.dtsi | 87 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra72x.dtsi | 4 +- + arch/arm/boot/dts/dra74x.dtsi | 6 +- + arch/arm/boot/dts/dra76-evm.dts | 1 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 909 ++++------------- + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 17 + + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 249 +---- + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 256 +++++ + arch/arm/boot/dts/logicpd-som-lv.dtsi | 27 - + arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 17 + + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 411 +------- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 395 ++++++++ + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 84 -- + arch/arm/boot/dts/omap3-n900.dts | 4 +- + arch/arm/boot/dts/omap4.dtsi | 37 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 895 ++++++----------- + arch/arm/boot/dts/omap5.dtsi | 46 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 623 ++++-------- + arch/arm/configs/omap2plus_defconfig | 11 + + arch/arm/mach-omap2/clockdomain.c | 8 - + arch/arm/mach-omap2/clockdomain.h | 2 - + arch/arm/mach-omap2/cm.h | 7 +- + arch/arm/mach-omap2/cm2xxx.c | 2 +- + arch/arm/mach-omap2/cm33xx.c | 8 +- + arch/arm/mach-omap2/cm3xxx.c | 2 +- + arch/arm/mach-omap2/cm_common.c | 16 +- + arch/arm/mach-omap2/cminst44xx.c | 12 +- + arch/arm/mach-omap2/omap_hwmod.c | 73 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +- + drivers/clk/ti/apll.c | 3 +- + drivers/clk/ti/clk-33xx.c | 279 ++++-- + drivers/clk/ti/clk-3xxx.c | 263 +---- + drivers/clk/ti/clk-43xx.c | 295 ++++-- + drivers/clk/ti/clk-44xx.c | 200 ++-- + drivers/clk/ti/clk-54xx.c | 697 +++++++++---- + drivers/clk/ti/clk-7xx.c | 1076 +++++++++++++++------ + drivers/clk/ti/clk-814x.c | 50 +- + drivers/clk/ti/clk-816x.c | 62 +- + drivers/clk/ti/clk.c | 70 +- + drivers/clk/ti/clkctrl.c | 91 +- + drivers/clk/ti/clock.h | 13 +- + drivers/clk/ti/composite.c | 3 +- + drivers/clk/ti/dpll.c | 3 +- + include/dt-bindings/clock/am3.h | 108 +++ + include/dt-bindings/clock/am4.h | 113 +++ + include/dt-bindings/clock/dm814.h | 45 + + include/dt-bindings/clock/dm816.h | 53 + + include/dt-bindings/clock/dra7.h | 172 ++++ + include/dt-bindings/clock/omap5.h | 118 +++ + 66 files changed, 4567 insertions(+), 3918 deletions(-) + create mode 100644 arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi + create mode 100644 include/dt-bindings/clock/am3.h + create mode 100644 include/dt-bindings/clock/am4.h + create mode 100644 include/dt-bindings/clock/dm814.h + create mode 100644 include/dt-bindings/clock/dm816.h + create mode 100644 include/dt-bindings/clock/dra7.h + create mode 100644 include/dt-bindings/clock/omap5.h +Merging reset/reset/next (0e5721f76252 reset: meson-axg: add compatible string for Meson-AXG SoC) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/amlogic,meson-reset.txt | 3 +- + drivers/reset/core.c | 9 +- + drivers/reset/reset-meson.c | 2 + + .../dt-bindings/reset/amlogic,meson-axg-reset.h | 124 +++++++++++++++++++++ + include/linux/reset.h | 50 +++------ + 5 files changed, 149 insertions(+), 39 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-reset.h +Merging qcom/for-next (e7048ed58ed9 Merge tag 'qcom-drivers-for-4.15-2' into final-for-4.15) +$ 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 (19e03b156dab Merge branch 'arm64-dt-for-v4.16' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 34 ++ + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 87 ++++++ + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 5 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 5 +- + arch/arm/boot/dts/r8a7740.dtsi | 3 - + arch/arm/boot/dts/r8a7743.dtsi | 149 ++++++++- + .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 158 ++++++++++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 99 ++++-- + arch/arm/boot/dts/r8a7745.dtsi | 196 +++++++++++- + arch/arm/boot/dts/r8a7778.dtsi | 12 +- + arch/arm/boot/dts/r8a7779.dtsi | 12 +- + arch/arm/boot/dts/r8a7790-lager.dts | 5 +- + arch/arm/boot/dts/r8a7790.dtsi | 23 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +- + arch/arm/boot/dts/r8a7791.dtsi | 20 +- + arch/arm/boot/dts/r8a7792.dtsi | 3 +- + arch/arm/boot/dts/r8a7793.dtsi | 20 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 +- + arch/arm/boot/dts/r8a7794.dtsi | 27 +- + arch/arm/boot/dts/sh73a0.dtsi | 3 - + arch/arm64/boot/dts/renesas/Makefile | 3 +- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 85 +++++ + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 343 ++++++++++++++++----- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 2 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 58 ++++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 151 ++++++++- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 23 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 55 ++++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 115 +++++-- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 234 ++++++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 31 ++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 29 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + drivers/soc/renesas/renesas-soc.c | 3 + + 40 files changed, 1796 insertions(+), 235 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts +Merging rockchip/for-next (c73d733c7515 Merge branch 'v4.15-armsoc/fixes64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3066a-marsboard.dts | 4 ++ + arch/arm/boot/dts/rk3288.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 29 +++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 16 +++++++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 ----- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 53 ++++++++++++++++++++++- + 8 files changed, 105 insertions(+), 14 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (565acee8f570 Merge branch 'fixes' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8ecccc26efbb] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/exynos4.dtsi | 1 + + arch/arm/boot/dts/exynos4412-trats2.dts | 29 ++++- + arch/arm/boot/dts/exynos4412.dtsi | 71 ++++++----- + arch/arm/boot/dts/exynos5.dtsi | 23 ++++ + arch/arm/boot/dts/exynos5250.dtsi | 64 ++++++---- + arch/arm/boot/dts/exynos5410.dtsi | 18 +++ + arch/arm/boot/dts/exynos5420-cpus.dtsi | 10 ++ + arch/arm/boot/dts/exynos5420.dtsi | 29 +++++ + arch/arm/boot/dts/exynos5422-cpus.dtsi | 10 ++ + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 6 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 60 ++++++---- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 52 ++++++++ + arch/arm/boot/dts/exynos54xx.dtsi | 26 +++- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + + arch/arm/configs/exynos_defconfig | 6 + + arch/arm/configs/multi_v7_defconfig | 5 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 14 +++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 132 +++++++++++++++++++++ + 18 files changed, 481 insertions(+), 79 deletions(-) +Merging sunxi/sunxi/for-next (68865e126ffb Merge branches 'sunxi/clk-for-4.16', 'sunxi/dt-for-4.16' and 'sunxi/dt64-for-4.16' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/axp81x.dtsi | 20 +++ + arch/arm/boot/dts/sun4i-a10.dtsi | 4 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 + + arch/arm/boot/dts/sun6i-a31.dtsi | 4 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 4 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 19 ++ + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 17 ++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 33 ++++ + arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts | 73 ++++++++ + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 1 - + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 196 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 2 - + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 17 ++ + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 1 - + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 37 ++++ + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 23 +++ + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 125 ++++++++++++- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 + + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 11 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 19 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 36 +++- + arch/arm64/configs/defconfig | 2 + + drivers/bus/sunxi-rsb.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 57 +++--- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 18 +- + drivers/clk/sunxi-ng/ccu_mp.c | 20 ++- + drivers/clk/sunxi-ng/ccu_mp.h | 24 +++ + drivers/clk/sunxi-ng/ccu_nm.c | 50 ++++-- + drivers/clk/sunxi-ng/ccu_nm.h | 2 + + drivers/clk/sunxi/clk-sun8i-apb0.c | 5 +- + 36 files changed, 762 insertions(+), 79 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts +Merging tegra/for-next (ec0c973f47c7 Merge branch for-4.15/reset into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging arm64/for-next/core (6aef0fdd35ea Merge branch 'kpti' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 30 +++-- + arch/arm64/include/asm/asm-uaccess.h | 26 ++-- + arch/arm64/include/asm/assembler.h | 27 +---- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/fixmap.h | 5 + + arch/arm64/include/asm/kernel-pgtable.h | 12 +- + arch/arm64/include/asm/mmu.h | 11 ++ + arch/arm64/include/asm/mmu_context.h | 9 +- + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable-prot.h | 21 +++- + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/include/asm/proc-fns.h | 6 - + arch/arm64/include/asm/tlbflush.h | 16 ++- + arch/arm64/include/asm/uaccess.h | 21 +++- + arch/arm64/kernel/asm-offsets.c | 6 +- + arch/arm64/kernel/cpufeature.c | 41 +++++++ + arch/arm64/kernel/entry.S | 206 +++++++++++++++++++++++++++----- + arch/arm64/kernel/process.c | 12 +- + arch/arm64/kernel/vmlinux.lds.S | 22 +++- + arch/arm64/lib/clear_user.S | 2 +- + arch/arm64/lib/copy_from_user.S | 2 +- + arch/arm64/lib/copy_in_user.S | 2 +- + arch/arm64/lib/copy_to_user.S | 2 +- + arch/arm64/mm/cache.S | 2 +- + arch/arm64/mm/context.c | 36 +++--- + arch/arm64/mm/mmu.c | 31 +++++ + arch/arm64/mm/proc.S | 12 +- + arch/arm64/xen/hypercall.S | 2 +- + drivers/perf/arm_spe_pmu.c | 9 ++ + 29 files changed, 439 insertions(+), 137 deletions(-) +Merging clk/clk-next (3279e463717f Merge branch 'clk-qcom-alpha-pll' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/hi3660-clock.txt | 6 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 +++ + drivers/clk/clk-stm32f4.c | 2 +- + drivers/clk/clk-stm32h7.c | 19 +- + drivers/clk/clk.c | 5 + + drivers/clk/h8300/clk-div.c | 4 +- + drivers/clk/h8300/clk-h8s2678.c | 6 +- + drivers/clk/hisilicon/Kconfig | 6 + + drivers/clk/hisilicon/Makefile | 1 + + drivers/clk/hisilicon/clk-hi3660-stub.c | 185 ++++++++ + drivers/clk/nxp/clk-lpc32xx.c | 4 +- + drivers/clk/qcom/Kconfig | 9 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-alpha-pll.c | 497 +++++++++++++++++---- + drivers/clk/qcom/clk-alpha-pll.h | 35 +- + drivers/clk/qcom/clk-spmi-pmic-div.c | 302 +++++++++++++ + drivers/clk/qcom/gcc-ipq8074.c | 2 + + drivers/clk/qcom/gcc-msm8916.c | 13 +- + drivers/clk/qcom/gcc-msm8994.c | 4 + + drivers/clk/qcom/gcc-msm8996.c | 4 + + drivers/clk/qcom/mmcc-msm8996.c | 16 + + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + include/dt-bindings/clock/hi3660-clock.h | 7 + + include/trace/events/clk.h | 4 +- + 25 files changed, 1073 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 drivers/clk/hisilicon/clk-hi3660-stub.c + create mode 100644 drivers/clk/qcom/clk-spmi-pmic-div.c +$ git reset --hard HEAD^ +HEAD is now at 0060935aa7ac Merge remote-tracking branch 'arm64/for-next/core' +Merging next-20171208 version of clk +$ git merge -m next-20171208/clk 90552a6f9312861ff2481fc9802c4cf6be02e338 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/hi3660-clock.txt | 6 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 ++++ + drivers/clk/clk-stm32f4.c | 2 +- + drivers/clk/clk-stm32h7.c | 19 +- + drivers/clk/clk.c | 5 + + drivers/clk/h8300/clk-div.c | 4 +- + drivers/clk/h8300/clk-h8s2678.c | 6 +- + drivers/clk/hisilicon/Kconfig | 6 + + drivers/clk/hisilicon/Makefile | 1 + + drivers/clk/hisilicon/clk-hi3660-stub.c | 185 +++++++++++++ + drivers/clk/nxp/clk-lpc32xx.c | 4 +- + drivers/clk/qcom/Kconfig | 9 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-spmi-pmic-div.c | 302 +++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8916.c | 13 +- + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + include/dt-bindings/clock/hi3660-clock.h | 7 + + include/trace/events/clk.h | 4 +- + 19 files changed, 606 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 drivers/clk/hisilicon/clk-hi3660-stub.c + create mode 100644 drivers/clk/qcom/clk-spmi-pmic-div.c +Merging clk-samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition) +$ git merge c6x/for-linux-next +Auto-merging arch/c6x/kernel/asm-offsets.c +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + 1 file changed, 1 deletion(-) +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up to date. +Merging m68k/for-next (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (50c4c4e268a2 Linux 4.15-rc3) +$ git merge m68knommu/for-next +Already up to date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up to date. +Merging microblaze/next (50c4c4e268a2 Linux 4.15-rc3) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (e0c5f36b2a63 MIPS: Add iomem resource for kernel bss section.) +$ git merge mips/mips-next +Already up to date. +Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (610f01b9a88a openrisc: fix possible deadlock scenario during timer sync) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (bebc6082da0a Linux 4.14) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (f36dbfe1a504 selftests/powerpc: Fix build errors in powerpc ptrace selftests) +$ git merge powerpc/next +Auto-merging include/linux/pci.h +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/include/asm/machdep.h +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/Makefile | 8 +- + arch/powerpc/boot/serial.c | 6 + + arch/powerpc/include/asm/code-patching.h | 1 + + arch/powerpc/include/asm/machdep.h | 8 + + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/kernel/asm-offsets.c | 2 + + arch/powerpc/kernel/eeh_driver.c | 4 +- + arch/powerpc/kernel/entry_64.S | 10 +- + arch/powerpc/kernel/module.lds | 8 + + arch/powerpc/kernel/module_64.c | 35 ++- + arch/powerpc/kernel/pci-common.c | 27 +- + arch/powerpc/kernel/pci_dn.c | 6 - + arch/powerpc/kernel/setup_64.c | 2 - + arch/powerpc/kernel/vdso64/gettimeofday.S | 67 ++++- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/lib/code-patching.c | 5 + + arch/powerpc/mm/init_64.c | 5 +- + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/platforms/44x/fsp2.c | 259 +++++++++++++++++++- + arch/powerpc/platforms/44x/fsp2.h | 272 +++++++++++++++++++++ + arch/powerpc/platforms/512x/mpc512x_shared.c | 4 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 7 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 3 +- + arch/powerpc/platforms/cell/setup.c | 3 +- + arch/powerpc/platforms/cell/spider-pic.c | 3 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/powerpc/platforms/powermac/feature.c | 3 +- + arch/powerpc/platforms/powermac/pic.c | 1 + + arch/powerpc/platforms/powernv/eeh-powernv.c | 33 +-- + arch/powerpc/platforms/powernv/opal.c | 10 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 16 +- + arch/powerpc/platforms/ps3/device-init.c | 12 +- + arch/powerpc/platforms/ps3/mm.c | 4 +- + arch/powerpc/platforms/ps3/os-area.c | 2 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++ + arch/powerpc/platforms/pseries/iommu.c | 8 +- + arch/powerpc/platforms/pseries/pci.c | 31 ++- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 8 +- + arch/powerpc/sysdev/mpic.c | 10 +- + arch/powerpc/sysdev/xics/icp-native.c | 10 +- + arch/powerpc/sysdev/xics/ics-opal.c | 4 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 4 +- + arch/powerpc/sysdev/xics/xics-common.c | 8 +- + drivers/pci/iov.c | 11 + + drivers/ps3/ps3av.c | 11 +- + include/linux/pci.h | 2 + + .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 3 +- + .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 2 +- + .../testing/selftests/powerpc/tm/tm-unavailable.c | 43 +++- + 56 files changed, 872 insertions(+), 162 deletions(-) + create mode 100644 arch/powerpc/kernel/module.lds + create mode 100644 arch/powerpc/platforms/44x/fsp2.h +Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-linux-next (8943d9736821 automerging branch "github.com-riscv/next-audit_dir_write" into "for-linux-next") +$ git merge risc-v/for-linux-next +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/barrier.h | 19 +++++++++++++++++++ + arch/riscv/kernel/setup.c | 11 ----------- + arch/riscv/kernel/sys_riscv.c | 2 +- + include/asm-generic/audit_dir_write.h | 2 ++ + 4 files changed, 22 insertions(+), 12 deletions(-) +Merging s390/features (a8ddea3d9b9a s390/vdso: revise CFI annotations of vDSO functions) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Makefile | 6 +++++- + arch/s390/boot/compressed/misc.c | 4 ++++ + arch/s390/include/asm/dwarf.h | 37 +++++++++++++++++++++++++++++++++ + arch/s390/kernel/vdso32/Makefile | 3 +++ + arch/s390/kernel/vdso32/clock_getres.S | 5 +++-- + arch/s390/kernel/vdso32/clock_gettime.S | 17 +++++++++++++-- + arch/s390/kernel/vdso32/getcpu.S | 5 +++-- + arch/s390/kernel/vdso32/gettimeofday.S | 9 ++++++-- + arch/s390/kernel/vdso64/Makefile | 3 +++ + arch/s390/kernel/vdso64/clock_getres.S | 5 +++-- + arch/s390/kernel/vdso64/clock_gettime.S | 21 +++++++++++++++++-- + arch/s390/kernel/vdso64/getcpu.S | 5 +++-- + arch/s390/kernel/vdso64/gettimeofday.S | 9 ++++++-- + arch/s390/kernel/vmlinux.lds.S | 3 +++ + 14 files changed, 115 insertions(+), 17 deletions(-) + create mode 100644 arch/s390/include/asm/dwarf.h +Merging sparc-next/master (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd()) +$ git merge uml/linux-next +Auto-merging arch/um/drivers/net_kern.c +Merge made by the 'recursive' strategy. + arch/um/Kconfig.net | 11 + + arch/um/drivers/Makefile | 4 +- + arch/um/drivers/chan_kern.c | 53 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/random.c | 11 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1630 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 129 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 586 ++++++++++++ + arch/um/drivers/vector_user.h | 99 +++ + arch/um/include/asm/asm-prototypes.h | 1 + + arch/um/include/asm/irq.h | 12 + + arch/um/include/shared/irq_user.h | 12 +- + arch/um/include/shared/net_kern.h | 2 + + arch/um/include/shared/os.h | 17 +- + arch/um/kernel/irq.c | 461 ++++++---- + arch/um/kernel/time.c | 6 +- + arch/um/os-Linux/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 2 +- + arch/x86/um/stub_segv.c | 2 +- + 22 files changed, 3383 insertions(+), 325 deletions(-) + create mode 100644 arch/um/drivers/vector_kern.c + create mode 100644 arch/um/drivers/vector_kern.h + create mode 100644 arch/um/drivers/vector_transports.c + create mode 100644 arch/um/drivers/vector_user.c + create mode 100644 arch/um/drivers/vector_user.h + create mode 100644 arch/um/include/asm/asm-prototypes.h +Merging xtensa/xtensa-for-next (a5840bee73a3 Merge branch 'xtensa-asm-cleanups' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/Makefile | 7 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 1 + + arch/xtensa/include/asm/asmmacro.h | 40 +++++++++ + arch/xtensa/include/asm/current.h | 4 +- + arch/xtensa/include/asm/kmem_layout.h | 3 + + arch/xtensa/include/asm/linkage.h | 9 ++ + arch/xtensa/include/asm/ptrace.h | 3 +- + arch/xtensa/include/asm/thread_info.h | 13 +-- + arch/xtensa/kernel/Makefile | 3 - + arch/xtensa/kernel/align.S | 7 +- + arch/xtensa/kernel/coprocessor.S | 3 +- + arch/xtensa/kernel/entry.S | 97 +++++++-------------- + arch/xtensa/kernel/head.S | 10 +-- + arch/xtensa/kernel/setup.c | 25 ++++-- + arch/xtensa/kernel/vectors.S | 17 ++-- + arch/xtensa/kernel/vmlinux.lds.S | 90 ++++++------------- + arch/xtensa/lib/checksum.S | 74 +++++++--------- + arch/xtensa/lib/memcopy.S | 79 ++++++----------- + arch/xtensa/lib/memset.S | 44 ++++------ + arch/xtensa/lib/strncpy_user.S | 60 ++++++------- + arch/xtensa/lib/strnlen_user.S | 28 +++--- + arch/xtensa/lib/usercopy.S | 138 +++++++++++++----------------- + 22 files changed, 327 insertions(+), 428 deletions(-) + create mode 100644 arch/xtensa/include/asm/linkage.h +Merging fscrypt/master (a0b3bc855374 fscrypt: lock mutex before checking for bounce page pool) +$ 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 (5226fcac7841 squashfs: Add zstd support) +$ git merge btrfs/next +Auto-merging crypto/testmgr.h +Auto-merging crypto/testmgr.c +Auto-merging crypto/Makefile +Auto-merging crypto/Kconfig +Merge made by the 'recursive' strategy. + crypto/Kconfig | 9 ++ + crypto/Makefile | 1 + + crypto/testmgr.c | 10 +++ + crypto/testmgr.h | 71 +++++++++++++++ + crypto/zstd.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 356 insertions(+) + create mode 100644 crypto/zstd.c +Merging btrfs-kdave/for-next (eccfa5b02330 Merge branch 'for-next-next-v4.15-20171212' into for-next-20171212) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 3 +- + fs/btrfs/compression.c | 166 +++++++++++++-- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 26 +-- + fs/btrfs/ctree.h | 11 +- + fs/btrfs/delayed-inode.c | 59 +++--- + fs/btrfs/delayed-ref.c | 2 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/dev-replace.c | 30 +-- + fs/btrfs/dir-item.c | 108 ---------- + fs/btrfs/disk-io.c | 60 +++--- + fs/btrfs/disk-io.h | 3 + + fs/btrfs/export.c | 5 - + fs/btrfs/extent-tree.c | 19 +- + fs/btrfs/extent_io.c | 129 +++++------- + fs/btrfs/extent_io.h | 39 ++-- + fs/btrfs/extent_map.h | 1 - + fs/btrfs/file.c | 361 ++++++++++++++++++++++++++------- + fs/btrfs/free-space-cache.c | 8 +- + fs/btrfs/inode.c | 128 ++++++------ + fs/btrfs/ioctl.c | 55 +++-- + fs/btrfs/props.c | 15 +- + fs/btrfs/qgroup.c | 172 +++++++++++----- + fs/btrfs/qgroup.h | 28 ++- + fs/btrfs/raid56.c | 57 +++++- + fs/btrfs/ref-verify.c | 6 +- + fs/btrfs/root-tree.c | 7 - + fs/btrfs/scrub.c | 34 ++-- + fs/btrfs/send.c | 6 - + fs/btrfs/super.c | 292 +++++++++++++++------------ + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/tests/inode-tests.c | 17 +- + fs/btrfs/transaction.c | 15 +- + fs/btrfs/transaction.h | 11 +- + fs/btrfs/tree-checker.c | 141 +++++++++++++ + fs/btrfs/tree-log.c | 54 ++--- + fs/btrfs/volumes.c | 467 ++++++++++++++++++++++++++----------------- + fs/btrfs/volumes.h | 38 ++-- + fs/btrfs/xattr.c | 6 - + fs/btrfs/zstd.c | 151 +++++++------- + include/trace/events/btrfs.h | 18 +- + include/uapi/linux/btrfs.h | 11 +- + 42 files changed, 1666 insertions(+), 1101 deletions(-) +Merging ceph/master (040d786032bf ceph: drop negative child dentries before try pruning inode's alias) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/mds_client.c | 42 ++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 38 insertions(+), 4 deletions(-) +Merging cifs/for-next (5702591fc6a3 CIFS: don't log STATUS_NOT_FOUND errors for DFS) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smb2ops.c | 3 ++- + fs/cifs/smb2pdu.c | 30 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 16 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (88bc0ede8d35 quota: Check for register_shrinker() failure.) +$ git merge ext3/for_next +Already up to date. +Merging ext4/dev (e243560f12d7 ext4: fix fdatasync(2) after fallocate(2) operation) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/extents.c | 1 + + fs/ext4/inode.c | 9 +++++++++ + 2 files changed, 10 insertions(+) +Merging f2fs/dev (4fbd8d194f06 Linux 4.15-rc1) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (a638349bf6c2 Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprt.c +Merge made by the 'recursive' strategy. + fs/nfs/client.c | 11 +++++++++++ + fs/nfs/nfs4client.c | 17 +++++++++++++---- + net/sunrpc/xprt.c | 26 +++++++++++++++++--------- + net/sunrpc/xprtrdma/rpc_rdma.c | 6 +----- + net/sunrpc/xprtrdma/transport.c | 2 ++ + net/sunrpc/xprtrdma/verbs.c | 2 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 1 + + 7 files changed, 46 insertions(+), 19 deletions(-) +Merging nfsd/nfsd-next (a14fbdff76ba lockd: convert nlm_rqst.a_count from atomic_t to refcount_t) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/clntproc.c | 14 +++++++------- + fs/lockd/host.c | 16 ++++++++-------- + fs/lockd/mon.c | 14 +++++++------- + fs/lockd/svcproc.c | 2 +- + include/linux/lockd/lockd.h | 9 +++++---- + 5 files changed, 28 insertions(+), 27 deletions(-) +Merging orangefs/for-next (db0267e7afc7 orangefs: call op_release sooner when creating inodes) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (7879cb43f9a7 ovl: Use PTR_ERR_OR_ZERO()) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 34 +++++++++++++ + fs/overlayfs/Kconfig | 10 ++++ + fs/overlayfs/namei.c | 18 ++++++- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/readdir.c | 5 +- + fs/overlayfs/super.c | 87 +++++++++++++++++++++++++-------- + 7 files changed, 134 insertions(+), 24 deletions(-) +Merging ubifs/linux-next (15e5178339b9 ubi: fastmap: Clean up the initialization of pointer p) +$ git merge ubifs/linux-next +Auto-merging drivers/mtd/ubi/build.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 13 +++++++++++-- + drivers/mtd/ubi/fastmap.c | 5 ++--- + drivers/mtd/ubi/vmt.c | 15 ++++++++++----- + fs/ubifs/tnc.c | 21 +++++++-------------- + 4 files changed, 30 insertions(+), 24 deletions(-) +Merging xfs/for-next (b7e0b6ff54dd xfs: make iomap_begin functions trim iomaps consistently) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_ialloc.c | 10 +++------- + fs/xfs/libxfs/xfs_ialloc.h | 1 - + fs/xfs/scrub/scrub.c | 1 - + fs/xfs/scrub/trace.c | 1 - + fs/xfs/xfs_inode.c | 33 +++++++-------------------------- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_qm.c | 4 ++-- + fs/xfs/xfs_reflink.c | 2 -- + fs/xfs/xfs_symlink.c | 15 +-------------- + fs/xfs/xfs_trace.c | 1 - + 11 files changed, 15 insertions(+), 57 deletions(-) +Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (18c4468d431b Merge branch 'for-linus' into for-next) +$ git merge vfs/for-next +Resolved 'arch/alpha/include/uapi/asm/Kbuild' using previous resolution. +Resolved 'arch/mn10300/include/uapi/asm/Kbuild' using previous resolution. +Resolved 'arch/score/include/uapi/asm/Kbuild' using previous resolution. +Resolved 'drivers/net/ethernet/via/via-rhine.c' using previous resolution. +Resolved 'net/netfilter/xt_bpf.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging net/tipc/server.c +Auto-merging net/sunrpc/cache.c +Auto-merging net/socket.c +Auto-merging net/sctp/socket.c +Auto-merging net/rxrpc/af_rxrpc.c +Auto-merging net/packet/af_packet.c +Auto-merging net/netfilter/xt_bpf.c +CONFLICT (content): Merge conflict in net/netfilter/xt_bpf.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/dccp/proto.c +Auto-merging net/9p/trans_fd.c +Auto-merging mm/memcontrol.c +Auto-merging mm/gup.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/events/core.c +Auto-merging ipc/mqueue.c +Auto-merging include/net/tcp.h +Auto-merging include/net/sock.h +Auto-merging include/net/sctp/sctp.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/fs.h +Auto-merging include/crypto/if_alg.h +Auto-merging fs/proc_namespace.c +Auto-merging fs/proc/inode.c +Auto-merging fs/namei.c +Auto-merging drivers/xen/pvcalls-front.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/staging/lustre/lnet/lnet/lib-socket.c +Auto-merging drivers/s390/char/monreader.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/tap.c +Auto-merging drivers/net/ethernet/via/via-rhine.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/via/via-rhine.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/media/v4l2-core/videobuf2-v4l2.c +Auto-merging drivers/media/v4l2-core/videobuf2-core.c +Auto-merging drivers/media/v4l2-core/videobuf-core.c +Auto-merging drivers/media/v4l2-core/v4l2-mem2mem.c +Auto-merging drivers/media/radio/radio-wl1273.c +Auto-merging drivers/media/radio/radio-si476x.c +Auto-merging drivers/media/platform/sh_veu.c +Auto-merging drivers/media/dvb-core/dvb_frontend.c +Auto-merging drivers/media/dvb-core/dvb_ca_en50221.c +Auto-merging drivers/md/md.c +Auto-merging drivers/android/binder.c +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/af_alg.c +Removing arch/x86/include/uapi/asm/poll.h +Auto-merging arch/x86/include/uapi/asm/Kbuild +Removing arch/score/include/uapi/asm/poll.h +Auto-merging arch/score/include/uapi/asm/Kbuild +CONFLICT (content): Merge conflict in arch/score/include/uapi/asm/Kbuild +Removing arch/mn10300/include/uapi/asm/poll.h +Auto-merging arch/mn10300/include/uapi/asm/Kbuild +CONFLICT (content): Merge conflict in arch/mn10300/include/uapi/asm/Kbuild +Removing arch/m32r/include/uapi/asm/poll.h +Auto-merging arch/m32r/include/uapi/asm/Kbuild +Removing arch/ia64/include/uapi/asm/poll.h +Auto-merging arch/ia64/include/uapi/asm/Kbuild +Removing arch/alpha/include/uapi/asm/poll.h +Auto-merging arch/alpha/include/uapi/asm/Kbuild +CONFLICT (content): Merge conflict in arch/alpha/include/uapi/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48ded09a09e84e5792176c17bfdeeebbe544bdbe] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/asm-prototypes.h | 2 +- + arch/alpha/include/uapi/asm/Kbuild | 1 + + arch/alpha/include/uapi/asm/poll.h | 2 - + arch/blackfin/include/uapi/asm/poll.h | 21 ++- + arch/cris/arch-v10/drivers/gpio.c | 6 +- + arch/cris/arch-v10/drivers/sync_serial.c | 8 +- + arch/cris/arch-v32/drivers/cryptocop.c | 23 +-- + arch/cris/arch-v32/drivers/sync_serial.c | 8 +- + arch/frv/include/uapi/asm/poll.h | 21 ++- + arch/ia64/include/asm/asm-prototypes.h | 2 +- + arch/ia64/include/uapi/asm/Kbuild | 1 + + arch/ia64/include/uapi/asm/poll.h | 2 - + arch/ia64/kernel/perfmon.c | 4 +- + arch/m32r/include/uapi/asm/Kbuild | 1 + + arch/m32r/include/uapi/asm/poll.h | 2 - + arch/m68k/include/uapi/asm/poll.h | 19 ++- + arch/mips/include/asm/asm-prototypes.h | 2 +- + arch/mips/include/uapi/asm/poll.h | 19 ++- + arch/mips/kernel/rtlx.c | 4 +- + arch/mn10300/include/uapi/asm/Kbuild | 1 + + arch/mn10300/include/uapi/asm/poll.h | 2 - + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/platforms/cell/spufs/backing_ops.c | 6 +- + arch/powerpc/platforms/cell/spufs/file.c | 16 +- + arch/powerpc/platforms/cell/spufs/hw_ops.c | 5 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 3 +- + arch/powerpc/platforms/powernv/opal-prd.c | 2 +- + arch/riscv/kernel/process.c | 2 +- + arch/riscv/mm/fault.c | 1 - + arch/score/include/uapi/asm/Kbuild | 1 + + arch/score/include/uapi/asm/poll.h | 7 - + arch/sparc/include/asm/asm-prototypes.h | 2 +- + arch/sparc/include/uapi/asm/poll.h | 28 +++- + arch/um/Makefile | 7 + + arch/um/drivers/hostaudio_kern.c | 6 +- + arch/x86/include/uapi/asm/Kbuild | 1 + + arch/x86/include/uapi/asm/poll.h | 1 - + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 2 +- + arch/xtensa/include/uapi/asm/poll.h | 21 ++- + block/bsg.c | 4 +- + crypto/af_alg.c | 4 +- + crypto/algif_skcipher.c | 1 - + drivers/acpi/acpi_dbg.c | 4 +- + drivers/android/binder.c | 2 +- + drivers/block/drbd/drbd_main.c | 8 +- + drivers/block/drbd/drbd_receiver.c | 3 +- + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/char/apm-emulation.c | 2 +- + drivers/char/dsp56k.c | 2 +- + drivers/char/dtlk.c | 6 +- + drivers/char/hpet.c | 2 +- + drivers/char/ipmi/bt-bmc.c | 4 +- + drivers/char/ipmi/ipmi_devintf.c | 4 +- + drivers/char/ipmi/ipmi_watchdog.c | 4 +- + drivers/char/pcmcia/cm4040_cs.c | 4 +- + drivers/char/ppdev.c | 4 +- + drivers/char/random.c | 4 +- + drivers/char/rtc.c | 4 +- + drivers/char/snsc.c | 4 +- + drivers/char/sonypi.c | 2 +- + drivers/char/tpm/tpm_vtpm_proxy.c | 4 +- + drivers/char/virtio_console.c | 4 +- + drivers/char/xillybus/xillybus_core.c | 4 +- + drivers/dma-buf/dma-buf.c | 6 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 4 +- + drivers/firewire/nosy.c | 4 +- + drivers/gpio/gpiolib.c | 4 +- + drivers/gpu/drm/drm_file.c | 4 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/vga/vgaarb.c | 2 +- + drivers/hid/hid-debug.c | 2 +- + drivers/hid/hid-roccat.c | 2 +- + drivers/hid/hid-sensor-custom.c | 4 +- + drivers/hid/hidraw.c | 2 +- + drivers/hid/uhid.c | 2 +- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/hsi/clients/cmt_speech.c | 4 +- + drivers/hv/hv_utils_transport.c | 2 +- + drivers/iio/iio_core.h | 2 +- + drivers/iio/industrialio-buffer.c | 2 +- + drivers/iio/industrialio-event.c | 4 +- + drivers/infiniband/core/ucm.c | 4 +- + drivers/infiniband/core/ucma.c | 4 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 8 +- + drivers/infiniband/hw/hfi1/file_ops.c | 18 +-- + drivers/infiniband/hw/qib/qib_file_ops.c | 14 +- + drivers/input/evdev.c | 4 +- + drivers/input/input.c | 2 +- + drivers/input/joydev.c | 2 +- + drivers/input/misc/hp_sdc_rtc.c | 2 +- + drivers/input/misc/uinput.c | 2 +- + drivers/input/mousedev.c | 4 +- + drivers/input/serio/serio_raw.c | 4 +- + drivers/input/serio/userio.c | 2 +- + drivers/isdn/capi/capi.c | 4 +- + drivers/isdn/divert/divert_procfs.c | 4 +- + drivers/isdn/hardware/eicon/divamnt.c | 4 +- + drivers/isdn/hardware/eicon/divasi.c | 4 +- + drivers/isdn/hardware/eicon/divasmain.c | 2 +- + drivers/isdn/hardware/eicon/divasproc.c | 2 +- + drivers/isdn/hysdn/hysdn_proclog.c | 4 +- + drivers/isdn/i4l/isdn_common.c | 4 +- + drivers/isdn/i4l/isdn_ppp.c | 4 +- + drivers/isdn/i4l/isdn_ppp.h | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 22 ++- + drivers/isdn/mISDN/timerdev.c | 4 +- + drivers/leds/uleds.c | 2 +- + drivers/macintosh/smu.c | 4 +- + drivers/macintosh/via-pmu.c | 4 +- + drivers/mailbox/mailbox-test.c | 2 +- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/md.c | 4 +- + drivers/media/cec/cec-api.c | 4 +- + drivers/media/common/saa7146/saa7146_fops.c | 8 +- + drivers/media/common/siano/smsdvb-debugfs.c | 7 +- + drivers/media/dvb-core/dmxdev.c | 8 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 4 +- + drivers/media/dvb-core/dvb_frontend.c | 2 +- + drivers/media/firewire/firedtv-ci.c | 2 +- + drivers/media/media-devnode.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 12 +- + drivers/media/pci/cx18/cx18-fileops.c | 8 +- + drivers/media/pci/cx18/cx18-fileops.h | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 10 +- + drivers/media/pci/ivtv/ivtv-fileops.h | 4 +- + drivers/media/pci/meye/meye.c | 4 +- + drivers/media/pci/saa7134/saa7134-video.c | 4 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 6 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 4 +- + drivers/media/pci/ttpci/av7110_av.c | 8 +- + drivers/media/pci/ttpci/av7110_ca.c | 4 +- + drivers/media/pci/zoran/zoran_driver.c | 4 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- + drivers/media/platform/fsl-viu.c | 6 +- + drivers/media/platform/m2m-deinterlace.c | 4 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 4 +- + drivers/media/platform/s3c-camif/camif-capture.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 +- + drivers/media/platform/sh_veu.c | 2 +- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +- + drivers/media/platform/soc_camera/soc_camera.c | 4 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vivid/vivid-core.c | 2 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 2 +- + drivers/media/platform/vivid/vivid-radio-rx.h | 2 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 2 +- + drivers/media/platform/vivid/vivid-radio-tx.h | 2 +- + drivers/media/radio/radio-cadet.c | 6 +- + drivers/media/radio/radio-si476x.c | 6 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-common.c | 6 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +- + drivers/media/rc/lirc_dev.c | 4 +- + drivers/media/usb/cpia2/cpia2.h | 2 +- + drivers/media/usb/cpia2/cpia2_core.c | 4 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 6 +- + drivers/media/usb/gspca/gspca.c | 6 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 4 +- + drivers/media/usb/tm6000/tm6000-video.c | 10 +- + drivers/media/usb/uvc/uvc_queue.c | 4 +- + drivers/media/usb/uvc/uvc_v4l2.c | 2 +- + drivers/media/usb/uvc/uvcvideo.h | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- + drivers/media/v4l2-core/v4l2-dev.c | 4 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 10 +- + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + drivers/media/v4l2-core/videobuf-core.c | 6 +- + drivers/media/v4l2-core/videobuf2-core.c | 4 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +- + drivers/misc/cxl/api.c | 2 +- + drivers/misc/cxl/cxl.h | 2 +- + drivers/misc/cxl/file.c | 4 +- + drivers/misc/hpilo.c | 2 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 2 +- + drivers/misc/mei/main.c | 6 +- + drivers/misc/mic/scif/scif_api.c | 7 +- + drivers/misc/mic/scif/scif_epd.h | 2 +- + drivers/misc/mic/scif/scif_fd.c | 2 +- + drivers/misc/mic/vop/vop_vringh.c | 4 +- + drivers/misc/phantom.c | 4 +- + drivers/misc/vmw_vmci/vmci_host.c | 4 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 179 ++++++--------------- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.h | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 26 +-- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 4 +- + drivers/net/ethernet/brocade/bna/bfi.h | 94 +++++------ + drivers/net/ethernet/brocade/bna/bfi_enet.h | 96 +++++------ + drivers/net/ethernet/brocade/bna/bna.h | 2 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 34 ++-- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 15 +- + drivers/net/ieee802154/ca8210.c | 4 +- + drivers/net/ppp/ppp_async.c | 2 +- + drivers/net/ppp/ppp_generic.c | 4 +- + drivers/net/ppp/ppp_synctty.c | 2 +- + drivers/net/tap.c | 4 +- + drivers/net/tun.c | 4 +- + drivers/net/wan/cosa.c | 2 +- + drivers/net/wireless/cisco/airo.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- + drivers/pci/switch/switchtec.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 4 +- + drivers/platform/goldfish/goldfish_pipe.c | 4 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/pps/pps.c | 2 +- + drivers/ptp/ptp_chardev.c | 2 +- + drivers/ptp/ptp_private.h | 2 +- + drivers/rapidio/devices/rio_mport_cdev.c | 2 +- + drivers/rpmsg/qcom_smd.c | 4 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/rpmsg_internal.h | 2 +- + drivers/rtc/rtc-dev.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/char/monreader.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/sg.c | 6 +- + drivers/staging/comedi/comedi_fops.c | 4 +- + drivers/staging/comedi/drivers/serial2002.c | 2 +- + drivers/staging/irda/net/af_irda.c | 4 +- + drivers/staging/irda/net/irnet/irnet_ppp.c | 8 +- + drivers/staging/irda/net/irnet/irnet_ppp.h | 2 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 24 ++- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 2 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- + drivers/staging/media/lirc/lirc_zilog.c | 4 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/most/aim-cdev/cdev.c | 4 +- + drivers/staging/most/aim-v4l2/video.c | 4 +- + drivers/staging/speakup/speakup_soft.c | 4 +- + drivers/tty/n_gsm.c | 4 +- + drivers/tty/n_hdlc.c | 6 +- + drivers/tty/n_r3964.c | 6 +- + drivers/tty/n_tty.c | 4 +- + drivers/tty/tty_io.c | 8 +- + drivers/tty/vt/vc_screen.c | 4 +- + drivers/uio/uio.c | 2 +- + drivers/usb/class/cdc-wdm.c | 4 +- + drivers/usb/class/usblp.c | 4 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devices.c | 2 +- + drivers/usb/core/devio.c | 4 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_hid.c | 4 +- + drivers/usb/gadget/function/f_printer.c | 4 +- + drivers/usb/gadget/function/uvc_queue.c | 2 +- + drivers/usb/gadget/function/uvc_queue.h | 2 +- + drivers/usb/gadget/function/uvc_v4l2.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 4 +- + drivers/usb/misc/iowarrior.c | 4 +- + drivers/usb/misc/ldusb.c | 4 +- + drivers/usb/misc/legousbtower.c | 6 +- + drivers/usb/mon/mon_bin.c | 4 +- + drivers/vfio/virqfd.c | 4 +- + drivers/vhost/net.c | 2 +- + drivers/vhost/vhost.c | 12 +- + drivers/vhost/vhost.h | 6 +- + drivers/virt/fsl_hypervisor.c | 4 +- + drivers/xen/evtchn.c | 4 +- + drivers/xen/mcelog.c | 2 +- + drivers/xen/pvcalls-front.c | 10 +- + drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +- + fs/cachefiles/daemon.c | 6 +- + fs/coda/psdev.c | 4 +- + fs/dcache.c | 1 - + fs/debugfs/file.c | 4 +- + fs/dlm/lowcomms.c | 4 +- + fs/dlm/plock.c | 4 +- + fs/dlm/user.c | 2 +- + fs/ecryptfs/miscdev.c | 4 +- + fs/eventfd.c | 4 +- + fs/eventpoll.c | 28 ++-- + fs/fcntl.c | 4 +- + fs/file.c | 5 - + fs/file_table.c | 1 - + fs/fuse/dev.c | 4 +- + fs/fuse/file.c | 6 +- + fs/fuse/fuse_i.h | 2 +- + fs/kernfs/file.c | 2 +- + fs/namei.c | 21 +++ + fs/namespace.c | 1 + + fs/ncpfs/sock.c | 3 +- + fs/notify/fanotify/fanotify_user.c | 4 +- + fs/notify/inotify/inotify_user.c | 4 +- + fs/ocfs2/cluster/tcp.c | 3 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/orangefs/devorangefs-req.c | 6 +- + fs/pipe.c | 4 +- + fs/proc/inode.c | 6 +- + fs/proc/kmsg.c | 2 +- + fs/proc/proc_sysctl.c | 4 +- + fs/proc_namespace.c | 4 +- + fs/select.c | 27 ++-- + fs/signalfd.c | 4 +- + fs/super.c | 37 +++-- + fs/timerfd.c | 4 +- + fs/userfaultfd.c | 4 +- + include/crypto/if_alg.h | 2 +- + include/drm/drm_file.h | 2 +- + include/linux/bpf.h | 10 ++ + include/linux/dma-buf.h | 2 +- + include/linux/fs.h | 6 +- + include/linux/net.h | 2 +- + include/linux/poll.h | 10 +- + include/linux/posix-clock.h | 2 +- + include/linux/ring_buffer.h | 2 +- + include/linux/rpmsg.h | 4 +- + include/linux/scif.h | 4 +- + include/linux/skbuff.h | 2 +- + include/linux/tty_ldisc.h | 2 +- + include/linux/wait.h | 10 +- + include/media/lirc_dev.h | 2 +- + include/media/media-devnode.h | 2 +- + include/media/soc_camera.h | 2 +- + include/media/v4l2-ctrls.h | 2 +- + include/media/v4l2-dev.h | 2 +- + include/media/v4l2-mem2mem.h | 4 +- + include/media/videobuf-core.h | 2 +- + include/media/videobuf2-core.h | 2 +- + include/media/videobuf2-v4l2.h | 5 +- + include/misc/cxl.h | 2 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/inet_connection_sock.h | 2 +- + include/net/iucv/af_iucv.h | 2 +- + include/net/sctp/sctp.h | 2 +- + include/net/sock.h | 2 +- + include/net/tcp.h | 2 +- + include/net/udp.h | 2 +- + include/sound/hwdep.h | 2 +- + include/sound/info.h | 2 +- + include/uapi/asm-generic/poll.h | 44 +++-- + include/uapi/linux/types.h | 6 + + ipc/mqueue.c | 175 +++++++------------- + kernel/bpf/inode.c | 90 +++++++---- + kernel/bpf/syscall.c | 2 +- + kernel/events/core.c | 4 +- + kernel/printk/printk.c | 4 +- + kernel/relay.c | 4 +- + kernel/time/posix-clock.c | 4 +- + kernel/trace/ring_buffer.c | 2 +- + kernel/trace/trace.c | 6 +- + mm/gup.c | 46 ++---- + mm/memcontrol.c | 2 +- + mm/swapfile.c | 2 +- + net/9p/trans_fd.c | 60 +++---- + net/atm/common.c | 4 +- + net/atm/common.h | 2 +- + net/batman-adv/icmp_socket.c | 2 +- + net/batman-adv/log.c | 2 +- + net/bluetooth/af_bluetooth.c | 6 +- + net/caif/caif_socket.c | 4 +- + net/core/datagram.c | 8 +- + net/core/sock.c | 2 +- + net/dccp/dccp.h | 2 +- + net/dccp/proto.c | 4 +- + net/decnet/af_decnet.c | 4 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/udp.c | 4 +- + net/iucv/af_iucv.c | 6 +- + net/netfilter/ipvs/ip_vs_sync.c | 9 +- + net/netfilter/xt_bpf.c | 17 +- + net/nfc/llcp_sock.c | 6 +- + net/nfc/nci/uart.c | 2 +- + net/packet/af_packet.c | 4 +- + net/phonet/socket.c | 4 +- + net/rds/af_rds.c | 4 +- + net/rfkill/core.c | 4 +- + net/rxrpc/af_rxrpc.c | 4 +- + net/sctp/socket.c | 4 +- + net/smc/af_smc.c | 6 +- + net/smc/smc_clc.c | 18 ++- + net/socket.c | 6 +- + net/sunrpc/cache.c | 8 +- + net/sunrpc/rpc_pipe.c | 4 +- + net/sunrpc/svcsock.c | 4 +- + net/tipc/server.c | 4 +- + net/tipc/socket.c | 4 +- + net/unix/af_unix.c | 15 +- + net/vmw_vsock/af_vsock.c | 4 +- + security/apparmor/apparmorfs.c | 4 +- + security/tomoyo/audit.c | 2 +- + security/tomoyo/common.c | 4 +- + security/tomoyo/common.h | 6 +- + security/tomoyo/securityfs_if.c | 2 +- + sound/core/compress_offload.c | 6 +- + sound/core/control.c | 4 +- + sound/core/hwdep.c | 2 +- + sound/core/info.c | 4 +- + sound/core/init.c | 2 +- + sound/core/oss/pcm_oss.c | 4 +- + sound/core/pcm_native.c | 8 +- + sound/core/rawmidi.c | 4 +- + sound/core/seq/oss/seq_oss.c | 4 +- + sound/core/seq/oss/seq_oss_device.h | 2 +- + sound/core/seq/oss/seq_oss_rw.c | 4 +- + sound/core/seq/seq_clientmgr.c | 4 +- + sound/core/timer.c | 4 +- + sound/firewire/bebob/bebob_hwdep.c | 4 +- + sound/firewire/dice/dice-hwdep.c | 4 +- + sound/firewire/digi00x/digi00x-hwdep.c | 4 +- + sound/firewire/fireface/ff-hwdep.c | 4 +- + sound/firewire/fireworks/fireworks_hwdep.c | 4 +- + sound/firewire/motu/motu-hwdep.c | 4 +- + sound/firewire/oxfw/oxfw-hwdep.c | 4 +- + sound/firewire/tascam/tascam-hwdep.c | 4 +- + sound/oss/dmasound/dmasound_core.c | 4 +- + sound/usb/mixer_quirks.c | 2 +- + sound/usb/usx2y/us122l.c | 4 +- + sound/usb/usx2y/usX2Yhwdep.c | 4 +- + virt/kvm/eventfd.c | 4 +- + virt/kvm/kvm_main.c | 43 ++--- + 439 files changed, 1404 insertions(+), 1434 deletions(-) + delete mode 100644 arch/alpha/include/uapi/asm/poll.h + delete mode 100644 arch/ia64/include/uapi/asm/poll.h + delete mode 100644 arch/m32r/include/uapi/asm/poll.h + delete mode 100644 arch/mn10300/include/uapi/asm/poll.h + delete mode 100644 arch/score/include/uapi/asm/poll.h + delete mode 100644 arch/x86/include/uapi/asm/poll.h +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 (926adbad7320 Merge commit 'da6af54dc0014d733ce014a196e4c84ee43cabec' into for-4.16-deprecate-printk-pf) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Auto-merging kernel/module.c +Auto-merging kernel/kallsyms.c +Auto-merging include/linux/kallsyms.h +Auto-merging arch/powerpc/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/kernel/module_64.c +Merge made by the 'recursive' strategy. + Documentation/printk-formats.txt | 34 +++++++------------ + arch/ia64/include/asm/sections.h | 10 +++++- + arch/ia64/kernel/module.c | 12 +++++++ + arch/ia64/kernel/vmlinux.lds.S | 2 ++ + arch/parisc/boot/compressed/vmlinux.lds.S | 2 ++ + arch/parisc/include/asm/sections.h | 6 ++++ + arch/parisc/kernel/module.c | 16 +++++++++ + arch/parisc/kernel/process.c | 9 ++++++ + arch/parisc/kernel/vmlinux.lds.S | 2 ++ + arch/powerpc/include/asm/module.h | 3 ++ + arch/powerpc/include/asm/sections.h | 12 +++++++ + arch/powerpc/kernel/module_64.c | 14 ++++++++ + arch/powerpc/kernel/vmlinux.lds.S | 2 ++ + include/asm-generic/sections.h | 8 +++-- + include/linux/kallsyms.h | 54 +++++++++++++++++++++++++++++++ + include/linux/module.h | 10 ++++++ + kernel/kallsyms.c | 35 -------------------- + kernel/module.c | 6 ++++ + kernel/sched/autogroup.c | 5 ++- + lib/vsprintf.c | 5 ++- + scripts/checkpatch.pl | 11 +++++-- + 21 files changed, 190 insertions(+), 68 deletions(-) +Merging pci/next (329c863b0c1d Merge branch 'pci/virtualization' into next) +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/switch/switchtec.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + arch/alpha/kernel/console.c | 1 + + arch/arm/include/asm/pci.h | 5 +- + arch/arm/kernel/bios32.c | 2 +- + arch/mips/jazz/setup.c | 8 +- + arch/mips/mti-malta/malta-setup.c | 10 +- + arch/powerpc/kernel/pci-hotplug.c | 20 +- + arch/powerpc/kernel/pci_of_scan.c | 7 +- + arch/powerpc/platforms/maple/time.c | 2 +- + arch/powerpc/sysdev/i8259.c | 6 +- + arch/x86/pci/xen.c | 4 +- + drivers/irqchip/irq-i8259.c | 4 +- + drivers/pci/host/pci-host-common.c | 2 +- + drivers/pci/host/pci-tegra.c | 2 +- + drivers/pci/host/pci-versatile.c | 2 +- + drivers/pci/host/pcie-rcar.c | 2 +- + drivers/pci/pci-sysfs.c | 9 +- + drivers/pci/pci.h | 54 ++-- + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- + drivers/pci/pcie/aspm.c | 71 ++-- + drivers/pci/probe.c | 263 +++++++++------ + drivers/pci/rom.c | 4 +- + drivers/pci/switch/switchtec.c | 3 + + drivers/video/console/vgacon.c | 34 +- + include/linux/pci.h | 413 +++++++++++------------- + include/linux/switchtec.h | 3 + + include/uapi/linux/switchtec_ioctl.h | 3 +- + kernel/resource.c | 29 +- + 28 files changed, 538 insertions(+), 434 deletions(-) +Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/platform.c | 1 - + 1 file changed, 1 deletion(-) +Merging hid/for-next (421f664d5eb4 Merge branch 'for-4.16/hid-quirks-cleanup/pixart' into for-next) +$ git merge hid/for-next +Auto-merging net/bluetooth/hidp/core.c +Removing drivers/hid/usbhid/hid-quirks.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 2 +- + Documentation/input/multi-touch-protocol.rst | 9 +- + drivers/hid/Kconfig | 11 + + drivers/hid/Makefile | 3 +- + drivers/hid/hid-asus.c | 24 +- + drivers/hid/hid-core.c | 934 +-------------- + drivers/hid/hid-cp2112.c | 15 +- + drivers/hid/hid-elo.c | 6 + + drivers/hid/hid-generic.c | 68 +- + drivers/hid/hid-holtekff.c | 8 +- + drivers/hid/hid-ids.h | 4 +- + drivers/hid/hid-jabra.c | 58 + + drivers/hid/hid-multitouch.c | 137 ++- + drivers/hid/hid-quirks.c | 1263 ++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 18 +- + drivers/hid/usbhid/Makefile | 2 +- + drivers/hid/usbhid/hid-core.c | 11 +- + drivers/hid/usbhid/hid-quirks.c | 402 ------- + drivers/hid/wacom_sys.c | 110 ++ + drivers/hid/wacom_wac.c | 43 +- + drivers/hid/wacom_wac.h | 6 + + include/linux/hid.h | 22 +- + net/bluetooth/hidp/core.c | 2 +- + 23 files changed, 1821 insertions(+), 1337 deletions(-) + create mode 100644 drivers/hid/hid-jabra.c + create mode 100644 drivers/hid/hid-quirks.c + delete mode 100644 drivers/hid/usbhid/hid-quirks.c +Merging i2c/i2c/for-next (7f361814eb1f Merge branch 'i2c/for-4.16' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/i2c/DMA-considerations | 67 ++++++++++ + Documentation/i2c/gpio-fault-injection | 54 ++++++++ + drivers/i2c/busses/Kconfig | 8 ++ + drivers/i2c/busses/i2c-cht-wc.c | 2 +- + drivers/i2c/busses/i2c-davinci.c | 20 ++- + drivers/i2c/busses/i2c-designware-common.c | 20 ++- + drivers/i2c/busses/i2c-designware-core.h | 2 + + drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 29 +---- + drivers/i2c/busses/i2c-designware-slave.c | 64 --------- + drivers/i2c/busses/i2c-gpio.c | 111 ++++++++++++++++ + drivers/i2c/busses/i2c-imx.c | 20 +-- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 88 ++++--------- + drivers/i2c/busses/i2c-stm32.h | 3 +- + drivers/i2c/busses/i2c-stm32f4.c | 3 +- + drivers/i2c/busses/i2c-stm32f7.c | 3 +- + drivers/i2c/i2c-core-base.c | 195 +++++++++++----------------- + drivers/i2c/i2c-core-smbus.c | 45 ++++++- + drivers/i2c/i2c-dev.c | 2 + + drivers/misc/eeprom/at24.c | 26 ++-- + include/linux/i2c.h | 86 ++++++++++-- + include/uapi/linux/i2c.h | 3 + + 24 files changed, 583 insertions(+), 329 deletions(-) + create mode 100644 Documentation/i2c/DMA-considerations + create mode 100644 Documentation/i2c/gpio-fault-injection +Merging dmi/master (0bcea5c474d1 firmware: dmi: handle missing DMI data gracefully) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/dmi_scan.c | 64 +++++++++++++++++++------------------------- + 2 files changed, 29 insertions(+), 37 deletions(-) +Merging hwmon-staging/hwmon-next (ccdb35594d7b hwmon: (w83773g) Fix fault detection and reporting) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm25066 | 20 +-- + Documentation/hwmon/max31785 | 15 +- + Documentation/hwmon/w83773g | 33 ++++ + drivers/hwmon/Kconfig | 26 ++-- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/coretemp.c | 3 +- + drivers/hwmon/hih6130.c | 2 +- + drivers/hwmon/hwmon.c | 33 ++-- + drivers/hwmon/iio_hwmon.c | 3 +- + drivers/hwmon/ina2xx.c | 87 ++++++----- + drivers/hwmon/pmbus/lm25066.c | 67 +------- + drivers/hwmon/pmbus/max31785.c | 294 +++++++++++++++++++++++++++++++++- + drivers/hwmon/pmbus/pmbus.h | 41 ++++- + drivers/hwmon/pmbus/pmbus_core.c | 265 +++++++++++++++++++++++++++---- + drivers/hwmon/sht15.c | 1 + + drivers/hwmon/sht21.c | 2 +- + drivers/hwmon/w83773g.c | 329 +++++++++++++++++++++++++++++++++++++++ + 17 files changed, 1040 insertions(+), 182 deletions(-) + create mode 100644 Documentation/hwmon/w83773g + create mode 100644 drivers/hwmon/w83773g.c +Merging jc_docs/docs-next (241f67c8cccc Documentation/process: Add CONFIG default value to submit-checklist) +$ git merge jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/admin-guide/mono.rst | 6 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/kernel-api.rst | 15 ++ + Documentation/core-api/refcount-vs-atomic.rst | 150 +++++++++++++++++ + Documentation/driver-api/basics.rst | 21 ++- + .../driver-api/usb/writing_usb_driver.rst | 2 +- + Documentation/index.rst | 1 + + Documentation/kbuild/kconfig-language.txt | 21 +++ + Documentation/kernel-hacking/hacking.rst | 2 +- + Documentation/maintainer/conf.py | 10 ++ + Documentation/maintainer/configure-git.rst | 34 ++++ + Documentation/maintainer/index.rst | 14 ++ + Documentation/maintainer/pull-requests.rst | 178 +++++++++++++++++++++ + Documentation/process/submit-checklist.rst | 4 +- + Documentation/sysctl/kernel.txt | 14 ++ + Documentation/usb/chipidea.txt | 12 +- + include/linux/refcount.h | 2 +- + lib/uuid.c | 34 ++-- + scripts/kernel-doc | 8 +- + 20 files changed, 494 insertions(+), 38 deletions(-) + create mode 100644 Documentation/core-api/refcount-vs-atomic.rst + create mode 100644 Documentation/maintainer/conf.py + create mode 100644 Documentation/maintainer/configure-git.rst + create mode 100644 Documentation/maintainer/index.rst + create mode 100644 Documentation/maintainer/pull-requests.rst +Merging v4l-dvb/master (330dada5957e media: dvb_frontend: fix return error code) +$ git merge v4l-dvb/master +Auto-merging drivers/media/usb/uvc/uvcvideo.h +Auto-merging drivers/media/usb/tm6000/tm6000-video.c +Auto-merging drivers/media/usb/stkwebcam/stk-webcam.c +Auto-merging drivers/media/usb/gspca/gspca.c +Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c +Auto-merging drivers/media/radio/radio-si476x.c +Auto-merging drivers/media/platform/vivid/vivid-radio-tx.c +Auto-merging drivers/media/platform/vivid/vivid-radio-rx.c +Auto-merging drivers/media/platform/vivid/vivid-core.c +Auto-merging drivers/media/pci/ddbridge/ddbridge-max.h +Auto-merging drivers/media/pci/ddbridge/ddbridge-max.c +Auto-merging drivers/media/pci/ddbridge/ddbridge-core.c +Auto-merging drivers/media/dvb-core/dvb_frontend.c +Auto-merging drivers/media/common/siano/smsdvb-debugfs.c +Auto-merging drivers/media/cec/cec-api.c +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/media/i2c/toshiba,et8ek8.txt | 7 + + .../bindings/media/xilinx/xlnx,v-tpg.txt | 2 +- + Documentation/media/kapi/cec-core.rst | 14 + + MAINTAINERS | 8 + + arch/arm/boot/dts/omap3-n900.dts | 2 + + drivers/media/cec/cec-adap.c | 25 +- + drivers/media/cec/cec-api.c | 32 +- + drivers/media/cec/cec-core.c | 15 +- + drivers/media/cec/cec-priv.h | 2 + + drivers/media/common/saa7146/saa7146_video.c | 9 +- + drivers/media/common/siano/smsdvb-debugfs.c | 21 +- + drivers/media/common/siano/smsir.c | 35 +- + drivers/media/common/siano/smsir.h | 37 +- + drivers/media/dvb-core/dvb_frontend.c | 4 +- + drivers/media/dvb-frontends/cxd2841er.c | 15 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 10 +- + drivers/media/dvb-frontends/drxd_hard.c | 22 +- + drivers/media/dvb-frontends/m88rs2000.c | 11 +- + drivers/media/dvb-frontends/mb86a16.c | 13 +- + drivers/media/dvb-frontends/mxl5xx.c | 9 +- + drivers/media/dvb-frontends/si2165.c | 609 +++++++++++++-------- + drivers/media/dvb-frontends/si2165.h | 37 +- + drivers/media/dvb-frontends/si2165_priv.h | 114 +++- + drivers/media/dvb-frontends/stv090x.c | 9 +- + drivers/media/dvb-frontends/stv0910.c | 13 + + drivers/media/i2c/adv7180.c | 12 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 1 + + drivers/media/i2c/adv748x/adv748x-core.c | 16 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 13 +- + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/adv7604.c | 1 + + drivers/media/i2c/cx25840/cx25840-core.c | 9 +- + drivers/media/i2c/imx274.c | 2 + + drivers/media/i2c/mt9v011.c | 13 +- + drivers/media/i2c/mt9v032.c | 21 +- + drivers/media/i2c/ov7670.c | 48 +- + drivers/media/i2c/ov9650.c | 10 +- + drivers/media/i2c/saa7115.c | 58 +- + drivers/media/i2c/saa711x_regs.h | 14 +- + drivers/media/i2c/tvp5150.c | 13 +- + drivers/media/i2c/tvp5150_reg.h | 5 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 4 +- + drivers/media/pci/cx23885/cx23885-input.c | 15 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 4 +- + drivers/media/pci/ddbridge/Makefile | 4 +- + drivers/media/pci/ddbridge/ddbridge-ci.c | 350 ++++++++++++ + drivers/media/pci/ddbridge/ddbridge-ci.h | 30 + + drivers/media/pci/ddbridge/ddbridge-core.c | 494 +++-------------- + drivers/media/pci/ddbridge/ddbridge-hw.c | 8 +- + drivers/media/pci/ddbridge/ddbridge-i2c.c | 16 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 23 +- + .../ddbridge/{ddbridge-maxs8.c => ddbridge-max.c} | 54 +- + .../ddbridge/{ddbridge-maxs8.h => ddbridge-max.h} | 12 +- + drivers/media/pci/ddbridge/ddbridge-regs.h | 32 +- + drivers/media/pci/ddbridge/ddbridge.h | 91 ++- + drivers/media/pci/pt1/pt1.c | 17 +- + drivers/media/pci/pt3/pt3_i2c.c | 1 - + drivers/media/pci/saa7146/hexium_gemini.c | 3 +- + drivers/media/pci/saa7146/hexium_orion.c | 3 +- + drivers/media/pci/saa7146/mxb.c | 3 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 17 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 + + drivers/media/pci/zoran/videocodec.c | 1 - + drivers/media/platform/atmel/atmel-isc.c | 4 +- + drivers/media/platform/coda/coda_regs.h | 1 - + drivers/media/platform/davinci/vpif_capture.c | 2 + + drivers/media/platform/exynos4-is/fimc-lite.c | 5 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 3 + + drivers/media/platform/qcom/venus/core.h | 4 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 73 +-- + drivers/media/platform/qcom/venus/hfi_helper.h | 4 +- + drivers/media/platform/qcom/venus/venc.c | 48 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 59 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 4 + + drivers/media/platform/tegra-cec/tegra_cec.c | 5 + + drivers/media/platform/vimc/vimc-common.h | 5 + + drivers/media/platform/vimc/vimc-sensor.c | 63 ++- + drivers/media/platform/vivid/vivid-core.c | 2 +- + drivers/media/platform/vivid/vivid-core.h | 2 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 11 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 8 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 2 +- + drivers/media/platform/vivid/vivid-rds-gen.h | 1 + + drivers/media/platform/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/platform/vsp1/vsp1_drv.c | 16 +- + drivers/media/radio/radio-si476x.c | 16 +- + drivers/media/rc/ir-nec-decoder.c | 19 +- + drivers/media/rc/ir-rc5-decoder.c | 21 +- + drivers/media/rc/ir-sanyo-decoder.c | 37 +- + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 17 +- + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 17 +- + drivers/media/rc/keymaps/rc-asus-pc39.c | 17 +- + drivers/media/rc/keymaps/rc-asus-ps3-100.c | 17 +- + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 15 +- + drivers/media/rc/keymaps/rc-avermedia.c | 17 +- + drivers/media/rc/keymaps/rc-avertv-303.c | 17 +- + drivers/media/rc/keymaps/rc-behold-columbus.c | 17 +- + drivers/media/rc/keymaps/rc-behold.c | 17 +- + drivers/media/rc/keymaps/rc-budget-ci-old.c | 17 +- + drivers/media/rc/keymaps/rc-cinergy-1400.c | 17 +- + drivers/media/rc/keymaps/rc-cinergy.c | 17 +- + drivers/media/rc/keymaps/rc-dib0700-nec.c | 27 +- + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 27 +- + drivers/media/rc/keymaps/rc-dm1105-nec.c | 17 +- + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 17 +- + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 17 +- + drivers/media/rc/keymaps/rc-em-terratec.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv2.c | 17 +- + drivers/media/rc/keymaps/rc-evga-indtube.c | 17 +- + drivers/media/rc/keymaps/rc-eztv.c | 17 +- + drivers/media/rc/keymaps/rc-flydvb.c | 17 +- + drivers/media/rc/keymaps/rc-flyvideo.c | 17 +- + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 17 +- + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 17 +- + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 17 +- + drivers/media/rc/keymaps/rc-gotview7135.c | 17 +- + drivers/media/rc/keymaps/rc-hauppauge.c | 29 +- + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 17 +- + drivers/media/rc/keymaps/rc-kaiomy.c | 17 +- + drivers/media/rc/keymaps/rc-kworld-315u.c | 17 +- + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 17 +- + drivers/media/rc/keymaps/rc-manli.c | 17 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 17 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 17 +- + drivers/media/rc/keymaps/rc-nebula.c | 17 +- + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 17 +- + drivers/media/rc/keymaps/rc-norwood.c | 17 +- + drivers/media/rc/keymaps/rc-npgtech.c | 17 +- + drivers/media/rc/keymaps/rc-pctv-sedna.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-color.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-002t.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-new.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview.c | 17 +- + .../media/rc/keymaps/rc-powercolor-real-angel.c | 17 +- + drivers/media/rc/keymaps/rc-proteus-2309.c | 17 +- + drivers/media/rc/keymaps/rc-purpletv.c | 17 +- + drivers/media/rc/keymaps/rc-pv951.c | 17 +- + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 17 +- + drivers/media/rc/keymaps/rc-tbs-nec.c | 17 +- + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 17 +- + drivers/media/rc/keymaps/rc-tevii-nec.c | 17 +- + drivers/media/rc/keymaps/rc-tt-1500.c | 17 +- + drivers/media/rc/keymaps/rc-videomate-s350.c | 17 +- + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 17 +- + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 17 +- + drivers/media/rc/keymaps/rc-winfast.c | 17 +- + drivers/media/rc/rc-core-priv.h | 18 +- + drivers/media/rc/rc-ir-raw.c | 17 +- + drivers/media/rc/rc-main.c | 19 +- + drivers/media/tuners/mxl5005s.c | 17 +- + drivers/media/tuners/qt1010.c | 4 +- + drivers/media/tuners/r820t.c | 56 +- + drivers/media/tuners/tda8290.c | 2 +- + drivers/media/tuners/tea5761.c | 15 +- + drivers/media/tuners/tea5767.c | 21 +- + drivers/media/tuners/tuner-xc2028-types.h | 5 +- + drivers/media/tuners/tuner-xc2028.c | 18 +- + drivers/media/tuners/tuner-xc2028.h | 5 +- + drivers/media/tuners/xc4000.c | 5 +- + drivers/media/tuners/xc5000.c | 22 +- + drivers/media/usb/au0828/au0828-input.c | 25 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 28 + + drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-input.c | 28 +- + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 39 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 9 +- + drivers/media/usb/dvb-usb/cxusb.c | 8 +- + drivers/media/usb/dvb-usb/friio-fe.c | 5 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 3 +- + drivers/media/usb/gspca/autogain_functions.c | 16 +- + drivers/media/usb/gspca/benq.c | 8 +- + drivers/media/usb/gspca/conex.c | 13 +- + drivers/media/usb/gspca/cpia1.c | 74 +-- + drivers/media/usb/gspca/dtcs033.c | 28 +- + drivers/media/usb/gspca/etoms.c | 38 +- + drivers/media/usb/gspca/finepix.c | 4 +- + drivers/media/usb/gspca/gl860/gl860.c | 37 +- + drivers/media/usb/gspca/gspca.c | 153 +++--- + drivers/media/usb/gspca/gspca.h | 9 +- + drivers/media/usb/gspca/jeilinj.c | 19 +- + drivers/media/usb/gspca/jl2005bcd.c | 45 +- + drivers/media/usb/gspca/kinect.c | 11 +- + drivers/media/usb/gspca/konica.c | 28 +- + drivers/media/usb/gspca/m5602/m5602_core.c | 34 +- + drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 21 +- + drivers/media/usb/gspca/m5602/m5602_ov7660.c | 11 +- + drivers/media/usb/gspca/m5602/m5602_ov9650.c | 26 +- + drivers/media/usb/gspca/m5602/m5602_po1030.c | 27 +- + drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 16 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 2 +- + drivers/media/usb/gspca/mars.c | 4 +- + drivers/media/usb/gspca/mr97310a.c | 29 +- + drivers/media/usb/gspca/nw80x.c | 24 +- + drivers/media/usb/gspca/ov519.c | 155 +++--- + drivers/media/usb/gspca/ov534.c | 25 +- + drivers/media/usb/gspca/ov534_9.c | 23 +- + drivers/media/usb/gspca/pac207.c | 16 +- + drivers/media/usb/gspca/pac7302.c | 2 +- + drivers/media/usb/gspca/pac7311.c | 2 +- + drivers/media/usb/gspca/pac_common.h | 7 +- + drivers/media/usb/gspca/sn9c2028.c | 34 +- + drivers/media/usb/gspca/sn9c2028.h | 7 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sonixj.c | 58 +- + drivers/media/usb/gspca/spca1528.c | 17 +- + drivers/media/usb/gspca/spca500.c | 66 +-- + drivers/media/usb/gspca/spca501.c | 10 +- + drivers/media/usb/gspca/spca505.c | 6 +- + drivers/media/usb/gspca/spca506.c | 16 +- + drivers/media/usb/gspca/spca508.c | 20 +- + drivers/media/usb/gspca/spca561.c | 20 +- + drivers/media/usb/gspca/sq905.c | 16 +- + drivers/media/usb/gspca/sq905c.c | 37 +- + drivers/media/usb/gspca/sq930x.c | 29 +- + drivers/media/usb/gspca/stk014.c | 6 +- + drivers/media/usb/gspca/stk1135.c | 15 +- + drivers/media/usb/gspca/stv0680.c | 36 +- + drivers/media/usb/gspca/stv06xx/stv06xx.c | 74 +-- + drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c | 10 +- + drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 23 +- + drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 16 +- + drivers/media/usb/gspca/sunplus.c | 36 +- + drivers/media/usb/gspca/t613.c | 24 +- + drivers/media/usb/gspca/topro.c | 6 +- + drivers/media/usb/gspca/touptek.c | 89 +-- + drivers/media/usb/gspca/vc032x.c | 51 +- + drivers/media/usb/gspca/w996Xcf.c | 9 +- + drivers/media/usb/gspca/xirlink_cit.c | 32 +- + drivers/media/usb/gspca/zc3xx.c | 83 +-- + drivers/media/usb/hdpvr/hdpvr-core.c | 26 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 12 + + drivers/media/usb/s2255/s2255drv.c | 13 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 18 +- + drivers/media/usb/tm6000/tm6000-cards.c | 20 +- + drivers/media/usb/tm6000/tm6000-core.c | 24 +- + drivers/media/usb/tm6000/tm6000-i2c.c | 24 +- + drivers/media/usb/tm6000/tm6000-regs.h | 18 +- + drivers/media/usb/tm6000/tm6000-stds.c | 18 +- + drivers/media/usb/tm6000/tm6000-usb-isoc.h | 18 +- + drivers/media/usb/tm6000/tm6000-video.c | 24 +- + drivers/media/usb/tm6000/tm6000.h | 24 +- + drivers/media/usb/usbvision/usbvision-video.c | 3 +- + drivers/media/usb/uvc/uvc_driver.c | 5 + + drivers/media/usb/uvc/uvc_status.c | 5 +- + drivers/media/usb/uvc/uvc_video.c | 5 +- + drivers/media/usb/uvc/uvcvideo.h | 5 + + drivers/staging/media/imx/imx-media-capture.c | 6 - + drivers/staging/media/imx/imx-media-csi.c | 12 +- + drivers/staging/media/imx/imx-media-dev.c | 7 +- + drivers/staging/media/imx/imx-media-fim.c | 30 +- + drivers/staging/media/imx/imx-media.h | 18 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 4 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + include/linux/led-class-flash.h | 4 + + include/media/cec.h | 13 + + 270 files changed, 3357 insertions(+), 3215 deletions(-) + create mode 100644 drivers/media/pci/ddbridge/ddbridge-ci.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-ci.h + rename drivers/media/pci/ddbridge/{ddbridge-maxs8.c => ddbridge-max.c} (92%) + rename drivers/media/pci/ddbridge/{ddbridge-maxs8.h => ddbridge-max.h} (73%) +Merging v4l-dvb-next/master (ba815f198ca2 media: RC docs: add enum rc_proto description at the docs) +$ git merge v4l-dvb-next/master +Resolved 'drivers/media/rc/lirc_dev.c' using previous resolution. +CONFLICT (modify/delete): include/media/lirc_dev.h deleted in v4l-dvb-next/master and modified in HEAD. Version HEAD of include/media/lirc_dev.h left in tree. +Removing include/media/lirc.h +Auto-merging include/media/cec.h +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_zilog.c deleted in v4l-dvb-next/master and modified in HEAD. Version HEAD of drivers/staging/media/lirc/lirc_zilog.c left in tree. +Removing drivers/staging/media/lirc/TODO +Removing drivers/staging/media/lirc/Makefile +Removing drivers/staging/media/lirc/Kconfig +Auto-merging drivers/media/usb/hdpvr/hdpvr-core.c +Auto-merging drivers/media/rc/rc-main.c +Auto-merging drivers/media/rc/rc-ir-raw.c +Auto-merging drivers/media/rc/rc-core-priv.h +Auto-merging drivers/media/rc/lirc_dev.c +CONFLICT (content): Merge conflict in drivers/media/rc/lirc_dev.c +Auto-merging drivers/media/rc/ir-sanyo-decoder.c +Auto-merging drivers/media/rc/ir-rc5-decoder.c +Auto-merging drivers/media/rc/ir-nec-decoder.c +Removing drivers/media/rc/ir-lirc-codec.c +Auto-merging drivers/media/cec/cec-core.c +Auto-merging drivers/media/cec/cec-adap.c +Auto-merging MAINTAINERS +Removing Documentation/media/uapi/rc/lirc-get-length.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/media/lirc_dev.h drivers/staging/media/lirc/lirc_zilog.c +drivers/staging/media/lirc/lirc_zilog.c: needs merge +include/media/lirc_dev.h: needs merge +rm 'drivers/staging/media/lirc/lirc_zilog.c' +rm 'include/media/lirc_dev.h' +$ git commit -v -a +[master 3ad731d278f4701251c8dfb16d45f6d3bc6b158a] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/media/kapi/rc-core.rst | 5 - + Documentation/media/lirc.h.rst.exceptions | 31 + + Documentation/media/uapi/rc/lirc-dev-intro.rst | 75 +- + Documentation/media/uapi/rc/lirc-func.rst | 1 - + Documentation/media/uapi/rc/lirc-get-features.rst | 17 +- + Documentation/media/uapi/rc/lirc-get-length.rst | 44 - + Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 5 +- + Documentation/media/uapi/rc/lirc-get-send-mode.rst | 2 +- + Documentation/media/uapi/rc/lirc-read.rst | 15 +- + Documentation/media/uapi/rc/lirc-write.rst | 19 +- + MAINTAINERS | 6 - + drivers/media/cec/cec-adap.c | 56 +- + drivers/media/cec/cec-core.c | 12 - + drivers/media/i2c/ir-kbd-i2c.c | 540 ++++++- + drivers/media/pci/cx18/cx18-cards.h | 8 +- + drivers/media/pci/cx18/cx18-i2c.c | 13 +- + drivers/media/pci/ivtv/ivtv-cards.h | 22 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 20 +- + drivers/media/pci/saa7134/saa7134-input.c | 3 +- + drivers/media/rc/Kconfig | 29 +- + drivers/media/rc/Makefile | 5 +- + drivers/media/rc/imon.c | 27 +- + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-lirc-codec.c | 448 ------ + drivers/media/rc/ir-mce_kbd-decoder.c | 12 +- + drivers/media/rc/ir-nec-decoder.c | 1 + + drivers/media/rc/ir-rc5-decoder.c | 1 + + drivers/media/rc/ir-rc6-decoder.c | 1 + + drivers/media/rc/ir-sanyo-decoder.c | 1 + + drivers/media/rc/ir-sharp-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/lirc_dev.c | 982 ++++++++---- + drivers/media/rc/rc-core-priv.h | 52 +- + drivers/media/rc/rc-ir-raw.c | 56 +- + drivers/media/rc/rc-main.c | 229 ++- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 11 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 23 +- + drivers/media/usb/hdpvr/hdpvr.h | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 13 +- + drivers/staging/media/Kconfig | 3 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/lirc/Kconfig | 21 - + drivers/staging/media/lirc/Makefile | 6 - + drivers/staging/media/lirc/TODO | 36 - + drivers/staging/media/lirc/lirc_zilog.c | 1653 -------------------- + include/linux/kfifo.h | 3 +- + include/media/cec.h | 5 - + include/media/i2c/ir-kbd-i2c.h | 6 +- + include/media/lirc.h | 1 - + include/media/lirc_dev.h | 192 --- + include/media/rc-core.h | 65 +- + include/media/rc-map.h | 54 +- + include/uapi/linux/lirc.h | 82 + + 54 files changed, 1714 insertions(+), 3207 deletions(-) + delete mode 100644 Documentation/media/uapi/rc/lirc-get-length.rst + delete mode 100644 drivers/media/rc/ir-lirc-codec.c + delete mode 100644 drivers/staging/media/lirc/Kconfig + delete mode 100644 drivers/staging/media/lirc/Makefile + delete mode 100644 drivers/staging/media/lirc/TODO + delete mode 100644 drivers/staging/media/lirc/lirc_zilog.c + delete mode 100644 include/media/lirc.h + delete mode 100644 include/media/lirc_dev.h +Merging fbdev/fbdev-for-next (5f215d252496 OMAPFB: prevent buffer underflow in omapfb_parse_vram_param()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (6424368125cb Merge branch 'powercap' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + Documentation/driver-api/pm/devices.rst | 27 +++- + Documentation/power/pci.txt | 11 ++ + Documentation/thermal/cpu-cooling-api.txt | 33 +--- + MAINTAINERS | 3 +- + arch/ia64/kernel/acpi.c | 5 + + arch/x86/kernel/acpi/sleep.c | 2 + + drivers/acpi/acpica/acapps.h | 3 + + drivers/acpi/acpica/acdebug.h | 4 + + drivers/acpi/acpica/aclocal.h | 15 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 3 + + drivers/acpi/acpica/acutils.h | 19 ++- + drivers/acpi/acpica/dbexec.c | 110 ++++++++++++- + drivers/acpi/acpica/dbinput.c | 145 ++++++++++------- + drivers/acpi/acpica/dscontrol.c | 18 ++- + drivers/acpi/acpica/dsfield.c | 28 ++-- + drivers/acpi/acpica/dsobject.c | 4 +- + drivers/acpi/acpica/dsutils.c | 3 +- + drivers/acpi/acpica/dswload.c | 6 +- + drivers/acpi/acpica/dswload2.c | 13 +- + drivers/acpi/acpica/evregion.c | 10 ++ + drivers/acpi/acpica/hwtimer.c | 29 ++-- + drivers/acpi/acpica/nsaccess.c | 13 +- + drivers/acpi/acpica/nsconvert.c | 3 +- + drivers/acpi/acpica/nsnames.c | 149 ++++++++++++++++++ + drivers/acpi/acpica/nssearch.c | 1 + + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psobject.c | 10 +- + drivers/acpi/acpica/psutils.c | 6 +- + drivers/acpi/acpica/utdecode.c | 11 +- + drivers/acpi/acpica/uterror.c | 73 +++++++++ + drivers/acpi/acpica/utinit.c | 1 - + drivers/acpi/acpica/utmath.c | 4 +- + drivers/acpi/acpica/utmutex.c | 9 +- + drivers/acpi/acpica/utstrsuppt.c | 42 ++--- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utxferror.c | 8 +- + drivers/acpi/apei/ghes.c | 79 ++++++---- + drivers/acpi/battery.c | 32 +++- + drivers/acpi/device_pm.c | 29 +++- + drivers/acpi/numa.c | 3 +- + drivers/acpi/sleep.c | 10 ++ + drivers/base/power/main.c | 117 ++++++++++++-- + drivers/base/power/sysfs.c | 182 ++++++++++----------- + drivers/cpufreq/arm_big_little.c | 23 +-- + drivers/cpufreq/cpufreq-dt.c | 27 +--- + drivers/cpufreq/cpufreq.c | 55 ++++--- + drivers/cpufreq/mediatek-cpufreq.c | 22 +-- + drivers/cpufreq/qoriq-cpufreq.c | 14 +- + drivers/pci/pci-driver.c | 21 ++- + drivers/powercap/powercap_sys.c | 6 +- + drivers/thermal/cpu_cooling.c | 201 +++++------------------- + include/acpi/acconfig.h | 4 +- + include/acpi/acexcep.h | 6 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actbl1.h | 159 +++++++++++++++++-- + include/acpi/actbl2.h | 15 +- + include/acpi/actypes.h | 2 + + include/linux/acpi.h | 1 + + include/linux/cpu_cooling.h | 75 ++------- + include/linux/pm.h | 17 +- + include/trace/events/thermal.h | 10 +- + kernel/configs/nopm.config | 15 ++ + tools/power/acpi/tools/acpidump/apmain.c | 28 +++- + 65 files changed, 1254 insertions(+), 737 deletions(-) + create mode 100644 kernel/configs/nopm.config +Merging cpupower/cpupower (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (1e032393d968 Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (fd6d2e506ce6 Merge tag 'docs-4.15-fixes' of git://git.lwn.net/linux) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up to date. +Merging net-next/master (48d79b49e168 Merge branch 'tcp-better-receiver-autotuning') +$ git merge net-next/master +Resolved 'drivers/net/phy/meson-gxl.c' using previous resolution. +Resolved 'net/smc/smc_clc.c' using previous resolution. +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/tipc/socket.c +Auto-merging net/smc/smc_clc.c +CONFLICT (content): Merge conflict in net/smc/smc_clc.c +Auto-merging net/smc/af_smc.c +Auto-merging net/sctp/socket.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/atm/common.c +Auto-merging include/net/tcp.h +Auto-merging include/net/sctp/sctp.h +Auto-merging include/net/inet_connection_sock.h +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/phy/meson-gxl.c +CONFLICT (content): Merge conflict in drivers/net/phy/meson-gxl.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging arch/arm/boot/dts/ls1021a-twr.dts +Auto-merging arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/imx35.dtsi +Auto-merging arch/arm/boot/dts/imx25.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da1d5dd09b4526707e63ce92b0ce806ce6c9d337] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_devel_QA.txt | 519 +++++++++ + .../devicetree/bindings/net/can/fsl-flexcan.txt | 6 + + Documentation/devicetree/bindings/net/fsl-fec.txt | 4 +- + .../devicetree/bindings/net/ieee802154/adf7242.txt | 2 +- + Documentation/devicetree/bindings/net/phy.txt | 2 + + Documentation/networking/dsa/dsa.txt | 5 - + Documentation/networking/ieee802154.txt | 40 + + Documentation/networking/kapi.rst | 24 + + MAINTAINERS | 9 + + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx28.dtsi | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/ls1021a-qds.dts | 16 + + arch/arm/boot/dts/ls1021a-twr.dts | 16 + + arch/arm/boot/dts/ls1021a.dtsi | 36 + + arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 2 + + drivers/atm/eni.c | 18 +- + drivers/hv/ring_buffer.c | 23 + + drivers/net/Kconfig | 11 + + drivers/net/Makefile | 1 + + drivers/net/can/c_can/c_can_pci.c | 4 +- + drivers/net/can/flexcan.c | 241 +++-- + drivers/net/can/usb/peak_usb/pcan_usb.c | 9 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 53 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 5 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 9 +- + drivers/net/can/vxcan.c | 16 +- + drivers/net/dsa/Kconfig | 2 +- + drivers/net/dsa/b53/b53_common.c | 10 +- + drivers/net/dsa/b53/b53_priv.h | 7 +- + drivers/net/dsa/bcm_sf2.c | 8 +- + drivers/net/dsa/dsa_loop.c | 9 +- + drivers/net/dsa/lan9303-core.c | 20 +- + drivers/net/dsa/microchip/ksz_common.c | 12 +- + drivers/net/dsa/mv88e6xxx/chip.c | 76 +- + drivers/net/dummy.c | 215 +--- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 11 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 17 +- + drivers/net/ethernet/cadence/macb.h | 167 ++- + drivers/net/ethernet/cadence/macb_main.c | 699 +++++++++--- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 115 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 11 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 76 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 822 ++++++++++++-- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h | 18 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 39 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 278 +---- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 19 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 14 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 4 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 12 + + drivers/net/ethernet/cisco/enic/enic_main.c | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 222 ++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 54 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 5 +- + drivers/net/ethernet/netronome/nfp/Makefile | 1 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 487 ++++++++- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 7 - + drivers/net/ethernet/netronome/nfp/bpf/main.h | 35 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 23 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 8 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 4 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 19 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 79 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 13 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.c | 7 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.h | 17 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 6 + + drivers/net/ethernet/netronome/nfp/nfp_main.h | 29 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 4 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 787 ++++++++++++++ + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 55 +- + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 2 + + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 9 +- + .../ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c | 10 + + drivers/net/ethernet/nvidia/forcedeth.c | 27 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 4 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 54 +- + drivers/net/ethernet/ti/cpsw.c | 84 +- + drivers/net/ethernet/ti/cpsw.h | 23 +- + drivers/net/ethernet/ti/cpsw_ale.c | 109 +- + drivers/net/ethernet/ti/cpsw_ale.h | 1 - + drivers/net/ethernet/ti/davinci_emac.c | 9 +- + drivers/net/ethernet/ti/netcp_ethss.c | 6 +- + drivers/net/hyperv/hyperv_net.h | 32 +- + drivers/net/hyperv/netvsc.c | 26 +- + drivers/net/hyperv/netvsc_drv.c | 74 +- + drivers/net/hyperv/rndis_filter.c | 4 +- + drivers/net/ieee802154/adf7242.c | 90 +- + drivers/net/ipvlan/ipvlan_core.c | 17 +- + drivers/net/ipvlan/ipvlan_main.c | 33 +- + drivers/net/netdevsim/Makefile | 7 + + drivers/net/netdevsim/bpf.c | 373 +++++++ + drivers/net/netdevsim/netdev.c | 502 +++++++++ + drivers/net/netdevsim/netdevsim.h | 78 ++ + drivers/net/phy/amd.c | 2 - + drivers/net/phy/at803x.c | 24 +- + drivers/net/phy/bcm-cygnus.c | 2 - + drivers/net/phy/bcm63xx.c | 4 - + drivers/net/phy/bcm7xxx.c | 6 - + drivers/net/phy/broadcom.c | 27 - + drivers/net/phy/cicada.c | 4 - + drivers/net/phy/davicom.c | 5 - + drivers/net/phy/dp83640.c | 2 - + drivers/net/phy/dp83822.c | 2 - + drivers/net/phy/dp83848.c | 2 - + drivers/net/phy/dp83867.c | 2 - + drivers/net/phy/icplus.c | 4 - + drivers/net/phy/intel-xway.c | 12 - + drivers/net/phy/lxt.c | 5 - + drivers/net/phy/marvell.c | 9 - + drivers/net/phy/mdio_bus.c | 21 + + drivers/net/phy/mdio_device.c | 25 +- + drivers/net/phy/meson-gxl.c | 1 - + drivers/net/phy/micrel.c | 24 - + drivers/net/phy/microchip.c | 1 - + drivers/net/phy/national.c | 2 - + drivers/net/phy/phy.c | 46 +- + drivers/net/phy/phy_device.c | 34 +- + drivers/net/phy/phylink.c | 341 ++++-- + drivers/net/phy/qsemi.c | 2 - + drivers/net/phy/realtek.c | 128 ++- + drivers/net/phy/rockchip.c | 1 - + drivers/net/phy/sfp-bus.c | 120 ++- + drivers/net/phy/smsc.c | 9 - + drivers/net/phy/ste10Xp.c | 4 - + drivers/net/phy/uPD60620.c | 1 - + drivers/net/phy/vitesse.c | 12 - + drivers/net/slip/slip.c | 4 +- + drivers/net/tun.c | 148 ++- + drivers/net/veth.c | 3 + + drivers/net/virtio_net.c | 9 +- + drivers/net/vmxnet3/vmxnet3_int.h | 8 +- + fs/gfs2/glock.c | 7 +- + include/linux/dsa/lan9303.h | 1 + + include/linux/filter.h | 1 + + include/linux/hyperv.h | 22 - + include/linux/if_macvlan.h | 2 +- + include/linux/mdio.h | 3 + + include/linux/netdevice.h | 5 +- + include/linux/phy.h | 49 +- + include/linux/phylink.h | 196 +++- + include/linux/rhashtable.h | 38 +- + include/linux/sctp.h | 20 + + include/linux/sfp.h | 57 +- + include/linux/skb_array.h | 5 + + include/linux/skbuff.h | 5 + + include/linux/spinlock.h | 6 + + include/linux/tcp.h | 2 +- + include/net/act_api.h | 2 +- + include/net/addrconf.h | 2 +- + include/net/dn_route.h | 1 + + include/net/dsa.h | 61 +- + include/net/dst.h | 39 +- + include/net/erspan.h | 51 + + include/net/gen_stats.h | 3 + + include/net/inet_connection_sock.h | 2 + + include/net/inet_hashtables.h | 29 +- + include/net/ip.h | 9 + + include/net/ip6_fib.h | 14 +- + include/net/ip6_tunnel.h | 1 + + include/net/ipv6.h | 17 + + include/net/netns/sctp.h | 5 +- + include/net/pkt_sched.h | 10 +- + include/net/rtnetlink.h | 4 +- + include/net/sch_generic.h | 90 +- + include/net/sctp/constants.h | 9 +- + include/net/sctp/sctp.h | 6 +- + include/net/sctp/sm.h | 15 +- + include/net/sctp/stream_interleave.h | 54 + + include/net/sctp/structs.h | 56 +- + include/net/sctp/ulpevent.h | 23 +- + include/net/sctp/ulpqueue.h | 10 +- + include/net/tc_act/tc_mirred.h | 6 +- + include/net/tcp.h | 6 +- + include/net/xfrm.h | 38 +- + include/uapi/linux/bpf.h | 6 + + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/if_tun.h | 1 + + include/uapi/linux/sctp.h | 3 + + kernel/bpf/verifier.c | 62 +- + lib/Makefile | 2 +- + lib/bucket_locks.c | 54 + + lib/rhashtable.c | 160 ++- + lib/test_rhashtable.c | 6 +- + net/atm/common.c | 2 +- + net/atm/mpc.c | 9 +- + net/atm/mpoa_caches.c | 48 +- + net/atm/mpoa_caches.h | 9 +- + net/atm/mpoa_proc.c | 15 +- + net/bridge/br_mdb.c | 6 +- + net/bridge/br_nf_core.c | 1 - + net/can/gw.c | 14 +- + net/core/dev.c | 84 +- + net/core/dst.c | 14 +- + net/core/filter.c | 40 +- + net/core/flow_dissector.c | 12 +- + net/core/gen_stats.c | 9 +- + net/core/pktgen.c | 12 +- + net/core/rtnetlink.c | 312 ++++-- + net/core/sock_reuseport.c | 4 +- + net/decnet/dn_dev.c | 9 +- + net/decnet/dn_fib.c | 6 +- + net/decnet/dn_route.c | 42 +- + net/dsa/Kconfig | 9 + + net/dsa/Makefile | 3 +- + net/dsa/dsa2.c | 2 +- + net/dsa/dsa_priv.h | 9 + + net/dsa/legacy.c | 20 - + net/dsa/slave.c | 25 +- + net/dsa/switch.c | 111 +- + net/ipv4/inet_hashtables.c | 184 +++- + net/ipv4/ip_gre.c | 54 +- + net/ipv4/route.c | 2 +- + net/ipv4/tcp.c | 3 + + net/ipv4/tcp_input.c | 31 +- + net/ipv4/udp.c | 44 +- + net/ipv4/xfrm4_mode_tunnel.c | 2 +- + net/ipv6/addrconf.c | 48 +- + net/ipv6/addrlabel.c | 25 +- + net/ipv6/ila/ila_xlat.c | 4 +- + net/ipv6/inet6_hashtables.c | 77 +- + net/ipv6/ip6_fib.c | 30 +- + net/ipv6/ip6_gre.c | 554 ++++++++-- + net/ipv6/ip6_output.c | 4 +- + net/ipv6/ip6_tunnel.c | 5 +- + net/ipv6/ip6mr.c | 9 +- + net/ipv6/route.c | 70 +- + net/ipv6/seg6.c | 4 +- + net/ipv6/udp.c | 54 +- + net/ipv6/xfrm6_mode_tunnel.c | 2 +- + net/ipv6/xfrm6_policy.c | 2 +- + net/mac80211/mesh_pathtbl.c | 34 +- + net/mpls/af_mpls.c | 15 +- + net/netfilter/nft_set_hash.c | 10 +- + net/netfilter/xt_policy.c | 3 +- + net/netlink/af_netlink.c | 71 +- + net/netlink/diag.c | 8 +- + net/openvswitch/flow.c | 6 +- + net/openvswitch/vport-internal_dev.c | 9 +- + net/phonet/pn_netlink.c | 21 +- + net/qrtr/qrtr.c | 8 +- + net/rds/connection.c | 7 +- + net/rds/rds.h | 6 +- + net/rds/tcp.c | 38 +- + net/rds/tcp.h | 1 + + net/sched/act_api.c | 2 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_ife.c | 10 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 19 +- + net/sched/act_pedit.c | 2 +- + net/sched/act_sample.c | 2 +- + net/sched/act_simple.c | 2 +- + net/sched/act_skbmod.c | 2 +- + net/sched/act_tunnel_key.c | 2 +- + net/sched/act_vlan.c | 2 +- + net/sched/cls_api.c | 39 +- + net/sched/cls_flower.c | 1 + + net/sched/sch_api.c | 105 +- + net/sched/sch_generic.c | 440 +++++--- + net/sched/sch_mq.c | 34 +- + net/sched/sch_mqprio.c | 69 +- + net/sctp/Makefile | 2 +- + net/sctp/associola.c | 2 +- + net/sctp/chunk.c | 8 +- + net/sctp/output.c | 5 +- + net/sctp/proc.c | 6 +- + net/sctp/sm_make_chunk.c | 45 +- + net/sctp/sm_sideeffect.c | 23 +- + net/sctp/sm_statefuns.c | 21 +- + net/sctp/sm_statetable.c | 3 + + net/sctp/socket.c | 149 ++- + net/sctp/stream.c | 1 + + net/sctp/stream_interleave.c | 1118 ++++++++++++++++++++ + net/sctp/ulpevent.c | 15 +- + net/sctp/ulpqueue.c | 23 +- + net/smc/af_smc.c | 24 +- + net/smc/smc_cdc.c | 12 +- + net/smc/smc_clc.c | 84 +- + net/smc/smc_clc.h | 34 +- + net/smc/smc_close.c | 2 +- + net/smc/smc_close.h | 1 - + net/smc/smc_rx.c | 5 +- + net/smc/smc_tx.c | 11 +- + net/tipc/bcast.c | 12 +- + net/tipc/link.c | 2 +- + net/tipc/msg.c | 51 +- + net/tipc/msg.h | 3 +- + net/tipc/socket.c | 6 +- + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_output.c | 2 +- + net/xfrm/xfrm_policy.c | 135 +-- + samples/bpf/tcbpf2_kern.c | 101 ++ + samples/bpf/test_cgrp2_attach2.c | 36 +- + samples/bpf/test_tunnel_bpf.sh | 102 ++ + security/selinux/xfrm.c | 2 +- + tools/testing/selftests/bpf/Makefile | 5 +- + tools/testing/selftests/bpf/sample_ret0.c | 7 + + tools/testing/selftests/bpf/test_align.c | 156 +-- + tools/testing/selftests/bpf/test_offload.py | 681 ++++++++++++ + 318 files changed, 11908 insertions(+), 3591 deletions(-) + create mode 100644 Documentation/bpf/bpf_devel_QA.txt + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c + create mode 100644 drivers/net/netdevsim/Makefile + create mode 100644 drivers/net/netdevsim/bpf.c + create mode 100644 drivers/net/netdevsim/netdev.c + create mode 100644 drivers/net/netdevsim/netdevsim.h + create mode 100644 include/net/sctp/stream_interleave.h + create mode 100644 lib/bucket_locks.c + create mode 100644 net/sctp/stream_interleave.c + create mode 100644 tools/testing/selftests/bpf/sample_ret0.c + create mode 100755 tools/testing/selftests/bpf/test_offload.py +Merging bpf-next/master (553a8f2f42df Merge branch 'bpf-override-return') +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/include/uapi/linux/perf_event.h +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/module.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/module.h +Auto-merging include/linux/bpf.h +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + arch/Kconfig | 3 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kprobes.h | 4 + + arch/x86/include/asm/ptrace.h | 5 + + arch/x86/kernel/kprobes/ftrace.c | 14 +++ + fs/btrfs/disk-io.c | 2 + + fs/btrfs/free-space-cache.c | 2 + + include/asm-generic/vmlinux.lds.h | 10 ++ + include/linux/bpf.h | 15 +++ + include/linux/filter.h | 3 +- + include/linux/kprobes.h | 1 + + include/linux/module.h | 5 + + include/linux/trace_events.h | 1 + + include/uapi/linux/bpf.h | 7 +- + include/uapi/linux/perf_event.h | 22 ++++ + kernel/bpf/core.c | 24 ++++ + kernel/bpf/verifier.c | 2 + + kernel/events/core.c | 10 ++ + kernel/kprobes.c | 163 ++++++++++++++++++++++++++ + kernel/module.c | 6 +- + kernel/trace/Kconfig | 11 ++ + kernel/trace/bpf_trace.c | 58 +++++++++ + kernel/trace/trace_kprobe.c | 55 +++++++-- + kernel/trace/trace_probe.h | 12 ++ + samples/bpf/Makefile | 4 + + samples/bpf/test_override_return.sh | 15 +++ + samples/bpf/tracex7_kern.c | 16 +++ + samples/bpf/tracex7_user.c | 28 +++++ + tools/bpf/bpftool/Documentation/Makefile | 30 +++-- + tools/bpf/bpftool/Makefile | 61 +++++----- + tools/include/uapi/linux/bpf.h | 7 +- + tools/include/uapi/linux/perf_event.h | 22 ++++ + tools/scripts/Makefile.include | 1 + + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/bpf_helpers.h | 3 +- + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/test_progs.c | 133 +++++++++++++++++++++ + tools/testing/selftests/bpf/test_tracepoint.c | 26 ++++ + 38 files changed, 732 insertions(+), 53 deletions(-) + create mode 100755 samples/bpf/test_override_return.sh + create mode 100644 samples/bpf/tracex7_kern.c + create mode 100644 samples/bpf/tracex7_user.c + create mode 100644 tools/testing/selftests/bpf/test_tracepoint.c +$ git reset --hard HEAD^ +HEAD is now at da1d5dd09b45 Merge remote-tracking branch 'net-next/master' +Merging next-20171212 version of bpf-next +$ git merge -m next-20171212/bpf-next 97c50589229f32457792e2c364d90185f86fd9c5 +Merge made by the 'recursive' strategy. + tools/bpf/bpftool/Documentation/Makefile | 30 ++++++++++------ + tools/bpf/bpftool/Makefile | 61 ++++++++++++++++---------------- + tools/scripts/Makefile.include | 1 + + 3 files changed, 52 insertions(+), 40 deletions(-) +Merging ipsec-next/master (9b7e14dba0c0 xfrm: Remove redundant state assignment in xfrm_input()) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_input.c +Auto-merging net/xfrm/xfrm_device.c +Merge made by the 'recursive' strategy. + Documentation/networking/00-INDEX | 2 + + Documentation/networking/xfrm_device.txt | 132 +++++++++++++++++++++++++++++++ + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_input.c | 1 - + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_replay.c | 3 +- + net/xfrm/xfrm_state.c | 7 ++ + 7 files changed, 144 insertions(+), 5 deletions(-) + create mode 100644 Documentation/networking/xfrm_device.txt +Merging netfilter-next/master (e02538c6458b netfilter: reduce size of hook entry point locations) +$ git merge netfilter-next/master +Resolved 'net/netfilter/nf_conntrack_h323_asn1.c' using previous resolution. +Auto-merging net/netfilter/x_tables.c +Auto-merging net/netfilter/nfnetlink_queue.c +Auto-merging net/netfilter/nf_conntrack_proto_tcp.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/netfilter/nf_conntrack_h323_asn1.c +CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_h323_asn1.c +Auto-merging net/netfilter/ipvs/ip_vs_conn.c +Auto-merging include/net/ip_vs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27dd038a780b629f5822a6ab099b5ff97de7edf3] Merge remote-tracking branch 'netfilter-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/netfilter.h | 43 ++++++-- + include/net/ip_vs.h | 3 +- + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 12 +-- + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 12 +-- + include/net/netfilter/nf_conntrack_l4proto.h | 19 ++-- + include/net/netfilter/nf_queue.h | 2 +- + include/net/netns/netfilter.h | 6 +- + net/bridge/br_netfilter_hooks.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 4 +- + net/netfilter/core.c | 137 +++++++++++-------------- + net/netfilter/ipset/ip_set_bitmap_gen.h | 1 + + net/netfilter/ipset/ip_set_core.c | 6 +- + net/netfilter/ipset/ip_set_hash_gen.h | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 2 +- + net/netfilter/ipvs/ip_vs_core.c | 12 +-- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 1 + + net/netfilter/ipvs/ip_vs_proto_udp.c | 1 + + net/netfilter/nf_conntrack_h323_asn1.c | 40 +++----- + net/netfilter/nf_conntrack_h323_main.c | 47 +-------- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_proto.c | 18 ++-- + net/netfilter/nf_conntrack_proto_dccp.c | 21 ++-- + net/netfilter/nf_conntrack_proto_generic.c | 4 +- + net/netfilter/nf_conntrack_proto_gre.c | 4 +- + net/netfilter/nf_conntrack_proto_sctp.c | 21 ++-- + net/netfilter/nf_conntrack_proto_tcp.c | 22 ++-- + net/netfilter/nf_conntrack_proto_udp.c | 10 +- + net/netfilter/nf_internals.h | 2 +- + net/netfilter/nf_queue.c | 28 +++-- + net/netfilter/nfnetlink_queue.c | 9 +- + net/netfilter/nft_cmp.c | 2 + + net/netfilter/x_tables.c | 2 +- + 35 files changed, 238 insertions(+), 266 deletions(-) +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ git merge nfc-next/master +Already up to date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (53ac79359327 wireless: use ARRAY_SIZE) +$ git merge wireless-drivers-next/master +Resolved 'drivers/net/wireless/intel/iwlwifi/pcie/drv.c' using previous resolution. +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/utils.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/time-event.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.h +Removing drivers/net/wireless/intel/iwlwifi/cfg/a000.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 86a7ad329424] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/mediatek,mt76.txt | 32 + + drivers/bcma/driver_pcie2.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 280 +++---- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 5 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 462 +++--------- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 216 ++++++ + drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 216 ------ + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 30 - + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 15 + + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 262 ++++++- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 20 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 232 +----- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 91 ++- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 43 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 314 ++++++++ + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 234 +++--- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 48 ++ + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 7 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 38 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 7 +- + drivers/net/wireless/marvell/mwl8k.c | 7 +- + drivers/net/wireless/mediatek/Kconfig | 1 + + drivers/net/wireless/mediatek/Makefile | 1 + + drivers/net/wireless/mediatek/mt76/Kconfig | 10 + + drivers/net/wireless/mediatek/mt76/Makefile | 15 + + drivers/net/wireless/mediatek/mt76/debugfs.c | 77 ++ + drivers/net/wireless/mediatek/mt76/dma.c | 451 +++++++++++ + drivers/net/wireless/mediatek/mt76/dma.h | 38 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 112 +++ + drivers/net/wireless/mediatek/mt76/mac80211.c | 393 ++++++++++ + drivers/net/wireless/mediatek/mt76/mmio.c | 61 ++ + drivers/net/wireless/mediatek/mt76/mt76.h | 360 +++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2.h | 227 ++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_core.c | 88 +++ + .../net/wireless/mediatek/mt76/mt76x2_debugfs.c | 133 ++++ + drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c | 493 ++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_dfs.h | 80 ++ + drivers/net/wireless/mediatek/mt76/mt76x2_dma.c | 183 +++++ + drivers/net/wireless/mediatek/mt76/mt76x2_dma.h | 68 ++ + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 647 ++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h | 182 +++++ + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 839 +++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 755 ++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 190 +++++ + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 545 +++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c | 451 +++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_mcu.h | 155 ++++ + drivers/net/wireless/mediatek/mt76/mt76x2_pci.c | 110 +++ + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 758 +++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_regs.h | 587 ++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x2_trace.c | 23 + + drivers/net/wireless/mediatek/mt76/mt76x2_trace.h | 144 ++++ + drivers/net/wireless/mediatek/mt76/mt76x2_tx.c | 258 +++++++ + drivers/net/wireless/mediatek/mt76/trace.c | 23 + + drivers/net/wireless/mediatek/mt76/trace.h | 71 ++ + drivers/net/wireless/mediatek/mt76/tx.c | 511 +++++++++++++ + drivers/net/wireless/mediatek/mt76/util.c | 78 ++ + drivers/net/wireless/mediatek/mt76/util.h | 44 ++ + .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 5 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 60 +- + drivers/net/wireless/realtek/rtlwifi/pci.h | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 57 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 22 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/table.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 34 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 11 +- + drivers/net/wireless/ti/wl1251/init.c | 4 +- + drivers/net/wireless/ti/wlcore/acx.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 33 +- + drivers/net/wireless/ti/wlcore/tx.c | 4 +- + drivers/ssb/Kconfig | 9 +- + 112 files changed, 10860 insertions(+), 1511 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt + create mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/22000.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/a000.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c + create mode 100644 drivers/net/wireless/mediatek/mt76/Kconfig + create mode 100644 drivers/net/wireless/mediatek/mt76/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt76/debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/dma.c + create mode 100644 drivers/net/wireless/mediatek/mt76/dma.h + create mode 100644 drivers/net/wireless/mediatek/mt76/eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mac80211.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mmio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_core.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_dfs.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_dma.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_dma.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_main.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_pci.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_phy.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_regs.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_trace.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_trace.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2_tx.c + create mode 100644 drivers/net/wireless/mediatek/mt76/trace.c + create mode 100644 drivers/net/wireless/mediatek/mt76/trace.h + create mode 100644 drivers/net/wireless/mediatek/mt76/tx.c + create mode 100644 drivers/net/wireless/mediatek/mt76/util.c + create mode 100644 drivers/net/wireless/mediatek/mt76/util.h +Merging bluetooth/master (0be8666f8ee7 dt-bindings: Add optional nvmem BD address bindings to ti,wlink-st) +$ git merge bluetooth/master +Auto-merging net/bluetooth/af_bluetooth.c +Auto-merging drivers/bluetooth/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/ti,wilink-st.txt | 5 +++ + MAINTAINERS | 2 - + drivers/bluetooth/Kconfig | 10 +++++ + drivers/bluetooth/btqcomsmd.c | 3 +- + drivers/bluetooth/btsdio.c | 9 +++++ + drivers/bluetooth/btusb.c | 7 ++++ + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_ll.c | 45 +++++++++++++++++++--- + drivers/bluetooth/hci_qca.c | 3 ++ + drivers/bluetooth/hci_serdev.c | 1 + + net/bluetooth/af_bluetooth.c | 38 ++++++++---------- + net/bluetooth/hci_debugfs.c | 17 ++------ + net/bluetooth/hci_request.c | 9 +---- + 13 files changed, 98 insertions(+), 52 deletions(-) +Merging mac80211-next/master (b0d52ad82184 mac80211: Add airtime account and scheduling to TXQs) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/ht.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/core.c | 2 - + drivers/net/wireless/ath/ath10k/core.h | 4 - + drivers/net/wireless/ath/ath10k/mac.c | 55 +++------ + drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 - + drivers/net/wireless/ath/ath9k/xmit.c | 210 ++++++++------------------------- + drivers/net/wireless/mac80211_hwsim.c | 17 ++- + include/net/cfg80211.h | 9 +- + include/net/mac80211.h | 71 +++++++++-- + net/mac80211/agg-rx.c | 26 ++-- + net/mac80211/agg-tx.c | 40 +++---- + net/mac80211/cfg.c | 3 + + net/mac80211/debugfs.c | 2 + + net/mac80211/debugfs_sta.c | 29 +++++ + net/mac80211/driver-ops.h | 12 +- + net/mac80211/ht.c | 1 + + net/mac80211/ieee80211_i.h | 13 +- + net/mac80211/iface.c | 4 +- + net/mac80211/key.c | 12 +- + net/mac80211/main.c | 7 ++ + net/mac80211/mesh.c | 2 + + net/mac80211/mesh_hwmp.c | 1 + + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 10 +- + net/mac80211/offchannel.c | 4 +- + net/mac80211/rx.c | 25 ++-- + net/mac80211/sta_info.c | 9 +- + net/mac80211/sta_info.h | 7 ++ + net/mac80211/status.c | 16 +++ + net/mac80211/tdls.c | 6 +- + net/mac80211/trace.h | 32 +---- + net/mac80211/tx.c | 74 +++++++++++- + net/mac80211/util.c | 19 +-- + net/mac80211/wme.c | 1 + + net/mac80211/wpa.c | 16 ++- + net/wireless/ibss.c | 5 + + net/wireless/mlme.c | 6 +- + net/wireless/nl80211.c | 61 ++++++---- + net/wireless/trace.h | 12 +- + 40 files changed, 453 insertions(+), 385 deletions(-) +$ git am -3 ../patches/0001-mt76-fix-up-for-mac80211-Add-TXQ-scheduling-API.patch +Applying: mt76: fix up for "mac80211: Add TXQ scheduling API" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/mediatek/mt76/mt76.h +M drivers/net/wireless/mediatek/mt76/tx.c +$ git add -A . +$ git commit -v -a --amend +[master 21eceae86735bf6a4b3dd097e981fed6228eb2cf] Merge remote-tracking branch 'mac80211-next/master' + Date: Wed Dec 13 12:55:18 2017 +1100 +Merging rdma/for-next (c058ecf6e455 iw_cxgb4: only insert drain cqes if wq is flushed) +$ git merge rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/core/device.c | 2 +- + drivers/infiniband/core/iwcm.c | 2 +- + drivers/infiniband/core/nldev.c | 2 +- + drivers/infiniband/core/security.c | 7 +++++-- + drivers/infiniband/core/uverbs_cmd.c | 6 ++++++ + drivers/infiniband/hw/cxgb4/cq.c | 5 +++++ + drivers/infiniband/hw/cxgb4/qp.c | 22 ++++++++++++++++------ + drivers/infiniband/hw/mlx4/qp.c | 26 +++++++++++++++++++------- + 9 files changed, 55 insertions(+), 19 deletions(-) +Merging gfs2/for-next (850d2d915fa6 gfs2: Add a crc field to resource group headers) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 5 +-- + fs/gfs2/main.c | 90 ++++++++++++++++++++-------------------- + fs/gfs2/rgrp.c | 26 ++++++++---- + include/uapi/linux/gfs2_ondisk.h | 15 +++++-- + 4 files changed, 75 insertions(+), 61 deletions(-) +Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user) +$ git merge mtd/master +Already up to date. +Merging l2-mtd/master (1530578abdac mtd: Avoid probe failures when mtd->dbg.dfs_dir is invalid) +$ git merge l2-mtd/master +Already up to date. +Merging nand/nand/next (d47eeb213c8b mtd: nand: add ->exec_op() implementation) +$ git merge nand/nand/next +Auto-merging Documentation/devicetree/bindings/mtd/mtk-nand.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 11 +- + drivers/mtd/nand/Kconfig | 4 +- + drivers/mtd/nand/atmel/nand-controller.c | 9 +- + drivers/mtd/nand/bf5xx_nand.c | 6 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 22 +- + drivers/mtd/nand/cafe_nand.c | 52 +- + drivers/mtd/nand/denali.c | 84 +- + drivers/mtd/nand/denali.h | 4 +- + drivers/mtd/nand/denali_pci.c | 4 + + drivers/mtd/nand/diskonchip.c | 4 +- + drivers/mtd/nand/docg4.c | 21 +- + drivers/mtd/nand/fsl_elbc_nand.c | 10 +- + drivers/mtd/nand/fsl_ifc_nand.c | 13 +- + drivers/mtd/nand/fsmc_nand.c | 9 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 97 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 46 +- + drivers/mtd/nand/hisi504_nand.c | 9 +- + drivers/mtd/nand/jz4740_nand.c | 16 +- + drivers/mtd/nand/lpc32xx_mlc.c | 7 +- + drivers/mtd/nand/lpc32xx_slc.c | 33 +- + drivers/mtd/nand/mtk_ecc.c | 126 +- + drivers/mtd/nand/mtk_ecc.h | 3 +- + drivers/mtd/nand/mtk_nand.c | 76 +- + drivers/mtd/nand/nand_base.c | 2223 +++++++++++++++++--- + drivers/mtd/nand/nand_bbt.c | 2 +- + drivers/mtd/nand/nand_hynix.c | 129 +- + drivers/mtd/nand/nand_micron.c | 83 +- + drivers/mtd/nand/nand_samsung.c | 6 + + drivers/mtd/nand/nand_timings.c | 21 +- + drivers/mtd/nand/omap2.c | 28 +- + drivers/mtd/nand/pxa3xx_nand.c | 14 +- + drivers/mtd/nand/qcom_nandc.c | 27 +- + drivers/mtd/nand/r852.c | 11 +- + drivers/mtd/nand/sh_flctl.c | 6 +- + drivers/mtd/nand/sm_common.h | 2 +- + drivers/mtd/nand/sunxi_nand.c | 103 +- + drivers/mtd/nand/tango_nand.c | 27 +- + drivers/mtd/nand/tmio_nand.c | 5 +- + drivers/mtd/nand/vf610_nfc.c | 6 +- + drivers/mtd/onenand/Kconfig | 3 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 +- + include/linux/mtd/rawnand.h | 443 +++- + 42 files changed, 2922 insertions(+), 888 deletions(-) +Merging spi-nor/spi-nor/next (59b356ffd0b0 mtd: m25p80: restore the status of SPI flash when exiting) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsl-quadspi.txt | 2 +- + Documentation/mtd/spi-nor.txt | 3 + + drivers/mtd/devices/m25p80.c | 9 +++ + drivers/mtd/spi-nor/spi-nor.c | 65 +++++++++++++++++----- + include/linux/mtd/spi-nor.h | 12 +++- + 5 files changed, 75 insertions(+), 16 deletions(-) +Merging crypto/master (65cd9588c597 MAINTAINERS: Add myself as co-maintainer for s5p-sss.c) +$ git merge crypto/master +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +Auto-merging drivers/char/random.c +Removing drivers/char/hw_random/bcm63xx-rng.c +Auto-merging crypto/mcryptd.c +Auto-merging crypto/Kconfig +Auto-merging arch/arm64/crypto/aes-ce-glue.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/rng/brcm,bcm6368.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/arm-cryptocell.txt | 22 + + .../devicetree/bindings/crypto/st,stm32-cryp.txt | 19 + + .../devicetree/bindings/rng/brcm,bcm2835.txt | 22 +- + .../devicetree/bindings/rng/brcm,bcm6368.txt | 17 - + MAINTAINERS | 1 + + arch/arm/crypto/aes-neonbs-glue.c | 10 +- + arch/arm64/crypto/Makefile | 2 +- + arch/arm64/crypto/aes-ce-core.S | 87 ++ + .../crypto/{aes-ce-cipher.c => aes-ce-glue.c} | 115 +- + arch/arm64/crypto/aes-glue.c | 1 + + arch/x86/crypto/chacha20_glue.c | 1 - + crypto/Kconfig | 2 +- + crypto/ablk_helper.c | 5 +- + crypto/blkcipher.c | 1 - + crypto/camellia_generic.c | 3 +- + crypto/cast5_generic.c | 3 +- + crypto/cast6_generic.c | 3 +- + crypto/chacha20_generic.c | 33 +- + crypto/cryptd.c | 7 +- + crypto/ecc.c | 2 +- + crypto/keywrap.c | 4 +- + crypto/mcryptd.c | 1 - + crypto/simd.c | 4 +- + crypto/tcrypt.c | 22 +- + crypto/twofish_common.c | 5 +- + crypto/twofish_generic.c | 5 +- + crypto/xcbc.c | 3 +- + drivers/char/hw_random/Kconfig | 20 +- + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/bcm2835-rng.c | 167 ++- + drivers/char/hw_random/bcm63xx-rng.c | 154 --- + drivers/char/random.c | 24 +- + drivers/crypto/caam/caamalg_qi.c | 6 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 3 +- + drivers/crypto/chelsio/Kconfig | 10 + + drivers/crypto/chelsio/Makefile | 1 + + drivers/crypto/chelsio/chcr_algo.c | 231 ++-- + drivers/crypto/chelsio/chcr_algo.h | 15 - + drivers/crypto/chelsio/chcr_core.c | 14 + + drivers/crypto/chelsio/chcr_core.h | 38 + + drivers/crypto/chelsio/chcr_crypto.h | 69 +- + drivers/crypto/chelsio/chcr_ipsec.c | 654 +++++++++++ + drivers/crypto/hifn_795x.c | 1 + + drivers/crypto/nx/nx-842-powernv.c | 4 +- + drivers/crypto/s5p-sss.c | 2 +- + drivers/crypto/stm32/Kconfig | 9 + + drivers/crypto/stm32/Makefile | 3 +- + drivers/crypto/stm32/stm32-cryp.c | 1172 ++++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 23 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 102 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 7 + + include/crypto/chacha20.h | 3 +- + lib/chacha20.c | 2 +- + 57 files changed, 2486 insertions(+), 657 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/arm-cryptocell.txt + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-cryp.txt + delete mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm6368.txt + create mode 100644 arch/arm64/crypto/aes-ce-core.S + rename arch/arm64/crypto/{aes-ce-cipher.c => aes-ce-glue.c} (62%) + delete mode 100644 drivers/char/hw_random/bcm63xx-rng.c + create mode 100644 drivers/crypto/chelsio/chcr_ipsec.c + create mode 100644 drivers/crypto/stm32/stm32-cryp.c +Merging drm/drm-next (9428088c90b6 drm/qxl: reapply cursor after resetting primary) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/gvt/scheduler.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Auto-merging include/drm/drm_connector.h +Removing drivers/gpu/drm/sun4i/sun8i_layer.h +Removing drivers/gpu/drm/sun4i/sun8i_layer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_guc_submission.h +Auto-merging drivers/gpu/drm/i915/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/intel_guc_reg.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio.h +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/drm_connector.c +Auto-merging drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_offset.h +Removing drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h +Removing drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_helper.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_debug.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/base/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ce378a434ffac06b7c197086078f3991784fadf2] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/ilitek,ili9225.txt | 25 + + .../display/panel/mitsubishi,aa070mc01.txt | 7 + + .../bindings/display/panel/tianma,tm070rvhg71.txt | 29 + + .../devicetree/bindings/display/renesas,du.txt | 30 +- + .../bindings/display/rockchip/rockchip-vop.txt | 1 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 6 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-kms-helpers.rst | 3 + + Documentation/gpu/i915.rst | 4 +- + Documentation/gpu/todo.rst | 18 +- + MAINTAINERS | 12 +- + arch/x86/include/asm/iosf_mbi.h | 25 + + arch/x86/platform/intel/iosf_mbi.c | 19 +- + drivers/base/Kconfig | 1 + + drivers/dma-buf/dma-buf.c | 9 +- + drivers/dma-buf/dma-fence-array.c | 14 +- + drivers/dma-buf/reservation.c | 58 +- + drivers/gpu/drm/Kconfig | 5 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 530 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 27 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 174 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 126 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 21 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 11 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 40 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 100 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 275 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 27 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 26 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/si.c | 34 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 10 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 28 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 52 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 281 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 33 +- + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 10 +- + drivers/gpu/drm/amd/display/dc/basics/logger.c | 22 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 87 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 574 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 52 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 15 +- + drivers/gpu/drm/amd/display/dc/dc.h | 587 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 28 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 25 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 207 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 292 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 5 - + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 32 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 194 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 9 - + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 33 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 34 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 34 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 278 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 327 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 28 +- + .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 1 + + .../display/dc/dce110/dce110_timing_generator.c | 265 +- + .../display/dc/dce110/dce110_timing_generator.h | 6 + + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 6 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 8 +- + .../display/dc/dce120/dce120_timing_generator.c | 6 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 45 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 186 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 8 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 516 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 214 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 345 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1826 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 52 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 102 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 120 +- + .../amd/display/dc/dcn10/dcn10_timing_generator.c | 122 +- + .../amd/display/dc/dcn10/dcn10_timing_generator.h | 35 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 7 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 122 +- + .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 6 +- + .../display/dc/gpio/dce120/hw_translate_dce120.c | 6 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 6 +- + .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 6 +- + .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 6 +- + .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 6 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 20 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 44 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 42 +- + drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 6 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 18 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 12 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 11 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 21 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 6 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 6 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 3 +- + .../drm/amd/display/include/ddc_service_types.h | 33 - + .../gpu/drm/amd/display/include/grph_object_id.h | 12 +- + .../gpu/drm/amd/display/include/logger_interface.h | 5 + + .../drm/amd/display/modules/freesync/freesync.c | 84 +- + drivers/gpu/drm/amd/include/amd_shared.h | 172 - + .../amd/include/asic_reg/athub/athub_1_0_offset.h | 453 + + .../amd/include/asic_reg/athub/athub_1_0_sh_mask.h | 2045 ++ + .../asic_reg/{vega10/DC => dce}/dce_12_0_offset.h | 0 + .../asic_reg/{vega10/DC => dce}/dce_12_0_sh_mask.h | 0 + .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h | 0 + .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h | 0 + .../asic_reg/{vega10/GC => gc}/gc_9_0_default.h | 0 + .../asic_reg/{vega10/GC => gc}/gc_9_0_offset.h | 0 + .../asic_reg/{vega10/GC => gc}/gc_9_0_sh_mask.h | 0 + .../asic_reg/{raven1/GC => gc}/gc_9_1_offset.h | 0 + .../drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h | 209 + + .../drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h | 601 + + .../{vega10/MMHUB => mmhub}/mmhub_1_0_default.h | 0 + .../{vega10/MMHUB => mmhub}/mmhub_1_0_offset.h | 0 + .../{vega10/MMHUB => mmhub}/mmhub_1_0_sh_mask.h | 0 + .../{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h | 0 + .../{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_default.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_offset.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/mp/mp_9_0_offset.h | 375 + + .../drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h | 1463 + + .../{vega10/NBIF => nbif}/nbif_6_1_offset.h | 0 + .../{vega10/NBIF => nbif}/nbif_6_1_sh_mask.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_default.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_offset.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_sh_mask.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_default.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_offset.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h | 0 + .../{vega10/OSSSYS => oss}/osssys_4_0_offset.h | 0 + .../{vega10/OSSSYS => oss}/osssys_4_0_sh_mask.h | 0 + .../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 ----- + .../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 --- + .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 ------------------- + .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 - + .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 - + .../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 - + .../amd/include/asic_reg/sdma0/sdma0_4_0_default.h | 286 + + .../amd/include/asic_reg/sdma0/sdma0_4_0_offset.h | 547 + + .../amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h | 1852 ++ + .../{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h | 0 + .../{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h | 0 + .../amd/include/asic_reg/sdma1/sdma1_4_0_default.h | 282 + + .../amd/include/asic_reg/sdma1/sdma1_4_0_offset.h | 539 + + .../amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h | 1810 ++ + .../{vega10/SMUIO => smuio}/smuio_9_0_offset.h | 0 + .../{vega10/SMUIO => smuio}/smuio_9_0_sh_mask.h | 0 + .../{raven1/THM => thm}/thm_10_0_default.h | 0 + .../asic_reg/{raven1/THM => thm}/thm_10_0_offset.h | 0 + .../{raven1/THM => thm}/thm_10_0_sh_mask.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_default.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_offset.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/umc/umc_6_0_default.h | 31 + + .../drm/amd/include/asic_reg/umc/umc_6_0_offset.h | 52 + + .../drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h | 36 + + .../asic_reg/{vega10/UVD => uvd}/uvd_7_0_offset.h | 0 + .../asic_reg/{vega10/UVD => uvd}/uvd_7_0_sh_mask.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_default.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_offset.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_sh_mask.h | 0 + .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h | 0 + .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h | 0 + .../asic_reg/vega10/ATHUB/athub_1_0_default.h | 241 - + .../asic_reg/vega10/ATHUB/athub_1_0_offset.h | 453 - + .../asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h | 2045 -- + .../include/asic_reg/vega10/DC/dce_12_0_default.h | 9868 ------ + .../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 - + .../include/asic_reg/vega10/HDP/hdp_4_0_offset.h | 209 - + .../include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h | 601 - + .../include/asic_reg/vega10/MP/mp_9_0_default.h | 342 - + .../amd/include/asic_reg/vega10/MP/mp_9_0_offset.h | 375 - + .../include/asic_reg/vega10/MP/mp_9_0_sh_mask.h | 1463 - + .../asic_reg/vega10/NBIF/nbif_6_1_default.h | 1271 - + .../asic_reg/vega10/OSSSYS/osssys_4_0_default.h | 176 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_default.h | 286 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_offset.h | 547 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h | 1852 -- + .../asic_reg/vega10/SDMA1/sdma1_4_0_default.h | 282 - + .../asic_reg/vega10/SDMA1/sdma1_4_0_offset.h | 539 - + .../asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h | 1810 -- + .../asic_reg/vega10/SMUIO/smuio_9_0_default.h | 100 - + .../include/asic_reg/vega10/UVD/uvd_7_0_default.h | 127 - + drivers/gpu/drm/amd/include/dm_pp_interface.h | 144 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 294 + + .../amd/include/{asic_reg/vega10 => }/soc15ip.h | 0 + .../include/{asic_reg/vega10 => }/vega10_enum.h | 0 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 158 +- + .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 2 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 33 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h | 23 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 275 +- + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 18 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 21 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 10 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 +- + drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 9 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 134 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 51 +- + drivers/gpu/drm/amd/scheduler/spsc_queue.h | 121 + + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 8 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 24 +- + drivers/gpu/drm/arm/malidp_drv.h | 1 - + drivers/gpu/drm/arm/malidp_planes.c | 3 +- + drivers/gpu/drm/ast/ast_ttm.c | 9 +- + drivers/gpu/drm/bochs/bochs_mm.c | 6 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 2 - + drivers/gpu/drm/bridge/sil-sii8620.c | 53 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 2 + + drivers/gpu/drm/cirrus/cirrus_main.c | 9 + + drivers/gpu/drm/cirrus/cirrus_ttm.c | 6 +- + drivers/gpu/drm/drm_atomic.c | 25 +- + drivers/gpu/drm/drm_atomic_helper.c | 112 +- + drivers/gpu/drm/drm_connector.c | 73 + + drivers/gpu/drm/drm_debugfs.c | 8 + + drivers/gpu/drm/drm_dp_helper.c | 1 - + drivers/gpu/drm/drm_drv.c | 47 - + drivers/gpu/drm/drm_edid.c | 104 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 37 - + drivers/gpu/drm/drm_fb_helper.c | 163 +- + drivers/gpu/drm/drm_framebuffer.c | 87 +- + drivers/gpu/drm/drm_gem.c | 21 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 53 +- + drivers/gpu/drm/drm_internal.h | 7 + + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_modeset_helper.c | 76 + + .../drm/drm_panel_orientation_quirks.c} | 101 +- + drivers/gpu/drm/drm_plane_helper.c | 111 +- + drivers/gpu/drm/drm_prime.c | 8 +- + drivers/gpu/drm/drm_print.c | 54 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 9 +- + drivers/gpu/drm/drm_syncobj.c | 11 +- + drivers/gpu/drm/drm_vblank.c | 12 +- + drivers/gpu/drm/drm_vma_manager.c | 15 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 25 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - + drivers/gpu/drm/gma500/mmu.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 6 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 29 + + drivers/gpu/drm/i915/Makefile | 32 +- + drivers/gpu/drm/i915/gvt/Makefile | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 225 +- + drivers/gpu/drm/i915/gvt/debug.h | 24 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 212 + + drivers/gpu/drm/i915/gvt/execlist.c | 496 +- + drivers/gpu/drm/i915/gvt/execlist.h | 8 +- + drivers/gpu/drm/i915/gvt/firmware.c | 26 +- + drivers/gpu/drm/i915/gvt/gtt.c | 261 +- + drivers/gpu/drm/i915/gvt/gtt.h | 42 +- + drivers/gpu/drm/i915/gvt/gvt.c | 148 +- + drivers/gpu/drm/i915/gvt/gvt.h | 71 +- + drivers/gpu/drm/i915/gvt/handlers.c | 92 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 130 +- + drivers/gpu/drm/i915/gvt/mmio.c | 32 +- + drivers/gpu/drm/i915/gvt/mmio.h | 4 + + drivers/gpu/drm/i915/gvt/mpt.h | 34 +- + drivers/gpu/drm/i915/gvt/opregion.c | 275 +- + drivers/gpu/drm/i915/gvt/reg.h | 6 +- + drivers/gpu/drm/i915/gvt/render.c | 17 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 656 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 28 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 34 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 20 +- + drivers/gpu/drm/i915/i915_debugfs.c | 274 +- + drivers/gpu/drm/i915/i915_drv.c | 115 +- + drivers/gpu/drm/i915/i915_drv.h | 114 +- + drivers/gpu/drm/i915/i915_gem.c | 331 +- + drivers/gpu/drm/i915/i915_gem.h | 12 +- + drivers/gpu/drm/i915/i915_gem_context.c | 362 +- + drivers/gpu/drm/i915/i915_gem_context.h | 4 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 83 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 86 +- + drivers/gpu/drm/i915/i915_gem_object.h | 11 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 139 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 27 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 138 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 54 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 9 + + drivers/gpu/drm/i915/i915_gem_timeline.c | 6 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 162 +- + drivers/gpu/drm/i915/i915_irq.c | 12 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 4 +- + drivers/gpu/drm/i915/i915_oa_bxt.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cflgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cflgt3.c | 109 + + drivers/gpu/drm/i915/i915_oa_cflgt3.h | 34 + + drivers/gpu/drm/i915/i915_oa_chv.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cnl.c | 121 + + drivers/gpu/drm/i915/i915_oa_cnl.h | 34 + + drivers/gpu/drm/i915/i915_oa_glk.c | 4 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 4 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 4 +- + drivers/gpu/drm/i915/i915_params.c | 15 - + drivers/gpu/drm/i915/i915_params.h | 3 - + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/i915_perf.c | 153 +- + drivers/gpu/drm/i915/i915_pmu.c | 865 + + drivers/gpu/drm/i915/i915_pmu.h | 111 + + drivers/gpu/drm/i915/i915_reg.h | 83 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 33 +- + drivers/gpu/drm/i915/i915_utils.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 6 +- + drivers/gpu/drm/i915/intel_audio.c | 202 +- + drivers/gpu/drm/i915/intel_bios.c | 24 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 54 +- + drivers/gpu/drm/i915/intel_cdclk.c | 393 +- + drivers/gpu/drm/i915/intel_color.c | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 46 +- + drivers/gpu/drm/i915/intel_csr.c | 9 +- + drivers/gpu/drm/i915/intel_ddi.c | 343 +- + drivers/gpu/drm/i915/intel_device_info.c | 121 +- + drivers/gpu/drm/i915/intel_display.c | 1055 +- + drivers/gpu/drm/i915/intel_dp.c | 594 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 79 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 122 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 107 +- + drivers/gpu/drm/i915/intel_drv.h | 82 +- + drivers/gpu/drm/i915/intel_dsi.c | 47 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 + + drivers/gpu/drm/i915/intel_engine_cs.c | 372 +- + drivers/gpu/drm/i915/intel_fbc.c | 35 +- + drivers/gpu/drm/i915/intel_guc.c | 41 +- + drivers/gpu/drm/i915/intel_guc.h | 17 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 1 + + drivers/gpu/drm/i915/intel_guc_fw.c | 184 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 40 + + .../drm/i915/{i915_guc_reg.h => intel_guc_reg.h} | 14 +- + ...915_guc_submission.c => intel_guc_submission.c} | 711 +- + ...915_guc_submission.h => intel_guc_submission.h} | 15 +- + drivers/gpu/drm/i915/intel_gvt.c | 5 - + drivers/gpu/drm/i915/intel_hangcheck.c | 44 +- + drivers/gpu/drm/i915/intel_hdmi.c | 112 +- + drivers/gpu/drm/i915/intel_huc.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 267 +- + drivers/gpu/drm/i915/intel_lrc.h | 5 - + drivers/gpu/drm/i915/intel_lvds.c | 2 + + drivers/gpu/drm/i915/intel_modes.c | 1 - + drivers/gpu/drm/i915/intel_opregion.c | 4 +- + drivers/gpu/drm/i915/intel_panel.c | 88 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 397 +- + drivers/gpu/drm/i915/intel_psr.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 747 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 253 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- + drivers/gpu/drm/i915/intel_sdvo.c | 6 +- + drivers/gpu/drm/i915/intel_sprite.c | 96 +- + drivers/gpu/drm/i915/intel_tv.c | 6 +- + drivers/gpu/drm/i915/intel_uc.c | 22 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 172 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 8 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 179 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 16 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 33 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 48 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 22 +- + drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 2 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_syncmap.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 369 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 9 - + drivers/gpu/drm/i915/selftests/intel_uncore.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 41 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/gpu/drm/meson/meson_plane.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 9 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 37 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nv50_display.c | 26 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 62 + + drivers/gpu/drm/qxl/qxl_display.c | 63 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 + + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 6 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 14 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 22 - + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_mn.c | 3 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 - + drivers/gpu/drm/radeon/radeon_object.c | 14 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 31 +- + drivers/gpu/drm/radeon/radeon_vm.c | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 38 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 62 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 4 - + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 75 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 4 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 64 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 28 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 30 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 6 + + drivers/gpu/drm/selftests/test-drm_mm.c | 5 + + drivers/gpu/drm/sti/Kconfig | 1 + + drivers/gpu/drm/sti/sti_awg_utils.c | 2 +- + drivers/gpu/drm/sti/sti_awg_utils.h | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 2 +- + drivers/gpu/drm/sti/sti_compositor.h | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_crtc.h | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.h | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_drv.h | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.h | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 12 +- + drivers/gpu/drm/sti/sti_hdmi.h | 2 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.h | 2 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/sti/sti_hqvdp_lut.h | 2 +- + drivers/gpu/drm/sti/sti_mixer.c | 2 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 +- + drivers/gpu/drm/sti/sti_plane.c | 2 +- + drivers/gpu/drm/sti/sti_plane.h | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 2 +- + drivers/gpu/drm/sti/sti_vid.c | 2 +- + drivers/gpu/drm/sti/sti_vid.h | 2 +- + drivers/gpu/drm/sti/sti_vtg.c | 40 +- + drivers/gpu/drm/sti/sti_vtg.h | 2 +- + drivers/gpu/drm/stm/drv.c | 3 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 9 +- + drivers/gpu/drm/stm/ltdc.c | 69 +- + drivers/gpu/drm/stm/ltdc.h | 3 +- + drivers/gpu/drm/sun4i/Makefile | 4 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 8 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 93 + + drivers/gpu/drm/sun4i/sun8i_csc.h | 36 + + drivers/gpu/drm/sun4i/sun8i_layer.c | 134 - + drivers/gpu/drm/sun4i/sun8i_layer.h | 36 - + drivers/gpu/drm/sun4i/sun8i_mixer.c | 496 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 123 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 349 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 63 + + drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 172 + + drivers/gpu/drm/sun4i/sun8i_ui_scaler.h | 49 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 390 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 51 + + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 971 + + drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 58 + + drivers/gpu/drm/tegra/dc.c | 4 +- + drivers/gpu/drm/tegra/output.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tinydrm/Kconfig | 10 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 67 - + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 4 +- + drivers/gpu/drm/tinydrm/ili9225.c | 468 + + drivers/gpu/drm/tinydrm/mi0283qt.c | 7 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 32 +- + drivers/gpu/drm/ttm/ttm_bo.c | 263 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 5 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 16 +- + drivers/gpu/drm/vc4/vc4_plane.c | 38 +- + drivers/gpu/drm/via/via_drv.h | 4 +- + drivers/gpu/drm/via/via_irq.c | 27 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 12 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- + drivers/gpu/drm/zte/zx_hdmi.c | 1 + + drivers/gpu/drm/zte/zx_plane.c | 15 +- + drivers/media/platform/vsp1/vsp1_drm.c | 37 +- + drivers/staging/vboxvideo/vbox_ttm.c | 17 +- + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/core/Makefile | 3 - + drivers/video/fbdev/core/fbcon.c | 22 +- + drivers/video/fbdev/core/fbcon.h | 6 - + drivers/video/fbdev/core/fbsysfs.c | 1 + + drivers/video/fbdev/efifb.c | 21 +- + drivers/video/hdmi.c | 51 +- + include/drm/drmP.h | 197 +- + include/drm/drm_atomic_helper.h | 7 + + include/drm/drm_connector.h | 54 +- + include/drm/drm_device.h | 9 + + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_drv.h | 22 +- + include/drm/drm_edid.h | 2 +- + include/drm/drm_encoder.h | 6 +- + include/drm/drm_fb_cma_helper.h | 6 - + include/drm/drm_fb_helper.h | 19 + + include/drm/drm_framebuffer.h | 2 +- + include/drm/drm_gem_cma_helper.h | 16 +- + include/drm/drm_mm.h | 2 +- + include/drm/drm_mode_config.h | 18 +- + include/drm/drm_modeset_helper.h | 3 + + include/drm/drm_modeset_helper_vtables.h | 3 - + include/drm/drm_plane.h | 14 +- + include/drm/drm_plane_helper.h | 5 - + include/drm/drm_print.h | 219 + + include/drm/drm_syncobj.h | 2 +- + include/drm/drm_utils.h | 15 + + include/drm/drm_vma_manager.h | 2 +- + include/drm/tinydrm/mipi-dbi.h | 4 +- + include/drm/tinydrm/tinydrm.h | 5 +- + include/drm/ttm/ttm_bo_api.h | 152 +- + include/drm/ttm/ttm_bo_driver.h | 150 +- + include/linux/dma-fence-array.h | 3 + + include/linux/dma-fence.h | 2 +- + include/linux/fb.h | 5 + + include/linux/reservation.h | 23 + + include/uapi/drm/amdgpu_drm.h | 12 + + include/uapi/drm/i915_drm.h | 77 + + 649 files changed, 32224 insertions(+), 81340 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9225.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt + mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_link.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_stream.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/DC => dce}/dce_12_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/DC => dce}/dce_12_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/GC => gc}/gc_9_1_offset.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIF => nbif}/nbif_6_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIF => nbif}/nbif_6_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/OSSSYS => oss}/osssys_4_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/OSSSYS => oss}/osssys_4_0_sh_mask.h (100%) + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SMUIO => smuio}/smuio_9_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SMUIO => smuio}/smuio_9_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/UVD => uvd}/uvd_7_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/UVD => uvd}/uvd_7_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h (100%) + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/kgd_pp_interface.h + rename drivers/gpu/drm/amd/include/{asic_reg/vega10 => }/soc15ip.h (100%) + rename drivers/gpu/drm/amd/include/{asic_reg/vega10 => }/vega10_enum.h (100%) + create mode 100644 drivers/gpu/drm/amd/scheduler/spsc_queue.h + rename drivers/{video/fbdev/core/fbcon_dmi_quirks.c => gpu/drm/drm_panel_orientation_quirks.c} (50%) + create mode 100644 drivers/gpu/drm/i915/gvt/debugfs.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.h + create mode 100644 drivers/gpu/drm/i915/i915_pmu.c + create mode 100644 drivers/gpu/drm/i915/i915_pmu.h + rename drivers/gpu/drm/i915/{i915_guc_reg.h => intel_guc_reg.h} (92%) + rename drivers/gpu/drm/i915/{i915_guc_submission.c => intel_guc_submission.c} (63%) + rename drivers/gpu/drm/i915/{i915_guc_submission.h => intel_guc_submission.h} (88%) + create mode 100644 drivers/gpu/drm/i915/selftests/intel_guc.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_csc.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_csc.h + delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c + delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_scaler.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_scaler.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_scaler.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_scaler.h + create mode 100644 drivers/gpu/drm/tinydrm/ili9225.c + create mode 100644 include/drm/drm_utils.h +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (59e4b19d622a drm/i915: Dump the engine state before declaring wedged from wait_for_engines()) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 5 +- + arch/x86/kernel/early-quirks.c | 86 ++-- + drivers/char/agp/intel-gtt.c | 16 +- + drivers/gpu/drm/i915/gvt/Makefile | 3 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 3 +- + drivers/gpu/drm/i915/gvt/display.c | 2 +- + drivers/gpu/drm/i915/gvt/display.h | 2 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 538 +++++++++++++++++++++++ + drivers/gpu/drm/i915/gvt/dmabuf.h | 67 +++ + drivers/gpu/drm/i915/gvt/execlist.c | 8 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 508 +++++++++++++++++++++ + drivers/gpu/drm/i915/gvt/fb_decoder.h | 169 +++++++ + drivers/gpu/drm/i915/gvt/gvt.c | 2 + + drivers/gpu/drm/i915/gvt/gvt.h | 19 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 3 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 161 ++++++- + drivers/gpu/drm/i915/gvt/mpt.h | 45 ++ + drivers/gpu/drm/i915/gvt/opregion.c | 137 +++--- + drivers/gpu/drm/i915/gvt/sched_policy.c | 5 + + drivers/gpu/drm/i915/gvt/sched_policy.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 14 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 7 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 17 +- + drivers/gpu/drm/i915/i915_debugfs.c | 48 +- + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 49 ++- + drivers/gpu/drm/i915/i915_gem.c | 108 +++-- + drivers/gpu/drm/i915/i915_gem_context.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 102 ++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- + drivers/gpu/drm/i915/i915_gem_object.h | 2 + + drivers/gpu/drm/i915/i915_gem_request.c | 14 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 275 ++++-------- + drivers/gpu/drm/i915/i915_gem_tiling.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 2 +- + drivers/gpu/drm/i915/i915_params.c | 11 +- + drivers/gpu/drm/i915/i915_params.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 34 +- + drivers/gpu/drm/i915/i915_vma.h | 35 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 73 +-- + drivers/gpu/drm/i915/intel_csr.c | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 16 +- + drivers/gpu/drm/i915/intel_display.c | 39 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 44 +- + drivers/gpu/drm/i915/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/intel_fbdev.c | 3 +- + drivers/gpu/drm/i915/intel_guc.c | 3 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 63 +-- + drivers/gpu/drm/i915/intel_guc_fw.h | 2 +- + drivers/gpu/drm/i915/intel_guc_log.c | 6 +- + drivers/gpu/drm/i915/intel_gvt.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_huc.c | 81 ++-- + drivers/gpu/drm/i915/intel_huc.h | 6 +- + drivers/gpu/drm/i915/intel_lrc.c | 13 +- + drivers/gpu/drm/i915/intel_overlay.c | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 35 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 5 + + drivers/gpu/drm/i915/intel_uc.c | 166 ++++--- + drivers/gpu/drm/i915/intel_uc.h | 19 + + drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 5 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 4 +- + include/drm/i915_drm.h | 3 + + include/drm/intel-gtt.h | 3 +- + include/uapi/linux/vfio.h | 62 +++ + 73 files changed, 2494 insertions(+), 784 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gvt/dmabuf.c + create mode 100644 drivers/gpu/drm/i915/gvt/dmabuf.h + create mode 100644 drivers/gpu/drm/i915/gvt/fb_decoder.c + create mode 100644 drivers/gpu/drm/i915/gvt/fb_decoder.h +Merging drm-tegra/drm/tegra/for-next (e1335e2f0cfc drm/tegra: sor: Reimplement pad clock) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (d3820952ea1b drm/tinydrm: Use drm_fb_cma_fbdev_init_with_funcs/fini()) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/gpu/drm/drm_mode_config.c +Merge made by the 'recursive' strategy. + .../bindings/display/amlogic,meson-dw-hdmi.txt | 4 + + .../bindings/display/amlogic,meson-vpu.txt | 4 + + Documentation/gpu/todo.rst | 5 - + drivers/gpu/drm/arm/malidp_drv.c | 39 ++----- + drivers/gpu/drm/arm/malidp_drv.h | 1 - + drivers/gpu/drm/armada/armada_drm.h | 1 - + drivers/gpu/drm/armada/armada_drv.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 11 +- + drivers/gpu/drm/armada/armada_fbdev.c | 8 -- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 26 +---- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 119 ++++++++++++++++++++- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- + drivers/gpu/drm/drm_mode_config.c | 3 + + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 18 ---- + drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 2 - + drivers/gpu/drm/gma500/framebuffer.c | 9 +- + drivers/gpu/drm/gma500/psb_drv.c | 15 +-- + drivers/gpu/drm/imx/imx-drm-core.c | 33 ++---- + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/meson/meson_drv.c | 9 ++ + drivers/gpu/drm/meson/meson_dw_hdmi.c | 13 +++ + drivers/gpu/drm/meson/meson_registers.h | 4 + + drivers/gpu/drm/msm/msm_drv.c | 18 +--- + drivers/gpu/drm/nouveau/nouveau_display.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 8 -- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 3 +- + drivers/gpu/drm/nouveau/nv50_display.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 34 +----- + drivers/gpu/drm/pl111/pl111_drm.h | 1 - + drivers/gpu/drm/pl111/pl111_drv.c | 16 +-- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 9 +- + drivers/gpu/drm/sti/sti_drv.c | 27 +---- + drivers/gpu/drm/sti/sti_drv.h | 1 - + drivers/gpu/drm/stm/drv.c | 38 ++----- + drivers/gpu/drm/stm/ltdc.h | 1 - + drivers/gpu/drm/sun4i/sun4i_drv.c | 14 +-- + drivers/gpu/drm/sun4i/sun4i_drv.h | 2 - + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 18 +--- + drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 2 +- + drivers/gpu/drm/tegra/drm.c | 13 +-- + drivers/gpu/drm/tegra/drm.h | 4 - + drivers/gpu/drm/tegra/fb.c | 14 --- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 26 +---- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 37 +------ + drivers/gpu/drm/tinydrm/ili9225.c | 3 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +- + drivers/gpu/drm/tinydrm/st7586.c | 3 +- + drivers/gpu/drm/tve200/tve200_drm.h | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 16 +-- + drivers/gpu/drm/vc4/vc4_drv.c | 13 +-- + drivers/gpu/drm/vc4/vc4_drv.h | 2 - + drivers/gpu/drm/vc4/vc4_kms.c | 18 +--- + drivers/gpu/drm/zte/zx_drm_drv.c | 48 ++------- + include/drm/drm_fb_cma_helper.h | 7 ++ + include/drm/tinydrm/tinydrm.h | 3 - + 61 files changed, 260 insertions(+), 512 deletions(-) +Merging drm-msm/msm-next (ad9d50c79043 drm/msm: free kstrdup'd cmdline) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_drv.h | 3 ++- + drivers/gpu/drm/msm/msm_gpu.c | 2 ++ + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.) +$ 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 (d66611856832 drm/imx: advertise supported plane format modifiers) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/imx/imx-drm-core.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm-core.c | 1 + + drivers/gpu/drm/imx/ipuv3-plane.c | 102 ++++++++++++++++++++++++++++++++++--- + drivers/gpu/ipu-v3/ipu-pre.c | 29 +++++++++-- + drivers/gpu/ipu-v3/ipu-prg.c | 84 +++++++++++++++++++++--------- + drivers/gpu/ipu-v3/ipu-prv.h | 4 +- + include/video/imx-ipu-v3.h | 2 +- + 6 files changed, 184 insertions(+), 38 deletions(-) +Merging etnaviv/etnaviv/next (49b82c389d2a drm/etnaviv: make THERMAL selectable) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/Kconfig | 9 +++++++++ + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +++++--- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 14 ++++++-------- + 4 files changed, 21 insertions(+), 11 deletions(-) +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (a7821505a87c Merge remote-tracking branches 'regmap/topic/hwspinlock' and 'regmap/topic/nolock' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 4 ---- + drivers/base/regmap/regmap.c | 20 ++++++++++---------- + include/linux/regmap.h | 5 +++++ + 3 files changed, 15 insertions(+), 14 deletions(-) +Merging sound/for-next (108884e6c5aa ALSA: usb-audio: Change the semantics of the enable option) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/pcm.h | 8 +++ + include/sound/soc-dai.h | 2 + + include/uapi/sound/asound.h | 9 +++ + sound/core/pcm_misc.c | 19 +++++- + sound/drivers/dummy.c | 2 +- + sound/isa/gus/gus_dma.c | 5 +- + sound/mips/hal2.c | 2 +- + sound/mips/sgio2audio.c | 2 +- + sound/pci/ice1712/prodigy_hifi.c | 131 ++++++++++++++++++++++++++++++--------- + sound/pci/korg1212/korg1212.c | 1 - + sound/usb/card.c | 21 +++++-- + 11 files changed, 159 insertions(+), 43 deletions(-) +Merging sound-asoc/for-next (f47eee0b26a6 Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/da7218.txt | 2 +- + Documentation/devicetree/bindings/sound/da7219.txt | 2 +- + .../devicetree/bindings/sound/nau8825.txt | 4 +- + .../devicetree/bindings/sound/pcm186x.txt | 42 ++ + .../devicetree/bindings/sound/st,stm32-sai.txt | 12 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + + .../devicetree/bindings/sound/tas5720.txt | 4 +- + .../devicetree/bindings/sound/tfa9879.txt | 8 +- + .../devicetree/bindings/sound/ti,tas6424.txt | 20 + + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- + .../devicetree/bindings/sound/tlv320aic3x.txt | 10 +- + .../devicetree/bindings/sound/uniphier,evea.txt | 26 + + MAINTAINERS | 7 + + include/sound/hdaudio_ext.h | 4 +- + include/sound/rt5514.h | 2 + + include/sound/rt5645.h | 3 + + include/sound/soc.h | 2 + + include/uapi/sound/snd_sst_tokens.h | 17 +- + sound/hda/ext/hdac_ext_bus.c | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/acp-pcm-dma.c | 42 +- + sound/soc/atmel/Kconfig | 2 +- + sound/soc/atmel/atmel-classd.c | 6 - + sound/soc/cirrus/ep93xx-ac97.c | 6 +- + sound/soc/codecs/88pm860x-codec.c | 9 +- + sound/soc/codecs/Kconfig | 25 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/cq93vc.c | 10 +- + sound/soc/codecs/cs35l32.c | 18 +- + sound/soc/codecs/cs35l34.c | 19 +- + sound/soc/codecs/cs42l52.c | 13 +- + sound/soc/codecs/cs42l56.c | 13 +- + sound/soc/codecs/cs42l73.c | 13 +- + sound/soc/codecs/cs47l24.c | 12 +- + sound/soc/codecs/cx20442.c | 44 +- + sound/soc/codecs/da7213.c | 7 +- + sound/soc/codecs/da7218.c | 11 +- + sound/soc/codecs/hdac_hdmi.c | 352 +++++----- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/max98927.c | 1 - + sound/soc/codecs/mc13783.c | 9 +- + sound/soc/codecs/msm8916-wcd-analog.c | 10 +- + sound/soc/codecs/msm8916-wcd-digital.c | 4 +- + sound/soc/codecs/nau8540.c | 98 ++- + sound/soc/codecs/nau8540.h | 20 + + sound/soc/codecs/nau8824.c | 18 +- + sound/soc/codecs/nau8825.c | 101 +-- + sound/soc/codecs/nau8825.h | 3 +- + sound/soc/codecs/pcm186x-i2c.c | 69 ++ + sound/soc/codecs/pcm186x-spi.c | 69 ++ + sound/soc/codecs/pcm186x.c | 719 +++++++++++++++++++++ + sound/soc/codecs/pcm186x.h | 220 +++++++ + sound/soc/codecs/pcm512x-spi.c | 4 + + sound/soc/codecs/rt5514-spi.c | 12 +- + sound/soc/codecs/rt5514.c | 87 ++- + sound/soc/codecs/rt5514.h | 5 +- + sound/soc/codecs/rt5645.c | 6 + + sound/soc/codecs/si476x.c | 9 +- + sound/soc/codecs/spdif_receiver.c | 5 +- + sound/soc/codecs/spdif_transmitter.c | 5 +- + sound/soc/codecs/tas5720.c | 61 +- + sound/soc/codecs/tas5720.h | 31 + + sound/soc/codecs/tas6424.c | 707 ++++++++++++++++++++ + sound/soc/codecs/tas6424.h | 144 +++++ + sound/soc/codecs/tfa9879.c | 1 + + sound/soc/codecs/tlv320aic31xx.c | 310 ++++----- + sound/soc/codecs/tlv320aic31xx.h | 335 ++++------ + sound/soc/codecs/tlv320aic3x.c | 15 +- + sound/soc/codecs/tlv320dac33.c | 45 +- + sound/soc/codecs/ts3a227e.c | 2 +- + sound/soc/codecs/twl4030.c | 15 +- + sound/soc/codecs/twl6040.c | 20 +- + sound/soc/codecs/uda1380.c | 44 +- + sound/soc/codecs/wm0010.c | 5 +- + sound/soc/codecs/wm2000.c | 6 +- + sound/soc/codecs/wm5102.c | 11 +- + sound/soc/codecs/wm5110.c | 12 +- + sound/soc/codecs/wm8350.c | 10 +- + sound/soc/codecs/wm8400.c | 9 +- + sound/soc/codecs/wm8903.c | 12 +- + sound/soc/codecs/wm8994.c | 10 +- + sound/soc/codecs/wm8997.c | 11 +- + sound/soc/codecs/wm8998.c | 12 +- + sound/soc/codecs/wm_adsp.c | 12 +- + sound/soc/fsl/eukrea-tlv320.c | 1 - + sound/soc/fsl/fsl-asoc-card.c | 4 +- + sound/soc/fsl/fsl_asrc.h | 6 +- + sound/soc/fsl/fsl_ssi.c | 111 +++- + sound/soc/hisilicon/hi6210-i2s.c | 1 - + sound/soc/intel/atom/sst/sst_acpi.c | 3 + + sound/soc/intel/boards/bytcr_rt5651.c | 14 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/mfld_machine.c | 2 + + sound/soc/intel/common/sst-dsp.c | 4 +- + sound/soc/intel/skylake/skl-i2s.h | 64 ++ + sound/soc/intel/skylake/skl-messages.c | 18 + + sound/soc/intel/skylake/skl-nhlt.c | 170 ++++- + sound/soc/intel/skylake/skl-pcm.c | 10 +- + sound/soc/intel/skylake/skl-ssp-clk.h | 79 +++ + sound/soc/intel/skylake/skl-sst-dsp.h | 3 + + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- + sound/soc/intel/skylake/skl-topology.c | 46 +- + sound/soc/intel/skylake/skl.c | 94 +++ + sound/soc/intel/skylake/skl.h | 21 + + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + sound/soc/nuc900/nuc900-ac97.c | 11 +- + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/qcom/apq8016_sbc.c | 10 +- + sound/soc/rockchip/rk3399_gru_sound.c | 3 +- + sound/soc/rockchip/rockchip_spdif.c | 18 +- + sound/soc/samsung/bells.c | 40 +- + sound/soc/sh/rcar/core.c | 147 +++-- + sound/soc/sh/rcar/dma.c | 104 +-- + sound/soc/sh/rcar/rsnd.h | 15 +- + sound/soc/sh/rcar/ssi.c | 161 +++-- + sound/soc/sh/rcar/ssiu.c | 5 +- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 13 +- + sound/soc/soc-utils.c | 2 +- + sound/soc/stm/stm32_sai.c | 114 +--- + sound/soc/sunxi/sun4i-codec.c | 29 +- + sound/soc/sunxi/sun4i-i2s.c | 21 + + sound/soc/uniphier/Kconfig | 19 + + sound/soc/uniphier/Makefile | 3 + + sound/soc/uniphier/evea.c | 567 ++++++++++++++++ + 128 files changed, 4698 insertions(+), 1371 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas6424.txt + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt + create mode 100644 sound/soc/codecs/pcm186x-i2c.c + create mode 100644 sound/soc/codecs/pcm186x-spi.c + create mode 100644 sound/soc/codecs/pcm186x.c + create mode 100644 sound/soc/codecs/pcm186x.h + create mode 100644 sound/soc/codecs/tas6424.c + create mode 100644 sound/soc/codecs/tas6424.h + create mode 100644 sound/soc/intel/skylake/skl-i2s.h + create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h + create mode 100644 sound/soc/uniphier/Kconfig + create mode 100644 sound/soc/uniphier/Makefile + create mode 100644 sound/soc/uniphier/evea.c +Merging modules/modules-next (ece1996a21ee module: Do not paper over type mismatches in module_param_call()) +$ git merge modules/modules-next +Already up to date. +Merging input/next (c1b433e04ef9 Input: gamecon - mark expected switch fall-throughs) +$ git merge input/next +Already up to date. +Merging block/for-next (50da70ed9c48 Merge branch 'for-4.15/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +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 (496cc64f4d10 dm: fix __send_changing_extent_only() to send first bio and chain remainder) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 4 +- + drivers/md/dm-bufio.c | 8 +- + drivers/md/dm-cache-target.c | 12 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-io.c | 3 +- + drivers/md/dm-mpath.c | 67 ++++++-- + drivers/md/dm-raid.c | 269 ++++++++++++++++++++---------- + drivers/md/dm-snap.c | 48 +++--- + drivers/md/dm-table.c | 16 +- + drivers/md/dm-thin.c | 22 ++- + drivers/md/dm.c | 286 ++++++++++++++++---------------- + drivers/md/dm.h | 3 +- + include/linux/device-mapper.h | 15 -- + 13 files changed, 438 insertions(+), 318 deletions(-) +Merging mmc/next (e828b53afd7f Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + drivers/mmc/core/block.c | 1384 +++++++++++--------- + drivers/mmc/core/block.h | 12 +- + drivers/mmc/core/bus.c | 2 - + drivers/mmc/core/card.h | 2 + + drivers/mmc/core/core.c | 220 +--- + drivers/mmc/core/core.h | 47 +- + drivers/mmc/core/host.h | 6 +- + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_test.c | 221 ++-- + drivers/mmc/core/queue.c | 504 ++++--- + drivers/mmc/core/queue.h | 64 +- + drivers/mmc/core/quirks.h | 8 + + drivers/mmc/core/slot-gpio.c | 14 +- + drivers/mmc/host/Kconfig | 14 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/cqhci.c | 1150 ++++++++++++++++ + drivers/mmc/host/cqhci.h | 240 ++++ + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-acpi.c | 128 +- + drivers/mmc/host/sdhci-of-arasan.c | 12 + + drivers/mmc/host/sdhci-of-esdhc.c | 8 + + drivers/mmc/host/sdhci-pci-core.c | 155 ++- + drivers/mmc/host/sunxi-mmc.c | 4 +- + drivers/mmc/host/tmio_mmc_core.c | 8 +- + include/linux/mmc/host.h | 5 +- + 26 files changed, 3064 insertions(+), 1149 deletions(-) + create mode 100644 drivers/mmc/host/cqhci.c + create mode 100644 drivers/mmc/host/cqhci.h +Merging md/for-next (474beb575c03 md/raid1,raid10: silence warning about wait-within-wait) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Auto-merging drivers/md/dm-raid.c +Merge made by the 'recursive' strategy. + drivers/md/dm-raid.c | 9 +++++++++ + drivers/md/md.c | 26 ++++++++++++++++++++------ + drivers/md/md.h | 8 ++++++++ + drivers/md/raid1.c | 11 +++++++++++ + drivers/md/raid10.c | 12 ++++++++++++ + drivers/md/raid5-cache.c | 22 +++++++++++++++++----- + drivers/md/raid5-log.h | 1 + + drivers/md/raid5.c | 10 ++++++++++ + 8 files changed, 88 insertions(+), 11 deletions(-) +Merging mfd/for-mfd-next (15a94ce2b7ae mfd: stm32: Adopt SPDX identifier) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/rtsx_pci.h +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/misc/cardreader/rtsx_usb.c +Auto-merging drivers/misc/cardreader/rtsx_pcr.h +Auto-merging drivers/misc/cardreader/rtsx_pcr.c +Auto-merging drivers/misc/cardreader/rts5249.c +Auto-merging drivers/misc/cardreader/rts5229.c +Auto-merging drivers/misc/cardreader/rts5227.c +Auto-merging drivers/misc/cardreader/rts5209.c +Auto-merging drivers/misc/cardreader/rtl8411.c +Auto-merging drivers/mfd/cros_ec_spi.c +Merge made by the 'recursive' strategy. + drivers/leds/leds-pm8058.c | 2 +- + drivers/memstick/host/Kconfig | 4 +- + drivers/memstick/host/rtsx_pci_ms.c | 2 +- + drivers/memstick/host/rtsx_usb_ms.c | 2 +- + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 4 - + drivers/mfd/ab8500-debugfs.c | 35 +- + drivers/mfd/axp20x.c | 3 + + drivers/mfd/cros_ec_spi.c | 25 +- + drivers/mfd/kempld-core.c | 2 +- + drivers/mfd/palmas.c | 10 +- + drivers/mfd/pcf50633-core.c | 2 +- + drivers/mfd/stm32-lptimer.c | 6 +- + drivers/mfd/stm32-timers.c | 4 +- + drivers/mfd/ti_am335x_tscadc.c | 2 +- + drivers/mfd/tmio_core.c | 20 + + drivers/misc/Kconfig | 5 + + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/Kconfig | 20 + + drivers/misc/cardreader/Makefile | 4 + + drivers/{mfd => misc/cardreader}/rtl8411.c | 2 +- + drivers/{mfd => misc/cardreader}/rts5209.c | 2 +- + drivers/{mfd => misc/cardreader}/rts5227.c | 2 +- + drivers/{mfd => misc/cardreader}/rts5229.c | 2 +- + drivers/{mfd => misc/cardreader}/rts5249.c | 3 +- + drivers/misc/cardreader/rts5260.c | 748 ++++++++++++++++++++++++++++ + drivers/misc/cardreader/rts5260.h | 45 ++ + drivers/{mfd => misc/cardreader}/rtsx_pcr.c | 125 ++++- + drivers/{mfd => misc/cardreader}/rtsx_pcr.h | 12 +- + drivers/{mfd => misc/cardreader}/rtsx_usb.c | 2 +- + drivers/mmc/host/Kconfig | 4 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + include/linux/mfd/palmas.h | 3 + + include/linux/mfd/stm32-lptimer.h | 6 +- + include/linux/mfd/stm32-timers.h | 4 +- + include/linux/mfd/tmio.h | 20 - + include/linux/{mfd => }/rtsx_common.h | 0 + include/linux/{mfd => }/rtsx_pci.h | 236 ++++++++- + include/linux/{mfd => }/rtsx_usb.h | 0 + 40 files changed, 1274 insertions(+), 122 deletions(-) + create mode 100644 drivers/misc/cardreader/Kconfig + create mode 100644 drivers/misc/cardreader/Makefile + rename drivers/{mfd => misc/cardreader}/rtl8411.c (99%) + rename drivers/{mfd => misc/cardreader}/rts5209.c (99%) + rename drivers/{mfd => misc/cardreader}/rts5227.c (99%) + rename drivers/{mfd => misc/cardreader}/rts5229.c (99%) + rename drivers/{mfd => misc/cardreader}/rts5249.c (99%) + create mode 100644 drivers/misc/cardreader/rts5260.c + create mode 100644 drivers/misc/cardreader/rts5260.h + rename drivers/{mfd => misc/cardreader}/rtsx_pcr.c (92%) + rename drivers/{mfd => misc/cardreader}/rtsx_pcr.h (88%) + rename drivers/{mfd => misc/cardreader}/rtsx_usb.c (99%) + rename include/linux/{mfd => }/rtsx_common.h (100%) + rename include/linux/{mfd => }/rtsx_pci.h (83%) + rename include/linux/{mfd => }/rtsx_usb.h (100%) +Merging backlight/for-backlight-next (29fae2c1db24 backlight: ili922x: Remove redundant variable len) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (70a39e107501 Add support for bq27521 battery monitor) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + + drivers/power/reset/zx-reboot.c | 4 + + drivers/power/supply/ab8500_charger.c | 6 +- + drivers/power/supply/bq24190_charger.c | 117 ++------------------- + drivers/power/supply/bq27xxx_battery.c | 39 ++++++- + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/cpcap-battery.c | 4 +- + drivers/power/supply/ltc2941-battery-gauge.c | 25 +++++ + drivers/power/supply/sbs-manager.c | 2 +- + include/linux/power/bq27xxx_battery.h | 1 + + 11 files changed, 88 insertions(+), 115 deletions(-) +Merging regulator/for-next (0cbd8b5da176 Merge remote-tracking branches 'regulator/topic/doc', 'regulator/topic/sc2731' and 'regulator/topic/tps65218' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/sprd,sc2731-regulator.txt | 43 ++++ + Documentation/power/regulator/machine.txt | 36 ++- + MAINTAINERS | 1 + + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 4 +- + drivers/regulator/sc2731-regulator.c | 256 +++++++++++++++++++++ + drivers/regulator/tps65218-regulator.c | 5 +- + 8 files changed, 328 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/sprd,sc2731-regulator.txt + create mode 100644 drivers/regulator/sc2731-regulator.c +Merging security/next-testing (457e594528bf Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Merge made by the 'recursive' strategy. + include/linux/seccomp.h | 8 ++++ + include/uapi/linux/ptrace.h | 6 +++ + kernel/ptrace.c | 4 ++ + kernel/seccomp.c | 106 +++++++++++++++++++++++++++++++------------- + 4 files changed, 94 insertions(+), 30 deletions(-) +Merging integrity/next (e87dafe70acc ima: Remove redundant conditional operator) +$ git merge integrity/next +Resolved 'Documentation/ABI/testing/evm' using previous resolution. +Resolved 'fs/namespace.c' using previous resolution. +Resolved 'include/linux/module.h' using previous resolution. +Auto-merging include/linux/module.h +CONFLICT (content): Merge conflict in include/linux/module.h +Auto-merging fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merging Documentation/ABI/testing/evm +CONFLICT (content): Merge conflict in Documentation/ABI/testing/evm +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54ed64e6570c] Merge remote-tracking branch 'integrity/next' +$ git diff -M --stat --summary HEAD^.. +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 (4b14752ec4e0 selinux: skip bounded transition processing if the policy isn't loaded) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/include/netlabel.h | 3 +-- + security/selinux/netlabel.c | 3 +-- + security/selinux/ss/services.c | 21 +++++++++++---------- + 3 files changed, 13 insertions(+), 14 deletions(-) +Merging tpmdd/next (db3248e8a036 tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()) +$ git merge tpmdd/next +Resolved 'include/linux/tpm_eventlog.h' using previous resolution. +Auto-merging security/keys/trusted.c +Auto-merging security/integrity/ima/ima_crypto.c +Auto-merging include/linux/tpm_eventlog.h +CONFLICT (content): Merge conflict in include/linux/tpm_eventlog.h +Auto-merging include/linux/efi.h +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/firmware/efi/Makefile +Auto-merging drivers/char/tpm/tpm_eventlog_of.c +Auto-merging drivers/char/tpm/tpm_eventlog_acpi.c +Auto-merging drivers/char/tpm/Makefile +Removing drivers/char/hw_random/tpm-rng.c +Auto-merging drivers/char/hw_random/Makefile +Auto-merging drivers/char/hw_random/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 422659a7221e22580f893f851ec69a6aaad8a889] Merge remote-tracking branch 'tpmdd/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/boot/compressed/eboot.c | 1 + + drivers/char/hw_random/Kconfig | 13 -- + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/tpm-rng.c | 50 ----- + drivers/char/tpm/Kconfig | 11 + + drivers/char/tpm/Makefile | 5 +- + drivers/char/tpm/tpm-chip.c | 67 ++++-- + drivers/char/tpm/tpm-interface.c | 231 +++++++++------------ + drivers/char/tpm/tpm.h | 52 ++++- + drivers/char/tpm/tpm1_eventlog.c | 13 +- + drivers/char/tpm/tpm2_eventlog.c | 2 +- + .../char/tpm/{tpm_acpi.c => tpm_eventlog_acpi.c} | 4 +- + drivers/char/tpm/tpm_eventlog_efi.c | 66 ++++++ + drivers/char/tpm/{tpm_of.c => tpm_eventlog_of.c} | 6 +- + drivers/char/tpm/tpm_tis.c | 121 ++--------- + drivers/char/tpm/tpm_tis_core.c | 221 +++++++++++++++++--- + drivers/char/tpm/tpm_tis_core.h | 17 ++ + drivers/char/tpm/xen-tpmfront.c | 61 ++++++ + drivers/firmware/efi/Makefile | 2 +- + drivers/firmware/efi/efi.c | 4 + + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/firmware/efi/libstub/tpm.c | 81 ++++++++ + drivers/firmware/efi/tpm.c | 40 ++++ + include/linux/efi.h | 46 ++++ + include/linux/tpm.h | 39 ++-- + {drivers/char/tpm => include/linux}/tpm_eventlog.h | 35 +--- + security/integrity/ima/ima_crypto.c | 2 +- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/ima/ima_queue.c | 2 +- + security/keys/trusted.c | 35 ++-- + 30 files changed, 797 insertions(+), 436 deletions(-) + delete mode 100644 drivers/char/hw_random/tpm-rng.c + rename drivers/char/tpm/{tpm_acpi.c => tpm_eventlog_acpi.c} (97%) + create mode 100644 drivers/char/tpm/tpm_eventlog_efi.c + rename drivers/char/tpm/{tpm_of.c => tpm_eventlog_of.c} (93%) + create mode 100644 drivers/firmware/efi/tpm.c + rename {drivers/char/tpm => include/linux}/tpm_eventlog.h (78%) +Merging watchdog/master (14807b07a7d8 watchdog: pcwd_usb: remove unneeded DRIVER_LICENSE #define) +$ git merge watchdog/master +Resolved 'drivers/watchdog/mpc8xxx_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/mpc8xxx_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/mpc8xxx_wdt.c +Removing drivers/watchdog/gemini_wdt.c +Auto-merging Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt +Auto-merging Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt +Removing Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a3e0f6be806] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 - + ...ina,gemin-watchdog.txt => faraday,ftwdt010.txt} | 11 +- + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 4 +- + .../bindings/watchdog/realtek,rtd119x.txt | 17 + + .../devicetree/bindings/watchdog/renesas-wdt.txt | 3 +- + .../devicetree/bindings/watchdog/sprd-wdt.txt | 19 + + drivers/watchdog/Kconfig | 38 +- + drivers/watchdog/Makefile | 4 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/aspeed_wdt.c | 21 +- + drivers/watchdog/da9062_wdt.c | 48 ++- + drivers/watchdog/dw_wdt.c | 18 +- + drivers/watchdog/f71808e_wdt.c | 4 +- + drivers/watchdog/ftwdt010_wdt.c | 236 ++++++++++++ + drivers/watchdog/gemini_wdt.c | 229 ------------ + drivers/watchdog/gpio_wdt.c | 58 ++- + drivers/watchdog/hpwdt.c | 12 +- + drivers/watchdog/i6300esb.c | 377 +++++++------------ + drivers/watchdog/jz4740_wdt.c | 1 + + drivers/watchdog/mei_wdt.c | 7 +- + drivers/watchdog/mpc8xxx_wdt.c | 83 ++--- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 5 +- + drivers/watchdog/rtd119x_wdt.c | 168 +++++++++ + drivers/watchdog/sprd_wdt.c | 399 +++++++++++++++++++++ + drivers/watchdog/sunxi_wdt.c | 7 +- + drivers/watchdog/watchdog_dev.c | 19 +- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/xen_wdt.c | 255 +++---------- + 31 files changed, 1223 insertions(+), 847 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt + rename Documentation/devicetree/bindings/watchdog/{cortina,gemin-watchdog.txt => faraday,ftwdt010.txt} (55%) + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/sprd-wdt.txt + create mode 100644 drivers/watchdog/ftwdt010_wdt.c + delete mode 100644 drivers/watchdog/gemini_wdt.c + create mode 100644 drivers/watchdog/rtd119x_wdt.c + create mode 100644 drivers/watchdog/sprd_wdt.c +Merging iommu/next (a593472591a5 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (d04222983379 Merge branches 'iommu/arm/smmu', 'iommu/updates', 'vfio/fixes', 'vfio/platform', 'iommu/vt-d', 'iommu/ipmmu-vmsa' and 'iommu/iova' into next) +$ git merge vfio/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (42d5e37654e4 audit: filter PATH records keyed on filesystem magic) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (aa199b746678 dt-bindings: arm: document supported STM32 SoC family) +$ git merge devicetree/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/stm32.txt | 9 +++++++++ + Documentation/devicetree/bindings/trivial-devices.txt | 1 + + drivers/of/Kconfig | 5 +++-- + drivers/of/irq.c | 3 +-- + 4 files changed, 14 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/stm32.txt +Merging mailbox/mailbox-for-next (1f90a2162fb3 mailbox/omap: unregister mbox class) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (0cf25e29d0bb Merge remote-tracking branches 'spi/topic/sun6i' and 'spi/topic/xilinx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | 18 ++++++++++++------ + Documentation/devicetree/bindings/spi/spi-meson.txt | 4 +++- + Documentation/devicetree/bindings/spi/spi-xilinx.txt | 2 +- + drivers/spi/spi-armada-3700.c | 8 ++++++++ + drivers/spi/spi-davinci.c | 4 ++-- + drivers/spi/spi-fsl-dspi.c | 2 +- + drivers/spi/spi-imx.c | 11 +++++------ + drivers/spi/spi-meson-spicc.c | 1 + + drivers/spi/spi-rspi.c | 4 ++-- + drivers/spi/spi-sh-msiof.c | 5 ++--- + drivers/spi/spi-sun4i.c | 2 +- + drivers/spi/spi-sun6i.c | 2 +- + drivers/spi/spi-xilinx.c | 12 ++++++++++++ + include/linux/spi/spi.h | 2 +- + 14 files changed, 52 insertions(+), 25 deletions(-) +Merging tip/auto-latest (638250bd465e Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging scripts/checkpatch.pl +Auto-merging init/main.c +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/acpi.h +Auto-merging arch/x86/tools/objdump_reformat.awk +Auto-merging arch/x86/tools/insn_decoder_test.c +Removing Documentation/locking/crossrelease.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/locking/crossrelease.txt | 874 --------------------- + .../process/kernel-enforcement-statement.rst | 1 + + Documentation/x86/boot.txt | 19 + + Documentation/x86/x86_64/mm.txt | 12 +- + arch/x86/Kconfig | 10 + + arch/x86/Kconfig.debug | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/boot/compressed/head_64.S | 16 +- + arch/x86/boot/compressed/misc.c | 16 + + arch/x86/boot/compressed/pagetable.c | 3 + + arch/x86/boot/compressed/pgtable_64.c | 28 + + arch/x86/boot/genimage.sh | 4 +- + arch/x86/boot/header.S | 6 +- + arch/x86/entry/calling.h | 145 ++++ + arch/x86/entry/entry_32.S | 14 +- + arch/x86/entry/entry_64.S | 237 +++++- + arch/x86/entry/entry_64_compat.S | 31 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 37 +- + arch/x86/events/intel/ds.c | 119 +-- + arch/x86/events/perf_event.h | 23 +- + arch/x86/include/asm/asm.h | 2 + + arch/x86/include/asm/cpufeature.h | 2 + + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/desc.h | 11 +- + arch/x86/include/asm/fixmap.h | 100 ++- + arch/x86/include/asm/hypervisor.h | 25 +- + arch/x86/include/asm/intel_ds.h | 36 + + arch/x86/include/asm/invpcid.h | 53 ++ + arch/x86/include/asm/irqflags.h | 3 + + arch/x86/include/asm/kdebug.h | 1 + + arch/x86/include/asm/mmu_context.h | 73 +- + arch/x86/include/asm/paravirt.h | 9 + + arch/x86/include/asm/pgtable.h | 20 +- + arch/x86/include/asm/pgtable_64.h | 123 +++ + arch/x86/include/asm/processor-flags.h | 5 + + arch/x86/include/asm/processor.h | 59 +- + arch/x86/include/asm/pti.h | 14 + + arch/x86/include/asm/stacktrace.h | 3 + + arch/x86/include/asm/switch_to.h | 8 +- + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 310 ++++++-- + arch/x86/include/asm/traps.h | 1 - + arch/x86/include/asm/unwind.h | 7 + + arch/x86/include/asm/uprobes.h | 4 + + arch/x86/include/uapi/asm/bootparam.h | 1 + + arch/x86/include/uapi/asm/processor-flags.h | 7 +- + arch/x86/kernel/acpi/boot.c | 7 + + arch/x86/kernel/apic/apic_flat_64.c | 8 +- + arch/x86/kernel/asm-offsets.c | 8 + + arch/x86/kernel/asm-offsets_32.c | 9 +- + arch/x86/kernel/asm-offsets_64.c | 4 + + arch/x86/kernel/cpu/common.c | 200 +++-- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 26 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- + arch/x86/kernel/cpu/microcode/intel.c | 13 - + arch/x86/kernel/doublefault.c | 36 +- + arch/x86/kernel/dumpstack.c | 74 +- + arch/x86/kernel/dumpstack_32.c | 6 + + arch/x86/kernel/dumpstack_64.c | 12 + + arch/x86/kernel/espfix_64.c | 16 + + arch/x86/kernel/head_64.S | 30 +- + arch/x86/kernel/ioport.c | 2 +- + arch/x86/kernel/irq.c | 12 - + arch/x86/kernel/irq_64.c | 4 +- + arch/x86/kernel/itmt.c | 1 - + arch/x86/kernel/ldt.c | 93 ++- + arch/x86/kernel/paravirt_patch_64.c | 2 - + arch/x86/kernel/process.c | 20 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 14 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/traps.c | 69 +- + arch/x86/kernel/unwind_orc.c | 88 +-- + arch/x86/kernel/uprobes.c | 107 ++- + arch/x86/kernel/vmlinux.lds.S | 17 + + arch/x86/kvm/vmx.c | 2 +- + arch/x86/lib/delay.c | 4 +- + arch/x86/mm/Makefile | 7 +- + arch/x86/mm/debug_pagetables.c | 80 +- + arch/x86/mm/dump_pagetables.c | 34 +- + arch/x86/mm/init.c | 80 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/kasan_init_64.c | 18 +- + arch/x86/mm/kmmio.c | 12 +- + arch/x86/mm/pgtable.c | 16 +- + arch/x86/mm/pti.c | 215 +++++ + arch/x86/mm/tlb.c | 64 +- + arch/x86/platform/efi/efi_64.c | 1 - + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/power/cpu.c | 16 +- + arch/x86/tools/Makefile | 12 +- + .../tools/{test_get_len.c => insn_decoder_test.c} | 43 +- + .../tools/{distill.awk => objdump_reformat.awk} | 4 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/enlighten_pvh.c | 5 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/spinlock.c | 2 - + drivers/acpi/osl.c | 10 +- + drivers/misc/pti.c | 2 +- + include/linux/acpi.h | 2 + + include/linux/compiler.h | 47 +- + include/linux/completion.h | 45 -- + include/linux/intel-pti.h | 43 + + include/linux/lockdep.h | 125 --- + include/linux/pti.h | 50 +- + include/linux/rwlock_types.h | 3 - + include/linux/sched.h | 11 - + include/linux/sched/task_stack.h | 2 +- + include/linux/spinlock.h | 5 - + include/linux/spinlock_types.h | 3 - + init/main.c | 2 + + kernel/locking/lockdep.c | 652 +-------------- + kernel/locking/spinlock.c | 13 +- + kernel/sched/core.c | 22 +- + kernel/sched/fair.c | 5 +- + kernel/sched/rt.c | 8 +- + lib/Kconfig.debug | 35 +- + mm/early_ioremap.c | 2 +- + scripts/checkpatch.pl | 22 - + security/Kconfig | 10 + + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 + + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-pthread-barrier.c | 12 + + tools/include/linux/compiler.h | 21 +- + tools/perf/Documentation/perf-buildid-cache.txt | 3 + + tools/perf/Documentation/perf-evlist.txt | 4 + + tools/perf/Documentation/perf-inject.txt | 4 + + tools/perf/Documentation/perf-lock.txt | 4 + + tools/perf/Documentation/perf-sched.txt | 4 + + tools/perf/Documentation/perf-script.txt | 10 +- + tools/perf/Documentation/perf-timechart.txt | 4 +- + tools/perf/Documentation/perf-top.txt | 6 + + tools/perf/Documentation/perf-trace.txt | 16 +- + tools/perf/Documentation/perf.data-file-format.txt | 23 + + tools/perf/Documentation/tips.txt | 2 + + tools/perf/Makefile.config | 14 +- + tools/perf/arch/arm64/util/Build | 1 + + tools/perf/arch/arm64/util/header.c | 65 ++ + tools/perf/arch/powerpc/util/header.c | 2 +- + tools/perf/arch/s390/annotate/instructions.c | 3 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- + tools/perf/arch/x86/util/header.c | 2 +- + tools/perf/bench/futex-hash.c | 19 +- + tools/perf/bench/futex-lock-pi.c | 23 +- + tools/perf/bench/futex-requeue.c | 22 +- + tools/perf/bench/futex-wake-parallel.c | 46 +- + tools/perf/bench/futex-wake.c | 18 +- + tools/perf/builtin-buildid-cache.c | 4 +- + tools/perf/builtin-c2c.c | 8 +- + tools/perf/builtin-kvm.c | 10 +- + tools/perf/builtin-record.c | 40 +- + tools/perf/builtin-report.c | 14 +- + tools/perf/builtin-script.c | 102 ++- + tools/perf/builtin-stat.c | 62 +- + tools/perf/builtin-top.c | 10 +- + tools/perf/builtin-trace.c | 2 +- + tools/perf/check-headers.sh | 1 - + .../arch/arm64/cavium/thunderx2-imp-def.json | 62 ++ + tools/perf/pmu-events/arch/arm64/mapfile.csv | 15 + + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 12 +- + .../perf/pmu-events/arch/powerpc/power9/cache.json | 5 - + .../pmu-events/arch/powerpc/power9/frontend.json | 7 +- + .../pmu-events/arch/powerpc/power9/marked.json | 27 +- + .../perf/pmu-events/arch/powerpc/power9/other.json | 276 ++----- + .../pmu-events/arch/powerpc/power9/pipeline.json | 14 +- + tools/perf/pmu-events/arch/powerpc/power9/pmc.json | 2 +- + .../arch/powerpc/power9/translation.json | 5 - + tools/perf/pmu-events/arch/x86/mapfile.csv | 5 +- + tools/perf/pmu-events/jevents.c | 39 +- + tools/perf/tests/attr.c | 6 + + tools/perf/tests/backward-ring-buffer.c | 6 +- + tools/perf/tests/bp_signal.c | 2 +- + tools/perf/tests/bpf.c | 2 +- + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/openat-syscall-tp-fields.c | 2 +- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/task-exit.c | 2 +- + tools/perf/ui/browsers/annotate.c | 401 +++++----- + tools/perf/ui/gtk/annotate.c | 25 +- + tools/perf/util/annotate.c | 641 ++++++++------- + tools/perf/util/annotate.h | 76 +- + tools/perf/util/evlist.c | 64 +- + tools/perf/util/evlist.h | 12 +- + tools/perf/util/evsel.c | 78 +- + tools/perf/util/evsel.h | 9 +- + tools/perf/util/header.c | 68 ++ + tools/perf/util/header.h | 8 +- + tools/perf/util/intel-pt-decoder/Build | 24 +- + tools/perf/util/machine.c | 2 +- + tools/perf/util/metricgroup.c | 8 +- + tools/perf/util/mmap.c | 73 +- + tools/perf/util/mmap.h | 6 +- + tools/perf/util/ordered-events.c | 3 +- + tools/perf/util/ordered-events.h | 2 +- + tools/perf/util/pmu.c | 87 +- + tools/perf/util/pmu.h | 2 +- + tools/perf/util/python.c | 2 +- + tools/perf/util/rblist.c | 19 +- + tools/perf/util/rblist.h | 1 + + tools/perf/util/session.c | 48 +- + tools/perf/util/session.h | 2 +- + tools/perf/util/stat-shadow.c | 12 +- + tools/perf/util/thread_map.c | 22 +- + tools/perf/util/thread_map.h | 1 + + 211 files changed, 4222 insertions(+), 3683 deletions(-) + delete mode 100644 Documentation/locking/crossrelease.txt + create mode 100644 arch/x86/boot/compressed/pgtable_64.c + create mode 100644 arch/x86/include/asm/intel_ds.h + create mode 100644 arch/x86/include/asm/invpcid.h + create mode 100644 arch/x86/include/asm/pti.h + create mode 100644 arch/x86/mm/pti.c + rename arch/x86/tools/{test_get_len.c => insn_decoder_test.c} (81%) + rename arch/x86/tools/{distill.awk => objdump_reformat.awk} (91%) + create mode 100644 include/linux/intel-pti.h + create mode 100644 tools/build/feature/test-pthread-barrier.c + create mode 100644 tools/perf/arch/arm64/util/header.c + create mode 100644 tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json + create mode 100644 tools/perf/pmu-events/arch/arm64/mapfile.csv +Merging clockevents/clockevents/next (8a7507eea818 clocksource/drivers/mips-gic-timer: Add fastpath for local timer updates) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/mips-gic-timer.c' using previous resolution. +Auto-merging drivers/clocksource/mips-gic-timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/mips-gic-timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fae78f228bf3] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (86a18ee21e5e EDAC, ti: Add support for TI keystone and DRA7xx EDAC) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/octeon_edac-lmc.c | 1 + + drivers/edac/ti_edac.c | 341 +++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 356 insertions(+) + create mode 100644 drivers/edac/ti_edac.c +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up to date. +Merging ftrace/for-next (a96a5037ed0f tracing, thermal: Hide cpu cooling trace events when not in use) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (b9623f0e768f doc: Fixed typo in rcutorture documentation) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/bin/config2frag.sh +Auto-merging scripts/checkpatch.pl +Auto-merging net/ipv6/netfilter/ip6_tables.c +Auto-merging net/ipv4/netfilter/ip_tables.c +Auto-merging net/ipv4/netfilter/arp_tables.c +Auto-merging kernel/workqueue.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/cpu.c +Auto-merging fs/file.c +Auto-merging fs/dcache.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/infiniband/hw/hfi1/rc.c +Auto-merging drivers/infiniband/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/Data-Structures.html | 49 ++- + .../RCU/Design/Requirements/Requirements.html | 7 +- + Documentation/RCU/rcu_dereference.txt | 6 +- + Documentation/RCU/stallwarn.txt | 10 +- + Documentation/RCU/whatisRCU.txt | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 9 - + Documentation/circular-buffers.txt | 3 +- + Documentation/locking/locktorture.txt | 5 - + Documentation/memory-barriers.txt | 22 +- + Documentation/timers/NO_HZ.txt | 7 - + MAINTAINERS | 22 +- + arch/mn10300/kernel/mn10300-serial.c | 7 +- + drivers/dma/ioat/dma.c | 2 - + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/hw/hfi1/rc.c | 4 - + drivers/infiniband/hw/hfi1/ruc.c | 1 - + drivers/infiniband/hw/hfi1/sdma.c | 1 - + drivers/infiniband/hw/hfi1/uc.c | 2 - + drivers/infiniband/hw/hfi1/ud.c | 2 - + drivers/infiniband/hw/qib/qib_rc.c | 3 - + drivers/infiniband/hw/qib/qib_ruc.c | 1 - + drivers/infiniband/hw/qib/qib_uc.c | 2 - + drivers/infiniband/hw/qib/qib_ud.c | 2 - + drivers/infiniband/sw/rdmavt/qp.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_spq.c | 4 +- + drivers/vhost/vhost.c | 7 +- + fs/dcache.c | 10 +- + fs/file.c | 2 +- + include/linux/genetlink.h | 3 +- + include/linux/netfilter/nfnetlink.h | 3 +- + include/linux/percpu-refcount.h | 6 +- + include/linux/rcupdate.h | 25 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/rtnetlink.h | 3 +- + include/linux/seqlock.h | 3 +- + include/linux/srcutree.h | 8 +- + include/linux/torture.h | 10 +- + include/linux/tracepoint.h | 5 +- + include/trace/events/rcu.h | 75 ++--- + kernel/cpu.c | 4 + + kernel/events/uprobes.c | 12 +- + kernel/locking/locktorture.c | 108 +++--- + kernel/locking/qspinlock.c | 12 +- + kernel/rcu/rcu.h | 27 +- + kernel/rcu/rcuperf.c | 6 +- + kernel/rcu/rcutorture.c | 39 +-- + kernel/rcu/srcutree.c | 111 ++++--- + kernel/rcu/tree.c | 366 ++++++++------------- + kernel/rcu/tree.h | 6 +- + kernel/rcu/tree_plugin.h | 51 ++- + kernel/rcu/update.c | 4 +- + kernel/sched/core.c | 3 +- + kernel/sched/rt.c | 2 +- + kernel/softirq.c | 2 +- + kernel/time/Kconfig | 11 +- + kernel/time/tick-sched.c | 22 +- + kernel/time/timer.c | 47 +++ + kernel/torture.c | 41 +-- + kernel/trace/trace.c | 11 - + kernel/trace/trace_benchmark.c | 2 +- + kernel/tracepoint.c | 9 +- + kernel/workqueue.c | 2 +- + lib/assoc_array.c | 37 +-- + lib/percpu-refcount.c | 8 +- + mm/ksm.c | 9 +- + mm/mlock.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 7 +- + net/ipv4/netfilter/ip_tables.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 7 +- + net/netfilter/nf_conntrack_core.c | 2 +- + scripts/checkpatch.pl | 6 + + security/keys/keyring.c | 7 - + .../selftests/rcutorture/bin/config2frag.sh | 25 -- + .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 5 - + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 4 +- + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 2 +- + .../rcutorture/bin/kvm-recheck-rcuperf.sh | 4 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 6 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 42 +-- + .../selftests/rcutorture/bin/parse-torture.sh | 2 +- + .../rcutorture/configs/lock/ver_functions.sh | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03 | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 1 - + .../rcutorture/configs/rcuperf/ver_functions.sh | 1 - + .../selftests/rcutorture/doc/rcu-test-image.txt | 2 +- + 93 files changed, 619 insertions(+), 817 deletions(-) + delete mode 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh +Merging kvm/linux-next (50c4c4e268a2 Linux 4.15-rc3) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (4fbd8d194f06 Linux 4.15-rc1) +$ 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 (432953b4455d KVM: PPC: Book3S HV: Cosmetic post-merge cleanups) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (da9a1446d248 KVM: s390: provide a capability for AIS state migration) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (c4f9d9cb2c29 xen: XEN_ACPI_PROCESSOR is Dom0-only) +$ git merge xen-tip/linux-next +Auto-merging arch/x86/xen/apic.c +Merge made by the 'recursive' strategy. + arch/x86/xen/apic.c | 2 +- + drivers/xen/Kconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging percpu/for-next (abee210500ed percpu: hack to let the CRIS architecture to boot until they clean up) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (01dfee9582d9 workqueue: remove unneeded kallsyms include) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (c454a99d4ce1 intel-hid: add a DMI quirk to support Wacom MobileStudio Pro) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/x86/include/asm/intel_pmc_ipc.h | 6 ++ + drivers/platform/x86/Kconfig | 25 +++++++ + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/acer-wireless.c | 71 ++++++++++++++++++++ + drivers/platform/x86/alienware-wmi.c | 17 +++++ + drivers/platform/x86/asus-nb-wmi.c | 13 +++- + drivers/platform/x86/asus-wireless.c | 1 + + drivers/platform/x86/dell-laptop.c | 25 +++++-- + drivers/platform/x86/dell-wmi.c | 2 + + drivers/platform/x86/ideapad-laptop.c | 21 ++++-- + drivers/platform/x86/intel-hid.c | 41 +++++++++++- + drivers/platform/x86/intel-vbtn.c | 24 ++++++- + drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 93 ++++++++++++++++++++++++++ + drivers/platform/x86/intel_int0002_vgpio.c | 2 +- + drivers/platform/x86/intel_pmc_ipc.c | 33 ++++++++- + drivers/platform/x86/intel_telemetry_debugfs.c | 83 ++++++++++------------- + include/uapi/linux/input-event-codes.h | 1 + + 18 files changed, 392 insertions(+), 70 deletions(-) + create mode 100644 drivers/platform/x86/acer-wireless.c + create mode 100644 drivers/platform/x86/intel_chtdc_ti_pwrbtn.c +Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/cros_ec_debugfs.c +Auto-merging drivers/platform/chrome/chromeos_laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 +++---- + drivers/platform/chrome/cros_ec_debugfs.c | 18 +++++ + drivers/platform/chrome/cros_ec_debugfs.h | 2 + + drivers/platform/chrome/cros_ec_dev.c | 49 ++++++++------ + drivers/platform/chrome/cros_ec_proto.c | 8 ++- + drivers/platform/chrome/cros_ec_sysfs.c | 105 ++++++++++++++++++++++++------ + include/linux/mfd/cros_ec.h | 1 + + 7 files changed, 149 insertions(+), 56 deletions(-) +Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) +$ git merge hsi/for-next +Auto-merging drivers/hsi/clients/cmt_speech.c +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging leds/for-next (eb17720378a0 leds: lm3692x: Introduce LM3692x dual string driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-led-trigger-netdev | 45 ++ + .../devicetree/bindings/leds/leds-lm3692x.txt | 49 ++ + drivers/leds/Kconfig | 7 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-blinkm.c | 4 + + drivers/leds/leds-lm3692x.c | 393 ++++++++++++++++ + drivers/leds/leds-lp8860.c | 26 +- + drivers/leds/leds-pwm.c | 1 - + drivers/leds/trigger/Kconfig | 9 +- + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-netdev.c | 496 +++++++++++++++++++++ + 11 files changed, 1028 insertions(+), 4 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-netdev + create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3692x.txt + create mode 100644 drivers/leds/leds-lm3692x.c + create mode 100644 drivers/leds/trigger/ledtrig-netdev.c +Merging ipmi/for-next (174134ac7602 ipmi_si: Fix error handling of platform device) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_watchdog.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 9 ++++++--- + drivers/char/ipmi/ipmi_si_platform.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (73cf7e111ed6 Merge 4.15-rc3 into driver-core-next) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/arch_topology.c | 8 +- + drivers/base/attribute_container.c | 3 +- + drivers/base/bus.c | 4 +- + drivers/base/cacheinfo.c | 13 +- + drivers/base/class.c | 4 +- + drivers/base/component.c | 5 +- + drivers/base/container.c | 5 +- + drivers/base/core.c | 4 +- + drivers/base/cpu.c | 1 + + drivers/base/dd.c | 3 +- + drivers/base/devcoredump.c | 17 +- + drivers/base/devres.c | 3 +- + drivers/base/dma-contiguous.c | 6 +- + drivers/base/dma-mapping.c | 3 +- + drivers/base/driver.c | 4 +- + drivers/base/firmware.c | 3 +- + drivers/base/firmware_class.c | 859 ++++++++++++---------- + drivers/base/hypervisor.c | 3 +- + drivers/base/init.c | 3 +- + drivers/base/isa.c | 1 + + drivers/base/map.c | 2 +- + drivers/base/module.c | 4 +- + drivers/base/pinctrl.c | 3 +- + drivers/base/platform-msi.c | 13 +- + drivers/base/platform.c | 3 +- + drivers/base/property.c | 5 +- + drivers/base/soc.c | 2 +- + drivers/base/syscore.c | 3 +- + drivers/base/test/test_async_driver_probe.c | 10 +- + drivers/base/topology.c | 17 +- + drivers/base/transport_class.c | 3 +- + include/linux/device.h | 3 +- + include/linux/kobject.h | 3 +- + include/linux/kobject_ns.h | 3 +- + lib/kobject.c | 4 +- + lib/kobject_uevent.c | 3 +- + samples/kobject/kobject-example.c | 4 +- + samples/kobject/kset-example.c | 4 +- + tools/testing/selftests/firmware/fw_fallback.sh | 172 +++-- + tools/testing/selftests/firmware/fw_filesystem.sh | 5 +- + 40 files changed, 619 insertions(+), 599 deletions(-) +Merging usb/usb-next (16e791e76596 doc: usb: chipidea: Fix typo in 'enumerate') +$ git merge usb/usb-next +Auto-merging drivers/usb/storage/unusual_uas.h +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci-mem.c +Auto-merging drivers/usb/core/hub.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 25 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 2 + + .../devicetree/bindings/usb/usb-device.txt | 68 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 +- + drivers/usb/core/driver.c | 10 +- + drivers/usb/core/hub.c | 17 +- + drivers/usb/core/ledtrig-usbport.c | 10 +- + drivers/usb/core/message.c | 26 +- + drivers/usb/core/of.c | 95 +- + drivers/usb/core/usb.c | 3 +- + drivers/usb/early/xhci-dbc.c | 2 +- + drivers/usb/host/Kconfig | 8 + + drivers/usb/host/Makefile | 5 + + drivers/usb/host/fotg210-hcd.c | 7 +- + drivers/usb/host/whci/asl.c | 2 - + drivers/usb/host/xhci-dbg.c | 261 ------ + drivers/usb/host/xhci-dbgcap.c | 996 +++++++++++++++++++++ + drivers/usb/host/xhci-dbgcap.h | 229 +++++ + drivers/usb/host/xhci-dbgtty.c | 497 ++++++++++ + drivers/usb/host/xhci-hub.c | 8 +- + drivers/usb/host/xhci-mem.c | 135 +-- + drivers/usb/host/xhci-mtk.c | 9 + + drivers/usb/host/xhci-pci.c | 3 + + drivers/usb/host/xhci-plat.c | 5 + + drivers/usb/host/xhci-ring.c | 14 +- + drivers/usb/host/xhci-trace.h | 69 ++ + drivers/usb/host/xhci.c | 48 +- + drivers/usb/host/xhci.h | 30 +- + drivers/usb/storage/unusual_uas.h | 63 -- + drivers/usb/storage/usb.c | 8 +- + drivers/usb/typec/fusb302/fusb302.c | 39 +- + drivers/usb/typec/tcpm.c | 293 ++++-- + drivers/usb/usbip/vhci_rx.c | 2 +- + include/linux/usb/of.h | 21 +- + include/linux/usb/pd.h | 2 + + include/linux/usb/tcpm.h | 16 +- + tools/usb/usbip/src/usbipd.c | 2 +- + 37 files changed, 2469 insertions(+), 566 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd + create mode 100644 drivers/usb/host/xhci-dbgcap.c + create mode 100644 drivers/usb/host/xhci-dbgcap.h + create mode 100644 drivers/usb/host/xhci-dbgtty.c +Merging usb-gadget/next (ce2b21a4e5ce usb: dwc2: Fix UDC state tracking) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d8a42b1ff8a3 USB: serial: ark3116: clean up return values of register accessors) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/ark3116.c | 11 +++++++---- + drivers/usb/serial/iuu_phoenix.c | 1 - + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (2a53e060a053 usb: chipidea: fix trivial typo in Kconfig) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (42e64571d516 Merge 4.15-rc3 into tty-next) +$ git merge tty/tty-next +Auto-merging drivers/tty/n_gsm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 +- + .../devicetree/bindings/serial/fsl-lpuart.txt | 3 +- + .../devicetree/bindings/serial/omap_serial.txt | 1 + + Documentation/devicetree/bindings/serial/rs485.txt | 1 + + Documentation/driver-model/devres.txt | 3 ++ + drivers/tty/moxa.c | 17 +++++--- + drivers/tty/moxa.h | 2 + + drivers/tty/n_gsm.c | 2 - + drivers/tty/serdev/core.c | 31 +++++++++++++- + drivers/tty/serdev/serdev-ttyport.c | 5 ++- + drivers/tty/serial/amba-pl011.c | 12 ++---- + drivers/tty/serial/atmel_serial.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 15 ++----- + drivers/tty/serial/imx.c | 47 ++++++++-------------- + drivers/tty/serial/meson_uart.c | 31 +++++++------- + drivers/tty/serial/omap-serial.c | 11 +++-- + drivers/tty/serial/serial_core.c | 28 ++++++++----- + drivers/tty/vt/selection.c | 6 +-- + include/linux/serdev.h | 7 +++- + include/linux/serial_core.h | 6 +-- + 20 files changed, 127 insertions(+), 107 deletions(-) +Merging char-misc/char-misc-next (2fc10246766f Merge 4.15-rc3 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/mic/vop/vop_vringh.c +Auto-merging drivers/misc/hpilo.c +Auto-merging drivers/android/binder.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/fpga/fpga-mgr.txt | 132 +++++----- + Documentation/fpga/fpga-region.txt | 95 +++++++ + Documentation/fpga/overview.txt | 23 ++ + MAINTAINERS | 4 +- + drivers/android/binder.c | 151 +++++++---- + drivers/android/binder_alloc.c | 4 + + drivers/android/binder_alloc.h | 2 + + drivers/char/lp.c | 67 +++-- + drivers/fpga/Kconfig | 103 ++++---- + drivers/fpga/Makefile | 1 + + drivers/fpga/fpga-bridge.c | 113 +++++++-- + drivers/fpga/fpga-mgr.c | 123 ++++++--- + drivers/fpga/fpga-region.c | 464 ++++------------------------------ + drivers/fpga/of-fpga-region.c | 504 +++++++++++++++++++++++++++++++++++++ + drivers/fsi/Kconfig | 6 +- + drivers/misc/enclosure.c | 12 +- + drivers/misc/hpilo.c | 5 +- + drivers/misc/hpilo.h | 5 +- + drivers/misc/isl29003.c | 7 + + drivers/misc/lkdtm_heap.c | 4 + + drivers/misc/mic/vop/vop_vringh.c | 21 +- + drivers/misc/vexpress-syscfg.c | 4 +- + include/linux/fpga/fpga-bridge.h | 14 +- + include/linux/fpga/fpga-mgr.h | 39 ++- + include/linux/fpga/fpga-region.h | 40 +++ + include/uapi/linux/lp.h | 12 +- + tools/hv/Makefile | 23 +- + 27 files changed, 1275 insertions(+), 703 deletions(-) + create mode 100644 Documentation/fpga/fpga-region.txt + create mode 100644 Documentation/fpga/overview.txt + create mode 100644 drivers/fpga/of-fpga-region.c + create mode 100644 include/linux/fpga/fpga-region.h +Merging extcon/extcon-next (4f65b63ecc4c extcon: axp288:: Handle return value of platform_get_irq) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 2 +- + drivers/extcon/extcon-axp288.c | 3 +++ + drivers/extcon/extcon-max77693.c | 2 +- + drivers/extcon/extcon-max8997.c | 2 +- + 4 files changed, 6 insertions(+), 3 deletions(-) +Merging staging/staging-next (93d3ad90c2d4 drivers: visorbus: move driver out of staging) +$ git merge staging/staging-next +Resolved 'drivers/staging/most/cdev/cdev.c' using previous resolution. +Resolved 'drivers/staging/most/video/video.c' using previous resolution. +Auto-merging include/linux/visorbus.h +Auto-merging drivers/visorbus/visorchipset.c +Auto-merging drivers/visorbus/visorchannel.c +Auto-merging drivers/visorbus/visorbus_private.h +Auto-merging drivers/visorbus/visorbus_main.c +Auto-merging drivers/visorbus/vbuschannel.h +Auto-merging drivers/visorbus/controlvmchannel.h +Auto-merging drivers/visorbus/Makefile +Auto-merging drivers/visorbus/Kconfig +Removing drivers/staging/unisys/include/visorchannel.h +Auto-merging drivers/staging/pi433/rf69.c +Auto-merging drivers/staging/most/video/video.c +CONFLICT (content): Merge conflict in drivers/staging/most/video/video.c +Auto-merging drivers/staging/most/video/Kconfig +Auto-merging drivers/staging/most/usb/usb.c +Auto-merging drivers/staging/most/usb/Kconfig +Auto-merging drivers/staging/most/sound/sound.c +Auto-merging drivers/staging/most/sound/Kconfig +Auto-merging drivers/staging/most/net/net.c +Auto-merging drivers/staging/most/net/Kconfig +Removing drivers/staging/most/mostcore/core.c +Removing drivers/staging/most/mostcore/Makefile +Removing drivers/staging/most/mostcore/Kconfig +Auto-merging drivers/staging/most/i2c/i2c.c +Auto-merging drivers/staging/most/i2c/Kconfig +Removing drivers/staging/most/hdm-usb/Makefile +Removing drivers/staging/most/hdm-i2c/Makefile +Removing drivers/staging/most/hdm-dim2/dim2_sysfs.h +Removing drivers/staging/most/hdm-dim2/dim2_sysfs.c +Removing drivers/staging/most/hdm-dim2/Makefile +Auto-merging drivers/staging/most/dim2/reg.h +Auto-merging drivers/staging/most/dim2/hal.h +Auto-merging drivers/staging/most/dim2/hal.c +Auto-merging drivers/staging/most/dim2/errors.h +Auto-merging drivers/staging/most/dim2/dim2.h +Auto-merging drivers/staging/most/dim2/dim2.c +Auto-merging drivers/staging/most/dim2/Kconfig +Auto-merging drivers/staging/most/core.h +Auto-merging drivers/staging/most/cdev/cdev.c +CONFLICT (content): Merge conflict in drivers/staging/most/cdev/cdev.c +Auto-merging drivers/staging/most/cdev/Kconfig +Removing drivers/staging/most/aim-v4l2/Makefile +Removing drivers/staging/most/aim-sound/Makefile +Removing drivers/staging/most/aim-network/Makefile +Removing drivers/staging/most/aim-cdev/Makefile +Auto-merging drivers/staging/ipx/Kconfig +Auto-merging drivers/staging/comedi/drivers/serial2002.c +Auto-merging drivers/staging/comedi/comedi_fops.c +Auto-merging drivers/staging/ccree/ssi_hash.c +Removing drivers/staging/ccree/Documentation/devicetree/bindings/crypto/arm-cryptocell.txt +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec0353a73f73c2709ddb20c6fe7cd5abd1c9a6f7] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 2 +- + .../bindings/iio/adc/amlogic,meson-saradc.txt | 1 - + .../devicetree/bindings/iio/adc/aspeed_adc.txt | 4 +- + .../bindings/iio/adc/at91-sama5d2_adc.txt | 7 + + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 24 + + .../devicetree/bindings/iio/health/max30102.txt | 8 +- + .../devicetree/bindings/iio/light/uvis25.txt | 23 + + MAINTAINERS | 13 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/iio/accel/bmc150-accel-i2c.c | 12 + + drivers/iio/accel/da280.c | 31 +- + drivers/iio/accel/kxsd9-i2c.c | 3 + + drivers/iio/accel/mma8452.c | 16 +- + drivers/iio/accel/st_accel_core.c | 5 - + drivers/iio/adc/Kconfig | 1 + + drivers/iio/adc/aspeed_adc.c | 25 +- + drivers/iio/adc/at91-sama5d2_adc.c | 456 ++++- + drivers/iio/adc/axp288_adc.c | 20 +- + drivers/iio/adc/ina2xx-adc.c | 149 +- + drivers/iio/adc/meson_saradc.c | 20 - + drivers/iio/adc/qcom-vadc-common.c | 4 + + drivers/iio/adc/stm32-adc.c | 181 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 2 - + drivers/iio/health/max30102.c | 308 +++- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 3 +- + drivers/iio/industrialio-core.c | 1 + + drivers/iio/light/Kconfig | 34 + + drivers/iio/light/Makefile | 4 + + drivers/iio/light/cros_ec_light_prox.c | 2 - + drivers/iio/light/st_uvis25.h | 37 + + drivers/iio/light/st_uvis25_core.c | 359 ++++ + drivers/iio/light/st_uvis25_i2c.c | 69 + + drivers/iio/light/st_uvis25_spi.c | 68 + + drivers/iio/light/zopt2201.c | 568 ++++++ + drivers/iio/magnetometer/ak8975.c | 1 + + drivers/iio/proximity/sx9500.c | 1 + + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + drivers/staging/android/ashmem.c | 10 +- + drivers/staging/android/ashmem.h | 1 + + drivers/staging/android/ion/ion-ioctl.c | 12 +- + drivers/staging/android/ion/ion.c | 32 +- + drivers/staging/android/ion/ion.h | 14 +- + drivers/staging/android/ion/ion_carveout_heap.c | 11 +- + drivers/staging/android/ion/ion_chunk_heap.c | 11 +- + drivers/staging/android/ion/ion_cma_heap.c | 11 +- + drivers/staging/android/ion/ion_heap.c | 11 +- + drivers/staging/android/ion/ion_page_pool.c | 11 +- + drivers/staging/android/ion/ion_system_heap.c | 11 +- + drivers/staging/android/uapi/ashmem.h | 1 + + drivers/staging/android/uapi/ion.h | 11 +- + .../devicetree/bindings/crypto/arm-cryptocell.txt | 27 - + drivers/staging/ccree/TODO | 23 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 2 - + drivers/staging/ccree/ssi_aead.c | 885 ++++----- + drivers/staging/ccree/ssi_aead.h | 21 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 811 ++++---- + drivers/staging/ccree/ssi_buffer_mgr.h | 49 +- + drivers/staging/ccree/ssi_cipher.c | 174 +- + drivers/staging/ccree/ssi_cipher.h | 5 +- + drivers/staging/ccree/ssi_config.h | 6 +- + drivers/staging/ccree/ssi_driver.c | 76 +- + drivers/staging/ccree/ssi_driver.h | 25 +- + drivers/staging/ccree/ssi_fips.h | 3 +- + drivers/staging/ccree/ssi_hash.c | 403 ++-- + drivers/staging/ccree/ssi_hash.h | 14 +- + drivers/staging/ccree/ssi_ivgen.c | 17 +- + drivers/staging/ccree/ssi_ivgen.h | 3 +- + drivers/staging/ccree/ssi_pm.c | 52 +- + drivers/staging/ccree/ssi_pm.h | 14 +- + drivers/staging/ccree/ssi_request_mgr.c | 164 +- + drivers/staging/ccree/ssi_request_mgr.h | 10 +- + drivers/staging/ccree/ssi_sram_mgr.c | 17 +- + drivers/staging/ccree/ssi_sram_mgr.h | 6 +- + drivers/staging/ccree/ssi_sysfs.c | 44 +- + drivers/staging/ccree/ssi_sysfs.h | 23 - + drivers/staging/comedi/comedi.h | 11 +- + drivers/staging/comedi/comedi_buf.c | 11 +- + drivers/staging/comedi/comedi_compat32.c | 11 +- + drivers/staging/comedi/comedi_compat32.h | 11 +- + drivers/staging/comedi/comedi_fops.c | 11 +- + drivers/staging/comedi/comedi_pci.c | 11 +- + drivers/staging/comedi/comedi_pci.h | 11 +- + drivers/staging/comedi/comedi_pcmcia.c | 11 +- + drivers/staging/comedi/comedi_pcmcia.h | 11 +- + drivers/staging/comedi/comedi_usb.c | 11 +- + drivers/staging/comedi/comedi_usb.h | 11 +- + drivers/staging/comedi/comedidev.h | 11 +- + drivers/staging/comedi/comedilib.h | 11 +- + drivers/staging/comedi/drivers.c | 11 +- + drivers/staging/comedi/drivers/8255.c | 11 +- + drivers/staging/comedi/drivers/8255.h | 11 +- + drivers/staging/comedi/drivers/8255_pci.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_1032.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 11 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 11 +- + drivers/staging/comedi/drivers/addi_watchdog.c | 11 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 11 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 11 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 11 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 11 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 1 + + drivers/staging/comedi/drivers/adq12b.c | 11 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 1 + + drivers/staging/comedi/drivers/adv_pci1720.c | 11 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 11 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 11 +- + drivers/staging/comedi/drivers/adv_pci1760.c | 11 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 1 + + drivers/staging/comedi/drivers/aio_aio12_8.c | 11 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 11 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 11 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 11 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 11 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 11 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 11 +- + drivers/staging/comedi/drivers/amplc_pc236.h | 11 +- + .../staging/comedi/drivers/amplc_pc236_common.c | 11 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 11 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 11 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 11 +- + drivers/staging/comedi/drivers/amplc_pci236.c | 11 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 11 +- + drivers/staging/comedi/drivers/c6xdigio.c | 11 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 11 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 11 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 11 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 11 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 11 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 11 +- + drivers/staging/comedi/drivers/comedi_8254.c | 11 +- + drivers/staging/comedi/drivers/comedi_8254.h | 11 +- + drivers/staging/comedi/drivers/comedi_8255.c | 11 +- + drivers/staging/comedi/drivers/comedi_bond.c | 11 +- + drivers/staging/comedi/drivers/comedi_isadma.c | 11 +- + drivers/staging/comedi/drivers/comedi_isadma.h | 11 +- + drivers/staging/comedi/drivers/comedi_parport.c | 11 +- + drivers/staging/comedi/drivers/comedi_test.c | 11 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 11 +- + drivers/staging/comedi/drivers/dac02.c | 11 +- + drivers/staging/comedi/drivers/daqboard2000.c | 11 +- + drivers/staging/comedi/drivers/das08.c | 11 +- + drivers/staging/comedi/drivers/das08.h | 11 +- + drivers/staging/comedi/drivers/das08_cs.c | 11 +- + drivers/staging/comedi/drivers/das08_isa.c | 11 +- + drivers/staging/comedi/drivers/das08_pci.c | 11 +- + drivers/staging/comedi/drivers/das16.c | 11 +- + drivers/staging/comedi/drivers/das16m1.c | 11 +- + drivers/staging/comedi/drivers/das1800.c | 11 +- + drivers/staging/comedi/drivers/das6402.c | 11 +- + drivers/staging/comedi/drivers/das800.c | 11 +- + drivers/staging/comedi/drivers/dmm32at.c | 11 +- + drivers/staging/comedi/drivers/dt2801.c | 1 + + drivers/staging/comedi/drivers/dt2811.c | 11 +- + drivers/staging/comedi/drivers/dt2814.c | 11 +- + drivers/staging/comedi/drivers/dt2815.c | 11 +- + drivers/staging/comedi/drivers/dt2817.c | 11 +- + drivers/staging/comedi/drivers/dt282x.c | 11 +- + drivers/staging/comedi/drivers/dt3000.c | 11 +- + drivers/staging/comedi/drivers/dt9812.c | 11 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 11 +- + drivers/staging/comedi/drivers/fl512.c | 11 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 11 +- + drivers/staging/comedi/drivers/icp_multi.c | 11 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 1 + + drivers/staging/comedi/drivers/jr3_pci.c | 11 +- + drivers/staging/comedi/drivers/ke_counter.c | 11 +- + drivers/staging/comedi/drivers/me4000.c | 11 +- + drivers/staging/comedi/drivers/me_daq.c | 11 +- + drivers/staging/comedi/drivers/mf6x4.c | 11 +- + drivers/staging/comedi/drivers/mite.c | 11 +- + drivers/staging/comedi/drivers/mite.h | 11 +- + drivers/staging/comedi/drivers/mpc624.c | 11 +- + drivers/staging/comedi/drivers/multiq3.c | 11 +- + drivers/staging/comedi/drivers/ni_6527.c | 11 +- + drivers/staging/comedi/drivers/ni_65xx.c | 11 +- + drivers/staging/comedi/drivers/ni_660x.c | 11 +- + drivers/staging/comedi/drivers/ni_670x.c | 11 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 11 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 11 +- + drivers/staging/comedi/drivers/ni_atmio.c | 11 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 11 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 11 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc.h | 11 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc_isadma.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 11 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 11 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 11 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 11 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 11 +- + drivers/staging/comedi/drivers/ni_stc.h | 11 +- + drivers/staging/comedi/drivers/ni_tio.c | 11 +- + drivers/staging/comedi/drivers/ni_tio.h | 11 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 11 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 11 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 11 +- + drivers/staging/comedi/drivers/pcl711.c | 11 +- + drivers/staging/comedi/drivers/pcl724.c | 1 + + drivers/staging/comedi/drivers/pcl726.c | 11 +- + drivers/staging/comedi/drivers/pcl730.c | 1 + + drivers/staging/comedi/drivers/pcl812.c | 1 + + drivers/staging/comedi/drivers/pcl816.c | 1 + + drivers/staging/comedi/drivers/pcl818.c | 1 + + drivers/staging/comedi/drivers/pcm3724.c | 1 + + drivers/staging/comedi/drivers/pcmad.c | 11 +- + drivers/staging/comedi/drivers/pcmda12.c | 11 +- + drivers/staging/comedi/drivers/pcmmio.c | 11 +- + drivers/staging/comedi/drivers/pcmuio.c | 11 +- + drivers/staging/comedi/drivers/plx9052.h | 11 +- + drivers/staging/comedi/drivers/plx9080.h | 6 +- + drivers/staging/comedi/drivers/rtd520.c | 11 +- + drivers/staging/comedi/drivers/rti800.c | 11 +- + drivers/staging/comedi/drivers/rti802.c | 11 +- + drivers/staging/comedi/drivers/s526.c | 11 +- + drivers/staging/comedi/drivers/s626.c | 11 +- + drivers/staging/comedi/drivers/s626.h | 11 +- + drivers/staging/comedi/drivers/serial2002.c | 11 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 11 +- + drivers/staging/comedi/drivers/usbdux.c | 14 +- + drivers/staging/comedi/drivers/usbduxfast.c | 11 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 11 +- + drivers/staging/comedi/drivers/vmk80xx.c | 11 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 11 +- + drivers/staging/comedi/proc.c | 11 +- + drivers/staging/comedi/range.c | 11 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_driver.h | 4 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 111 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 31 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 1 + + drivers/staging/fsl-mc/bus/dpbp.c | 16 +- + drivers/staging/fsl-mc/bus/dpcon-cmd.h | 6 - + drivers/staging/fsl-mc/bus/dpcon.c | 83 +- + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 85 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 28 +- + drivers/staging/fsl-mc/bus/dprc.c | 16 +- + drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 108 +- + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 96 +- + drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 15 +- + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 7 +- + drivers/staging/fsl-mc/bus/mc-io.c | 32 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 7 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 4 - + drivers/staging/fsl-mc/include/dpcon.h | 10 - + drivers/staging/fsl-mc/include/mc.h | 57 +- + drivers/staging/iio/cdc/ad7152.c | 17 +- + drivers/staging/iio/cdc/ad7746.c | 17 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 +- + {net => drivers/staging}/ipx/Kconfig | 1 + + {net => drivers/staging}/ipx/Makefile | 0 + drivers/staging/ipx/TODO | 4 + + {net => drivers/staging}/ipx/af_ipx.c | 0 + {net => drivers/staging}/ipx/ipx_proc.c | 0 + {net => drivers/staging}/ipx/ipx_route.c | 0 + {net => drivers/staging}/ipx/pe2.c | 0 + {net => drivers/staging}/ipx/sysctl_net_ipx.c | 0 + drivers/staging/irda/drivers/pxaficp_ir.c | 1 - + drivers/staging/irda/net/irlmp.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 18 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 4 +- + drivers/staging/lustre/lustre/llite/dir.c | 4 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 10 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 9 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 3 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 3 + + .../most/Documentation/ABI/sysfs-bus-most.txt | 313 ++++ + .../staging/most/Documentation/driver_usage.txt | 192 +- + drivers/staging/most/Kconfig | 27 +- + drivers/staging/most/Makefile | 19 +- + drivers/staging/most/aim-cdev/Makefile | 4 - + drivers/staging/most/aim-network/Makefile | 4 - + drivers/staging/most/aim-sound/Makefile | 4 - + drivers/staging/most/aim-v4l2/Makefile | 5 - + drivers/staging/most/{aim-cdev => cdev}/Kconfig | 6 +- + drivers/staging/most/cdev/Makefile | 4 + + drivers/staging/most/{aim-cdev => cdev}/cdev.c | 194 +- + drivers/staging/most/core.c | 1603 ++++++++++++++++ + .../staging/most/{mostcore/mostcore.h => core.h} | 77 +- + drivers/staging/most/{hdm-dim2 => dim2}/Kconfig | 6 +- + drivers/staging/most/dim2/Makefile | 4 + + .../most/{hdm-dim2/dim2_hdm.c => dim2/dim2.c} | 39 +- + .../most/{hdm-dim2/dim2_hdm.h => dim2/dim2.h} | 10 +- + .../most/{hdm-dim2/dim2_errors.h => dim2/errors.h} | 10 +- + .../most/{hdm-dim2/dim2_hal.c => dim2/hal.c} | 16 +- + .../most/{hdm-dim2/dim2_hal.h => dim2/hal.h} | 12 +- + .../most/{hdm-dim2/dim2_reg.h => dim2/reg.h} | 10 +- + drivers/staging/most/dim2/sysfs.c | 49 + + drivers/staging/most/dim2/sysfs.h | 30 + + drivers/staging/most/hdm-dim2/Makefile | 5 - + drivers/staging/most/hdm-dim2/dim2_sysfs.c | 115 -- + drivers/staging/most/hdm-dim2/dim2_sysfs.h | 36 - + drivers/staging/most/hdm-i2c/Makefile | 3 - + drivers/staging/most/hdm-usb/Makefile | 4 - + drivers/staging/most/{hdm-i2c => i2c}/Kconfig | 6 +- + drivers/staging/most/i2c/Makefile | 4 + + .../staging/most/{hdm-i2c/hdm_i2c.c => i2c/i2c.c} | 19 +- + drivers/staging/most/mostcore/Kconfig | 14 - + drivers/staging/most/mostcore/Makefile | 3 - + drivers/staging/most/mostcore/core.c | 1949 -------------------- + drivers/staging/most/{aim-network => net}/Kconfig | 6 +- + drivers/staging/most/net/Makefile | 4 + + .../most/{aim-network/networking.c => net/net.c} | 59 +- + drivers/staging/most/{aim-sound => sound}/Kconfig | 6 +- + drivers/staging/most/sound/Makefile | 4 + + drivers/staging/most/{aim-sound => sound}/sound.c | 33 +- + drivers/staging/most/{hdm-usb => usb}/Kconfig | 7 +- + drivers/staging/most/usb/Makefile | 4 + + .../staging/most/{hdm-usb/hdm_usb.c => usb/usb.c} | 272 +-- + drivers/staging/most/{aim-v4l2 => video}/Kconfig | 6 +- + drivers/staging/most/video/Makefile | 4 + + drivers/staging/most/{aim-v4l2 => video}/video.c | 167 +- + {fs => drivers/staging}/ncpfs/Kconfig | 0 + {fs => drivers/staging}/ncpfs/Makefile | 0 + drivers/staging/ncpfs/TODO | 4 + + {fs => drivers/staging}/ncpfs/dir.c | 0 + {fs => drivers/staging}/ncpfs/file.c | 0 + {fs => drivers/staging}/ncpfs/getopt.c | 0 + {fs => drivers/staging}/ncpfs/getopt.h | 0 + {fs => drivers/staging}/ncpfs/inode.c | 0 + {fs => drivers/staging}/ncpfs/ioctl.c | 0 + {fs => drivers/staging}/ncpfs/mmap.c | 0 + {fs => drivers/staging}/ncpfs/ncp_fs.h | 0 + {fs => drivers/staging}/ncpfs/ncp_fs_i.h | 0 + {fs => drivers/staging}/ncpfs/ncp_fs_sb.h | 0 + {fs => drivers/staging}/ncpfs/ncplib_kernel.c | 0 + {fs => drivers/staging}/ncpfs/ncplib_kernel.h | 0 + {fs => drivers/staging}/ncpfs/ncpsign_kernel.c | 0 + {fs => drivers/staging}/ncpfs/ncpsign_kernel.h | 0 + {fs => drivers/staging}/ncpfs/sock.c | 0 + {fs => drivers/staging}/ncpfs/symlink.c | 0 + drivers/staging/olpc_dcon/olpc_dcon.c | 30 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 30 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- + drivers/staging/pi433/pi433_if.c | 358 ++-- + drivers/staging/pi433/pi433_if.h | 28 +- + drivers/staging/pi433/rf69.c | 459 +++-- + drivers/staging/pi433/rf69.h | 15 +- + drivers/staging/pi433/rf69_enum.h | 326 ++-- + drivers/staging/pi433/rf69_registers.h | 44 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 +- + drivers/staging/rtl8712/hal_init.c | 1 - + drivers/staging/rtlwifi/cam.c | 4 +- + drivers/staging/rtlwifi/core.c | 8 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 + + drivers/staging/rtlwifi/wifi.h | 2 +- + drivers/staging/rts5208/rtsx.c | 17 - + drivers/staging/rts5208/rtsx.h | 2 - + drivers/staging/sm750fb/TODO | 4 +- + drivers/staging/speakup/selection.c | 9 +- + drivers/staging/unisys/Kconfig | 4 - + drivers/staging/unisys/Makefile | 1 - + drivers/staging/unisys/include/iochannel.h | 15 +- + drivers/staging/unisys/include/visorchannel.h | 189 -- + drivers/staging/unisys/visorhba/visorhba_main.c | 14 +- + .../staging/unisys/visorinput/ultrainputreport.h | 11 +- + drivers/staging/unisys/visorinput/visorinput.c | 13 +- + drivers/staging/unisys/visornic/visornic_main.c | 13 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 56 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 2 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.c | 7 +- + drivers/staging/vt6655/baseband.c | 11 +- + drivers/staging/vt6655/baseband.h | 11 +- + drivers/staging/vt6655/card.c | 11 +- + drivers/staging/vt6655/card.h | 11 +- + drivers/staging/vt6655/channel.c | 11 +- + drivers/staging/vt6655/channel.h | 12 +- + drivers/staging/vt6655/desc.h | 11 +- + drivers/staging/vt6655/device.h | 11 +- + drivers/staging/vt6655/device_cfg.h | 11 +- + drivers/staging/vt6655/device_main.c | 11 +- + drivers/staging/vt6655/dpc.c | 11 +- + drivers/staging/vt6655/dpc.h | 11 +- + drivers/staging/vt6655/key.c | 11 +- + drivers/staging/vt6655/key.h | 11 +- + drivers/staging/vt6655/mac.c | 11 +- + drivers/staging/vt6655/mac.h | 11 +- + drivers/staging/vt6655/power.c | 11 +- + drivers/staging/vt6655/power.h | 11 +- + drivers/staging/vt6655/rf.c | 11 +- + drivers/staging/vt6655/rf.h | 11 +- + drivers/staging/vt6655/rxtx.c | 11 +- + drivers/staging/vt6655/rxtx.h | 11 +- + drivers/staging/vt6655/srom.c | 11 +- + drivers/staging/vt6655/srom.h | 11 +- + drivers/staging/vt6655/tmacro.h | 11 +- + drivers/staging/vt6655/upc.h | 11 +- + drivers/staging/vt6656/baseband.c | 12 +- + drivers/staging/vt6656/baseband.h | 12 +- + drivers/staging/vt6656/card.c | 12 +- + drivers/staging/vt6656/card.h | 12 +- + drivers/staging/vt6656/channel.c | 12 +- + drivers/staging/vt6656/channel.h | 12 +- + drivers/staging/vt6656/desc.h | 12 +- + drivers/staging/vt6656/device.h | 12 +- + drivers/staging/vt6656/dpc.c | 12 +- + drivers/staging/vt6656/dpc.h | 12 +- + drivers/staging/vt6656/firmware.c | 12 +- + drivers/staging/vt6656/firmware.h | 12 +- + drivers/staging/vt6656/int.c | 12 +- + drivers/staging/vt6656/int.h | 12 +- + drivers/staging/vt6656/key.c | 12 +- + drivers/staging/vt6656/key.h | 12 +- + drivers/staging/vt6656/mac.c | 12 +- + drivers/staging/vt6656/mac.h | 12 +- + drivers/staging/vt6656/main_usb.c | 12 +- + drivers/staging/vt6656/power.c | 12 +- + drivers/staging/vt6656/power.h | 12 +- + drivers/staging/vt6656/rf.c | 12 +- + drivers/staging/vt6656/rf.h | 12 +- + drivers/staging/vt6656/rxtx.c | 12 +- + drivers/staging/vt6656/rxtx.h | 12 +- + drivers/staging/vt6656/usbpipe.c | 12 +- + drivers/staging/vt6656/usbpipe.h | 12 +- + drivers/staging/vt6656/wcmd.c | 12 +- + drivers/staging/vt6656/wcmd.h | 12 +- + drivers/staging/wilc1000/linux_wlan.c | 1 + + drivers/staging/wilc1000/wilc_debugfs.c | 1 + + drivers/staging/wilc1000/wilc_sdio.c | 1 + + drivers/staging/wilc1000/wilc_spi.c | 1 + + drivers/staging/wilc1000/wilc_wlan.c | 1 + + drivers/staging/wlan-ng/hfa384x.h | 1 + + drivers/staging/wlan-ng/hfa384x_usb.c | 1 + + drivers/staging/wlan-ng/p80211conv.c | 1 + + drivers/staging/wlan-ng/p80211conv.h | 1 + + drivers/staging/wlan-ng/p80211hdr.h | 1 + + drivers/staging/wlan-ng/p80211ioctl.h | 1 + + drivers/staging/wlan-ng/p80211metadef.h | 1 + + drivers/staging/wlan-ng/p80211metastruct.h | 1 + + drivers/staging/wlan-ng/p80211mgmt.h | 1 + + drivers/staging/wlan-ng/p80211msg.h | 1 + + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 + + drivers/staging/wlan-ng/p80211req.c | 1 + + drivers/staging/wlan-ng/p80211req.h | 1 + + drivers/staging/wlan-ng/p80211types.h | 1 + + drivers/staging/wlan-ng/p80211wep.c | 1 + + drivers/staging/wlan-ng/prism2fw.c | 1 + + drivers/staging/wlan-ng/prism2mgmt.c | 1 + + drivers/staging/wlan-ng/prism2mgmt.h | 1 + + drivers/staging/wlan-ng/prism2mib.c | 1 + + drivers/staging/wlan-ng/prism2sta.c | 1 + + drivers/staging/xgifb/XGI_main.h | 13 - + drivers/staging/xgifb/XGI_main_26.c | 224 +-- + drivers/{staging/unisys => }/visorbus/Kconfig | 2 +- + drivers/{staging/unisys => }/visorbus/Makefile | 2 - + .../unisys => }/visorbus/controlvmchannel.h | 14 +- + .../{staging/unisys => }/visorbus/vbuschannel.h | 13 +- + .../{staging/unisys => }/visorbus/visorbus_main.c | 13 +- + .../unisys => }/visorbus/visorbus_private.h | 13 +- + .../{staging/unisys => }/visorbus/visorchannel.c | 13 +- + .../{staging/unisys => }/visorbus/visorchipset.c | 20 +- + fs/Kconfig | 1 - + fs/Makefile | 1 - + include/linux/iio/machine.h | 7 + + .../unisys/include => include/linux}/visorbus.h | 178 +- + net/Kconfig | 1 - + net/Makefile | 1 - + 472 files changed, 7867 insertions(+), 8319 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/light/uvis25.txt + create mode 100644 drivers/iio/light/st_uvis25.h + create mode 100644 drivers/iio/light/st_uvis25_core.c + create mode 100644 drivers/iio/light/st_uvis25_i2c.c + create mode 100644 drivers/iio/light/st_uvis25_spi.c + create mode 100644 drivers/iio/light/zopt2201.c + delete mode 100644 drivers/staging/ccree/Documentation/devicetree/bindings/crypto/arm-cryptocell.txt + rename {net => drivers/staging}/ipx/Kconfig (99%) + rename {net => drivers/staging}/ipx/Makefile (100%) + create mode 100644 drivers/staging/ipx/TODO + rename {net => drivers/staging}/ipx/af_ipx.c (100%) + rename {net => drivers/staging}/ipx/ipx_proc.c (100%) + rename {net => drivers/staging}/ipx/ipx_route.c (100%) + rename {net => drivers/staging}/ipx/pe2.c (100%) + rename {net => drivers/staging}/ipx/sysctl_net_ipx.c (100%) + create mode 100644 drivers/staging/most/Documentation/ABI/sysfs-bus-most.txt + delete mode 100644 drivers/staging/most/aim-cdev/Makefile + delete mode 100644 drivers/staging/most/aim-network/Makefile + delete mode 100644 drivers/staging/most/aim-sound/Makefile + delete mode 100644 drivers/staging/most/aim-v4l2/Makefile + rename drivers/staging/most/{aim-cdev => cdev}/Kconfig (70%) + create mode 100644 drivers/staging/most/cdev/Makefile + rename drivers/staging/most/{aim-cdev => cdev}/cdev.c (68%) + create mode 100644 drivers/staging/most/core.c + rename drivers/staging/most/{mostcore/mostcore.h => core.h} (84%) + rename drivers/staging/most/{hdm-dim2 => dim2}/Kconfig (83%) + create mode 100644 drivers/staging/most/dim2/Makefile + rename drivers/staging/most/{hdm-dim2/dim2_hdm.c => dim2/dim2.c} (97%) + rename drivers/staging/most/{hdm-dim2/dim2_hdm.h => dim2/dim2.h} (54%) + rename drivers/staging/most/{hdm-dim2/dim2_errors.h => dim2/errors.h} (73%) + rename drivers/staging/most/{hdm-dim2/dim2_hal.c => dim2/hal.c} (98%) + rename drivers/staging/most/{hdm-dim2/dim2_hal.h => dim2/hal.h} (88%) + rename drivers/staging/most/{hdm-dim2/dim2_reg.h => dim2/reg.h} (89%) + create mode 100644 drivers/staging/most/dim2/sysfs.c + create mode 100644 drivers/staging/most/dim2/sysfs.h + delete mode 100644 drivers/staging/most/hdm-dim2/Makefile + delete mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.c + delete mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.h + delete mode 100644 drivers/staging/most/hdm-i2c/Makefile + delete mode 100644 drivers/staging/most/hdm-usb/Makefile + rename drivers/staging/most/{hdm-i2c => i2c}/Kconfig (72%) + create mode 100644 drivers/staging/most/i2c/Makefile + rename drivers/staging/most/{hdm-i2c/hdm_i2c.c => i2c/i2c.c} (95%) + delete mode 100644 drivers/staging/most/mostcore/Kconfig + delete mode 100644 drivers/staging/most/mostcore/Makefile + delete mode 100644 drivers/staging/most/mostcore/core.c + rename drivers/staging/most/{aim-network => net}/Kconfig (69%) + create mode 100644 drivers/staging/most/net/Makefile + rename drivers/staging/most/{aim-network/networking.c => net/net.c} (88%) + rename drivers/staging/most/{aim-sound => sound}/Kconfig (72%) + create mode 100644 drivers/staging/most/sound/Makefile + rename drivers/staging/most/{aim-sound => sound}/sound.c (95%) + rename drivers/staging/most/{hdm-usb => usb}/Kconfig (77%) + create mode 100644 drivers/staging/most/usb/Makefile + rename drivers/staging/most/{hdm-usb/hdm_usb.c => usb/usb.c} (85%) + rename drivers/staging/most/{aim-v4l2 => video}/Kconfig (71%) + create mode 100644 drivers/staging/most/video/Makefile + rename drivers/staging/most/{aim-v4l2 => video}/video.c (74%) + rename {fs => drivers/staging}/ncpfs/Kconfig (100%) + rename {fs => drivers/staging}/ncpfs/Makefile (100%) + create mode 100644 drivers/staging/ncpfs/TODO + rename {fs => drivers/staging}/ncpfs/dir.c (100%) + rename {fs => drivers/staging}/ncpfs/file.c (100%) + rename {fs => drivers/staging}/ncpfs/getopt.c (100%) + rename {fs => drivers/staging}/ncpfs/getopt.h (100%) + rename {fs => drivers/staging}/ncpfs/inode.c (100%) + rename {fs => drivers/staging}/ncpfs/ioctl.c (100%) + rename {fs => drivers/staging}/ncpfs/mmap.c (100%) + rename {fs => drivers/staging}/ncpfs/ncp_fs.h (100%) + rename {fs => drivers/staging}/ncpfs/ncp_fs_i.h (100%) + rename {fs => drivers/staging}/ncpfs/ncp_fs_sb.h (100%) + rename {fs => drivers/staging}/ncpfs/ncplib_kernel.c (100%) + rename {fs => drivers/staging}/ncpfs/ncplib_kernel.h (100%) + rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.c (100%) + rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.h (100%) + rename {fs => drivers/staging}/ncpfs/sock.c (100%) + rename {fs => drivers/staging}/ncpfs/symlink.c (100%) + delete mode 100644 drivers/staging/unisys/include/visorchannel.h + rename drivers/{staging/unisys => }/visorbus/Kconfig (94%) + rename drivers/{staging/unisys => }/visorbus/Makefile (81%) + rename drivers/{staging/unisys => }/visorbus/controlvmchannel.h (97%) + rename drivers/{staging/unisys => }/visorbus/vbuschannel.h (85%) + rename drivers/{staging/unisys => }/visorbus/visorbus_main.c (98%) + rename drivers/{staging/unisys => }/visorbus/visorbus_private.h (78%) + rename drivers/{staging/unisys => }/visorbus/visorchannel.c (95%) + rename drivers/{staging/unisys => }/visorbus/visorchipset.c (98%) + rename {drivers/staging/unisys/include => include/linux}/visorbus.h (52%) +Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + drivers/mux/Kconfig | 1 + + drivers/mux/Makefile | 1 + + drivers/mux/adg792a.c | 5 +---- + drivers/mux/core.c | 9 ++++----- + drivers/mux/gpio.c | 5 +---- + drivers/mux/mmio.c | 5 +---- + include/linux/mux/consumer.h | 5 +---- + include/linux/mux/driver.h | 5 +---- + 8 files changed, 11 insertions(+), 25 deletions(-) +Merging slave-dma/next (f1b8ae7acceb Merge branch 'topic/mic' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/amba-pl08x.c | 11 ++++++++++- + drivers/dma/at_hdmac.c | 4 +++- + drivers/dma/bcm2835-dma.c | 10 +++++++++- + drivers/dma/dma-jz4780.c | 10 +++++++++- + drivers/dma/edma.c | 7 ++----- + drivers/dma/img-mdc-dma.c | 17 ++++++++++++----- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/k3dma.c | 10 +++++++++- + drivers/dma/mic_x100_dma.c | 4 +--- + drivers/dma/omap-dma.c | 2 +- + drivers/dma/qcom/hidma_ll.c | 9 ++++++--- + drivers/dma/s3c24xx-dma.c | 11 ++++++++++- + drivers/dma/sh/rcar-dmac.c | 44 ++++++++++++++++++++++++++++++++++++++++++- + drivers/dma/tegra20-apb-dma.c | 19 ++++++++++++++----- + drivers/dma/virt-dma.c | 5 +---- + drivers/dma/virt-dma.h | 44 +++++++++++++++++++++++++++++++++++++++++++ + 16 files changed, 175 insertions(+), 34 deletions(-) +Merging cgroup/for-next (e7fd37ba1217 cgroup: avoid copying strings longer than the buffers) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging scsi/for-next (a9417e74ff41 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/scsi.rst | 10 +- + MAINTAINERS | 2 +- + drivers/message/fusion/mptbase.c | 57 +- + drivers/scsi/3w-9xxx.c | 26 +- + drivers/scsi/3w-9xxx.h | 2 +- + drivers/scsi/3w-sas.c | 15 +- + drivers/scsi/aacraid/commsup.c | 8 +- + drivers/scsi/aacraid/linit.c | 3 - + drivers/scsi/arcmsr/arcmsr.h | 567 +++++++++------- + drivers/scsi/arcmsr/arcmsr_hba.c | 1056 +++++++++++++++++++++++------- + drivers/scsi/bfa/bfa_cs.h | 6 +- + drivers/scsi/bfa/bfa_defs_svc.h | 3 +- + drivers/scsi/bfa/bfa_fcbuild.c | 8 +- + drivers/scsi/bfa/bfa_fcpim.c | 3 +- + drivers/scsi/bfa/bfa_fcpim.h | 4 +- + drivers/scsi/bfa/bfa_fcs.c | 78 +-- + drivers/scsi/bfa/bfa_fcs_lport.c | 62 +- + drivers/scsi/bfa/bfa_ioc.c | 10 +- + drivers/scsi/bfa/bfa_port.c | 15 +- + drivers/scsi/bfa/bfa_port.h | 2 +- + drivers/scsi/bfa/bfa_svc.c | 51 +- + drivers/scsi/bfa/bfa_svc.h | 2 +- + drivers/scsi/bfa/bfad.c | 20 +- + drivers/scsi/bfa/bfad_attr.c | 5 +- + drivers/scsi/bfa/bfad_bsg.c | 16 +- + drivers/scsi/bfa/bfad_im.c | 6 +- + drivers/scsi/bfa/bfad_im.h | 42 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 9 +- + drivers/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/csiostor/csio_init.h | 1 - + drivers/scsi/csiostor/csio_mb.c | 6 +- + drivers/scsi/fnic/fnic_debugfs.c | 20 +- + drivers/scsi/fnic/fnic_scsi.c | 2 +- + drivers/scsi/hosts.c | 6 + + drivers/scsi/hpsa.c | 2 - + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 320 ++++----- + drivers/scsi/ipr.c | 4 +- + drivers/scsi/libfc/fc_lport.c | 4 + + drivers/scsi/libsas/sas_expander.c | 10 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 13 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 19 + + drivers/scsi/lpfc/lpfc_debugfs.c | 16 +- + drivers/scsi/lpfc/lpfc_disc.h | 2 + + drivers/scsi/lpfc/lpfc_els.c | 71 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 29 +- + drivers/scsi/lpfc/lpfc_hw4.h | 6 +- + drivers/scsi/lpfc/lpfc_init.c | 243 ++++--- + drivers/scsi/lpfc/lpfc_mem.c | 2 +- + drivers/scsi/lpfc/lpfc_nvme.c | 230 ++++++- + drivers/scsi/lpfc/lpfc_nvme.h | 5 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 13 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 4 + + drivers/scsi/lpfc/lpfc_sli.c | 169 ++--- + drivers/scsi/lpfc/lpfc_sli4.h | 10 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 12 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/ppa.c | 4 + + drivers/scsi/qla2xxx/qla_def.h | 49 +- + drivers/scsi/qla2xxx/qla_gs.c | 230 +++++-- + drivers/scsi/qla2xxx/qla_init.c | 69 +- + drivers/scsi/qla2xxx/qla_iocb.c | 13 - + drivers/scsi/qla2xxx/qla_isr.c | 12 +- + drivers/scsi/qla2xxx/qla_mbx.c | 3 +- + drivers/scsi/qla2xxx/qla_mid.c | 42 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 - + drivers/scsi/qla2xxx/qla_os.c | 78 ++- + drivers/scsi/qla2xxx/qla_sup.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 62 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_common.c | 14 +- + drivers/scsi/scsi_debug.c | 111 +++- + drivers/scsi/scsi_debugfs.c | 6 +- + drivers/scsi/scsi_devinfo.c | 59 +- + drivers/scsi/scsi_dh.c | 5 +- + drivers/scsi/scsi_error.c | 21 +- + drivers/scsi/scsi_lib.c | 44 +- + drivers/scsi/scsi_priv.h | 15 +- + drivers/scsi/scsi_sysfs.c | 3 - + drivers/scsi/sd.c | 10 +- + drivers/scsi/ses.c | 11 +- + drivers/scsi/st.c | 2 +- + drivers/scsi/ufs/ufshci.h | 16 + + drivers/scsi/wd719x.c | 4 +- + include/scsi/scsi_cmnd.h | 1 - + include/scsi/scsi_host.h | 2 + + 90 files changed, 2835 insertions(+), 1391 deletions(-) +Merging scsi-mkp/for-next (ed123b6e4740 scsi: qla2xxx: remove duplicate includes) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (97488c73190b tcmu: Add a missing unlock on an error path) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (ebb82e3c79d2 ahci: Allow setting a default LPM policy for mobile chipsets) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 19 +++++++++++ + drivers/ata/ahci.c | 93 ++++++++++++++++++++++++++++++++--------------------- + drivers/ata/ahci.h | 3 ++ + 3 files changed, 78 insertions(+), 37 deletions(-) +Merging vhost/linux-next (e073f74a5a39 Merge branch 'this' into vhost) +$ git merge vhost/linux-next +Auto-merging kernel/crash_core.c +Auto-merging drivers/vhost/scsi.c +Merge made by the 'recursive' strategy. + drivers/firmware/qemu_fw_cfg.c | 284 ++++++++++++++++++++++++++++++++---- + drivers/vhost/scsi.c | 9 +- + drivers/virtio/virtio_balloon.c | 4 + + drivers/virtio/virtio_mmio.c | 6 +- + include/uapi/linux/virtio_balloon.h | 3 +- + kernel/crash_core.c | 1 + + 6 files changed, 265 insertions(+), 42 deletions(-) +Merging rpmsg/for-next (aae5207dd9c4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/qcom_common.c | 2 +- + drivers/rpmsg/qcom_glink_smem.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging gpio/for-next (1cb26d26cc0f Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/gpio/gpiolib.c +Removing drivers/gpio/gpio-axp209.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-axp209.txt | 49 ++- + Documentation/w1/masters/w1-gpio | 17 +- + MAINTAINERS | 1 + + arch/arm/mach-ixp4xx/vulcan-setup.c | 13 +- + arch/arm/mach-pxa/raumfeld.c | 16 +- + drivers/gpio/Kconfig | 6 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-aspeed.c | 39 +- + drivers/gpio/gpio-ath79.c | 3 + + drivers/gpio/gpio-axp209.c | 188 -------- + drivers/gpio/gpio-ftgpio010.c | 4 +- + drivers/gpio/gpio-iop.c | 4 + + drivers/gpio/gpio-it87.c | 2 +- + drivers/gpio/gpio-max732x.c | 6 +- + drivers/gpio/gpio-mockup.c | 288 +++++++------ + drivers/gpio/gpio-omap.c | 32 +- + drivers/gpio/gpio-reg.c | 4 +- + drivers/gpio/gpio-stmpe.c | 24 +- + drivers/gpio/gpiolib-acpi.c | 57 ++- + drivers/gpio/gpiolib-of.c | 6 +- + drivers/gpio/gpiolib-sysfs.c | 14 +- + drivers/gpio/gpiolib.c | 74 +++- + drivers/gpio/gpiolib.h | 10 +- + drivers/pinctrl/Kconfig | 10 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-axp209.c | 476 +++++++++++++++++++++ + drivers/w1/masters/w1-gpio.c | 149 +++---- + include/dt-bindings/gpio/gpio.h | 6 +- + include/linux/acpi.h | 5 + + include/linux/gpio.h | 10 + + include/linux/gpio/consumer.h | 8 + + include/linux/gpio/machine.h | 4 +- + include/linux/of_gpio.h | 2 +- + include/linux/pinctrl/pinconf-generic.h | 2 + + include/linux/w1-gpio.h | 9 +- + 35 files changed, 1038 insertions(+), 502 deletions(-) + delete mode 100644 drivers/gpio/gpio-axp209.c + create mode 100644 drivers/pinctrl/pinctrl-axp209.c +Merging pinctrl/for-next (353c2e005e37 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/cortina,gemini-pinctrl.txt | 3 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../pinctrl/socionext,uniphier-pinctrl.txt | 27 + + MAINTAINERS | 1 + + drivers/gpio/gpio-uniphier.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 75 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 65 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 75 +- + drivers/pinctrl/intel/pinctrl-intel.c | 179 +++- + drivers/pinctrl/intel/pinctrl-intel.h | 3 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 7 + + drivers/pinctrl/meson/Kconfig | 9 + + drivers/pinctrl/meson/Makefile | 2 + + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 118 +++ + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 62 ++ + drivers/pinctrl/meson/pinctrl-meson-axg.c | 975 +++++++++++++++++++++ + drivers/pinctrl/meson/pinctrl-meson.h | 1 + + drivers/pinctrl/pinctrl-gemini.c | 84 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 35 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32f429.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32f469.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32f746.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32h743.c | 6 +- + include/dt-bindings/gpio/meson-axg-gpio.h | 116 +++ + 27 files changed, 1647 insertions(+), 222 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg.c + create mode 100644 include/dt-bindings/gpio/meson-axg-gpio.h +Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-meson.txt | 2 ++ + drivers/pwm/pwm-meson.c | 26 ++++++++++++++++++++++ + drivers/pwm/pwm-stmpe.c | 2 +- + drivers/pwm/sysfs.c | 1 + + 4 files changed, 30 insertions(+), 1 deletion(-) +Merging userns/for-next (116ceac9741e autofs4: Modify autofs_wait to use current_uid() and current_gid()) +$ git merge userns/for-next +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/autofs4/waitq.c | 4 ++-- + fs/namei.c | 3 --- + 2 files changed, 2 insertions(+), 5 deletions(-) +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (9e66317d3c92 Linux 4.14-rc3) +$ 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 (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (c99a2be790b0 livepatch: force transition to finish) +$ git merge livepatching/for-next +Auto-merging kernel/signal.c +Auto-merging arch/powerpc/kernel/signal.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 26 ++++++++ + Documentation/livepatch/livepatch.txt | 25 +++++++- + arch/powerpc/kernel/signal.c | 6 +- + arch/x86/entry/common.c | 6 +- + kernel/livepatch/core.c | 60 ++++++++++++++++++ + kernel/livepatch/transition.c | 77 +++++++++++++++++++++++- + kernel/livepatch/transition.h | 2 + + kernel/signal.c | 4 +- + 8 files changed, 195 insertions(+), 11 deletions(-) +Merging coresight/next (2bbe5ac62413 coresight: etb10: remove duplicate includes) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../coresight/coresight-dynamic-replicator.c | 4 +--- + drivers/hwtracing/coresight/coresight-etb10.c | 1 - + drivers/hwtracing/coresight/coresight-funnel.c | 4 +--- + drivers/hwtracing/coresight/coresight-tpiu.c | 17 +++++++++------ + drivers/hwtracing/coresight/coresight.c | 25 +++++----------------- + 5 files changed, 18 insertions(+), 33 deletions(-) +Merging rtc/rtc-next (9f33399c9074 rtc: stm32: Fix copyright) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-brcmstb-waketimer.c | 15 ++++++++++++--- + drivers/rtc/rtc-r9701.c | 6 ------ + drivers/rtc/rtc-stm32.c | 4 ++-- + include/linux/rtc.h | 1 - + 4 files changed, 14 insertions(+), 12 deletions(-) +Merging nvdimm/libnvdimm-for-next (4247f24c2358 Merge branch 'for-4.15/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up to date. +Merging at24/at24/for-next (a53593d9621c eeprom: at24: don't use the default regmap locking) +$ git merge at24/at24/for-next +Recorded preimage for 'drivers/misc/eeprom/at24.c' +Auto-merging drivers/misc/eeprom/at24.c +CONFLICT (content): Merge conflict in drivers/misc/eeprom/at24.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/eeprom/at24.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/misc/eeprom/at24.c'. +[master f738c2af2681] Merge remote-tracking branch 'at24/at24/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/eeprom/{eeprom.txt => at24.txt} | 5 + + MAINTAINERS | 1 + + drivers/misc/eeprom/Kconfig | 1 + + drivers/misc/eeprom/at24.c | 460 ++++++--------------- + include/linux/platform_data/at24.h | 2 + + 5 files changed, 142 insertions(+), 327 deletions(-) + rename Documentation/devicetree/bindings/eeprom/{eeprom.txt => at24.txt} (85%) +Merging ntb/ntb-next (c47963de5204 ntb_hw_switchtec: Force down the link before initializing) +$ git merge ntb/ntb-next +Auto-merging include/linux/switchtec.h +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/ntb_hw_intel.c | 309 +---------------- + drivers/ntb/hw/intel/ntb_hw_intel.h | 58 ---- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 586 ++++++++++++++++++++++++++------- + drivers/ntb/ntb.c | 3 +- + drivers/ntb/test/ntb_perf.c | 3 +- + drivers/ntb/test/ntb_pingpong.c | 3 +- + drivers/ntb/test/ntb_tool.c | 3 +- + include/linux/ntb.h | 15 +- + include/linux/switchtec.h | 23 +- + 9 files changed, 511 insertions(+), 492 deletions(-) +Merging kspp/for-next/kspp (589cde432c02 lkdtm: Update usercopy tests for whitelisting) +$ git merge kspp/for-next/kspp +Auto-merging virt/kvm/kvm_main.c +Auto-merging security/Kconfig +Auto-merging net/sctp/socket.c +Auto-merging net/ipv4/raw.c +Auto-merging net/core/sock.c +Auto-merging net/caif/caif_socket.c +Auto-merging include/net/sock.h +Auto-merging include/net/sctp/structs.h +Auto-merging fs/dcache.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 11 +++++ + arch/arm/Kconfig | 1 + + arch/arm/include/asm/processor.h | 7 +++ + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/processor.h | 8 ++++ + arch/x86/Kconfig | 1 + + arch/x86/include/asm/processor.h | 8 ++++ + arch/x86/kvm/x86.c | 7 +-- + drivers/misc/lkdtm.h | 4 +- + drivers/misc/lkdtm_core.c | 4 +- + drivers/misc/lkdtm_usercopy.c | 88 +++++++++++++++++++++----------------- + drivers/scsi/scsi_lib.c | 9 ++-- + fs/befs/linuxvfs.c | 14 +++--- + fs/cifs/cifsfs.c | 10 +++-- + fs/dcache.c | 9 ++-- + fs/exofs/super.c | 7 ++- + fs/ext2/super.c | 12 +++--- + fs/ext4/super.c | 12 +++--- + fs/fhandle.c | 3 +- + fs/freevxfs/vxfs_super.c | 8 +++- + fs/jfs/super.c | 8 ++-- + fs/orangefs/super.c | 15 ++++--- + fs/ufs/super.c | 13 +++--- + include/linux/sched/task.h | 14 ++++++ + include/linux/slab.h | 29 ++++++++++--- + include/linux/slab_def.h | 3 ++ + include/linux/slub_def.h | 3 ++ + include/linux/stddef.h | 2 + + include/net/sctp/structs.h | 9 +++- + include/net/sock.h | 2 + + kernel/fork.c | 31 +++++++++++--- + mm/slab.c | 34 ++++++++++++--- + mm/slab.h | 8 +++- + mm/slab_common.c | 62 ++++++++++++++++++++++----- + mm/slub.c | 44 +++++++++++++++---- + mm/usercopy.c | 12 ++++++ + net/caif/caif_socket.c | 2 + + net/core/sock.c | 4 +- + net/ipv4/raw.c | 2 + + net/ipv6/raw.c | 2 + + net/sctp/socket.c | 10 ++++- + security/Kconfig | 14 ++++++ + virt/kvm/kvm_main.c | 8 +++- + 43 files changed, 417 insertions(+), 138 deletions(-) +Merging akpm-current/current (677a4801e2b7 lustre: don't set f_version in ll_readdir) +$ git merge --no-ff akpm-current/current +Removing tools/testing/selftests/x86/5lvl.c +Auto-merging scripts/checkpatch.pl +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/mlock.c +Auto-merging mm/memcontrol.c +Auto-merging lib/find_bit_benchmark.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/mqueue.c +Auto-merging include/linux/sched.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/dcache.c +Auto-merging fs/autofs4/waitq.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Auto-merging drivers/gpu/drm/drm_mm.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/ia64/kernel/perfmon.c +Auto-merging arch/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/cgroup-v2.txt | 67 ++++ + Documentation/sysctl/vm.txt | 30 +- + Documentation/vm/hugetlbpage.txt | 27 +- + Documentation/vm/zswap.txt | 22 +- + Makefile | 51 ++- + arch/Kconfig | 16 +- + arch/arm/include/asm/bitops.h | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/frv/kernel/traps.c | 9 + + arch/ia64/kernel/perfmon.c | 13 +- + arch/m68k/include/asm/bitops.h | 3 +- + arch/powerpc/Kconfig | 1 - + arch/s390/Kconfig | 1 - + arch/s390/kernel/compat_linux.c | 1 + + arch/unicore32/include/asm/bitops.h | 2 + + arch/x86/Kconfig | 3 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + drivers/gpu/drm/drm_mm.c | 8 +- + drivers/staging/lustre/lustre/llite/dir.c | 3 - + fs/autofs4/waitq.c | 1 - + fs/dax.c | 19 +- + fs/dcache.c | 3 +- + fs/exec.c | 8 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 3 +- + fs/hfsplus/inode.c | 7 +- + fs/hfsplus/super.c | 2 +- + fs/nfsd/auth.c | 3 + + fs/ntfs/inode.c | 9 - + fs/ntfs/mft.c | 6 - + fs/ocfs2/aops.c | 77 +++- + fs/ocfs2/cluster/quorum.c | 5 +- + fs/ocfs2/cluster/tcp_internal.h | 2 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 7 - + fs/ocfs2/dlmglue.c | 43 ++- + fs/ocfs2/dlmglue.h | 6 +- + fs/ocfs2/extent_map.c | 41 +++ + fs/ocfs2/extent_map.h | 3 + + fs/ocfs2/file.c | 95 ++++- + fs/ocfs2/filecheck.c | 357 +++++++----------- + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/mmap.c | 2 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 10 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/array.c | 8 +- + fs/proc/base.c | 65 +++- + fs/proc/fd.c | 2 +- + fs/proc/kcore.c | 18 +- + fs/proc/self.c | 6 +- + fs/proc/task_mmu.c | 11 +- + fs/proc/thread_self.c | 5 +- + fs/proc/vmcore.c | 6 +- + fs/seq_file.c | 10 - + fs/userfaultfd.c | 5 +- + include/asm-generic/bitops/find.h | 20 + + include/linux/bitmap.h | 6 +- + include/linux/cgroup-defs.h | 5 + + include/linux/cpumask.h | 2 +- + include/linux/crash_core.h | 2 + + include/linux/cred.h | 1 + + include/linux/hugetlb.h | 1 - + include/linux/idr.h | 1 + + include/linux/list_lru.h | 3 +- + include/linux/memcontrol.h | 199 ++++++---- + include/linux/memory_hotplug.h | 3 - + include/linux/mm.h | 29 +- + include/linux/mmzone.h | 2 +- + include/linux/oom.h | 21 +- + include/linux/pagevec.h | 6 +- + include/linux/rbtree.h | 2 + + include/linux/sched.h | 11 +- + include/linux/sched/coredump.h | 1 + + include/linux/sched/mm.h | 24 +- + include/linux/sched/signal.h | 3 + + include/linux/shrinker.h | 2 +- + include/linux/string.h | 5 +- + include/linux/swap.h | 42 +-- + include/linux/vmstat.h | 17 - + include/trace/events/vmscan.h | 23 +- + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sysctl.h | 4 + + ipc/mqueue.c | 2 +- + ipc/msg.c | 20 +- + ipc/sem.c | 10 + + ipc/shm.c | 20 +- + ipc/util.c | 5 +- + kernel/async.c | 20 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/compat.c | 2 +- + kernel/configs/tiny.config | 4 + + kernel/cred.c | 1 + + kernel/exit.c | 12 + + kernel/fork.c | 506 ++++++++++++++------------ + kernel/futex.c | 20 +- + kernel/groups.c | 5 +- + kernel/kcov.c | 4 +- + kernel/pid.c | 13 + + kernel/ptrace.c | 27 +- + kernel/sched/core.c | 2 +- + kernel/sys.c | 11 + + kernel/sysctl.c | 7 - + kernel/taskstats.c | 6 +- + kernel/uid16.c | 1 + + lib/Kconfig.debug | 37 +- + lib/Kconfig.kasan | 3 - + lib/Makefile | 2 +- + lib/cpumask.c | 9 +- + lib/find_bit.c | 59 ++- + lib/{test_find_bit.c => find_bit_benchmark.c} | 70 ++-- + lib/rbtree.c | 10 + + lib/stackdepot.c | 19 +- + lib/ubsan.c | 9 +- + mm/Kconfig | 7 +- + mm/backing-dev.c | 35 ++ + mm/cma.c | 83 ++++- + mm/compaction.c | 4 +- + mm/filemap.c | 1 - + mm/frame_vector.c | 6 +- + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 40 +- + mm/internal.h | 4 +- + mm/interval_tree.c | 2 +- + mm/khugepaged.c | 3 +- + mm/kmemleak.c | 3 +- + mm/list_lru.c | 74 ++-- + mm/memcontrol.c | 424 ++++++++++++++++----- + mm/memory.c | 85 +++-- + mm/memory_hotplug.c | 13 +- + mm/mempolicy.c | 35 +- + mm/mlock.c | 6 + + mm/mmap.c | 10 +- + mm/nommu.c | 7 - + mm/oom_kill.c | 214 +++++++---- + mm/page_alloc.c | 269 ++++++++------ + mm/page_owner.c | 8 +- + mm/process_vm_access.c | 6 +- + mm/shmem.c | 5 +- + mm/slab.c | 18 +- + mm/slab.h | 3 - + mm/slab_common.c | 56 +-- + mm/swap.c | 98 ++--- + mm/swap_state.c | 137 ++++--- + mm/truncate.c | 23 +- + mm/vmscan.c | 138 ++----- + mm/zswap.c | 71 +++- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 1 + + net/sunrpc/auth_gss/svcauth_gss.c | 1 + + net/sunrpc/svcauth_unix.c | 2 + + scripts/checkpatch.pl | 5 + + scripts/decodecode | 20 + + scripts/faddr2line | 8 +- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + security/yama/yama_lsm.c | 11 +- + tools/include/asm-generic/bitops/find.h | 16 + + tools/lib/find_bit.c | 40 +- + tools/testing/selftests/vm/Makefile | 5 +- + tools/testing/selftests/vm/run_vmtests | 11 + + tools/testing/selftests/vm/va_128TBswitch.c | 297 +++++++++++++++ + tools/testing/selftests/x86/5lvl.c | 177 --------- + tools/vm/slabinfo-gnuplot.sh | 2 +- + 169 files changed, 3164 insertions(+), 1918 deletions(-) + rename lib/{test_find_bit.c => find_bit_benchmark.c} (69%) + create mode 100644 tools/testing/selftests/vm/va_128TBswitch.c + delete mode 100644 tools/testing/selftests/x86/5lvl.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: tools/objtool/Makefile: don't assume sync-check.sh is executable +Applying: vfs: remove might_sleep() from clear_inode() +Applying: mm/userfaultfd.c: remove duplicate include +Applying: ipc, mqueue: lazy call kern_mount_data in new namespaces +Applying: epoll: use the waitqueue lock to protect ep->wq +Applying: sched/wait: assert the wait_queue_head lock is held in __wake_up_common +Applying: mm: remove unneeded kallsyms include +Applying: power: remove unneeded kallsyms include +Applying: pci: remove unneeded kallsyms include +Applying: pnp: remove unneeded kallsyms include +Applying: hrtimer: remove unneeded kallsyms include +Applying: genirq: remove unneeded kallsyms include +Applying: sparc64: NG4 memset 32 bits overflow +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + e8e5b7ee0a5e...439811df7cfc akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (439811df7cfc lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 +++++++++---------- + drivers/base/power/main.c | 1 - + drivers/pci/quirks.c | 1 - + drivers/pnp/quirks.c | 1 - + fs/eventpoll.c | 46 ++++++++++++++++------------------ + fs/inode.c | 1 - + include/linux/crc-ccitt.h | 7 ++++++ + include/linux/ipc_namespace.h | 4 +-- + ipc/mqueue.c | 49 ++++++++++++++++++++++++++++-------- + ipc/namespace.c | 2 +- + kernel/irq/spurious.c | 1 - + kernel/sched/wait.c | 2 ++ + kernel/time/hrtimer.c | 1 - + lib/crc-ccitt.c | 58 ++++++++++++++++++++++++++++++++++++++++++- + mm/memory.c | 4 --- + mm/userfaultfd.c | 1 - + tools/objtool/Makefile | 2 +- + 17 files changed, 144 insertions(+), 63 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..221329d04e35 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.14-rc5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..eab4058cb65a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20171213 |