diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-06 15:17:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-06 15:17:23 +1100 |
| commit | d5c52866f560ba43edcb941868e1f884f15234e5 (patch) | |
| tree | 7fc0a6bbc1b2807e4dfcbc1f6dd6754ce593acd3 | |
| parent | 1c63c500b8fc601b422c5b23a230226b3adfbf48 (diff) | |
| download | linux-next-d5c52866f560ba43edcb941868e1f884f15234e5.tar.gz | |
Add linux-next specific files for 20171206next-20171206
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 252 | ||||
| -rw-r--r-- | Next/Trees | 254 | ||||
| -rw-r--r-- | Next/merge.log | 5014 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5523 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7c78fce2a10f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,252 @@ +Name SHA1 +---- ---- +origin 13231caccedffcceff1580b78e6d99d8b0a43404 +fixes 820bf5c419e4b85298e5c3001bd1b5be46d60765 +kbuild-current 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arc-current 329b4130bc5eb2a1b123a652b985dbdb08d6b9a8 +arm-current 3aaf33bebda8d4ffcc0fc8ef39e6c1ac68823b11 +m68k-current 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 7e4d4233260be0611c7fbdb2730c12731c4b8dc0 +sparc a0908a1b7d68706ee52ed4a039756e70c8e956e9 +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net c9d3fe9da094a9a7a3d3cd365b334b822e05f5e8 +bpf 2391f0b4808e3d5af348324d69f5f45c56a26836 +ipsec 4ce3dbe397d7b6b15f272ae757c78c35e9e4b61d +netfilter 8b1836c4b64386e9bc580438cae386ed31a43ab9 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 5c3de777bdaf48bd0cfb43097c0d0fb85056cab7 +mac80211 72e2c3438ba3bd2ed640b6b5ea9e58993dd9ab7f +sound-current 362bca57f5d78220f8b5907b875961af9436e229 +pci-current 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +driver-core.current 0946b2fb38fdb6585a5ac3ca84ac73924f645952 +tty.current c8ec2041f549e7f2dee0c34d25381be6f7805f99 +usb.current 80e457699a8dbdd70f2d26911e46f538645c55fc +usb-gadget-fixes a3acc696085e112733d191a77b106e67a4fa110b +usb-serial-fixes 762ff4678e89a5e3f8b2237533e04d3ef2737e78 +usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d +phy 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +staging.current e168e9845d956e6d0c057f9ecd28782a1ab4a08a +char-misc.current 66bc5df31110652a31c91f14b4e23f7c51e5328e +input-current 4c83c071b7849ca3e8072284a8587669d8ba6a3d +crypto-current ecaaab5649781c5a0effdaf298a925063020500e +ide 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c +vfio-fixes e41dd1556d4d22c4b51c9003552af36e1d3e9b4a +kselftest-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +mfd-fixes 001dde9400d5c3e9e2ce2abe06c1efa70a25dfde +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes b084116f8587b222a2c5ef6dcd846f40f24b9420 +kvm-fixes 609b7002705ae72a6ca45b633b7ff1a09a7a0d86 +drm-intel-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +drm-misc-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +kbuild 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping c9eb6172c328dde7e14812f94f8da87b691e41b5 +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 383f07dc0a84ee4b9bfd2f5376f70283ab932ac6 +arm-perf 07141342149a62db780c02f6352a0610a535eee1 +arm-soc ee4c54d0912713f69da51bca922735846fac25a8 +actions a15f031b73615eab6094595c1407aee03fcb9b71 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 9f8e06ca1d0e3ef1167a2f43a8b1e63763b283b8 +aspeed 9c9ae757dc8b8c5f7ca676587e58af3e63d4c766 +at91 bee152d6af7d735f177ad1398ed9bbe84dfb6d63 +bcm2835 e83e7335d05989773de0f70c0bea6a912343c21a +imx-mxs 3d48b83d1ab5b471199a1a42b3279455eeba8f71 +keystone 1064f63204a0674eb7924a5a508bbb6e187ac0c5 +mvebu c6c5ff72be36b321c9da7de1ecd4d1daf938ff31 +omap aa40a77609dbe4c6ca6be8fad5c5ffd89f2cf27c +reset 0e5721f76252d69d424ec87a391d5ea37414b641 +qcom e7048ed58ed960c5355138ee7db740ab28ec4d4e +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 2dd944f637d52f508c12199acdd3244328b543e5 +rockchip d683087d6944c99b49b5dc04a2ad6448644e3070 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk a77db8a2259610d218496614d9e479dde83401aa +sunxi 81ea246a6edf8e5aa351dd2be6a2cb8608816126 +tegra ec0c973f47c74920bc8731f7355b5bf9a3f38de4 +arm64 6cfa7cc46b1a7a15d81d5389c99cfca633c12b8e +clk 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +clk-samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +c6x 62016565bb04cb9f138510e87c9e4da95e00fdfb +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +m68k 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 +m68knommu 4cc9ce65974bbf735cd0cabf9bcbf651f53c383b +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze da25f490a0b3d9c234d659b21024d61fe2d08c8e +mips e0c5f36b2a638fc3298200c385af7f196d3b5cd4 +nios2 65d1e3ddeae117f6a224535e10a09145f0f96508 +openrisc 610f01b9a88a9ef8b506709a825c17395c56a62a +parisc-hd bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +powerpc ae64f9bd1d3621b5e60d7363bc20afb46aede215 +fsl a4e89ffb59235fd11d27107dea3efa4562ac0a12 +risc-v f0b0655e99364856082c243446de1fbaeafb9bc0 +s390 4c48b1da1d91ba38c8f50d1ef8f3f196a41a74a1 +sparc-next 1deab8ce2c91e3b16563b7a7ea150f82334262ec +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 02eb0b11eab56b47bcc36aa04dd522786c8faab9 +xtensa 271335b9726e230eda124c83af2b4773502288f5 +fscrypt a0b3bc855374c50b5ea85273553485af48caf2f7 +befs 88e3f65c2c2097a09fbb461ed896bb53274d6b8c +btrfs 5226fcac7841f66e5c141d27f0d099b5fd0d626f +btrfs-kdave 03c80fe23cf74ca356b4666f5d3b9f64cd85e6f5 +ceph febe4f631532ac52edaa6c4e204941a8a7124955 +cifs d13ecaa98be7d60a5ae5bccb7275c718b8c1c0f0 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 88bc0ede8d35edc969350852894dc864a2dc1859 +ext4 e243560f12d7e0b176b32d9fdebc0c9818ba7b05 +f2fs 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 13231caccedffcceff1580b78e6d99d8b0a43404 +nfs-anna eb5b46faa693470681ec7c28cc2436edd1571198 +nfsd a14fbdff76badb2a12883d22c1bae5f076995e1a +orangefs db0267e7afc72e04d92b845a00928e39be211d6a +overlayfs d9768076068f81687b3dbddbd76b5e108f5d53d0 +ubifs 15e5178339b9a95bc60c6bcfcae1b8f48afedd23 +xfs 373b0589dc8d58bc09c9a28d03611ae4fb216057 +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs 80628e018d43920da2fb09121078167d8ff121d7 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 3f892e63a94705403aa220bc8400a5b0700e4540 +pci b78742a02873e9e7da4500942322fa2f74798d13 +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid 100a65b3d07d0940e9677deb65daf77044e9e958 +i2c c86d671f7d8512de02d7b48d774f04d6ff029413 +dmi 0bcea5c474d1a86736b0fb3c7dbff9d8d2fbeace +hwmon-staging ccdb35594d7b394692f4a596de2f6af3baa48136 +jc_docs 9956cfef3409177d9e24ea4b7910148a18073a6f +v4l-dvb 781b045baefdabf7e0bc9f33672ca830d3db9f27 +v4l-dvb-next db6321a1af8432df983048d2dd8529525589f71d +fbdev 5f215d252496543ba22299bccef5062d30d63cfe +pm 96fe03c9f78f221629a14216de282ff936d59f29 +cpupower ae64f9bd1d3621b5e60d7363bc20afb46aede215 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +thermal 1e032393d9680c1f3b5238ec0f3f4eb006ee83d2 +thermal-soc fd6d2e506ce6f850d45342a15c896591291b77b5 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 9a63b255dffd6de31fe47a80d16d26d0291d3714 +bpf-next f19397a5c65665d66e3866b42056f1f58b7a366b +ipsec-next 9b7e14dba0c087e950fc024b486e8f729c1ee672 +netfilter-next c5c44aa5791ea3982006720bcd946e2f79e56ed4 +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next 80b0ebd488b3edaf3e5ed08c34a952c804e3a635 +bluetooth da0898db1e7c6acdf45e0fbffb8885f61ad0bda4 +mac80211-next 5048a9c329afa9b3a1c282fa28726540f2a1ca78 +rdma 315d160c5a4e034a576a13aa21e7235d5c9ec609 +gfs2 9aa015932727597f18d952c25b7ecb2e0376f055 +mtd 36de80740008e6a4a55115b4a92e2059e47c1cba +l2-mtd 1530578abdac4edce9244c7a1962ded3ffdb58ce +nand 41abeee8dd1eedc4485d1faeb5b930302176c48d +spi-nor b3fbf5e23f8cbcf56eb2a4d802bbf71ca37132a3 +crypto 45223b78118cbab12744a7e193b6c7c208c15c27 +drm c5dd52f653fa74f8f4771425c6db33609ad21258 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 2abf3c0da99648861e900a2b264b633b9cbca6fa +drm-tegra e1335e2f0cfcd36ffa1b709ac58096134eb6e779 +drm-misc 3b71239181e5429702387666f1ac70a9e6856cce +drm-msm ad9d50c790434a27920044d6d493c2df05e450ef +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm d6661185683218715460bc73d8cc89784152621d +etnaviv 49b82c389d2a40eaef1355aaa35868b367aec9d1 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 5a9a24faae43666fd196b6fb71bc650797f09484 +sound 108884e6c5aa731c6704000e27444d51d090078b +sound-asoc 9bb96c3a6c9639aa29b415da52cf944fec4b39b4 +modules ece1996a21eeb344b49200e627c6660111009c10 +input c1b433e04ef9c0a1c4d65bfe918472ffa334dff4 +block 50da70ed9c48b7a758a3f57fe1d31fd2748db1e8 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper a49796788d0817fff9b6608c2246ed70518c29cd +mmc 40d72bbbc8684aa7bc1e4df8d3af4d4b47e25794 +md 3f5b7d277da90a22ff553593e56f660be64bf025 +mfd b534651d7a50593560d65e7d2d65e4192d1a79ee +backlight 29fae2c1db242a39c5c7c49434fb183f990df2f8 +battery d16002755dc8169d080d23f6df04ba165df66586 +regulator 40d5e58782e684cd31759a3fdef5e37f1e22ac6a +security 4c6082336a7485419a03dabcc37d0b9aa8fe4472 +integrity e87dafe70acc3872395a208e7e33758a00984446 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux ef28df55ac27e1e5cd122e19fa311d886d47a756 +tpmdd f8b73d394f91d3927455e5bc44571bb26ecd0b7f +watchdog 14807b07a7d86b7e43eb044f859ae78c57366927 +iommu a593472591a5cf2d91244bc3f319c9dd91119343 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio d0422298337986e63714df6637093e4153d7dab9 +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit 42d5e37654e4cdb9fb2e2f3ab30045fee35c42d8 +devicetree 54192011468dc419aaa8cb3e0c13181112385739 +mailbox 1f90a2162fb3cdfd9c44380bf16209af00f7acbe +spi 5ca0175131d451ed298f8c21796f0643cb992d4d +tip 0df8a88e651baf51414a157434c75065e154a4dc +clockevents 8a7507eea818d829e2ac9fce3ba769458681ef02 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 86a18ee21e5eecf56ca02aec24807ffa87bb57b6 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace a96a5037ed0f52e2d86739f4a1ef985bd036e575 +rcu f8549f9930071e1b025c1a6026626f50b19e0445 +kvm 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +kvm-arm 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 432953b4455d8a48af0500a77826c71871671161 +kvms390 da9a1446d248f673a8560ce46251ff620214ab7b +xen-tip 646d944c2ef5a3b298c4e150494c71b9272d8b47 +percpu abee210500ed15a22787009d9210b9a34911afcc +workqueues 62408c1ef00784e8bcfc4848ade76480fb8aed21 +drivers-x86 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +chrome-platform 859eb05676f67d4960130dff36d3368006716110 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds 92fdb03c084e37b3c7b4642456d6214607e6213e +ipmi 066bccbd0c72dee77085672aba5d96b95c65c98a +driver-core 82bdf495169f2e4c25c5bd0f9384b687d358ebac +usb 7739376eb1ed68593805e5b4ed359123d0718549 +usb-gadget ce2b21a4e5ce042c0a42c9db8fa9e0f849427d5e +usb-serial d8a42b1ff8a3755cc710785c7e4b5e59636399ca +usb-chipidea-next 2a53e060a053d5d7627dcde5b06b5950902d9ce6 +phy-next 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +tty 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +char-misc 9a450484089dfa8b6348eff2a918f3c8f38585b9 +extcon 4f65b63ecc4c3476c6a5ecc077eba8592287fbe3 +staging 82aec3ed46fd313f043481fd613cfcb6b27275ea +mux aae4e7a8bc44722fe70d58920a36916b1043195e +slave-dma f1b8ae7accebdf4f2982a8608d18e5b6c9c5e64b +cgroup c2f31b79d510ec1a27138bdcf2d0ece1080be85e +scsi 5271b8a207baae5ac90a7297a4ed5426e089596f +scsi-mkp 417dff6cc15cdbeae71f8c127b3d0371c92a34ea +target-updates 97488c73190bb785cba818bf31e7361a27aded41 +target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +libata 2dc0b46b5ea30f169b0b272253ea846a5a281731 +vhost d9a4645e7e7c1471124c8beade3cb3c1e35e3645 +rpmsg c4ec2b7731d801b82535616351db4213743b4b08 +gpio e3ce8c16971c33d30d10f5d8cd100dd9dcf9d074 +pinctrl 8ed259d4f68705bd1293799fd65fbc70cb76d9fa +pinctrl-samsung 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns 116ceac9741e5ab0337b0c855ba80966bfc899e2 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest ae64f9bd1d3621b5e60d7363bc20afb46aede215 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +livepatching a57fcf2ddba51776d4ec2d5b21e92b489d31dacd +coresight 86970467531949c99f2a254492b58bed3d455ffc +rtc 9f33399c90741196be71cc4637e623a7d33f8c7f +nvdimm 4247f24c23589bcc3bc3490515ef8c9497e9ae55 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 1f51194db0d791536bea3269e91c4e73a874d8f6 +ntb c47963de520462c5058badf94e015220c93d6a14 +kspp 589cde432c02376f863fca98c3e7549f64d78559 +akpm-current ba0cf5d1a44b51e7f857dd59186a45d355119d25 +akpm 5fefda30479954b4368daf2f78dca6b30a78b96b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..caa639a7fe46 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,254 @@ +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 +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/users/dvhart/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..cbb9ef10e21c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5014 @@ +$ date -R +Wed, 06 Dec 2017 09:32:49 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 2391f0b4808e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost +Merging origin/master (13231caccedf Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge origin/master +Updating 2391f0b4808e..13231caccedf +Fast-forward + Documentation/core-api/genericirq.rst | 16 ++--- + .../devicetree/bindings/gpio/gpio-pca953x.txt | 2 +- + Documentation/driver-api/dmaengine/client.rst | 2 +- + Documentation/driver-api/pci.rst | 3 - + Documentation/scsi/scsi_mid_low_api.txt | 6 +- + MAINTAINERS | 3 +- + arch/mips/include/asm/Kbuild | 1 - + arch/mips/include/asm/serial.h | 22 +++++++ + drivers/Makefile | 1 + + drivers/android/binder.c | 40 ++++++++++--- + drivers/base/Kconfig | 25 ++++---- + drivers/base/isa.c | 10 ++-- + drivers/firmware/google/vpd.c | 48 +++++++++++---- + drivers/gpio/gpio-74x164.c | 4 +- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/hv/channel.c | 10 +++- + drivers/hv/channel_mgmt.c | 7 ++- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/adc/meson_saradc.c | 52 ++++++++++++---- + drivers/iio/health/max30102.c | 2 +- + drivers/iio/industrialio-core.c | 4 +- + drivers/iio/proximity/sx9500.c | 9 +++ + drivers/infiniband/Kconfig | 2 +- + drivers/infiniband/core/cma.c | 1 + + drivers/infiniband/core/device.c | 2 +- + drivers/infiniband/core/security.c | 50 ++++++++++++++-- + drivers/infiniband/hw/hfi1/rc.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 23 ------- + drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 25 ++++---- + drivers/infiniband/hw/hns/hns_roce_hem.h | 1 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 22 ++++--- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 31 ++++++---- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 43 +++++++++---- + drivers/infiniband/hw/i40iw/i40iw_d.h | 6 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 13 +++- + drivers/pinctrl/pinctrl-gemini.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 +- + drivers/scsi/aacraid/aacraid.h | 1 + + drivers/scsi/aacraid/commsup.c | 35 +---------- + drivers/scsi/aacraid/linit.c | 3 + + drivers/scsi/aacraid/rx.c | 15 +++-- + drivers/scsi/aacraid/src.c | 20 +++++-- + drivers/scsi/scsi_lib.c | 10 ++-- + drivers/scsi/ufs/ufshcd.c | 7 ++- + drivers/staging/ccree/ssi_hash.c | 9 ++- + drivers/staging/comedi/drivers/ni_atmio.c | 5 ++ + drivers/staging/octeon-usb/octeon-hcd.c | 6 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 ++--- + drivers/tty/serdev/serdev-ttyport.c | 26 +++++++- + drivers/tty/serial/8250/8250_early.c | 14 +++-- + drivers/tty/serial/8250/8250_pci.c | 3 + + drivers/usb/common/ulpi.c | 4 +- + drivers/usb/core/config.c | 28 +++++++-- + drivers/usb/core/devio.c | 14 +++-- + drivers/usb/core/hub.c | 9 +++ + drivers/usb/core/quirks.c | 3 + + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/composite.c | 7 ++- + drivers/usb/gadget/function/f_fs.c | 15 ++++- + drivers/usb/gadget/legacy/Kconfig | 10 ++++ + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 - + drivers/usb/gadget/udc/core.c | 8 ++- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/xhci-mem.c | 7 +++ + drivers/usb/host/xhci-ring.c | 12 ++-- + drivers/usb/serial/option.c | 3 + + drivers/usb/serial/usb_debug.c | 2 + + drivers/usb/storage/uas-detect.h | 4 ++ + drivers/usb/typec/Kconfig | 54 ++++++++++++++--- + drivers/usb/typec/ucsi/Kconfig | 1 - + drivers/usb/usbip/vhci_hcd.c | 1 - + include/linux/debugfs.h | 2 + + include/linux/dma-mapping.h | 2 - + include/linux/hyperv.h | 1 + + include/linux/iio/timer/stm32-lptim-trigger.h | 5 +- + include/linux/serdev.h | 2 +- + include/scsi/libsas.h | 2 +- + include/uapi/linux/usb/ch9.h | 3 + + kernel/printk/printk.c | 3 - + scripts/kernel-doc | 2 +- + tools/hv/hv_kvp_daemon.c | 70 +++++----------------- + tools/usb/usbip/libsrc/vhci_driver.c | 14 ++++- + 88 files changed, 634 insertions(+), 347 deletions(-) + create mode 100644 arch/mips/include/asm/serial.h +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 (4fbd8d194f06 Linux 4.15-rc1) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (329b4130bc5e ARC: Fix detection of dual-issue enabled) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (7e4d4233260b powerpc: Do not assign thread.tidr if already assigned) +$ 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 (c9d3fe9da094 VSOCK: fix outdated sk_state value in hvs_release()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/gianfar.c | 6 +++-- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 15 +++++------ + drivers/net/ethernet/renesas/sh_eth.c | 31 ++++++++++++----------- + include/net/red.h | 13 +++++++++- + net/core/dev.c | 2 +- + net/ipv4/inet_timewait_sock.c | 6 ++--- + net/sched/sch_choke.c | 3 +++ + net/sched/sch_gred.c | 3 +++ + net/sched/sch_red.c | 2 ++ + net/sched/sch_sfq.c | 3 +++ + net/tipc/server.c | 3 ++- + net/vmw_vsock/hyperv_transport.c | 2 +- + 12 files changed, 56 insertions(+), 33 deletions(-) +Merging bpf/master (2391f0b4808e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (4ce3dbe397d7 xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0)) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_input.c | 12 +++++++++++- + net/xfrm/xfrm_user.c | 17 ++++++++++++++++- + 2 files changed, 27 insertions(+), 2 deletions(-) +Merging netfilter/master (8b1836c4b643 netfilter: conntrack: clamp timeouts to INT_MAX) +$ 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 | 1 + + net/ipv6/netfilter/ip6_tables.c | 1 - + 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_log.c | 5 ++ + net/netfilter/nfnetlink_queue.c | 5 ++ + net/netfilter/x_tables.c | 9 +++ + 11 files changed, 137 insertions(+), 36 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 (5c3de777bdaf brcmfmac: change driver unbind order of the sdio function devices) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 ++ + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 - + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 53 ++++++++++++++++------ + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 13 +++++- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 6 +++ + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 ++++ + 12 files changed, 81 insertions(+), 20 deletions(-) +Merging mac80211/master (72e2c3438ba3 mac80211: tear down RX aggregations first) +$ git merge mac80211/master +Already up to date. +Merging sound-current/for-linus (362bca57f5d7 ALSA: pcm: prevent UAF in snd_pcm_info) +$ git merge sound-current/for-linus +Auto-merging sound/usb/mixer.c +Merge made by the 'recursive' strategy. + sound/core/pcm.c | 2 ++ + sound/core/seq/seq_timer.c | 2 +- + sound/pci/hda/patch_realtek.c | 8 ++++++++ + sound/usb/mixer.c | 13 +++++++++---- + 4 files changed, 20 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (4fbd8d194f06 Linux 4.15-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (0946b2fb38fd firmware: cleanup FIRMWARE_IN_KERNEL message) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (c8ec2041f549 MIPS: Add custom serial.h with BASE_BAUD override for generic kernel) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (80e457699a8d usb: xhci: fix panic in xhci_free_virt_devices_depth_first) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (a3acc696085e usb: f_fs: Force Reserved1=1 in OS_DESC_EXT_COMPAT) +$ 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 (4fbd8d194f06 Linux 4.15-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (e168e9845d95 Merge tag 'iio-fixes-for-4.15a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (66bc5df31110 MAINTAINERS: update Android driver maintainers.) +$ 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 (ecaaab564978 crypto: salsa20 - fix blkcipher_walk API usage) +$ git merge crypto-current/master +Auto-merging crypto/algif_aead.c +Auto-merging crypto/af_alg.c +Merge made by the 'recursive' strategy. + 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 +++-- + include/crypto/internal/hash.h | 8 ++++++++ + 8 files changed, 25 insertions(+), 25 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 +Merge made by the 'recursive' strategy. + drivers/iommu/intel-iommu.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +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 (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (001dde9400d5 mfd: cros ec: spi: Fix "in progress" error signaling) +$ 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 ++++++---- + 3 files changed, 40 insertions(+), 34 deletions(-) +Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) +$ git merge v4l-dvb-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/media/dvb-drivers/frontends.rst | 30 + + Documentation/media/dvb-drivers/index.rst | 1 + + MAINTAINERS | 8 + + drivers/media/common/siano/smscoreapi.c | 66 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 68 +- + drivers/media/dvb-core/dvb_frontend.c | 13 +- + drivers/media/dvb-core/dvb_net.c | 15 +- + drivers/media/dvb-frontends/af9013.h | 24 +- + drivers/media/dvb-frontends/ascot2e.h | 9 + + drivers/media/dvb-frontends/cxd2820r.h | 24 +- + drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h | 12 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 878 ++++++++++----------- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 248 +++--- + drivers/media/dvb-frontends/drx39xyj/drxj.h | 220 +++--- + drivers/media/dvb-frontends/drxk.h | 13 +- + drivers/media/dvb-frontends/drxk_hard.c | 32 +- + drivers/media/dvb-frontends/dvb-pll.h | 13 +- + drivers/media/dvb-frontends/helene.h | 30 +- + drivers/media/dvb-frontends/horus3a.h | 9 + + drivers/media/dvb-frontends/ix2505v.c | 6 +- + drivers/media/dvb-frontends/ix2505v.h | 28 +- + drivers/media/dvb-frontends/l64781.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.h | 155 ++-- + drivers/media/dvb-frontends/mb86a20s.h | 17 +- + drivers/media/dvb-frontends/mn88472.h | 16 +- + drivers/media/dvb-frontends/rtl2830.h | 1 - + drivers/media/dvb-frontends/rtl2832.h | 1 - + drivers/media/dvb-frontends/rtl2832_sdr.h | 6 +- + drivers/media/dvb-frontends/sp887x.c | 6 +- + drivers/media/dvb-frontends/stb6000.h | 11 +- + drivers/media/dvb-frontends/stv0299.c | 2 +- + drivers/media/dvb-frontends/tda10071.h | 1 - + drivers/media/dvb-frontends/tda826x.h | 11 +- + drivers/media/dvb-frontends/tua6100.c | 2 +- + drivers/media/dvb-frontends/tua6100.h | 2 +- + drivers/media/dvb-frontends/zd1301_demod.h | 13 +- + drivers/media/dvb-frontends/zl10036.c | 8 +- + drivers/media/dvb-frontends/zl10036.h | 16 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/et8ek8/Kconfig | 1 + + drivers/media/i2c/imx274.c | 5 +- + drivers/media/i2c/lm3560.c | 1 + + drivers/media/i2c/m5mols/m5mols_capture.c | 5 + + drivers/media/i2c/m5mols/m5mols_controls.c | 1 + + drivers/media/i2c/m5mols/m5mols_core.c | 20 +- + drivers/media/i2c/ov5647.c | 4 +- + drivers/media/i2c/s5k6a3.c | 3 + + drivers/media/i2c/s5k6aa.c | 5 + + drivers/media/i2c/tvp514x.c | 12 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 8 +- + drivers/media/pci/solo6x10/solo6x10-enc.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 11 + + drivers/media/pci/tw68/tw68-risc.c | 33 +- + drivers/media/platform/davinci/vpif.c | 3 +- + drivers/media/platform/davinci/vpif_capture.c | 27 +- + drivers/media/platform/davinci/vpif_display.c | 16 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 3 + + drivers/media/platform/exynos4-is/media-dev.c | 11 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 + + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 4 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 3 +- + drivers/media/platform/pxa_camera.c | 9 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/s3c-camif/camif-core.c | 1 + + drivers/media/platform/sh_veu.c | 2 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 21 +- + drivers/media/platform/sti/hva/hva-h264.c | 18 +- + drivers/media/platform/ti-vpe/vpe.c | 2 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vsp1/vsp1_dl.c | 1 + + drivers/media/radio/radio-si476x.c | 18 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/rc/img-ir/img-ir-hw.c | 2 +- + drivers/media/rc/imon.c | 40 +- + drivers/media/rc/ir-jvc-decoder.c | 2 +- + drivers/media/rc/ir-lirc-codec.c | 4 +- + drivers/media/rc/ir-nec-decoder.c | 3 +- + drivers/media/rc/ir-sanyo-decoder.c | 2 +- + drivers/media/rc/ir-sharp-decoder.c | 2 +- + drivers/media/rc/ir-xmp-decoder.c | 2 +- + drivers/media/rc/rc-ir-raw.c | 2 +- + drivers/media/rc/rc-main.c | 78 +- + drivers/media/rc/sir_ir.c | 40 +- + drivers/media/rc/st_rc.c | 6 +- + drivers/media/rc/streamzap.c | 6 +- + drivers/media/tuners/mt2063.c | 6 +- + drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 16 +- + drivers/media/usb/dvb-usb/friio-fe.c | 2 +- + drivers/media/usb/dvb-usb/friio.c | 2 +- + drivers/media/usb/gspca/ov519.c | 2 +- + drivers/media/usb/pwc/pwc-dec23.c | 7 +- + drivers/media/usb/siano/smsusb.c | 4 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 6 +- + drivers/media/usb/usbtv/usbtv-core.c | 1 + + drivers/media/v4l2-core/tuner-core.c | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 3 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 10 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 10 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 2 + + drivers/media/v4l2-core/videobuf-core.c | 2 +- + drivers/media/v4l2-core/videobuf2-core.c | 56 +- + drivers/media/v4l2-core/videobuf2-memops.c | 2 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +- + .../staging/media/atomisp/include/linux/atomisp.h | 34 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 16 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 2 +- + .../atomisp2/css2400/base/circbuf/src/circbuf.c | 26 +- + .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 34 +- + .../camera/pipe/interface/ia_css_pipe_util.h | 2 +- + .../css2400/camera/util/interface/ia_css_util.h | 18 +- + .../css_2401_csi2p_system/host/csi_rx_private.h | 2 +- + .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 4 +- + .../css2400/css_2401_csi2p_system/host/isys_irq.c | 2 +- + .../css_2401_csi2p_system/host/isys_irq_private.h | 4 +- + .../host/isys_stream2mmio_private.h | 4 +- + .../css_2401_csi2p_system/host/pixelgen_private.h | 2 +- + .../css_2401_csi2p_system/isys_dma_global.h | 4 +- + .../css_2401_csi2p_system/pixelgen_global.h | 2 +- + .../css2400/css_2401_csi2p_system/system_global.h | 8 +- + .../atomisp/pci/atomisp2/css2400/css_api_version.h | 2 +- + .../css2400/hive_isp_css_common/host/gp_timer.c | 2 +- + .../hive_isp_css_include/host/csi_rx_public.h | 4 +- + .../hive_isp_css_include/host/ibuf_ctrl_public.h | 4 +- + .../css2400/hive_isp_css_include/host/isp_op1w.h | 98 +-- + .../css2400/hive_isp_css_include/host/isp_op2w.h | 78 +- + .../host/isys_stream2mmio_public.h | 4 +- + .../hive_isp_css_include/host/pixelgen_public.h | 4 +- + .../hive_isp_css_include/host/ref_vector_func.h | 144 ++-- + .../css2400/hive_isp_css_include/math_support.h | 2 +- + .../css2400/hive_isp_css_include/string_support.h | 8 +- + .../css2400/hive_isp_css_shared/host/tag.c | 4 +- + .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 2 +- + .../media/atomisp/pci/atomisp2/css2400/ia_css_3a.h | 38 +- + .../pci/atomisp2/css2400/ia_css_acc_types.h | 216 ++--- + .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 32 +- + .../atomisp/pci/atomisp2/css2400/ia_css_control.h | 22 +- + .../pci/atomisp2/css2400/ia_css_device_access.h | 2 +- + .../atomisp/pci/atomisp2/css2400/ia_css_dvs.h | 52 +- + .../atomisp/pci/atomisp2/css2400/ia_css_env.h | 40 +- + .../atomisp/pci/atomisp2/css2400/ia_css_err.h | 18 +- + .../pci/atomisp2/css2400/ia_css_event_public.h | 68 +- + .../atomisp/pci/atomisp2/css2400/ia_css_firmware.h | 14 +- + .../atomisp/pci/atomisp2/css2400/ia_css_frac.h | 10 +- + .../pci/atomisp2/css2400/ia_css_frame_format.h | 62 +- + .../pci/atomisp2/css2400/ia_css_frame_public.h | 120 +-- + .../pci/atomisp2/css2400/ia_css_input_port.h | 32 +- + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 112 +-- + .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 24 +- + .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 10 +- + .../atomisp/pci/atomisp2/css2400/ia_css_mmu.h | 4 +- + .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 6 +- + .../pci/atomisp2/css2400/ia_css_pipe_public.h | 128 +-- + .../atomisp/pci/atomisp2/css2400/ia_css_prbs.h | 12 +- + .../pci/atomisp2/css2400/ia_css_properties.h | 6 +- + .../atomisp/pci/atomisp2/css2400/ia_css_shading.h | 6 +- + .../atomisp/pci/atomisp2/css2400/ia_css_stream.h | 4 +- + .../pci/atomisp2/css2400/ia_css_stream_format.h | 90 +-- + .../pci/atomisp2/css2400/ia_css_stream_public.h | 148 ++-- + .../atomisp/pci/atomisp2/css2400/ia_css_timer.h | 30 +- + .../atomisp/pci/atomisp2/css2400/ia_css_tpg.h | 8 +- + .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 258 +++--- + .../atomisp/pci/atomisp2/css2400/ia_css_version.h | 6 +- + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 6 +- + .../isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 6 +- + .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 4 +- + .../isp/kernels/anr/anr_2/ia_css_anr_param.h | 2 +- + .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 2 +- + .../css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h | 4 +- + .../css2400/isp/kernels/bnlm/ia_css_bnlm_types.h | 36 +- + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 34 +- + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 20 +- + .../conversion_1.0/ia_css_conversion_types.h | 8 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 2 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 2 +- + .../isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 8 +- + .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 12 +- + .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 10 +- + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 38 +- + .../isp/kernels/de/de_1.0/ia_css_de_types.h | 10 +- + .../css2400/isp/kernels/de/de_2/ia_css_de2_types.h | 10 +- + .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 8 +- + .../css2400/isp/kernels/dpc2/ia_css_dpc2_types.h | 6 +- + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 2 +- + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 2 +- + .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 82 +- + .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 6 +- + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 14 +- + .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 32 +- + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 14 +- + .../css2400/isp/kernels/hdr/ia_css_hdr_types.h | 26 +- + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 2 +- + .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 16 +- + .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 12 +- + .../css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h | 12 +- + .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 26 +- + .../output/output_1.0/ia_css_output_param.h | 2 +- + .../output/output_1.0/ia_css_output_types.h | 8 +- + .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 2 +- + .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +- + .../isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 2 +- + .../isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 2 +- + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 98 +-- + .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 2 +- + .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 4 +- + .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 42 +- + .../kernels/sdis/common/ia_css_sdis_common_types.h | 104 +-- + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 20 +- + .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 40 +- + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 38 +- + .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 26 +- + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 10 +- + .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 4 +- + .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 4 +- + .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 14 +- + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 2 +- + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 2 +- + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 20 +- + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 30 +- + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 28 +- + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 40 +- + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 2 +- + .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 2 +- + .../runtime/binary/interface/ia_css_binary.h | 2 +- + .../atomisp2/css2400/runtime/binary/src/binary.c | 2 +- + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +- + .../css2400/runtime/debug/interface/ia_css_debug.h | 30 +- + .../css2400/runtime/debug/src/ia_css_debug.c | 10 +- + .../pci/atomisp2/css2400/runtime/event/src/event.c | 4 +- + .../atomisp2/css2400/runtime/eventq/src/eventq.c | 2 +- + .../css2400/runtime/frame/interface/ia_css_frame.h | 22 +- + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- + .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 2 +- + .../css2400/runtime/inputfifo/src/inputfifo.c | 2 +- + .../isp_param/interface/ia_css_isp_param_types.h | 6 +- + .../css2400/runtime/isp_param/src/isp_param.c | 2 +- + .../css2400/runtime/isys/interface/ia_css_isys.h | 6 +- + .../css2400/runtime/isys/src/csi_rx_rmgr.c | 2 +- + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 2 +- + .../css2400/runtime/isys/src/isys_dma_rmgr.c | 2 +- + .../atomisp2/css2400/runtime/isys/src/isys_init.c | 2 +- + .../runtime/isys/src/isys_stream2mmio_rmgr.c | 2 +- + .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 2 +- + .../css2400/runtime/isys/src/virtual_isys.c | 8 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 28 +- + .../css2400/runtime/pipeline/src/pipeline.c | 8 +- + .../css2400/runtime/queue/interface/ia_css_queue.h | 22 +- + .../css2400/runtime/queue/src/queue_access.c | 2 +- + .../pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c | 4 +- + .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 26 +- + .../runtime/spctrl/interface/ia_css_spctrl.h | 20 +- + .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 14 +- + .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 4 +- + .../pci/atomisp2/css2400/runtime/timer/src/timer.c | 2 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 68 +- + .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 22 +- + .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 2 +- + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 4 +- + .../atomisp/pci/atomisp2/css2400/sh_css_params.h | 4 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 18 +- + .../atomisp/pci/atomisp2/css2400/sh_css_struct.h | 2 +- + 269 files changed, 3169 insertions(+), 2951 deletions(-) + create mode 100644 Documentation/media/dvb-drivers/frontends.rst +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 (609b7002705a Merge tag 'kvm-arm-fixes-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_arm.h | 3 +-- + arch/arm/include/asm/kvm_host.h | 5 ++++ + arch/arm64/include/asm/kvm_arm.h | 3 +-- + arch/arm64/include/asm/kvm_host.h | 1 + + arch/arm64/kvm/debug.c | 21 +++++++++++++++ + arch/arm64/kvm/handle_exit.c | 57 ++++++++++++++++++++++++++++----------- + arch/arm64/kvm/hyp/switch.c | 37 ++++++++++++++++++++----- + include/kvm/arm_arch_timer.h | 3 --- + virt/kvm/arm/arch_timer.c | 11 +++----- + virt/kvm/arm/arm.c | 7 +++-- + virt/kvm/arm/hyp/timer-sr.c | 48 ++++++++++++++------------------- + virt/kvm/arm/hyp/vgic-v2-sr.c | 4 --- + virt/kvm/arm/vgic/vgic-irqfd.c | 3 +-- + virt/kvm/arm/vgic/vgic-its.c | 4 ++- + virt/kvm/arm/vgic/vgic-v3.c | 2 +- + virt/kvm/arm/vgic/vgic-v4.c | 6 +++-- + virt/kvm/arm/vgic/vgic.c | 8 +++--- + 17 files changed, 144 insertions(+), 79 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge kbuild/for-next +Already up to date. +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 (ee4c54d09127 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/am33xx-usb.txt | 2 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/am33xx.dtsi | 2 + + arch/arm/boot/dts/am4372.dtsi | 6 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 4 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 1 + + arch/arm/boot/dts/armada-385-linksys.dtsi | 1 + + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 + + arch/arm/boot/dts/armada-388-gp.dts | 2 + + arch/arm/boot/dts/bcm-nsp.dtsi | 4 +- + arch/arm/boot/dts/bcm283x.dtsi | 1 + + arch/arm/boot/dts/bcm958623hr.dts | 4 - + arch/arm/boot/dts/bcm958625hr.dts | 4 - + arch/arm/boot/dts/dm814x.dtsi | 1 + + arch/arm/boot/dts/imx53.dtsi | 9 - + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 17 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 1 + + arch/arm/boot/dts/omap3-beagle.dts | 1 + + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 + + arch/arm/boot/dts/omap3-evm-common.dtsi | 1 + + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 1 + + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 + + arch/arm/boot/dts/omap3-overo-base.dtsi | 1 + + arch/arm/boot/dts/omap3-pandora-common.dtsi | 1 + + arch/arm/boot/dts/omap3-tao3530.dtsi | 1 + + arch/arm/boot/dts/omap3.dtsi | 1 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 1 + + arch/arm/boot/dts/omap4-duovero.dtsi | 1 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 1 + + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 3 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 + + arch/arm/boot/dts/omap5-cm-t54.dts | 2 + + arch/arm/boot/dts/omap5.dtsi | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 1 + + arch/arm/boot/dts/r8a7792.dtsi | 1 + + arch/arm/boot/dts/r8a7793.dtsi | 1 + + arch/arm/boot/dts/r8a7794.dtsi | 1 + + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/mach-omap2/cm_common.c | 6 +- + arch/arm/mach-omap2/omap-secure.c | 19 ++ + arch/arm/mach-omap2/omap-secure.h | 4 + + arch/arm/mach-omap2/omap_device.c | 10 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 + + arch/arm/mach-omap2/pm.h | 4 - + arch/arm/mach-omap2/pm34xx.c | 13 +- + arch/arm/mach-omap2/prcm-common.h | 1 + + arch/arm/mach-omap2/prm33xx.c | 12 -- + arch/arm/mach-omap2/sleep34xx.S | 26 +-- + arch/arm64/boot/dts/Makefile | 2 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 1 - + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 1 - + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 3 +- + drivers/firmware/arm_scpi.c | 216 ++++++++++++--------- + drivers/tee/optee/core.c | 1 - + 58 files changed, 236 insertions(+), 180 deletions(-) +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 (9f8e06ca1d0e ARM64: dts: odroid-c2: Add HDMI and CEC Nodes) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson.dtsi | 18 ++++----- + arch/arm/mach-meson/platsmp.c | 2 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 12 ++++++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 ++++++- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 30 +++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 43 ++++++++++++++++++++++ + .../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 | 43 ++++++++++++++++++++++ + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 12 ++++++ + drivers/soc/amlogic/meson-gx-socinfo.c | 4 +- + 11 files changed, 188 insertions(+), 13 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 (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (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 (1064f63204a0 Merge branch 'for_4.16/keystone-config' into next) +$ git merge keystone/next +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 | 90 +++++- + arch/arm/boot/dts/keystone-k2g-ice.dts | 336 +++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 15 +- + 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 | 332 +++++++++----------- + 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 | 325 ++++++++++++++++++++ + drivers/memory/ti-emif-sram-pm.S | 334 ++++++++++++++++++++ + include/linux/ti-emif-sram.h | 69 +++++ + 18 files changed, 1495 insertions(+), 212 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 (aa40a77609db Merge branch 'omap-for-v4.15/fixes-v2' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm814x.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 2 +- + arch/arm/configs/omap2plus_defconfig | 11 +++++++++++ + 3 files changed, 13 insertions(+), 1 deletion(-) +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 (2dd944f637d5 Merge branches 'arm64-dt-for-v4.16', 'dt-bindings-for-v4.16' and '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 | 180 +++++++++++++++- + 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 | 205 +++++++++++++++++- + 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 | 30 +++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 29 +++ + drivers/soc/renesas/renesas-soc.c | 3 + + 39 files changed, 1707 insertions(+), 168 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 (d683087d6944 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.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.dtsi | 53 ++++++++++++++++++++++- + 6 files changed, 103 insertions(+), 3 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (a77db8a22596 Merge branch 'next/defconfig' 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 9a0a24cdb650] 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 | 13 ++ + arch/arm/boot/dts/exynos5250.dtsi | 29 ++--- + arch/arm/boot/dts/exynos5410.dtsi | 8 ++ + arch/arm/boot/dts/exynos5420-cpus.dtsi | 10 ++ + arch/arm/boot/dts/exynos5420.dtsi | 19 +++ + 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/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 +++++++++++++++++++++ + 17 files changed, 415 insertions(+), 76 deletions(-) +Merging sunxi/sunxi/for-next (81ea246a6edf Merge branches 'sunxi/fixes-for-4.15' and 'sunxi/dt-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-h2-plus-orangepi-r1.dts | 73 ++++++++ + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 196 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 1 + + .../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 | 2 +- + .../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 +++- + drivers/bus/sunxi-rsb.c | 1 + + 20 files changed, 464 insertions(+), 33 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 (6cfa7cc46b1a arm64: Make ARMV8_DEPRECATED depend on SYSCTL) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge clk/clk-next +Already up to date. +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 (4cc9ce65974b m68k/defconfig: fix stmark2 broken local compilation) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/stmark2_defconfig | 1 - + arch/m68k/kernel/vmlinux-nommu.lds | 2 ++ + arch/m68k/kernel/vmlinux-std.lds | 2 ++ + arch/m68k/kernel/vmlinux-sun3.lds | 2 ++ + 4 files changed, 6 insertions(+), 1 deletion(-) +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up to date. +Merging microblaze/next (da25f490a0b3 microblaze: add missing include to mmu_context_mm.h) +$ 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 (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge powerpc/next +Already up to date. +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 (f0b0655e9936 Merge tag 'v4.14-rc8' into for-linux-next) +$ git merge risc-v/for-linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging s390/features (4c48b1da1d91 s390/vdso: revise CFI annotations of vDSO functions) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kbuild | 1 + + arch/s390/Makefile | 6 +++++- + arch/s390/appldata/Makefile | 1 + + arch/s390/boot/compressed/vmlinux.scr | 1 + + arch/s390/crypto/sha1_s390.c | 7 +------ + arch/s390/hypfs/Makefile | 1 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/alternative.h | 1 + + arch/s390/include/asm/ap.h | 5 +---- + arch/s390/include/asm/bugs.h | 1 + + arch/s390/include/asm/dwarf.h | 37 +++++++++++++++++++++++++++++++++ + arch/s390/include/asm/segment.h | 1 + + arch/s390/include/asm/switch_to.h | 27 ++++++++++++------------ + arch/s390/include/asm/vga.h | 1 + + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/perf_regs.h | 1 + + arch/s390/include/uapi/asm/sthyi.h | 1 + + arch/s390/include/uapi/asm/virtio-ccw.h | 2 +- + arch/s390/include/uapi/asm/vmcp.h | 1 + + arch/s390/kernel/alternative.c | 1 + + arch/s390/kernel/perf_regs.c | 1 + + 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/vdso64/note.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 3 +++ + arch/s390/mm/pgalloc.c | 2 -- + arch/s390/net/Makefile | 1 + + arch/s390/numa/Makefile | 1 + + arch/s390/pci/Makefile | 1 + + arch/s390/tools/gen_opcode_table.c | 1 + + drivers/s390/Makefile | 1 + + drivers/s390/block/Kconfig | 1 + + drivers/s390/block/dasd.c | 10 ++++----- + drivers/s390/block/dasd_eckd.c | 16 ++++++++------ + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/char/Kconfig | 1 + + drivers/s390/char/defkeymap.map | 1 + + drivers/s390/cio/blacklist.h | 1 + + drivers/s390/cio/qdio_main.c | 7 ++++--- + drivers/s390/net/Kconfig | 1 + + drivers/s390/scsi/Makefile | 1 + + 49 files changed, 174 insertions(+), 59 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 (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (88e3f65c2c20 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 (03c80fe23cf7 Merge branch 'for-next-next-v4.15-20171205' into for-next-20171205) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 3 +- + fs/btrfs/compression.c | 177 +++++++++++++++-- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 18 +- + 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 | 20 +- + fs/btrfs/extent_io.c | 88 ++++----- + fs/btrfs/extent_io.h | 36 ++-- + fs/btrfs/extent_map.h | 1 - + fs/btrfs/file.c | 361 +++++++++++++++++++++++++++------- + fs/btrfs/free-space-cache.c | 8 +- + fs/btrfs/inode.c | 102 +++++----- + fs/btrfs/ioctl.c | 55 +++--- + fs/btrfs/props.c | 15 +- + fs/btrfs/qgroup.c | 172 +++++++++++----- + fs/btrfs/qgroup.h | 28 ++- + fs/btrfs/ref-verify.c | 6 +- + fs/btrfs/root-tree.c | 7 - + fs/btrfs/scrub.c | 13 +- + fs/btrfs/send.c | 6 - + fs/btrfs/super.c | 291 +++++++++++++++------------ + 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 | 456 +++++++++++++++++++++++++------------------ + fs/btrfs/volumes.h | 38 ++-- + fs/btrfs/xattr.c | 6 - + fs/btrfs/zstd.c | 151 +++++++------- + include/trace/events/btrfs.h | 18 +- + 40 files changed, 1584 insertions(+), 1016 deletions(-) +Merging ceph/master (febe4f631532 ceph: decrease session->s_trim_caps only after caps get trimmed) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/mds_client.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging cifs/for-next (d13ecaa98be7 cifs: avoid a kmalloc in smb2_send_recv/SendReceive2 for the common case) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsproto.h | 4 + + fs/cifs/smb2misc.c | 2 +- + fs/cifs/smb2ops.c | 3 +- + fs/cifs/smb2pdu.c | 442 +++++++++++++++++++++++++--------------------------- + fs/cifs/smb2pdu.h | 46 ++++-- + fs/cifs/transport.c | 61 +++++++- + 6 files changed, 307 insertions(+), 251 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 (13231caccedf Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (eb5b46faa693 SUNRPC: Handle ENETDOWN errors) +$ git merge nfs-anna/linux-next +Already up to date. +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 (d9768076068f ovl: remove unneeded arg from ovl_verify_origin()) +$ git merge overlayfs/overlayfs-next +Already up to date. +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 (373b0589dc8d xfs: Properly retry failed dquot items in case of error during buffer writeback) +$ git merge xfs/for-next +Already up to date. +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 (80628e018d43 Merge branches 'work.get_user_pages_fast', 'for-davem', 'work.wmci', 'work.sock_recvmsg', 'misc.netdrv', 'work.mkobj', 'misc.poll', 'work.whack-a-mole' and 'work.misc' into for-next) +$ git merge vfs/for-next +Resolved 'drivers/net/ethernet/via/via-rhine.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/sctp/socket.c +Auto-merging net/rxrpc/af_rxrpc.c +Auto-merging net/packet/af_packet.c +Auto-merging mm/memcontrol.c +Auto-merging mm/gup.c +Auto-merging kernel/printk/printk.c +Auto-merging ipc/mqueue.c +Auto-merging include/net/tcp.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/vhost/net.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.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/android/binder.c +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/af_alg.c +Removing arch/x86/include/uapi/asm/poll.h +Removing arch/score/include/uapi/asm/poll.h +Removing arch/mn10300/include/uapi/asm/poll.h +Removing arch/m32r/include/uapi/asm/poll.h +Removing arch/ia64/include/uapi/asm/poll.h +Removing arch/alpha/include/uapi/asm/poll.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 531bb0481e17015da5bd1fd98d5eff1557476261] 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 | 2 + + 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 | 32 ++-- + .../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/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/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/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 | 61 ++++--- + 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/kcm/kcmsock.c | 68 +++----- + net/netfilter/ipvs/ip_vs_sync.c | 9 +- + net/netfilter/xt_bpf.c | 14 +- + 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 | 5 +- + net/smc/af_smc.c | 6 +- + net/smc/smc_clc.c | 18 ++- + net/socket.c | 116 ++++++------- + 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 ++--- + 437 files changed, 1473 insertions(+), 1548 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 (3f892e63a947 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 +Merge made by the 'recursive' strategy. + Documentation/printk-formats.txt | 48 ++++++++++++------------------- + 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 | 2 ++ + include/linux/module.h | 3 ++ + kernel/kallsyms.c | 19 ++++++++++++ + kernel/module.c | 6 ++++ + lib/vsprintf.c | 5 ++-- + scripts/checkpatch.pl | 11 +++++-- + 20 files changed, 155 insertions(+), 37 deletions(-) +Merging pci/next (b78742a02873 Merge branch 'pci/virtualization' into next) +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/pci-hotplug.c | 20 +- + arch/powerpc/kernel/pci_of_scan.c | 7 +- + arch/x86/pci/xen.c | 4 +- + drivers/pci/pci.h | 54 ++--- + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- + drivers/pci/probe.c | 230 ++++++++++++--------- + include/linux/pci.h | 411 ++++++++++++++++++------------------- + 7 files changed, 370 insertions(+), 359 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 (100a65b3d07d Merge branch 'for-4.16/hid-quirks-cleanup/multitouch' 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 | 932 +-------------- + 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 | 3 +- + drivers/hid/hid-jabra.c | 58 + + drivers/hid/hid-multitouch.c | 137 ++- + drivers/hid/hid-quirks.c | 1262 ++++++++++++++++++++ + 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, 1818 insertions(+), 1336 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 (c86d671f7d85 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-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 | 18 +-- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 88 ++++--------- + drivers/i2c/i2c-core-base.c | 195 +++++++++++----------------- + drivers/i2c/i2c-core-smbus.c | 45 ++++++- + drivers/i2c/i2c-dev.c | 2 + + include/linux/i2c.h | 86 ++++++++++-- + include/uapi/linux/i2c.h | 3 + + 18 files changed, 563 insertions(+), 308 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 (9956cfef3409 Documentation: fix docs build error after source file removed) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (db6321a1af84 media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA) +$ git merge v4l-dvb-next/master +Already up to date. +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 (96fe03c9f78f Merge branch 'acpi-apei' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +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 ++ + MAINTAINERS | 1 + + 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 | 27 +++- + drivers/acpi/numa.c | 3 +- + drivers/acpi/sleep.c | 10 ++ + drivers/base/power/main.c | 102 ++++++++++--- + drivers/base/power/sysfs.c | 182 ++++++++++-------------- + drivers/cpufreq/cpufreq.c | 55 +++---- + drivers/pci/pci-driver.c | 19 ++- + 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/pm.h | 16 ++- + kernel/configs/nopm.config | 15 ++ + tools/power/acpi/tools/acpidump/apmain.c | 28 +++- + 56 files changed, 1169 insertions(+), 389 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 (9a63b255dffd net_sched: remove unused parameter from act cleanup ops) +$ git merge net-next/master +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/dev.c +Auto-merging net/atm/common.c +Auto-merging include/net/inet_connection_sock.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/hyperv.h +Auto-merging drivers/net/tun.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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/fsl-flexcan.txt | 6 + + .../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 | 5 + + 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/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 | 6 +- + drivers/net/dsa/microchip/ksz_common.c | 12 +- + drivers/net/dsa/mv88e6xxx/chip.c | 72 +- + drivers/net/dummy.c | 215 +----- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 11 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 1 + + drivers/net/ethernet/cadence/macb.h | 167 ++++- + drivers/net/ethernet/cadence/macb_main.c | 700 ++++++++++++++---- + 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/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/mellanox/mlx5/core/en_main.c | 3 - + 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/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 | 6 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 4 - + 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_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 | 2 - + 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/tun.c | 149 +++- + drivers/net/vmxnet3/vmxnet3_int.h | 8 +- + include/linux/hyperv.h | 22 - + include/linux/mdio.h | 3 + + include/linux/netdevice.h | 5 +- + include/linux/phy.h | 49 +- + include/linux/phylink.h | 196 +++-- + include/linux/sfp.h | 57 +- + include/linux/skbuff.h | 5 + + include/net/act_api.h | 2 +- + include/net/addrconf.h | 2 +- + include/net/dn_route.h | 1 + + include/net/dsa.h | 50 +- + include/net/dst.h | 39 +- + include/net/erspan.h | 51 ++ + 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/rtnetlink.h | 4 +- + include/net/sch_generic.h | 11 +- + include/net/xfrm.h | 38 +- + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/if_tun.h | 1 + + kernel/bpf/verifier.c | 62 +- + 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 | 53 +- + net/core/dst.c | 14 +- + net/core/filter.c | 5 +- + net/core/flow_dissector.c | 12 +- + net/core/pktgen.c | 12 +- + net/core/rtnetlink.c | 278 +++++--- + 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/dsa2.c | 2 +- + 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/udp.c | 44 +- + net/ipv4/xfrm4_mode_tunnel.c | 2 +- + net/ipv6/addrconf.c | 48 +- + net/ipv6/addrlabel.c | 25 +- + net/ipv6/inet6_hashtables.c | 77 +- + net/ipv6/ip6_fib.c | 30 +- + net/ipv6/ip6_gre.c | 492 +++++++++++-- + net/ipv6/ip6_output.c | 4 +- + net/ipv6/ip6_tunnel.c | 5 +- + net/ipv6/ip6mr.c | 9 +- + net/ipv6/route.c | 70 +- + net/ipv6/udp.c | 54 +- + net/ipv6/xfrm6_mode_tunnel.c | 2 +- + net/ipv6/xfrm6_policy.c | 2 +- + net/mpls/af_mpls.c | 15 +- + net/netfilter/xt_policy.c | 3 +- + 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 | 3 +- + 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 | 2 +- + 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 | 30 +- + net/sched/cls_flower.c | 1 + + net/sched/sch_api.c | 97 +-- + net/tipc/bcast.c | 12 +- + net/tipc/link.c | 2 +- + net/tipc/msg.c | 51 +- + net/tipc/msg.h | 3 +- + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_output.c | 2 +- + net/xfrm/xfrm_policy.c | 135 ++-- + samples/bpf/tcbpf2_kern.c | 43 ++ + samples/bpf/test_cgrp2_attach2.c | 36 +- + samples/bpf/test_tunnel_bpf.sh | 65 ++ + 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 ++++++++++++++++++ + 220 files changed, 7513 insertions(+), 2545 deletions(-) + 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 tools/testing/selftests/bpf/sample_ret0.c + create mode 100755 tools/testing/selftests/bpf/test_offload.py +Merging bpf-next/master (f19397a5c656 bpf: Add access to snd_cwnd and others in sock_ops) +$ git merge bpf-next/master +Auto-merging include/net/tcp.h +Merge made by the 'recursive' strategy. + include/linux/filter.h | 1 + + include/net/tcp.h | 6 ++++-- + include/uapi/linux/bpf.h | 6 ++++++ + net/core/filter.c | 41 ++++++++++++++++++++++++++++++++++++++--- + 4 files changed, 49 insertions(+), 5 deletions(-) +Merging ipsec-next/master (9b7e14dba0c0 xfrm: Remove redundant state assignment in xfrm_input()) +$ git merge ipsec-next/master +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 (c5c44aa5791e netfilter: conntrack: timeouts can be const) +$ git merge netfilter-next/master +Auto-merging net/netfilter/x_tables.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 +Merge made by the 'recursive' strategy. + 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 +++++++++---------- + 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/ipset/ip_set_core.c | 2 +- + 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 | 3 +++ + 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/nft_cmp.c | 2 ++ + net/netfilter/x_tables.c | 2 +- + 21 files changed, 84 insertions(+), 84 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 (80b0ebd488b3 Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.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/mvm.h +Removing drivers/net/wireless/intel/iwlwifi/cfg/a000.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 216 +++++++++++++++++++ + 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 +- + 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 | 3 - + 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/coex.c | 33 +-- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 232 +-------------------- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 30 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 6 - + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 36 ++-- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +- + 28 files changed, 323 insertions(+), 622 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/22000.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/a000.c +Merging bluetooth/master (da0898db1e7c Bluetooth: hci_ll: add constant for vendor-specific command) +$ 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. + 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 | 22 ++++++++++++++++------ + drivers/bluetooth/hci_qca.c | 3 +++ + drivers/bluetooth/hci_serdev.c | 1 + + net/bluetooth/af_bluetooth.c | 38 +++++++++++++++++--------------------- + 10 files changed, 66 insertions(+), 30 deletions(-) +Merging mac80211-next/master (5048a9c329af mac80211: make __ieee80211_start_rx_ba_session static) +$ git merge mac80211-next/master +Resolved 'net/mac80211/agg-rx.c' using previous resolution. +Resolved 'net/mac80211/agg-tx.c' using previous resolution. +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/mesh_hwmp.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/ht.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/agg-tx.c +CONFLICT (content): Merge conflict in net/mac80211/agg-tx.c +Auto-merging net/mac80211/agg-rx.c +CONFLICT (content): Merge conflict in net/mac80211/agg-rx.c +Auto-merging include/net/mac80211.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 56ce27c875ee] Merge remote-tracking branch 'mac80211-next/master' +$ git diff -M --stat --summary HEAD^.. + include/net/mac80211.h | 4 ++++ + net/mac80211/agg-rx.c | 26 ++++++++------------------ + net/mac80211/agg-tx.c | 31 ++++++++----------------------- + net/mac80211/cfg.c | 3 +++ + net/mac80211/debugfs.c | 1 + + net/mac80211/ht.c | 1 + + net/mac80211/ieee80211_i.h | 4 ---- + net/mac80211/iface.c | 2 +- + net/mac80211/mesh.c | 2 ++ + net/mac80211/mesh_hwmp.c | 1 + + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 1 + + net/mac80211/offchannel.c | 4 ++-- + net/mac80211/tdls.c | 6 +++++- + net/mac80211/wme.c | 1 + + 15 files changed, 39 insertions(+), 50 deletions(-) +Merging rdma/for-next (315d160c5a4e IB/core: Only enforce security for InfiniBand) +$ git merge rdma/for-next +Already up to date. +Merging gfs2/for-next (9aa015932727 gfs2: Remove unused gfs2_write_jdata_pagevec parameter) +$ 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 | 10 ++----- + 3 files changed, 48 insertions(+), 57 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 (41abeee8dd1e mtd: nand: provide valid ->data_interface during NAND detection) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + 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 | 20 +- + drivers/mtd/nand/cafe_nand.c | 20 +- + drivers/mtd/nand/denali.c | 74 +- + 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 | 5 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 93 +- + 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_nand.c | 33 +- + drivers/mtd/nand/nand_base.c | 1207 +++++++++++++++++++------ + drivers/mtd/nand/nand_hynix.c | 120 ++- + drivers/mtd/nand/nand_micron.c | 83 +- + drivers/mtd/nand/nand_timings.c | 21 +- + drivers/mtd/nand/omap2.c | 18 +- + 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 | 97 +- + drivers/mtd/nand/tango_nand.c | 27 +- + drivers/mtd/nand/tmio_nand.c | 5 +- + drivers/mtd/nand/vf610_nfc.c | 6 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 +- + include/linux/mtd/rawnand.h | 45 +- + 36 files changed, 1392 insertions(+), 733 deletions(-) +Merging spi-nor/spi-nor/next (b3fbf5e23f8c mtd: spi-nor: Check that BP bits are set properly) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsl-quadspi.txt | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 55 ++++++++++++++++------ + include/linux/mtd/spi-nor.h | 6 ++- + 3 files changed, 47 insertions(+), 16 deletions(-) +Merging crypto/master (45223b78118c crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error) +$ git merge crypto/master +Auto-merging drivers/char/random.c +Removing drivers/char/hw_random/bcm63xx-rng.c +Auto-merging arch/arm64/crypto/aes-ce-glue.c +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 - + 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/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/cavium/cpt/cptvf_reqmanager.c | 3 +- + drivers/crypto/chelsio/Kconfig | 10 + + drivers/crypto/chelsio/Makefile | 1 + + drivers/crypto/chelsio/chcr_algo.c | 227 ++-- + 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 | 660 +++++++++++ + 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 +- + 53 files changed, 2479 insertions(+), 647 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 (c5dd52f653fa Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next) +$ git merge drm/drm-next +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/i915_perf.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/base/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../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 +- + Documentation/gpu/i915.rst | 4 +- + Documentation/gpu/todo.rst | 4 + + MAINTAINERS | 6 +- + 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/amd/amdgpu/amdgpu_connectors.c | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +- + 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_planes.c | 3 +- + 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/drm_atomic.c | 25 +- + drivers/gpu/drm/drm_atomic_helper.c | 112 +++- + 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 | 69 +- + 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_plane_helper.c | 111 +--- + drivers/gpu/drm/drm_print.c | 54 +- + 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/gma500/mmu.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/i2c/tda998x_drv.c | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 28 + + drivers/gpu/drm/i915/Makefile | 31 +- + drivers/gpu/drm/i915/gvt/Makefile | 2 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 21 + + 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 | 139 +++- + drivers/gpu/drm/i915/gvt/kvmgt.c | 130 +--- + drivers/gpu/drm/i915/gvt/mmio.c | 32 +- + drivers/gpu/drm/i915/gvt/mmio.h | 6 + + 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 | 14 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 667 ++++++++++++++++++-- + drivers/gpu/drm/i915/gvt/scheduler.h | 28 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 34 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 131 +++- + drivers/gpu/drm/i915/i915_drv.c | 52 +- + drivers/gpu/drm/i915/i915_drv.h | 62 +- + drivers/gpu/drm/i915/i915_gem.c | 316 ++++++++-- + drivers/gpu/drm/i915/i915_gem.h | 12 +- + drivers/gpu/drm/i915/i915_gem_context.c | 62 +- + 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 | 66 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 75 ++- + drivers/gpu/drm/i915/i915_gem_object.h | 11 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 141 ++--- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 2 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 54 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 9 + + drivers/gpu/drm/i915/i915_gpu_error.c | 102 ++- + drivers/gpu/drm/i915/i915_guc_reg.h | 7 - + drivers/gpu/drm/i915/i915_irq.c | 8 +- + 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_perf.c | 95 ++- + drivers/gpu/drm/i915/i915_reg.h | 83 ++- + drivers/gpu/drm/i915/i915_selftest.h | 2 +- + 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 | 391 ++++++++---- + drivers/gpu/drm/i915/intel_color.c | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 46 +- + drivers/gpu/drm/i915/intel_csr.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 323 ++++++---- + drivers/gpu/drm/i915/intel_device_info.c | 121 +++- + drivers/gpu/drm/i915/intel_display.c | 308 ++++++--- + drivers/gpu/drm/i915/intel_dp.c | 517 +++++++-------- + 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 | 56 +- + drivers/gpu/drm/i915/intel_dsi.c | 19 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 + + drivers/gpu/drm/i915/intel_engine_cs.c | 215 ++++--- + drivers/gpu/drm/i915/intel_guc.c | 38 +- + drivers/gpu/drm/i915/intel_guc.h | 15 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 1 + + drivers/gpu/drm/i915/intel_guc_fw.c | 174 +++-- + drivers/gpu/drm/i915/intel_guc_fwif.h | 40 ++ + ...915_guc_submission.c => intel_guc_submission.c} | 699 +++++++++++++++------ + ...915_guc_submission.h => intel_guc_submission.h} | 11 +- + drivers/gpu/drm/i915/intel_hdmi.c | 112 ++-- + drivers/gpu/drm/i915/intel_huc.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 181 +++--- + drivers/gpu/drm/i915/intel_lrc.h | 1 - + 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_pipe_crc.c | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 174 ++--- + drivers/gpu/drm/i915/intel_psr.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 123 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 79 ++- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- + drivers/gpu/drm/i915/intel_sdvo.c | 6 +- + drivers/gpu/drm/i915/intel_sprite.c | 11 +- + drivers/gpu/drm/i915/intel_tv.c | 6 +- + drivers/gpu/drm/i915/intel_uc.c | 22 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 169 ++++- + drivers/gpu/drm/i915/intel_vbt_defs.h | 8 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 3 + + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 16 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.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 | 2 +- + 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_syncmap.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 367 +++++++++++ + 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/msm/mdp/mdp5/mdp5_plane.c | 10 +- + 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_ttm.c | 5 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 1 - + drivers/gpu/drm/radeon/radeon_dp_mst.c | 1 - + 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_hdmi.c | 10 +- + drivers/gpu/drm/sti/sti_vtg.c | 38 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 6 +- + drivers/gpu/drm/stm/ltdc.c | 66 +- + 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/core/tinydrm-helpers.c | 4 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 8 +- + 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 | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 40 +- + 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/video/hdmi.c | 51 +- + include/drm/drmP.h | 197 +----- + include/drm/drm_atomic_helper.h | 7 + + include/drm/drm_connector.h | 14 +- + 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 | 11 + + 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 | 2 +- + 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_vma_manager.h | 2 +- + include/drm/tinydrm/tinydrm.h | 1 + + include/linux/dma-fence-array.h | 3 + + include/linux/dma-fence.h | 2 +- + include/linux/reservation.h | 23 + + include/uapi/drm/i915_drm.h | 37 ++ + 247 files changed, 8038 insertions(+), 4155 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt + 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 + 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} (90%) + create mode 100644 drivers/gpu/drm/i915/selftests/intel_guc.c +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (2abf3c0da996 drm/i915: add platform tag to WA) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_guc_reg.h +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/Makefile +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 4 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/gvt/render.c | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 7 +- + drivers/gpu/drm/i915/i915_debugfs.c | 143 +--- + drivers/gpu/drm/i915/i915_drv.c | 85 +- + drivers/gpu/drm/i915/i915_drv.h | 56 +- + drivers/gpu/drm/i915/i915_gem.c | 73 +- + drivers/gpu/drm/i915/i915_gem_context.c | 316 +------- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 11 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 4 - + drivers/gpu/drm/i915/i915_gem_request.c | 25 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 138 ++-- + 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 | 60 +- + drivers/gpu/drm/i915/i915_irq.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 | 86 +- + drivers/gpu/drm/i915/i915_pmu.c | 865 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_pmu.h | 111 +++ + drivers/gpu/drm/i915/i915_reg.h | 3 + + drivers/gpu/drm/i915/i915_sysfs.c | 33 +- + drivers/gpu/drm/i915/intel_cdclk.c | 2 +- + drivers/gpu/drm/i915/intel_csr.c | 8 +- + drivers/gpu/drm/i915/intel_ddi.c | 21 +- + drivers/gpu/drm/i915/intel_device_info.c | 16 +- + drivers/gpu/drm/i915/intel_display.c | 810 ++++++++++--------- + drivers/gpu/drm/i915/intel_dp.c | 81 +- + drivers/gpu/drm/i915/intel_drv.h | 28 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 167 +++- + drivers/gpu/drm/i915/intel_fbc.c | 35 +- + drivers/gpu/drm/i915/intel_guc.c | 3 +- + drivers/gpu/drm/i915/intel_guc.h | 2 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 14 +- + .../drm/i915/{i915_guc_reg.h => intel_guc_reg.h} | 7 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 38 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 4 +- + drivers/gpu/drm/i915/intel_gvt.c | 5 - + drivers/gpu/drm/i915/intel_hangcheck.c | 44 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 86 +- + drivers/gpu/drm/i915/intel_lrc.h | 4 - + drivers/gpu/drm/i915/intel_panel.c | 88 +-- + drivers/gpu/drm/i915/intel_pipe_crc.c | 2 - + drivers/gpu/drm/i915/intel_pm.c | 238 +++--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 624 ++++++--------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 174 ++++- + drivers/gpu/drm/i915/intel_sprite.c | 85 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 3 - + drivers/gpu/drm/i915/selftests/huge_pages.c | 176 +++-- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 31 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 20 - + drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 9 - + include/uapi/drm/i915_drm.h | 40 + + 63 files changed, 2870 insertions(+), 2081 deletions(-) + 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} (98%) +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 (3b71239181e5 drm/fsl-dcu: Use drm_mode_config_helper_suspend/resume()) +$ git merge drm-misc/for-linux-next +Removing drivers/gpu/drm/sun4i/sun8i_layer.h +Removing drivers/gpu/drm/sun4i/sun8i_layer.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/ilitek,ili9225.txt | 25 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-kms-helpers.rst | 3 + + Documentation/gpu/todo.rst | 14 +- + MAINTAINERS | 6 + + drivers/gpu/drm/Kconfig | 5 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/arm/malidp_drv.c | 24 +- + drivers/gpu/drm/arm/malidp_drv.h | 1 - + drivers/gpu/drm/drm_connector.c | 73 ++ + drivers/gpu/drm/drm_fb_helper.c | 90 +- + drivers/gpu/drm/drm_modeset_helper.c | 76 ++ + .../drm/drm_panel_orientation_quirks.c} | 101 ++- + drivers/gpu/drm/drm_prime.c | 8 +- + drivers/gpu/drm/drm_probe_helper.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/i915/intel_dsi.c | 28 + + 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 | 387 ++++++++ + 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/tinydrm/Kconfig | 10 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 67 -- + drivers/gpu/drm/tinydrm/ili9225.c | 468 ++++++++++ + drivers/gpu/drm/tinydrm/mi0283qt.c | 7 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 24 +- + 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 +- + include/drm/drm_connector.h | 40 + + include/drm/drm_fb_helper.h | 8 + + include/drm/drm_mode_config.h | 16 + + include/drm/drm_modeset_helper.h | 3 + + include/drm/drm_utils.h | 15 + + include/drm/tinydrm/mipi-dbi.h | 4 +- + include/drm/tinydrm/tinydrm.h | 4 - + include/linux/fb.h | 5 + + 56 files changed, 3622 insertions(+), 625 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9225.txt + rename drivers/{video/fbdev/core/fbcon_dmi_quirks.c => gpu/drm/drm_panel_orientation_quirks.c} (50%) + 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 +$ git am -3 ../patches/0001-drm-i915-fix-up-for-drm-i915-s-enum-plane-enum-i9xx_.patch +Applying: drm/i915: fix up for "drm/i915: s/enum plane/enum i9xx_plane_id/" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/intel_dsi.c +$ git add -A . +$ git commit -v -a --amend +[master ef88fde1d7c179ea97cfa19edc441c1daf65b139] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Dec 6 11:54:10 2017 +1100 +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 (5a9a24faae43 Merge remote-tracking branch 'regmap/topic/hwspinlock' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 4 ---- + drivers/base/regmap/regmap.c | 11 ++--------- + 2 files changed, 2 insertions(+), 13 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 (9bb96c3a6c96 Merge remote-tracking branches 'asoc/topic/wm8903', 'asoc/topic/wm8994', 'asoc/topic/wm8997' and '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/st,stm32-sai.txt | 12 +- + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- + .../devicetree/bindings/sound/tlv320aic3x.txt | 10 +- + .../devicetree/bindings/sound/uniphier,evea.txt | 26 + + MAINTAINERS | 6 + + include/sound/hdaudio_ext.h | 4 +- + include/sound/rt5514.h | 2 + + include/sound/soc.h | 2 + + 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/atmel-classd.c | 6 - + sound/soc/cirrus/ep93xx-ac97.c | 6 +- + sound/soc/codecs/88pm860x-codec.c | 9 +- + 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/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 | 2 + + sound/soc/codecs/si476x.c | 9 +- + sound/soc/codecs/spdif_receiver.c | 5 +- + sound/soc/codecs/spdif_transmitter.c | 5 +- + sound/soc/codecs/tfa9879.c | 1 + + sound/soc/codecs/tlv320aic31xx.c | 237 +++++---- + 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/fsl/eukrea-tlv320.c | 1 - + sound/soc/fsl/fsl-asoc-card.c | 4 +- + sound/soc/fsl/fsl_asrc.h | 4 +- + sound/soc/fsl/fsl_ssi.c | 111 +++- + 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/skylake/skl-i2s.h | 64 +++ + sound/soc/intel/skylake/skl-nhlt.c | 155 ++++++ + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/soc/intel/skylake/skl-ssp-clk.h | 79 +++ + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- + sound/soc/intel/skylake/skl.c | 94 ++++ + sound/soc/intel/skylake/skl.h | 4 + + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + sound/soc/nuc900/nuc900-ac97.c | 4 +- + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/qcom/apq8016_sbc.c | 10 +- + sound/soc/rockchip/rk3399_gru_sound.c | 3 +- + sound/soc/samsung/bells.c | 40 +- + sound/soc/sh/rcar/core.c | 98 +++- + sound/soc/sh/rcar/dma.c | 104 +--- + sound/soc/sh/rcar/rsnd.h | 15 +- + 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/uniphier/Kconfig | 19 + + sound/soc/uniphier/Makefile | 3 + + sound/soc/uniphier/evea.c | 567 +++++++++++++++++++++ + 100 files changed, 2269 insertions(+), 1162 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt + 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 (a49796788d08 dm: safely allocate multiple bioset bios) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 4 +- + drivers/md/dm-cache-target.c | 12 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-io.c | 3 +- + drivers/md/dm-mpath.c | 18 +-- + drivers/md/dm-raid.c | 269 ++++++++++++++++++++++---------- + drivers/md/dm-snap.c | 48 +++--- + drivers/md/dm-table.c | 5 +- + drivers/md/dm-thin.c | 22 ++- + drivers/md/dm.c | 132 +++++++++++----- + include/linux/device-mapper.h | 15 -- + 11 files changed, 332 insertions(+), 199 deletions(-) +Merging mmc/next (40d72bbbc868 mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardb) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + drivers/mmc/Kconfig | 10 + + drivers/mmc/core/block.c | 942 +++++++++++++++- + drivers/mmc/core/block.h | 12 + + drivers/mmc/core/core.c | 44 +- + drivers/mmc/core/core.h | 41 +- + drivers/mmc/core/host.c | 2 + + drivers/mmc/core/host.h | 9 + + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_test.c | 221 ++-- + drivers/mmc/core/queue.c | 456 +++++++- + drivers/mmc/core/queue.h | 51 + + 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 | 79 ++ + 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 | 2 + + 25 files changed, 3252 insertions(+), 227 deletions(-) + create mode 100644 drivers/mmc/host/cqhci.c + create mode 100644 drivers/mmc/host/cqhci.h +Merging md/for-next (3f5b7d277da9 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 | 30 +++++++++++++++++++++++------- + drivers/md/md.h | 8 ++++++++ + drivers/md/raid1.c | 15 +++++++++++++++ + drivers/md/raid10.c | 16 ++++++++++++++++ + drivers/md/raid5-cache.c | 44 ++++++++++++++++++++++++++------------------ + drivers/md/raid5-log.h | 1 + + drivers/md/raid5.c | 12 +++++++++++- + 8 files changed, 109 insertions(+), 26 deletions(-) +Merging mfd/for-mfd-next (b534651d7a50 mfd: pm8xxx: Make elegible for COMPILE_TEST) +$ 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/cros_ec_spi.c | 25 +- + drivers/mfd/kempld-core.c | 2 +- + drivers/mfd/palmas.c | 10 +- + drivers/mfd/pcf50633-core.c | 2 +- + 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/tmio.h | 20 - + include/linux/{mfd => }/rtsx_common.h | 0 + include/linux/{mfd => }/rtsx_pci.h | 236 ++++++++- + include/linux/{mfd => }/rtsx_usb.h | 0 + 35 files changed, 1267 insertions(+), 106 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 (89%) + 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%) +$ git am -3 ../patches/0001-misc-rtsx-fix-symbol-clashes.patch +Applying: misc: rtsx: fix symbol clashes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/cardreader/rts5260.c +M drivers/misc/cardreader/rtsx_pcr.c +M drivers/misc/cardreader/rtsx_pcr.h +$ git add -A . +$ git commit -v -a --amend +[master 5786b82da204] Merge remote-tracking branch 'mfd/for-mfd-next' + Date: Wed Dec 6 12:14:34 2017 +1100 +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 (d16002755dc8 power: supply: bq24190_charger: Remove extcon handling) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + drivers/power/reset/zx-reboot.c | 4 + + drivers/power/supply/ab8500_charger.c | 6 +- + drivers/power/supply/bq24190_charger.c | 117 +++------------------------ + 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 +- + 7 files changed, 47 insertions(+), 113 deletions(-) +Merging regulator/for-next (40d5e58782e6 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/sc2731-regulator.c | 256 +++++++++++++++++++++ + drivers/regulator/tps65218-regulator.c | 5 +- + 7 files changed, 326 insertions(+), 23 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/sprd,sc2731-regulator.txt + create mode 100644 drivers/regulator/sc2731-regulator.c +Merging security/next-testing (4c6082336a74 Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 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. +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 33ecc0a01c6a] 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 (ef28df55ac27 selinux: ensure the context is NUL terminated in security_context_to_sid_core()) +$ 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 | 18 ++++++++---------- + 3 files changed, 10 insertions(+), 14 deletions(-) +Merging tpmdd/next (f8b73d394f91 tpm: parse TPM event logs based on EFI table) +$ git merge tpmdd/next +Resolved 'include/linux/tpm_eventlog.h' using previous resolution. +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/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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eaedaa1ad20d] Merge remote-tracking branch 'tpmdd/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/boot/compressed/eboot.c | 1 + + drivers/char/tpm/Makefile | 5 +- + drivers/char/tpm/tpm-chip.c | 3 +- + drivers/char/tpm/tpm-interface.c | 62 +----------- + drivers/char/tpm/tpm.h | 41 ++++++-- + 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_core.c | 110 +++++++++++++++------ + 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 +++++++++ + {drivers/char/tpm => include/linux}/tpm_eventlog.h | 35 ++----- + 19 files changed, 449 insertions(+), 136 deletions(-) + 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/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 7a14fd5f3391] 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 (54192011468d of: overlay: Remove else after goto) +$ git merge devicetree/for-next +Merge made by the 'recursive' strategy. + drivers/of/dynamic.c | 4 ++-- + drivers/of/overlay.c | 39 +++++++++++++++++---------------------- + drivers/of/unittest.c | 1 - + 3 files changed, 19 insertions(+), 25 deletions(-) +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 (5ca0175131d4 Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic/meson', 'spi/topic/sh-msiof' 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-fsl-dspi.c | 2 +- + drivers/spi/spi-imx.c | 11 +++++------ + drivers/spi/spi-meson-spicc.c | 1 + + drivers/spi/spi-sh-msiof.c | 5 ++--- + drivers/spi/spi-xilinx.c | 12 ++++++++++++ + include/linux/spi/spi.h | 2 +- + 10 files changed, 46 insertions(+), 19 deletions(-) +Merging tip/auto-latest (0df8a88e651b Merge branch 'WIP.x86/mm') +$ git merge tip/auto-latest +Auto-merging tools/perf/Makefile.config +Auto-merging kernel/time/timer.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/mm/pgtable.c +Auto-merging arch/x86/mm/pageattr.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/mm/Makefile +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/espfix_64.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/fixmap.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/x86/kaiser.txt | 159 +++++ + arch/x86/Kconfig | 8 + + arch/x86/boot/compressed/pagetable.c | 5 + + arch/x86/entry/calling.h | 84 +++ + arch/x86/entry/entry_32.S | 6 +- + arch/x86/entry/entry_64.S | 208 ++++++- + arch/x86/entry/entry_64_compat.S | 31 +- + arch/x86/events/intel/ds.c | 49 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/desc.h | 11 +- + arch/x86/include/asm/fixmap.h | 61 +- + arch/x86/include/asm/kaiser.h | 73 +++ + arch/x86/include/asm/kdebug.h | 1 + + arch/x86/include/asm/mmu_context.h | 29 +- + arch/x86/include/asm/pgtable.h | 20 +- + arch/x86/include/asm/pgtable_64.h | 140 +++++ + arch/x86/include/asm/pgtable_types.h | 11 + + arch/x86/include/asm/processor.h | 54 +- + arch/x86/include/asm/stacktrace.h | 3 + + arch/x86/include/asm/switch_to.h | 3 +- + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 243 ++++++-- + arch/x86/include/asm/traps.h | 1 - + arch/x86/include/asm/unwind.h | 7 + + arch/x86/include/uapi/asm/processor-flags.h | 3 +- + arch/x86/kernel/asm-offsets.c | 7 + + arch/x86/kernel/asm-offsets_32.c | 5 - + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/cpu/common.c | 142 +++-- + 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 | 6 + + arch/x86/kernel/espfix_64.c | 28 +- + arch/x86/kernel/head_64.S | 30 +- + arch/x86/kernel/irq.c | 12 - + arch/x86/kernel/irq_64.c | 4 +- + arch/x86/kernel/ldt.c | 25 +- + arch/x86/kernel/process.c | 15 +- + arch/x86/kernel/process_64.c | 14 +- + arch/x86/kernel/traps.c | 57 +- + arch/x86/kernel/unwind_orc.c | 88 ++- + arch/x86/kernel/vmlinux.lds.S | 9 + + arch/x86/kvm/x86.c | 3 +- + arch/x86/mm/Makefile | 1 + + arch/x86/mm/debug_pagetables.c | 81 ++- + arch/x86/mm/dump_pagetables.c | 32 +- + arch/x86/mm/init.c | 89 ++- + arch/x86/mm/kaiser.c | 521 +++++++++++++++++ + arch/x86/mm/kasan_init_64.c | 18 +- + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/pgtable.c | 16 +- + arch/x86/mm/tlb.c | 105 +++- + arch/x86/power/cpu.c | 16 +- + arch/x86/xen/mmu_pv.c | 2 +- + include/asm-generic/vmlinux.lds.h | 7 + + include/linux/hrtimer.h | 113 ++-- + include/linux/kaiser.h | 32 + + include/linux/percpu-defs.h | 30 + + include/trace/events/timer.h | 37 +- + init/main.c | 3 + + kernel/events/core.c | 5 +- + kernel/fork.c | 1 + + kernel/time/hrtimer.c | 643 ++++++++++++-------- + kernel/time/tick-internal.h | 13 +- + kernel/time/tick-sched.c | 2 +- + kernel/time/timer.c | 98 ++-- + net/can/bcm.c | 156 ++--- + security/Kconfig | 10 + + tools/arch/x86/include/asm/cpufeatures.h | 537 ++++++++--------- + tools/arch/x86/include/asm/disabled-features.h | 8 +- + tools/include/uapi/linux/kcmp.h | 1 + + tools/include/uapi/linux/prctl.h | 1 + + 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-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/Makefile.config | 2 +- + tools/perf/builtin-buildid-cache.c | 4 +- + tools/perf/builtin-c2c.c | 8 +- + tools/perf/builtin-help.c | 4 +- + tools/perf/builtin-kvm.c | 8 +- + tools/perf/builtin-record.c | 42 +- + tools/perf/builtin-report.c | 3 + + tools/perf/builtin-script.c | 36 +- + tools/perf/builtin-top.c | 44 +- + tools/perf/builtin-trace.c | 6 +- + .../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/tests/attr.c | 6 + + tools/perf/tests/backward-ring-buffer.c | 2 +- + tools/perf/tests/mmap-basic.c | 2 +- + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- + tools/perf/tests/sw-clock.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 | 651 +++++++++++---------- + tools/perf/util/annotate.h | 76 +-- + tools/perf/util/evlist.c | 25 +- + tools/perf/util/evlist.h | 6 + + tools/perf/util/evsel.c | 92 ++- + tools/perf/util/evsel.h | 10 +- + tools/perf/util/machine.c | 5 +- + tools/perf/util/ordered-events.c | 3 +- + tools/perf/util/ordered-events.h | 2 +- + tools/perf/util/parse-events.c | 2 + + tools/perf/util/parse-events.h | 3 + + tools/perf/util/pmu.c | 5 + + tools/perf/util/session.c | 45 +- + tools/perf/util/session.h | 2 +- + 122 files changed, 4284 insertions(+), 2012 deletions(-) + create mode 100644 Documentation/x86/kaiser.txt + create mode 100644 arch/x86/include/asm/kaiser.h + create mode 100644 arch/x86/mm/kaiser.c + create mode 100644 include/linux/kaiser.h +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 50d49014c7b8] 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 (f8549f993007 EXP: rcu: Add ->boost_tasks to assertion) +$ 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/trace/trace.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging fs/file.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 | 8 +- + include/linux/tracepoint.h | 5 +- + include/trace/events/rcu.h | 75 ++--- + 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 | 2 +- + 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 | 16 + + kernel/torture.c | 39 ++- + 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 - + 91 files changed, 577 insertions(+), 816 deletions(-) + delete mode 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh +Merging kvm/linux-next (4fbd8d194f06 Linux 4.15-rc1) +$ 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 (646d944c2ef5 xen/pvcalls: fix potential endless loop in pvcalls-front.c) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (abee210500ed percpu: hack to let the CRIS architecture to boot until they clean up) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging workqueues/for-next (62408c1ef007 workqueue/hotplug: remove the workaround in rebind_workers()) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + init/main.c | 7 ++++++- + kernel/workqueue.c | 32 ++++++++++++-------------------- + 2 files changed, 18 insertions(+), 21 deletions(-) +Merging drivers-x86/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge drivers-x86/for-next +Already up to date. +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 (92fdb03c084e leds: blinkm: avoid uninitialized data use) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-blinkm.c | 4 ++++ + drivers/leds/leds-lp8860.c | 26 ++++++++++++++++++++++++-- + drivers/leds/leds-pwm.c | 1 - + drivers/leds/trigger/Kconfig | 2 +- + 4 files changed, 29 insertions(+), 4 deletions(-) +Merging ipmi/for-next (066bccbd0c72 ipmi_si: Fix oops with PCI devices) +$ git merge ipmi/for-next +Resolved 'drivers/char/ipmi/ipmi_si_intf.c' using previous resolution. +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_si_intf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e0d26b65f5a8] Merge remote-tracking branch 'ipmi/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/ipmi/ipmi_si_intf.c | 44 +++++++++++++++++++++------------------- + drivers/char/ipmi/ipmi_si_pci.c | 7 +++++-- + 2 files changed, 28 insertions(+), 23 deletions(-) +Merging driver-core/driver-core-next (82bdf495169f test_firmware: wrap custom sysfs load tests into helper) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/firmware_class.c | 858 ++++++++++++---------- + tools/testing/selftests/firmware/fw_fallback.sh | 172 +++-- + tools/testing/selftests/firmware/fw_filesystem.sh | 5 +- + 3 files changed, 581 insertions(+), 454 deletions(-) +Merging usb/usb-next (7739376eb1ed USB: of: clean up device-node helper) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/usb-device.txt | 68 +++++++++++++++- + drivers/usb/core/ledtrig-usbport.c | 10 ++- + drivers/usb/core/message.c | 20 +++-- + drivers/usb/core/of.c | 95 +++++++++++++++++++--- + drivers/usb/core/usb.c | 3 +- + drivers/usb/host/whci/asl.c | 2 - + drivers/usb/typec/fusb302/fusb302.c | 38 ++++++--- + drivers/usb/usbip/vhci_rx.c | 2 +- + include/linux/usb/of.h | 21 ++++- + 9 files changed, 214 insertions(+), 45 deletions(-) +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 (4fbd8d194f06 Linux 4.15-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (9a450484089d lp: support 64-bit time_t user space) +$ git merge char-misc/char-misc-next +Auto-merging drivers/android/binder.c +Merge made by the 'recursive' strategy. + Documentation/fpga/fpga-mgr.txt | 132 +++++----- + Documentation/fpga/fpga-region.txt | 95 +++++++ + Documentation/fpga/overview.txt | 23 ++ + 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/misc/lkdtm_heap.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 +- + 19 files changed, 1252 insertions(+), 662 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 (82aec3ed46fd Merge tag 'iio-for-4.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Resolved 'drivers/iio/adc/meson_saradc.c' using previous resolution. +Resolved 'drivers/staging/most/cdev/cdev.c' using previous resolution. +Resolved 'drivers/staging/most/video/video.c' using previous resolution. +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/drivers/ni_atmio.c +Auto-merging drivers/staging/comedi/comedi_fops.c +Auto-merging drivers/staging/ccree/ssi_hash.c +Auto-merging drivers/iio/proximity/sx9500.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/health/max30102.c +Auto-merging drivers/iio/adc/meson_saradc.c +CONFLICT (content): Merge conflict in drivers/iio/adc/meson_saradc.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e07b92b695c8c24f596a6d14662ec1489eb35764] 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 | 11 +- + 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 | 26 +- + drivers/staging/android/ion/ion.h | 11 +- + 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 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 2 - + drivers/staging/ccree/ssi_aead.c | 259 ++- + drivers/staging/ccree/ssi_aead.h | 17 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 727 ++++---- + drivers/staging/ccree/ssi_buffer_mgr.h | 49 +- + drivers/staging/ccree/ssi_cipher.c | 139 +- + drivers/staging/ccree/ssi_cipher.h | 5 +- + drivers/staging/ccree/ssi_config.h | 6 +- + drivers/staging/ccree/ssi_driver.c | 65 +- + drivers/staging/ccree/ssi_driver.h | 25 +- + drivers/staging/ccree/ssi_fips.h | 3 +- + drivers/staging/ccree/ssi_hash.c | 372 ++-- + 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 | 137 +- + drivers/staging/ccree/ssi_request_mgr.h | 10 +- + drivers/staging/ccree/ssi_sram_mgr.c | 15 +- + 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/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/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/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 + + drivers/staging/media/imx/imx-media-csi.c | 8 +- + drivers/staging/media/imx/imx-media-fim.c | 30 +- + drivers/staging/media/imx/imx-media.h | 2 +- + .../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/pi433/pi433_if.c | 44 +- + drivers/staging/pi433/pi433_if.h | 3 +- + drivers/staging/pi433/rf69_enum.h | 57 +- + 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/include/iochannel.h | 12 +- + drivers/staging/unisys/include/visorbus.h | 12 +- + drivers/staging/unisys/include/visorchannel.h | 12 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 11 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 11 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 11 +- + drivers/staging/unisys/visorbus/visorbus_private.h | 11 +- + drivers/staging/unisys/visorbus/visorchannel.c | 11 +- + drivers/staging/unisys/visorbus/visorchipset.c | 18 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 12 +- + .../staging/unisys/visorinput/ultrainputreport.h | 11 +- + drivers/staging/unisys/visorinput/visorinput.c | 11 +- + drivers/staging/unisys/visornic/visornic_main.c | 11 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 37 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 2 +- + 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 | 1 + + 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_26.c | 1 + + fs/Kconfig | 1 - + fs/Makefile | 1 - + include/linux/iio/machine.h | 7 + + net/Kconfig | 1 - + net/Makefile | 1 - + 449 files changed, 6488 insertions(+), 6865 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 + 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%) +Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4) +$ git merge mux/for-next +Already up to date. +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 (c2f31b79d510 cgroup: add warning about RT not being supported on cgroup2) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 7 +++++++ + kernel/cgroup/debug.c | 4 ++-- + kernel/cgroup/stat.c | 8 ++++++-- + 3 files changed, 15 insertions(+), 4 deletions(-) +Merging scsi/for-next (5271b8a207ba Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/scsi.rst | 2 +- + 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/bfa/bfa_cs.h | 6 +- + drivers/scsi/bfa/bfa_defs_svc.h | 3 +- + drivers/scsi/bfa/bfa_fcpim.c | 3 +- + drivers/scsi/bfa/bfa_fcpim.h | 4 +- + drivers/scsi/bfa/bfa_ioc.c | 8 +- + drivers/scsi/bfa/bfa_port.c | 15 +- + drivers/scsi/bfa/bfa_port.h | 2 +- + drivers/scsi/bfa/bfa_svc.c | 47 ++--- + drivers/scsi/bfa/bfa_svc.h | 2 +- + drivers/scsi/bfa/bfad_attr.c | 3 - + drivers/scsi/bfa/bfad_bsg.c | 10 +- + drivers/scsi/bfa/bfad_im.h | 32 +++- + 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/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/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/ppa.c | 4 + + drivers/scsi/scsi_debug.c | 5 +- + drivers/scsi/scsi_devinfo.c | 27 +-- + drivers/scsi/sd.c | 6 +- + drivers/scsi/ses.c | 11 +- + drivers/scsi/st.c | 2 +- + drivers/scsi/ufs/ufshci.h | 16 ++ + drivers/scsi/wd719x.c | 4 +- + 56 files changed, 915 insertions(+), 587 deletions(-) +Merging scsi-mkp/for-next (417dff6cc15c scsi: ibmvscsis: add DRC indices to debug statements) +$ 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 (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (2dc0b46b5ea3 libata: sata_down_spd_limit should return if driver has not recorded sstatus speed) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci_mtk.c | 6 +++--- + drivers/ata/ahci_qoriq.c | 12 ++++++++++++ + drivers/ata/libata-core.c | 12 +++++++++--- + drivers/ata/pata_pdc2027x.c | 16 ++++++---------- + 4 files changed, 30 insertions(+), 16 deletions(-) +Merging vhost/linux-next (d9a4645e7e7c 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 | 4 +- + include/uapi/linux/virtio_balloon.h | 3 +- + kernel/crash_core.c | 1 + + 6 files changed, 264 insertions(+), 41 deletions(-) +Merging rpmsg/for-next (c4ec2b7731d8 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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (e3ce8c16971c Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpio/gpio-aspeed.c | 39 ++++- + drivers/gpio/gpio-ath79.c | 3 + + 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-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 +- + 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 + + 22 files changed, 401 insertions(+), 200 deletions(-) +Merging pinctrl/for-next (8ed259d4f687 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 | 59 +- + 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, 1631 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 (a57fcf2ddba5 Merge branch 'for-4.16/signal-sysfs-force' into for-next) +$ 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 | 25 +++++++++ + Documentation/livepatch/livepatch.txt | 22 +++++++- + arch/powerpc/kernel/signal.c | 6 +-- + arch/x86/entry/common.c | 6 +-- + kernel/livepatch/core.c | 60 +++++++++++++++++++++ + kernel/livepatch/transition.c | 66 ++++++++++++++++++++++++ + kernel/livepatch/transition.h | 2 + + kernel/signal.c | 4 +- + 8 files changed, 182 insertions(+), 9 deletions(-) +Merging coresight/next (869704675319 coresight: Use PTR_ERR_OR_ZERO()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../coresight/coresight-dynamic-replicator.c | 4 +--- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +--- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 +--- + drivers/hwtracing/coresight/coresight.c | 25 +++++----------------- + 4 files changed, 8 insertions(+), 29 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 (1f51194db0d7 eeprom: at24: remove now unneeded smbus-related code) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/Kconfig | 1 + + drivers/misc/eeprom/at24.c | 450 +++++++++++--------------------------------- + 2 files changed, 115 insertions(+), 336 deletions(-) +Merging ntb/ntb-next (c47963de5204 ntb_hw_switchtec: Force down the link before initializing) +$ git merge ntb/ntb-next +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/core/sock.c +Auto-merging net/caif/caif_socket.c +Auto-merging kernel/fork.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/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(-) +$ git am -3 ../patches/0001-Revert-symbol-lookup-introduce-dereference_symbol_de.patch +Applying: Revert "symbol lookup: introduce dereference_symbol_descriptor()" +Merging akpm-current/current (ba0cf5d1a44b pids: introduce find_get_task_by_vpid() helper) +$ git merge --no-ff akpm-current/current +Resolved 'lib/vsprintf.c' using previous resolution. +Recorded preimage for 'scripts/checkpatch.pl' +Removing tools/testing/selftests/x86/5lvl.c +Auto-merging scripts/checkpatch.pl +CONFLICT (content): Merge conflict in scripts/checkpatch.pl +Auto-merging mm/mlock.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging lib/find_bit_benchmark.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/fork.c +Auto-merging fs/dcache.c +Auto-merging drivers/gpu/drm/drm_mm.c +Auto-merging block/genhd.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/ia64/kernel/perfmon.c +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging Documentation/printk-formats.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'scripts/checkpatch.pl'. +[master c83c7ea3ffb2f130fd9da8549ff0e948d759043c] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/printk-formats.txt | 1 - + Documentation/sysctl/vm.txt | 25 -- + Documentation/vm/hugetlbpage.txt | 27 +- + Makefile | 51 ++- + arch/Kconfig | 16 +- + arch/arm/include/asm/bitops.h | 1 + + arch/arm/include/asm/page.h | 2 + + arch/frv/kernel/traps.c | 9 + + arch/ia64/kernel/perfmon.c | 13 +- + arch/powerpc/Kconfig | 1 - + arch/s390/Kconfig | 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 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/ocfs2/cluster/quorum.c | 9 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmcommon.h | 1 + + fs/ocfs2/dlm/dlmdomain.c | 14 + + fs/ocfs2/dlm/dlmmaster.c | 7 - + fs/ocfs2/dlm/dlmrecovery.c | 13 +- + 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/proc/array.c | 8 +- + fs/proc/base.c | 65 +++- + fs/proc/fd.c | 2 +- + 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 - + include/asm-generic/bitops/find.h | 20 + + include/linux/bitmap.h | 6 +- + include/linux/crash_core.h | 2 + + include/linux/hugetlb.h | 2 +- + include/linux/list_lru.h | 3 +- + include/linux/memcontrol.h | 165 +++++---- + include/linux/mm.h | 2 +- + include/linux/oom.h | 13 + + include/linux/rbtree.h | 2 + + include/linux/sched.h | 5 + + include/linux/sched/mm.h | 24 +- + include/linux/sched/signal.h | 3 + + include/linux/shrinker.h | 2 +- + 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 + + kernel/async.c | 20 +- + kernel/configs/tiny.config | 4 + + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 506 ++++++++++++++------------ + kernel/futex.c | 20 +- + kernel/pid.c | 13 + + kernel/ptrace.c | 27 +- + kernel/sys.c | 11 + + kernel/sysctl.c | 7 - + kernel/taskstats.c | 6 +- + lib/Kconfig.debug | 2 +- + 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 +- + mm/Kconfig | 7 +- + mm/filemap.c | 1 - + mm/hugetlb.c | 40 +- + mm/interval_tree.c | 2 +- + mm/kmemleak.c | 1 - + mm/list_lru.c | 66 ++-- + mm/memcontrol.c | 160 ++++---- + mm/memory.c | 24 +- + mm/memory_hotplug.c | 6 +- + mm/mempolicy.c | 35 +- + mm/mlock.c | 6 + + mm/oom_kill.c | 31 +- + mm/page_alloc.c | 198 +++++----- + mm/page_owner.c | 8 +- + mm/process_vm_access.c | 6 +- + mm/shmem.c | 5 +- + mm/swap.c | 98 ++--- + mm/swap_state.c | 137 ++++--- + mm/vmscan.c | 148 ++------ + mm/zswap.c | 71 +++- + scripts/checkpatch.pl | 5 + + scripts/decodecode | 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 --------- + 112 files changed, 2127 insertions(+), 1588 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: 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 + + 48405639053d...5fefda304799 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5fefda304799 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 ++++++++++----------- + fs/inode.c | 1 - + include/linux/crc-ccitt.h | 7 ++++++ + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- + tools/objtool/Makefile | 2 +- + 5 files changed, 78 insertions(+), 16 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..b3888b0db91c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20171206 |